Merge pull request #162 from catenarytransit/allow-clone

Allow Calendar, Shape, Route, and other enums to be clonable, move serde bounds, upgrade from deprecated time function

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Read GTFS (public transit timetables) files"
 name = "gtfs-structures"
-version = "0.41.1"
+version = "0.41.2"
 authors = ["Tristram Gräbener <[email protected]>", "Antoine Desbordes <[email protected]>"]
 repository = "https://github.com/rust-transit/gtfs-structure"
 license = "MIT"

src/gtfs.rs

@@ -1,6 +1,5 @@
 use crate::{objects::*, Error, RawGtfs};
 use chrono::prelude::NaiveDate;
-use chrono::Duration;
 use std::collections::{HashMap, HashSet};
 use std::convert::TryFrom;
 use std::sync::Arc;
@@ -167,14 +166,16 @@ impl Gtfs {
                 .signed_duration_since(start_date)
                 .num_days();
             for days_offset in 0..=total_days {
-                let current_date = start_date + Duration::days(days_offset);
-
-                if calendar.start_date <= current_date
-                    && calendar.end_date >= current_date
-                    && calendar.valid_weekday(current_date)
-                    && !removed_days.contains(&days_offset)
-                {
-                    result.push(days_offset as u16);
+                if let Some(days_offset_timedelta) = chrono::TimeDelta::try_days(days_offset) {
+                    let current_date = start_date + days_offset_timedelta;
+
+                    if calendar.start_date <= current_date
+                        && calendar.end_date >= current_date
+                        && calendar.valid_weekday(current_date)
+                        && !removed_days.contains(&days_offset)
+                    {
+                        result.push(days_offset as u16);
+                    }
                 }
             }
         }

src/objects.rs

@@ -33,7 +33,7 @@ impl<T: Type> Type for Arc<T> {
 }
 
 /// A calender describes on which days the vehicle runs. See <https://gtfs.org/reference/static/#calendartxt>
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Calendar {
     /// Unique technical identifier (not for the traveller) of this calendar
     #[serde(rename = "service_id")]
@@ -128,7 +128,7 @@ impl Calendar {
 }
 
 /// Defines a specific date that can be added or removed from a [Calendar]. See <https://gtfs.org/reference/static/#calendar_datestxt>
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct CalendarDate {
     /// Identifier of the service that is modified at this date
     pub service_id: String,
@@ -217,7 +217,7 @@ impl fmt::Display for Stop {
 }
 
 /// A [StopTime] where the relations with [Trip] and [Stop] have not been tested
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct RawStopTime {
     /// [Trip] to which this stop time belongs to
     pub trip_id: String,
@@ -313,7 +313,7 @@ impl StopTime {
 }
 
 /// A route is a commercial line (there can be various stop sequences for a same line). See <https://gtfs.org/reference/static/#routestxt>
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct Route {
     /// Unique technical (not for the traveller) identifier for the route
     #[serde(rename = "route_id")]
@@ -386,7 +386,7 @@ impl fmt::Display for Route {
 }
 
 /// Raw structure to hold translations as defined in the GTFS file. See <https://gtfs.org/schedule/reference/#translationstxt>
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct RawTranslation {
     /// To which table does the translation apply
     pub table_name: String,
@@ -405,7 +405,7 @@ pub struct RawTranslation {
 }
 
 /// A [Trip] where the relationships with other objects have not been checked
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct RawTrip {
     /// Unique technical (not for the traveller) identifier for the Trip
     #[serde(rename = "trip_id")]
@@ -506,7 +506,7 @@ impl fmt::Display for Trip {
 }
 
 /// General informations about the agency running the network. See <https://gtfs.org/reference/static/#agencytxt>
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct Agency {
     /// Unique technical (not for the traveller) identifier for the Agency
     #[serde(rename = "agency_id")]
@@ -556,7 +556,7 @@ impl fmt::Display for Agency {
 }
 
 /// A single geographical point decribing the shape of a [Trip]. See <https://gtfs.org/reference/static/#shapestxt>
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct Shape {
     /// Unique technical (not for the traveller) identifier for the Shape
     #[serde(rename = "shape_id")]
@@ -588,7 +588,7 @@ impl Id for Shape {
 }
 
 /// Defines one possible fare. See <https://gtfs.org/reference/static/#fare_attributestxt>
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct FareAttribute {
     /// Unique technical (not for the traveller) identifier for the FareAttribute
     #[serde(rename = "fare_id")]
@@ -621,7 +621,7 @@ impl Type for FareAttribute {
 }
 
 /// Defines one possible fare. See <https://gtfs.org/schedule/reference/#fare_rulestxt>
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct FareRule {
     /// ID of the referenced FareAttribute.
     pub fare_id: String,
@@ -636,7 +636,7 @@ pub struct FareRule {
 }
 
 /// A [Frequency] before being merged into the corresponding [Trip]
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct RawFrequency {
     /// References the [Trip] that uses frequency
     pub trip_id: String,
@@ -684,7 +684,7 @@ impl Frequency {
 }
 
 /// Transfer information between stops before merged into [Stop]
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct RawTransfer {
     /// Stop from which to leave
     pub from_stop_id: String,
@@ -696,7 +696,7 @@ pub struct RawTransfer {
     pub min_transfer_time: Option<u32>,
 }
 
-#[derive(Debug, Default, Clone, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 /// Transfer information between stops
 pub struct StopTransfer {
     /// Stop which to transfer to
@@ -719,7 +719,7 @@ impl From<RawTransfer> for StopTransfer {
 }
 
 /// Meta-data about the feed. See <https://gtfs.org/reference/static/#feed_infotxt>
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct FeedInfo {
     /// Full name of the organization that publishes the dataset.
     #[serde(rename = "feed_publisher_name")]
@@ -766,7 +766,7 @@ impl fmt::Display for FeedInfo {
 }
 
 /// A graph representation to describe subway or train, with nodes (the locations) and edges (the pathways).
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct RawPathway {
     /// Uniquely identifies the pathway
     #[serde(rename = "pathway_id")]
@@ -867,7 +867,7 @@ impl From<RawPathway> for Pathway {
 }
 
 /// Format of the data
-#[derive(Debug, Serialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, PartialEq)]
 pub enum SourceFormat {
     /// `Directory` means the data comes from a directory
     Directory,

src/serde_helpers.rs

@@ -183,10 +183,10 @@ pub fn default_route_color() -> RGB8 {
     RGB8::new(255, 255, 255)
 }
 
-pub fn de_with_empty_default<'de, T: Default, D>(de: D) -> Result<T, D::Error>
+pub fn de_with_empty_default<'de, T, D>(de: D) -> Result<T, D::Error>
 where
     D: Deserializer<'de>,
-    T: Deserialize<'de>,
+    T: Deserialize<'de> + Default,
 {
     Option::<T>::deserialize(de).map(|opt| opt.unwrap_or_default())
 }