core: editoast: add weight field to operational points path property

Signed-off-by: Youness CHRIFI ALAOUI <youness.chrifi@gmail.com>
OpenRailAssociation · Jan 9, 2025 · e0b99bc · e0b99bc
1 parent ed6fcf4
commit e0b99bc
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 3 deletions.
diff --git a/core/kt-osrd-rjs-parser/src/main/kotlin/fr/sncf/osrd/RawInfraRJSParser.kt b/core/kt-osrd-rjs-parser/src/main/kotlin/fr/sncf/osrd/RawInfraRJSParser.kt
@@ -797,6 +797,10 @@ fun parseRJSInfra(rjsInfra: RJSInfra): RawInfra {
                 props["chLongLabel"] = sncf.chLongLabel
                 props["trigram"] = sncf.trigram
             }
+            val weight = operationalPoint.weight
+            if (weight != null) {
+                props["weight"] = weight
+            }
             if (opPart.extensions?.sncf != null) props["kp"] = opPart.extensions!!.sncf!!.kp
             val partId =
                 builder.operationalPointPart(

diff --git a/core/osrd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/infra/RJSOperationalPoint.java b/core/osrd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/infra/RJSOperationalPoint.java
@@ -14,11 +14,15 @@ public class RJSOperationalPoint implements Identified {
     @Nullable
     public RJSOperationalPointExtensions extensions;
 
+    @Nullable
+    public String weight;
+
     public RJSOperationalPoint(
-            String id, List<RJSOperationalPointPart> parts, @Nullable RJSOperationalPointExtensions extensions) {
+            String id, List<RJSOperationalPointPart> parts, @Nullable RJSOperationalPointExtensions extensions, @Nullable String weight) {
         this.id = id;
         this.parts = parts;
         this.extensions = extensions;
+        this.weight = weight;
     }
 
     @Override

diff --git a/core/src/main/kotlin/fr/sncf/osrd/api/api_v2/path_properties/PathPropResponse.kt b/core/src/main/kotlin/fr/sncf/osrd/api/api_v2/path_properties/PathPropResponse.kt
@@ -32,7 +32,8 @@ data class OperationalPointResponse(
     val id: String,
     val part: OperationalPointPartResponse,
     val extensions: OperationalPointExtensions?,
-    val position: Offset<Path>
+    val position: Offset<Path>,
+    val weight: Long?
 )
 
 data class OperationalPointPartResponse(

diff --git a/core/src/main/kotlin/fr/sncf/osrd/api/api_v2/path_properties/PathPropResponseConverter.kt b/core/src/main/kotlin/fr/sncf/osrd/api/api_v2/path_properties/PathPropResponseConverter.kt
@@ -101,8 +101,9 @@ private fun makeOperationalPoints(
         val opExtensions =
             if (opSncfExtension == null && opIdExtension == null) null
             else OperationalPointExtensions(opSncfExtension, opIdExtension)
+        val weight = if (opPartProps["weight"] == null) null else opPartProps["weight"]!!.toLong()
         val opResult =
-            OperationalPointResponse(operationalPointId, opPartResult, opExtensions, offset)
+            OperationalPointResponse(operationalPointId, opPartResult, opExtensions, offset, weight)
         res.add(opResult)
     }
     return res

diff --git a/editoast/openapi.yaml b/editoast/openapi.yaml
@@ -8010,6 +8010,7 @@ components:
             - id
             - part
             - position
+            - weight
             properties:
               extensions:
                 $ref: '#/components/schemas/OperationalPointExtensions'
@@ -8024,6 +8025,12 @@ components:
                 format: int64
                 description: Distance from the beginning of the path in mm
                 minimum: 0
+              weight:
+                type: integer
+                format: int32
+                description: Importance of the operational point
+                nullable: true
+                minimum: 0
           description: Operational points along the path
           nullable: true
         slopes:

diff --git a/editoast/src/core/path_properties.rs b/editoast/src/core/path_properties.rs
@@ -78,6 +78,9 @@ pub struct OperationalPointOnPath {
     extensions: OperationalPointExtensions,
     /// Distance from the beginning of the path in mm
     position: u64,
+    /// Importance of the operational point
+    #[schema(required)]
+    weight: Option<u8>,
 }
 
 /// Zones along a path. Each value is associated to a range of the path.

diff --git a/front/src/common/api/generatedEditoastApi.ts b/front/src/common/api/generatedEditoastApi.ts
@@ -2567,6 +2567,8 @@ export type PathProperties = {
         part: OperationalPointPart;
         /** Distance from the beginning of the path in mm */
         position: number;
+        /** Importance of the operational point */
+        weight: number | null;
       }[]
     | null;
   slopes?: {