Now using the minimized version of OpenLayers.

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

diff --git a/wrmap.body.php b/wrmap.body.php
index b89826bb9ba1f4f5a980431410d163fa371e66cb..8723f96c0304e18d7e45cd8bc7748acc1d899309 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -54,22 +54,22 @@ function xml_to_json_features($input) {
        libxml_use_internal_errors(true); // without that, we get PHP Warnings if the $input is not well-formed
        $xml = new SimpleXMLElement($input); // input
        $json_features = array(); // output
        libxml_use_internal_errors(true); // without that, we get PHP Warnings if the $input is not well-formed
        $xml = new SimpleXMLElement($input); // input
        $json_features = array(); // output

-       $point_type = array('gasthaus' => 'inn', 'haltestelle' => 'busstop', 'parkplatz' => 'carpark', 'achtung' => 'attention', 'punkt' => 'point');
-       $line_type = array('rodelbahn' => 'sledrun', 'gehweg' => 'walk', 'alternative' => 'alternative', 'lift' => 'lift', 'linie' => 'line');
+       $point_types = array('gasthaus', 'haltestelle', 'parkplatz', 'achtung', 'punkt');
+       $line_types = array('rodelbahn', 'gehweg', 'alternative', 'lift', 'anfahrt', 'linie');

        foreach ($xml as $feature) {
                $given_properties = array();
                foreach ($feature->attributes() as $key => $value) $given_properties[] = $key;
 
                // determine feature type
        foreach ($xml as $feature) {
                $given_properties = array();
                foreach ($feature->attributes() as $key => $value) $given_properties[] = $key;
 
                // determine feature type

-               $is_point = in_array($feature->getName(), array_keys($point_type));
-               $is_line = in_array($feature->getName(), array_keys($line_type));
+               $is_point = in_array($feature->getName(), $point_types);
+               $is_line = in_array($feature->getName(), $line_types);

                if (!$is_point && !$is_line) {
                        throw new Exception('Unbekanntes Element <' . $feature->getName() . '>. Erlaubt sind: <' . implode('>, <', array_keys(array_merge($point_type, $line_type))) . '>.');
                }
 
                // point
                if ($is_point) {
                if (!$is_point && !$is_line) {
                        throw new Exception('Unbekanntes Element <' . $feature->getName() . '>. Erlaubt sind: <' . implode('>, <', array_keys(array_merge($point_type, $line_type))) . '>.');
                }
 
                // point
                if ($is_point) {

-                       $properties = array('type' => $point_type[$feature->getName()]);
+                       $properties = array('type' => $feature->getName());

                        $allowed_properties = array('name', 'wiki');
                        $wrong_properties = array_diff($given_properties, $allowed_properties);
                        if (count($wrong_properties) > 0) throw new Exception("Das Attribut '" . reset($wrong_properties) . "' ist nicht erlaubt bei <" . $feature->getName() . ">. Erlaubt sind: '" . implode("', '", $allowed_properties) . "'.");
                        $allowed_properties = array('name', 'wiki');
                        $wrong_properties = array_diff($given_properties, $allowed_properties);
                        if (count($wrong_properties) > 0) throw new Exception("Das Attribut '" . reset($wrong_properties) . "' ist nicht erlaubt bei <" . $feature->getName() . ">. Erlaubt sind: '" . implode("', '", $allowed_properties) . "'.");


@@ -90,7 +90,7 @@ function xml_to_json_features($input) {
                }
                // line
                if ($is_line) {
                }
                // line
                if ($is_line) {

-                       $properties = array('type' => $line_type[$feature->getName()]);
+                       $properties = array('type' => $feature->getName());

                        $allowed_properties = array('farbe', 'dicke');
                        $wrong_properties = array_diff($given_properties, $allowed_properties);
                        if (count($wrong_properties) > 0) throw new Exception("Das Attribut '" . reset($wrong_properties) . "' ist nicht erlaubt bei <" . $feature->getName() . ">. Erlaubt sind: '" . implode("', '", $allowed_properties) . "'.");
                        $allowed_properties = array('farbe', 'dicke');
                        $wrong_properties = array_diff($given_properties, $allowed_properties);
                        if (count($wrong_properties) > 0) throw new Exception("Das Attribut '" . reset($wrong_properties) . "' ist nicht erlaubt bei <" . $feature->getName() . ">. Erlaubt sind: '" . implode("', '", $allowed_properties) . "'.");


@@ -126,31 +126,27 @@ class WrBaseMap {
                $tagname = strtolower(get_called_class()); // either wrmap or wrgmap
                assert(in_array($tagname, array('wrmap', 'wrgmap')));
 
                $tagname = strtolower(get_called_class()); // either wrmap or wrgmap
                assert(in_array($tagname, array('wrmap', 'wrgmap')));
 

-               // Get center and zoom level from $args // TODO: What happens if the values are no correct e.g. float?
-               if (isset($args['lat'])) $latitude = floatval($args['lat']); else $latitude = 47.267648;   // latitude as float value
-               if (isset($args['lon'])) $longitude = floatval($args['lon']); else $longitude = 11.404655; // longitude as float value
-               if (isset($args['zoom'])) $zoom = intval($args['zoom']); else $zoom = 10; // Google Zoom Level
-               if (isset($args['width'])) $width = intval($args['width']); else $width = null; // null corresponds to 100%
-               if (isset($args['height'])) $height = intval($args['height']); else $height = 450;
-               $latitude_s = sprintf('%.6F', $latitude);
-               $longitude_s = sprintf('%.6F', $longitude);
-               $width_s = is_null($width) ? '100%' : $width . 'px';
-               $height_s = $height . 'px';
-               $show_sledruns = ($tagname == 'wrgmap');
-

                $parserOutput = $parser->getOutput();
                $parserOutput->addHeadItem('<script type="text/javascript" src="http://maps.google.com/maps/api/js?v=3.8&amp;sensor=false"></script>', 'googlemaps');
                $parserOutput->addModules('ext.wrmap');
                $parserOutput = $parser->getOutput();
                $parserOutput->addHeadItem('<script type="text/javascript" src="http://maps.google.com/maps/api/js?v=3.8&amp;sensor=false"></script>', 'googlemaps');
                $parserOutput->addModules('ext.wrmap');

-               
-               $json_features = array();

 
                // append all sledruns as icon
 
                // append all sledruns as icon

+               $json_features = array();
+               $show_sledruns = ($tagname == 'wrgmap');

                if ($show_sledruns) {
                        $json_features = array_merge($json_features, sledruns_to_json_features());
                }
 
                if ($show_sledruns) {
                        $json_features = array_merge($json_features, sledruns_to_json_features());
                }
 

-               // append all elements in the XML

                try {
                try {

+                       // map properties
+                       $properties = array();
+                       if (isset($args['lat'])) $properties['lat'] = (float) $args['lat']; // latitude as float value
+                       if (isset($args['lon'])) $properties['lon'] = (float) $args['lon']; // longitude as float value
+                       if (isset($args['zoom'])) $properties['zoom'] = (int) $args['zoom']; // zoom as int value
+                       if (isset($args['width'])) $properties['width'] = (int) $args['width']; // width as int value
+                       if (isset($args['height'])) $properties['height'] = (int) $args['height']; // height as int value
+
+                       // append all elements in the XML

                        $json_features = array_merge($json_features, xml_to_json_features('<wrmap>' . $content . '</wrmap>'));
                } catch (Exception $e) {
                        return '<div class="error">' . htmlspecialchars("Fehler beim Parsen der Landkarte: " . $e->getMessage()) . '</div>';
                        $json_features = array_merge($json_features, xml_to_json_features('<wrmap>' . $content . '</wrmap>'));
                } catch (Exception $e) {
                        return '<div class="error">' . htmlspecialchars("Fehler beim Parsen der Landkarte: " . $e->getMessage()) . '</div>';


@@ -159,13 +155,16 @@ class WrBaseMap {
                // create final geojson
                $json = array(
                        'type' => 'FeatureCollection',
                // create final geojson
                $json = array(
                        'type' => 'FeatureCollection',

-                       'features' => $json_features
+                       'features' => $json_features,
+                       'properties' => $properties

                );
                $json_string = json_encode($json);
 
                // Create <div/> element where the map is placed in
                global $wgExtensionAssetsPath;
                );
                $json_string = json_encode($json);
 
                // Create <div/> element where the map is placed in
                global $wgExtensionAssetsPath;

-               $output = "<div class=\"wrmap\" style=\"width: $width_s; height: $height_s; border-style:none;\" data-center-lon=\"$longitude_s\" data-center-lat=\"$latitude_s\" data-zoom=\"$zoom\" data-img-path=\"$wgExtensionAssetsPath/wrmap/openlayers/img/\">";
+               $width_s = (isset($properties['width'])) ? (string) $properties['width'] . 'px' : '100%';
+               $height_s = (isset($properties['height']) ? (string) $properties['height'] : 450) . 'px';
+               $output = "<div class=\"wrmap\" style=\"width: $width_s; height: $height_s; border-style:none;\" data-img-path=\"$wgExtensionAssetsPath/wrmap/openlayers/img/\">";

                $output .= "<script type=\"application/json\">";
                $output .= htmlspecialchars($json_string, ENT_NOQUOTES);
                $output .= "</script>";
                $output .= "<script type=\"application/json\">";
                $output .= htmlspecialchars($json_string, ENT_NOQUOTES);
                $output .= "</script>";