Tagged output with 'nowiki' to prevent further processing.

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

diff --git a/wrmap.body.php b/wrmap.body.php
index b4671c00438e071ebc7f559904186f5f5d994c32..278333f9816ce4ac6d34df1709864821b311867c 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -53,6 +53,10 @@ function sledruns_to_json_features() {
 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
+       $whitespace = (string) $xml; // everything between <wrmap> and </wrmap> that's not a sub-element
+       if (strlen($whitespace) > 0 && !ctype_space($whitespace)) { // there must not be anythin except sub-elements or whitespace
+               throw new Exception('Die Landkarte enthält folgenden ungültigen Text: "' . trim($xml) . '".');
+       }
        $json_features = array(); // output
        $point_types = array('gasthaus', 'haltestelle', 'parkplatz', 'achtung', 'punkt');
        $line_types = array('rodelbahn', 'gehweg', 'alternative', 'lift', 'anfahrt', 'linie');
@@ -64,7 +68,7 @@ function xml_to_json_features($input) {
                $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))) . '>.');
+                       throw new Exception('Unbekanntes Element <' . $feature->getName() . '>. Erlaubt sind: <' . implode('>, <', array_merge($point_types, $line_types)) . '>.');
                }
 
                // point
@@ -74,7 +78,12 @@ function xml_to_json_features($input) {
                        $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];
+                               $propval = (string) $feature[$property];
+                               if ($property == 'wiki') {
+                                       $title = Title::newFromText($propval);
+                                       $propval = $title->getLocalUrl();
+                               }
+                               $properties[$property] = $propval;
                        }
                        $coordinates = geo_to_coordinates($feature);
                        if (count($coordinates) != 1) throw new Exception('Das Element <' . $feature->getName() . '> muss genau ein Koordinatenpaar haben.');
@@ -94,8 +103,18 @@ function xml_to_json_features($input) {
                        $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
+                       if (isset($feature['farbe'])) {
+                               $color = (string) $feature['farbe']; // e.g. #a200b7
+                               if (preg_match('/^#[0-9a-f]{6}$/i', $color) != 1) 
+                                       throw new Exception('Die Farbangabe der Linie hat ein falsches Format. Sie muss z.B. so aussehen: #a200b7.');
+                               $properties['strokeColor'] = $color;
+                       }
+                       if (isset($feature['dicke'])) {
+                               $stroke_width = (int) $feature['dicke']; // e.g. 6
+                               if (((string) $stroke_width) !== (string) $feature['dicke'])
+                                       throw new Exception('Die Angabe der Liniendicke hat ein falsches Format. Sie muss eine ganze Zahl wie z.B. 6 sein.');
+                               $properties['strokeWidth'] = $stroke_width;
+                       }
                        $json_feature = array(
                                'type' => 'feature',
                                'geometry' => array(
@@ -162,15 +181,11 @@ class WrBaseMap {
 
                // Create <div/> element where the map is placed in
                global $wgExtensionAssetsPath;
-               $width_s = (isset($properties['width'])) ? $width . 'px' : '100%';
-               $height_s = (isset($properties['height']) ? $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 = "<div class=\"wrmap\" style=\"border-style:none;\" data-img-path=\"$wgExtensionAssetsPath/wrmap/openlayers/img/\">";
                $output .= htmlspecialchars($json_string, ENT_NOQUOTES);
-               $output .= "</script>";
                $output .= "</div>\n";
                
-               return $output;
+               return array($output, 'markerType' => 'nowiki');
        }
 }