[feature] read gtfs route as line

documentation/gtfs_to_ntfs_specs.md

@@ -28,7 +28,10 @@ In addition, the NTFS format introduces 2 objects to enable the manipulation of
 Two parameters can be specified in the configuration of the converter in order to determine if on demand transport (ODT) data should be considered when reading the input GTFS (in particular, when [reading the stop_times.txt file](#reading-stop_timestxt)):
 
 * a boolean parameter `odt`, by default set to `false`, indicating if the GTFS should be considered as containing ODT information
-* a string `odt_comment` setting the message associated to an ODT comment.
+* a string `odt_comment` setting the message associated to an ODT comment. 
+
+A third boolean parameter (`read-as-line`) may affect the reading of the file [routes.txt](#reading-routestxt). If true, each GTFS "Route" will generate a different "Line" else we group the routes by "agency_id" and "route_short_name" (or "route_long_name" if the short name is empty) and create a "Line" for each group.
+
 
 ## Mapping of objects between GTFS and NTFS
 

examples/gtfs_reader.rs

@@ -13,22 +13,10 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>
 
 use serde_json::json;
-use std::collections::BTreeMap;
-use transit_model::{
-    gtfs,
-    objects::{Contributor, Dataset},
-    Result,
-};
+use transit_model::{gtfs, Result};
 
 fn run() -> Result<()> {
-    let configuration: gtfs::Configuration = gtfs::Configuration {
-        contributor: Contributor::default(),
-        dataset: Dataset::default(),
-        feed_infos: BTreeMap::new(),
-        prefix_conf: None,
-        on_demand_transport: false,
-        on_demand_transport_comment: None,
-    };
+    let configuration = gtfs::Configuration::default();
     // read GTFS from current directory
     let objects = gtfs::read_from_path(".", configuration)?;
     // output internal model as JSON

gtfs2netexfr/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gtfs2netexfr"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["Kisio Digital <[email protected]>"]
 license = "AGPL-3.0-only"
 description = "Binary to convert Transit data from GTFS format to NeTEx France"

gtfs2netexfr/src/main.rs

@@ -101,9 +101,9 @@ fn run(opt: Opt) -> Result<()> {
         contributor,
         dataset,
         feed_infos,
-        prefix_conf: None,
         on_demand_transport: opt.odt,
         on_demand_transport_comment: opt.odt_comment,
+        ..Default::default()
     };
 
     let model = if opt.input.is_file() {

gtfs2ntfs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gtfs2ntfs"
-version = "1.0.1"
+version = "1.1.0"
 authors = ["Kisio Digital <[email protected]>"]
 license = "AGPL-3.0-only"
 description = "Binary to convert Transit data from GTFS format to NTFS"

gtfs2ntfs/src/main.rs

@@ -58,6 +58,12 @@ struct Opt {
     #[structopt(long = "odt-comment")]
     odt_comment: Option<String>,
 
+    /// If true, each GTFS `Route` will generate a different `Line`.
+    /// Else we group the routes by `agency_id` and `route_short_name`
+    /// (or `route_long_name` if the short name is empty) and create a `Line` for each group.
+    #[structopt(long = "read-as-line")]
+    read_as_line: bool,
+
     /// Current datetime.
     #[structopt(
         short = "x",
@@ -118,6 +124,7 @@ fn run(opt: Opt) -> Result<()> {
         prefix_conf: Some(prefix_conf),
         on_demand_transport: opt.odt,
         on_demand_transport_comment: opt.odt_comment,
+        read_as_line: opt.read_as_line,
     };
 
     let model = if opt.input.is_file() {

src/gtfs/mod.rs

@@ -253,6 +253,7 @@ struct Shape {
 }
 
 ///parameters consolidation
+#[derive(Default)]
 pub struct Configuration {
     /// The Contributor providing the Dataset
     pub contributor: Contributor,
@@ -266,6 +267,10 @@ pub struct Configuration {
     pub on_demand_transport: bool,
     /// on demand transport comment template
     pub on_demand_transport_comment: Option<String>,
+    /// If true, each GTFS `Route` will generate a different `Line`.
+    /// Else we group the routes by `agency_id` and `route_short_name`
+    /// (or `route_long_name` if the short name is empty) and create a `Line` for each group.
+    pub read_as_line: bool,
 }
 
 fn read<H>(file_handler: &mut H, configuration: Configuration) -> Result<Model>
@@ -282,6 +287,7 @@ where
         prefix_conf,
         on_demand_transport,
         on_demand_transport_comment,
+        read_as_line,
     } = configuration;
 
     manage_calendars(file_handler, &mut collections)?;
@@ -303,7 +309,7 @@ where
 
     read::manage_shapes(&mut collections, file_handler)?;
 
-    read::read_routes(file_handler, &mut collections)?;
+    read::read_routes(file_handler, &mut collections, read_as_line)?;
     collections.equipments = CollectionWithId::new(equipments.into_equipments())?;
     read::manage_stop_times(
         &mut collections,