GeoJSON is used now by the .php scripts to embed the map in the html page.

Javascript is not changed yet.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/mediawiki_extensions/wrmap/trunk@1496 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wrmap.body.php b/wrmap.body.php
index c4e3d9e7b219e45ee11ce4320e037cc7a08db456..5f43adc683c115a162573ecb882f066c0ef26154 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -1,5 +1,115 @@
 <?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 coordinate pairs, e.g.
+// 47.12 N 11.87 E
+// 47.13 N 11.70 E
+// ->
+// array(array(47.12, 11.87), array(47.13, 11.70))
+function geo_to_coordinates($input) {
+       $matches = array();
+       $num_matches = preg_match_all('/(\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[1][$i]), floatval($matches[2][$i]));
+       }
+       return $result;
+}
+
+
+// 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']);
+               $title_text = $title->getText();
+               $title_url = $title->getLocalUrl();
+               $condition = $sledrun['condition'];
+               if (!is_null($condition)) $condition = intval($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
+                       )
+               );
+               $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
+       $json_features = array(); // output
+       foreach ($xml as $feature) {
+               // point
+               if (in_array($feature->getName(), array('gasthaus', 'haltestelle', 'parkplatz', 'punkt'))) {
+                       $wiki = array_get('wiki', $feature, null);
+                       $name = array_get('name', $feature, null);
+                       $json_feature = array(
+                               'type' => 'feature',
+                               'geometry' => array(
+                                       'type' => 'Point',
+                                       'coordinates' => geo_to_coordinates($feature)[0]
+                               ),
+                               'properties' => array(
+                                       'type' => $feature->getName(),
+                                       'name' => $name,
+                                       'wiki' => $wiki
+                               )
+                       );
+                       $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);
+                       $json_feature = array(
+                               'type' => 'feature',
+                               'geometry' => array(
+                                       'type' => 'LineString',
+                                       'coordinates' => geo_to_coordinates($feature)
+                               ),
+                               'properties' => array(
+                                       'type' => $feature->getName(),
+                                       'color' => $color,
+                                       'thickness' => $thickness
+                               )
+                       );
+                       $json_features[] = $json_feature;
+               }
+       }
+       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() toes not provide an argument
@@ -12,7 +122,7 @@ class WrBaseMap {
        public static function render($content, $args, $parser, $frame) {
                // Unfortunately, $tagname is no argument of this function, therefore we have to use a trick with derived classes.
                $tagname = strtolower(get_called_class()); // either wrmap or wrgmap
-               assert(in_array($tagname, 'wrmap', '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
@@ -24,35 +134,39 @@ class WrBaseMap {
                $longitude_s = sprintf('%.6F', $longitude);
                $width_s = is_null($width) ? '100%' : $width . 'px';
                $height_s = $height . 'px';
+               $show_sledruns = ($tagname == 'wrgmap');
 
-               // Query database
-               $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')));
-               $sledruns = array();
-               while ($sledrun = $dbr->fetchRow($res)) $sledruns[] = $sledrun;
-               $dbr->freeResult($res);
-               
                $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
+               if ($show_sledruns) {
+                       $json_features = array_merge($json_features, sledruns_to_json_features());
+               }
+
+               // append all elements in the XML
+               try {
+                       $json_features = array_merge($json_features, xml_to_json_features('<wrmap>' . $content . '</wrmap>'));
+               } catch (Exception $e) {
+                       return htmlspecialchars($e);
+               }
+
+               // create final geojson
+               $json = array(
+                       'type' => 'FeatureCollection',
+                       'features' => $json_features
+               );
+               $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/\">\n";
-
-               // create layeer showing sledruns as icons (note: why not use WFS?)
-               foreach ($sledruns as $sledrun) {
-                       $lat = $sledrun['position_latitude'];
-                       $lon = $sledrun['position_longitude'];
-                       if (!$lat || !$lon) continue;
-                       $title = Title::newFromText($sledrun['page_title']);
-                       $title_text = htmlspecialchars($title->getText());
-                       $title_url = htmlspecialchars($title->getLocalUrl());
-                       $output .= "<p data-lon=\"$lon\" data-lat=\"$lat\" data-title=\"$title_text\" data-url=\"$title_url\" ";
-                       if (!is_null($sledrun['date_report'])) $output .= "data-date_report=\"{$sledrun['date_report']}\" ";
-                       if (!is_null($sledrun['condition'])) $output .= "data-condition=\"{$sledrun['condition']}\" ";
-                       $output .= "/>\n";
-               }
+               $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/\">";
+               $output .= "<script type=\"application/json\">";
+               $output .= htmlspecialchars($json_string, ENT_NOQUOTES);
+               $output .= "</script>";
                $output .= "</div>\n";
                
                return $output;

diff --git a/wrmap.php b/wrmap.php
index 543637ffdbbe709f5ad615e7ebe2e4b877f7698f..4a0f481ac79d240f9abd7e81135eabafee9d710d 100644 (file)
--- a/wrmap.php
+++ b/wrmap.php
@@ -93,13 +93,14 @@ $wgResourceModules['ext.wrmap'] = array(
 
 
 $wgAutoloadClasses['WrMap'] = dirname(__FILE__) . '/wrmap.body.php';
+$wgAutoloadClasses['WrGMap'] = $wgAutoloadClasses['WrMap'];
 
 
 $wgHooks['ParserFirstCallInit'][] = 'wrMapParserFirstCallInit';
 
 
 function wrMapParserFirstCallInit($parser) {
-       $parser->setHook('wrgmap', 'WrMap::render');
+       $parser->setHook('wrgmap', 'WrGMap::render');
        $parser->setHook('wrmap', 'WrMap::render');
        return true;
 }