debugging on travel..

travelInfo.py

@@ -10,7 +10,7 @@ import pytz
 
 timezone = pytz.timezone('Europe/Berlin')
 
-def check_ssid():
+def get_ssid():
 
     scanoutput = check_output(["/usr/sbin/iwlist", "wlp2s0", "scan"])
     
@@ -25,10 +25,10 @@ def get_speed_db():
     rs = "https://iceportal.de/api1/rs/status"
     response = get(rs)
     data = response.json()
-    speed= data["speed"] + " km/h"
+    speed= str(data["speed"])
     return speed
 
-def get_trip_db():
+def get_next_db():
     rs = "https://iceportal.de/api1/rs/tripInfo/trip/"
     response = get(rs)
     data = response.json() 
@@ -39,14 +39,23 @@ def get_trip_db():
             nextStationName = i['station']['name']
             arrivalDelay = i['timetable']['arrivalDelay']
             utime=i['timetable']['actualArrivalTime']/1000
-            arrivalTime = datetime.fromtimestamp(utime, tz=timezonedt).strftime('%H:%M')
+            arrivalTime = datetime.fromtimestamp(utime, tz=timezone).strftime('%H:%M')
             break
     tripinfo = nextStationName+" "+ arrivalTime+" " + arrivalDelay
     return tripinfo
 
+def get_trainInfo_db():
+    rs = "https://iceportal.de/api1/rs/tripInfo/trip/"
+    response = get(rs)
+    data = response.json() 
+    trainType = data["trip"]["trainType"]
+    trainNumber = data["trip"]["vzn"]
+    finalStationName = data["trip"]["stopInfo"]["finalStationName"] 
+    return trainType+" "+trainNumber+" "+ finalStationName
+
 def main():
-    if check_ssid() == "WIFIonICE":
-        print("SPEED: "+get_speed_db()+"NEXT: "+get_trip_db())
+    if get_ssid() == "WIFIonICE":
+        print(get_trainInfo_db()+" | "+"SPEED: "+get_speed_db()+" km/h | "+"NEXT: "+get_next_db())
     return 0
 
 if __name__ == '__main__':