front: manchette: display waypoints added with map click

Author: SharglutDev

front/public/locales/en/simulation.json

@@ -34,6 +34,7 @@
     "used": "used"
   },
   "projectionInProgress": "Projection in progress: {{ count }}/{{ total }} trains",
+  "requestedPoint": "requested point {{ count }}",
   "reset": "Reset the chart",
   "resetTimer": "Reset timer",
   "rotate": "Rotate the chart",

front/public/locales/fr/simulation.json

@@ -34,6 +34,7 @@
     "used": "utilisée"
   },
   "projectionInProgress": "Projection en cours: {{ count }}/{{ total }} trains",
+  "requestedPoint": "point demandé {{ count }}",
   "reset": "Réinitialiser le graphique",
   "resetTimer": "Réinitialiser le compteur",
   "rotate": "Pivoter le graphique",

front/src/modules/simulationResult/components/SpaceTimeChart/useGetProjectedTrainOperationalPoints.ts

@@ -1,20 +1,34 @@
 import { useEffect, useState } from 'react';
 
+import { useTranslation } from 'react-i18next';
+
 import { STDCM_TRAIN_ID } from 'applications/stdcm/consts';
 import {
   osrdEditoastApi,
   type PathProperties,
   type PostV2InfraByInfraIdPathPropertiesApiArg,
 } from 'common/api/osrdEditoastApi';
+import { addElementAtIndex } from 'utils/array';
 
 const useGetProjectedTrainOperationalPoints = (
   trainIdUsedForProjection?: number,
   infraId?: number
 ) => {
+  const { t } = useTranslation('simulation');
   const [operationalPoints, setOperationalPoints] = useState<
     NonNullable<PathProperties['operational_points']>
   >([]);
 
+  const { data: trainScheduleUsedForProjection } =
+    osrdEditoastApi.endpoints.getV2TrainScheduleById.useQuery(
+      {
+        id: trainIdUsedForProjection as number,
+      },
+      {
+        skip: !trainIdUsedForProjection,
+      }
+    );
+
   const { data: pathfindingResult } = osrdEditoastApi.endpoints.getV2TrainScheduleByIdPath.useQuery(
     {
       id: trainIdUsedForProjection as number,
@@ -30,7 +44,12 @@ const useGetProjectedTrainOperationalPoints = (
 
   useEffect(() => {
     const getOperationalPoints = async () => {
-      if (infraId && pathfindingResult && pathfindingResult.status === 'success') {
+      if (
+        infraId &&
+        trainScheduleUsedForProjection &&
+        pathfindingResult &&
+        pathfindingResult.status === 'success'
+      ) {
         const pathPropertiesParams: PostV2InfraByInfraIdPathPropertiesApiArg = {
           infraId,
           props: ['operational_points'],
@@ -40,13 +59,44 @@ const useGetProjectedTrainOperationalPoints = (
         };
         const { operational_points } = await postPathProperties(pathPropertiesParams).unwrap();
 
-        setOperationalPoints(
-          operational_points as NonNullable<PathProperties['operational_points']>
-        );
+        let operationalPointsWithAllWaypoints = operational_points as NonNullable<
+          PathProperties['operational_points']
+        >;
+        // Check if there are vias added by map click and insert them in the operational points
+        if (trainScheduleUsedForProjection.path.some((step) => 'track' in step)) {
+          trainScheduleUsedForProjection.path.forEach((step, i) => {
+            if ('track' in step) {
+              const positionOnPath = pathfindingResult.path_item_positions[i];
+              const indexToInsert = operationalPointsWithAllWaypoints.findIndex(
+                (op) => op.position >= positionOnPath
+              );
+
+              const formattedStep: NonNullable<PathProperties['operational_points']>[number] = {
+                id: step.id,
+                extensions: {
+                  identifier: {
+                    name: t('requestedPoint', { count: indexToInsert }),
+                    uic: 0,
+                  },
+                },
+                part: { track: step.track, position: step.offset },
+                position: positionOnPath,
+              };
+
+              operationalPointsWithAllWaypoints = addElementAtIndex(
+                operationalPointsWithAllWaypoints,
+                indexToInsert,
+                formattedStep
+              );
+            }
+          });
+        }
+
+        setOperationalPoints(operationalPointsWithAllWaypoints);
       }
     };
     getOperationalPoints();
-  }, [pathfindingResult, infraId]);
+  }, [pathfindingResult, infraId, t]);
 
   return operationalPoints;
 };