From 7e0b364be4189792955d855db421cd67b1e58cc0 Mon Sep 17 00:00:00 2001 From: ArnaudOggy Date: Thu, 30 Jul 2020 17:12:40 +0200 Subject: [PATCH] [feature] Use schedule id for equipment --- Cargo.toml | 2 +- src/objects.rs | 10 +++++----- tests/fixtures/gtfs2ntfs/full_output/equipments.txt | 2 +- tests/fixtures/gtfs2ntfs/full_output/stops.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4ee1353e5..22e239a03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Kisio Digital ", "Guillaume Pinot "] name = "transit_model" -version = "0.26.0" +version = "0.26.1" license = "AGPL-3.0-only" description = "Transit data management" repository = "https://github.com/CanalTP/transit_model" diff --git a/src/objects.rs b/src/objects.rs index 7364936d5..cb5f16575 100644 --- a/src/objects.rs +++ b/src/objects.rs @@ -1048,7 +1048,7 @@ impl AddPrefix for StopArea { self.equipment_id = self .equipment_id .take() - .map(|id| prefix_conf.referential_prefix(id.as_str())); + .map(|id| prefix_conf.schedule_prefix(id.as_str())); self.geometry_id = self .geometry_id .take() @@ -1115,7 +1115,7 @@ impl AddPrefix for StopPoint { self.equipment_id = self .equipment_id .take() - .map(|id| prefix_conf.referential_prefix(id.as_str())); + .map(|id| prefix_conf.schedule_prefix(id.as_str())); self.geometry_id = self .geometry_id .take() @@ -1172,7 +1172,7 @@ impl AddPrefix for StopLocation { self.equipment_id = self .equipment_id .take() - .map(|id| prefix_conf.referential_prefix(id.as_str())); + .map(|id| prefix_conf.schedule_prefix(id.as_str())); self.level_id = self .level_id .take() @@ -1404,7 +1404,7 @@ impl_id!(Equipment); impl AddPrefix for Equipment { fn prefix(&mut self, prefix_conf: &PrefixConfiguration) { - self.id = prefix_conf.referential_prefix(self.id.as_str()); + self.id = prefix_conf.schedule_prefix(self.id.as_str()); } } @@ -1439,7 +1439,7 @@ impl AddPrefix for Transfer { self.equipment_id = self .equipment_id .take() - .map(|id| prefix_conf.referential_prefix(id.as_str())); + .map(|id| prefix_conf.schedule_prefix(id.as_str())); } } diff --git a/tests/fixtures/gtfs2ntfs/full_output/equipments.txt b/tests/fixtures/gtfs2ntfs/full_output/equipments.txt index 62ab5d738..b24e07937 100644 --- a/tests/fixtures/gtfs2ntfs/full_output/equipments.txt +++ b/tests/fixtures/gtfs2ntfs/full_output/equipments.txt @@ -1,2 +1,2 @@ equipment_id,wheelchair_boarding,sheltered,elevator,escalator,bike_accepted,bike_depot,visual_announcement,audible_announcement,appropriate_escort,appropriate_signage -ME:0,1,0,0,0,0,0,0,0,0,0 +ME:Defaul:0,1,0,0,0,0,0,0,0,0,0 diff --git a/tests/fixtures/gtfs2ntfs/full_output/stops.txt b/tests/fixtures/gtfs2ntfs/full_output/stops.txt index 071a74a47..cb5f83939 100644 --- a/tests/fixtures/gtfs2ntfs/full_output/stops.txt +++ b/tests/fixtures/gtfs2ntfs/full_output/stops.txt @@ -1,5 +1,5 @@ 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 -ME:stop:11,pouet,,1,,2.372987,48.844746,0,ME:stoparea:1,,,ME:0,ME:1,A +ME:stop:11,pouet,,1,,2.372987,48.844746,0,ME:stoparea:1,,,ME:Defaul:0,ME:1,A ME:stop:22,pouet,,1,,2.372987,48.844746,0,ME:stoparea:1,,,,, ME:stop:31,pouet,,1,,2.372987,48.844746,0,ME:stoparea:1,,,,, ME:stop:32,pouet,,1,,2.372987,48.844746,0,ME:stoparea:1,,,,,