editoast: move Sign to editoast_schemas

Author: hamz2a

editoast/editoast_schemas/src/infra.rs

@@ -2,6 +2,7 @@ mod applicable_directions;
 mod direction;
 mod directional_track_range;
 mod side;
+mod sign;
 mod track_location;
 mod track_offset;
 mod track_range;
@@ -11,6 +12,7 @@ pub use applicable_directions::ApplicableDirections;
 pub use direction::Direction;
 pub use directional_track_range::DirectionalTrackRange;
 pub use side::Side;
+pub use sign::Sign;
 pub use track_location::TrackLocation;
 pub use track_offset::TrackOffset;
 pub use track_range::TrackRange;

editoast/editoast_schemas/src/infra/sign.rs

@@ -0,0 +1,24 @@
+use derivative::Derivative;
+use editoast_common::Identifier;
+use editoast_common::NonBlankString;
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::Direction;
+use super::Side;
+
+#[derive(Debug, Derivative, Clone, Deserialize, Serialize, PartialEq)]
+#[derivative(Default)]
+#[serde(deny_unknown_fields)]
+pub struct Sign {
+    #[derivative(Default(value = r#""InvalidRef".into()"#))]
+    pub track: Identifier,
+    pub position: f64,
+    pub side: Side,
+    #[derivative(Default(value = r#"Direction::StartToStop"#))]
+    pub direction: Direction,
+    #[serde(rename = "type")]
+    pub sign_type: NonBlankString,
+    pub value: String,
+    pub kp: String,
+}

editoast/src/schema/mod.rs

@@ -21,7 +21,6 @@ pub use detector::Detector;
 pub use detector::DetectorCache;
 use editoast_schemas::infra::ApplicableDirections;
 use editoast_schemas::infra::Direction;
-use editoast_schemas::infra::Side;
 use editoast_schemas::primitives::OSRDIdentified;
 use editoast_schemas::primitives::ObjectType;
 pub use electrification::Electrification;
@@ -70,7 +69,6 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use editoast_common::Identifier;
-use editoast_common::NonBlankString;
 
 editoast_common::schemas! {
     utils::schemas(),
@@ -144,19 +142,3 @@ impl TrackEndpoint {
         }
     }
 }
-
-#[derive(Debug, Derivative, Clone, Deserialize, Serialize, PartialEq)]
-#[derivative(Default)]
-#[serde(deny_unknown_fields)]
-pub struct Sign {
-    #[derivative(Default(value = r#""InvalidRef".into()"#))]
-    pub track: Identifier,
-    pub position: f64,
-    pub side: Side,
-    #[derivative(Default(value = r#"Direction::StartToStop"#))]
-    pub direction: Direction,
-    #[serde(rename = "type")]
-    pub sign_type: NonBlankString,
-    pub value: String,
-    pub kp: String,
-}

editoast/src/schema/neutral_section.rs

@@ -4,9 +4,9 @@ use serde::Serialize;
 
 use super::OSRDIdentified;
 use super::ObjectType;
-use super::Sign;
 use editoast_common::Identifier;
 use editoast_schemas::infra::DirectionalTrackRange;
+use editoast_schemas::infra::Sign;
 use editoast_schemas::primitives::OSRDTyped;
 
 /// Neutral sections are portions of track where trains aren't allowed to pull power from electrifications. They have to rely on inertia to cross such sections.

editoast/src/schema/speed_section.rs

@@ -7,11 +7,11 @@ use serde::Serialize;
 use super::ApplicableDirectionsTrackRange;
 use super::OSRDIdentified;
 use super::ObjectType;
-use super::Sign;
 use crate::infra_cache::Cache;
 use crate::infra_cache::ObjectCache;
 use editoast_common::Identifier;
 use editoast_common::NonBlankString;
+use editoast_schemas::infra::Sign;
 use editoast_schemas::primitives::OSRDTyped;
 
 #[derive(Debug, Derivative, Clone, Serialize, PartialEq, Copy)]