Merge pull request #713 from CanalTP/add_object_codes_on_companies

[feature] add object codes on companies

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Kisio Digital <[email protected]>", "Guillaume Pinot <[email protected]>"]
 name = "transit_model"
-version = "0.31.5"
+version = "0.32.0"
 license = "AGPL-3.0-only"
 description = "Transit data management"
 repository = "https://github.com/CanalTP/transit_model"

gtfs2netexfr/Cargo.toml

@@ -22,4 +22,4 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.31", path = "../", features = ["proj"] }
+transit_model = { version = "0.32", path = "../", features = ["proj"] }

gtfs2ntfs/Cargo.toml

@@ -22,4 +22,4 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.31", path = "../" }
+transit_model = { version = "0.32", path = "../" }

ntfs2gtfs/Cargo.toml

@@ -22,4 +22,4 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.31", path = "../" }
+transit_model = { version = "0.32", path = "../" }

ntfs2netexfr/Cargo.toml

@@ -22,4 +22,4 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.31", path = "../", features = ["proj"] }
+transit_model = { version = "0.32", path = "../", features = ["proj"] }

ntfs2ntfs/Cargo.toml

@@ -22,4 +22,4 @@ slog-scope = "4.1"
 slog-stdlog = "4.0"
 slog-term = "2.4"
 structopt = "0.3"
-transit_model = { version = "0.31", path = "../" }
+transit_model = { version = "0.32", path = "../" }

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.31", path = "../" }
+transit_model = { version = "0.32", path = "../" }

src/gtfs/read.rs

@@ -79,6 +79,7 @@ impl From<Agency> for objects::Company {
             url: Some(agency.url),
             mail: agency.email,
             phone: agency.phone,
+            codes: BTreeSet::new(),
         }
     }
 }

src/lib.rs

@@ -58,7 +58,7 @@ pub mod validity_period;
 pub mod vptranslator;
 
 /// Current version of the NTFS format
-pub const NTFS_VERSION: &str = "0.11.2";
+pub const NTFS_VERSION: &str = "0.11.4";
 
 /// The max distance in meters to compute the transfer
 pub const TRANSFER_MAX_DISTANCE: &str = "300";

src/ntfs/mod.rs

@@ -394,7 +394,7 @@ mod tests {
                     ("feed_end_date".to_string(), "20180131".to_string()),
                     ("feed_publisher_name".to_string(), "Nicaragua".to_string()),
                     ("feed_start_date".to_string(), "20180130".to_string()),
-                    ("ntfs_version".to_string(), "0.11.2".to_string()),
+                    ("ntfs_version".to_string(), "0.11.4".to_string()),
                     ("tartare_platform".to_string(), "dev".to_string()),
                 ],
                 collections
@@ -458,6 +458,7 @@ mod tests {
                 url: Some("http://www.foo.fr/".to_string()),
                 mail: Some("[email protected]".to_string()),
                 phone: Some("0123456789".to_string()),
+                codes: BTreeSet::new(),
             },
             Company {
                 id: "OIF:102".to_string(),
@@ -466,6 +467,7 @@ mod tests {
                 url: None,
                 mail: None,
                 phone: None,
+                codes: BTreeSet::new(),
             },
         ]);
     }

src/ntfs/write.rs

@@ -770,6 +770,7 @@ pub fn write_codes(path: &path::Path, collections: &Collections) -> Result<()> {
     write_codes_from_collection_with_id(&mut wtr, &collections.lines, &path)?;
     write_codes_from_collection_with_id(&mut wtr, &collections.routes, &path)?;
     write_codes_from_collection_with_id(&mut wtr, &collections.vehicle_journeys, &path)?;
+    write_codes_from_collection_with_id(&mut wtr, &collections.companies, &path)?;
 
     wtr.flush()
         .with_context(|_| format!("Error reading {:?}", path))?;

src/objects.rs

@@ -43,6 +43,7 @@ pub enum ObjectType {
     StopTime,
     LineGroup,
     Ticket,
+    Company,
 }
 
 pub trait GetObjectType {
@@ -61,6 +62,7 @@ impl ObjectType {
             ObjectType::StopTime => "stop_time",
             ObjectType::LineGroup => "line_group",
             ObjectType::Ticket => "ticket",
+            ObjectType::Company => "company",
         }
     }
 }
@@ -1308,9 +1310,13 @@ pub struct Company {
     pub mail: Option<String>,
     #[serde(rename = "company_phone")]
     pub phone: Option<String>,
+    #[serde(skip)]
+    pub codes: KeysValues,
 }
 
 impl_id!(Company);
+impl_codes!(Company);
+
 impl Default for Company {
     fn default() -> Company {
         Company {
@@ -1320,6 +1326,7 @@ impl Default for Company {
             url: None,
             mail: None,
             phone: None,
+            codes: BTreeSet::new(),
         }
     }
 }
@@ -1328,6 +1335,11 @@ impl AddPrefix for Company {
         self.id = prefix_conf.referential_prefix(self.id.as_str());
     }
 }
+impl GetObjectType for Company {
+    fn get_object_type() -> ObjectType {
+        ObjectType::Company
+    }
+}
 
 impl_with_id!(Company);
 

tests/fixtures/gtfs2ntfs/full_output/feed_infos.txt

@@ -7,6 +7,6 @@ feed_license,DefaultDatasourceLicense
 feed_license_url,http://www.default-datasource-website.com
 feed_publisher_name,DefaultContributorName
 feed_start_date,20180101
-ntfs_version,0.11.2
+ntfs_version,0.11.4
 tartare_contributor_id,DefaultContributorId
 tartare_platform,dev

tests/fixtures/gtfs2ntfs/minimal/output/feed_infos.txt

@@ -4,4 +4,4 @@ feed_creation_time,17:19:00
 feed_creation_datetime,2019-04-03T17:19:00+00:00
 feed_end_date,20180106
 feed_start_date,20180101
-ntfs_version,0.11.2
+ntfs_version,0.11.4

tests/fixtures/restrict-validity-period/output/feed_infos.txt

@@ -4,4 +4,4 @@ feed_creation_time,17:19:00
 feed_creation_datetime,2019-04-03T17:19:00+00:00
 feed_end_date,20180805
 feed_start_date,20180501
-ntfs_version,0.11.2
+ntfs_version,0.11.4