| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMaps.php |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | // Get the Google Maps names for the control and map types |
| 68 | 68 | $this->type = MapsGoogleMapsUtils::getGMapType($this->type, true); |
| 69 | 69 | |
| 70 | | - $control = MapsGoogleMapsUtils::getGControlType($this->controls); |
| | 70 | + $this->controls = MapsGoogleMapsUtils::createControlsString($this->controls); |
| 71 | 71 | |
| 72 | 72 | $this->autozoom = MapsGoogleMapsUtils::getAutozoomJSValue($this->autozoom); |
| 73 | 73 | |
| — | — | @@ -90,7 +90,7 @@ |
| 91 | 91 | <div id="$this->mapName" class="$this->class" style="$this->style" ></div> |
| 92 | 92 | <script type="$wgJsMimeType"> /*<![CDATA[*/ |
| 93 | 93 | addLoadEvent( |
| 94 | | - initializeGoogleMap('$this->mapName', $this->width, $this->height, $this->centre_lat, $this->centre_lon, $this->zoom, $this->type, [$typesString], new $control(), $this->autozoom, [$markersString]) |
| | 94 | + initializeGoogleMap('$this->mapName', $this->width, $this->height, $this->centre_lat, $this->centre_lon, $this->zoom, $this->type, [$typesString], [$this->controls], $this->autozoom, [$markersString]) |
| 95 | 95 | ); |
| 96 | 96 | /*]]>*/ </script> |
| 97 | 97 | |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsFormInput.php |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | |
| 68 | 68 | $this->type = MapsGoogleMapsUtils::getGMapType($this->type, true); |
| 69 | 69 | |
| 70 | | - $control = MapsGoogleMapsUtils::getGControlType($this->controls); |
| | 70 | + $this->controls = MapsGoogleMapsUtils::createControlsString($this->controls); |
| 71 | 71 | |
| 72 | 72 | $this->types = explode(",", $this->types); |
| 73 | 73 | |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | <div id='".$this->mapName."' class='".$this->class."'></div> |
| 78 | 78 | |
| 79 | 79 | <script type='$wgJsMimeType'>/*<![CDATA[*/ |
| 80 | | - addLoadEvent(makeFormInputGoogleMap('$this->mapName', '$this->coordsFieldName', $this->width, $this->height, $this->centre_lat, $this->centre_lon, $this->zoom, $this->marker_lat, $this->marker_lon, $this->type, [$typesString], new $control(), $this->autozoom)); |
| | 80 | + addLoadEvent(makeFormInputGoogleMap('$this->mapName', '$this->coordsFieldName', $this->width, $this->height, $this->centre_lat, $this->centre_lon, $this->zoom, $this->marker_lat, $this->marker_lon, $this->type, [$typesString], [$this->controls], $this->autozoom)); |
| 81 | 81 | window.unload = GUnload; |
| 82 | 82 | /*]]>*/</script>"; |
| 83 | 83 | } |