Handle new, different way to specify an empty LonLat.

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

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index b0a2e00bbe4c360fcd9cd3216e8f144dbe556c7c..cd75bbe9ef8b608d5151b9603497161d6084588d 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -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, \
 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:
 
 
 class RodelbahnController:


@@ -58,18 +58,18 @@ class RodelbahnController:
         def markdown_to_mediawiki(markdown: str) -> str:
             return subprocess.check_output(['pandoc', '--to', 'mediawiki'], input=markdown, encoding='utf-8')
 
         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)
             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"))
             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:
 
         def position_ele_to_ele(value: Optional[dict]) -> Optional[int]:
             if value is not None: