editoast: add new track_section field in operational point layer

Signed-off-by: Youness CHRIFI ALAOUI <youness.chrifi@gmail.com>

editoast/editoast_models/src/tables.rs

@@ -191,6 +191,7 @@ diesel::table! {
         geographic -> Geometry,
         infra_id -> Int8,
         kp -> Nullable<Text>,
+        track_section -> Text,
     }
 }
 

editoast/map_layers.yml

@@ -80,9 +80,10 @@ layers:
     views:
       geo:
         on_field: geographic
-        data_expr: operational_point.data - 'parts' || jsonb_build_object('kp', layer.kp)
+        data_expr: operational_point.data - 'parts' || jsonb_build_object('kp', layer.kp, 'track_id', layer.track_section, 'track_label', track_section.data->'extensions'->'sncf'->'track_name')
         joins:
           - inner join infra_object_operational_point operational_point on operational_point.obj_id = layer.obj_id and operational_point.infra_id = layer.infra_id
+          - inner join infra_object_track_section track_section on track_section.obj_id = layer.track_section and track_section.infra_id = layer.infra_id
 
   electrifications:
     table_name: infra_layer_electrification

editoast/migrations/2024-11-27-095410_add_track_section_operational_point_layer/down.sql

@@ -0,0 +1 @@
+ALTER TABLE infra_layer_operational_point DROP COLUMN track_section;

editoast/migrations/2024-11-27-095410_add_track_section_operational_point_layer/up.sql

@@ -0,0 +1,40 @@
+DELETE FROM infra_layer_operational_point;
+ALTER TABLE infra_layer_operational_point ADD COLUMN track_section text NOT NULL;
+
+WITH ops AS (
+    SELECT obj_id AS op_id,
+        infra_id,
+        (
+            jsonb_array_elements(data->'parts')->'position'
+        )::float AS position,
+        jsonb_array_elements(data->'parts')->>'track' AS track_id,
+        jsonb_array_elements(data->'parts')->'extensions'->'sncf'->>'kp' AS kp
+    FROM infra_object_operational_point
+),
+collect AS (
+    SELECT ops.op_id,
+        ST_LineInterpolatePoint(
+            tracks_layer.geographic,
+            LEAST(
+                GREATEST(
+                    ops.position / (tracks.data->'length')::float,
+                    0.
+                ),
+                1.
+            )
+        ) AS geo,
+        ops.kp AS kp,
+        ops.infra_id AS infra_id,
+        ops.track_id AS track_section
+    FROM ops
+        INNER JOIN infra_object_track_section AS tracks ON tracks.obj_id = ops.track_id AND tracks.infra_id = ops.infra_id
+        INNER JOIN infra_layer_track_section AS tracks_layer ON tracks.obj_id = tracks_layer.obj_id
+        AND tracks.infra_id = tracks_layer.infra_id
+)
+INSERT INTO infra_layer_operational_point (obj_id, infra_id, geographic, kp, track_section)
+SELECT op_id,
+     infra_id,
+    geo,
+    kp,
+    track_section
+FROM collect;

editoast/src/generated_data/sql/generate_operational_point_layer.sql

@@ -20,16 +20,18 @@ collect AS (
                 1.
             )
         ) AS geo,
-        ops.kp AS kp
+        ops.kp AS kp,
+        ops.track_id AS track_section
     FROM ops
         INNER JOIN infra_object_track_section AS tracks ON tracks.obj_id = ops.track_id
         AND tracks.infra_id = $1
         INNER JOIN infra_layer_track_section AS tracks_layer ON tracks.obj_id = tracks_layer.obj_id
         AND tracks.infra_id = tracks_layer.infra_id
 )
-INSERT INTO infra_layer_operational_point (obj_id, infra_id, geographic, kp)
+INSERT INTO infra_layer_operational_point (obj_id, infra_id, geographic, kp, track_section)
 SELECT op_id,
     $1,
     geo,
-    kp
+    kp,
+    track_section
 FROM collect

editoast/src/generated_data/sql/insert_operational_point_layer.sql

@@ -21,16 +21,18 @@ collect AS (
                 1.
             )
         ) AS geo,
-        ops.kp AS kp
+        ops.kp AS kp,
+        ops.track_id AS track_section
     FROM ops
         INNER JOIN infra_object_track_section AS tracks ON tracks.obj_id = ops.track_id
         AND tracks.infra_id = $1
         INNER JOIN infra_layer_track_section AS tracks_layer ON tracks.obj_id = tracks_layer.obj_id
         AND tracks.infra_id = tracks_layer.infra_id
 )
-INSERT INTO infra_layer_operational_point (obj_id, infra_id, geographic, kp)
+INSERT INTO infra_layer_operational_point (obj_id, infra_id, geographic, kp, track_section)
 SELECT op_id,
     $1,
     geo,
-    kp
+    kp,
+    track_section
 FROM collect