Merge pull request #201 from datanel/sanitize-transfers

Sanitize transfers

Author: nberard

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Kisio Digital <guillaume.pinot@kisio.org>"]
 name = "navitia_model"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2018"
 
 [dependencies]

fixtures/restrict-validity-period/input/transfers.txt

@@ -0,0 +1,5 @@
+from_stop_id,to_stop_id,min_transfer_time,real_min_transfer_time,equipment_id
+CDGR,CDGR,0,60,
+DEFR,DEFR,0,60,
+GDLB,GDLB,0,60,
+NATM,NATM,0,60,

fixtures/restrict-validity-period/output/transfers.txt

@@ -0,0 +1,3 @@
+from_stop_id,to_stop_id,min_transfer_time,real_min_transfer_time,equipment_id
+GDLB,GDLB,0,60,
+NATM,NATM,0,60,

src/collection.rs

@@ -273,6 +273,32 @@ impl<T> Collection<T> {
     pub fn is_empty(&self) -> bool {
         self.objects.is_empty()
     }
+
+    /// Retains the elements matching predicate parameter from the current `CollectionWithId` object
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use navitia_model::collection::*;
+    /// # use std::collections::HashSet;
+    /// # fn run() -> navitia_model::Result<()> {
+    /// # #[derive(PartialEq, Debug)] struct Obj(&'static str);
+    /// let mut c = Collection::new(vec![Obj("foo"), Obj("bar"), Obj("qux")]);
+    /// let mut ids_to_keep: HashSet<String> = HashSet::new();
+    /// ids_to_keep.insert("foo".to_string());
+    /// ids_to_keep.insert("qux".to_string());
+    /// c.retain(|item| ids_to_keep.contains(item.0));
+    /// assert_eq!(c.len(), 2);
+    /// assert_eq!(c.values().map(|obj| obj.0).collect::<Vec<&str>>(), ["foo", "qux"]);
+    /// # Ok(())
+    /// # }
+    /// # fn main() { run().unwrap() }
+    /// ```
+    pub fn retain<F: FnMut(&T) -> bool>(&mut self, f: F) {
+        let mut purged = self.take();
+        purged.retain(f);
+        *self = Self::new(purged);
+    }
 }
 
 /// The type returned by `Collection::iter`.

src/model.rs

@@ -442,6 +442,10 @@ impl Collections {
             .retain(|commercial_mode| commercial_modes_used.contains(&commercial_mode.id));
         self.physical_modes
             .retain(|physical_mode| physical_modes_used.contains(&physical_mode.id));
+        self.transfers.retain(|t| {
+            stop_points_used.contains(&t.from_stop_id) && stop_points_used.contains(&t.to_stop_id)
+        });
+
         Ok(())
     }
 }

tests/restrict_validity_period.rs

@@ -53,6 +53,7 @@ fn test_restrict_global() {
                 "trips.txt",
                 "object_codes.txt",
                 "object_properties.txt",
+                "transfers.txt",
             ]),
             "./fixtures/restrict-validity-period/output/",
         );