Remove unused imports.

[philipp/winterrodeln/wrpylib.git] / wrpylib / wrmwmarkup.py

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index 4294393b237cdd0e528ce72f99b829f54dd26d01..2ab28d227efa0ef3ba64ad6141b54a153c48e706 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -3,7 +3,7 @@
 import re
 import xml.etree.ElementTree
 import collections
-from typing import Tuple, Optional, List
+from typing import Tuple, Optional, List, OrderedDict, Union
 
 from mwparserfromhell.nodes import Template
 
@@ -15,17 +15,29 @@ from wrpylib.wrvalidators import LonLat, opt_lonlat_from_str, opt_lonlat_to_str,
     opt_phone_comment_enum_to_str, lift_german_from_str, GASTHAUSBOX_DICT
 
 
-def sledrun_from_rodelbahnbox(value, sledrun):
+def split_lon_lat(value: Optional[LonLat]) -> Union[LonLat, Tuple[None, None]]:
+    if value is None:
+        return None, None
+    return value
+
+
+def join_lon_lat(lon: Optional[float], lat: Optional[float]) -> Optional[LonLat]:
+    if lon is None or lat is None:
+        return None
+    return LonLat(lon, lat)
+
+
+def sledrun_from_rodelbahnbox(value: OrderedDict, sledrun: object):
     """Takes a Rodelbahnbox as returned by rodelbahnbox_from_str (that is, an OrderedDict) and
     updates the sledrun instance with all values present in the Rodelbahnbox. Other values are not
     updated. Does not validate the arguments."""
     # sledrun.page_id = None # this field is not updated because it is not present in the RodelbahnBox
     # sledrun.page_title = None # this field is not updated because it is not present in the RodelbahnBox
     # sledrun.name_url = None # this field is not updated because it is not present in the RodelbahnBox
-    sledrun.position_longitude, sledrun.position_latitude = value['Position']
-    sledrun.top_longitude, sledrun.top_latitude = value['Position oben']
+    sledrun.position_longitude, sledrun.position_latitude = split_lon_lat(value['Position'])
+    sledrun.top_longitude, sledrun.top_latitude = split_lon_lat(value['Position oben'])
     sledrun.top_elevation = value['Höhe oben']
-    sledrun.bottom_longitude, sledrun.bottom_latitude = value['Position unten']
+    sledrun.bottom_longitude, sledrun.bottom_latitude = split_lon_lat(value['Position unten'])
     sledrun.bottom_elevation = value['Höhe unten']
     sledrun.length = value['Länge']
     sledrun.difficulty = value['Schwierigkeit']
@@ -55,10 +67,10 @@ def sledrun_to_rodelbahnbox(sledrun) -> collections.OrderedDict:
     """Takes a sledrun instance that might come from the database and converts it to a OrderedDict ready
     to be formatted as RodelbahnBox."""
     value = collections.OrderedDict()
-    value['Position'] = LonLat(sledrun.position_longitude, sledrun.position_latitude)
-    value['Position oben'] = LonLat(sledrun.top_longitude, sledrun.top_latitude)
+    value['Position'] = join_lon_lat(sledrun.position_longitude, sledrun.position_latitude)
+    value['Position oben'] = join_lon_lat(sledrun.top_longitude, sledrun.top_latitude)
     value['Höhe oben'] = sledrun.top_elevation
-    value['Position unten'] = LonLat(sledrun.bottom_longitude, sledrun.bottom_latitude)
+    value['Position unten'] = join_lon_lat(sledrun.bottom_longitude, sledrun.bottom_latitude)
     value['Höhe unten'] = sledrun.bottom_elevation
     value['Länge'] = sledrun.length
     value['Schwierigkeit'] = sledrun.difficulty
@@ -91,7 +103,7 @@ def inn_from_gasthausbox(value, inn):
         if v == '':
             return None
         return v
-    inn.position_longitude, inn.position_latitude = value['Position']
+    inn.position_longitude, inn.position_latitude = split_lon_lat(value['Position'])
     inn.position_elevation = value['Höhe']
     inn.operator = value['Betreiber']
     inn.seats = value['Sitzplätze']
@@ -112,10 +124,10 @@ def inn_from_gasthausbox(value, inn):
 def inn_to_gasthausbox(inn) -> collections.OrderedDict:
     """Converts an inn class to a dict of Gasthausbox properties. inn is an Inn instance."""
     def convfromdb(val, key):
-        v = '' if value is None else val
+        v = '' if val is None else val
         return GASTHAUSBOX_DICT[key].from_str(v)
     value = collections.OrderedDict()
-    value['Position'] = LonLat(inn.position_longitude, inn.position_latitude)
+    value['Position'] = join_lon_lat(inn.position_longitude, inn.position_latitude)
     value['Höhe'] = inn.position_elevation
     value['Betreiber'] = inn.operator
     value['Sitzplätze'] = inn.seats
@@ -169,7 +181,7 @@ def parse_wrmap_coordinates(coords: str) -> List[List[float]]:
     else:
         if pos == len(coords):
             return result
-    raise RuntimeError('Wrong coordinate format: {}'.format(coords))
+    raise RuntimeError(f'Wrong coordinate format: {coords}')
 
 
 WRMAP_POINT_TYPES = ['gasthaus', 'haltestelle', 'parkplatz', 'achtung', 'foto', 'verleih', 'punkt']
@@ -204,7 +216,7 @@ def parse_wrmap(wikitext):
         wrmap_xml = xml.etree.ElementTree.fromstring(wikitext)
     except xml.etree.ElementTree.ParseError as e:
         row, column = e.position
-        raise ParseError("XML parse error on row {}, column {}: {}".format(row, column, e))
+        raise ParseError(f"XML parse error on row {row}, column {column}: {e}")
     if wrmap_xml.tag not in ['wrmap', 'wrgmap']:
         raise ParseError('No valid tag name')
 
@@ -215,7 +227,7 @@ def parse_wrmap(wikitext):
         is_point = feature.tag in WRMAP_POINT_TYPES
         is_line = feature.tag in WRMAP_LINE_TYPES
         if not is_point and not is_line:
-            raise ParseError('Unknown element <{}>.'.format(feature.tag))
+            raise ParseError(f'Unknown element <{feature.tag}>.')
 
         # point
         if is_point:
@@ -261,14 +273,14 @@ def parse_wrmap(wikitext):
             try:
                 properties[k] = float(v)
             except ValueError:
-                raise ParseError('Attribute "{}" has to be a float value.'.format(k))
+                raise ParseError(f'Attribute "{k}" has to be a float value.')
         elif k in ['zoom', 'width', 'height']:
             try:
                 properties[k] = int(v)
             except ValueError:
-                raise ParseError('Attribute "{}" has to be an integer value.'.format(k))
+                raise ParseError(f'Attribute "{k}" has to be an integer value.')
         else:
-            raise ParseError('Unknown attribute "{}".'.format(k))
+            raise ParseError(f'Unknown attribute "{k}".')
 
     geojson = {
         'type': 'FeatureCollection',
@@ -281,7 +293,7 @@ def parse_wrmap(wikitext):
 def create_wrmap_coordinates(coords):
     result = []
     for coord in coords:
-        result.append('{:.6f} N {:.6f} E'.format(coord[1], coord[0]))
+        result.append(f'{coord[1]:.6f} N {coord[0]:.6f} E')
     return '\n'.join(result)
  
 
@@ -291,7 +303,7 @@ def create_wrmap(geojson):
     wrmap_xml.text = '\n\n'
     for k, v in geojson['properties'].items():
         if k in ['lon', 'lat']:
-            wrmap_xml.attrib[k] = '{:.6f}'.format(v)
+            wrmap_xml.attrib[k] = f'{v:.6f}'
         else:
             wrmap_xml.attrib[k] = str(v)