From ea57c229a3114c53131489ae4eaaabf8bdff8d91 Mon Sep 17 00:00:00 2001 From: ArnaudOggy Date: Fri, 7 Jan 2022 15:23:31 +0100 Subject: [PATCH] [tech] Remove fields from Line - Forward & Backward-direction --- Cargo.toml | 2 +- src/enhancers/adjust_lines_names.rs | 4 ---- src/gtfs/read.rs | 8 ++------ src/gtfs/write.rs | 4 ---- src/ntfs/mod.rs | 6 ------ src/objects.rs | 12 ------------ 6 files changed, 3 insertions(+), 33 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d1d119f5c..3774458c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Kisio Digital ", "Guillaume Pinot "] name = "transit_model" -version = "0.44.0" +version = "0.45.0" license = "AGPL-3.0-only" description = "Transit data management" repository = "https://github.com/CanalTP/transit_model" diff --git a/src/enhancers/adjust_lines_names.rs b/src/enhancers/adjust_lines_names.rs index cd5a04707..dec557dcf 100644 --- a/src/enhancers/adjust_lines_names.rs +++ b/src/enhancers/adjust_lines_names.rs @@ -145,9 +145,7 @@ mod test { id: String::from("line_id1"), name: String::new(), forward_name: Some("A".to_string()), - forward_direction: Some("B".to_string()), backward_name: Some("C".to_string()), - backward_direction: Some("D".to_string()), ..Default::default() }) .unwrap(); @@ -169,9 +167,7 @@ mod test { let line1 = collections.lines.get("line_id1").unwrap(); assert_eq!("my route id1", line1.name); assert_eq!("A", line1.forward_name.as_ref().unwrap()); - assert_eq!("B", line1.forward_direction.as_ref().unwrap()); assert_eq!("C", line1.backward_name.as_ref().unwrap()); - assert_eq!("D", line1.backward_direction.as_ref().unwrap()); } #[test] diff --git a/src/gtfs/read.rs b/src/gtfs/read.rs index c1209d118..4bbbe41ed 100644 --- a/src/gtfs/read.rs +++ b/src/gtfs/read.rs @@ -1009,9 +1009,7 @@ fn make_lines( comment_links: CommentLinksT::default(), name: r.long_name.to_string(), forward_name: None, - forward_direction: None, backward_name: None, - backward_direction: None, color: r.color.clone(), text_color: r.text_color.clone(), sort_order: r.sort_order, @@ -2080,16 +2078,14 @@ mod tests { ); assert_eq!( vec![ - ("my_prefix:route_1", "my_prefix:agency_1", "Bus", None, None), - ("my_prefix:route_2", "my_prefix:agency_1", "Bus", None, None), + ("my_prefix:route_1", "my_prefix:agency_1", "Bus"), + ("my_prefix:route_2", "my_prefix:agency_1", "Bus"), ], extract( |obj| ( obj.id.as_str(), obj.network_id.as_str(), obj.commercial_mode_id.as_str(), - obj.forward_direction.as_deref(), - obj.backward_direction.as_deref(), ), &collections.lines, ) diff --git a/src/gtfs/write.rs b/src/gtfs/write.rs index 472c2f749..b64d2b9f2 100644 --- a/src/gtfs/write.rs +++ b/src/gtfs/write.rs @@ -1270,9 +1270,7 @@ mod tests { object_properties: PropertiesMap::default(), comment_links: BTreeSet::default(), forward_name: None, - forward_direction: None, backward_name: None, - backward_direction: None, color: None, text_color: None, sort_order: None, @@ -1318,9 +1316,7 @@ mod tests { 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()), backward_name: Some("Hôtels - Hôtels".to_string()), - backward_direction: Some("OIF:SA:4:126".to_string()), color: Some(objects::Rgb { red: 155, green: 12, diff --git a/src/ntfs/mod.rs b/src/ntfs/mod.rs index 622fc9ae8..c5c1d3e82 100644 --- a/src/ntfs/mod.rs +++ b/src/ntfs/mod.rs @@ -601,9 +601,7 @@ mod tests { object_properties: PropertiesMap::default(), comment_links: CommentLinksT::default(), forward_name: Some("Hôtels - Hôtels".to_string()), - forward_direction: None, backward_name: Some("Hôtels - Hôtels".to_string()), - backward_direction: None, color: Some(Rgb { red: 155, green: 12, @@ -629,9 +627,7 @@ mod tests { object_properties: PropertiesMap::default(), comment_links: CommentLinksT::default(), forward_name: None, - forward_direction: None, backward_name: None, - backward_direction: None, color: None, text_color: None, sort_order: None, @@ -1136,9 +1132,7 @@ mod tests { )], comment_links: btree_set_from_vec(vec!["c:1".to_string(), "c:2".to_string()]), forward_name: None, - forward_direction: None, backward_name: None, - backward_direction: None, color: None, text_color: None, sort_order: None, diff --git a/src/objects.rs b/src/objects.rs index e7d6cec4b..a8b63727f 100644 --- a/src/objects.rs +++ b/src/objects.rs @@ -474,12 +474,8 @@ pub struct Line { pub name: String, #[serde(rename = "forward_line_name")] pub forward_name: Option, - #[serde(skip)] - pub forward_direction: Option, #[serde(rename = "backward_line_name")] pub backward_name: Option, - #[serde(skip)] - pub backward_direction: Option, #[serde( rename = "line_color", default, @@ -512,14 +508,6 @@ impl AddPrefix for Line { fn prefix(&mut self, prefix_conf: &PrefixConfiguration) { self.id = prefix_conf.referential_prefix(self.id.as_str()); self.network_id = prefix_conf.referential_prefix(self.network_id.as_str()); - self.forward_direction = self - .forward_direction - .take() - .map(|id| prefix_conf.referential_prefix(id.as_str())); - self.backward_direction = self - .backward_direction - .take() - .map(|id| prefix_conf.referential_prefix(id.as_str())); self.geometry_id = self .geometry_id .take()