revert to septa api for rt tracking
This commit is contained in:
parent
f407992035
commit
a335f14b14
18 changed files with 535 additions and 355 deletions
|
|
@ -70,7 +70,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| {
|
||||
|
|
@ -84,7 +84,7 @@ pub fn build_timetables(
|
|||
for trip in direction_trips.clone() {
|
||||
if let Some(last) = trip.schedule.last() {
|
||||
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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -105,12 +105,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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue