Now using the minimized version of OpenLayers.
[philipp/winterrodeln/mediawiki_extensions/wrmap.git] / wrmap.body.php
index 1fdc8234f855125ab81fd5a21e780caff9385131..8723f96c0304e18d7e45cd8bc7748acc1d899309 100644 (file)
@@ -1,12 +1,5 @@
 <?php
 
-// get value of key or default value if key does not exist
-function array_get($key, $array, $default) {
-       if (array_key_exists($key, $array)) return $array[$key];
-       return $default;
-}
-
-
 // gets coordinates and returns an array of lon/lat coordinate pairs, e.g.
 // 47.12 N 11.87 E
 // 47.13 N 11.70 E
@@ -14,11 +7,12 @@ function array_get($key, $array, $default) {
 // array(array(11.87, 47.12), array(11.70, 47.13))
 function geo_to_coordinates($input) {
        $matches = array();
-       $num_matches = preg_match_all('/(\d+\.?\d*)\s*N?\s+(\d+\.?\d*)\s*E?\s*/', $input, $matches);
+       $num_matches = preg_match_all('/\s*(\d+\.?\d*)\s*N?\s+(\d+\.?\d*)\s*E?\s*/', $input, $matches);
        $result = array();
        for ($i=0; $i!=$num_matches; ++$i) {
                $result[] = array(floatval($matches[2][$i]), floatval($matches[1][$i]));
        }
+       if (implode($matches[0]) != $input) throw new Exception('Falsches Koordinatenformat: ' . $input);
        return $result;
 }
 
@@ -36,23 +30,16 @@ function sledruns_to_json_features() {
                $lat = floatval($lat);
                $lon = floatval($lon);
                $title = Title::newFromText($sledrun['page_title']);
-               $title_text = $title->getText();
-               $title_url = $title->getLocalUrl();
-               $condition = $sledrun['condition'];
-               if (!is_null($condition)) $condition = intval($condition);
+               $properties = array('type' => 'sledrun', 'name' => $title->getText(), 'wiki' => $title->getLocalUrl());
+               if (!is_null($sledrun['date_report'])) $properties[] = $sledrun['date_report'];
+               if (!is_null($sledrun['condition'])) $properties[] = intval($sledrun['condition']);
                $json_feature = array(
                        'type' => 'feature',
                        'geometry' => array(
                                'type' => 'Point',
                                'coordinates' => array($lon, $lat)
                        ),
-                       'properties' => array(
-                               'type' => 'sledrun',
-                               'name' => $title_text,
-                               'wiki' => $title_url,
-                               'date_report' => $sledrun['date_report'],
-                               'condition' => $condition
-                       )
+                       'properties' => $properties
                );
                $json_features[] = $json_feature;
        }
@@ -67,40 +54,55 @@ 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
+       $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
+               $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 (in_array($feature->getName(), array('gasthaus', 'haltestelle', 'parkplatz', 'punkt'))) {
-                       $wiki = array_get('wiki', $feature, null);
-                       $name = array_get('name', $feature, null);
+               if ($is_point) {
+                       $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) . "'.");
+                       foreach ($given_properties as $property) {
+                               $properties[$property] = (string) $feature[$property];
+                       }
+                       $coordinates = geo_to_coordinates($feature);
+                       if (count($coordinates) != 1) throw new Exception('Das Element <' . $feature->getName() . '> muss genau ein Koordinatenpaar haben.');
                        $json_feature = array(
                                'type' => 'feature',
                                'geometry' => array(
                                        'type' => 'Point',
-                                       'coordinates' => geo_to_coordinates($feature)[0]
+                                       'coordinates' => reset($coordinates)
                                ),
-                               'properties' => array(
-                                       'type' => $feature->getName(),
-                                       'name' => $name,
-                                       'wiki' => $wiki
-                               )
+                               'properties' => $properties
                        );
                        $json_features[] = $json_feature;
                }
                // line
-               if (in_array($feature->getName(), array('rodelbahn', 'gehweg', 'alternative', 'lift', 'linie'))) {
-                       $color = array_get('farbe', $feature, null);
-                       $thickness = array_get('dicke', $feature, null);
+               if ($is_line) {
+                       $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) . "'.");
+                       if (isset($feature['farbe'])) $properties['strokeColor'] = (string) $feature['farbe']; // e.g. #a200b7 // TODO: Check
+                       if (isset($feature['dicke'])) $properties['strokeWidth'] = (int) $feature['dicke']; // e.g. 6 // TODO: Check
                        $json_feature = array(
                                'type' => 'feature',
                                'geometry' => array(
                                        'type' => 'LineString',
                                        'coordinates' => geo_to_coordinates($feature)
                                ),
-                               'properties' => array(
-                                       'type' => $feature->getName(),
-                                       'color' => $color,
-                                       'thickness' => $thickness
-                               )
+                               'properties' => $properties
                        );
                        $json_features[] = $json_feature;
                }
@@ -124,46 +126,45 @@ class WrBaseMap {
                $tagname = strtolower(get_called_class()); // either wrmap or wrgmap
                assert(in_array($tagname, array('wrmap', 'wrgmap')));
 
-               // Get center and zoom level from $args
-               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');
-               
-               $json_features = array();
 
                // 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());
                }
 
-               // append all elements in the XML
                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 htmlspecialchars($e);
+                       return '<div class="error">' . htmlspecialchars("Fehler beim Parsen der Landkarte: " . $e->getMessage()) . '</div>';
                }
 
                // 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;
-               $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>";