edward/agenda
1
0
Fork 0
Code Issues 27 Pull requests Packages Projects Releases Wiki Activity

Include ferry distances

Browse source
This commit is contained in:
Edward Betts 2024-05-05 14:57:13 +03:00
parent ca7c449410
commit c65e60a1f1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
agenda/trip.py
View file

@ -58,7 +58,9 @@ def load_trains(
return trains return trains
def load_ferries(data_dir: str) -> list[StrDict]: def load_ferries(
data_dir: str, route_distances: travel.RouteDistances | None = None
) -> list[StrDict]:
"""Load ferries.""" """Load ferries."""
ferries = load_travel("ferry", "ferries", data_dir) ferries = load_travel("ferry", "ferries", data_dir)
terminals = travel.parse_yaml("ferry_terminals", data_dir) terminals = travel.parse_yaml("ferry_terminals", data_dir)
@ -70,6 +72,9 @@ def load_ferries(data_dir: str) -> list[StrDict]:
item["from_terminal"] = from_terminal item["from_terminal"] = from_terminal
item["to_terminal"] = to_terminal item["to_terminal"] = to_terminal
if route_distances:
travel.add_leg_route_distance(item, route_distances)
geojson = from_terminal["routes"].get(item["to"]) geojson = from_terminal["routes"].get(item["to"])
if geojson: if geojson:
item["geojson_filename"] = geojson item["geojson_filename"] = geojson
@ -131,7 +136,7 @@ def build_trip_list(
travel_items = sorted( travel_items = sorted(
load_flights(data_dir) load_flights(data_dir)
+ load_trains(data_dir, route_distances=route_distances) + load_trains(data_dir, route_distances=route_distances)
+ load_ferries(data_dir), + load_ferries(data_dir, route_distances=route_distances),
key=depart_datetime, key=depart_datetime,
) )