| Index: trunk/extensions/Maps/Includes/Maps_Mapper.php |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | */ |
| 83 | 83 | public static function formatLocation( &$location, $name, array $parameters ) { |
| 84 | 84 | if ( self::geocoderIsAvailable() ) { |
| 85 | | - $location = MapsGeocoder::attemptToGeocodeToString( $location, $parameters['geoservice']['value'], $parameters['mappingservice']['value'] ); |
| | 85 | + $location = MapsGeocoders::attemptToGeocodeToString( $location, $parameters['geoservice']['value'], $parameters['mappingservice']['value'] ); |
| 86 | 86 | } else { |
| 87 | 87 | $location = MapsCoordinateParser::parseAndFormat( $location ); |
| 88 | 88 | } |
| — | — | @@ -173,7 +173,7 @@ |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | /** |
| 177 | | - * Returns a boolean indicating if MapsGeocoder is available. |
| | 177 | + * Returns a boolean indicating if MapsGeocoders is available. |
| 178 | 178 | * |
| 179 | 179 | * @deprecated - use MapsGeocoders::canGeocode() instead |
| 180 | 180 | * |
| Index: trunk/extensions/Maps/Maps_Settings.php |
| — | — | @@ -54,10 +54,17 @@ |
| 55 | 55 | |
| 56 | 56 | # Geocoders |
| 57 | 57 | |
| | 58 | + # Registration of the GeoNames service geocoder. |
| 58 | 59 | $wgHooks['GeocoderFirstCallInit'][] = 'MapsGeonamesGeocoder::register'; |
| | 60 | + |
| | 61 | + # Registration of the Google Geocoding (v2) service geocoder. |
| 59 | 62 | $wgHooks['GeocoderFirstCallInit'][] = 'MapsGoogleGeocoder::register'; |
| | 63 | + |
| | 64 | + # Registration of the Yahoo! Geocoding service geocoder. |
| 60 | 65 | $wgHooks['GeocoderFirstCallInit'][] = 'MapsYahooGeocoder::register'; |
| 61 | 66 | |
| | 67 | + |
| | 68 | + |
| 62 | 69 | # Mapping services configuration |
| 63 | 70 | # Note: You can not use aliases in the settings. Use the main service names. |
| 64 | 71 | |