Skip to content

ETA Fixes #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmv1167 wants to merge 3 commits into
base: 0.3.0
Choose a base branch
from
Open

ETA Fixes #31

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5af1a5
Fixed: eta referenced before assignment and incorrect logic
dmv1167 Oct 1, 2024
b91c121
Fixed etaR keyerror in stops with no vehicles
dmv1167 Oct 1, 2024
d1f7c35
Minor type issue
dmv1167 Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions passiogo/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ class Route:

def __init__(
self,
id: str,
id: int,
groupId: int = None,
groupColor: str = None,
name: str = None,
Expand Down Expand Up @@ -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,
Expand All @@ -710,12 +709,12 @@ 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:
eta = vehicle["secondsSpent"]
vehicles.append((eta, self.system.getVehicleById(int(vehicle["busId"]))))
vehicles.append((eta, self.system.getVehicleById(int(vehicle["busId"]))))
return vehicles


Expand Down