| Index: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispPoint.php |
| — | — | @@ -60,6 +60,7 @@ |
| 61 | 61 | public function addSpecificMapHTML() { |
| 62 | 62 | global $wgJsMimeType; |
| 63 | 63 | |
| | 64 | + // TODO |
| 64 | 65 | $this->output .=<<<END |
| 65 | 66 | |
| 66 | 67 | END; |
| Index: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispMap.php |
| — | — | @@ -60,7 +60,19 @@ |
| 61 | 61 | |
| 62 | 62 | // TODO |
| 63 | 63 | $this->output .=<<<END |
| 64 | | - |
| | 64 | +<div id="$this->mapName" style="width:100%; height:100%"></div> |
| | 65 | +<script type="$wgJsMimeType"> /*<![CDATA[*/ |
| | 66 | +addOnloadHook( |
| | 67 | + function() { |
| | 68 | + var latlng = new google.maps.LatLng(-34.397, 150.644); |
| | 69 | + var myOptions = { |
| | 70 | + zoom: 8, |
| | 71 | + center: latlng, |
| | 72 | + mapTypeId: google.maps.MapTypeId.ROADMAP |
| | 73 | + }; |
| | 74 | + var map = new google.maps.Map(document.getElementById("$this->mapName"), myOptions); |
| | 75 | +} |
| | 76 | +/*]]>*/ </script> |
| 65 | 77 | END; |
| 66 | 78 | |
| 67 | 79 | } |
| Index: trunk/extensions/Maps/GoogleMaps/Maps_GoogleMaps.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | die( 'Not an entry point.' ); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | | -$egMapsServices['googlemaps'] = array( |
| | 24 | +$egMapsServices['googlemaps2'] = array( |
| 25 | 25 | 'pf' => array( |
| 26 | 26 | 'display_point' => array('class' => 'MapsGoogleMapsDispPoint', 'file' => 'GoogleMaps/Maps_GoogleMapsDispPoint.php', 'local' => true), |
| 27 | 27 | 'display_map' => array('class' => 'MapsGoogleMapsDispMap', 'file' => 'GoogleMaps/Maps_GoogleMapsDispMap.php', 'local' => true), |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | 'classes' => array( |
| 30 | 30 | array('class' => 'MapsGoogleMaps', 'file' => 'GoogleMaps/Maps_GoogleMaps.php', 'local' => true) |
| 31 | 31 | ), |
| 32 | | - 'aliases' => array('google', 'googlemap', 'gmap', 'gmaps'), |
| | 32 | + 'aliases' => array('googlemaps', 'google', 'googlemap', 'gmap', 'gmaps'), |
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | 35 | /** |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | */ |
| 42 | 42 | class MapsGoogleMaps { |
| 43 | 43 | |
| 44 | | - const SERVICE_NAME = 'googlemaps'; |
| | 44 | + const SERVICE_NAME = 'googlemaps2'; |
| 45 | 45 | |
| 46 | 46 | public static function initialize() { |
| 47 | 47 | self::initializeParams(); |
| Index: trunk/extensions/Maps/Maps.i18n.php |
| — | — | @@ -32,7 +32,8 @@ |
| 33 | 33 | 'maps_map_cannot_be_displayed' => 'The map cannot be displayed.', |
| 34 | 34 | |
| 35 | 35 | // Mapping services |
| 36 | | - 'maps_googlemaps' => 'Google Maps', |
| | 36 | + 'maps_googlemaps2' => 'Google Maps v2', |
| | 37 | + 'maps_googlemaps3' => 'Google Maps v3', |
| 37 | 38 | 'maps_yahoomaps' => 'Yahoo! Maps', |
| 38 | 39 | 'maps_openlayers' => 'OpenLayers', |
| 39 | 40 | 'maps_osm' => 'OpenStreetMap', |
| — | — | @@ -41,7 +42,7 @@ |
| 42 | 43 | 'maps_click_to_activate' => 'Click to activate map', |
| 43 | 44 | 'maps_centred_on' => 'Map centered on $1, $2.', |
| 44 | 45 | |
| 45 | | - // Google Maps overlays |
| | 46 | + // Google Maps v2 overlays |
| 46 | 47 | 'maps_overlays' => 'Overlays', |
| 47 | 48 | 'maps_photos' => 'Photos', |
| 48 | 49 | 'maps_videos' => 'Videos', |
| — | — | @@ -96,7 +97,7 @@ |
| 97 | 98 | 'maps_unrecognized_coords_for' => '{{PLURAL:$2|الإحداثي التالي|الإحداثيات التالية}} لم يتم التعرف عليها و {{PLURAL:$2|تمت|تمت}} إزالتها من الخريطة: |
| 98 | 99 | $1', |
| 99 | 100 | 'maps_map_cannot_be_displayed' => 'الخريطة لا يمكن عرضها.', |
| 100 | | - 'maps_googlemaps' => 'خرائط جوجل', |
| | 101 | + 'maps_googlemaps2' => 'خرائط جوجل', |
| 101 | 102 | 'maps_yahoomaps' => 'خرائط ياهو!', |
| 102 | 103 | 'maps_openlayers' => 'أوبن لايرز', |
| 103 | 104 | 'maps_osm' => 'أوبن ستريت ماب', |
| — | — | @@ -114,7 +115,7 @@ |
| 115 | 116 | */ |
| 116 | 117 | $messages['arz'] = array( |
| 117 | 118 | 'maps_name' => 'خرايط', |
| 118 | | - 'maps_googlemaps' => 'خرايط جوجل', |
| | 119 | + 'maps_googlemaps2' => 'خرايط جوجل', |
| 119 | 120 | 'maps_yahoomaps' => 'خرايط ياهو', |
| 120 | 121 | ); |
| 121 | 122 | |
| — | — | @@ -672,7 +673,7 @@ |
| 673 | 674 | 'maps_unrecognized_coords_for' => 'De volgende {{PLURAL:$2|coördinaat is niet herkend en is|coördinaten zijn niet herkend en zijn}} weggelaten uit de kaart: |
| 674 | 675 | $1.', |
| 675 | 676 | 'maps_map_cannot_be_displayed' => 'De kaart kan niet weergegeven worden.', |
| 676 | | - 'maps_googlemaps' => 'Google Maps', |
| | 677 | + 'maps_googlemaps2' => 'Google Maps v2', |
| 677 | 678 | 'maps_yahoomaps' => 'Yahoo! Maps', |
| 678 | 679 | 'maps_openlayers' => 'OpenLayers', |
| 679 | 680 | 'maps_click_to_activate' => 'Klik om de kaart te activeren', |
| Index: trunk/extensions/Maps/Maps_Settings.php |
| — | — | @@ -69,17 +69,17 @@ |
| 70 | 70 | |
| 71 | 71 | # Array of String. Array containing all the mapping services that will be made available to the user. |
| 72 | 72 | # Currently Maps provides the following services: googlemaps, yahoomaps, openlayers |
| 73 | | -$egMapsAvailableServices = array('googlemaps', 'googlemaps3', 'yahoomaps', 'openlayers', 'osm'); |
| | 73 | +$egMapsAvailableServices = array('googlemaps2', 'googlemaps3', 'yahoomaps', 'openlayers', 'osm'); |
| 74 | 74 | |
| 75 | 75 | # String. The default mapping service, which will be used when no default service is present in the |
| 76 | 76 | # $egMapsDefaultServices array for a certain feature. A service that supports all features is recommended. |
| 77 | 77 | # This service needs to be enabled, if not, the first one from the available services will be taken. |
| 78 | | -$egMapsDefaultService = 'googlemaps'; |
| | 78 | +$egMapsDefaultService = 'googlemaps2'; |
| 79 | 79 | |
| 80 | 80 | # Array of String. The default mapping service for each feature, which will be used when no valid service is provided by the user. |
| 81 | 81 | # Each service needs to be enabled, if not, the first one from the available services will be taken. |
| 82 | 82 | # Note: The default service needs to be available for the feature you set it for, since it's used as a fallback mechanism. |
| 83 | | -$egMapsDefaultServices = array('pf' => 'googlemaps'); |
| | 83 | +$egMapsDefaultServices = array('pf' => 'googlemaps2'); |
| 84 | 84 | |
| 85 | 85 | |
| 86 | 86 | |
| — | — | @@ -94,7 +94,7 @@ |
| 95 | 95 | 'class' => 'MapsGoogleGeocoder', |
| 96 | 96 | 'file' => 'Geocoders/Maps_GoogleGeocoder.php', |
| 97 | 97 | 'local' => true, |
| 98 | | - 'overrides' => array('googlemaps'), |
| | 98 | + 'overrides' => array('googlemaps2'), |
| 99 | 99 | ), |
| 100 | 100 | 'yahoo' => array( |
| 101 | 101 | 'class' => 'MapsYahooGeocoder', |