| Index: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | types: [$this->types], |
| 86 | 86 | controls: [$this->controls], |
| 87 | 87 | scrollWheelZoom: $this->autozoom, |
| 88 | | - kml: '$this->kml' |
| | 88 | + kml: [$this->kml] |
| 89 | 89 | }, |
| 90 | 90 | []); |
| 91 | 91 | } |
| Index: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php |
| — | — | @@ -73,6 +73,8 @@ |
| 74 | 74 | 'output-type' => 'boolstr' |
| 75 | 75 | ), |
| 76 | 76 | 'kml' => array( |
| | 77 | + 'type' => array( 'string', 'list' ), |
| | 78 | + 'output-type' => array( 'list', ',', '\'' ) |
| 77 | 79 | ), |
| 78 | 80 | ); |
| 79 | 81 | |
| Index: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php |
| — | — | @@ -87,7 +87,7 @@ |
| 88 | 88 | types: [$this->types], |
| 89 | 89 | controls: [$this->controls], |
| 90 | 90 | scrollWheelZoom: $this->autozoom, |
| 91 | | - kml: '$this->kml' |
| | 91 | + kml: [$this->kml] |
| 92 | 92 | }, |
| 93 | 93 | [$this->markerString] |
| 94 | 94 | ); |
| Index: trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js |
| — | — | @@ -166,12 +166,14 @@ |
| 167 | 167 | |
| 168 | 168 | map.enableContinuousZoom(); |
| 169 | 169 | |
| 170 | | - // Code to add KML files |
| 171 | | - if (mapOptions.kml != '') { |
| 172 | | - map.addOverlay( new GGeoXml( mapOptions.kml ) ); |
| 173 | | - } |
| | 170 | + // Code to add KML files. |
| | 171 | + var kmlOverlays = []; |
| | 172 | + for ( i = mapOptions.kml.length -1; i >= 0; i-- ) { |
| | 173 | + kmlOverlays[i] = new GGeoXml( mapOptions.kml[i] ); |
| | 174 | + map.addOverlay( kmlOverlays[i] ); |
| | 175 | + } |
| 174 | 176 | |
| 175 | | - // Make the map variable available for other functions |
| | 177 | + // Make the map variable available for other functions. |
| 176 | 178 | if (!window.GMaps) window.GMaps = new Object; |
| 177 | 179 | eval("window.GMaps." + mapName + " = map;"); |
| 178 | 180 | |
| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | 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>.'; |
| 35 | 35 | } |
| 36 | 36 | else { |
| 37 | | - define( 'Maps_VERSION', '0.6.4 a4' ); |
| | 37 | + define( 'Maps_VERSION', '0.6.4 a5' ); |
| 38 | 38 | |
| 39 | 39 | // The different coordinate notations. |
| 40 | 40 | define( 'Maps_COORDS_FLOAT', 'float' ); |