From c5af1a5463a19cf8de90dbea628ae42d45b837ce Mon Sep 17 00:00:00 2001 From: Dominic Vinciulla Date: Tue, 1 Oct 2024 14:17:04 -0400 Subject: [PATCH 1/3] Fixed: eta referenced before assignment and incorrect logic --- passiogo/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/passiogo/__init__.py b/passiogo/__init__.py index b5447ec..728c732 100644 --- a/passiogo/__init__.py +++ b/passiogo/__init__.py @@ -686,8 +686,7 @@ def getNextVehicle( if not etas: return None - # Generally operates in O(1) as etas come sorted by API - return min(etas, key = lambda x : x[0]) + return etas[0] def getEtas( self, @@ -715,7 +714,7 @@ def getEtas( eta = convertToUnixEta(vehicle["secondsSpent"]) else: eta = vehicle["secondsSpent"] - vehicles.append((eta, self.system.getVehicleById(int(vehicle["busId"])))) + vehicles.append((eta, self.system.getVehicleById(int(vehicle["busId"])))) return vehicles From b91c12129b95bc74fb2b418ee90f2e43d75b2ee8 Mon Sep 17 00:00:00 2001 From: Dominic Vinciulla Date: Tue, 1 Oct 2024 14:31:25 -0400 Subject: [PATCH 2/3] Fixed etaR keyerror in stops with no vehicles --- passiogo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passiogo/__init__.py b/passiogo/__init__.py index 728c732..f25b074 100644 --- a/passiogo/__init__.py +++ b/passiogo/__init__.py @@ -709,7 +709,7 @@ def getEtas( if str(self.id) not in data: return vehicles for vehicle in data[str(self.id)]: - if vehicle["etaR"]: #etaR is "" when eta is unavailable + if "etaR" in vehicle and vehicle["etaR"]: #etaR is "" when eta is unavailable if returnInUTC: eta = convertToUnixEta(vehicle["secondsSpent"]) else: From d1f7c35a53211352203807bcef5dd49829ba417e Mon Sep 17 00:00:00 2001 From: Dominic Vinciulla Date: Tue, 1 Oct 2024 18:57:09 -0400 Subject: [PATCH 3/3] Minor type issue --- passiogo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passiogo/__init__.py b/passiogo/__init__.py index f25b074..8ec6c97 100644 --- a/passiogo/__init__.py +++ b/passiogo/__init__.py @@ -569,7 +569,7 @@ class Route: def __init__( self, - id: str, + id: int, groupId: int = None, groupColor: str = None, name: str = None,