editoast: use our custom uom unit system

editoast/Cargo.toml

@@ -150,7 +150,7 @@ tracing-opentelemetry = { version = "0.33.0", default-features = false, features
   "tracing-log",
 ] }
 tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
-uom = { version = "0.38.0", default-features = false, features = ["f64", "si"] }
+unit_system = { path = "./unit_system" }
 url = { version = "2.5.8", features = ["serde"] }
 urlencoding = "2.1.3"
 utoipa = { git = "https://github.com/osrd-project/utoipa.git", rev = "5103a24a6d6", features = [
@@ -250,7 +250,7 @@ tower-http = { version = "0.7", features = [
 ] }
 tracing.workspace = true
 tracing-subscriber.workspace = true
-uom.workspace = true
+unit_system.workspace = true
 url.workspace = true
 utoipa.workspace = true
 uuid.workspace = true

editoast/common/Cargo.toml

@@ -16,7 +16,6 @@ serde_json.workspace = true
 tracing.workspace = true
 tracing-opentelemetry.workspace = true
 tracing-subscriber.workspace = true
-uom.workspace = true
 url.workspace = true
 utoipa.workspace = true
 

editoast/common/src/lib.rs

@@ -2,7 +2,6 @@ pub mod geometry;
 mod hash_rounded_float;
 pub mod rangemap_utils;
 pub mod tracing;
-pub mod units;
 
 use std::collections::HashSet;
 use std::hash::Hash;
@@ -35,10 +34,7 @@ pub struct Version {
 /// Allows implementing Eq for floats considering all NaN values to be equal
 ///
 /// Tip: provide this to Educe.
-pub fn float_eq<V>(a: &V, b: &V) -> bool
-where
-    V: uom::num_traits::Num + uom::num_traits::float::TotalOrder + uom::Conversion<V>,
-{
+pub fn float_eq(a: &f64, b: &f64) -> bool {
     matches!(a.total_cmp(b), std::cmp::Ordering::Equal)
 }
 

editoast/core_client/Cargo.toml

@@ -28,6 +28,7 @@ tokio.workspace = true
 tokio-stream = "0.1.18"
 tracing.workspace = true
 tracing-opentelemetry.workspace = true
+unit_system.workspace = true
 url.workspace = true
 utoipa.workspace = true
 uuid.workspace = true

editoast/core_client/src/conflict_detection.rs

@@ -1,7 +1,7 @@
-use common::units::quantities::Offset;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::HashMap;
+use unit_system::quantities::Offset;
 use utoipa::ToSchema;
 use uuid::Uuid;
 
@@ -65,7 +65,7 @@ pub struct Conflict {
     /// (`trains_requirements` and `work_schedules`) and response.
     /// Example: `1970-01-01T00:00:00Z` for calendar timetables; the timetable start for hourly
     /// timetables.
-    #[serde(with = "common::units::millisecond::i64")]
+    #[serde(with = "unit_system::units::millisecond::i64")]
     pub start_time: Offset,
     /// Duration of the conflict in ms.
     pub duration: u64,
@@ -90,7 +90,7 @@ pub struct ConflictRequirement {
     /// (`trains_requirements` and `work_schedules`) and response.
     /// Example: `1970-01-01T00:00:00Z` for calendar timetables; the timetable start for hourly
     /// timetables.
-    #[serde(with = "common::units::millisecond::i64")]
+    #[serde(with = "unit_system::units::millisecond::i64")]
     #[schema(value_type = i64)]
     pub start_time: Offset,
     /// Duration of the time range in ms (difference between the latest end time and the earliest start_time for any zone use in this conflict).

editoast/core_client/src/simulation.rs

@@ -2,13 +2,6 @@ use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::hash::Hash;
 
-use common::units;
-use common::units::quantities::Acceleration;
-use common::units::quantities::Deceleration;
-use common::units::quantities::Length;
-use common::units::quantities::Mass;
-use common::units::quantities::Time;
-use common::units::quantities::Velocity;
 use educe::Educe;
 use schemas::rolling_stock::EffortCurves;
 use schemas::rolling_stock::EtcsBrakeParams;
@@ -20,6 +13,13 @@ use schemas::train_schedule::ReceptionSignal;
 use schemas::train_schedule::TrainScheduleOptions;
 use serde::Deserialize;
 use serde::Serialize;
+use unit_system::quantities::Acceleration;
+use unit_system::quantities::Deceleration;
+use unit_system::quantities::Length;
+use unit_system::quantities::Mass;
+use unit_system::quantities::Time;
+use unit_system::quantities::Velocity;
+use unit_system::units;
 use utoipa::ToSchema;
 
 use super::RawError;

editoast/core_task/Cargo.toml

@@ -21,7 +21,7 @@ serde_json.workspace = true
 tokio.workspace = true
 tokio-stream.workspace = true
 tracing.workspace = true
-uom.workspace = true
+unit_system.workspace = true
 
 [dev-dependencies]
 cache = { workspace = true, features = ["mock"] }

editoast/core_task/src/envs/simulation/inputs.rs

@@ -47,9 +47,9 @@ pub struct SimulationTrainParameters {
     power_restrictions: rangemap::RangeMap<ScheduleItemIndex, String>,
     margins: rangemap::RangeMap<ScheduleItemIndex, MarginValue>,
 
-    #[educe(Hash(method(common::units::meter_per_second::hash)))]
-    #[educe(PartialEq(method(common::units::meter_per_second::eq)))]
-    initial_speed: uom::si::f64::Velocity,
+    #[educe(Hash(method(unit_system::units::meter_per_second::hash)))]
+    #[educe(PartialEq(method(unit_system::units::meter_per_second::eq)))]
+    initial_speed: unit_system::quantities::Velocity,
     constraint_distribution: Distribution,
     comfort: Comfort,
     speed_limit_tag: Option<String>,
@@ -73,7 +73,7 @@ impl ScheduleItem {
 
 impl SimulationTrainParameters {
     pub fn new(
-        initial_speed: uom::si::f64::Velocity,
+        initial_speed: unit_system::quantities::Velocity,
         constraint_distribution: Distribution,
         comfort: Comfort,
         speed_limit_tag: Option<String>,
@@ -103,7 +103,7 @@ impl SimulationTrainParameters {
         &self.margins
     }
 
-    pub fn initial_speed(&self) -> uom::si::f64::Velocity {
+    pub fn initial_speed(&self) -> unit_system::quantities::Velocity {
         self.initial_speed
     }
 

editoast/core_task/src/envs/simulation/request.rs

@@ -114,9 +114,7 @@ pub(super) fn build_request(
             values: margin_values,
         },
         power_restrictions,
-        initial_speed: params
-            .initial_speed()
-            .get::<uom::si::velocity::meter_per_second>(),
+        initial_speed: unit_system::units::meter_per_second::from(params.initial_speed()),
         comfort: params.comfort(),
         constraint_distribution: params.constraint_distribution(),
         speed_limit_tag: params.speed_limit_tag().map(|s| s.to_owned()),

editoast/editoast_derive/src/annotate_units.rs

@@ -34,13 +34,28 @@ fn get_abbreviation(value: &str) -> Option<&'static str> {
         "meter" => Some("Length in m"),
         "millimeter" => Some("Length in mm"),
         "meter_per_second" => Some("Velocity in m·s⁻¹"),
+        "kilometer_per_hour" => Some("Velocity in km·h⁻¹"),
         "meter_per_second_squared" => Some("Acceleration in m·s⁻²"),
+        "newton_per_kg" => Some("Acceleration in N·kg⁻¹"),
+        "newton_per_ton" => Some("Acceleration in N·t⁻¹"),
         "kilogram" => Some("Mass in kg"),
+        "ton" => Some("Mass in t"),
         "newton" => Some("Solid Friction in N"),
+        "kilonewton" => Some("Solid Friction in kN"),
+        "kilogram_per_second" => Some("Viscosity friction in kg·s⁻¹"),
+        "newton_per_meter_per_second" => Some("Viscosity friction in N·(m/s)⁻¹"),
+        "newton_per_kilometer_per_hour" => Some("Viscosity friction in N·(km/h)⁻¹"),
         "hertz" => Some("Viscosity friction per weight in s⁻¹"),
+        "newton_per_meter_per_second_per_kilogram" => {
+            Some("Viscosity friction per weight in N·(m/s)⁻¹·kg⁻¹")
+        }
         "kilogram_per_meter" => Some("Aerodynamic drag in kg·m⁻¹"),
-        "kilogram_per_second" => Some("Viscosity friction in kg·s⁻¹"),
+        "newton_per_meter_per_second_squared" => Some("Aerodynamic drag in N·(m/s)⁻²"),
+        "kilonewton_per_kilometer_per_hour_squared" => Some("Aerodynamic drag in kN·(km/h)⁻²"),
         "per_meter" => Some("Aerodynamic drag per kg in m⁻¹"),
+        "newton_per_meter_per_second_squared_per_kilogram" => {
+            Some("Aerodynamic drag per kg in N·(m/s)⁻²·kg⁻¹")
+        }
         _ => None,
     }
 }

editoast/editoast_derive/src/lib.rs

@@ -226,7 +226,7 @@ pub fn search_config_store(input: proc_macro::TokenStream) -> proc_macro::TokenS
 /// * `#[model(to_string)]`: calls `to_string()` before writing the field to the database and calls `String::from` after reading (diesel column type: String)
 /// * `#[model(to_enum)]`: is converted as `u8` before writing the field to the database and calls `FromRepr::from_repr` after reading (diesel column type: TinyInt)
 /// * `#[model(remote = "T")]`: calls `Into::<T>::into` before writing the field to the database and calls `T::from` after reading (diesel column type: T)
-/// * `#[model(uom_unit = "path::to::unit")]`: the value is the path to an unit defined in common, e.g. `"common::units::meter"`
+/// * `#[model(uom_unit = "path::to::unit")]`: the value is the path to an unit defined in common, e.g. `"unit_system::units::meter"`
 /// * `#[model(geo)]` **TODO**: TBD
 /// * `#[model(non_null_array = "T")]`: wraps type `T` into an `Option<T>` when interfacing with diesel to satisfy the nullable property of postgres arrays
 ///

editoast/models/Cargo.toml

@@ -38,7 +38,7 @@ thiserror.workspace = true
 tokio.workspace = true
 tokio-postgres.workspace = true
 tracing.workspace = true
-uom.workspace = true
+unit_system.workspace = true
 url.workspace = true
 utoipa.workspace = true
 uuid.workspace = true

editoast/models/src/rolling_stock.rs

@@ -3,13 +3,6 @@ mod power_restrictions;
 use std::collections::HashMap;
 use std::collections::HashSet;
 
-use common::units;
-use common::units::quantities::Acceleration;
-use common::units::quantities::Deceleration;
-use common::units::quantities::Length;
-use common::units::quantities::Mass;
-use common::units::quantities::Time;
-use common::units::quantities::Velocity;
 use editoast_derive::Model;
 use schemas::rolling_stock::EffortCurves;
 use schemas::rolling_stock::EnergySource;
@@ -20,6 +13,13 @@ use schemas::rolling_stock::RollingStockMetadata;
 use schemas::rolling_stock::SupportedSignalingSystem;
 use serde::Deserialize;
 use serde::Serialize;
+use unit_system::quantities::Acceleration;
+use unit_system::quantities::Deceleration;
+use unit_system::quantities::Length;
+use unit_system::quantities::Mass;
+use unit_system::quantities::Time;
+use unit_system::quantities::Velocity;
+use unit_system::units;
 use utoipa::ToSchema;
 
 use crate::prelude::*;

editoast/models/src/timetable.rs

@@ -1,5 +1,3 @@
-use common::units::millisecond;
-use common::units::quantities::Offset;
 use database::DatabaseError;
 use database::tables::sql_types;
 use diesel::prelude::*;
@@ -15,6 +13,8 @@ use editoast_derive::Model;
 use itertools::Itertools as _;
 use std::collections::HashSet;
 use std::ops::DerefMut as _;
+use unit_system::quantities::Offset;
+use unit_system::units::millisecond;
 
 use database::DbConnection;
 

editoast/models/src/towed_rolling_stock.rs

@@ -1,13 +1,13 @@
-use common::units;
-use common::units::quantities::Acceleration;
-use common::units::quantities::Deceleration;
-use common::units::quantities::Length;
-use common::units::quantities::Mass;
-use common::units::quantities::Velocity;
 use editoast_derive::Model;
 use schemas::rolling_stock::RollingResistancePerWeight;
 use serde::Deserialize;
 use serde::Serialize;
+use unit_system::quantities::Acceleration;
+use unit_system::quantities::Deceleration;
+use unit_system::quantities::Length;
+use unit_system::quantities::Mass;
+use unit_system::quantities::Velocity;
+use unit_system::units;
 
 use crate::prelude::*;
 

editoast/models/src/train_schedule.rs

@@ -2,8 +2,6 @@ use crate::prelude::*;
 use crate::rolling_stock::TrainMainCategory;
 use crate::tags::Tags;
 use chrono::Duration as ChronoDuration;
-use common::units::millisecond;
-use common::units::quantities::Offset;
 use derive_more::Display;
 use editoast_derive::Model;
 use itertools::Itertools as _;
@@ -24,6 +22,8 @@ use schemas::train_schedule::TrainScheduleOptions;
 use serde::Deserialize;
 use serde::Serialize;
 use std::fmt::Display;
+use unit_system::quantities::Offset;
+use unit_system::units::millisecond;
 use utoipa::ToSchema;
 
 #[derive(Debug, Clone, Model)]
@@ -37,7 +37,7 @@ pub struct TrainSchedule {
     pub labels: Tags,
     pub rolling_stock_name: String,
     pub train_schedule_set_id: i64,
-    #[model(uom_unit = "common::units::millisecond::i64")]
+    #[model(uom_unit = "unit_system::units::millisecond::i64")]
     /// For calendar timetables: elapsed ms since 1970-01-01T00:00:00Z.
     /// For hourly timetables: elapsed ms since the timetable start.
     pub start_time: Offset,
@@ -504,14 +504,14 @@ mod tests {
 
     use super::OccurrenceId;
     use super::TrainSchedule;
-    use common::units::quantities::Offset;
     use database::DbConnectionPoolV2;
     use pretty_assertions::assert_eq;
     use rstest::rstest;
     use schemas::TrainScheduleExceptionChangeGroups;
     use schemas::fixtures::ms_since_epoch;
     use schemas::paced_train::RollingStockCategoryChangeGroup;
     use schemas::paced_train::StartTimeChangeGroup;
+    use unit_system::quantities::Offset;
 
     use crate::prelude::*;
     use schemas::train_schedule::Comfort;

editoast/schemas/Cargo.toml

@@ -23,7 +23,7 @@ serde_json.workspace = true
 serde_with.workspace = true
 strum.workspace = true
 thiserror.workspace = true
-uom.workspace = true
+unit_system.workspace = true
 utoipa.workspace = true
 uuid.workspace = true