Updated a sanity check function for new format of station ids.

Author: Sebastian Lehrack

mvg_api/__init__.py

@@ -13,6 +13,22 @@
 routing_url = "https://www.mvg.de/api/fahrinfo/routing/?"
 interruptions_url = "https://www.mvg.de/.rest/betriebsaenderungen/api/interruptions"
 
+def _station_sanity_check(id:str):
+    """
+    New ID format has these specifications:
+    starts with de
+    has two : (checked with split)
+    second and third field is integer (not checked)
+    :param id: station id to be checked
+    :return: Boolean on id sanity
+    """
+    split_id = id.split(":")
+    if not len(split_id)==3:
+        return False
+    if not split_id[0]=='de':
+        return False
+    return True
+
 
 def _perform_api_request(url):
     resp = requests.get(url, headers={'X-MVG-Authorization-Key': api_key, 'User-Agent': 'python-mvg-api/1 (+https://github.com/leftshift/python_mvg_api)', 'Accept': 'application/json'})
@@ -186,20 +202,22 @@ def get_route(start, dest,
     url = routing_url
     options = []
 
-    if isinstance(start, int):
-        options.append("fromStation=" + str(start))
-    elif isinstance(start, tuple) and len(start) == 2:
+
+    if isinstance(start, tuple) and len(start) == 2:
         options.append("fromLatitude=" + str(start[0]))
         options.append("fromLongitude=" + str(start[1]))
+    elif _station_sanity_check(start):
+        options.append("fromStation=" + start)
     else:
         raise ValueError("A start must be given;\
                           either int station id or tuple latitude longitude")
 
-    if isinstance(dest, int):
-        options.append("toStation=" + str(dest))
-    elif isinstance(dest, tuple) and len(dest) == 2:
+
+    if isinstance(dest, tuple) and len(dest) == 2:
         options.append("toLatitude=" + str(dest[0]))
         options.append("toLongitude=" + str(dest[1]))
+    elif _station_sanity_check(dest):
+        options.append("toStation=" + dest)
     else:
         raise ValueError("A destination must be given;\
                           either int station id or tuple latitude longitude")
@@ -256,11 +274,11 @@ def get_departures(station_id):
     `departureTimeMinutes`, the time left to the departure in minutes,
     is added to the response from the api for your convenience.
     """
-    if not isinstance(station_id, int):
+    if not _station_sanity_check(station_id):
         raise TypeError("Please give the int station_id of the station.\
                          You can find it out by running \
                          get_id_for_station('Station name')")
-    url = departure_url.format(id=str(station_id))
+    url = departure_url.format(id=station_id)
     departures = _perform_api_request(url)['departures']
     for departure in departures:
         # For some reason, mvg gives you a Unix timestamp, but in milliseconds.