Added DOM helper classes that were copied from the wrreport extension.

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

diff --git a/wrmap.body.php b/wrmap.body.php
index 8bb75f12b7638b55ef6bad4d0cbd9432a19109cd..36cba2d0366b617bdac4e37b180428adc12e78ef 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -1,5 +1,55 @@
 <?php
 
+// DOM helper classes
+// ------------------
+
+// The following two classes are "duplicated" from the wrreport extension to keep them separate.
+// Put improvements in both classes.
+class WrMapDOMDocument extends DOMDocument {
+       function __construct() {
+               parent::__construct('1.0', 'utf-8');
+               $this->registerNodeClass('DOMElement', 'WrMapDOMElement');
+       }
+
+       /// Creates and adds the element with the given tag name and returns it.
+       /// Additionally, it calls setAttribute($key, $value) for every entry
+       /// in $attributes.
+       function appendElement($tagName, $attributes=array()) {
+               $child = $this->appendChild($this->createElement($tagName));
+               foreach ($attributes as $key => $value) $child->setAttribute($key, $value);
+               return $child;
+       }
+
+}
+class WrMapDOMElement extends DOMElement {
+
+       /// Creates and adds the element with the given tag name and returns it
+       /// Additionally, it calls setAttribute($key, $value) for every entry
+       /// in $attributes.
+       function appendElement($tagName, $attributes=array()) {
+               $child = $this->appendChild($this->ownerDocument->createElement($tagName));
+               foreach ($attributes as $key => $value) $child->setAttribute($key, $value);
+               return $child;
+       }
+
+       /// Adds any UTF-8 string as content of the element - it will be escaped.
+       function appendText($text) {
+               return $this->appendChild($this->ownerDocument->createTextNode($text));
+       }
+
+       // Appends a CDATASections to the element. This can be used to include
+       // raw (unparsed) HTML to the DOM tree as it is necessary because
+       // $parser->recursiveTagParse does not always escape & characters.
+       // (see https://bugzilla.wikimedia.org/show_bug.cgi?id=55526 )
+       // Workaround: Use a CDATA section. When serializing with $doc->saveHTML,
+       // the <![CDATA[...]]> is returned as ... .
+       // However, we end up having unescaped & in the output due to this bug in recursiveTagParse.
+       function appendCDATA($data) {
+               return $this->appendChild($this->ownerDocument->createCDATASection($data));
+       }
+}
+
+
 // 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
@@ -31,8 +81,8 @@ function sledruns_to_json_features() {
                $lon = floatval($lon);
                $title = Title::newFromText($sledrun['page_title']);
                $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']);
+               if (!is_null($sledrun['date_report'])) $properties['date_report'] = $sledrun['date_report'];
+               if (!is_null($sledrun['condition'])) $properties['condition'] = intval($sledrun['condition']);
                $json_feature = array(
                        'type' => 'feature',
                        'geometry' => array(
@@ -53,6 +103,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 +118,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
@@ -177,13 +231,11 @@ class WrBaseMap {
 
                // Create <div/> element where the map is placed in
                global $wgExtensionAssetsPath;
-               $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 = "<div class=\"wrmap\" style=\"border-style:none;\" data-img-path=\"$wgExtensionAssetsPath/wrmap/openlayers/img/\">";
                $output .= htmlspecialchars($json_string, ENT_NOQUOTES);
                $output .= "</div>\n";
                
-               return $output;
+               return array($output, 'markerType' => 'nowiki');
        }
 }