From 34f3e85f2ca91c1aab03bd48ac551561a3bed261 Mon Sep 17 00:00:00 2001
From: ArnaudOggy <arnaud.ogiela@gmail.com>
Date: Fri, 6 Sep 2024 18:02:34 +0200
Subject: [PATCH 1/5] StopTime - Move arrival_time and departure_time to Option

---
 src/enhancers/check_stop_times_order.rs | 12 ++--
 src/enhancers/enhance_pickup_dropoff.rs | 30 ++++++----
 src/gtfs/read.rs                        | 75 ++++++++++++++++---------
 src/gtfs/write.rs                       | 40 ++++++++-----
 src/model.rs                            | 65 +++++++++++++++------
 src/model_builder.rs                    |  6 +-
 src/netex_france/offer.rs               | 64 +++++++++++++--------
 src/netex_france/route_points.rs        |  6 +-
 src/ntfs/mod.rs                         | 24 +++++---
 src/ntfs/read.rs                        | 32 +++++++----
 src/ntfs/write.rs                       |  2 +
 src/objects.rs                          | 34 ++++++-----
 12 files changed, 261 insertions(+), 129 deletions(-)

diff --git a/src/enhancers/check_stop_times_order.rs b/src/enhancers/check_stop_times_order.rs
index 50fed2bb4..fab0562ab 100644
--- a/src/enhancers/check_stop_times_order.rs
+++ b/src/enhancers/check_stop_times_order.rs
@@ -35,8 +35,10 @@ mod tests {
             StopTime {
                 stop_point_idx,
                 sequence: 0,
-                arrival_time: Time::from_str(a_arrival).unwrap(),
-                departure_time: Time::from_str(a_departure).unwrap(),
+                arrival_time: Time::from_str(a_arrival).ok(),
+                departure_time: Time::from_str(a_departure).ok(),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0,
                 alighting_duration: 0,
                 pickup_type: 0,
@@ -47,8 +49,10 @@ mod tests {
             StopTime {
                 stop_point_idx,
                 sequence: 1,
-                arrival_time: FromStr::from_str(b_arrival).unwrap(),
-                departure_time: FromStr::from_str(b_departure).unwrap(),
+                arrival_time: FromStr::from_str(b_arrival).ok(),
+                departure_time: FromStr::from_str(b_departure).ok(),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0,
                 alighting_duration: 0,
                 pickup_type: 0,
diff --git a/src/enhancers/enhance_pickup_dropoff.rs b/src/enhancers/enhance_pickup_dropoff.rs
index 067b273b3..20aaad930 100644
--- a/src/enhancers/enhance_pickup_dropoff.rs
+++ b/src/enhancers/enhance_pickup_dropoff.rs
@@ -201,8 +201,10 @@ mod tests {
         let stop_time_1 = StopTime {
             stop_point_idx: sp_idxs[0],
             sequence: 0,
-            arrival_time: prev_vj_config.2 - Time::new(1, 0, 0),
-            departure_time: prev_vj_config.3 - Time::new(1, 0, 0),
+            arrival_time: Some(prev_vj_config.2 - Time::new(1, 0, 0)),
+            departure_time: Some(prev_vj_config.3 - Time::new(1, 0, 0)),
+            start_pickup_drop_off_window: None,
+            end_pickup_drop_off_window: None,
             boarding_duration: 0,
             alighting_duration: 0,
             pickup_type: 0,
@@ -214,8 +216,10 @@ mod tests {
         let stop_time_2 = StopTime {
             stop_point_idx: sp_idxs[prev_vj_config.1],
             sequence: 0,
-            arrival_time: prev_vj_config.2,
-            departure_time: prev_vj_config.3,
+            arrival_time: Some(prev_vj_config.2),
+            departure_time: Some(prev_vj_config.3),
+            start_pickup_drop_off_window: None,
+            end_pickup_drop_off_window: None,
             boarding_duration: 0,
             alighting_duration: 0,
             pickup_type: 0,
@@ -227,8 +231,10 @@ mod tests {
         let next_vj_config_time_1 = StopTime {
             stop_point_idx: sp_idxs[next_vj_config.1],
             sequence: 1,
-            arrival_time: next_vj_config.2,
-            departure_time: next_vj_config.3,
+            arrival_time: Some(next_vj_config.2),
+            departure_time: Some(next_vj_config.3),
+            start_pickup_drop_off_window: None,
+            end_pickup_drop_off_window: None,
             boarding_duration: 0,
             alighting_duration: 0,
             pickup_type: 0,
@@ -240,8 +246,10 @@ mod tests {
         let next_vj_config_time_2 = StopTime {
             stop_point_idx: sp_idxs[3],
             sequence: 1,
-            arrival_time: next_vj_config.2 + Time::new(1, 0, 0),
-            departure_time: next_vj_config.3 + Time::new(1, 0, 0),
+            arrival_time: Some(next_vj_config.2 + Time::new(1, 0, 0)),
+            departure_time: Some(next_vj_config.3 + Time::new(1, 0, 0)),
+            start_pickup_drop_off_window: None,
+            end_pickup_drop_off_window: None,
             boarding_duration: 0,
             alighting_duration: 0,
             pickup_type: 0,
@@ -451,8 +459,10 @@ mod tests {
         vj_mut.stop_times.push(StopTime {
             stop_point_idx: sp4_idx,
             sequence: 2,
-            arrival_time: Time::new(11, 30, 0),
-            departure_time: Time::new(11, 30, 0),
+            arrival_time: Some(Time::new(11, 30, 0)),
+            departure_time: Some(Time::new(11, 30, 0)),
+            start_pickup_drop_off_window: None,
+            end_pickup_drop_off_window: None,
             boarding_duration: 0,
             alighting_duration: 0,
             pickup_type: 3,
diff --git a/src/gtfs/read.rs b/src/gtfs/read.rs
index 327e1b710..ce04b7c51 100644
--- a/src/gtfs/read.rs
+++ b/src/gtfs/read.rs
@@ -477,8 +477,10 @@ where
                     .push(objects::StopTime {
                         stop_point_idx,
                         sequence: stop_time.stop_sequence,
-                        arrival_time: st_values.arrival_time,
-                        departure_time: st_values.departure_time,
+                        arrival_time: Some(st_values.arrival_time),
+                        departure_time: Some(st_values.departure_time),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type,
@@ -1065,6 +1067,7 @@ fn make_routes(gtfs_trips: &[Trip], map_line_routes: &MapLineRoutes<'_>) -> Vec<
             }
 
             let has_one_direction = route_directions.len() <= 1;
+
             for d in route_directions {
                 let mut codes = KeysValues::default();
                 codes.insert(("source".to_string(), r.id.clone()));
@@ -2415,8 +2418,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:01").unwrap(),
                         sequence: 1,
-                        arrival_time: Time::new(6, 0, 0),
-                        departure_time: Time::new(6, 0, 0),
+                        arrival_time: Some(Time::new(6, 0, 0)),
+                        departure_time: Some(Time::new(6, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -2427,8 +2432,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:02").unwrap(),
                         sequence: 2,
-                        arrival_time: Time::new(6, 6, 27),
-                        departure_time: Time::new(6, 6, 27),
+                        arrival_time: Some(Time::new(6, 6, 27)),
+                        departure_time: Some(Time::new(6, 6, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
@@ -2439,8 +2446,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:03").unwrap(),
                         sequence: 3,
-                        arrival_time: Time::new(6, 6, 27),
-                        departure_time: Time::new(6, 6, 27),
+                        arrival_time: Some(Time::new(6, 6, 27)),
+                        departure_time: Some(Time::new(6, 6, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
@@ -2507,8 +2516,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:01").unwrap(),
                         sequence: 1,
-                        arrival_time: Time::new(6, 0, 0),
-                        departure_time: Time::new(6, 0, 0),
+                        arrival_time: Some(Time::new(6, 0, 0)),
+                        departure_time: Some(Time::new(6, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -2519,8 +2530,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:02").unwrap(),
                         sequence: 2,
-                        arrival_time: Time::new(6, 11, 0),
-                        departure_time: Time::new(6, 11, 0),
+                        arrival_time: Some(Time::new(6, 11, 0)),
+                        departure_time: Some(Time::new(6, 11, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -2531,8 +2544,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:03").unwrap(),
                         sequence: 3,
-                        arrival_time: Time::new(6, 22, 0),
-                        departure_time: Time::new(6, 22, 0),
+                        arrival_time: Some(Time::new(6, 22, 0)),
+                        departure_time: Some(Time::new(6, 22, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -2590,8 +2605,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:01").unwrap(),
                         sequence: 1,
-                        arrival_time: Time::new(6, 0, 0),
-                        departure_time: Time::new(6, 0, 0),
+                        arrival_time: Some(Time::new(6, 0, 0)),
+                        departure_time: Some(Time::new(6, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -2602,8 +2619,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:02").unwrap(),
                         sequence: 2,
-                        arrival_time: Time::new(6, 6, 27),
-                        departure_time: Time::new(6, 6, 27),
+                        arrival_time: Some(Time::new(6, 6, 27)),
+                        departure_time: Some(Time::new(6, 6, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
@@ -3021,7 +3040,7 @@ mod tests {
                 collections.vehicle_journeys.into_vec()[0]
                     .stop_times
                     .iter()
-                    .map(|st| (st.arrival_time, st.departure_time))
+                    .map(|st| (st.arrival_time.unwrap(), st.departure_time.unwrap()))
                     .collect::<Vec<_>>()
             );
         });
@@ -3213,8 +3232,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:01").unwrap(),
                         sequence: 1,
-                        arrival_time: Time::new(6, 0, 0),
-                        departure_time: Time::new(6, 0, 0),
+                        arrival_time: Some(Time::new(6, 0, 0)),
+                        departure_time: Some(Time::new(6, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -3225,8 +3246,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:02").unwrap(),
                         sequence: 2,
-                        arrival_time: Time::new(6, 6, 27),
-                        departure_time: Time::new(6, 6, 27),
+                        arrival_time: Some(Time::new(6, 6, 27)),
+                        departure_time: Some(Time::new(6, 6, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
@@ -3237,8 +3260,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:03").unwrap(),
                         sequence: 3,
-                        arrival_time: Time::new(6, 6, 27),
-                        departure_time: Time::new(6, 6, 27),
+                        arrival_time: Some(Time::new(6, 6, 27)),
+                        departure_time: Some(Time::new(6, 6, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
diff --git a/src/gtfs/write.rs b/src/gtfs/write.rs
index 6c5a27e4d..cdce63a34 100644
--- a/src/gtfs/write.rs
+++ b/src/gtfs/write.rs
@@ -480,8 +480,8 @@ pub fn write_stop_times(
                     stop_id: stop_points[st.stop_point_idx].id.clone(),
                     trip_id: vj.id.clone(),
                     stop_sequence: st.sequence,
-                    arrival_time: Some(st.arrival_time),
-                    departure_time: Some(st.departure_time),
+                    arrival_time: st.arrival_time,
+                    departure_time: st.departure_time,
                     pickup_type: st.pickup_type,
                     drop_off_type: st.drop_off_type,
                     local_zone_id: st.local_zone_id,
@@ -953,8 +953,10 @@ mod tests {
                 objects::StopTime {
                     stop_point_idx: collections.stop_points.get_idx("OIF:SP:36:2085").unwrap(),
                     sequence: 0,
-                    arrival_time: objects::Time::new(14, 40, 0),
-                    departure_time: objects::Time::new(14, 40, 0),
+                    arrival_time: Some(objects::Time::new(14, 40, 0)),
+                    departure_time: Some(objects::Time::new(14, 40, 0)),
+                    start_pickup_drop_off_window: None,
+                    end_pickup_drop_off_window: None,
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 0,
@@ -965,8 +967,10 @@ mod tests {
                 objects::StopTime {
                     stop_point_idx: collections.stop_points.get_idx("OIF:SP:36:2127").unwrap(),
                     sequence: 1,
-                    arrival_time: objects::Time::new(14, 42, 0),
-                    departure_time: objects::Time::new(14, 42, 0),
+                    arrival_time: Some(objects::Time::new(14, 42, 0)),
+                    departure_time: Some(objects::Time::new(14, 42, 0)),
+                    start_pickup_drop_off_window: None,
+                    end_pickup_drop_off_window: None,
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 0,
@@ -996,8 +1000,10 @@ mod tests {
                 objects::StopTime {
                     stop_point_idx: collections.stop_points.get_idx("OIF:SP:36:2085").unwrap(),
                     sequence: 0,
-                    arrival_time: objects::Time::new(14, 40, 0),
-                    departure_time: objects::Time::new(14, 40, 0),
+                    arrival_time: Some(objects::Time::new(14, 40, 0)),
+                    departure_time: Some(objects::Time::new(14, 40, 0)),
+                    start_pickup_drop_off_window: None,
+                    end_pickup_drop_off_window: None,
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 0,
@@ -1008,8 +1014,10 @@ mod tests {
                 objects::StopTime {
                     stop_point_idx: collections.stop_points.get_idx("OIF:SP:36:2127").unwrap(),
                     sequence: 1,
-                    arrival_time: objects::Time::new(14, 42, 0),
-                    departure_time: objects::Time::new(14, 42, 0),
+                    arrival_time: Some(objects::Time::new(14, 42, 0)),
+                    departure_time: Some(objects::Time::new(14, 42, 0)),
+                    start_pickup_drop_off_window: None,
+                    end_pickup_drop_off_window: None,
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 0,
@@ -1224,8 +1232,10 @@ mod tests {
             StopTime {
                 stop_point_idx: stop_points.get_idx("sp:01").unwrap(),
                 sequence: 1,
-                arrival_time: Time::new(6, 0, 0),
-                departure_time: Time::new(6, 0, 0),
+                arrival_time: Some(Time::new(6, 0, 0)),
+                departure_time: Some(Time::new(6, 0, 0)),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0,
                 alighting_duration: 0,
                 pickup_type: 0,
@@ -1236,8 +1246,10 @@ mod tests {
             StopTime {
                 stop_point_idx: stop_points.get_idx("sp:01").unwrap(),
                 sequence: 2,
-                arrival_time: Time::new(6, 6, 27),
-                departure_time: Time::new(6, 6, 27),
+                arrival_time: Some(Time::new(6, 6, 27)),
+                departure_time: Some(Time::new(6, 6, 27)),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0,
                 alighting_duration: 0,
                 pickup_type: 2,
diff --git a/src/model.rs b/src/model.rs
index 65732e045..05dea22c2 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -1351,7 +1351,20 @@ impl Collections {
                 );
                 continue;
             };
-            let mut arrival_time_delta = st.arrival_time;
+
+            if corresponding_vj.stop_times.iter().any(|st| {
+                st.start_pickup_drop_off_window.is_some() || st.end_pickup_drop_off_window.is_some()
+            }) {
+                warn!(
+                    "frequency mapped to trip {:?} with drop_off_window stop_times not supported",
+                    frequency.vehicle_journey_id
+                );
+                continue;
+            }
+
+            let mut arrival_time_delta = st
+                .arrival_time
+                .expect("`stop_time.arrival_time` should not be empty");
 
             while start_time < frequency.end_time {
                 trip_id_sequence
@@ -1393,17 +1406,27 @@ impl Collections {
                 let stop_times: Vec<StopTime> = corresponding_vj
                     .stop_times
                     .iter()
-                    .map(|stop_time| StopTime {
-                        stop_point_idx: stop_time.stop_point_idx,
-                        sequence: stop_time.sequence,
-                        arrival_time: stop_time.arrival_time + start_time - arrival_time_delta,
-                        departure_time: stop_time.departure_time + start_time - arrival_time_delta,
-                        boarding_duration: stop_time.boarding_duration,
-                        alighting_duration: stop_time.alighting_duration,
-                        pickup_type: stop_time.pickup_type,
-                        drop_off_type: stop_time.drop_off_type,
-                        local_zone_id: stop_time.local_zone_id,
-                        precision: stop_time.precision.clone(),
+                    .map(|stop_time| {
+                        let arrival_time = stop_time
+                            .arrival_time
+                            .map(|at| at + start_time - arrival_time_delta);
+                        let departure_time = stop_time
+                            .departure_time
+                            .map(|dt| dt + start_time - arrival_time_delta);
+                        StopTime {
+                            stop_point_idx: stop_time.stop_point_idx,
+                            sequence: stop_time.sequence,
+                            arrival_time,
+                            departure_time,
+                            start_pickup_drop_off_window: None,
+                            end_pickup_drop_off_window: None,
+                            boarding_duration: stop_time.boarding_duration,
+                            alighting_duration: stop_time.alighting_duration,
+                            pickup_type: stop_time.pickup_type,
+                            drop_off_type: stop_time.drop_off_type,
+                            local_zone_id: stop_time.local_zone_id,
+                            precision: stop_time.precision.clone(),
+                        }
                     })
                     .collect();
                 start_time = start_time + Time::new(0, 0, frequency.headway_secs);
@@ -1727,8 +1750,10 @@ mod tests {
             let stop_time = StopTime {
                 stop_point_idx: collections.stop_points.get_idx("stop_point_id").unwrap(),
                 sequence: 0,
-                arrival_time: Time::new(0, 0, 0),
-                departure_time: Time::new(0, 0, 0),
+                arrival_time: Some(Time::new(0, 0, 0)),
+                departure_time: Some(Time::new(0, 0, 0)),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0,
                 alighting_duration: 0,
                 pickup_type: 0,
@@ -2067,8 +2092,10 @@ mod tests {
             let stop_time_at = |stop_point_id: &str| StopTime {
                 stop_point_idx: collections.stop_points.get_idx(stop_point_id).unwrap(),
                 sequence: 0,
-                arrival_time: Time::new(0, 0, 0),
-                departure_time: Time::new(0, 0, 0),
+                arrival_time: Some(Time::new(0, 0, 0)),
+                departure_time: Some(Time::new(0, 0, 0)),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0,
                 alighting_duration: 0,
                 pickup_type: 0,
@@ -2537,8 +2564,10 @@ mod tests {
             StopTime {
                 stop_point_idx: stop_points.get_idx(stop_point_id).unwrap(),
                 sequence: 1,
-                arrival_time,
-                departure_time,
+                arrival_time: Some(arrival_time),
+                departure_time: Some(departure_time),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0,
                 alighting_duration: 0,
                 pickup_type: 0,
diff --git a/src/model_builder.rs b/src/model_builder.rs
index 1847d9c9f..fdbcb09cd 100644
--- a/src/model_builder.rs
+++ b/src/model_builder.rs
@@ -735,8 +735,10 @@ impl<'a> VehicleJourneyBuilder<'a> {
             let mut stop_time = StopTime {
                 stop_point_idx,
                 sequence,
-                arrival_time: arrival.as_time(),
-                departure_time: departure.as_time(),
+                arrival_time: Some(arrival.as_time()),
+                departure_time: Some(departure.as_time()),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0u16,
                 alighting_duration: 0u16,
                 pickup_type,
diff --git a/src/netex_france/offer.rs b/src/netex_france/offer.rs
index a73cc060b..c59252d29 100644
--- a/src/netex_france/offer.rs
+++ b/src/netex_france/offer.rs
@@ -415,17 +415,23 @@ impl<'a> OfferExporter<'a> {
     }
 
     fn export_timetabled_passing_time(stop_time: &'a StopTime) -> Element {
-        let arrival_day_offset = stop_time.arrival_time.hours() / 24;
+        let arrival_time = stop_time
+            .arrival_time
+            .expect("`stop_time.arrival_time` should not be empty");
+        let departure_time = stop_time
+            .departure_time
+            .expect("`stop_time.departure_time` should not be empty");
+        let arrival_day_offset = arrival_time.hours() / 24;
         let arrival_time = Time::new(
-            stop_time.arrival_time.hours() % 24,
-            stop_time.arrival_time.minutes(),
-            stop_time.arrival_time.seconds(),
+            arrival_time.hours() % 24,
+            arrival_time.minutes(),
+            arrival_time.seconds(),
         );
-        let departure_day_offset = stop_time.departure_time.hours() / 24;
+        let departure_day_offset = departure_time.hours() / 24;
         let departure_time = Time::new(
-            stop_time.departure_time.hours() % 24,
-            stop_time.departure_time.minutes(),
-            stop_time.departure_time.seconds(),
+            departure_time.hours() % 24,
+            departure_time.minutes(),
+            departure_time.seconds(),
         );
         Element::builder(ObjectType::TimetabledPassingTime.to_string())
             .append(Self::generate_arrival_time(arrival_time))
@@ -804,8 +810,10 @@ mod tests {
                 StopTime {
                     stop_point_idx: collections.stop_points.get_idx("sp_id_1").unwrap(),
                     sequence: 0,
-                    arrival_time: Time::new(0, 0, 0),
-                    departure_time: Time::new(0, 0, 0),
+                    arrival_time: Some(Time::new(0, 0, 0)),
+                    departure_time: Some(Time::new(0, 0, 0)),
+                    start_pickup_drop_off_window: None,
+                    end_pickup_drop_off_window: None,
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 0,
@@ -816,8 +824,10 @@ mod tests {
                 StopTime {
                     stop_point_idx: collections.stop_points.get_idx("sp_id_2").unwrap(),
                     sequence: 1,
-                    arrival_time: Time::new(0, 0, 0),
-                    departure_time: Time::new(0, 0, 0),
+                    arrival_time: Some(Time::new(0, 0, 0)),
+                    departure_time: Some(Time::new(0, 0, 0)),
+                    start_pickup_drop_off_window: None,
+                    end_pickup_drop_off_window: None,
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 1,
@@ -847,8 +857,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp_id_1").unwrap(),
                         sequence: 0,
-                        arrival_time: Time::new(0, 0, 0),
-                        departure_time: Time::new(0, 0, 0),
+                        arrival_time: Some(Time::new(0, 0, 0)),
+                        departure_time: Some(Time::new(0, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -859,8 +871,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp_id_2").unwrap(),
                         sequence: 1,
-                        arrival_time: Time::new(0, 0, 0),
-                        departure_time: Time::new(0, 0, 0),
+                        arrival_time: Some(Time::new(0, 0, 0)),
+                        departure_time: Some(Time::new(0, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 1,
@@ -901,8 +915,10 @@ mod tests {
                 stop_times: vec![StopTime {
                     stop_point_idx: collections.stop_points.get_idx("sp_id_1").unwrap(),
                     sequence: 0,
-                    arrival_time: Time::new(0, 0, 0),
-                    departure_time: Time::new(0, 0, 0),
+                    arrival_time: Some(Time::new(0, 0, 0)),
+                    departure_time: Some(Time::new(0, 0, 0)),
+                    start_pickup_drop_off_window: None,
+                    end_pickup_drop_off_window: None,
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 0,
@@ -948,8 +964,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp_id_1").unwrap(),
                         sequence: 0,
-                        arrival_time: Time::new(0, 0, 0),
-                        departure_time: Time::new(0, 0, 0),
+                        arrival_time: Some(Time::new(0, 0, 0)),
+                        departure_time: Some(Time::new(0, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         // This pickup type is different from 'vj_id_1'
@@ -961,8 +979,10 @@ mod tests {
                     StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp_id_2").unwrap(),
                         sequence: 1,
-                        arrival_time: Time::new(0, 0, 0),
-                        departure_time: Time::new(0, 0, 0),
+                        arrival_time: Some(Time::new(0, 0, 0)),
+                        departure_time: Some(Time::new(0, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 1,
diff --git a/src/netex_france/route_points.rs b/src/netex_france/route_points.rs
index 3474bbc94..3a2eef0ac 100644
--- a/src/netex_france/route_points.rs
+++ b/src/netex_france/route_points.rs
@@ -110,8 +110,10 @@ mod tests {
             StopTime {
                 stop_point_idx,
                 sequence,
-                arrival_time: Time::new(0, 0, 0),
-                departure_time,
+                arrival_time: Some(Time::new(0, 0, 0)),
+                departure_time: Some(departure_time),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 0,
                 alighting_duration: 0,
                 pickup_type: 0,
diff --git a/src/ntfs/mod.rs b/src/ntfs/mod.rs
index 98804fc65..5d86312c1 100644
--- a/src/ntfs/mod.rs
+++ b/src/ntfs/mod.rs
@@ -41,8 +41,10 @@ struct StopTime {
     stop_id: String,
     trip_id: String,
     stop_sequence: u32,
-    arrival_time: Time,
-    departure_time: Time,
+    arrival_time: Option<Time>,
+    departure_time: Option<Time>,
+    start_pickup_drop_off_window: Option<Time>,
+    end_pickup_drop_off_window: Option<Time>,
     #[serde(default)]
     boarding_duration: u16,
     #[serde(default)]
@@ -766,8 +768,10 @@ mod tests {
                     objects::StopTime {
                         stop_point_idx: stop_points.get_idx("OIF:SP:36:2085").unwrap(),
                         sequence: 0,
-                        arrival_time: Time::new(14, 40, 0),
-                        departure_time: Time::new(14, 40, 0),
+                        arrival_time: Some(Time::new(14, 40, 0)),
+                        departure_time: Some(Time::new(14, 40, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -778,8 +782,10 @@ mod tests {
                     objects::StopTime {
                         stop_point_idx: stop_points.get_idx("OIF:SP:36:2127").unwrap(),
                         sequence: 1,
-                        arrival_time: Time::new(14, 42, 0),
-                        departure_time: Time::new(14, 42, 0),
+                        arrival_time: Some(Time::new(14, 42, 0)),
+                        departure_time: Some(Time::new(14, 42, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -1244,8 +1250,10 @@ mod tests {
             stop_times: vec![objects::StopTime {
                 stop_point_idx: stop_points.get_idx("sp_1").unwrap(),
                 sequence: 0,
-                arrival_time: Time::new(9, 0, 0),
-                departure_time: Time::new(9, 2, 0),
+                arrival_time: Some(Time::new(9, 0, 0)),
+                departure_time: Some(Time::new(9, 2, 0)),
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: 2,
                 alighting_duration: 3,
                 pickup_type: 1,
diff --git a/src/ntfs/read.rs b/src/ntfs/read.rs
index 653cd4acd..fdfb2d34d 100644
--- a/src/ntfs/read.rs
+++ b/src/ntfs/read.rs
@@ -321,6 +321,8 @@ where
                 sequence: stop_time.stop_sequence,
                 arrival_time: stop_time.arrival_time,
                 departure_time: stop_time.departure_time,
+                start_pickup_drop_off_window: None,
+                end_pickup_drop_off_window: None,
                 boarding_duration: stop_time.boarding_duration,
                 alighting_duration: stop_time.alighting_duration,
                 pickup_type: stop_time.pickup_type,
@@ -914,8 +916,10 @@ mod tests {
                     objects::StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:01").unwrap(),
                         sequence: 1,
-                        arrival_time: Time::new(6, 0, 0),
-                        departure_time: Time::new(6, 0, 0),
+                        arrival_time: Some(Time::new(6, 0, 0)),
+                        departure_time: Some(Time::new(6, 0, 0)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 0,
@@ -926,8 +930,10 @@ mod tests {
                     objects::StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:02").unwrap(),
                         sequence: 2,
-                        arrival_time: Time::new(6, 6, 27),
-                        departure_time: Time::new(6, 6, 27),
+                        arrival_time: Some(Time::new(6, 6, 27)),
+                        departure_time: Some(Time::new(6, 6, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
@@ -938,8 +944,10 @@ mod tests {
                     objects::StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:03").unwrap(),
                         sequence: 3,
-                        arrival_time: Time::new(6, 7, 27),
-                        departure_time: Time::new(6, 7, 27),
+                        arrival_time: Some(Time::new(6, 7, 27)),
+                        departure_time: Some(Time::new(6, 7, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
@@ -950,8 +958,10 @@ mod tests {
                     objects::StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:04").unwrap(),
                         sequence: 4,
-                        arrival_time: Time::new(6, 8, 27),
-                        departure_time: Time::new(6, 8, 27),
+                        arrival_time: Some(Time::new(6, 8, 27)),
+                        departure_time: Some(Time::new(6, 8, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
@@ -962,8 +972,10 @@ mod tests {
                     objects::StopTime {
                         stop_point_idx: collections.stop_points.get_idx("sp:05").unwrap(),
                         sequence: 5,
-                        arrival_time: Time::new(6, 9, 27),
-                        departure_time: Time::new(6, 9, 27),
+                        arrival_time: Some(Time::new(6, 9, 27)),
+                        departure_time: Some(Time::new(6, 9, 27)),
+                        start_pickup_drop_off_window: None,
+                        end_pickup_drop_off_window: None,
                         boarding_duration: 0,
                         alighting_duration: 0,
                         pickup_type: 2,
diff --git a/src/ntfs/write.rs b/src/ntfs/write.rs
index e3879c81b..0dc1fe393 100644
--- a/src/ntfs/write.rs
+++ b/src/ntfs/write.rs
@@ -101,6 +101,8 @@ pub fn write_vehicle_journeys_and_stop_times(
                     stop_sequence: st.sequence,
                     arrival_time: st.arrival_time,
                     departure_time: st.departure_time,
+                    start_pickup_drop_off_window: st.start_pickup_drop_off_window,
+                    end_pickup_drop_off_window: st.end_pickup_drop_off_window,
                     boarding_duration: st.boarding_duration,
                     alighting_duration: st.alighting_duration,
                     pickup_type: st.pickup_type,
diff --git a/src/objects.rs b/src/objects.rs
index ea90dc99a..0c34a5d44 100644
--- a/src/objects.rs
+++ b/src/objects.rs
@@ -687,10 +687,10 @@ impl GetObjectType for VehicleJourney {
 
 impl VehicleJourney {
     pub fn first_departure_time(&self) -> Option<Time> {
-        self.stop_times.first().map(|st| st.departure_time)
+        self.stop_times.first().and_then(|st| st.departure_time)
     }
     pub fn last_arrival_time(&self) -> Option<Time> {
-        self.stop_times.last().map(|st| st.arrival_time)
+        self.stop_times.last().and_then(|st| st.arrival_time)
     }
 }
 
@@ -722,14 +722,16 @@ impl VehicleJourney {
                 });
             }
             #[allow(clippy::suspicious_operation_groupings)]
-            if (curr_st.arrival_time > curr_st.departure_time)
-                || (curr_st.departure_time > next_st.arrival_time)
-            {
-                return Err(StopTimeError::IncoherentStopTimes {
-                    first_incorrect_sequence: curr_st.sequence,
-                    first_incorrect_time: curr_st.departure_time,
-                    vj_id: self.id.clone(),
-                });
+            if let Some(dt) = curr_st.departure_time {
+                if (curr_st.arrival_time > curr_st.departure_time)
+                    || (curr_st.departure_time > next_st.arrival_time)
+                {
+                    return Err(StopTimeError::IncoherentStopTimes {
+                        first_incorrect_sequence: curr_st.sequence,
+                        first_incorrect_time: dt,
+                        vj_id: self.id.clone(),
+                    });
+                }
             }
         }
         Ok(())
@@ -875,8 +877,10 @@ impl std::fmt::Display for Time {
 pub struct StopTime {
     pub stop_point_idx: Idx<StopPoint>,
     pub sequence: u32,
-    pub arrival_time: Time,
-    pub departure_time: Time,
+    pub arrival_time: Option<Time>,
+    pub departure_time: Option<Time>,
+    pub start_pickup_drop_off_window: Option<Time>,
+    pub end_pickup_drop_off_window: Option<Time>,
     pub boarding_duration: u16,
     pub alighting_duration: u16,
     pub pickup_type: u8,
@@ -2224,8 +2228,10 @@ mod tests {
                 .map(|(sequence, arrival, departure)| StopTime {
                     stop_point_idx,
                     sequence,
-                    arrival_time: Time::from_str(arrival).unwrap(),
-                    departure_time: Time::from_str(departure).unwrap(),
+                    arrival_time: Some(Time::from_str(arrival).unwrap()),
+                    departure_time: Some(Time::from_str(departure).unwrap()),
+                    start_pickup_drop_off_window: None,
+                    end_pickup_drop_off_window: None,
                     boarding_duration: 0,
                     alighting_duration: 0,
                     pickup_type: 0,

From 37c7ae83619ce927d6b55ed4f83dbc89e32106be Mon Sep 17 00:00:00 2001
From: ArnaudOggy <arnaud.ogiela@gmail.com>
Date: Fri, 13 Sep 2024 12:00:31 +0200
Subject: [PATCH 2/5] update fixtures

---
 .../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 +-
 10 files changed, 249 insertions(+), 249 deletions(-)

diff --git a/tests/fixtures/gtfs2ntfs/full_output/stop_times.txt b/tests/fixtures/gtfs2ntfs/full_output/stop_times.txt
index 483f2ac3e..ea3c0f4e4 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 f16d2242f..e2b1e2553 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 337dc533b..ae9181361 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 5d2f0de8b..e4d28622b 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 8446df860..bb93104e1 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 f16d2242f..e2b1e2553 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 f16d2242f..e2b1e2553 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 5bb7f7537..ce33edd17 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 35d96b984..e7d703a46 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 0d8025a88..c1bf74046 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,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
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,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 5867085694d79b45ea8d28c271054300fd74beec Mon Sep 17 00:00:00 2001
From: ArnaudOggy <arnaud.ogiela@gmail.com>
Date: Fri, 13 Sep 2024 17:28:02 +0200
Subject: [PATCH 3/5] Bump Ntfs to v0.18.0 and TransitModel to v0.67.0

---
 Cargo.toml                                                      | 2 +-
 src/lib.rs                                                      | 2 +-
 src/ntfs/mod.rs                                                 | 2 +-
 tests/fixtures/gtfs2ntfs/full_output/feed_infos.txt             | 2 +-
 tests/fixtures/gtfs2ntfs/minimal/output/feed_infos.txt          | 2 +-
 tests/fixtures/gtfs2ntfs/routes_comments/output/feed_infos.txt  | 2 +-
 .../gtfs2ntfs/routes_comments/output_as_lines/feed_infos.txt    | 2 +-
 tests/fixtures/restrict-validity-period/output/feed_infos.txt   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0c261d66e..f2cfecc08 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Hove <core@hove.com>", "Guillaume Pinot <texitoi@texitoi.eu>"]
 name = "transit_model"
-version = "0.66.0"
+version = "0.67.0"
 license = "AGPL-3.0-only"
 description = "Transit data management"
 repository = "https://github.com/hove-io/transit_model"
diff --git a/src/lib.rs b/src/lib.rs
index 947d67df8..b78c53283 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -82,7 +82,7 @@ pub mod vptranslator;
 pub(crate) const STOP_TIMES_INIT_CAPACITY: usize = 50;
 
 /// Current version of the NTFS format
-pub const NTFS_VERSION: &str = "0.17.0";
+pub const NTFS_VERSION: &str = "0.18.0";
 
 /// The max distance in meters to compute the transfer
 pub const TRANSFER_MAX_DISTANCE: &str = "300";
diff --git a/src/ntfs/mod.rs b/src/ntfs/mod.rs
index 5d86312c1..477817ec8 100644
--- a/src/ntfs/mod.rs
+++ b/src/ntfs/mod.rs
@@ -535,7 +535,7 @@ mod tests {
                     ("feed_end_date".to_string(), "20180131".to_string()),
                     ("feed_publisher_name".to_string(), "Nicaragua".to_string()),
                     ("feed_start_date".to_string(), "20180130".to_string()),
-                    ("ntfs_version".to_string(), "0.17.0".to_string()),
+                    ("ntfs_version".to_string(), "0.18.0".to_string()),
                     ("tartare_platform".to_string(), "dev".to_string()),
                 ],
                 collections
diff --git a/tests/fixtures/gtfs2ntfs/full_output/feed_infos.txt b/tests/fixtures/gtfs2ntfs/full_output/feed_infos.txt
index 78aea85ff..c6246ab67 100644
--- a/tests/fixtures/gtfs2ntfs/full_output/feed_infos.txt
+++ b/tests/fixtures/gtfs2ntfs/full_output/feed_infos.txt
@@ -7,6 +7,6 @@ feed_license,DefaultDatasourceLicense
 feed_license_url,http://www.default-datasource-website.com
 feed_publisher_name,DefaultContributorName
 feed_start_date,20180101
-ntfs_version,0.17.0
+ntfs_version,0.18.0
 tartare_contributor_id,DefaultContributorId
 tartare_platform,dev
diff --git a/tests/fixtures/gtfs2ntfs/minimal/output/feed_infos.txt b/tests/fixtures/gtfs2ntfs/minimal/output/feed_infos.txt
index d212895f8..2f45823b6 100644
--- a/tests/fixtures/gtfs2ntfs/minimal/output/feed_infos.txt
+++ b/tests/fixtures/gtfs2ntfs/minimal/output/feed_infos.txt
@@ -4,4 +4,4 @@ feed_creation_time,17:19:00
 feed_creation_datetime,2019-04-03T17:19:00+00:00
 feed_end_date,20180106
 feed_start_date,20180101
-ntfs_version,0.17.0
+ntfs_version,0.18.0
diff --git a/tests/fixtures/gtfs2ntfs/routes_comments/output/feed_infos.txt b/tests/fixtures/gtfs2ntfs/routes_comments/output/feed_infos.txt
index d212895f8..2f45823b6 100644
--- a/tests/fixtures/gtfs2ntfs/routes_comments/output/feed_infos.txt
+++ b/tests/fixtures/gtfs2ntfs/routes_comments/output/feed_infos.txt
@@ -4,4 +4,4 @@ feed_creation_time,17:19:00
 feed_creation_datetime,2019-04-03T17:19:00+00:00
 feed_end_date,20180106
 feed_start_date,20180101
-ntfs_version,0.17.0
+ntfs_version,0.18.0
diff --git a/tests/fixtures/gtfs2ntfs/routes_comments/output_as_lines/feed_infos.txt b/tests/fixtures/gtfs2ntfs/routes_comments/output_as_lines/feed_infos.txt
index d212895f8..2f45823b6 100644
--- a/tests/fixtures/gtfs2ntfs/routes_comments/output_as_lines/feed_infos.txt
+++ b/tests/fixtures/gtfs2ntfs/routes_comments/output_as_lines/feed_infos.txt
@@ -4,4 +4,4 @@ feed_creation_time,17:19:00
 feed_creation_datetime,2019-04-03T17:19:00+00:00
 feed_end_date,20180106
 feed_start_date,20180101
-ntfs_version,0.17.0
+ntfs_version,0.18.0
diff --git a/tests/fixtures/restrict-validity-period/output/feed_infos.txt b/tests/fixtures/restrict-validity-period/output/feed_infos.txt
index c265501fd..8a0aaaf41 100644
--- a/tests/fixtures/restrict-validity-period/output/feed_infos.txt
+++ b/tests/fixtures/restrict-validity-period/output/feed_infos.txt
@@ -4,4 +4,4 @@ feed_creation_time,17:19:00
 feed_creation_datetime,2019-04-03T17:19:00+00:00
 feed_end_date,20180805
 feed_start_date,20180501
-ntfs_version,0.17.0
+ntfs_version,0.18.0

From 85af09e71e64f6f4235687f74dd8baeb31048b15 Mon Sep 17 00:00:00 2001
From: ArnaudOggy <arnaud.ogiela@gmail.com>
Date: Wed, 18 Sep 2024 15:15:24 +0200
Subject: [PATCH 4/5] Add ntfs fixture with stoptimes windows

---
 .../input/booking_rule_links.txt              |   4 +
 .../ntfs_with_windows/input/booking_rules.txt |   4 +
 .../ntfs_with_windows/input/calendar.txt      |   3 +
 .../input/commercial_modes.txt                |   3 +
 .../ntfs_with_windows/input/companies.txt     |   5 +
 .../ntfs_with_windows/input/contributors.txt  |   2 +
 .../ntfs_with_windows/input/datasets.txt      |   2 +
 .../ntfs_with_windows/input/equipments.txt    |   4 +
 .../ntfs_with_windows/input/feed_infos.txt    |   7 +
 .../ntfs_with_windows/input/lines.txt         |   5 +
 .../ntfs_with_windows/input/networks.txt      |   5 +
 .../ntfs_with_windows/input/object_codes.txt  | 211 ++++++++++++++++++
 .../input/physical_modes.txt                  |   6 +
 .../ntfs_with_windows/input/routes.txt        |   5 +
 .../ntfs_with_windows/input/stop_times.txt    |  21 ++
 .../ntfs_with_windows/input/stops.txt         |  40 ++++
 .../ntfs_with_windows/input/transfers.txt     |  27 +++
 .../input/trip_properties.txt                 |   5 +
 .../ntfs_with_windows/input/trips.txt         |   5 +
 .../ntfs_with_windows/output/stop_times.txt   |  21 ++
 tests/read_ntfs.rs                            |  13 ++
 21 files changed, 398 insertions(+)
 create mode 100644 tests/fixtures/ntfs_with_windows/input/booking_rule_links.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/booking_rules.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/calendar.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/commercial_modes.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/companies.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/contributors.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/datasets.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/equipments.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/feed_infos.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/lines.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/networks.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/object_codes.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/physical_modes.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/routes.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/stop_times.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/stops.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/transfers.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/trip_properties.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/input/trips.txt
 create mode 100644 tests/fixtures/ntfs_with_windows/output/stop_times.txt

diff --git a/tests/fixtures/ntfs_with_windows/input/booking_rule_links.txt b/tests/fixtures/ntfs_with_windows/input/booking_rule_links.txt
new file mode 100644
index 000000000..5c76ae929
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/booking_rule_links.txt
@@ -0,0 +1,4 @@
+object_id,object_type,booking_rule_id
+MFDI:KVVB:158023-C02513-1638-260,trip,MFDI:10
+MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,trip,MFDI:12
+MFDI:KRO6:153358-C02060-680-260,trip,MFDI:11
diff --git a/tests/fixtures/ntfs_with_windows/input/booking_rules.txt b/tests/fixtures/ntfs_with_windows/input/booking_rules.txt
new file mode 100644
index 000000000..92b6816d3
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/booking_rules.txt
@@ -0,0 +1,4 @@
+booking_rule_id,name,info_url,phone_number,message,booking_url
+MFDI:10,sans_reservation,,,"Bus de soirée : Le service fonctionne sans réservation, il suffit d'indiquer l'arrêt de descente au conducteur",
+MFDI:11,avec_reservation,https://www.fileo.com/se-deplacer/reserver-votre-fileo/,01 74 37 24 77,24h/24 et 7j/7,
+MFDI:12,sans_reservation,,,,
diff --git a/tests/fixtures/ntfs_with_windows/input/calendar.txt b/tests/fixtures/ntfs_with_windows/input/calendar.txt
new file mode 100644
index 000000000..01fd2617d
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/calendar.txt
@@ -0,0 +1,3 @@
+service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date
+MFDI:1,1,1,1,1,1,0,0,20240916,20241015
+MFDI:1000,1,1,1,1,1,1,1,20240916,20241015
diff --git a/tests/fixtures/ntfs_with_windows/input/commercial_modes.txt b/tests/fixtures/ntfs_with_windows/input/commercial_modes.txt
new file mode 100644
index 000000000..0cf491854
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/commercial_modes.txt
@@ -0,0 +1,3 @@
+commercial_mode_id,commercial_mode_name
+Bus,Bus
+Metro,Métro
diff --git a/tests/fixtures/ntfs_with_windows/input/companies.txt b/tests/fixtures/ntfs_with_windows/input/companies.txt
new file mode 100644
index 000000000..052b8e962
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/companies.txt
@@ -0,0 +1,5 @@
+company_id,company_name,company_address,company_url,company_mail,company_phone
+MFDI:100,RATP,,,,
+MFDI:1017,Keolis Vélizy Vallée de la Bièvre,,,,
+MFDI:1028,Keolis Roissy Pays de France Ouest,,,,
+MFDI:1021,Transdev Boucle des Lys,,,,
diff --git a/tests/fixtures/ntfs_with_windows/input/contributors.txt b/tests/fixtures/ntfs_with_windows/input/contributors.txt
new file mode 100644
index 000000000..cbb88ece5
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/contributors.txt
@@ -0,0 +1,2 @@
+contributor_id,contributor_name,contributor_license,contributor_website
+MFDI:ntx,ntx,public,
diff --git a/tests/fixtures/ntfs_with_windows/input/datasets.txt b/tests/fixtures/ntfs_with_windows/input/datasets.txt
new file mode 100644
index 000000000..eb8273f33
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/datasets.txt
@@ -0,0 +1,2 @@
+dataset_id,contributor_id,dataset_start_date,dataset_end_date,dataset_type,dataset_extrapolation,dataset_desc,dataset_system
+MFDI:4c649e1d-f7e4-4622-b6df-30e0997704af,MFDI:ntx,20240916,20241015,,0,,
diff --git a/tests/fixtures/ntfs_with_windows/input/equipments.txt b/tests/fixtures/ntfs_with_windows/input/equipments.txt
new file mode 100644
index 000000000..1fbd753ad
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/equipments.txt
@@ -0,0 +1,4 @@
+equipment_id,wheelchair_boarding,sheltered,elevator,escalator,bike_accepted,bike_depot,visual_announcement,audible_announcement,appropriate_escort,appropriate_signage
+MFDI:1,1,0,0,0,0,0,0,0,0,0
+MFDI:2,2,0,0,0,0,0,0,0,0,0
+MFDI:3,2,0,0,0,0,0,1,1,0,0
diff --git a/tests/fixtures/ntfs_with_windows/input/feed_infos.txt b/tests/fixtures/ntfs_with_windows/input/feed_infos.txt
new file mode 100644
index 000000000..c0b75d89c
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/feed_infos.txt
@@ -0,0 +1,7 @@
+feed_info_param,feed_info_value
+feed_creation_date,20240918
+feed_creation_datetime,2024-09-18T11:33:52+00:00
+feed_creation_time,11:33:52
+feed_end_date,20241015
+feed_start_date,20240916
+ntfs_version,0.18.0
diff --git a/tests/fixtures/ntfs_with_windows/input/lines.txt b/tests/fixtures/ntfs_with_windows/input/lines.txt
new file mode 100644
index 000000000..726bc2261
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/lines.txt
@@ -0,0 +1,5 @@
+line_id,line_code,line_name,forward_line_name,backward_line_name,line_color,line_text_color,line_sort_order,network_id,commercial_mode_id,geometry_id,line_opening_time,line_closing_time
+MFDI:C01376,6,6,,,6ECA97,0,,MFDI:Operator_100,Metro,,,
+MFDI:C02060,Filéo RS,Filéo Roissy Sud - Villeparisis et Mitry (sur réservation),,,4890CD,FFFFFF,,MFDI:1071,Bus,,,
+MFDI:C02491,Soir,Soir Saint-Germain-en-Laye,,,652C8F,FFFFFF,,MFDI:1062,Bus,,,
+MFDI:C02513,Soir,Soir Versailles-Chantiers,,,640082,FFFFFF,,MFDI:1061,Bus,,,
diff --git a/tests/fixtures/ntfs_with_windows/input/networks.txt b/tests/fixtures/ntfs_with_windows/input/networks.txt
new file mode 100644
index 000000000..6d82bb8f7
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/networks.txt
@@ -0,0 +1,5 @@
+network_id,network_name,network_url,network_timezone,network_lang,network_phone,network_address,network_fare_url,network_sort_order
+MFDI:1061,Vélizy Vallées,https://www.iledefrance-mobilites.fr,Europe/Paris,,,,https://applidium.page.link/default,
+MFDI:1071,Roissy Ouest,https://www.iledefrance-mobilites.fr,Europe/Paris,,,,https://applidium.page.link/default,
+MFDI:1062,Saint Germain Boucles de Seine,https://www.iledefrance-mobilites.fr,Europe/Paris,,,,https://applidium.page.link/default,
+MFDI:Operator_100,RATP,https://www.iledefrance-mobilites.fr,Europe/Paris,,,,https://applidium.page.link/default,
diff --git a/tests/fixtures/ntfs_with_windows/input/object_codes.txt b/tests/fixtures/ntfs_with_windows/input/object_codes.txt
new file mode 100644
index 000000000..9727314a6
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/object_codes.txt
@@ -0,0 +1,211 @@
+object_type,object_id,object_system,object_code
+stop_area,MFDI:461827,source,FR::multimodalStopPlace:461827:FR1
+stop_area,MFDI:426072,source,FR::multimodalStopPlace:426072:FR1
+stop_area,MFDI:71639,source,FR::multimodalStopPlace:71639:FR1
+stop_area,MFDI:71673,TN_PA,484
+stop_area,MFDI:71673,source,FR::multimodalStopPlace:71673:FR1
+stop_area,MFDI:64589,TN_PA,476
+stop_area,MFDI:64589,source,FR::multimodalStopPlace:64589:FR1
+stop_area,MFDI:63880,TN_PA,210
+stop_area,MFDI:63880,source,FR::multimodalStopPlace:63880:FR1
+stop_area,MFDI:71026,source,FR::multimodalStopPlace:71026:FR1
+stop_area,MFDI:64509,source,FR::multimodalStopPlace:64509:FR1
+stop_area,MFDI:64485,source,FR::multimodalStopPlace:64485:FR1
+stop_area,MFDI:63534,source,FR::multimodalStopPlace:63534:FR1
+stop_area,MFDI:63529,source,FR::multimodalStopPlace:63529:FR1
+stop_area,MFDI:63438,source,FR::multimodalStopPlace:63438:FR1
+stop_area,MFDI:73556,source,FR::multimodalStopPlace:73556:FR1
+stop_area,MFDI:73596,TN_PA,376
+stop_area,MFDI:73596,source,FR::multimodalStopPlace:73596:FR1
+stop_area,MFDI:73591,source,FR::multimodalStopPlace:73591:FR1
+stop_area,MFDI:71347,TN_PA,482
+stop_area,MFDI:71347,source,FR::multimodalStopPlace:71347:FR1
+stop_area,MFDI:73486,source,FR::multimodalStopPlace:73486:FR1
+stop_area,MFDI:71199,source,FR::multimodalStopPlace:71199:FR1
+stop_area,MFDI:480959,source,FR::multimodalStopPlace:480959:FR1
+stop_point,MFDI:22167,netex_monomodal_stopplace,monomodalStopPlace:44334
+stop_point,MFDI:22167,netex_zder_quay,22167
+stop_point,MFDI:22167,netex_zder_quay,463098
+stop_point,MFDI:22167,netex_zder_quay,monomodalStopPlace:44334
+stop_point,MFDI:22167,source,FR::Quay:22167:FR1
+stop_point,MFDI:22173,netex_monomodal_stopplace,monomodalStopPlace:45276
+stop_point,MFDI:22173,netex_zder_quay,22173
+stop_point,MFDI:22173,netex_zder_quay,463186
+stop_point,MFDI:22173,netex_zder_quay,monomodalStopPlace:45276
+stop_point,MFDI:22173,source,FR::Quay:22173:FR1
+stop_point,MFDI:22073,netex_monomodal_stopplace,monomodalStopPlace:462358
+stop_point,MFDI:22073,netex_zder_quay,21919
+stop_point,MFDI:22073,netex_zder_quay,22072
+stop_point,MFDI:22073,netex_zder_quay,22073
+stop_point,MFDI:22073,netex_zder_quay,22080
+stop_point,MFDI:22073,netex_zder_quay,462942
+stop_point,MFDI:22073,netex_zder_quay,462943
+stop_point,MFDI:22073,netex_zder_quay,463028
+stop_point,MFDI:22073,netex_zder_quay,463067
+stop_point,MFDI:22073,netex_zder_quay,monomodalStopPlace:462358
+stop_point,MFDI:22073,source,FR::Quay:22073:FR1
+stop_point,MFDI:41403,netex_monomodal_stopplace,monomodalStopPlace:425035
+stop_point,MFDI:41403,netex_zder_quay,41403
+stop_point,MFDI:41403,netex_zder_quay,472884
+stop_point,MFDI:41403,netex_zder_quay,monomodalStopPlace:425035
+stop_point,MFDI:41403,source,FR::Quay:41403:FR1
+stop_point,MFDI:463194,netex_monomodal_stopplace,monomodalStopPlace:43566
+stop_point,MFDI:463194,netex_zder_quay,21969
+stop_point,MFDI:463194,netex_zder_quay,22162
+stop_point,MFDI:463194,netex_zder_quay,22183
+stop_point,MFDI:463194,netex_zder_quay,463194
+stop_point,MFDI:463194,netex_zder_quay,463201
+stop_point,MFDI:463194,netex_zder_quay,463202
+stop_point,MFDI:463194,netex_zder_quay,monomodalStopPlace:43566
+stop_point,MFDI:463194,source,FR::Quay:463194:FR1
+stop_point,MFDI:463042,netex_monomodal_stopplace,monomodalStopPlace:477682
+stop_point,MFDI:463042,netex_zder_quay,22086
+stop_point,MFDI:463042,netex_zder_quay,22094
+stop_point,MFDI:463042,netex_zder_quay,22095
+stop_point,MFDI:463042,netex_zder_quay,463013
+stop_point,MFDI:463042,netex_zder_quay,463042
+stop_point,MFDI:463042,netex_zder_quay,463043
+stop_point,MFDI:463042,netex_zder_quay,monomodalStopPlace:477682
+stop_point,MFDI:463042,source,FR::Quay:463042:FR1
+stop_point,MFDI:426813,netex_monomodal_stopplace,monomodalStopPlace:462743
+stop_point,MFDI:426813,netex_zder_quay,13070
+stop_point,MFDI:426813,netex_zder_quay,13071
+stop_point,MFDI:426813,netex_zder_quay,14651
+stop_point,MFDI:426813,netex_zder_quay,34203
+stop_point,MFDI:426813,netex_zder_quay,35054
+stop_point,MFDI:426813,netex_zder_quay,426791
+stop_point,MFDI:426813,netex_zder_quay,426806
+stop_point,MFDI:426813,netex_zder_quay,426807
+stop_point,MFDI:426813,netex_zder_quay,426812
+stop_point,MFDI:426813,netex_zder_quay,426813
+stop_point,MFDI:426813,netex_zder_quay,426814
+stop_point,MFDI:426813,netex_zder_quay,427388
+stop_point,MFDI:426813,netex_zder_quay,471706
+stop_point,MFDI:426813,netex_zder_quay,477638
+stop_point,MFDI:426813,netex_zder_quay,477718
+stop_point,MFDI:426813,netex_zder_quay,477719
+stop_point,MFDI:426813,netex_zder_quay,485088
+stop_point,MFDI:426813,netex_zder_quay,487504
+stop_point,MFDI:426813,netex_zder_quay,488050
+stop_point,MFDI:426813,netex_zder_quay,488255
+stop_point,MFDI:426813,netex_zder_quay,488256
+stop_point,MFDI:426813,netex_zder_quay,monomodalStopPlace:462743
+stop_point,MFDI:426813,source,FR::Quay:426813:FR1
+stop_point,MFDI:426214,netex_monomodal_stopplace,monomodalStopPlace:57672
+stop_point,MFDI:426214,netex_zder_quay,20300
+stop_point,MFDI:426214,netex_zder_quay,426214
+stop_point,MFDI:426214,netex_zder_quay,monomodalStopPlace:57672
+stop_point,MFDI:426214,source,FR::Quay:426214:FR1
+stop_point,MFDI:477725,netex_monomodal_stopplace,monomodalStopPlace:480958
+stop_point,MFDI:477725,netex_zder_quay,477725
+stop_point,MFDI:477725,netex_zder_quay,monomodalStopPlace:480958
+stop_point,MFDI:477725,source,FR::Quay:477725:FR1
+stop_point,MFDI:34582,netex_monomodal_stopplace,monomodalStopPlace:54733
+stop_point,MFDI:34582,netex_zder_quay,34582
+stop_point,MFDI:34582,netex_zder_quay,34719
+stop_point,MFDI:34582,netex_zder_quay,monomodalStopPlace:54733
+stop_point,MFDI:34582,source,FR::Quay:34582:FR1
+stop_point,MFDI:38175,netex_monomodal_stopplace,monomodalStopPlace:44262
+stop_point,MFDI:38175,netex_zder_quay,38175
+stop_point,MFDI:38175,netex_zder_quay,40739
+stop_point,MFDI:38175,netex_zder_quay,monomodalStopPlace:44262
+stop_point,MFDI:38175,source,FR::Quay:38175:FR1
+stop_point,MFDI:461909,netex_monomodal_stopplace,monomodalStopPlace:473812
+stop_point,MFDI:461909,netex_zder_quay,13497
+stop_point,MFDI:461909,netex_zder_quay,34498
+stop_point,MFDI:461909,netex_zder_quay,34605
+stop_point,MFDI:461909,netex_zder_quay,34610
+stop_point,MFDI:461909,netex_zder_quay,34657
+stop_point,MFDI:461909,netex_zder_quay,34658
+stop_point,MFDI:461909,netex_zder_quay,35033
+stop_point,MFDI:461909,netex_zder_quay,461909
+stop_point,MFDI:461909,netex_zder_quay,481823
+stop_point,MFDI:461909,netex_zder_quay,491803
+stop_point,MFDI:461909,netex_zder_quay,monomodalStopPlace:473812
+stop_point,MFDI:461909,source,FR::Quay:461909:FR1
+stop_point,MFDI:18995,netex_monomodal_stopplace,monomodalStopPlace:57333
+stop_point,MFDI:18995,netex_zder_quay,18995
+stop_point,MFDI:18995,netex_zder_quay,19563
+stop_point,MFDI:18995,netex_zder_quay,monomodalStopPlace:57333
+stop_point,MFDI:18995,source,FR::Quay:18995:FR1
+stop_point,MFDI:34605,netex_monomodal_stopplace,monomodalStopPlace:473812
+stop_point,MFDI:34605,netex_zder_quay,13497
+stop_point,MFDI:34605,netex_zder_quay,34498
+stop_point,MFDI:34605,netex_zder_quay,34605
+stop_point,MFDI:34605,netex_zder_quay,34610
+stop_point,MFDI:34605,netex_zder_quay,34657
+stop_point,MFDI:34605,netex_zder_quay,34658
+stop_point,MFDI:34605,netex_zder_quay,35033
+stop_point,MFDI:34605,netex_zder_quay,461909
+stop_point,MFDI:34605,netex_zder_quay,481823
+stop_point,MFDI:34605,netex_zder_quay,491803
+stop_point,MFDI:34605,netex_zder_quay,monomodalStopPlace:473812
+stop_point,MFDI:34605,source,FR::Quay:34605:FR1
+stop_point,MFDI:34744,netex_monomodal_stopplace,monomodalStopPlace:44620
+stop_point,MFDI:34744,netex_zder_quay,34744
+stop_point,MFDI:34744,netex_zder_quay,34745
+stop_point,MFDI:34744,netex_zder_quay,monomodalStopPlace:44620
+stop_point,MFDI:34744,source,FR::Quay:34744:FR1
+stop_point,MFDI:11584,netex_monomodal_stopplace,monomodalStopPlace:52901
+stop_point,MFDI:11584,netex_zder_quay,11584
+stop_point,MFDI:11584,netex_zder_quay,11585
+stop_point,MFDI:11584,netex_zder_quay,monomodalStopPlace:52901
+stop_point,MFDI:11584,source,FR::Quay:11584:FR1
+stop_point,MFDI:14081,netex_monomodal_stopplace,monomodalStopPlace:45016
+stop_point,MFDI:14081,netex_zder_quay,14081
+stop_point,MFDI:14081,netex_zder_quay,monomodalStopPlace:45016
+stop_point,MFDI:14081,source,FR::Quay:14081:FR1
+stop_point,MFDI:20324,netex_monomodal_stopplace,monomodalStopPlace:57680
+stop_point,MFDI:20324,netex_zder_quay,20324
+stop_point,MFDI:20324,netex_zder_quay,20325
+stop_point,MFDI:20324,netex_zder_quay,monomodalStopPlace:57680
+stop_point,MFDI:20324,source,FR::Quay:20324:FR1
+stop_point,MFDI:20312,netex_monomodal_stopplace,monomodalStopPlace:46420
+stop_point,MFDI:20312,netex_zder_quay,20312
+stop_point,MFDI:20312,netex_zder_quay,20313
+stop_point,MFDI:20312,netex_zder_quay,monomodalStopPlace:46420
+stop_point,MFDI:20312,source,FR::Quay:20312:FR1
+stop_point,MFDI:485179,netex_monomodal_stopplace,monomodalStopPlace:477262
+stop_point,MFDI:485179,netex_zder_quay,477079
+stop_point,MFDI:485179,netex_zder_quay,477080
+stop_point,MFDI:485179,netex_zder_quay,477194
+stop_point,MFDI:485179,netex_zder_quay,477497
+stop_point,MFDI:485179,netex_zder_quay,477499
+stop_point,MFDI:485179,netex_zder_quay,477886
+stop_point,MFDI:485179,netex_zder_quay,479496
+stop_point,MFDI:485179,netex_zder_quay,479497
+stop_point,MFDI:485179,netex_zder_quay,485179
+stop_point,MFDI:485179,netex_zder_quay,491506
+stop_point,MFDI:485179,netex_zder_quay,491507
+stop_point,MFDI:485179,netex_zder_quay,monomodalStopPlace:477262
+stop_point,MFDI:485179,source,FR::Quay:485179:FR1
+network,MFDI:1061,source,FR1:Network:1061:LOC
+network,MFDI:1071,source,FR1:Network:1071:LOC
+network,MFDI:1062,source,FR1:Network:1062:LOC
+network,MFDI:Operator_100,source,FR1:Operator:100:LOC
+line,MFDI:C01376,Netex_PrivateCode,100110006
+line,MFDI:C01376,source,FR1:Line:C01376:
+line,MFDI:C02060,Netex_PrivateCode,116277010
+line,MFDI:C02060,source,FR1:Line:C02060:
+line,MFDI:C02491,Netex_PrivateCode,532532100
+line,MFDI:C02491,source,FR1:Line:C02491:
+line,MFDI:C02513,Netex_PrivateCode,000527266
+line,MFDI:C02513,source,FR1:Line:C02513:
+route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Netex_ServiceJourneyPattern,RATP:ServiceJourneyPattern:107494-C01376-MISS_RATP_C01376_-1163221766:LOC
+route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Netex_ServiceJourneyPattern,RATP:ServiceJourneyPattern:107494-C01376-MISS_RATP_C01376_-1646701812:LOC
+route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Netex_ServiceJourneyPattern,RATP:ServiceJourneyPattern:107494-C01376-MISS_RATP_C01376_-1818959048:LOC
+route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Netex_ServiceJourneyPattern,RATP:ServiceJourneyPattern:107494-C01376-MISS_RATP_C01376_1351424965:LOC
+route,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,source,RATP:Route:107494-C01376-ITI_IDFM_C01376_A_-1009412783:LOC
+route,MFDI:KVVB:C02513-SOIR-A,Netex_ServiceJourneyPattern,KVVB:ServiceJourneyPattern:158023-C02513-DWH-C02513-SOIR-A-02:LOC
+route,MFDI:KVVB:C02513-SOIR-A,source,KVVB:Route:C02513-SOIR-A:LOC
+route,MFDI:BOUCLE_DE_LYS:82336-C02491-4740-ALLER,Netex_ServiceJourneyPattern,BOUCLE_DE_LYS:ServiceJourneyPattern:82336-C02491-41025:LOC
+route,MFDI:BOUCLE_DE_LYS:82336-C02491-4740-ALLER,source,BOUCLE_DE_LYS:Route:82336-C02491-4740-ALLER:LOC
+route,MFDI:stif:local-153359-C02060-3417,Netex_ServiceJourneyPattern,KRO6:ServiceJourneyPattern:153358-C02060-DWH-C02060-F12-A-02:LOC
+route,MFDI:stif:local-153359-C02060-3417,Netex_ServiceJourneyPattern,KRO6:ServiceJourneyPattern:153358-C02060-DWH-C02060-F12-A-03:LOC
+route,MFDI:stif:local-153359-C02060-3417,Netex_ServiceJourneyPattern,KRO6:ServiceJourneyPattern:153358-C02060-DWH-C02060-F12-A-06:LOC
+route,MFDI:stif:local-153359-C02060-3417,Netex_ServiceJourneyPattern,KRO6:ServiceJourneyPattern:153358-C02060-DWH-C02060-F12-A-07:LOC
+route,MFDI:stif:local-153359-C02060-3417,source,stif:Route:local-153359-C02060-3417:LOC
+trip,MFDI:KVVB:158023-C02513-1638-260,source,KVVB:ServiceJourney:158023-C02513-1638-260:LOC
+trip,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,source,BOUCLE_DE_LYS:ServiceJourney:149996-C02491-18777678:LOC
+trip,MFDI:KRO6:153358-C02060-680-260,source,KRO6:ServiceJourney:153358-C02060-680-260:LOC
+trip,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,source,RATP:ServiceJourney:153912-C01376-COU_RATP_5086613_2991428_116:LOC
diff --git a/tests/fixtures/ntfs_with_windows/input/physical_modes.txt b/tests/fixtures/ntfs_with_windows/input/physical_modes.txt
new file mode 100644
index 000000000..ddfc1437f
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/physical_modes.txt
@@ -0,0 +1,6 @@
+physical_mode_id,physical_mode_name,co2_emission
+Bus,Bus,92.0
+Metro,Métro,3.8
+Bike,Bike,0.0
+BikeSharingService,BikeSharingService,0.0
+Car,Car,184.0
diff --git a/tests/fixtures/ntfs_with_windows/input/routes.txt b/tests/fixtures/ntfs_with_windows/input/routes.txt
new file mode 100644
index 000000000..d46ecfefa
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/routes.txt
@@ -0,0 +1,5 @@
+route_id,route_name,direction_type,line_id,geometry_id,destination_id
+MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Charles de Gaulle - Etoile,outbound,MFDI:C01376,,MFDI:71347
+MFDI:KVVB:C02513-SOIR-A,Porte Jaune,outbound,MFDI:C02513,,MFDI:63534
+MFDI:BOUCLE_DE_LYS:82336-C02491-4740-ALLER,Gare de St-Germain-en-Laye - Gare Routière,inbound,MFDI:C02491,,MFDI:64589
+MFDI:stif:local-153359-C02060-3417,Gare de Roissypole Aéroport CDG 1,outbound,MFDI:C02060,,MFDI:73596
diff --git a/tests/fixtures/ntfs_with_windows/input/stop_times.txt b/tests/fixtures/ntfs_with_windows/input/stop_times.txt
new file mode 100644
index 000000000..af3d61dc2
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/stop_times.txt
@@ -0,0 +1,21 @@
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision
+MFDI:485179,MFDI:KVVB:158023-C02513-1638-260,0,22:30:00,22:30:00,,,0,0,2,1,,,,0
+MFDI:426214,MFDI:KVVB:158023-C02513-1638-260,1,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:20312,MFDI:KVVB:158023-C02513-1638-260,12,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:20324,MFDI:KVVB:158023-C02513-1638-260,24,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:11584,MFDI:KVVB:158023-C02513-1638-260,32,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:34605,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,0,,,23:15:00,23:48:00,0,0,2,1,,,,2
+MFDI:34744,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,1,,,23:15:00,23:48:00,0,0,2,2,,,,2
+MFDI:14081,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,15,,,23:15:00,23:48:00,0,0,2,2,,,,2
+MFDI:34582,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,25,,,23:15:00,23:48:00,0,0,2,2,,,,2
+MFDI:461909,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,35,,,23:15:00,23:48:00,0,0,1,2,,,,2
+MFDI:477725,MFDI:KRO6:153358-C02060-680-260,0,26:39:00,26:39:00,,,0,0,2,1,,,,0
+MFDI:38175,MFDI:KRO6:153358-C02060-680-260,1,26:40:00,26:40:00,,,0,0,2,2,,,,0
+MFDI:18995,MFDI:KRO6:153358-C02060-680-260,17,26:52:00,26:52:00,,,0,0,2,2,,,,0
+MFDI:41403,MFDI:KRO6:153358-C02060-680-260,32,27:06:00,27:06:00,,,0,0,2,2,,,,0
+MFDI:426813,MFDI:KRO6:153358-C02060-680-260,37,27:15:00,27:15:00,,,0,0,1,2,,,,0
+MFDI:22073,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,0,10:30:00,10:30:00,,,0,0,0,1,,,,0
+MFDI:22167,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,1,10:31:00,10:31:00,,,0,0,0,0,,,,0
+MFDI:22173,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,11,10:43:00,10:43:00,,,0,0,0,0,,,,0
+MFDI:463194,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,20,10:54:00,10:54:00,,,0,0,0,0,,,,0
+MFDI:463042,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,27,11:03:00,11:03:00,,,0,0,1,0,,,,0
diff --git a/tests/fixtures/ntfs_with_windows/input/stops.txt b/tests/fixtures/ntfs_with_windows/input/stops.txt
new file mode 100644
index 000000000..fda37a803
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/stops.txt
@@ -0,0 +1,40 @@
+stop_id,stop_name,stop_code,visible,fare_zone_id,stop_lon,stop_lat,location_type,parent_station,stop_timezone,geometry_id,equipment_id,level_id,platform_code,address_id
+MFDI:22167,Picpus,,1,1,2.401248269453829,48.84501767720269,0,MFDI:71639,Europe/Paris,,MFDI:3,,,
+MFDI:22173,Glacière,,1,1,2.3434974927179884,48.831170235245835,0,MFDI:71026,Europe/Paris,,MFDI:3,,,
+MFDI:22073,Nation,,1,1,2.3958598043279085,48.84789550545761,0,MFDI:71673,Europe/Paris,,MFDI:3,,,
+MFDI:41403,Cargo Centre,,1,5,2.526990016633599,48.99817129747993,0,MFDI:73591,Europe/Paris,,MFDI:1,,,
+MFDI:463194,La Motte-Picquet - Grenelle,,1,1,2.298957096977008,48.848765448122315,0,MFDI:71199,Europe/Paris,,MFDI:3,,,
+MFDI:463042,Charles de Gaulle - Etoile,,1,1,2.2947520493673434,48.87371127132366,0,MFDI:71347,Europe/Paris,,MFDI:3,,,
+MFDI:426813,Gare de Roissypole - Aéroport CDG1 Terminal 3 (C4),,1,,2.559069276593061,49.010290004685544,0,MFDI:73596,Europe/Paris,,MFDI:2,,,
+MFDI:426214,La Logeraie,,1,4,2.1359934967138585,48.766289059613705,0,MFDI:63529,Europe/Paris,,MFDI:1,,,
+MFDI:477725,Verdi,,1,4,2.577391101137773,48.961194121418,0,MFDI:480959,Europe/Paris,,MFDI:2,,,
+MFDI:34582,Fourqueux,,1,,2.0804267048554177,48.89058561987773,0,MFDI:64509,Europe/Paris,,MFDI:1,,,
+MFDI:38175,Parmentier,,1,4,2.561581492140883,48.947693512717194,0,MFDI:73486,Europe/Paris,,MFDI:2,,,
+MFDI:461909,Gare de Saint-Germain-en-Laye,,1,,2.094588526727687,48.898931576292874,0,MFDI:64589,Europe/Paris,,MFDI:1,,,
+MFDI:18995,Croix l'Aumône,,1,4,2.524710804326184,48.96497157469924,0,MFDI:73556,Europe/Paris,,MFDI:2,,,
+MFDI:34605,Gare de Saint-Germain-en-Laye,,1,,2.0939283750483924,48.89924135453759,0,MFDI:64589,Europe/Paris,,MFDI:1,,,
+MFDI:34744,République,,1,,2.0927460449808457,48.89812620815719,0,MFDI:426072,Europe/Paris,,MFDI:1,,,
+MFDI:11584,Porte Jaune,,1,4,2.229129261380777,48.76610796421317,0,MFDI:63534,Europe/Paris,,MFDI:1,,,
+MFDI:14081,Victor Hugo,,1,,2.063504165681303,48.886623198199004,0,MFDI:64485,Europe/Paris,,MFDI:2,,,
+MFDI:20324,Clos Normand,,1,4,2.186312472329811,48.75818767629223,0,MFDI:63438,Europe/Paris,,MFDI:1,,,
+MFDI:20312,Les Tilleuls,,1,4,2.1615499577506054,48.76517599148135,0,MFDI:461827,Europe/Paris,,MFDI:2,,,
+MFDI:485179,Gare routière de Versailles Chantiers - Quai G,,1,4,2.1340608589561016,48.795848498088226,0,MFDI:63880,Europe/Paris,,MFDI:1,,,
+MFDI:461827,Les Tilleuls,,1,,2.1613451720416506,48.76521952597488,1,,,,,,,
+MFDI:426072,République / Rue de la Salle,,1,,2.092660713832334,48.89762192758876,1,,,,,,,
+MFDI:71639,Picpus,,1,,2.402166806721031,48.845125696754025,1,,,,,,,
+MFDI:71673,Nation,,1,,2.3963316057344417,48.848927647042316,1,,,,,,,
+MFDI:64589,Saint-Germain-en-Laye,,1,,2.0951814549394174,48.899349756253876,1,,,,,,,
+MFDI:63880,Versailles Chantiers,,1,,2.134652391388478,48.79588875952142,1,,,,,,,
+MFDI:71026,Glacière,,1,,2.3438687884909264,48.8308934672617,1,,,,,,,
+MFDI:64509,Fourqueux,,1,,2.080767458510045,48.89098395203159,1,,,,,,,
+MFDI:64485,Victor Hugo,,1,,2.063504165681303,48.886623198199004,1,,,,,,,
+MFDI:63534,Porte Jaune,,1,,2.2291546111332714,48.766234048830825,1,,,,,,,
+MFDI:63529,La Logeraie,,1,,2.1363481054691924,48.76623765829017,1,,,,,,,
+MFDI:63438,Clos Normand,,1,,2.1861969917891195,48.758177894949306,1,,,,,,,
+MFDI:73556,Croix l'Aumône,,1,,2.524833265434999,48.965021518604,1,,,,,,,
+MFDI:73596,Roissy Aéroport CDG 1 (Terminal 3) (Tremblay-en-France),,1,,2.5601295519817535,49.01033329803776,1,,,,,,,
+MFDI:73591,Cargo Centre,,1,,2.5261341855607036,48.998356758085166,1,,,,,,,
+MFDI:71347,Charles de Gaulle - Etoile,,1,,2.2946168784613463,48.87362503818625,1,,,,,,,
+MFDI:73486,Parmentier / Saint Vincent de Paul,,1,,2.5608350156242676,48.94635987507931,1,,,,,,,
+MFDI:71199,La Motte-Picquet - Grenelle,,1,,2.2984077121284154,48.84918377697637,1,,,,,,,
+MFDI:480959,Verdi,,1,,2.577391101137773,48.961194121418,1,,,,,,,
diff --git a/tests/fixtures/ntfs_with_windows/input/transfers.txt b/tests/fixtures/ntfs_with_windows/input/transfers.txt
new file mode 100644
index 000000000..fd6cdd54d
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/transfers.txt
@@ -0,0 +1,27 @@
+from_stop_id,to_stop_id,min_transfer_time,real_min_transfer_time,equipment_id
+MFDI:22167,MFDI:22167,0,120,
+MFDI:20324,MFDI:20324,0,120,
+MFDI:34744,MFDI:461909,206,326,
+MFDI:34582,MFDI:34582,0,120,
+MFDI:34744,MFDI:34744,0,120,
+MFDI:463042,MFDI:463042,0,120,
+MFDI:34744,MFDI:34605,192,312,
+MFDI:22173,MFDI:22173,0,120,
+MFDI:11584,MFDI:11584,0,120,
+MFDI:18995,MFDI:18995,0,120,
+MFDI:22073,MFDI:22073,0,120,
+MFDI:14081,MFDI:14081,0,120,
+MFDI:20312,MFDI:20312,0,120,
+MFDI:426214,MFDI:426214,0,120,
+MFDI:34605,MFDI:34605,0,120,
+MFDI:34605,MFDI:34744,192,312,
+MFDI:461909,MFDI:461909,0,120,
+MFDI:461909,MFDI:34744,206,326,
+MFDI:38175,MFDI:38175,0,120,
+MFDI:461909,MFDI:34605,62,242,
+MFDI:477725,MFDI:477725,0,120,
+MFDI:426813,MFDI:426813,0,120,
+MFDI:463194,MFDI:463194,0,120,
+MFDI:485179,MFDI:485179,0,120,
+MFDI:41403,MFDI:41403,0,120,
+MFDI:34605,MFDI:461909,62,242,
diff --git a/tests/fixtures/ntfs_with_windows/input/trip_properties.txt b/tests/fixtures/ntfs_with_windows/input/trip_properties.txt
new file mode 100644
index 000000000..79edeaf85
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/trip_properties.txt
@@ -0,0 +1,5 @@
+trip_property_id,wheelchair_accessible,bike_accepted,air_conditioned,visual_announcement,audible_announcement,appropriate_escort,appropriate_signage,school_vehicle_type
+MFDI:3,0,0,0,0,0,0,0,0
+MFDI:5,0,0,0,1,1,0,0,0
+MFDI:7,2,0,0,0,0,0,0,0
+MFDI:9,0,0,0,2,2,0,0,0
diff --git a/tests/fixtures/ntfs_with_windows/input/trips.txt b/tests/fixtures/ntfs_with_windows/input/trips.txt
new file mode 100644
index 000000000..7f616404e
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/input/trips.txt
@@ -0,0 +1,5 @@
+trip_id,route_id,physical_mode_id,dataset_id,service_id,trip_headsign,trip_short_name,block_id,company_id,trip_property_id,geometry_id,journey_pattern_id
+MFDI:KVVB:158023-C02513-1638-260,MFDI:KVVB:C02513-SOIR-A,Bus,MFDI:4c649e1d-f7e4-4622-b6df-30e0997704af,MFDI:1000,Porte Jaune,,,MFDI:1017,MFDI:5,,
+MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,MFDI:BOUCLE_DE_LYS:82336-C02491-4740-ALLER,Bus,MFDI:4c649e1d-f7e4-4622-b6df-30e0997704af,MFDI:1,Gare de St-Germain-en-Laye - Gare Routière,,,MFDI:1021,MFDI:3,,
+MFDI:KRO6:153358-C02060-680-260,MFDI:stif:local-153359-C02060-3417,Bus,MFDI:4c649e1d-f7e4-4622-b6df-30e0997704af,MFDI:1000,Gare de Roissypole Aéroport CDG 1,,,MFDI:1028,MFDI:9,,
+MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,MFDI:RATP:107494-C01376-ITI_IDFM_C01376_A_-1009412783,Metro,MFDI:4c649e1d-f7e4-4622-b6df-30e0997704af,MFDI:1,Charles de Gaulle-Etoile,,,MFDI:100,MFDI:7,,
diff --git a/tests/fixtures/ntfs_with_windows/output/stop_times.txt b/tests/fixtures/ntfs_with_windows/output/stop_times.txt
new file mode 100644
index 000000000..af3d61dc2
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/output/stop_times.txt
@@ -0,0 +1,21 @@
+stop_id,trip_id,stop_sequence,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,boarding_duration,alighting_duration,pickup_type,drop_off_type,local_zone_id,stop_headsign,stop_time_id,stop_time_precision
+MFDI:485179,MFDI:KVVB:158023-C02513-1638-260,0,22:30:00,22:30:00,,,0,0,2,1,,,,0
+MFDI:426214,MFDI:KVVB:158023-C02513-1638-260,1,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:20312,MFDI:KVVB:158023-C02513-1638-260,12,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:20324,MFDI:KVVB:158023-C02513-1638-260,24,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:11584,MFDI:KVVB:158023-C02513-1638-260,32,,,22:36:00,22:55:00,0,0,1,2,,,,2
+MFDI:34605,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,0,,,23:15:00,23:48:00,0,0,2,1,,,,2
+MFDI:34744,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,1,,,23:15:00,23:48:00,0,0,2,2,,,,2
+MFDI:14081,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,15,,,23:15:00,23:48:00,0,0,2,2,,,,2
+MFDI:34582,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,25,,,23:15:00,23:48:00,0,0,2,2,,,,2
+MFDI:461909,MFDI:BOUCLE_DE_LYS:149996-C02491-18777678,35,,,23:15:00,23:48:00,0,0,1,2,,,,2
+MFDI:477725,MFDI:KRO6:153358-C02060-680-260,0,26:39:00,26:39:00,,,0,0,2,1,,,,0
+MFDI:38175,MFDI:KRO6:153358-C02060-680-260,1,26:40:00,26:40:00,,,0,0,2,2,,,,0
+MFDI:18995,MFDI:KRO6:153358-C02060-680-260,17,26:52:00,26:52:00,,,0,0,2,2,,,,0
+MFDI:41403,MFDI:KRO6:153358-C02060-680-260,32,27:06:00,27:06:00,,,0,0,2,2,,,,0
+MFDI:426813,MFDI:KRO6:153358-C02060-680-260,37,27:15:00,27:15:00,,,0,0,1,2,,,,0
+MFDI:22073,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,0,10:30:00,10:30:00,,,0,0,0,1,,,,0
+MFDI:22167,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,1,10:31:00,10:31:00,,,0,0,0,0,,,,0
+MFDI:22173,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,11,10:43:00,10:43:00,,,0,0,0,0,,,,0
+MFDI:463194,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,20,10:54:00,10:54:00,,,0,0,0,0,,,,0
+MFDI:463042,MFDI:RATP:153912-C01376-COU_RATP_5086613_2991428_116,27,11:03:00,11:03:00,,,0,0,1,0,,,,0
diff --git a/tests/read_ntfs.rs b/tests/read_ntfs.rs
index 79dff2743..d76db1548 100644
--- a/tests/read_ntfs.rs
+++ b/tests/read_ntfs.rs
@@ -556,3 +556,16 @@ fn ntfs_with_duplicated_objects_without_id() {
     assert_eq!(1, model.grid_periods.len());
     assert_eq!(2, model.grid_rel_calendar_line.len());
 }
+
+#[test]
+fn preserve_stoptimes_windows() {
+    let ntm = transit_model::ntfs::read("tests/fixtures/ntfs_with_windows/input/").unwrap();
+    test_in_tmp_dir(|output_dir| {
+        transit_model::ntfs::write(&ntm, output_dir, get_test_datetime()).unwrap();
+        compare_output_dir_with_expected(
+            output_dir,
+            Some(vec!["stop_times.txt"]),
+            "tests/fixtures/ntfs_with_windows/output",
+        );
+    });
+}

From 71f36c84e5dea7029a6fa4018042fa172bc56f7f Mon Sep 17 00:00:00 2001
From: ArnaudOggy <arnaud.ogiela@gmail.com>
Date: Wed, 18 Sep 2024 18:38:46 +0200
Subject: [PATCH 5/5] Read windows from ntfs and add some data controls

---
 src/ntfs/read.rs                              |  4 +-
 src/objects.rs                                | 47 +++++++++++++++----
 .../ntfs_with_windows/input/lines.txt         |  2 +-
 .../ntfs_with_windows/output/lines.txt        |  5 ++
 tests/read_ntfs.rs                            |  4 +-
 5 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 tests/fixtures/ntfs_with_windows/output/lines.txt

diff --git a/src/ntfs/read.rs b/src/ntfs/read.rs
index fdfb2d34d..00e6f7a53 100644
--- a/src/ntfs/read.rs
+++ b/src/ntfs/read.rs
@@ -321,8 +321,8 @@ where
                 sequence: stop_time.stop_sequence,
                 arrival_time: stop_time.arrival_time,
                 departure_time: stop_time.departure_time,
-                start_pickup_drop_off_window: None,
-                end_pickup_drop_off_window: None,
+                start_pickup_drop_off_window: stop_time.start_pickup_drop_off_window,
+                end_pickup_drop_off_window: stop_time.end_pickup_drop_off_window,
                 boarding_duration: stop_time.boarding_duration,
                 alighting_duration: stop_time.alighting_duration,
                 pickup_type: stop_time.pickup_type,
diff --git a/src/objects.rs b/src/objects.rs
index 0c34a5d44..4fbcaf5da 100644
--- a/src/objects.rs
+++ b/src/objects.rs
@@ -687,10 +687,14 @@ impl GetObjectType for VehicleJourney {
 
 impl VehicleJourney {
     pub fn first_departure_time(&self) -> Option<Time> {
-        self.stop_times.first().and_then(|st| st.departure_time)
+        self.stop_times
+            .first()
+            .and_then(|st| st.departure_time.or(st.start_pickup_drop_off_window))
     }
     pub fn last_arrival_time(&self) -> Option<Time> {
-        self.stop_times.last().and_then(|st| st.arrival_time)
+        self.stop_times
+            .last()
+            .and_then(|st| st.arrival_time.or(st.end_pickup_drop_off_window))
     }
 }
 
@@ -715,23 +719,50 @@ impl VehicleJourney {
         for window in self.stop_times.windows(2) {
             let curr_st = &window[0];
             let next_st = &window[1];
+
             if curr_st.sequence == next_st.sequence {
                 return Err(StopTimeError::DuplicateStopSequence {
                     duplicated_sequence: curr_st.sequence,
                     vj_id: self.id.clone(),
                 });
             }
-            #[allow(clippy::suspicious_operation_groupings)]
-            if let Some(dt) = curr_st.departure_time {
-                if (curr_st.arrival_time > curr_st.departure_time)
-                    || (curr_st.departure_time > next_st.arrival_time)
-                {
+
+            let dt = curr_st
+                .departure_time
+                .or(curr_st.start_pickup_drop_off_window)
+                .unwrap_or_default();
+
+            // Only 2 valid possibilities:
+            // - arrival_time and departure_time are filled, but not start_pickup_drop_off_window and end_pickup_drop_off_window
+            // - start_pickup_drop_off_window and end_pickup_drop_off_window are filled, but not arrival_time and departure_time
+            match (
+                curr_st.arrival_time,
+                curr_st.departure_time,
+                curr_st.start_pickup_drop_off_window,
+                curr_st.end_pickup_drop_off_window,
+            ) {
+                (Some(_), Some(_), None, None) => (),
+                (None, None, Some(_), Some(_)) => (),
+                _ => {
                     return Err(StopTimeError::IncoherentStopTimes {
                         first_incorrect_sequence: curr_st.sequence,
                         first_incorrect_time: dt,
                         vj_id: self.id.clone(),
-                    });
+                    })
                 }
+            };
+
+            if (curr_st.arrival_time > curr_st.departure_time)
+                || (curr_st.start_pickup_drop_off_window > curr_st.end_pickup_drop_off_window)
+                || (curr_st.departure_time.is_some()
+                    && next_st.arrival_time.is_some()
+                    && curr_st.departure_time > next_st.arrival_time)
+            {
+                return Err(StopTimeError::IncoherentStopTimes {
+                    first_incorrect_sequence: curr_st.sequence,
+                    first_incorrect_time: dt,
+                    vj_id: self.id.clone(),
+                });
             }
         }
         Ok(())
diff --git a/tests/fixtures/ntfs_with_windows/input/lines.txt b/tests/fixtures/ntfs_with_windows/input/lines.txt
index 726bc2261..042d22f22 100644
--- a/tests/fixtures/ntfs_with_windows/input/lines.txt
+++ b/tests/fixtures/ntfs_with_windows/input/lines.txt
@@ -1,5 +1,5 @@
 line_id,line_code,line_name,forward_line_name,backward_line_name,line_color,line_text_color,line_sort_order,network_id,commercial_mode_id,geometry_id,line_opening_time,line_closing_time
-MFDI:C01376,6,6,,,6ECA97,0,,MFDI:Operator_100,Metro,,,
+MFDI:C01376,6,6,,,6ECA97,000000,,MFDI:Operator_100,Metro,,,
 MFDI:C02060,Filéo RS,Filéo Roissy Sud - Villeparisis et Mitry (sur réservation),,,4890CD,FFFFFF,,MFDI:1071,Bus,,,
 MFDI:C02491,Soir,Soir Saint-Germain-en-Laye,,,652C8F,FFFFFF,,MFDI:1062,Bus,,,
 MFDI:C02513,Soir,Soir Versailles-Chantiers,,,640082,FFFFFF,,MFDI:1061,Bus,,,
diff --git a/tests/fixtures/ntfs_with_windows/output/lines.txt b/tests/fixtures/ntfs_with_windows/output/lines.txt
new file mode 100644
index 000000000..fa8da0fd8
--- /dev/null
+++ b/tests/fixtures/ntfs_with_windows/output/lines.txt
@@ -0,0 +1,5 @@
+line_id,line_code,line_name,forward_line_name,backward_line_name,line_color,line_text_color,line_sort_order,network_id,commercial_mode_id,geometry_id,line_opening_time,line_closing_time
+MFDI:C01376,6,6,,,6ECA97,000000,,MFDI:Operator_100,Metro,,10:30:00,11:03:00
+MFDI:C02060,Filéo RS,Filéo Roissy Sud - Villeparisis et Mitry (sur réservation),,,4890CD,FFFFFF,,MFDI:1071,Bus,,02:39:00,03:15:00
+MFDI:C02491,Soir,Soir Saint-Germain-en-Laye,,,652C8F,FFFFFF,,MFDI:1062,Bus,,23:15:00,23:48:00
+MFDI:C02513,Soir,Soir Versailles-Chantiers,,,640082,FFFFFF,,MFDI:1061,Bus,,22:30:00,22:55:00
diff --git a/tests/read_ntfs.rs b/tests/read_ntfs.rs
index d76db1548..7349458bb 100644
--- a/tests/read_ntfs.rs
+++ b/tests/read_ntfs.rs
@@ -558,13 +558,13 @@ fn ntfs_with_duplicated_objects_without_id() {
 }
 
 #[test]
-fn preserve_stoptimes_windows() {
+fn preserve_stoptimes_windows_and_enhance_line_opening_time() {
     let ntm = transit_model::ntfs::read("tests/fixtures/ntfs_with_windows/input/").unwrap();
     test_in_tmp_dir(|output_dir| {
         transit_model::ntfs::write(&ntm, output_dir, get_test_datetime()).unwrap();
         compare_output_dir_with_expected(
             output_dir,
-            Some(vec!["stop_times.txt"]),
+            Some(vec!["lines.txt", "stop_times.txt"]),
             "tests/fixtures/ntfs_with_windows/output",
         );
     });