X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/mediawiki_extensions/wrmap.git/blobdiff_plain/7faf2f18e28ae68cfa491ec6fe3e26279fac6e98..6d6fba003a800252f3d724f53e3b7a13b3ea5bab:/wrmap.body.php?ds=sidebyside
diff --git a/wrmap.body.php b/wrmap.body.php
index 1fdc823..36cba2d 100644
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -1,9 +1,52 @@
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 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));
+ }
}
@@ -14,11 +57,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 +80,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['date_report'] = $sledrun['date_report'];
+ if (!is_null($sledrun['condition'])) $properties['condition'] = 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;
}
@@ -66,41 +103,75 @@ 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 and 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');
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_merge($point_types, $line_types)) . '>.');
+ }
+
// 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) {
+ $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.');
$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'])) {
+ $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(
'type' => 'LineString',
'coordinates' => geo_to_coordinates($feature)
),
- 'properties' => array(
- 'type' => $feature->getName(),
- 'color' => $color,
- 'thickness' => $thickness
- )
+ 'properties' => $properties
);
$json_features[] = $json_feature;
}
@@ -124,52 +195,47 @@ 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('', '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('' . $content . ''));
} catch (Exception $e) {
- return htmlspecialchars($e);
+ return '' . htmlspecialchars("Fehler beim Parsen der Landkarte: " . $e->getMessage()) . '
';
}
// create final geojson
$json = array(
'type' => 'FeatureCollection',
- 'features' => $json_features
+ 'features' => $json_features,
+ 'properties' => $properties
);
$json_string = json_encode($json);
// Create element where the map is placed in
global $wgExtensionAssetsPath;
- $output = "";
- $output .= "";
$output .= "
\n";
- return $output;
+ return array($output, 'markerType' => 'nowiki');
}
}