diff --git a/editoast/Cargo.lock b/editoast/Cargo.lock index cb2a0b566fa..2806ab558c9 100644 --- a/editoast/Cargo.lock +++ b/editoast/Cargo.lock @@ -1296,6 +1296,7 @@ dependencies = [ "diesel", "diesel-async", "diesel_json", + "editoast_common", "editoast_derive", "enum-map", "enumset", @@ -1317,7 +1318,6 @@ dependencies = [ "opentelemetry_sdk", "osm4routing", "osmpbfreader", - "osrd_containers", "paste", "pathfinding", "postgis_diesel", @@ -1352,6 +1352,17 @@ dependencies = [ "validator", ] +[[package]] +name = "editoast_common" +version = "0.1.0" +dependencies = [ + "rangemap", + "serde", + "serde_derive", + "serde_json", + "utoipa", +] + [[package]] name = "editoast_derive" version = "0.1.0" @@ -2806,17 +2817,6 @@ dependencies = [ "smartstring", ] -[[package]] -name = "osrd_containers" -version = "0.1.0" -dependencies = [ - "rangemap", - "serde", - "serde_derive", - "serde_json", - "utoipa", -] - [[package]] name = "overload" version = "0.1.1" diff --git a/editoast/Cargo.toml b/editoast/Cargo.toml index e42e17c9a46..85911a28bc7 100644 --- a/editoast/Cargo.toml +++ b/editoast/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "LGPL-3.0" [workspace] -members = [".", "editoast_derive", "osrd_containers"] +members = [".", "editoast_derive", "editoast_common"] [workspace.dependencies] rangemap = "1.4.0" @@ -65,7 +65,7 @@ strum_macros = "0.25.3" thiserror = "1.0.56" enum-map = "2.7.3" editoast_derive = { path = "./editoast_derive" } -osrd_containers = { path = "./osrd_containers" } +editoast_common = { path = "./editoast_common" } mvt = "0.9.0" futures = "0.3.30" postgis_diesel = { version = "2.3.0", features = ["serde"] } diff --git a/editoast/osrd_containers/Cargo.toml b/editoast/editoast_common/Cargo.toml similarity index 92% rename from editoast/osrd_containers/Cargo.toml rename to editoast/editoast_common/Cargo.toml index 6016e505a16..442c2985104 100644 --- a/editoast/osrd_containers/Cargo.toml +++ b/editoast/editoast_common/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "osrd_containers" +name = "editoast_common" version = "0.1.0" edition = "2021" diff --git a/editoast/osrd_containers/src/lib.rs b/editoast/editoast_common/src/lib.rs similarity index 100% rename from editoast/osrd_containers/src/lib.rs rename to editoast/editoast_common/src/lib.rs diff --git a/editoast/osrd_containers/src/rangemap_utils.rs b/editoast/editoast_common/src/rangemap_utils.rs similarity index 100% rename from editoast/osrd_containers/src/rangemap_utils.rs rename to editoast/editoast_common/src/rangemap_utils.rs diff --git a/editoast/src/views/pathfinding/electrical_profiles.rs b/editoast/src/views/pathfinding/electrical_profiles.rs index 7dc7cb9c84f..32c53eb46c2 100644 --- a/editoast/src/views/pathfinding/electrical_profiles.rs +++ b/editoast/src/views/pathfinding/electrical_profiles.rs @@ -7,7 +7,7 @@ use actix_web::web::Data; use actix_web::web::Json; use actix_web::web::Path; use actix_web::web::Query; -use osrd_containers::rangemap_utils::RangedValue; +use editoast_common::rangemap_utils::RangedValue; use rangemap::RangeMap; use serde::Deserialize; use serde::Serialize; @@ -141,7 +141,7 @@ mod tests { use actix_web::test::call_service; use actix_web::test::read_body_json; use actix_web::test::TestRequest; - use osrd_containers::range_map; + use editoast_common::range_map; use rstest::*; use super::*; diff --git a/editoast/src/views/pathfinding/electrifications.rs b/editoast/src/views/pathfinding/electrifications.rs index 3de0be25d04..90351bea1cb 100644 --- a/editoast/src/views/pathfinding/electrifications.rs +++ b/editoast/src/views/pathfinding/electrifications.rs @@ -7,7 +7,7 @@ use actix_web::web::Data; use actix_web::web::Json; use actix_web::web::Path; use chashmap::CHashMap; -use osrd_containers::rangemap_utils::RangedValue; +use editoast_common::rangemap_utils::RangedValue; use rangemap::RangeMap; use serde::Deserialize; use serde::Serialize; @@ -33,7 +33,7 @@ crate::routes! { crate::schemas! { ElectrificationsOnPathResponse, - &osrd_containers::rangemap_utils::RangedValue, + &editoast_common::rangemap_utils::RangedValue, } /// Build a rangemap for each track section, giving the voltage for each range @@ -138,7 +138,7 @@ pub mod tests { use actix_web::test::call_service; use actix_web::test::read_body_json; use actix_web::test::TestRequest; - use osrd_containers::range_map; + use editoast_common::range_map; use rstest::*; use serde_json::from_value; use ApplicableDirections::*; diff --git a/editoast/src/views/pathfinding/path_rangemap.rs b/editoast/src/views/pathfinding/path_rangemap.rs index 0bae78af7ad..02b2a25a72e 100644 --- a/editoast/src/views/pathfinding/path_rangemap.rs +++ b/editoast/src/views/pathfinding/path_rangemap.rs @@ -1,10 +1,10 @@ use std::collections::HashMap; -use osrd_containers::rangemap_utils::clip_range_map; -use osrd_containers::rangemap_utils::extend_range_map; -use osrd_containers::rangemap_utils::travel_range_map; -use osrd_containers::rangemap_utils::Float; -use osrd_containers::rangemap_utils::TravelDir; +use editoast_common::rangemap_utils::clip_range_map; +use editoast_common::rangemap_utils::extend_range_map; +use editoast_common::rangemap_utils::travel_range_map; +use editoast_common::rangemap_utils::Float; +use editoast_common::rangemap_utils::TravelDir; use rangemap::RangeMap; use crate::models::pathfinding::Pathfinding; @@ -49,7 +49,7 @@ pub fn make_path_range_map( #[cfg(test)] mod tests { - use osrd_containers::range_map; + use editoast_common::range_map; use super::*; use crate::models::pathfinding::tests::simple_pathfinding;