update GTFS parser according to the specifications

Cargo.toml

@@ -15,21 +15,19 @@ travis-ci = { repository = "CanalTP/transit_model" }
 chrono = "0.4"
 csv = "1.0"
 derivative = "1"
-env_logger = "0.6"
 failure = "0.1"
 geo = "0.12"
 geo-types = "0.4"
 iso4217 = "0.3"
 lazy_static = "1.2"
 log = "0.4"
-minidom = "0.9"
+minidom = "0.11"
 num-traits = "0.2"
 pretty_assertions = "0.6"
 proj = { version = "0.10", optional = true }
 rust_decimal = "1.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-structopt = "0.3"
 tempfile = "3"
 time-parse = "0.1"
 transit_model_procmacro = { version = "0.1", path = "./transit_model_procmacro" }

examples/gtfs_reader.rs

@@ -25,7 +25,6 @@ fn run() -> Result<()> {
 }
 
 fn main() {
-    env_logger::init();
     if let Err(err) = run() {
         for cause in err.iter_chain() {
             eprintln!("{}", cause);

examples/test.rs

@@ -48,7 +48,6 @@ fn run() -> Result<()> {
 }
 
 fn main() {
-    env_logger::init();
     if let Err(err) = run() {
         for cause in err.iter_chain() {
             eprintln!("{}", cause);

src/add_prefix.rs

@@ -58,8 +58,10 @@ impl AddPrefix for Collections {
         self.lines.add_prefix(&prefix);
         self.routes.add_prefix(&prefix);
         self.vehicle_journeys.add_prefix(&prefix);
+        self.frequencies.add_prefix(&prefix);
         self.stop_areas.add_prefix(&prefix);
         self.stop_points.add_prefix(&prefix);
+        self.stop_locations.add_prefix(&prefix);
         self.calendars.add_prefix(&prefix);
         self.companies.add_prefix(&prefix);
         self.comments.add_prefix(&prefix);
@@ -76,6 +78,8 @@ impl AddPrefix for Collections {
         self.ticket_uses.add_prefix(&prefix);
         self.ticket_use_perimeters.add_prefix(&prefix);
         self.ticket_use_restrictions.add_prefix(&prefix);
+        self.pathways.add_prefix(&prefix);
+        self.levels.add_prefix(&prefix);
     }
 }
 

src/documentation/gtfs_to_ntfs_specs.md

@@ -80,9 +80,9 @@ Like the GTFS, the NTFS group stop_points and stop_areas in on file : stops.txt.
 The `parent_station` of the stop_point should then contain the generated `stop_area.id`.
 
 (2) The `stop_code` field is added as a complementary `object_code` with the following properties:
-+ `object_type` : _stop_point_ or _stop_area_  accordingly to the `location_type` value
++ `object_type` : `stop_point` or `stop_area`  accordingly to the `location_type` value
 + `object_id` : NTFS `stop_id`
-+ `object_system` : Fixed value "source"
++ `object_system` : Fixed value `gtfs_stop_code`
 + `object_code` : value of the `stop_code` property
 
 (3) The `comment` object is a complex type with additional properties :

src/gtfs/mod.rs

@@ -90,6 +90,30 @@ enum StopLocationType {
     BoardingArea,
 }
 
+impl From<StopLocationType> for StopType {
+    fn from(stop_location_type: StopLocationType) -> StopType {
+        match stop_location_type {
+            StopLocationType::StopPoint => StopType::Point,
+            StopLocationType::StopArea => StopType::Zone,
+            StopLocationType::StopEntrance => StopType::StopEntrance,
+            StopLocationType::GenericNode => StopType::GenericNode,
+            StopLocationType::BoardingArea => StopType::BoardingArea,
+        }
+    }
+}
+
+impl From<StopType> for StopLocationType {
+    fn from(stop_type: StopType) -> StopLocationType {
+        match stop_type {
+            StopType::Point => StopLocationType::StopPoint,
+            StopType::Zone => StopLocationType::StopArea,
+            StopType::StopEntrance => StopLocationType::StopEntrance,
+            StopType::GenericNode => StopLocationType::GenericNode,
+            StopType::BoardingArea => StopLocationType::BoardingArea,
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 struct Stop {
     #[serde(rename = "stop_id", deserialize_with = "de_without_slashes")]
@@ -98,18 +122,16 @@ struct Stop {
     code: Option<String>,
     #[serde(rename = "stop_name")]
     name: String,
-    #[serde(default, rename = "stop_desc")]
-    desc: String,
     #[serde(
-        rename = "stop_lon",
-        deserialize_with = "de_location_trim_with_default"
-    )]
-    lon: f64,
-    #[serde(
-        rename = "stop_lat",
-        deserialize_with = "de_location_trim_with_default"
+        default,
+        rename = "stop_desc",
+        deserialize_with = "de_option_empty_string"
     )]
-    lat: f64,
+    desc: Option<String>,
+    #[serde(rename = "stop_lon")]
+    lon: String,
+    #[serde(rename = "stop_lat")]
+    lat: String,
     #[serde(rename = "zone_id")]
     fare_zone_id: Option<String>,
     #[serde(rename = "stop_url")]
@@ -120,6 +142,7 @@ struct Stop {
     parent_station: Option<String>,
     #[serde(rename = "stop_timezone")]
     timezone: Option<String>,
+    level_id: Option<String>,
     #[serde(deserialize_with = "de_with_empty_default", default)]
     wheelchair_boarding: Availability,
     platform_code: Option<String>,
@@ -259,10 +282,12 @@ where
     let (networks, companies) = read::read_agency(file_handler)?;
     collections.networks = networks;
     collections.companies = companies;
-    let (stop_areas, stop_points) = read::read_stops(file_handler, &mut comments, &mut equipments)?;
+    let (stop_areas, stop_points, stop_locations) =
+        read::read_stops(file_handler, &mut comments, &mut equipments)?;
     collections.transfers = read::read_transfers(file_handler, &stop_points)?;
     collections.stop_areas = stop_areas;
     collections.stop_points = stop_points;
+    collections.stop_locations = stop_locations;
 
     read::manage_shapes(&mut collections, file_handler)?;
 
@@ -271,7 +296,8 @@ where
     collections.comments = comments;
     read::manage_stop_times(&mut collections, file_handler)?;
     read::manage_frequencies(&mut collections, file_handler)?;
-
+    collections.pathways = read::read_pathways(&mut collections, file_handler)?;
+    collections.levels = read_utils::read_opt_collection(file_handler, "levels.txt")?;
     collections.sanitize()?;
 
     //add prefixes
@@ -404,6 +430,7 @@ pub fn write<P: AsRef<Path>>(model: Model, path: P) -> Result<()> {
         path,
         &model.stop_points,
         &model.stop_areas,
+        &model.stop_locations,
         &model.comments,
         &model.equipments,
     )?;
@@ -423,6 +450,8 @@ pub fn write<P: AsRef<Path>>(model: Model, path: P) -> Result<()> {
         &model.stop_time_headsigns,
     )?;
     write::write_shapes(path, &model.geometries)?;
+    write_collection_with_id(path, "pathways.txt", &model.pathways)?;
+    write_collection_with_id(path, "levels.txt", &model.levels)?;
 
     Ok(())
 }