Now rendering JSON map stored in the wiki.

[philipp/winterrodeln/wradmin.git] / wradmin / controllers / rodelbahn.py

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index b0a2e00bbe4c360fcd9cd3216e8f144dbe556c7c..017da740225f4a1efabb851289fd3d725650c588 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -1,6 +1,6 @@
 import json
 import subprocess
-import urllib.request
+import urllib.request, urllib.error
 from collections import OrderedDict
 from typing import Optional, Tuple, List
 
@@ -16,7 +16,7 @@ from wradmin.model import WrSledrunCache, WrReport
 from wradmin.template_helper import PylonsHelper
 from wrpylib.wrvalidators import rodelbahnbox_to_str, LonLat, difficulty_german_from_str, \
     avalanches_german_from_str, public_transport_german_from_str, opt_tristate_german_comment_from_str, \
-    nightlightdays_from_str, lonlat_none
+    nightlightdays_from_str
 
 
 class RodelbahnController:
@@ -51,25 +51,35 @@ class RodelbahnController:
             abort(404)
         h = PylonsHelper()
         sledrun_json_url = h.sledrun_json_url(sledrun.page_title)
-        sledrun_json_page = urllib.request.urlopen(sledrun_json_url)
+        sledrun_json_page = urllib.request.urlopen(sledrun_json_url)  # might raise urllib.error.HTTPError
         sledrun_json_str = sledrun_json_page.read()
         sledrun_json = json.loads(sledrun_json_str)
 
+        sledrun_map_json = None
+        sledrun_map_url = h.sledrun_map_url(sledrun.page_title)
+        try:
+            sledrun_map_page = urllib.request.urlopen(sledrun_map_url)
+            sledrun_map_str = sledrun_map_page.read()
+            sledrun_map_json = json.loads(sledrun_map_str)
+        except urllib.error.HTTPError as e:
+            if e.code != 404:  # accept "not found" as map not being present
+                raise
+
         def markdown_to_mediawiki(markdown: str) -> str:
             return subprocess.check_output(['pandoc', '--to', 'mediawiki'], input=markdown, encoding='utf-8')
 
-        def position_to_lon_lat(value: Optional[dict]) -> LonLat:
+        def position_to_lon_lat(value: Optional[dict]) -> Optional[LonLat]:
             if value is not None:
                 lon = value.get('longitude')
                 lat = value.get('latitude')
                 if lon is not None and lat is not None:
                     return LonLat(lon, lat)
-            return lonlat_none
+            return None
 
-        def position_ele_to_lon_lat(value: Optional[dict]) -> LonLat:
+        def position_ele_to_lon_lat(value: Optional[dict]) -> Optional[LonLat]:
             if value is not None:
                 return position_to_lon_lat(value.get("position"))
-            return lonlat_none
+            return None
 
         def position_ele_to_ele(value: Optional[dict]) -> Optional[int]:
             if value is not None:
@@ -150,7 +160,8 @@ class RodelbahnController:
         rodelbahnbox = rodelbahnbox_to_str(sledrun_rbb_json)
         return render_template('rodelbahn_view_wikitext.html', sledrun=sledrun, sledrun_json=sledrun_json,
                                rodelbahnbox=rodelbahnbox, description=description, night_light=night_light,
-                               sled_rental_description=sled_rental_description, operator=betreiber())
+                               sled_rental_description=sled_rental_description, operator=betreiber(),
+                               sledrun_map_json=sledrun_map_json)
 
     def json_edit(self, sledrun_id):
         q = db.session.query(WrSledrunCache)