| Index: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispPoint.php |
| — | — | @@ -34,7 +34,7 @@ |
| 35 | 35 | $this->elementNamePrefix = $egMapsGMaps3Prefix; |
| 36 | 36 | $this->defaultZoom = $egMapsGMaps3Zoom; |
| 37 | 37 | |
| 38 | | - $this->markerStringFormat = ''; // TODO |
| | 38 | + $this->markerStringFormat = 'getGMaps3MarkerData(lat, lon, \'title\', \'label\', "icon")'; |
| 39 | 39 | |
| 40 | 40 | $this->spesificParameters = array( |
| 41 | 41 | ); |
| — | — | @@ -68,9 +68,11 @@ |
| 69 | 69 | initGMap3("$this->mapName", { |
| 70 | 70 | zoom: $this->zoom, |
| 71 | 71 | lat: $this->centre_lat, |
| 72 | | - lon: $this->centre_lon, |
| | 72 | + lon: $this->centre_lon, |
| | 73 | + types: [$this->types], |
| | 74 | + mapTypeId: $this->type |
| 73 | 75 | }, |
| 74 | | - [] |
| | 76 | + [$this->markerString] |
| 75 | 77 | ) |
| 76 | 78 | ); |
| 77 | 79 | /*]]>*/ </script> |
| Index: trunk/extensions/Maps/GoogleMaps3/GoogleMap3Functions.js |
| — | — | @@ -10,11 +10,16 @@ |
| 11 | 11 | /** |
| 12 | 12 | * Created a new Map object with the provided properties and markers. |
| 13 | 13 | */ |
| 14 | | -function initGMap3(name, options, markers) { |
| | 14 | +function initGMap3(name, options, markerData) { |
| 15 | 15 | options.center = new google.maps.LatLng(options.lat, options.lon); |
| 16 | 16 | |
| 17 | 17 | var map = new google.maps.Map(document.getElementById(name), options); |
| 18 | 18 | |
| 19 | | - map.mapTypes = options.types; |
| 20 | | - map.setMapTypeId(options.type); |
| | 19 | + // TODO: types - http://code.google.com/apis/maps/documentation/v3/reference.html#MapTypeRegistry |
| | 20 | + |
| | 21 | + // TODO: markers |
| | 22 | +} |
| | 23 | + |
| | 24 | +function getGMaps3MarkerData(lat, lon, title, label, icon) { |
| | 25 | + return {position: new google.maps.LatLng(lat, lon), title: title, label: label, icon: icon}; |
| 21 | 26 | } |
| \ No newline at end of file |
| Index: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispMap.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | lat: $this->centre_lat, |
| 69 | 69 | lon: $this->centre_lon, |
| 70 | 70 | types: [$this->types], |
| 71 | | - type: $this->type, |
| | 71 | + mapTypeId: $this->type |
| 72 | 72 | }, |
| 73 | 73 | [] |
| 74 | 74 | ) |
| 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.5.3 a1'); |
| | 37 | + define('Maps_VERSION', '0.5.3 a2'); |
| 38 | 38 | |
| 39 | 39 | $egMapsScriptPath = $wgScriptPath . '/extensions/Maps'; |
| 40 | 40 | $egMapsIP = $IP . '/extensions/Maps'; |