| Index: trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3.php |
| — | — | @@ -49,8 +49,8 @@ |
| 50 | 50 | |
| 51 | 51 | self::initializeParams(); |
| 52 | 52 | |
| 53 | | - Validator::addOutputFormat( 'gmap3type', array( 'MapsGoogleMaps3', 'setGMapType' ) ); |
| 54 | | - Validator::addOutputFormat( 'gmap3types', array( 'MapsGoogleMaps3', 'setGMapTypes' ) ); |
| | 53 | + Validator::addOutputFormat( 'gmap3type', array( __CLASS__, 'setGMapType' ) ); |
| | 54 | + Validator::addOutputFormat( 'gmap3types', array( __CLASS__, 'setGMapTypes' ) ); |
| 55 | 55 | |
| 56 | 56 | return true; |
| 57 | 57 | } |
| — | — | @@ -108,7 +108,7 @@ |
| 109 | 109 | * |
| 110 | 110 | * @return string |
| 111 | 111 | */ |
| 112 | | - public static function setGMapType( &$type ) { |
| | 112 | + public static function setGMapType( &$type, $name, array $parameters ) { |
| 113 | 113 | $type = 'google.maps.MapTypeId.' . self::$mapTypes[ $type ]; |
| 114 | 114 | } |
| 115 | 115 | |
| — | — | @@ -119,9 +119,9 @@ |
| 120 | 120 | * |
| 121 | 121 | * @return array |
| 122 | 122 | */ |
| 123 | | - public static function setGMapTypes( array &$types ) { |
| | 123 | + public static function setGMapTypes( array &$types, $name, array $parameters ) { |
| 124 | 124 | for ( $i = count( $types ) - 1; $i >= 0; $i-- ) { |
| 125 | | - self::setGMapType( $types[$i] ); |
| | 125 | + self::setGMapType( $types[$i], $name, $parameters ); |
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
| Index: trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMaps.php |
| — | — | @@ -134,7 +134,7 @@ |
| 135 | 135 | * |
| 136 | 136 | * @return string |
| 137 | 137 | */ |
| 138 | | - public static function setYMapType( &$type ) { |
| | 138 | + public static function setYMapType( &$type, $name, array $parameters ) { |
| 139 | 139 | $type = self::$mapTypes[ $type ]; |
| 140 | 140 | } |
| 141 | 141 | |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | * |
| 147 | 147 | * @return array |
| 148 | 148 | */ |
| 149 | | - public static function setYMapTypes( array &$types ) { |
| | 149 | + public static function setYMapTypes( array &$types, $name, array $parameters ) { |
| 150 | 150 | for ( $i = count( $types ) - 1; $i >= 0; $i-- ) { |
| 151 | 151 | $types[$i] = self::$mapTypes[ $types[$i] ]; |
| 152 | 152 | } |
| Index: trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayers.php |
| — | — | @@ -205,7 +205,7 @@ |
| 206 | 206 | * |
| 207 | 207 | * @param array $layers |
| 208 | 208 | */ |
| 209 | | - public static function unpackLayerGroups( array &$layers ) { |
| | 209 | + public static function unpackLayerGroups( array &$layers, $name, array $parameters ) { |
| 210 | 210 | global $egMapsOLLayerGroups; |
| 211 | 211 | |
| 212 | 212 | $unpacked = array(); |
| Index: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php |
| — | — | @@ -178,7 +178,7 @@ |
| 179 | 179 | * |
| 180 | 180 | * @return string |
| 181 | 181 | */ |
| 182 | | - public static function setGMapType( &$type ) { |
| | 182 | + public static function setGMapType( &$type, $name, array $parameters ) { |
| 183 | 183 | $type = self::$mapTypes[ $type ]; |
| 184 | 184 | } |
| 185 | 185 | |
| — | — | @@ -189,7 +189,7 @@ |
| 190 | 190 | * |
| 191 | 191 | * @return array |
| 192 | 192 | */ |
| 193 | | - public static function setGMapTypes( array &$types ) { |
| | 193 | + public static function setGMapTypes( array &$types, $name, array $parameters ) { |
| 194 | 194 | for ( $i = count( $types ) - 1; $i >= 0; $i-- ) { |
| 195 | 195 | $types[$i] = self::$mapTypes[ $types[$i] ]; |
| 196 | 196 | } |
| Index: trunk/extensions/Maps/Maps_CoordinateParser.php |
| — | — | @@ -180,9 +180,11 @@ |
| 181 | 181 | */ |
| 182 | 182 | private static function normalizeCoordinates( $coordinates ) { |
| 183 | 183 | $coordinates = trim( $coordinates ); |
| | 184 | + |
| 184 | 185 | $coordinates = str_replace( array( '°', '°' ), Maps_GEO_DEG, $coordinates ); |
| 185 | 186 | $coordinates = str_replace( array( '´', '´' ), Maps_GEO_SEC, $coordinates ); |
| 186 | 187 | $coordinates = str_replace( array( '″', '″', Maps_GEO_SEC . Maps_GEO_SEC, '´´', '′′', '″' ), Maps_GEO_MIN, $coordinates ); |
| | 188 | + |
| 187 | 189 | return str_replace( array( '′', '′', '´', '′' ), Maps_GEO_SEC, $coordinates ); |
| 188 | 190 | } |
| 189 | 191 | |
| Index: trunk/extensions/Maps/Maps_Mapper.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | return true; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | | - public static function formatLocation( &$location ) { |
| | 47 | + public static function formatLocation( &$location, $name, array $parameters ) { |
| 48 | 48 | if ( self::geocoderIsAvailable() ) { |
| 49 | 49 | $location = MapsGeocoder::attemptToGeocodeToString( $location ); |
| 50 | 50 | } else { |
| — | — | @@ -51,10 +51,10 @@ |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | | - public static function formatLocations( &$locations ) { |
| | 55 | + public static function formatLocations( &$locations, $name, array $parameters ) { |
| 56 | 56 | $locations = (array)$locations; |
| 57 | 57 | foreach ( $locations as &$location ) { |
| 58 | | - self::formatLocation( $location ); |
| | 58 | + self::formatLocation( $location, $name, $parameters ); |
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | |
| — | — | @@ -187,7 +187,7 @@ |
| 188 | 188 | * @param string $dimension Must be width or height. |
| 189 | 189 | * @param number $default The default value for this dimension. |
| 190 | 190 | */ |
| 191 | | - public static function setMapDimension( &$value, $dimension, $default ) { |
| | 191 | + public static function setMapDimension( &$value, $name, array $parameters, $dimension, $default ) { |
| 192 | 192 | self::isMapDimension( $value, array(), $dimension, true, $default ); |
| 193 | 193 | } |
| 194 | 194 | |