Replace matrixSet with projection to be more general.

[philipp/winterrodeln/mediawiki_extensions/wrmap.git] / wrmap.body.php

diff --git a/wrmap.body.php b/wrmap.body.php
index ab0f1788268b846b93cfb99b0bdab7bd3a397ea7..fa4bd4162854de91a9d3de413e5ade176ef3cb41 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -271,7 +271,7 @@ class WrBaseMap {
                $json = array(
                        'type' => 'FeatureCollection',
                        'features' => $json_features,
-                       'properties' => $properties
+                       'wr_properties' => $properties
                );
                $json_string = json_encode($json);
 
@@ -283,11 +283,7 @@ class WrBaseMap {
                $div_map->appendElement('div', array())->appendText(wfMessage('wrmap-loading')->text());
                // data
                $div_map->appendElement('div', array('style' => 'height: 0px; display:none;'))->appendText($json_string);
-               // popup
-               $div_popup = $doc->appendElement('div', array('id' => 'popup', 'class' => 'ol-popup'));
-               $div_popup->appendElement('a', array('id' => 'popup-closer', 'href' => '#', 'class' => 'ol-popup-closer'));
-               $div_popup->appendElement('div', array('id' => 'popup-content'));
-               return array($doc->saveHTML($div_map) . $doc->saveHTML($div_popup), 'markerType' => 'nowiki');
+               return array($doc->saveHTML($div_map), 'markerType' => 'nowiki');
        }
 }