Now rendering JSON map stored in the wiki.

[philipp/winterrodeln/wradmin.git] / wradmin / template_helper.py

diff --git a/wradmin/template_helper.py b/wradmin/template_helper.py
index b9c1dda9edaf10c0be36a833ba5554a60dc4fd45..f0e9ac0a5d2823f88dee36c9609244f2e9b99782 100644 (file)
--- a/wradmin/template_helper.py
+++ b/wradmin/template_helper.py
@@ -1,9 +1,10 @@
-from typing import List
+from typing import List, Dict

 from urllib.parse import quote_plus
 
 from flask import url_for, current_app
 import wrpylib.wrvalidators
 from wrpylib.mwmarkup import create_template
 from urllib.parse import quote_plus
 
 from flask import url_for, current_app
 import wrpylib.wrvalidators
 from wrpylib.mwmarkup import create_template

+from wrpylib.wrmwmarkup import create_wrmap

 from wrpylib.wrvalidators import LonLat, lonlat_to_str
 
 
 from wrpylib.wrvalidators import LonLat, lonlat_to_str
 
 


@@ -38,12 +39,30 @@ class PylonsHelper:
             url += '&action=raw'
         return url
 
             url += '&action=raw'
         return url
 

-    def sledrun_json_url(self, page_title, raw: bool = True):
-        url = f'{self.mediawiki_index_url()}?title={quote_plus(page_title)}/Rodelbahn.json'
+    def sledrun_json_title(self, page_title: str) -> str:
+        return f'{page_title}/Rodelbahn.json'
+
+    def sledrun_json_url(self, page_title, raw: bool = True) -> str:
+        json_page_title = self.sledrun_json_title(page_title)
+        url = f'{self.mediawiki_index_url()}?title={quote_plus(json_page_title)}'

         if raw:
             url += '&action=raw'
         return url
 
         if raw:
             url += '&action=raw'
         return url
 

+    def sledrun_map_title(self, page_title: str) -> str:
+        return f'{page_title}/Landkarte.json'
+
+    def sledrun_map_url(self, page_title, raw: bool = True) -> str:
+        map_page_title = self.sledrun_map_title(page_title)
+        url = f'{self.mediawiki_index_url()}?title={quote_plus(map_page_title)}'
+        if raw:
+            url += '&action=raw'
+        print(url)
+        return url
+
+    def create_wrmap(self, geojson: Dict) -> str:
+        return create_wrmap(geojson)
+

     def google_maps(self, latitude, longitude):
         """Builds an URL like http://maps.google.at/maps?q=47.200607,11.260007"""
         return "https://maps.google.at/maps?q=%.6f,%.6f" % (latitude, longitude)
     def google_maps(self, latitude, longitude):
         """Builds an URL like http://maps.google.at/maps?q=47.200607,11.260007"""
         return "https://maps.google.at/maps?q=%.6f,%.6f" % (latitude, longitude)