From 4d0081f58030111eae45ccc868da04207a759978 Mon Sep 17 00:00:00 2001 From: patoche Date: Wed, 5 Jan 2022 14:36:41 +0100 Subject: [PATCH 1/3] [feature] remove datetime_estimated field from objects --- Cargo.toml | 2 +- model-builder/src/builder.rs | 1 - src/enhancers/check_stop_times_order.rs | 2 - src/enhancers/enhance_pickup_dropoff.rs | 5 - src/gtfs/read.rs | 38 ++- src/gtfs/write.rs | 13 +- src/model.rs | 2 - src/netex_france/offer.rs | 7 - src/netex_france/route_points.rs | 1 - src/ntfs/mod.rs | 4 +- src/ntfs/read.rs | 6 - src/ntfs/write.rs | 10 +- src/objects.rs | 2 - .../gtfs2ntfs/full_output/stop_times.txt | 54 ++--- .../gtfs2ntfs/minimal/output/stop_times.txt | 24 +- .../no_traffic/output/stop_times.txt | 6 +- .../output_with_frequencies/stop_times.txt | 226 +++++++++--------- .../output_without_frequencies/stop_times.txt | 24 +- .../routes_comments/output/stop_times.txt | 24 +- .../output_as_lines/stop_times.txt | 24 +- .../ntfs2ntfs/frequencies/stop_times.txt | 42 ++-- tests/fixtures/ntfs2ntfs/stops/stop_times.txt | 48 ++-- .../output/stop_times.txt | 26 +- 23 files changed, 272 insertions(+), 319 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d1d119f5c..3774458c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Kisio Digital ", "Guillaume Pinot "] name = "transit_model" -version = "0.44.0" +version = "0.45.0" license = "AGPL-3.0-only" description = "Transit data management" repository = "https://github.com/CanalTP/transit_model" diff --git a/model-builder/src/builder.rs b/model-builder/src/builder.rs index 60608af93..ffc648f6f 100644 --- a/model-builder/src/builder.rs +++ b/model-builder/src/builder.rs @@ -334,7 +334,6 @@ impl<'a> VehicleJourneyBuilder<'a> { alighting_duration: 0u16, pickup_type: 0u8, drop_off_type: 0u8, - datetime_estimated: false, local_zone_id: None, precision: None, }; diff --git a/src/enhancers/check_stop_times_order.rs b/src/enhancers/check_stop_times_order.rs index 0f127d9b5..50fed2bb4 100644 --- a/src/enhancers/check_stop_times_order.rs +++ b/src/enhancers/check_stop_times_order.rs @@ -41,7 +41,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }, @@ -54,7 +53,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }, diff --git a/src/enhancers/enhance_pickup_dropoff.rs b/src/enhancers/enhance_pickup_dropoff.rs index eeca5ddc1..ce5159e22 100644 --- a/src/enhancers/enhance_pickup_dropoff.rs +++ b/src/enhancers/enhance_pickup_dropoff.rs @@ -209,7 +209,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }; @@ -223,7 +222,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }; @@ -237,7 +235,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }; @@ -251,7 +248,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }; @@ -463,7 +459,6 @@ mod tests { alighting_duration: 0, pickup_type: 3, drop_off_type: 3, - datetime_estimated: true, local_zone_id: None, precision: None, }); diff --git a/src/gtfs/read.rs b/src/gtfs/read.rs index 6063c8727..c1209d118 100644 --- a/src/gtfs/read.rs +++ b/src/gtfs/read.rs @@ -414,11 +414,14 @@ where for (stop_time, st_values) in stop_times.iter().zip(st_values) { if let Some(stop_point_idx) = collections.stop_points.get_idx(&stop_time.stop_id) { - let precision = match (on_demand_transport, st_values.datetime_estimated) { - (_, false) => Some(StopTimePrecision::Exact), - (false, true) => Some(StopTimePrecision::Approximate), - (true, true) => Some(StopTimePrecision::Estimated), + let precision = if on_demand_transport + && st_values.precision == StopTimePrecision::Approximate + { + Some(StopTimePrecision::Estimated) + } else { + Some(st_values.precision) }; + if let Some(headsign) = &stop_time.stop_headsign { headsigns.insert( (stop_time.trip_id.clone(), stop_time.stop_sequence), @@ -461,7 +464,6 @@ where alighting_duration: 0, pickup_type, drop_off_type, - datetime_estimated: st_values.datetime_estimated, local_zone_id: stop_time.local_zone_id, precision, }); @@ -493,7 +495,7 @@ fn ventilate_stop_times( res.push(StopTimesValues { departure_time: time, arrival_time: time, - datetime_estimated: true, + precision: StopTimePrecision::Approximate, }); } res @@ -503,7 +505,7 @@ fn ventilate_stop_times( struct StopTimesValues { arrival_time: Time, departure_time: Time, - datetime_estimated: bool, + precision: StopTimePrecision, } // in the GTFS some stoptime can have undefined departure/arrival (all stop_times but the first and the last) @@ -536,7 +538,11 @@ fn interpolate_undefined_stop_times( let st_value = StopTimesValues { departure_time, arrival_time, - datetime_estimated: !st.timepoint, + precision: if !st.timepoint { + StopTimePrecision::Approximate + } else { + StopTimePrecision::Exact + }, }; if !undefined_stops_bulk.is_empty() { @@ -1209,10 +1215,6 @@ where ); continue; } - let datetime_estimated = match frequency.exact_times { - FrequencyPrecision::Exact => false, - FrequencyPrecision::Inexact => true, - }; let corresponding_vj = skip_error_and_warn!(collections .vehicle_journeys .get(&frequency.trip_id) @@ -1281,7 +1283,6 @@ where alighting_duration: stop_time.alighting_duration, pickup_type: stop_time.pickup_type, drop_off_type: stop_time.drop_off_type, - datetime_estimated, local_zone_id: stop_time.local_zone_id, precision: stop_time.precision.clone(), }) @@ -2511,7 +2512,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: true, local_zone_id: None, precision: Some(StopTimePrecision::Approximate), }, @@ -2524,7 +2524,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -2537,7 +2536,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -2606,7 +2604,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -2619,7 +2616,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -2632,7 +2628,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -2692,7 +2687,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -2705,7 +2699,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -3317,7 +3310,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: true, local_zone_id: None, precision: Some(StopTimePrecision::Estimated), }, @@ -3330,7 +3322,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -3343,7 +3334,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, diff --git a/src/gtfs/write.rs b/src/gtfs/write.rs index 135d325ae..9f2d35ffa 100644 --- a/src/gtfs/write.rs +++ b/src/gtfs/write.rs @@ -440,7 +440,10 @@ pub fn write_stop_times( stop_headsign: stop_times_headsigns .get(&(vehicle_journeys[vj_idx].id.clone(), st.sequence)) .cloned(), - timepoint: !st.datetime_estimated, + timepoint: st + .precision + .as_ref() + .map_or_else(|| true, |p| p == &StopTimePrecision::Exact), }) .with_context(|| format!("Error reading {:?}", st_wtr))?; } @@ -904,7 +907,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: None, }, @@ -917,7 +919,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }, @@ -949,7 +950,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: None, }, @@ -962,7 +962,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }, @@ -1178,7 +1177,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }, @@ -1191,9 +1189,8 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: true, local_zone_id: Some(3), - precision: None, + precision: Some(StopTimePrecision::Estimated), }, ]; let vehicle_journeys = CollectionWithId::from(VehicleJourney { diff --git a/src/model.rs b/src/model.rs index f15ac5a34..15aa838e2 100644 --- a/src/model.rs +++ b/src/model.rs @@ -1509,7 +1509,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: Some(0), precision: None, }; @@ -1828,7 +1827,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }; diff --git a/src/netex_france/offer.rs b/src/netex_france/offer.rs index a38c39b66..70ce629af 100644 --- a/src/netex_france/offer.rs +++ b/src/netex_france/offer.rs @@ -808,7 +808,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: Some(1), precision: Some(StopTimePrecision::Exact), }, @@ -821,7 +820,6 @@ mod tests { alighting_duration: 0, pickup_type: 1, drop_off_type: 1, - datetime_estimated: false, local_zone_id: Some(1), precision: Some(StopTimePrecision::Exact), }, @@ -853,7 +851,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: Some(1), precision: Some(StopTimePrecision::Exact), }, @@ -866,7 +863,6 @@ mod tests { alighting_duration: 0, pickup_type: 1, drop_off_type: 1, - datetime_estimated: false, local_zone_id: Some(1), precision: Some(StopTimePrecision::Exact), }, @@ -909,7 +905,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: Some(1), precision: Some(StopTimePrecision::Exact), }], @@ -958,7 +953,6 @@ mod tests { // This pickup type is different from 'vj_id_1' pickup_type: 1, drop_off_type: 0, - datetime_estimated: false, local_zone_id: Some(1), precision: Some(StopTimePrecision::Exact), }, @@ -971,7 +965,6 @@ mod tests { alighting_duration: 0, pickup_type: 1, drop_off_type: 1, - datetime_estimated: false, local_zone_id: Some(1), precision: Some(StopTimePrecision::Exact), }, diff --git a/src/netex_france/route_points.rs b/src/netex_france/route_points.rs index 2f7a09882..f8548f0a5 100644 --- a/src/netex_france/route_points.rs +++ b/src/netex_france/route_points.rs @@ -116,7 +116,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, } diff --git a/src/ntfs/mod.rs b/src/ntfs/mod.rs index 2ec06c3cf..622fc9ae8 100644 --- a/src/ntfs/mod.rs +++ b/src/ntfs/mod.rs @@ -50,6 +50,7 @@ struct StopTime { pickup_type: u8, #[serde(default)] drop_off_type: u8, + #[serde(skip_serializing)] datetime_estimated: Option, local_zone_id: Option, stop_headsign: Option, @@ -750,7 +751,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -763,7 +763,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -1198,7 +1197,6 @@ mod tests { alighting_duration: 3, pickup_type: 1, drop_off_type: 2, - datetime_estimated: false, local_zone_id: None, precision: None, }], diff --git a/src/ntfs/read.rs b/src/ntfs/read.rs index 4568f6098..4605428b7 100644 --- a/src/ntfs/read.rs +++ b/src/ntfs/read.rs @@ -322,7 +322,6 @@ where alighting_duration: stop_time.alighting_duration, pickup_type: stop_time.pickup_type, drop_off_type: stop_time.drop_off_type, - datetime_estimated, local_zone_id: stop_time.local_zone_id, precision, }); @@ -801,7 +800,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -814,7 +812,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Approximate), }, @@ -827,7 +824,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Estimated), }, @@ -840,7 +836,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: false, local_zone_id: None, precision: Some(StopTimePrecision::Exact), }, @@ -853,7 +848,6 @@ mod tests { alighting_duration: 0, pickup_type: 2, drop_off_type: 1, - datetime_estimated: true, local_zone_id: None, precision: Some(StopTimePrecision::Estimated), }, diff --git a/src/ntfs/write.rs b/src/ntfs/write.rs index 4b7c43642..d5afc6eaf 100644 --- a/src/ntfs/write.rs +++ b/src/ntfs/write.rs @@ -91,13 +91,7 @@ pub fn write_vehicle_journeys_and_stop_times( .with_context(|| format!("Error reading {:?}", trip_path))?; for st in &vj.stop_times { - let precision = st.precision.clone().or_else(|| { - if st.datetime_estimated { - Some(StopTimePrecision::Estimated) - } else { - Some(StopTimePrecision::Exact) - } - }); + let precision = st.precision.clone(); st_wtr .serialize(StopTime { stop_id: stop_points[st.stop_point_idx].id.clone(), @@ -109,7 +103,7 @@ pub fn write_vehicle_journeys_and_stop_times( alighting_duration: st.alighting_duration, pickup_type: st.pickup_type, drop_off_type: st.drop_off_type, - datetime_estimated: Some(st.datetime_estimated as u8), + datetime_estimated: None, local_zone_id: st.local_zone_id, stop_headsign: stop_time_headsigns .get(&(vehicle_journeys[vj_idx].id.clone(), st.sequence)) diff --git a/src/objects.rs b/src/objects.rs index 0215ab382..e7d6cec4b 100644 --- a/src/objects.rs +++ b/src/objects.rs @@ -872,7 +872,6 @@ pub struct StopTime { pub alighting_duration: u16, pub pickup_type: u8, pub drop_off_type: u8, - pub datetime_estimated: bool, pub local_zone_id: Option, pub precision: Option, } @@ -2063,7 +2062,6 @@ mod tests { alighting_duration: 0, pickup_type: 0, drop_off_type: 0, - datetime_estimated: false, local_zone_id: None, precision: None, }) diff --git a/tests/fixtures/gtfs2ntfs/full_output/stop_times.txt b/tests/fixtures/gtfs2ntfs/full_output/stop_times.txt index 7d2bad7ec..483f2ac3e 100644 --- a/tests/fixtures/gtfs2ntfs/full_output/stop_times.txt +++ b/tests/fixtures/gtfs2ntfs/full_output/stop_times.txt @@ -1,27 +1,27 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -ME:stop:11,ME:WINTER:trip:4-0,0,20:00:00,20:00:00,0,0,2,1,1,,,,0 -ME:stop:11,ME:WINTER:trip:4-1,0,20:30:00,20:30:00,0,0,2,1,1,,,,0 -ME:stop:11,ME:WINTER:trip:4-2,0,21:00:00,21:00:00,0,0,2,1,1,,,,0 -ME:stop:11,ME:WINTER:trip:4-3,0,21:30:00,21:30:00,0,0,2,1,1,,,,0 -ME:stop:22,ME:WINTER:trip:4-0,1,20:09:00,20:09:00,0,0,2,0,1,,,,0 -ME:stop:22,ME:WINTER:trip:4-1,1,20:39:00,20:39:00,0,0,2,0,1,,,,0 -ME:stop:22,ME:WINTER:trip:4-2,1,21:09:00,21:09:00,0,0,2,0,1,,,,0 -ME:stop:22,ME:WINTER:trip:4-3,1,21:39:00,21:39:00,0,0,2,0,1,,,,0 -ME:stop:31,ME:WINTER:trip:3-0,0,10:00:00,10:00:00,0,0,0,1,0,,,,0 -ME:stop:32,ME:WINTER:trip:3-0,1,10:13:00,10:15:00,0,0,0,0,0,,,,0 -ME:stop:33,ME:WINTER:trip:3-0,2,10:20:00,10:25:00,0,0,1,0,0,,,,0 -ME:stop:33,ME:WINTER:trip:4-0,2,20:17:00,20:19:00,0,0,1,0,1,,,,0 -ME:stop:33,ME:WINTER:trip:4-1,2,20:47:00,20:49:00,0,0,1,0,1,,,,0 -ME:stop:33,ME:WINTER:trip:4-2,2,21:17:00,21:19:00,0,0,1,0,1,,,,0 -ME:stop:33,ME:WINTER:trip:4-3,2,21:47:00,21:49:00,0,0,1,0,1,,,,0 -ME:stop:51,ME:WINTER:trip:5-0,0,23:00:00,23:00:00,0,0,2,1,0,,,,0 -ME:stop:51,ME:WINTER:trip:5-1,0,23:50:00,23:50:00,0,0,2,1,0,,,,0 -ME:stop:51,ME:WINTER:trip:5-2,0,00:40:00,00:40:00,0,0,2,1,0,,,,0 -ME:stop:52,ME:WINTER:trip:5-0,1,23:47:00,23:47:00,0,0,2,0,0,,,,0 -ME:stop:52,ME:WINTER:trip:5-1,1,24:37:00,24:37:00,0,0,2,0,0,,,,0 -ME:stop:52,ME:WINTER:trip:5-2,1,01:27:00,01:27:00,0,0,2,0,0,,,,0 -ME:stop:53,ME:WINTER:trip:5-0,2,24:17:00,24:17:00,0,0,1,2,0,,,,0 -ME:stop:53,ME:WINTER:trip:5-1,2,25:07:00,25:07:00,0,0,1,2,0,,,,0 -ME:stop:53,ME:WINTER:trip:5-2,2,01:57:00,01:57:00,0,0,1,2,0,,,,0 -ME:stop:61,ME:WINTER:trip:6,0,14:40:00,14:40:00,0,0,2,1,0,,,,0 -ME:stop:61,ME:WINTER:trip:6,1,15:20:00,15:20:00,0,0,1,0,0,,,,0 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +ME:stop:11,ME:WINTER:trip:4-0,0,20:00:00,20:00:00,0,0,2,1,,,,0 +ME:stop:11,ME:WINTER:trip:4-1,0,20:30:00,20:30:00,0,0,2,1,,,,0 +ME:stop:11,ME:WINTER:trip:4-2,0,21:00:00,21:00:00,0,0,2,1,,,,0 +ME:stop:11,ME:WINTER:trip:4-3,0,21:30:00,21:30:00,0,0,2,1,,,,0 +ME:stop:22,ME:WINTER:trip:4-0,1,20:09:00,20:09:00,0,0,2,0,,,,0 +ME:stop:22,ME:WINTER:trip:4-1,1,20:39:00,20:39:00,0,0,2,0,,,,0 +ME:stop:22,ME:WINTER:trip:4-2,1,21:09:00,21:09:00,0,0,2,0,,,,0 +ME:stop:22,ME:WINTER:trip:4-3,1,21:39:00,21:39:00,0,0,2,0,,,,0 +ME:stop:31,ME:WINTER:trip:3-0,0,10:00:00,10:00:00,0,0,0,1,,,,0 +ME:stop:32,ME:WINTER:trip:3-0,1,10:13:00,10:15:00,0,0,0,0,,,,0 +ME:stop:33,ME:WINTER:trip:3-0,2,10:20:00,10:25:00,0,0,1,0,,,,0 +ME:stop:33,ME:WINTER:trip:4-0,2,20:17:00,20:19:00,0,0,1,0,,,,0 +ME:stop:33,ME:WINTER:trip:4-1,2,20:47:00,20:49:00,0,0,1,0,,,,0 +ME:stop:33,ME:WINTER:trip:4-2,2,21:17:00,21:19:00,0,0,1,0,,,,0 +ME:stop:33,ME:WINTER:trip:4-3,2,21:47:00,21:49:00,0,0,1,0,,,,0 +ME:stop:51,ME:WINTER:trip:5-0,0,23:00:00,23:00:00,0,0,2,1,,,,0 +ME:stop:51,ME:WINTER:trip:5-1,0,23:50:00,23:50:00,0,0,2,1,,,,0 +ME:stop:51,ME:WINTER:trip:5-2,0,00:40:00,00:40:00,0,0,2,1,,,,0 +ME:stop:52,ME:WINTER:trip:5-0,1,23:47:00,23:47:00,0,0,2,0,,,,0 +ME:stop:52,ME:WINTER:trip:5-1,1,24:37:00,24:37:00,0,0,2,0,,,,0 +ME:stop:52,ME:WINTER:trip:5-2,1,01:27:00,01:27:00,0,0,2,0,,,,0 +ME:stop:53,ME:WINTER:trip:5-0,2,24:17:00,24:17:00,0,0,1,2,,,,0 +ME:stop:53,ME:WINTER:trip:5-1,2,25:07:00,25:07:00,0,0,1,2,,,,0 +ME:stop:53,ME:WINTER:trip:5-2,2,01:57:00,01:57:00,0,0,1,2,,,,0 +ME:stop:61,ME:WINTER:trip:6,0,14:40:00,14:40:00,0,0,2,1,,,,0 +ME:stop:61,ME:WINTER:trip:6,1,15:20:00,15:20:00,0,0,1,0,,,,0 diff --git a/tests/fixtures/gtfs2ntfs/minimal/output/stop_times.txt b/tests/fixtures/gtfs2ntfs/minimal/output/stop_times.txt index 1855f7982..f16d2242f 100644 --- a/tests/fixtures/gtfs2ntfs/minimal/output/stop_times.txt +++ b/tests/fixtures/gtfs2ntfs/minimal/output/stop_times.txt @@ -1,12 +1,12 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -stop:11,trip:4,0,07:23:00,07:23:00,0,0,2,1,0,,,,0 -stop:22,trip:4,1,07:32:00,07:32:00,0,0,2,0,0,,,,0 -stop:33,trip:4,2,07:40:00,07:42:00,0,0,1,0,0,,,,0 -stop:51,trip:5,0,13:23:00,13:23:00,0,0,2,1,0,,,,0 -stop:52,trip:5,1,14:10:00,14:10:00,0,0,2,0,0,,,,0 -stop:53,trip:5,2,14:40:00,14:40:00,0,0,1,2,0,,,,0 -stop:31,trip:3,0,23:50:00,23:50:00,0,0,0,1,0,,,,0 -stop:32,trip:3,1,24:03:00,24:05:00,0,0,0,0,0,,,,0 -stop:33,trip:3,2,24:10:00,24:15:00,0,0,1,0,0,,,,0 -stop:61,trip:6,0,14:40:00,14:40:00,0,0,2,1,0,,,,0 -stop:61,trip:6,1,15:20:00,15:20:00,0,0,1,0,0,,,,0 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +stop:11,trip:4,0,07:23:00,07:23:00,0,0,2,1,,,,0 +stop:22,trip:4,1,07:32:00,07:32:00,0,0,2,0,,,,0 +stop:33,trip:4,2,07:40:00,07:42:00,0,0,1,0,,,,0 +stop:51,trip:5,0,13:23:00,13:23:00,0,0,2,1,,,,0 +stop:52,trip:5,1,14:10:00,14:10:00,0,0,2,0,,,,0 +stop:53,trip:5,2,14:40:00,14:40:00,0,0,1,2,,,,0 +stop:31,trip:3,0,23:50:00,23:50:00,0,0,0,1,,,,0 +stop:32,trip:3,1,24:03:00,24:05:00,0,0,0,0,,,,0 +stop:33,trip:3,2,24:10:00,24:15:00,0,0,1,0,,,,0 +stop:61,trip:6,0,14:40:00,14:40:00,0,0,2,1,,,,0 +stop:61,trip:6,1,15:20:00,15:20:00,0,0,1,0,,,,0 diff --git a/tests/fixtures/gtfs2ntfs/no_traffic/output/stop_times.txt b/tests/fixtures/gtfs2ntfs/no_traffic/output/stop_times.txt index ff7c8ec95..337dc533b 100644 --- a/tests/fixtures/gtfs2ntfs/no_traffic/output/stop_times.txt +++ b/tests/fixtures/gtfs2ntfs/no_traffic/output/stop_times.txt @@ -1,3 +1,3 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -stop:31,trip:3,0,23:50:00,23:50:00,0,0,0,1,0,,,,0 -stop:33,trip:3,2,24:10:00,24:15:00,0,0,1,0,0,,,,0 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +stop:31,trip:3,0,23:50:00,23:50:00,0,0,0,1,,,,0 +stop:33,trip:3,2,24:10:00,24:15:00,0,0,1,0,,,,0 diff --git a/tests/fixtures/gtfs2ntfs/odt_comment/output_with_frequencies/stop_times.txt b/tests/fixtures/gtfs2ntfs/odt_comment/output_with_frequencies/stop_times.txt index 3bb5fc992..5d2f0de8b 100644 --- a/tests/fixtures/gtfs2ntfs/odt_comment/output_with_frequencies/stop_times.txt +++ b/tests/fixtures/gtfs2ntfs/odt_comment/output_with_frequencies/stop_times.txt @@ -1,113 +1,113 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -test:stop:11,test:trip:1-13,0,17:55:00,17:57:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-13,1,18:10:00,18:13:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-13,2,18:25:00,18:25:00,0,0,2,0,1,,,test:trip:1-13-2,0 -test:stop:14,test:trip:1-13,3,18:35:00,18:35:00,0,0,1,2,1,,,test:trip:1-13-3,0 -test:stop:21,test:trip:2-11,0,15:55:00,15:55:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-11,1,16:00:00,16:00:00,0,0,1,0,0,,,,0 -test:stop:21,test:trip:2-10,0,15:45:00,15:45:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-10,1,15:50:00,15:50:00,0,0,1,0,0,,,,0 -test:stop:21,test:trip:2-1,0,14:15:00,14:15:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-1,1,14:20:00,14:20:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-7,0,17:25:00,17:27:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-7,1,17:40:00,17:43:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-7,2,17:55:00,17:55:00,0,0,2,0,1,,,test:trip:1-7-2,0 -test:stop:14,test:trip:1-7,3,18:05:00,18:05:00,0,0,1,2,1,,,test:trip:1-7-3,0 -test:stop:11,test:trip:1-1,0,07:30:00,07:32:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-1,1,07:45:00,07:48:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-1,2,08:00:00,08:00:00,0,0,2,0,1,,,test:trip:1-1-2,0 -test:stop:14,test:trip:1-1,3,08:10:00,08:10:00,0,0,1,2,1,,,test:trip:1-1-3,0 -test:stop:31,test:trip:3-0,0,10:00:00,10:00:00,0,0,0,1,0,,,,0 -test:stop:32,test:trip:3-0,1,10:13:00,10:15:00,0,0,0,0,0,,,,0 -test:stop:33,test:trip:3-0,2,10:20:00,10:25:00,0,0,1,0,0,,,,0 -test:stop:51,test:trip:5-1,0,23:50:00,23:50:00,0,0,0,1,0,,,,0 -test:stop:52,test:trip:5-1,1,24:37:00,24:37:00,0,0,0,0,0,,,,0 -test:stop:53,test:trip:5-1,2,25:07:00,25:07:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-0,0,07:00:00,07:02:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-0,1,07:15:00,07:18:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-0,2,07:30:00,07:30:00,0,0,2,0,1,,,test:trip:1-0-2,0 -test:stop:14,test:trip:1-0,3,07:40:00,07:40:00,0,0,1,2,1,,,test:trip:1-0-3,0 -test:stop:11,test:trip:1-4,0,17:10:00,17:12:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-4,1,17:25:00,17:28:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-4,2,17:40:00,17:40:00,0,0,2,0,1,,,test:trip:1-4-2,0 -test:stop:14,test:trip:1-4,3,17:50:00,17:50:00,0,0,1,2,1,,,test:trip:1-4-3,0 -test:stop:21,test:trip:2-2,0,14:25:00,14:25:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-2,1,14:30:00,14:30:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-11,0,17:45:00,17:47:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-11,1,18:00:00,18:03:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-11,2,18:15:00,18:15:00,0,0,2,0,1,,,test:trip:1-11-2,0 -test:stop:14,test:trip:1-11,3,18:25:00,18:25:00,0,0,1,2,1,,,test:trip:1-11-3,0 -test:stop:21,test:trip:2-9,0,15:35:00,15:35:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-9,1,15:40:00,15:40:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-5,0,17:15:00,17:17:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-5,1,17:30:00,17:33:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-5,2,17:45:00,17:45:00,0,0,2,0,1,,,test:trip:1-5-2,0 -test:stop:14,test:trip:1-5,3,17:55:00,17:55:00,0,0,1,2,1,,,test:trip:1-5-3,0 -test:stop:21,test:trip:2-6,0,15:05:00,15:05:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-6,1,15:10:00,15:10:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:4-1,0,20:30:00,20:30:00,0,0,0,1,1,,,,0 -test:stop:22,test:trip:4-1,1,20:39:00,20:39:00,0,0,0,0,1,,,,0 -test:stop:33,test:trip:4-1,2,20:47:00,20:49:00,0,0,1,0,1,,,,0 -test:stop:71,test:trip:russian-1,0,03:00:00,03:00:00,0,0,0,1,0,,,,0 -test:stop:72,test:trip:russian-1,1,05:00:00,05:00:00,0,0,1,0,0,,,,0 -test:stop:21,test:trip:2-7,0,15:15:00,15:15:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-7,1,15:20:00,15:20:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:4-2,0,21:00:00,21:00:00,0,0,0,1,1,,,,0 -test:stop:22,test:trip:4-2,1,21:09:00,21:09:00,0,0,0,0,1,,,,0 -test:stop:33,test:trip:4-2,2,21:17:00,21:19:00,0,0,1,0,1,,,,0 -test:stop:21,test:trip:2-4,0,14:45:00,14:45:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-4,1,14:50:00,14:50:00,0,0,1,0,0,,,,0 -test:stop:71,test:trip:russian-3,0,03:00:00,03:00:00,0,0,0,1,0,,,,0 -test:stop:72,test:trip:russian-3,1,05:00:00,05:00:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-3,0,17:05:00,17:07:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-3,1,17:20:00,17:23:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-3,2,17:35:00,17:35:00,0,0,2,0,1,,,test:trip:1-3-2,0 -test:stop:14,test:trip:1-3,3,17:45:00,17:45:00,0,0,1,2,1,,,test:trip:1-3-3,0 -test:stop:11,test:trip:1-6,0,17:20:00,17:22:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-6,1,17:35:00,17:38:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-6,2,17:50:00,17:50:00,0,0,2,0,1,,,test:trip:1-6-2,0 -test:stop:14,test:trip:1-6,3,18:00:00,18:00:00,0,0,1,2,1,,,test:trip:1-6-3,0 -test:stop:21,test:trip:2-0,0,14:05:00,14:05:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-0,1,14:10:00,14:10:00,0,0,1,0,0,,,,0 -test:stop:71,test:trip:russian-2,0,15:00:00,15:00:00,0,0,0,1,0,,,,0 -test:stop:72,test:trip:russian-2,1,17:00:00,17:00:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:4-0,0,20:00:00,20:00:00,0,0,0,1,1,,,,0 -test:stop:22,test:trip:4-0,1,20:09:00,20:09:00,0,0,0,0,1,,,,0 -test:stop:33,test:trip:4-0,2,20:17:00,20:19:00,0,0,1,0,1,,,,0 -test:stop:51,test:trip:5-0,0,23:00:00,23:00:00,0,0,0,1,0,,,,0 -test:stop:52,test:trip:5-0,1,23:47:00,23:47:00,0,0,0,0,0,,,,0 -test:stop:53,test:trip:5-0,2,24:17:00,24:17:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-10,0,17:40:00,17:42:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-10,1,17:55:00,17:58:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-10,2,18:10:00,18:10:00,0,0,2,0,1,,,test:trip:1-10-2,0 -test:stop:14,test:trip:1-10,3,18:20:00,18:20:00,0,0,1,2,1,,,test:trip:1-10-3,0 -test:stop:11,test:trip:1-9,0,17:35:00,17:37:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-9,1,17:50:00,17:53:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-9,2,18:05:00,18:05:00,0,0,2,0,1,,,test:trip:1-9-2,0 -test:stop:14,test:trip:1-9,3,18:15:00,18:15:00,0,0,1,2,1,,,test:trip:1-9-3,0 -test:stop:11,test:trip:4-3,0,21:30:00,21:30:00,0,0,0,1,1,,,,0 -test:stop:22,test:trip:4-3,1,21:39:00,21:39:00,0,0,0,0,1,,,,0 -test:stop:33,test:trip:4-3,2,21:47:00,21:49:00,0,0,1,0,1,,,,0 -test:stop:21,test:trip:2-8,0,15:25:00,15:25:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-8,1,15:30:00,15:30:00,0,0,1,0,0,,,,0 -test:stop:51,test:trip:5-2,0,00:40:00,00:40:00,0,0,0,1,0,,,,0 -test:stop:52,test:trip:5-2,1,01:27:00,01:27:00,0,0,0,0,0,,,,0 -test:stop:53,test:trip:5-2,2,01:57:00,01:57:00,0,0,1,0,0,,,,0 -test:stop:71,test:trip:russian-0,0,15:00:00,15:00:00,0,0,0,1,0,,,,0 -test:stop:72,test:trip:russian-0,1,17:00:00,17:00:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-8,0,17:30:00,17:32:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-8,1,17:45:00,17:48:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-8,2,18:00:00,18:00:00,0,0,2,0,1,,,test:trip:1-8-2,0 -test:stop:14,test:trip:1-8,3,18:10:00,18:10:00,0,0,1,2,1,,,test:trip:1-8-3,0 -test:stop:21,test:trip:2-3,0,14:35:00,14:35:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-3,1,14:40:00,14:40:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-2,0,17:00:00,17:02:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-2,1,17:15:00,17:18:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-2,2,17:30:00,17:30:00,0,0,2,0,1,,,test:trip:1-2-2,0 -test:stop:14,test:trip:1-2,3,17:40:00,17:40:00,0,0,1,2,1,,,test:trip:1-2-3,0 -test:stop:21,test:trip:2-5,0,14:55:00,14:55:00,0,0,0,1,0,,,,0 -test:stop:22,test:trip:2-5,1,15:00:00,15:00:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:1-12,0,17:50:00,17:52:00,0,0,0,1,1,,,,0 -test:stop:12,test:trip:1-12,1,18:05:00,18:08:00,0,0,0,0,1,,,,0 -test:stop:13,test:trip:1-12,2,18:20:00,18:20:00,0,0,2,0,1,,,test:trip:1-12-2,0 -test:stop:14,test:trip:1-12,3,18:30:00,18:30:00,0,0,1,2,1,,,test:trip:1-12-3,0 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +test:stop:11,test:trip:1-13,0,17:55:00,17:57:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-13,1,18:10:00,18:13:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-13,2,18:25:00,18:25:00,0,0,2,0,,,test:trip:1-13-2,0 +test:stop:14,test:trip:1-13,3,18:35:00,18:35:00,0,0,1,2,,,test:trip:1-13-3,0 +test:stop:21,test:trip:2-11,0,15:55:00,15:55:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-11,1,16:00:00,16:00:00,0,0,1,0,,,,0 +test:stop:21,test:trip:2-10,0,15:45:00,15:45:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-10,1,15:50:00,15:50:00,0,0,1,0,,,,0 +test:stop:21,test:trip:2-1,0,14:15:00,14:15:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-1,1,14:20:00,14:20:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-7,0,17:25:00,17:27:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-7,1,17:40:00,17:43:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-7,2,17:55:00,17:55:00,0,0,2,0,,,test:trip:1-7-2,0 +test:stop:14,test:trip:1-7,3,18:05:00,18:05:00,0,0,1,2,,,test:trip:1-7-3,0 +test:stop:11,test:trip:1-1,0,07:30:00,07:32:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-1,1,07:45:00,07:48:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-1,2,08:00:00,08:00:00,0,0,2,0,,,test:trip:1-1-2,0 +test:stop:14,test:trip:1-1,3,08:10:00,08:10:00,0,0,1,2,,,test:trip:1-1-3,0 +test:stop:31,test:trip:3-0,0,10:00:00,10:00:00,0,0,0,1,,,,0 +test:stop:32,test:trip:3-0,1,10:13:00,10:15:00,0,0,0,0,,,,0 +test:stop:33,test:trip:3-0,2,10:20:00,10:25:00,0,0,1,0,,,,0 +test:stop:51,test:trip:5-1,0,23:50:00,23:50:00,0,0,0,1,,,,0 +test:stop:52,test:trip:5-1,1,24:37:00,24:37:00,0,0,0,0,,,,0 +test:stop:53,test:trip:5-1,2,25:07:00,25:07:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-0,0,07:00:00,07:02:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-0,1,07:15:00,07:18:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-0,2,07:30:00,07:30:00,0,0,2,0,,,test:trip:1-0-2,0 +test:stop:14,test:trip:1-0,3,07:40:00,07:40:00,0,0,1,2,,,test:trip:1-0-3,0 +test:stop:11,test:trip:1-4,0,17:10:00,17:12:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-4,1,17:25:00,17:28:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-4,2,17:40:00,17:40:00,0,0,2,0,,,test:trip:1-4-2,0 +test:stop:14,test:trip:1-4,3,17:50:00,17:50:00,0,0,1,2,,,test:trip:1-4-3,0 +test:stop:21,test:trip:2-2,0,14:25:00,14:25:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-2,1,14:30:00,14:30:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-11,0,17:45:00,17:47:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-11,1,18:00:00,18:03:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-11,2,18:15:00,18:15:00,0,0,2,0,,,test:trip:1-11-2,0 +test:stop:14,test:trip:1-11,3,18:25:00,18:25:00,0,0,1,2,,,test:trip:1-11-3,0 +test:stop:21,test:trip:2-9,0,15:35:00,15:35:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-9,1,15:40:00,15:40:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-5,0,17:15:00,17:17:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-5,1,17:30:00,17:33:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-5,2,17:45:00,17:45:00,0,0,2,0,,,test:trip:1-5-2,0 +test:stop:14,test:trip:1-5,3,17:55:00,17:55:00,0,0,1,2,,,test:trip:1-5-3,0 +test:stop:21,test:trip:2-6,0,15:05:00,15:05:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-6,1,15:10:00,15:10:00,0,0,1,0,,,,0 +test:stop:11,test:trip:4-1,0,20:30:00,20:30:00,0,0,0,1,,,,0 +test:stop:22,test:trip:4-1,1,20:39:00,20:39:00,0,0,0,0,,,,0 +test:stop:33,test:trip:4-1,2,20:47:00,20:49:00,0,0,1,0,,,,0 +test:stop:71,test:trip:russian-1,0,03:00:00,03:00:00,0,0,0,1,,,,0 +test:stop:72,test:trip:russian-1,1,05:00:00,05:00:00,0,0,1,0,,,,0 +test:stop:21,test:trip:2-7,0,15:15:00,15:15:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-7,1,15:20:00,15:20:00,0,0,1,0,,,,0 +test:stop:11,test:trip:4-2,0,21:00:00,21:00:00,0,0,0,1,,,,0 +test:stop:22,test:trip:4-2,1,21:09:00,21:09:00,0,0,0,0,,,,0 +test:stop:33,test:trip:4-2,2,21:17:00,21:19:00,0,0,1,0,,,,0 +test:stop:21,test:trip:2-4,0,14:45:00,14:45:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-4,1,14:50:00,14:50:00,0,0,1,0,,,,0 +test:stop:71,test:trip:russian-3,0,03:00:00,03:00:00,0,0,0,1,,,,0 +test:stop:72,test:trip:russian-3,1,05:00:00,05:00:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-3,0,17:05:00,17:07:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-3,1,17:20:00,17:23:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-3,2,17:35:00,17:35:00,0,0,2,0,,,test:trip:1-3-2,0 +test:stop:14,test:trip:1-3,3,17:45:00,17:45:00,0,0,1,2,,,test:trip:1-3-3,0 +test:stop:11,test:trip:1-6,0,17:20:00,17:22:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-6,1,17:35:00,17:38:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-6,2,17:50:00,17:50:00,0,0,2,0,,,test:trip:1-6-2,0 +test:stop:14,test:trip:1-6,3,18:00:00,18:00:00,0,0,1,2,,,test:trip:1-6-3,0 +test:stop:21,test:trip:2-0,0,14:05:00,14:05:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-0,1,14:10:00,14:10:00,0,0,1,0,,,,0 +test:stop:71,test:trip:russian-2,0,15:00:00,15:00:00,0,0,0,1,,,,0 +test:stop:72,test:trip:russian-2,1,17:00:00,17:00:00,0,0,1,0,,,,0 +test:stop:11,test:trip:4-0,0,20:00:00,20:00:00,0,0,0,1,,,,0 +test:stop:22,test:trip:4-0,1,20:09:00,20:09:00,0,0,0,0,,,,0 +test:stop:33,test:trip:4-0,2,20:17:00,20:19:00,0,0,1,0,,,,0 +test:stop:51,test:trip:5-0,0,23:00:00,23:00:00,0,0,0,1,,,,0 +test:stop:52,test:trip:5-0,1,23:47:00,23:47:00,0,0,0,0,,,,0 +test:stop:53,test:trip:5-0,2,24:17:00,24:17:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-10,0,17:40:00,17:42:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-10,1,17:55:00,17:58:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-10,2,18:10:00,18:10:00,0,0,2,0,,,test:trip:1-10-2,0 +test:stop:14,test:trip:1-10,3,18:20:00,18:20:00,0,0,1,2,,,test:trip:1-10-3,0 +test:stop:11,test:trip:1-9,0,17:35:00,17:37:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-9,1,17:50:00,17:53:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-9,2,18:05:00,18:05:00,0,0,2,0,,,test:trip:1-9-2,0 +test:stop:14,test:trip:1-9,3,18:15:00,18:15:00,0,0,1,2,,,test:trip:1-9-3,0 +test:stop:11,test:trip:4-3,0,21:30:00,21:30:00,0,0,0,1,,,,0 +test:stop:22,test:trip:4-3,1,21:39:00,21:39:00,0,0,0,0,,,,0 +test:stop:33,test:trip:4-3,2,21:47:00,21:49:00,0,0,1,0,,,,0 +test:stop:21,test:trip:2-8,0,15:25:00,15:25:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-8,1,15:30:00,15:30:00,0,0,1,0,,,,0 +test:stop:51,test:trip:5-2,0,00:40:00,00:40:00,0,0,0,1,,,,0 +test:stop:52,test:trip:5-2,1,01:27:00,01:27:00,0,0,0,0,,,,0 +test:stop:53,test:trip:5-2,2,01:57:00,01:57:00,0,0,1,0,,,,0 +test:stop:71,test:trip:russian-0,0,15:00:00,15:00:00,0,0,0,1,,,,0 +test:stop:72,test:trip:russian-0,1,17:00:00,17:00:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-8,0,17:30:00,17:32:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-8,1,17:45:00,17:48:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-8,2,18:00:00,18:00:00,0,0,2,0,,,test:trip:1-8-2,0 +test:stop:14,test:trip:1-8,3,18:10:00,18:10:00,0,0,1,2,,,test:trip:1-8-3,0 +test:stop:21,test:trip:2-3,0,14:35:00,14:35:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-3,1,14:40:00,14:40:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-2,0,17:00:00,17:02:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-2,1,17:15:00,17:18:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-2,2,17:30:00,17:30:00,0,0,2,0,,,test:trip:1-2-2,0 +test:stop:14,test:trip:1-2,3,17:40:00,17:40:00,0,0,1,2,,,test:trip:1-2-3,0 +test:stop:21,test:trip:2-5,0,14:55:00,14:55:00,0,0,0,1,,,,0 +test:stop:22,test:trip:2-5,1,15:00:00,15:00:00,0,0,1,0,,,,0 +test:stop:11,test:trip:1-12,0,17:50:00,17:52:00,0,0,0,1,,,,0 +test:stop:12,test:trip:1-12,1,18:05:00,18:08:00,0,0,0,0,,,,0 +test:stop:13,test:trip:1-12,2,18:20:00,18:20:00,0,0,2,0,,,test:trip:1-12-2,0 +test:stop:14,test:trip:1-12,3,18:30:00,18:30:00,0,0,1,2,,,test:trip:1-12-3,0 diff --git a/tests/fixtures/gtfs2ntfs/odt_comment/output_without_frequencies/stop_times.txt b/tests/fixtures/gtfs2ntfs/odt_comment/output_without_frequencies/stop_times.txt index a14e3b24f..8446df860 100644 --- a/tests/fixtures/gtfs2ntfs/odt_comment/output_without_frequencies/stop_times.txt +++ b/tests/fixtures/gtfs2ntfs/odt_comment/output_without_frequencies/stop_times.txt @@ -1,12 +1,12 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -test:stop:51,test:trip:5,0,13:23:00,13:23:00,0,0,2,1,0,,,test:trip:5-0,0 -test:stop:52,test:trip:5,1,14:10:00,14:10:00,0,0,2,0,0,,,test:trip:5-1,0 -test:stop:53,test:trip:5,2,14:40:00,14:40:00,0,0,1,2,0,,,,0 -test:stop:31,test:trip:3,0,23:50:00,23:50:00,0,0,0,1,0,,,,0 -test:stop:32,test:trip:3,1,24:03:00,24:05:00,0,0,0,0,0,,,,0 -test:stop:33,test:trip:3,2,24:10:00,24:15:00,0,0,1,0,0,,,,0 -test:stop:11,test:trip:4,0,07:23:00,07:23:00,0,0,2,1,0,,,test:trip:4-0,0 -test:stop:22,test:trip:4,1,07:32:00,07:32:00,0,0,2,0,0,,,,0 -test:stop:33,test:trip:4,2,07:40:00,07:42:00,0,0,1,0,0,,,test:trip:4-2,0 -test:stop:61,test:trip:6,0,14:40:00,14:40:00,0,0,2,1,0,,,test:trip:6-0,0 -test:stop:61,test:trip:6,1,15:20:00,15:20:00,0,0,1,0,0,,,test:trip:6-1,0 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +test:stop:51,test:trip:5,0,13:23:00,13:23:00,0,0,2,1,,,test:trip:5-0,0 +test:stop:52,test:trip:5,1,14:10:00,14:10:00,0,0,2,0,,,test:trip:5-1,0 +test:stop:53,test:trip:5,2,14:40:00,14:40:00,0,0,1,2,,,,0 +test:stop:31,test:trip:3,0,23:50:00,23:50:00,0,0,0,1,,,,0 +test:stop:32,test:trip:3,1,24:03:00,24:05:00,0,0,0,0,,,,0 +test:stop:33,test:trip:3,2,24:10:00,24:15:00,0,0,1,0,,,,0 +test:stop:11,test:trip:4,0,07:23:00,07:23:00,0,0,2,1,,,test:trip:4-0,0 +test:stop:22,test:trip:4,1,07:32:00,07:32:00,0,0,2,0,,,,0 +test:stop:33,test:trip:4,2,07:40:00,07:42:00,0,0,1,0,,,test:trip:4-2,0 +test:stop:61,test:trip:6,0,14:40:00,14:40:00,0,0,2,1,,,test:trip:6-0,0 +test:stop:61,test:trip:6,1,15:20:00,15:20:00,0,0,1,0,,,test:trip:6-1,0 diff --git a/tests/fixtures/gtfs2ntfs/routes_comments/output/stop_times.txt b/tests/fixtures/gtfs2ntfs/routes_comments/output/stop_times.txt index 1855f7982..f16d2242f 100644 --- a/tests/fixtures/gtfs2ntfs/routes_comments/output/stop_times.txt +++ b/tests/fixtures/gtfs2ntfs/routes_comments/output/stop_times.txt @@ -1,12 +1,12 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -stop:11,trip:4,0,07:23:00,07:23:00,0,0,2,1,0,,,,0 -stop:22,trip:4,1,07:32:00,07:32:00,0,0,2,0,0,,,,0 -stop:33,trip:4,2,07:40:00,07:42:00,0,0,1,0,0,,,,0 -stop:51,trip:5,0,13:23:00,13:23:00,0,0,2,1,0,,,,0 -stop:52,trip:5,1,14:10:00,14:10:00,0,0,2,0,0,,,,0 -stop:53,trip:5,2,14:40:00,14:40:00,0,0,1,2,0,,,,0 -stop:31,trip:3,0,23:50:00,23:50:00,0,0,0,1,0,,,,0 -stop:32,trip:3,1,24:03:00,24:05:00,0,0,0,0,0,,,,0 -stop:33,trip:3,2,24:10:00,24:15:00,0,0,1,0,0,,,,0 -stop:61,trip:6,0,14:40:00,14:40:00,0,0,2,1,0,,,,0 -stop:61,trip:6,1,15:20:00,15:20:00,0,0,1,0,0,,,,0 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +stop:11,trip:4,0,07:23:00,07:23:00,0,0,2,1,,,,0 +stop:22,trip:4,1,07:32:00,07:32:00,0,0,2,0,,,,0 +stop:33,trip:4,2,07:40:00,07:42:00,0,0,1,0,,,,0 +stop:51,trip:5,0,13:23:00,13:23:00,0,0,2,1,,,,0 +stop:52,trip:5,1,14:10:00,14:10:00,0,0,2,0,,,,0 +stop:53,trip:5,2,14:40:00,14:40:00,0,0,1,2,,,,0 +stop:31,trip:3,0,23:50:00,23:50:00,0,0,0,1,,,,0 +stop:32,trip:3,1,24:03:00,24:05:00,0,0,0,0,,,,0 +stop:33,trip:3,2,24:10:00,24:15:00,0,0,1,0,,,,0 +stop:61,trip:6,0,14:40:00,14:40:00,0,0,2,1,,,,0 +stop:61,trip:6,1,15:20:00,15:20:00,0,0,1,0,,,,0 diff --git a/tests/fixtures/gtfs2ntfs/routes_comments/output_as_lines/stop_times.txt b/tests/fixtures/gtfs2ntfs/routes_comments/output_as_lines/stop_times.txt index 1855f7982..f16d2242f 100644 --- a/tests/fixtures/gtfs2ntfs/routes_comments/output_as_lines/stop_times.txt +++ b/tests/fixtures/gtfs2ntfs/routes_comments/output_as_lines/stop_times.txt @@ -1,12 +1,12 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -stop:11,trip:4,0,07:23:00,07:23:00,0,0,2,1,0,,,,0 -stop:22,trip:4,1,07:32:00,07:32:00,0,0,2,0,0,,,,0 -stop:33,trip:4,2,07:40:00,07:42:00,0,0,1,0,0,,,,0 -stop:51,trip:5,0,13:23:00,13:23:00,0,0,2,1,0,,,,0 -stop:52,trip:5,1,14:10:00,14:10:00,0,0,2,0,0,,,,0 -stop:53,trip:5,2,14:40:00,14:40:00,0,0,1,2,0,,,,0 -stop:31,trip:3,0,23:50:00,23:50:00,0,0,0,1,0,,,,0 -stop:32,trip:3,1,24:03:00,24:05:00,0,0,0,0,0,,,,0 -stop:33,trip:3,2,24:10:00,24:15:00,0,0,1,0,0,,,,0 -stop:61,trip:6,0,14:40:00,14:40:00,0,0,2,1,0,,,,0 -stop:61,trip:6,1,15:20:00,15:20:00,0,0,1,0,0,,,,0 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +stop:11,trip:4,0,07:23:00,07:23:00,0,0,2,1,,,,0 +stop:22,trip:4,1,07:32:00,07:32:00,0,0,2,0,,,,0 +stop:33,trip:4,2,07:40:00,07:42:00,0,0,1,0,,,,0 +stop:51,trip:5,0,13:23:00,13:23:00,0,0,2,1,,,,0 +stop:52,trip:5,1,14:10:00,14:10:00,0,0,2,0,,,,0 +stop:53,trip:5,2,14:40:00,14:40:00,0,0,1,2,,,,0 +stop:31,trip:3,0,23:50:00,23:50:00,0,0,0,1,,,,0 +stop:32,trip:3,1,24:03:00,24:05:00,0,0,0,0,,,,0 +stop:33,trip:3,2,24:10:00,24:15:00,0,0,1,0,,,,0 +stop:61,trip:6,0,14:40:00,14:40:00,0,0,2,1,,,,0 +stop:61,trip:6,1,15:20:00,15:20:00,0,0,1,0,,,,0 diff --git a/tests/fixtures/ntfs2ntfs/frequencies/stop_times.txt b/tests/fixtures/ntfs2ntfs/frequencies/stop_times.txt index 267e57031..5bb7f7537 100644 --- a/tests/fixtures/ntfs2ntfs/frequencies/stop_times.txt +++ b/tests/fixtures/ntfs2ntfs/frequencies/stop_times.txt @@ -1,21 +1,21 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -NATM,M1F1,0,00:00:00,00:00:00,0,0,0,1,0,,,,0 -GDLM,M1F1,1,00:10:00,00:10:00,0,0,0,0,0,,,,0 -CHAM,M1F1,2,00:20:00,00:20:00,0,0,0,0,0,,,,0 -CDGM,M1F1,3,00:40:00,00:40:00,0,0,1,0,0,,,,0 -NATM,M1B1,9,00:30:00,00:30:00,0,0,1,0,0,,,,0 -GDLM,M1B1,8,00:20:00,00:20:00,0,0,0,0,0,,,,0 -CHAM,M1B1,7,00:10:00,00:10:00,0,0,0,0,0,,,,0 -CDGM,M1B1,6,00:00:00,00:00:00,0,0,0,1,0,,,,0 -GDLB,B42F1,10,10:10:00,10:10:00,0,0,0,1,0,,,,0 -MTPB,B42F1,20,10:20:00,10:20:00,0,0,1,0,0,,,,0 -GDLB,B42B1,30,07:10:00,07:10:00,0,0,1,0,0,,,,0 -MTPB,B42B1,20,07:00:00,07:00:00,0,0,0,1,0,,,,0 -NATR,RERAF1,1,08:09:00,08:10:00,0,0,0,1,0,,,,0 -GDLR,RERAF1,2,08:14:00,08:15:00,0,0,0,0,0,,,,0 -CDGR,RERAF1,3,08:19:00,08:20:00,0,0,0,0,0,,,,0 -DEFR,RERAF1,5,08:24:00,08:25:00,0,0,1,0,0,,,,0 -NATR,RERAB1,21,09:49:00,09:50:00,0,0,1,0,0,,,,0 -GDLR,RERAB1,13,09:44:00,09:45:00,0,0,0,0,0,,,,0 -CDGR,RERAB1,8,09:39:00,09:40:00,0,0,0,0,0,,,StopTime:RERAB1-8:0,0 -DEFR,RERAB1,5,09:24:00,09:25:00,0,0,0,1,0,,,StopTime:RERAB1-5:1,0 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +NATM,M1F1,0,00:00:00,00:00:00,0,0,0,1,,,,0 +GDLM,M1F1,1,00:10:00,00:10:00,0,0,0,0,,,,0 +CHAM,M1F1,2,00:20:00,00:20:00,0,0,0,0,,,,0 +CDGM,M1F1,3,00:40:00,00:40:00,0,0,1,0,,,,0 +NATM,M1B1,9,00:30:00,00:30:00,0,0,1,0,,,,0 +GDLM,M1B1,8,00:20:00,00:20:00,0,0,0,0,,,,0 +CHAM,M1B1,7,00:10:00,00:10:00,0,0,0,0,,,,0 +CDGM,M1B1,6,00:00:00,00:00:00,0,0,0,1,,,,0 +GDLB,B42F1,10,10:10:00,10:10:00,0,0,0,1,,,,0 +MTPB,B42F1,20,10:20:00,10:20:00,0,0,1,0,,,,0 +GDLB,B42B1,30,07:10:00,07:10:00,0,0,1,0,,,,0 +MTPB,B42B1,20,07:00:00,07:00:00,0,0,0,1,,,,0 +NATR,RERAF1,1,08:09:00,08:10:00,0,0,0,1,,,,0 +GDLR,RERAF1,2,08:14:00,08:15:00,0,0,0,0,,,,0 +CDGR,RERAF1,3,08:19:00,08:20:00,0,0,0,0,,,,0 +DEFR,RERAF1,5,08:24:00,08:25:00,0,0,1,0,,,,0 +NATR,RERAB1,21,09:49:00,09:50:00,0,0,1,0,,,,0 +GDLR,RERAB1,13,09:44:00,09:45:00,0,0,0,0,,,,0 +CDGR,RERAB1,8,09:39:00,09:40:00,0,0,0,0,,,StopTime:RERAB1-8:0,0 +DEFR,RERAB1,5,09:24:00,09:25:00,0,0,0,1,,,StopTime:RERAB1-5:1,0 diff --git a/tests/fixtures/ntfs2ntfs/stops/stop_times.txt b/tests/fixtures/ntfs2ntfs/stops/stop_times.txt index a22a896f8..35d96b984 100644 --- a/tests/fixtures/ntfs2ntfs/stops/stop_times.txt +++ b/tests/fixtures/ntfs2ntfs/stops/stop_times.txt @@ -1,24 +1,24 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -NATM,M1F1,0,09:00:00,09:00:00,0,0,0,1,0,,,,0 -GDLM,M1F1,1,09:10:00,09:10:00,0,0,3,3,0,,,,0 -CHAM,M1F1,2,09:20:00,09:20:00,0,0,0,0,0,,,,0 -CDGM,M1F1,3,09:40:00,09:40:00,0,0,1,0,0,,,,0 -CDGM,M1B1,6,10:40:00,10:40:00,0,0,0,1,0,,,,0 -CHAM,M1B1,7,10:50:00,10:50:00,0,0,0,0,0,,,,0 -GDLM,M1B1,8,11:00:00,11:00:00,0,0,0,0,0,,,,0 -NATM,M1B1,9,11:10:00,11:10:00,0,0,1,0,0,,,,0 -GDLB,B42F1,10,10:10:00,10:10:00,0,0,0,1,0,,,,0 -MTPB,B42F1,20,10:20:00,10:20:00,0,0,1,0,0,,,,0 -MTPB,B42B1,20,07:00:00,07:00:00,0,0,0,1,0,,,,0 -GDLB,B42B1,30,07:10:00,07:10:00,0,0,1,0,0,,,,0 -NATR,RERAF1,1,08:09:00,08:10:00,0,0,0,1,0,,,,0 -GDLR,RERAF1,2,08:14:00,08:15:00,0,0,0,0,0,,,,0 -CDGR,RERAF1,3,08:19:00,08:20:00,0,0,0,0,0,,,,0 -DEFR,RERAF1,5,08:24:00,08:25:00,0,0,1,0,0,,,,0 -DEFR,RERAB1,5,09:24:00,09:25:00,0,0,0,1,1,,,,2 -CDGR,RERAB1,8,09:39:00,09:40:00,0,0,0,0,0,,,,0 -GDLR,RERAB1,13,09:44:00,09:45:00,0,0,0,0,0,,,,0 -NATR,RERAB1,21,09:49:00,09:50:00,0,0,0,0,0,,,,0 -MTPZ,RERAB1,50,19:24:00,19:25:00,0,0,0,0,1,,,,2 -CDGZ,RERAB1,51,19:26:00,19:27:00,0,0,0,0,0,,,,0 -MTPZ,RERAB1,52,19:34:00,19:35:00,0,0,1,0,1,,,,2 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +NATM,M1F1,0,09:00:00,09:00:00,0,0,0,1,,,,0 +GDLM,M1F1,1,09:10:00,09:10:00,0,0,3,3,,,,0 +CHAM,M1F1,2,09:20:00,09:20:00,0,0,0,0,,,,0 +CDGM,M1F1,3,09:40:00,09:40:00,0,0,1,0,,,,0 +CDGM,M1B1,6,10:40:00,10:40:00,0,0,0,1,,,,0 +CHAM,M1B1,7,10:50:00,10:50:00,0,0,0,0,,,,0 +GDLM,M1B1,8,11:00:00,11:00:00,0,0,0,0,,,,0 +NATM,M1B1,9,11:10:00,11:10:00,0,0,1,0,,,,0 +GDLB,B42F1,10,10:10:00,10:10:00,0,0,0,1,,,,0 +MTPB,B42F1,20,10:20:00,10:20:00,0,0,1,0,,,,0 +MTPB,B42B1,20,07:00:00,07:00:00,0,0,0,1,,,,0 +GDLB,B42B1,30,07:10:00,07:10:00,0,0,1,0,,,,0 +NATR,RERAF1,1,08:09:00,08:10:00,0,0,0,1,,,,0 +GDLR,RERAF1,2,08:14:00,08:15:00,0,0,0,0,,,,0 +CDGR,RERAF1,3,08:19:00,08:20:00,0,0,0,0,,,,0 +DEFR,RERAF1,5,08:24:00,08:25:00,0,0,1,0,,,,0 +DEFR,RERAB1,5,09:24:00,09:25:00,0,0,0,1,,,,2 +CDGR,RERAB1,8,09:39:00,09:40:00,0,0,0,0,,,,0 +GDLR,RERAB1,13,09:44:00,09:45:00,0,0,0,0,,,,0 +NATR,RERAB1,21,09:49:00,09:50:00,0,0,0,0,,,,0 +MTPZ,RERAB1,50,19:24:00,19:25:00,0,0,0,0,,,,2 +CDGZ,RERAB1,51,19:26:00,19:27:00,0,0,0,0,,,,0 +MTPZ,RERAB1,52,19:34:00,19:35:00,0,0,1,0,,,,2 diff --git a/tests/fixtures/restrict-validity-period/output/stop_times.txt b/tests/fixtures/restrict-validity-period/output/stop_times.txt index 1c5aebae1..0d8025a88 100644 --- a/tests/fixtures/restrict-validity-period/output/stop_times.txt +++ b/tests/fixtures/restrict-validity-period/output/stop_times.txt @@ -1,13 +1,13 @@ -stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,datetime_estimated,local_zone_id,stop_headsign,stop_time_id,stop_time_precision -CDGM,M1B1,6,10:40:00,10:40:00,0,0,0,1,0,,,stoptime:8,0 -CHAM,M1B1,7,10:50:00,10:50:00,0,0,0,0,0,,,stoptime:7,0 -GDLM,M1B1,8,11:00:00,11:00:00,0,0,0,0,0,,,stoptime:6,0 -NATM,M1B1,9,11:10:00,11:10:00,0,0,1,0,1,,headsign kept,stoptime:5,2 -GDLB,B42F1,10,10:10:00,10:10:00,0,0,0,1,0,,,stoptime:9,0 -MTPB,B42F1,20,10:20:00,10:20:00,0,0,1,0,0,,,stoptime:10,0 -MTPB,B42B1,20,07:00:00,07:00:00,0,0,0,1,0,,,stoptime:12,0 -GDLB,B42B1,30,07:10:00,07:10:00,0,0,1,0,0,,,stoptime:11,0 -GDLM,B42B1_R,0,20:34:00,20:35:00,0,0,1,1,1,,,stoptime:27,2 -GDLM,B42F1_R,0,20:34:00,20:35:00,0,0,1,1,1,,,stoptime:26,2 -GDLM,M1B1_R,0,20:34:00,20:35:00,0,0,1,1,1,,,stoptime:24,2 -GDLM,M1F1-2,0,20:34:00,20:35:00,0,0,1,1,1,,,stoptime:25,2 +stop_id,trip_id,stop_sequence,arrival_time,departure_time,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision +CDGM,M1B1,6,10:40:00,10:40:00,0,0,0,1,,,stoptime:8,0 +CHAM,M1B1,7,10:50:00,10:50:00,0,0,0,0,,,stoptime:7,0 +GDLM,M1B1,8,11:00:00,11:00:00,0,0,0,0,,,stoptime:6,0 +NATM,M1B1,9,11:10:00,11:10:00,0,0,1,0,,headsign kept,stoptime:5,2 +GDLB,B42F1,10,10:10:00,10:10:00,0,0,0,1,,,stoptime:9,0 +MTPB,B42F1,20,10:20:00,10:20:00,0,0,1,0,,,stoptime:10,0 +MTPB,B42B1,20,07:00:00,07:00:00,0,0,0,1,,,stoptime:12,0 +GDLB,B42B1,30,07:10:00,07:10:00,0,0,1,0,,,stoptime:11,0 +GDLM,B42B1_R,0,20:34:00,20:35:00,0,0,1,1,,,stoptime:27,2 +GDLM,B42F1_R,0,20:34:00,20:35:00,0,0,1,1,,,stoptime:26,2 +GDLM,M1B1_R,0,20:34:00,20:35:00,0,0,1,1,,,stoptime:24,2 +GDLM,M1F1-2,0,20:34:00,20:35:00,0,0,1,1,,,stoptime:25,2 From e1639ae969dbdf0ed2357ab268645784c71a4f27 Mon Sep 17 00:00:00 2001 From: patoche Date: Wed, 5 Jan 2022 15:44:16 +0100 Subject: [PATCH 2/3] consideration of comments --- src/gtfs/write.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gtfs/write.rs b/src/gtfs/write.rs index 9f2d35ffa..472c2f749 100644 --- a/src/gtfs/write.rs +++ b/src/gtfs/write.rs @@ -440,10 +440,7 @@ pub fn write_stop_times( stop_headsign: stop_times_headsigns .get(&(vehicle_journeys[vj_idx].id.clone(), st.sequence)) .cloned(), - timepoint: st - .precision - .as_ref() - .map_or_else(|| true, |p| p == &StopTimePrecision::Exact), + timepoint: matches!(st.precision, None | Some(StopTimePrecision::Exact)), }) .with_context(|| format!("Error reading {:?}", st_wtr))?; } From 260c3178bb534fa7dda1252e1fc4158732d4c4c1 Mon Sep 17 00:00:00 2001 From: patoche Date: Thu, 6 Jan 2022 08:46:38 +0100 Subject: [PATCH 3/3] no need to bump version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3774458c5..d1d119f5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Kisio Digital ", "Guillaume Pinot "] name = "transit_model" -version = "0.45.0" +version = "0.44.0" license = "AGPL-3.0-only" description = "Transit data management" repository = "https://github.com/CanalTP/transit_model"