http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95666
Revision: 95666
Author: jeroendedauw
Date: 2011-08-29 15:37:04 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
added kml rezoom setting and parameter
Modified Paths:
--------------
trunk/extensions/Maps/Maps.i18n.php
trunk/extensions/Maps/Maps_Settings.php
trunk/extensions/Maps/RELEASE-NOTES
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
Modified: trunk/extensions/Maps/Maps.i18n.php
===================================================================
--- trunk/extensions/Maps/Maps.i18n.php 2011-08-29 15:00:15 UTC (rev 95665)
+++ trunk/extensions/Maps/Maps.i18n.php 2011-08-29 15:37:04 UTC (rev 95666)
@@ -190,6 +190,7 @@
'maps-googlemaps3-par-gkml' => 'KML files hosted by Google to load onto
the map.',
'maps-googlemaps3-par-fusiontables' => 'IDs of Google Fusion Tables
which should be loaded onto the map.',
'maps-googlemaps3-par-tilt' => 'Tilt for the Map when using Google
Maps.',
+ 'maps-googlemaps3-par-kmlrezoom' => 'Rezoom the map after the KML
layers have been loaded.',
// OpenLayers
'maps-openlayers-par-controls' => 'The controls to place on the map.',
Modified: trunk/extensions/Maps/Maps_Settings.php
===================================================================
--- trunk/extensions/Maps/Maps_Settings.php 2011-08-29 15:00:15 UTC (rev
95665)
+++ trunk/extensions/Maps/Maps_Settings.php 2011-08-29 15:37:04 UTC (rev
95666)
@@ -162,6 +162,8 @@
$egMapsDefaultLabel = '';
$egMapsResizableByDefault = false;
+
+ $egMapsRezoomForKML = false;
Modified: trunk/extensions/Maps/RELEASE-NOTES
===================================================================
--- trunk/extensions/Maps/RELEASE-NOTES 2011-08-29 15:00:15 UTC (rev 95665)
+++ trunk/extensions/Maps/RELEASE-NOTES 2011-08-29 15:37:04 UTC (rev 95666)
@@ -12,6 +12,7 @@
* Added API module for geocoding.
* Added 'geocoding' right.
+* Added kmlrezoom parameter for Google Maps v3 and general $egMapsRezoomForKML
setting.
* Fixed Google Maps v3 JavaScript issue occuring on MediaWiki 1.17.
=== Maps 1.0.2 ===
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2011-08-29 15:00:15 UTC (rev 95665)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2011-08-29 15:37:04 UTC (rev 95666)
@@ -148,6 +148,10 @@
$params['tilt'] = new Parameter( 'tilt',
Parameter::TYPE_INTEGER );
$params['tilt']->setDefault( $egMapsGMaps3DefaultTilt, false );
$params['tilt']->setMessage( 'maps-googlemaps3-par-tilt' );
+
+ $params['kmlrezoom'] = new Parameter( 'kmlrezoom',
Parameter::TYPE_BOOLEAN );
+ $params['kmlrezoom']->setDefault(
$GLOBALS['egMapsRezoomForKML'], false );
+ $params['kmlrezoom']->setMessage(
'maps-googlemaps3-par-kmlrezoom' );
}
/**
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-29 15:00:15 UTC (rev 95665)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-29 15:37:04 UTC (rev 95666)
@@ -118,7 +118,7 @@
// If there are any non-Google KML/KMZ layers, load the geoxml
library and use it to add these layers.
if ( options.kml.length != 0 ) {
mw.loader.using( 'ext.maps.gm3.geoxml', function() {
- var geoXml = new geoXML3.parser( { map: map } );
+ var geoXml = new geoXML3.parser( { map: map,
zoom: options.kmlrezoom } );
for ( i = options.kml.length - 1; i >= 0; i-- )
{
geoXml.parse( options.kml[i] );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
