Moved global functions belonging to that extension to the WrBaseMap class.
authorphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Sun, 3 Nov 2013 12:18:55 +0000 (12:18 +0000)
committerphilipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Sun, 3 Nov 2013 12:18:55 +0000 (12:18 +0000)
git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/mediawiki_extensions/wrmap/trunk@1780 7aebc617-e5e2-0310-91dc-80fb5f6d2477

wrmap.body.php

index e4d03202054c9d36d60ae397cdbc188350b391d4..059eab5bc605bf6d9bd2679235ad629a9234edda 100644 (file)
@@ -19,8 +19,9 @@ class WrMapDOMDocument extends DOMDocument {
                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
@@ -50,140 +51,142 @@ class WrMapDOMElement extends DOMElement {
 }
 
 
-// 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
-// ->
-// array(array(11.87, 47.12), array(11.70, 47.13))
-function geo_to_coordinates($input) {
-       $matches = array();
-       $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;
-}
-
+// WrBaseMap
+// ---------
 
-// convert sledruns to geojson (http://www.geojson.org/geojson-spec.html)
-// Returns an array of features
-function sledruns_to_json_features() {
-       $json_features = array(); // result
-       $dbr = wfGetDB(DB_SLAVE);
-       $res = $dbr->select(array('wrsledruncache', 'wrreportcache'), array('wrsledruncache.page_title', 'position_latitude', 'position_longitude', 'date_report', '`condition`'), array('show_in_overview', 'not under_construction'), __METHOD__, array(), array('wrreportcache' => array('left outer join', 'wrsledruncache.page_id=wrreportcache.page_id')));
-       while ($sledrun = $dbr->fetchRow($res)) {
-               $lat = $sledrun['position_latitude'];
-               $lon = $sledrun['position_longitude'];
-               if (is_null($lat) || is_null($lon)) continue;
-               $lat = floatval($lat);
-               $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['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' => $properties
-               );
-               $json_features[] = $json_feature;
-       }
-       $dbr->freeResult($res);
-       return $json_features;
-}
-
-
-// convert XML to geojson (http://www.geojson.org/geojson-spec.html)
-// Returns an array of 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) . '".');
+class WrBaseMap {
+       // 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
+       // ->
+       // array(array(11.87, 47.12), array(11.70, 47.13))
+       public static function geo_to_coordinates($input) {
+               $matches = array();
+               $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;
        }
-       $json_features = array(); // output
-       $point_types = array('gasthaus', 'haltestelle', 'parkplatz', 'achtung', 'foto', '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 ($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.');
+       // convert sledruns to geojson (http://www.geojson.org/geojson-spec.html)
+       // Returns an array of features
+       public static function sledruns_to_json_features() {
+               $json_features = array(); // result
+               $dbr = wfGetDB(DB_SLAVE);
+               $res = $dbr->select(array('wrsledruncache', 'wrreportcache'), array('wrsledruncache.page_title', 'position_latitude', 'position_longitude', 'date_report', '`condition`'), array('show_in_overview', 'not under_construction'), __METHOD__, array(), array('wrreportcache' => array('left outer join', 'wrsledruncache.page_id=wrreportcache.page_id')));
+               while ($sledrun = $dbr->fetchRow($res)) {
+                       $lat = $sledrun['position_latitude'];
+                       $lon = $sledrun['position_longitude'];
+                       if (is_null($lat) || is_null($lon)) continue;
+                       $lat = floatval($lat);
+                       $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['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' => reset($coordinates)
+                                       'coordinates' => array($lon, $lat)
                                ),
                                'properties' => $properties
                        );
                        $json_features[] = $json_feature;
                }
-               // line
-               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;
+               $dbr->freeResult($res);
+               return $json_features;
+       }
+
+
+       // convert XML to geojson (http://www.geojson.org/geojson-spec.html)
+       // Returns an array of features
+       public static 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', 'foto', '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)) . '>.');
                        }
-                       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;
+
+                       // point
+                       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 = WrBaseMap::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' => reset($coordinates)
+                                       ),
+                                       'properties' => $properties
+                               );
+                               $json_features[] = $json_feature;
+                       }
+                       // line
+                       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' => WrBaseMap::geo_to_coordinates($feature)
+                                       ),
+                                       'properties' => $properties
+                               );
+                               $json_features[] = $json_feature;
                        }
-                       $json_feature = array(
-                               'type' => 'feature',
-                               'geometry' => array(
-                                       'type' => 'LineString',
-                                       'coordinates' => geo_to_coordinates($feature)
-                               ),
-                               'properties' => $properties
-                       );
-                       $json_features[] = $json_feature;
                }
+               return $json_features;
        }
-       return $json_features;
-}
 
 
-
-class WrBaseMap {
        /// Renders the <wrgmap> tag and the <wrmap> tag.
-       /// This class would be the only class needed but as the function render() does not provide an argument
+       /// The WrBaseMap class would be the only class needed but as the function render() does not provide an argument
        /// telling which tag name called the function, a trick with two inherited classes has to be used.
        /// @param $content string - the content of the <wrgmap> tag
        /// @param $args array - the array of attribute name/value pairs for the tag
@@ -203,7 +206,7 @@ class WrBaseMap {
                $json_features = array();
                $show_sledruns = ($tagname == 'wrgmap');
                if ($show_sledruns) {
-                       $json_features = array_merge($json_features, sledruns_to_json_features());
+                       $json_features = array_merge($json_features, WrBaseMap::sledruns_to_json_features());
                }
 
                try {
@@ -216,7 +219,7 @@ class WrBaseMap {
                        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>'));
+                       $json_features = array_merge($json_features, WrBaseMap::xml_to_json_features('<wrmap>' . $content . '</wrmap>'));
                } catch (Exception $e) {
                        $doc = new WrMapDOMDocument();
                        $doc->appendElement('div', array('class' => 'error'))->appendText('Fehler beim Parsen der Landkarte: ' . $e->getMessage());