Merge pull request #763 from CanalTP/object-properties-btreemap

[features] object_properties are a BTreeMap instead of BTreeSet
hove-io · May 7, 2021 · 0c37fe3 · 0c37fe3
2 parents c61f997 + 6eaa42e
commit 0c37fe3
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 64 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Kisio Digital <team.coretools@kisio.com>", "Guillaume Pinot <texitoi@texitoi.eu>"]
 name = "transit_model"
-version = "0.35.1"
+version = "0.36.0"
 license = "AGPL-3.0-only"
 description = "Transit data management"
 repository = "https://github.com/CanalTP/transit_model"

diff --git a/gtfs2netexfr/Cargo.toml b/gtfs2netexfr/Cargo.toml
@@ -22,5 +22,5 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.35", path = "../", features = ["proj"] }
+transit_model = { version = "0.36", path = "../", features = ["proj"] }
 lazy_static = "1"
diff --git a/gtfs2ntfs/Cargo.toml b/gtfs2ntfs/Cargo.toml
@@ -22,5 +22,5 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.35", path = "../" }
+transit_model = { version = "0.36", path = "../" }
 lazy_static = "1"
diff --git a/ntfs2gtfs/Cargo.toml b/ntfs2gtfs/Cargo.toml
@@ -22,5 +22,5 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.35", path = "../" }
+transit_model = { version = "0.36", path = "../" }
 lazy_static = "1"
diff --git a/ntfs2netexfr/Cargo.toml b/ntfs2netexfr/Cargo.toml
@@ -22,5 +22,5 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.35", path = "../", features = ["proj"] }
+transit_model = { version = "0.36", path = "../", features = ["proj"] }
 lazy_static = "1"
diff --git a/ntfs2ntfs/Cargo.toml b/ntfs2ntfs/Cargo.toml
@@ -22,5 +22,5 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.35", path = "../" }
+transit_model = { version = "0.36", path = "../" }
 lazy_static = "1"
diff --git a/restrict-validity-period/Cargo.toml b/restrict-validity-period/Cargo.toml
@@ -21,4 +21,4 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.35", path = "../" }
+transit_model = { version = "0.36", path = "../" }
diff --git a/src/gtfs/read.rs b/src/gtfs/read.rs
@@ -19,8 +19,9 @@ use super::{
 use crate::{
     model::Collections,
     objects::{
-        self, Availability, CommentLinksT, Coord, KeysValues, Pathway, StopLocation, StopPoint,
-        StopTime as NtfsStopTime, StopTimePrecision, StopType, Time, TransportType, VehicleJourney,
+        self, Availability, CommentLinksT, Coord, KeysValues, Pathway, PropertiesMap, StopLocation,
+        StopPoint, StopTime as NtfsStopTime, StopTimePrecision, StopType, Time, TransportType,
+        VehicleJourney,
     },
     read_utils::{read_collection, read_objects, read_objects_loose, FileHandler},
     utils::*,
@@ -104,7 +105,7 @@ impl TryFrom<Stop> for objects::StopArea {
             id: stop.id,
             name: stop.name,
             codes,
-            object_properties: KeysValues::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: objects::CommentLinksT::default(),
             coord,
             timezone: stop.timezone,
@@ -309,7 +310,7 @@ impl Trip {
         Ok(objects::VehicleJourney {
             id: self.id.clone(),
             codes,
-            object_properties: KeysValues::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: CommentLinksT::default(),
             route_id: route.get_id_by_direction(self.direction),
             physical_mode_id: physical_mode.id,
@@ -993,7 +994,7 @@ fn make_lines(
             id: r.id.clone(),
             code: line_code(r),
             codes: KeysValues::default(),
-            object_properties: KeysValues::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: CommentLinksT::default(),
             name: r.long_name.to_string(),
             forward_name: None,
@@ -1049,7 +1050,7 @@ fn make_routes(gtfs_trips: &[Trip], map_line_routes: &MapLineRoutes<'_>) -> Vec<
                     },
                     direction_type: Some(get_direction_name(d)),
                     codes: KeysValues::default(),
-                    object_properties: KeysValues::default(),
+                    object_properties: PropertiesMap::default(),
                     comment_links: CommentLinksT::default(),
                     line_id: sr.id.clone(),
                     geometry_id: None,

diff --git a/src/gtfs/write.rs b/src/gtfs/write.rs
@@ -529,10 +529,7 @@ mod tests {
         calendars::write_calendar_dates,
         gtfs::{Route, RouteType, StopLocationType, Transfer, TransferType},
         model::Collections,
-        objects::{
-            Calendar, CommentLinksT, Coord, KeysValues, StopPoint, StopTime,
-            Transfer as NtfsTransfer,
-        },
+        objects::{Calendar, CommentLinksT, Coord, StopPoint, StopTime, Transfer as NtfsTransfer},
     };
     use geo::{line_string, point};
     use pretty_assertions::assert_eq;
@@ -768,7 +765,7 @@ mod tests {
             ]
             .into_iter()
             .collect(),
-            object_properties: BTreeSet::default(),
+            object_properties: PropertiesMap::default(),
             comment_links,
             visible: true,
             coord: objects::Coord {
@@ -914,7 +911,7 @@ mod tests {
         let vj = objects::VehicleJourney {
             id: "OIF:87604986-1_11595-1".to_string(),
             codes: BTreeSet::default(),
-            object_properties: BTreeSet::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: BTreeSet::default(),
             route_id: "OIF:078078001:1".to_string(),
             physical_mode_id: "Bus".to_string(),
@@ -959,7 +956,7 @@ mod tests {
         let vj_coach = objects::VehicleJourney {
             id: "OIF:87604986-1_11595-1:Coach".to_string(),
             codes: BTreeSet::default(),
-            object_properties: BTreeSet::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: BTreeSet::default(),
             route_id: "OIF:078078001:1".to_string(),
             physical_mode_id: "Coach".to_string(),
@@ -1031,7 +1028,7 @@ mod tests {
             id: "sa:01".to_string(),
             name: "sa:01".to_string(),
             codes: sa_codes,
-            object_properties: KeysValues::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: CommentLinksT::default(),
             visible: true,
             coord: Coord {
@@ -1231,7 +1228,7 @@ mod tests {
         let vehicle_journeys = CollectionWithId::from(VehicleJourney {
             id: "vj:01".to_string(),
             codes: BTreeSet::new(),
-            object_properties: KeysValues::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: CommentLinksT::default(),
             route_id: "r:01".to_string(),
             physical_mode_id: "pm:01".to_string(),
@@ -1305,7 +1302,7 @@ mod tests {
             name: "3".to_string(),
             code: None,
             codes: BTreeSet::default(),
-            object_properties: BTreeSet::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: BTreeSet::default(),
             forward_name: None,
             forward_direction: None,
@@ -1353,7 +1350,7 @@ mod tests {
             name: "DEF".to_string(),
             code: Some("DEF".to_string()),
             codes: BTreeSet::default(),
-            object_properties: BTreeSet::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: BTreeSet::default(),
             forward_name: Some("Hôtels - Hôtels".to_string()),
             forward_direction: Some("OIF:SA:4:126".to_string()),

diff --git a/src/model.rs b/src/model.rs
@@ -2436,7 +2436,7 @@ mod tests {
             VehicleJourney {
                 id: String::from(trip_id),
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 route_id: String::from("route_id"),
                 physical_mode_id: String::new(),

diff --git a/src/netex_france/route_points.rs b/src/netex_france/route_points.rs
@@ -99,7 +99,7 @@ mod tests {
 
     mod build_route_points {
         use super::*;
-        use crate::objects::{CommentLinksT, KeysValues, StopTime, Time};
+        use crate::objects::{CommentLinksT, KeysValues, PropertiesMap, StopTime, Time};
         use pretty_assertions::assert_eq;
 
         fn stop_time(
@@ -126,7 +126,7 @@ mod tests {
             VehicleJourney {
                 id,
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 route_id: String::from("route_id"),
                 physical_mode_id: String::from("Bus"),

diff --git a/src/ntfs/mod.rs b/src/ntfs/mod.rs
@@ -547,7 +547,7 @@ mod tests {
                 name: "DEF".to_string(),
                 code: Some("DEF".to_string()),
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 forward_name: Some("Hôtels - Hôtels".to_string()),
                 forward_direction: None,
@@ -575,7 +575,7 @@ mod tests {
                 name: "3".to_string(),
                 code: None,
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 forward_name: None,
                 forward_direction: None,
@@ -622,7 +622,7 @@ mod tests {
                 name: "Hôtels - Hôtels".to_string(),
                 direction_type: Some("forward".to_string()),
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 line_id: "OIF:002002002:BDEOIF829".to_string(),
                 geometry_id: Some("Geometry:Line:Relation:6883353".to_string()),
@@ -633,7 +633,7 @@ mod tests {
                 name: "Hôtels - Hôtels".to_string(),
                 direction_type: None,
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 line_id: "OIF:002002002:BDEOIF829".to_string(),
                 geometry_id: None,
@@ -678,7 +678,7 @@ mod tests {
             VehicleJourney {
                 id: "OIF:87604986-1_11595-1".to_string(),
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 route_id: "OIF:078078001:1".to_string(),
                 physical_mode_id: "Bus".to_string(),
@@ -723,7 +723,7 @@ mod tests {
             VehicleJourney {
                 id: "OIF:90014407-1_425283-1".to_string(),
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 route_id: "OIF:800:TER".to_string(),
                 physical_mode_id: "Bus".to_string(),
@@ -953,7 +953,7 @@ mod tests {
                 id: "Navitia:sa_2".to_string(),
                 name: "sa_name_2".to_string(),
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 visible: true,
                 coord: Coord {
@@ -969,7 +969,7 @@ mod tests {
                 id: "sa_1".to_string(),
                 name: "sa_name_1".to_string(),
                 codes: KeysValues::default(),
-                object_properties: KeysValues::default(),
+                object_properties: PropertiesMap::default(),
                 comment_links: CommentLinksT::default(),
                 visible: true,
                 coord: Coord {
@@ -1033,10 +1033,10 @@ mod tests {
                 "object_system:1".to_string(),
                 "object_code:1".to_string(),
             )]),
-            object_properties: btree_set_from_vec(vec![(
+            object_properties: properties_map![(
                 "prop_name:1".to_string(),
-                "prop_value:1".to_string(),
-            )]),
+                "prop_value:1".to_string()
+            )],
             comment_links: btree_set_from_vec(vec!["c:1".to_string()]),
             visible: true,
             coord: Coord {
@@ -1055,10 +1055,10 @@ mod tests {
                 "object_system:2".to_string(),
                 "object_code:2".to_string(),
             )]),
-            object_properties: btree_set_from_vec(vec![(
+            object_properties: properties_map![(
                 "prop_name:2".to_string(),
-                "prop_value:2".to_string(),
-            )]),
+                "prop_value:2".to_string()
+            )],
             comment_links: btree_set_from_vec(vec!["c:2".to_string()]),
             visible: true,
             coord: Coord {
@@ -1081,10 +1081,10 @@ mod tests {
                 "object_system:3".to_string(),
                 "object_code:3".to_string(),
             )]),
-            object_properties: btree_set_from_vec(vec![(
+            object_properties: properties_map![(
                 "prop_name:3".to_string(),
-                "prop_value:3".to_string(),
-            )]),
+                "prop_value:3".to_string()
+            )],
             comment_links: btree_set_from_vec(vec!["c:1".to_string(), "c:2".to_string()]),
             forward_name: None,
             forward_direction: None,
@@ -1108,10 +1108,10 @@ mod tests {
                 ("object_system:4".to_string(), "object_code:4".to_string()),
                 ("object_system:5".to_string(), "object_code:5".to_string()),
             ]),
-            object_properties: btree_set_from_vec(vec![(
+            object_properties: properties_map![(
                 "prop_name:4".to_string(),
-                "prop_value:4".to_string(),
-            )]),
+                "prop_value:4".to_string()
+            )],
             comment_links: btree_set_from_vec(vec!["c:3".to_string()]),
             line_id: "OIF:002002002:BDEOIF829".to_string(),
             geometry_id: None,
@@ -1124,10 +1124,10 @@ mod tests {
                 "object_system:6".to_string(),
                 "object_code:6".to_string(),
             )]),
-            object_properties: btree_set_from_vec(vec![(
+            object_properties: properties_map![(
                 "prop_name:6".to_string(),
-                "prop_value:6".to_string(),
-            )]),
+                "prop_value:6".to_string()
+            )],
             comment_links: CommentLinksT::default(),
             route_id: "OIF:800:TER".to_string(),
             physical_mode_id: "Bus".to_string(),

diff --git a/src/ntfs/read.rs b/src/ntfs/read.rs
@@ -45,7 +45,7 @@ impl TryFrom<Stop> for StopArea {
             id: stop.id,
             name: stop.name,
             codes: KeysValues::default(),
-            object_properties: KeysValues::default(),
+            object_properties: PropertiesMap::default(),
             comment_links: CommentLinksT::default(),
             visible: stop.visible,
             coord,
@@ -556,10 +556,10 @@ where
             return;
         }
     };
-    collection.index_mut(idx).properties_mut().insert((
+    collection.index_mut(idx).properties_mut().insert(
         obj_prop.object_property_name,
         obj_prop.object_property_value,
-    ));
+    );
 }
 
 pub(crate) fn manage_object_properties<H>(