| Index: branches/Maps0.8/includes/services/GoogleMaps3/Maps_ParamGMap3Type.php |
| — | — | @@ -15,21 +15,12 @@ |
| 16 | 16 | class MapsParamGMap3Type extends ItemParameterManipulation { |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | | - * Constructor. |
| 20 | | - * |
| 21 | | - * @since 0.7 |
| 22 | | - */ |
| 23 | | - public function __construct() { |
| 24 | | - parent::__construct(); |
| 25 | | - } |
| 26 | | - |
| 27 | | - /** |
| 28 | 19 | * @see ItemParameterManipulation::doManipulation |
| 29 | 20 | * |
| 30 | 21 | * @since 0.7 |
| 31 | 22 | */ |
| 32 | 23 | public function doManipulation( &$value, Parameter $parameter, array &$parameters ) { |
| 33 | | - $value = 'google.maps.MapTypeId.' . MapsGoogleMaps3::$mapTypes[strtolower( $value )]; |
| | 24 | + $value = MapsGoogleMaps3::$mapTypes[strtolower( $value )]; |
| 34 | 25 | } |
| 35 | 26 | |
| 36 | 27 | } |
| \ No newline at end of file |
| Index: branches/Maps0.8/includes/services/GoogleMaps3/Maps_ParamGMap3Typestyle.php |
| — | — | @@ -15,21 +15,12 @@ |
| 16 | 16 | class MapsParamGMap3Typestyle extends ItemParameterManipulation { |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | | - * Constructor. |
| 20 | | - * |
| 21 | | - * @since 0.7 |
| 22 | | - */ |
| 23 | | - public function __construct() { |
| 24 | | - parent::__construct(); |
| 25 | | - } |
| 26 | | - |
| 27 | | - /** |
| 28 | 19 | * @see ItemParameterManipulation::doManipulation |
| 29 | 20 | * |
| 30 | | - * @since 0.7 |
| | 21 | + * @since 0.8 |
| 31 | 22 | */ |
| 32 | 23 | public function doManipulation( &$value, Parameter $parameter, array &$parameters ) { |
| 33 | | - $value = 'google.maps.MapTypeControlStyle.' . MapsGoogleMaps3::$tyepControlStyles[strtolower( $value )]; |
| | 24 | + $value = MapsGoogleMaps3::$tyepControlStyles[strtolower( $value )]; |
| 34 | 25 | } |
| 35 | 26 | |
| 36 | 27 | } |
| \ No newline at end of file |
| Index: branches/Maps0.8/includes/services/GoogleMaps3/jquery.googlemap.js |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | |
| 11 | 11 | var mapOptions = { |
| 12 | 12 | disableDefaultUI: true, |
| 13 | | - mapTypeId: eval( options.type ), |
| | 13 | + mapTypeId: eval( 'google.maps.MapTypeId.' + options.type ), |
| 14 | 14 | }; |
| 15 | 15 | this.options = options; |
| 16 | 16 | |
| — | — | @@ -21,8 +21,8 @@ |
| 22 | 22 | mapOptions.streetViewControl = $.inArray( 'streetview', options.controls ) != -1; |
| 23 | 23 | |
| 24 | 24 | // Map control styles |
| 25 | | - mapOptions.zoomControlOptions = { style: eval( options.zoomstyle ) } |
| 26 | | - mapOptions.mapTypeControlOptions = { style: eval( options.typestyle ) } |
| | 25 | + mapOptions.zoomControlOptions = { style: eval( 'google.maps.ZoomControlStyle.' + options.zoomstyle ) } |
| | 26 | + mapOptions.mapTypeControlOptions = { style: eval( 'google.maps.MapTypeControlStyle.' + options.typestyle ) } |
| 27 | 27 | |
| 28 | 28 | // Create the map. |
| 29 | 29 | var locations = options.locations; |
| Index: branches/Maps0.8/includes/services/GoogleMaps3/Maps_ParamGMap3Zoomstyle.php |
| — | — | @@ -15,21 +15,12 @@ |
| 16 | 16 | class MapsParamGMap3Zoomstyle extends ItemParameterManipulation { |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | | - * Constructor. |
| 20 | | - * |
| 21 | | - * @since 0.7 |
| 22 | | - */ |
| 23 | | - public function __construct() { |
| 24 | | - parent::__construct(); |
| 25 | | - } |
| 26 | | - |
| 27 | | - /** |
| 28 | 19 | * @see ItemParameterManipulation::doManipulation |
| 29 | 20 | * |
| 30 | | - * @since 0.7 |
| | 21 | + * @since 0.8 |
| 31 | 22 | */ |
| 32 | 23 | public function doManipulation( &$value, Parameter $parameter, array &$parameters ) { |
| 33 | | - $value = 'google.maps.ZoomControlStyle.' . strtoupper( $value ); |
| | 24 | + $value = strtoupper( $value ); |
| 34 | 25 | } |
| 35 | 26 | |
| 36 | 27 | } |
| \ No newline at end of file |