This commit is contained in:
Andras Schmelczer 2026-07-03 18:28:56 +01:00
parent 909e241907
commit 1ee796b282
29 changed files with 250 additions and 126 deletions

View file

@ -50,7 +50,7 @@ ENGLAND_PBF_URL = (
"https://download.geofabrik.de/europe/united-kingdom/england-latest.osm.pbf"
)
# Bus Open Data Service pre-converted GTFS covering all England bus/tram/ferry
# Bus Open Data Service: pre-converted GTFS covering all England bus/tram/ferry
BODS_GTFS_URL = "https://data.bus-data.dft.gov.uk/timetable/download/gtfs-file/all/"
# National Rail Open Data API
@ -597,7 +597,7 @@ def validate_gtfs_feed(
fail("has neither calendar.txt nor calendar_dates.txt")
if not _calendar_active_in_window(z, names, window_start, window_end):
fail(
f"no service active between {window_start} and {window_end} "
f"no service active between {window_start} and {window_end}: "
"the feed's calendars are stale/expired and it would contribute "
"zero service to routing"
)
@ -697,7 +697,7 @@ def _iter_stop_time_trips(lines, trip_id_idx: int):
dtd2mysql currently writes rows grouped by trip and ordered by
stop_sequence, but neither is guaranteed by GTFS. Grouping is verified (a
trip_id reappearing later raises instead of silently scrambling trips);
within-trip order is NOT assumed callers sort each group by its original
within-trip order is NOT assumed: callers sort each group by its original
stop_sequence.
"""
current_trip: str | None = None
@ -1175,7 +1175,7 @@ def main() -> None:
cif = download_national_rail_cif(raw_dir)
if cif is None:
raise RuntimeError(
"National Rail timetable was not downloaded set "
"National Rail timetable was not downloaded: set "
"NATIONAL_RAIL_EMAIL / NATIONAL_RAIL_PASSWORD (register free at "
"https://opendata.nationalrail.co.uk/). National Rail heavy rail is "
"required; without it the transit network models every train journey "