nahuel
/
dublinbus-display
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add route_type to ArrivalTines object.

This commit is contained in:
Gultak 2023-08-27 16:22:36 +01:00
parent 8bf7503a39
commit a62b325651
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arrival_times.py
View File

@ -3,9 +3,10 @@ import datetime
class ArrivalTime(): class ArrivalTime():
""" Represents the arrival times of buses at one of the configured stops """ """ Represents the arrival times of buses at one of the configured stops """
def __init__(self, stop_id: str, route_id: str, destination: str, due_in_seconds: int, is_added: bool = False) -> None: def __init__(self, stop_id: str, route_id: str, route_type: str, destination: str, due_in_seconds: int, is_added: bool = False) -> None:
self.stop_id = stop_id self.stop_id = stop_id
self.route_id = route_id self.route_id = route_id
self.route_type = route_type
self.destination = destination self.destination = destination
self.due_in_seconds = due_in_seconds self.due_in_seconds = due_in_seconds
self.is_added = is_added self.is_added = is_added

2
gtfs_client.py
View File

@ -316,6 +316,7 @@ class GTFSClient():
new_arrival = ArrivalTime( new_arrival = ArrivalTime(
stop_id = stop_time_update.get("stop_code"), stop_id = stop_time_update.get("stop_code"),
route_id = self.feed.routes[self.feed.routes["route_id"] == route_id]["route_short_name"].item(), route_id = self.feed.routes[self.feed.routes["route_id"] == route_id]["route_short_name"].item(),
route_type = self.feed.routes[self.feed.routes["route_id"] == route_id]["route_type"].item(),
destination = self.__lookup_headsign_by_route(route_id, direction_id), destination = self.__lookup_headsign_by_route(route_id, direction_id),
due_in_seconds = arrival_time - int(time.time()), due_in_seconds = arrival_time - int(time.time()),
is_added = True is_added = True
@ -376,6 +377,7 @@ class GTFSClient():
arrival = ArrivalTime(stop_id = bus["stop_code"], arrival = ArrivalTime(stop_id = bus["stop_code"],
route_id = bus["route_short_name"], route_id = bus["route_short_name"],
route_type = bus["route_type"],
destination = bus["trip_headsign"], destination = bus["trip_headsign"],
due_in_seconds = self.__due_in_seconds(bus["arrival_time"]) + delta, due_in_seconds = self.__due_in_seconds(bus["arrival_time"]) + delta,
is_added = False is_added = False