]> ToastFreeware Gitweb - philipp/winterrodeln/mediawiki_extensions/wrmap.git/blobdiff - wrmap.body.php
Rename "properties" of geojson to "wr_properties".
[philipp/winterrodeln/mediawiki_extensions/wrmap.git] / wrmap.body.php
index d5afd97ea4f7cf2c0fed13949e48a13c565a6cac..fa4bd4162854de91a9d3de413e5ade176ef3cb41 100644 (file)
@@ -1,4 +1,6 @@
 <?php
+use MediaWiki\MediaWikiServices;
+
 
 // DOM helper classes
 // ------------------
@@ -14,7 +16,7 @@ class WrMapDOMDocument extends DOMDocument {
        /// 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()) {
+       function appendElement(string $tagName, $attributes=array()): WrMapDOMElement {
                $child = $this->appendChild($this->createElement($tagName));
                foreach ($attributes as $key => $value) $child->setAttribute($key, $value);
                return $child;
@@ -27,14 +29,14 @@ 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()) {
+       function appendElement(string $tagName, $attributes=array()): WrMapDOMElement {
                $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) {
+       function appendText(string|NULL $text) {
                return $this->appendChild($this->ownerDocument->createTextNode($text));
        }
 
@@ -75,31 +77,30 @@ class WrBaseMap {
        /// Takes a page title from the wiki and returns an image (if available)
        /// or Null. For image wiki pages, the image is the corresponding image,
        /// for inns it's the image of the "Gasthausbox".
-       public static function wikipage_to_image($title, $width) {
+       public static function wikipage_to_image(Title $title, int $width) {
                $file = false; // File class or false
                // for NS_FILE titles, use the corresponding file as image
-               if ($title->getNamespace() == NS_FILE) {
-                       $file = wfFindFile($title); // $file is a mediawiki File class or false
+               if ($title->inNamespace(NS_FILE)) {
+                       $file = MediaWikiServices::getInstance()->getRepoGroup()->findFile($title); // $file is a mediawiki File class or false
                } else {
+                       $lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
                        $categories = $title->getParentCategories(); // e.g. array('Kategorie:Rodelbahn' => 'Juifenalm')
-                       global $wgContLang;
+                       $wgContLang = MediaWikiServices::getInstance()->getContentLanguage();
                        $key_sledrun = $wgContLang->getNSText(NS_CATEGORY) . ':Rodelbahn';
                        if (array_key_exists($key_sledrun, $categories)) {
                                // for sledrun titles use the image from the rodelbahnbox
-                               $dbr = wfGetDB(DB_SLAVE);
+                               $dbr = $lb->getConnection( DB_REPLICA );
                                $res = $dbr->select('wrsledruncache', 'image', array('page_id' => $title->getArticleID()), __METHOD__);
-                               $image = $dbr->fetchRow($res);
-                               if ($image && !is_null($image['image'])) $file = wfFindFile($image['image']);
-                               $dbr->freeResult($res);
+                               $image = $res->fetchRow();
+                               if ($image && !is_null($image['image'])) $file = MediaWikiServices::getInstance()->getRepoGroup()->findFile($image['image']);
                        }
                        $key_inn = $wgContLang->getNSText(NS_CATEGORY) . ':Gasthaus';
                        if (array_key_exists($key_inn, $categories)) {
                                // for inn titles use the image from the gasthausbox
-                               $dbr = wfGetDB(DB_SLAVE);
+                               $dbr = $lb->getConnection( DB_REPLICA );
                                $res = $dbr->select('wrinncache', 'image', array('page_id' => $title->getArticleID()), __METHOD__);
-                               $image = $dbr->fetchRow($res);
-                               if ($image && !is_null($image['image'])) $file = wfFindFile($image['image']);
-                               $dbr->freeResult($res);
+                               $image = $res->fetchRow();
+                               if ($image && !is_null($image['image'])) $file = MediaWikiServices::getInstance()->getRepoGroup()->findFile($image['image']);
                        }
                }
                if ($file === false) return Null;
@@ -110,26 +111,27 @@ class WrBaseMap {
        }
 
 
-       // convert sledruns to geojson (http://www.geojson.org/geojson-spec.html)
+       // convert sledruns to geojson (https://datatracker.ietf.org/doc/html/rfc7946)
        // Returns an array of features
        public static function sledruns_to_json_features() {
                $json_features = array(); // result
-               $dbr = wfGetDB(DB_SLAVE);
+               $lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
+               $dbr = $lb->getConnection( DB_REPLICA );
                $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)) {
+               while ($sledrun = $res->fetchRow()) {
                        $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());
+                       $properties = array('type' => 'sledrun', 'name' => $title->getText(), 'wiki' => $sledrun['page_title']);
                        if (!is_null($sledrun['date_report'])) $properties['date_report'] = $sledrun['date_report'];
                        if (!is_null($sledrun['condition'])) $properties['condition'] = intval($sledrun['condition']);
                        $image_url = WrBaseMap::wikipage_to_image($title, 150);
                        if (!is_null($image_url)) $properties['thumb_url'] = $image_url;
                        $json_feature = array(
-                               'type' => 'feature',
+                               'type' => 'Feature',
                                'geometry' => array(
                                        'type' => 'Point',
                                        'coordinates' => array($lon, $lat)
@@ -138,7 +140,6 @@ class WrBaseMap {
                        );
                        $json_features[] = $json_feature;
                }
-               $dbr->freeResult($res);
                return $json_features;
        }
 
@@ -176,7 +177,6 @@ class WrBaseMap {
                                        $propval = (string) $feature[$property];
                                        if ($property == 'wiki') {
                                                $title = Title::newFromText($propval);
-                                               $propval = $title->getLocalUrl();
                                                $file_url = WrBaseMap::wikipage_to_image($title, 200);
                                                if (!is_null($file_url)) $properties['thumb_url'] = $file_url;
                                        }
@@ -185,7 +185,7 @@ class WrBaseMap {
                                $coordinates = WrBaseMap::geo_to_coordinates($feature);
                                if (count($coordinates) != 1) throw new Exception(wfMessage('wrmap-error-coordinate-count', $feature->getName())->text());
                                $json_feature = array(
-                                       'type' => 'feature',
+                                       'type' => 'Feature',
                                        'geometry' => array(
                                                'type' => 'Point',
                                                'coordinates' => reset($coordinates)
@@ -202,7 +202,7 @@ class WrBaseMap {
                                if (count($wrong_properties) > 0) throw new Exception(wfMessage('wrmap-error-invalid-attribute',  reset($wrong_properties), $feature->getName(), "'" . implode("', '", $allowed_properties) . "'")->text());
                                if (isset($feature['farbe'])) {
                                        $color = (string) $feature['farbe']; // e.g. #a200b7
-                                       if (preg_match('/^#[0-9a-f]{6}$/i', $color) != 1) 
+                                       if (preg_match('/^#[0-9a-f]{6}$/i', $color) != 1)
                                                throw new Exception(wfMessage('wrmap-error-line-color')->text());
                                        $properties['strokeColor'] = $color;
                                }
@@ -213,7 +213,7 @@ class WrBaseMap {
                                        $properties['strokeWidth'] = $stroke_width;
                                }
                                $json_feature = array(
-                                       'type' => 'feature',
+                                       'type' => 'Feature',
                                        'geometry' => array(
                                                'type' => 'LineString',
                                                'coordinates' => WrBaseMap::geo_to_coordinates($feature)
@@ -241,8 +241,7 @@ class WrBaseMap {
                assert(in_array($tagname, array('wrmap', 'wrgmap')));
 
                $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');
+               $parserOutput->addModules(array('ext.wrmap'));
 
                // append all sledruns as icon
                $json_features = array();
@@ -272,30 +271,38 @@ class WrBaseMap {
                $json = array(
                        'type' => 'FeatureCollection',
                        'features' => $json_features,
-                       'properties' => $properties
+                       'wr_properties' => $properties
                );
                $json_string = json_encode($json);
 
                // Create <div/> element where the map is placed in
                global $wgExtensionAssetsPath;
                $doc = new WrMapDOMDocument();
-               $div = $doc->appendElement('div', array('class' => 'wrmap', 'style' => 'border-style:none;', 'data-ext-path' => "$wgExtensionAssetsPath/wrmap"));
+               $div_map = $doc->appendElement('div', array('class' => 'wrmap', 'style' => 'border-style:none;', 'data-ext-path' => "$wgExtensionAssetsPath/wrmap"));
                // progress message
-               $div->appendElement('div', array())->appendText(wfMessage('wrmap-loading')->text());
+               $div_map->appendElement('div', array())->appendText(wfMessage('wrmap-loading')->text());
                // data
-               $div->appendElement('div', array('style' => 'height: 0px; display:none;'))->appendText($json_string);
-               return array($doc->saveHTML($div), 'markerType' => 'nowiki');
+               $div_map->appendElement('div', array('style' => 'height: 0px; display:none;'))->appendText($json_string);
+               return array($doc->saveHTML($div_map), 'markerType' => 'nowiki');
        }
 }
 
 
 // <wrmap> tag
 class WrMap extends WrBaseMap {
+       public static function onParserFirstCallInit(Parser $parser) {
+               $parser->setHook('wrmap', 'WrMap::render');
+               return true;
+       }
 }
 
 
 // <wrgmap> tag
 class WrGMap extends WrBaseMap {
+       public static function onParserFirstCallInit(Parser $parser) {
+               $parser->setHook('wrgmap', 'WrGMap::render');
+               return true;
+       }
 }
 
 ?>