http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61286
Revision: 61286
Author: jeroendedauw
Date: 2010-01-20 02:11:12 +0000 (Wed, 20 Jan 2010)
Log Message:
-----------
Changes for 0.5.3.
* Google Maps v3 support
Modified Paths:
--------------
trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php
trunk/extensions/Maps/Maps_Settings.php
Modified: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php
===================================================================
--- trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php 2010-01-20
02:04:50 UTC (rev 61285)
+++ trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php 2010-01-20
02:11:12 UTC (rev 61286)
@@ -22,11 +22,11 @@
$egMapsServices['googlemaps3'] = array(
'pf' =>
array(
-
'display_point' => array('class' => 'MapsGoogleMaps3DispPoint', 'file' =>
'GoogleMaps/Maps_GoogleMaps3DispPoint.php', 'local' => true),
-
'display_map' => array('class' => 'MapsGoogleMaps3DispMap', 'file' =>
'GoogleMaps/Maps_GoogleMaps3DispMap.php', 'local' => true),
+
'display_point' => array('class' => 'MapsGoogleMaps3DispPoint', 'file' =>
'GoogleMaps3/Maps_GoogleMaps3DispPoint.php', 'local' => true),
+
'display_map' => array('class' => 'MapsGoogleMaps3DispMap', 'file' =>
'GoogleMaps3/Maps_GoogleMaps3DispMap.php', 'local' => true),
),
'classes' => array(
-
array('class' => 'MapsGoogleMaps3', 'file' =>
'GoogleMaps/Maps_GoogleMaps3.php', 'local' => true)
+
array('class' => 'MapsGoogleMaps3', 'file' =>
'GoogleMaps3/Maps_GoogleMaps3.php', 'local' => true)
),
'aliases' => array('google3', 'googlemap3', 'gmap3', 'gmaps3'),
);
@@ -38,7 +38,7 @@
*
* @author Jeroen De Dauw
*/
-class MapsGoogleMaps {
+class MapsGoogleMaps3 {
const SERVICE_NAME = 'googlemaps3';
Modified: trunk/extensions/Maps/Maps_Settings.php
===================================================================
--- trunk/extensions/Maps/Maps_Settings.php 2010-01-20 02:04:50 UTC (rev
61285)
+++ trunk/extensions/Maps/Maps_Settings.php 2010-01-20 02:11:12 UTC (rev
61286)
@@ -62,13 +62,14 @@
# Include the mapping services that should be loaded into Maps.
# Commenting or removing a mapping service will cause Maps to completely
ignore it, and so improve performance.
include_once $egMapsIP . '/GoogleMaps/Maps_GoogleMaps.php'; // Google Maps
+include_once $egMapsIP . '/GoogleMaps3/Maps_GoogleMaps3.php'; // Google Maps
v3
include_once $egMapsIP . '/OpenLayers/Maps_OpenLayers.php'; // OpenLayers
include_once $egMapsIP . '/YahooMaps/Maps_YahooMaps.php'; //
Yahoo! Maps
include_once $egMapsIP . '/OpenStreetMap/Maps_OSM.php'; //
OpenLayers optimized for OSM
# Array of String. Array containing all the mapping services that will be made
available to the user.
# Currently Maps provides the following services: googlemaps, yahoomaps,
openlayers
-$egMapsAvailableServices = array('googlemaps', 'yahoomaps', 'openlayers',
'osm');
+$egMapsAvailableServices = array('googlemaps', 'googlemaps3', 'yahoomaps',
'openlayers', 'osm');
# String. The default mapping service, which will be used when no default
service is present in the
# $egMapsDefaultServices array for a certain feature. A service that supports
all features is recommended.
@@ -149,7 +150,7 @@
# Specific map properties configuration
-# Google maps
+# Google Maps
# Your Google Maps API key. Required for displaying Google Maps, and using the
Google Geocoder services.
if (empty($egGoogleMapsKey)) $egGoogleMapsKey = ''; #
http://code.google.com/apis/maps/signup.html
@@ -181,8 +182,18 @@
-# Yahoo maps
+# Google Maps v3
+# String. The Google Maps v3 map name prefix. It can not be identical to the
one of another mapping service.
+$egMapsGoogleMaps3Prefix = 'map_google3';
+
+# Integer. The default zoom of a map. This value will only be used when the
user does not provide one.
+$egMapsGoogleMaps3Zoom = 14;
+
+
+
+# Yahoo! Maps
+
# Your Yahoo! Maps API key. Required for displaying Yahoo! Maps.
# Haven't got an API key yet? Get it here:
https://developer.yahoo.com/wsregapp/
if (empty($egYahooMapsKey)) $egYahooMapsKey = '';
@@ -227,7 +238,7 @@
-# OpenStreetMaps (OpenLayers optimized for OSM)
+# OpenStreetMap (OpenLayers optimized for OSM)
# String. The OSM map name prefix. It can not be identical to the one of
another mapping service.
$egMapsOSMPrefix = 'map_osm';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
