http://www.mediawiki.org/wiki/Special:Code/MediaWiki/68828
Revision: 68828
Author: jeroendedauw
Date: 2010-07-01 11:42:44 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Patch to enable KML for google maps submitted by 67.170.217.247
Modified Paths:
--------------
trunk/extensions/Maps/Maps.php
trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js
trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php
trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php
trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
Modified: trunk/extensions/Maps/Maps.php
===================================================================
--- trunk/extensions/Maps/Maps.php 2010-07-01 11:04:00 UTC (rev 68827)
+++ trunk/extensions/Maps/Maps.php 2010-07-01 11:42:44 UTC (rev 68828)
@@ -33,7 +33,7 @@
echo '<b>Warning:</b> You need to have <a
href="http://www.mediawiki.org/wiki/Extension:Validator";>Validator</a>
installed in order to use <a
href="http://www.mediawiki.org/wiki/Extension:Maps";>Maps</a>.';
}
else {
- define( 'Maps_VERSION', '0.6.4 a3' );
+ define( 'Maps_VERSION', '0.6.4 a4' );
// The different coordinate notations.
define( 'Maps_COORDS_FLOAT', 'float' );
Modified: trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js
2010-07-01 11:04:00 UTC (rev 68827)
+++ trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js
2010-07-01 11:42:44 UTC (rev 68828)
@@ -140,7 +140,10 @@
break;
case 'nav-label' : case 'nav' :
map.addControl(new GNavLabelControl());
- break;
+ break;
+ case 'searchbar' :
+ map.enableGoogleBar();
+ break;
}
}
@@ -163,6 +166,11 @@
map.enableContinuousZoom();
+ // Code to add KML files
+ if (mapOptions.kml != '') {
+ map.addOverlay( new GGeoXml( mapOptions.kml ) );
+ }
+
// Make the map variable available for other functions
if (!window.GMaps) window.GMaps = new Object;
eval("window.GMaps." + mapName + " = map;");
Modified: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php
2010-07-01 11:04:00 UTC (rev 68827)
+++ trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php
2010-07-01 11:42:44 UTC (rev 68828)
@@ -72,6 +72,8 @@
'default' => $egMapsGoogleAutozoom,
'output-type' => 'boolstr'
),
+ 'kml' => array(
+ ),
);
$parameters['zoom']['criteria']['in_range'] = array( 0, 20 );
@@ -119,7 +121,7 @@
public static function getControlNames() {
return array(
'auto', 'large', 'small', 'large-original',
'small-original', 'zoom', 'type', 'type-menu',
- 'overlays', 'overview', 'overview-map', 'scale',
'nav-label', 'nav'
+ 'overlays', 'overview', 'overview-map', 'scale',
'nav-label', 'nav', 'searchbar'
);
}
Modified: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php
2010-07-01 11:04:00 UTC (rev 68827)
+++ trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php
2010-07-01 11:42:44 UTC (rev 68828)
@@ -83,7 +83,8 @@
type: $this->type,
types: [$this->types],
controls: [$this->controls],
- scrollWheelZoom: $this->autozoom
+ scrollWheelZoom: $this->autozoom,
+ kml: '$this->kml'
},
[]);
}
Modified: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
2010-07-01 11:04:00 UTC (rev 68827)
+++ trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
2010-07-01 11:42:44 UTC (rev 68828)
@@ -86,7 +86,8 @@
type: $this->type,
types: [$this->types],
controls: [$this->controls],
- scrollWheelZoom: $this->autozoom
+ scrollWheelZoom: $this->autozoom,
+ kml: '$this->kml'
},
[$this->markerString]
);
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
