| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMaps.php |
| — | — | @@ -26,9 +26,9 @@ |
| 27 | 27 | * |
| 28 | 28 | */ |
| 29 | 29 | protected function setQueryPrinterSettings() { |
| 30 | | - global $egMapsGoogleMapsZoom; |
| | 30 | + global $egMapsGoogleMapsZoom, $egMapsGoogleMapsPrefix; |
| 31 | 31 | |
| 32 | | - $this->elementNamePrefix = 'map_google'; |
| | 32 | + $this->elementNamePrefix = $egMapsGoogleMapsPrefix; |
| 33 | 33 | |
| 34 | 34 | $this->defaultZoom = $egMapsGoogleMapsZoom; |
| 35 | 35 | } |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsFormInput.php |
| — | — | @@ -22,9 +22,9 @@ |
| 23 | 23 | * |
| 24 | 24 | */ |
| 25 | 25 | protected function setMapSettings() { |
| 26 | | - global $egMapsGoogleMapsZoom; |
| | 26 | + global $egMapsGoogleMapsZoom, $egMapsGoogleMapsPrefix; |
| 27 | 27 | |
| 28 | | - $this->elementNamePrefix = 'map_google'; |
| | 28 | + $this->elementNamePrefix = $egMapsGoogleMapsPrefix; |
| 29 | 29 | $this->showAddresFunction = 'showGAddress'; |
| 30 | 30 | |
| 31 | 31 | $this->earthZoom = 1; |
| Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMaps.php |
| — | — | @@ -24,9 +24,9 @@ |
| 25 | 25 | * |
| 26 | 26 | */ |
| 27 | 27 | protected function setQueryPrinterSettings() { |
| 28 | | - global $egMapsYahooMapsZoom; |
| | 28 | + global $egMapsYahooMapsZoom, $egMapsYahooMapsPrefix; |
| 29 | 29 | |
| 30 | | - $this->elementNamePrefix = 'map_yahoo'; |
| | 30 | + $this->elementNamePrefix = $egMapsYahooMapsPrefix; |
| 31 | 31 | $this->defaultZoom = $egMapsYahooMapsZoom; |
| 32 | 32 | } |
| 33 | 33 | |
| Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMapsFormInput.php |
| — | — | @@ -20,9 +20,9 @@ |
| 21 | 21 | * |
| 22 | 22 | */ |
| 23 | 23 | protected function setMapSettings() { |
| 24 | | - global $egMapsYahooMapsZoom; |
| | 24 | + global $egMapsYahooMapsZoom, $egMapsYahooMapsPrefix; |
| 25 | 25 | |
| 26 | | - $this->elementNamePrefix = 'map_yahoo'; |
| | 26 | + $this->elementNamePrefix = $egMapsYahooMapsPrefix; |
| 27 | 27 | $this->showAddresFunction = 'showYAddress'; |
| 28 | 28 | |
| 29 | 29 | $this->earthZoom = 17; |
| Index: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayers.php |
| — | — | @@ -25,9 +25,9 @@ |
| 26 | 26 | * |
| 27 | 27 | */ |
| 28 | 28 | protected function setQueryPrinterSettings() { |
| 29 | | - global $egMapsOpenLayersZoom; |
| | 29 | + global $egMapsOpenLayersZoom, $egMapsOpenLayersPrefix; |
| 30 | 30 | |
| 31 | | - $this->elementNamePrefix = 'open_layer'; |
| | 31 | + $this->elementNamePrefix = $egMapsOpenLayersPrefix; |
| 32 | 32 | $this->defaultZoom = $egMapsOpenLayersZoom; |
| 33 | 33 | } |
| 34 | 34 | |
| Index: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFormInput.php |
| — | — | @@ -20,9 +20,9 @@ |
| 21 | 21 | * |
| 22 | 22 | */ |
| 23 | 23 | protected function setMapSettings() { |
| 24 | | - global $egMapsOpenLayersZoom; |
| | 24 | + global $egMapsOpenLayersZoom, $egMapsOpenLayersPrefix; |
| 25 | 25 | |
| 26 | | - $this->elementNamePrefix = 'open_layer'; |
| | 26 | + $this->elementNamePrefix = $egMapsOpenLayersPrefix; |
| 27 | 27 | $this->showAddresFunction = 'showOLAddress'; |
| 28 | 28 | |
| 29 | 29 | $this->earthZoom = 1; |
| Index: trunk/extensions/SemanticMaps/SM_MapPrinter.php |
| — | — | @@ -45,9 +45,14 @@ |
| 46 | 46 | |
| 47 | 47 | protected $output = ''; |
| 48 | 48 | |
| | 49 | + protected $mapFeature; |
| | 50 | + |
| 49 | 51 | /** |
| 50 | | - * |
| | 52 | + * Builds up and returns the HTML for the map, with the queried coordinate data on it. |
| 51 | 53 | * |
| | 54 | + * @param unknown_type $res |
| | 55 | + * @param unknown_type $outputmode |
| | 56 | + * @return unknown |
| 52 | 57 | */ |
| 53 | 58 | public final function getResultText($res, $outputmode) { |
| 54 | 59 | $this->formatResultData($res, $outputmode); |