| Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMapsQP.php |
| — | — | @@ -53,9 +53,7 @@ |
| 54 | 54 | */ |
| 55 | 55 | protected function addSpecificMapHTML() { |
| 56 | 56 | global $wgJsMimeType; |
| 57 | | - |
| 58 | | - $this->type = MapsYahooMaps::getYMapType($this->type, true); |
| 59 | | - |
| | 57 | + |
| 60 | 58 | $this->autozoom = MapsYahooMaps::getAutozoomJSValue($this->autozoom); |
| 61 | 59 | |
| 62 | 60 | $markerItems = array(); |
| — | — | @@ -70,16 +68,14 @@ |
| 71 | 69 | $markerItems[] = "getYMarkerData($lat, $lon, '$title', '$label', '$icon')"; |
| 72 | 70 | } |
| 73 | 71 | |
| 74 | | - $markersString = implode(',', $markerItems); |
| | 72 | + $markersString = implode(',', $markerItems); |
| 75 | 73 | |
| 76 | | - $typesString = MapsYahooMaps::createTypesString($this->types); |
| 77 | | - |
| 78 | 74 | $this->output .= " |
| 79 | 75 | <div id='$this->mapName' style='width: {$this->width}px; height: {$this->height}px;'></div> |
| 80 | 76 | |
| 81 | 77 | <script type='$wgJsMimeType'>/*<![CDATA[*/ |
| 82 | 78 | addOnloadHook( |
| 83 | | - initializeYahooMap('$this->mapName', $this->centre_lat, $this->centre_lon, $this->zoom, $this->type, [$typesString], [$this->controls], $this->autozoom, [$markersString], $this->height) |
| | 79 | + initializeYahooMap('$this->mapName', $this->centre_lat, $this->centre_lon, $this->zoom, $this->type, [$this->types], [$this->controls], $this->autozoom, [$markersString], $this->height) |
| 84 | 80 | ); |
| 85 | 81 | /*]]>*/</script>"; |
| 86 | 82 | |
| Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMapsFormInput.php |
| — | — | @@ -70,12 +70,8 @@ |
| 71 | 71 | protected function addSpecificMapHTML() { |
| 72 | 72 | global $wgJsMimeType; |
| 73 | 73 | |
| 74 | | - $type = MapsYahooMaps::getYMapType($this->type, true); |
| | 74 | + $this->autozoom = MapsYahooMaps::getAutozoomJSValue($this->autozoom); |
| 75 | 75 | |
| 76 | | - $this->autozoom = MapsYahooMaps::getAutozoomJSValue($this->autozoom); |
| 77 | | - |
| 78 | | - $typesString = MapsYahooMaps::createTypesString($this->types); |
| 79 | | - |
| 80 | 76 | $this->output .=" |
| 81 | 77 | <div id='".$this->mapName."' style='width: {$this->width}px; height: {$this->height}px;'></div> |
| 82 | 78 | |
| Index: trunk/extensions/SemanticMaps/SemanticMaps.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | |
| 37 | 37 | // Only initialize the extension when all dependencies are present. |
| 38 | 38 | if (defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' )) { |
| 39 | | - define('SM_VERSION', '0.5.1 a4'); |
| | 39 | + define('SM_VERSION', '0.5.1 a5'); |
| 40 | 40 | |
| 41 | 41 | $smgScriptPath = $wgScriptPath . '/extensions/SemanticMaps'; |
| 42 | 42 | $smgIP = $IP . '/extensions/SemanticMaps'; |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsQP.php |
| — | — | @@ -67,9 +67,6 @@ |
| 68 | 68 | */ |
| 69 | 69 | protected function addSpecificMapHTML() { |
| 70 | 70 | global $wgJsMimeType; |
| 71 | | - |
| 72 | | - // Get the Google Maps names for the control and map types. |
| 73 | | - $this->type = MapsGoogleMaps::getGMapType($this->type, true); |
| 74 | 71 | |
| 75 | 72 | $onloadFunctions = MapsGoogleMaps::addOverlayOutput($this->output, $this->mapName, $this->overlays, $this->controls); |
| 76 | 73 | |
| — | — | @@ -89,8 +86,6 @@ |
| 90 | 87 | // Create a string containing the marker JS |
| 91 | 88 | $markersString = implode(',', $markerItems); |
| 92 | 89 | |
| 93 | | - $typesString = MapsGoogleMaps::createTypesString($this->types); |
| 94 | | - |
| 95 | 90 | $this->output .= <<<END |
| 96 | 91 | <div id="$this->mapName" class="$this->class" style="$this->style" ></div> |
| 97 | 92 | <script type="$wgJsMimeType"> /*<![CDATA[*/ |
| — | — | @@ -103,7 +98,7 @@ |
| 104 | 99 | lon: $this->centre_lon, |
| 105 | 100 | zoom: $this->zoom, |
| 106 | 101 | type: $this->type, |
| 107 | | - types: [$typesString], |
| | 102 | + types: [$this->types], |
| 108 | 103 | controls: [$this->controls], |
| 109 | 104 | scrollWheelZoom: $this->autozoom |
| 110 | 105 | }, |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsFormInput.php |
| — | — | @@ -74,16 +74,12 @@ |
| 75 | 75 | |
| 76 | 76 | $this->autozoom = MapsGoogleMaps::getAutozoomJSValue($this->autozoom); |
| 77 | 77 | |
| 78 | | - $this->type = MapsGoogleMaps::getGMapType($this->type, true); |
| 79 | | - |
| 80 | 78 | // Remove the overlays control in case it's present. |
| 81 | 79 | if (in_string('overlays', $this->controls)) { |
| 82 | 80 | $this->controls = str_replace(",'overlays'", '', $this->controls); |
| 83 | 81 | $this->controls = str_replace("'overlays',", '', $this->controls); |
| 84 | 82 | } |
| 85 | 83 | |
| 86 | | - $typesString = MapsGoogleMaps::createTypesString($this->types); |
| 87 | | - |
| 88 | 84 | $this->output .= " |
| 89 | 85 | <div id='".$this->mapName."' class='".$this->class."'></div> |
| 90 | 86 | |
| — | — | @@ -99,7 +95,7 @@ |
| 100 | 96 | lon: $this->centre_lon, |
| 101 | 97 | zoom: $this->zoom, |
| 102 | 98 | type: $this->type, |
| 103 | | - types: [$typesString], |
| | 99 | + types: [$this->types], |
| 104 | 100 | controls: [$this->controls], |
| 105 | 101 | scrollWheelZoom: $this->autozoom |
| 106 | 102 | }, |