nickorlow/septastic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge w/ gtfs
Some checks failed
Create and publish a Docker image / build-and-push-image (push) Has been cancelled
Details

Browse source
This commit is contained in:
Nicholas Orlowsky 2025-11-08 13:14:36 -05:00
commit 786f32e7e3
No known key found for this signature in database
GPG key ID: A9F3BA4C0AA7A70B
39 changed files with 1220 additions and 1515 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/src/templates.rs
View file

@ -72,7 +72,7 @@ pub fn build_timetables(
let mut direction_trips: Vec<&Trip> = trips
.iter()
.filter(|trip| trip.direction_id == direction.direction_id)
.filter(|trip| trip.direction.direction == direction.direction)
.collect();
direction_trips.sort_by_key(|trip| {
@ -86,7 +86,7 @@ pub fn build_timetables(
for trip in direction_trips.clone() {
if let Some(last) = trip.schedule.iter().max_by_key(|x| x.arrival_time) {
if next_id == None && i64::from(seconds_since_midnight) < last.arrival_time {
next_id = Some(last.trip_id.clone());
next_id = Some(last.stop.id.to_string());
}
}
}
@ -107,12 +107,12 @@ pub fn build_timetables(
for (trip_index, trip) in direction_trips.iter().enumerate() {
for stop in &trip.schedule {
let entry = stop_map
.entry(stop.stop_id)
.or_insert((stop.stop_sequence, stop.stop_name.clone(), vec![None; direction_trips.len()]));
.entry(stop.stop.id)
.or_insert((stop.stop_sequence, stop.stop.name.clone(), vec![None; direction_trips.len()]));
// If this stop_id appears in multiple trips with different sequences, keep the lowest
entry.0 = entry.0.max(stop.stop_sequence);
entry.1 = stop.stop_name.clone();
entry.1 = stop.stop.name.clone();
entry.2[trip_index] = Some(stop.arrival_time);
}
}