front: Pathfinding module

api/openapi.yaml

@@ -191,9 +191,7 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/Path"
+                $ref: "#/components/schemas/Path"
   /pathfinding/op/:
     post:
       tags:
@@ -966,7 +964,9 @@ components:
                 items: { type: number, format: float }
                 minItems: 2
                 maxItems: 2
-        mechanical_energy_consumed: { type: number, format: float }
+        mechanical_energy_consumed:
+          type: number
+          format: float
     TrainScheduleResult:
       properties:
         id:
@@ -1158,9 +1158,29 @@ components:
         geographic:
           type: object
           description: GeoJson format
+          properties:
+            coordinates:
+              type: array
+              items:
+                type: array
+                items:
+                  type: number
+                  format: float
+            type:
+              type: string
         schematic:
           type: object
           description: GeoJson format
+          properties:
+            coordinates:
+              type: array
+              items:
+                type: array
+                items:
+                  type: number
+                  format: float
+            type:
+              type: string
         slopes:
           description: Slopes on the path
           type: array

front/.storybook/preview.js

@@ -1,4 +1,3 @@
-import '../src/styles/styles.scss';
 import('@sncf/bootstrap-sncf.metier.reseau/dist/css/bootstrap-sncf.min.css');
 export const parameters = {
   actions: { argTypesRegex: "^on[A-Z].*" },

front/public/locales/fr/operationalStudies/manageTrainSchedule.json

@@ -21,13 +21,23 @@
     "stdcmError": "Erreur de calcul Sillon de dernière minute",
     "The requested train couldn't reach its destination": "Le train ne peut pas atteindre sa destination",
     "trainScheduleTitle": "Une erreur est survenue",
-    "unableToRetrievePath": "Impossible de récupérer un chemin",
-    "unableToRetrievePathfinding": "Impossible de tracer un chemin",
+    "unableToRetrievePath": "Impossible de récupérer un itinéraire",
+    "unableToRetrievePathfinding": "Impossible de tracer un itinéraire",
     "unableToRetrieveRollingStock": "Récupération matériel impossible",
     "unableToRetrieveTags": "Impossible de récupérer les étiquettes",
     "unableToRetrieveTimetable": "Récupération grille horaire impossible",
     "unableToRetrieveTimetableList": "Récupération liste de grilles horaires impossible"
   },
+  "pathfindingStatus": "Statut recherche d’itinéraire",
+  "pathfindingInProgress": "Recherche d’itinéraire en cours",
+  "pathfindingError": "Erreur dans la recherche d’itinéraire : {{errorMessage}}",
+  "pathfindingDone": "Recherche terminée : ",
+  "pathfindingMissingParams": "Éléments manquants pour la recherche : {{missingElements}}",
+  "No path could be found": "Aucun itinéraire trouvé",
+  "No path could be found after loading Gauge constraints": "Aucun itinéraire trouvé avec ce gabarit de matériel",
+  "No path could be found after loading Electrification constraints": "Aucun itinéraire trouvé pour un matériel avec ce type d’électrification",
+  "cancelPathfinding": "Annuler",
+  "restartPathfinding": "Relancer la recherche",
   "gare": "Gare, poste",
   "inverseOD": "Inverser origine/destination",
   "indications": {
@@ -41,7 +51,6 @@
   "noTimetable": "Choisissez une grille horaire",
   "noTrainCompo": "Aucun matériel défini…",
   "origin": "Origine",
-  "pathFindingInProgress": "Récupération du chemin en cours",
   "pleaseWait": "Veuillez patientez",
   "rollingstock": "Matériel",
   "searchingItinerary": "Recherche de sillon…",

front/src/Store.ts

@@ -4,11 +4,12 @@ import {
   legacy_createStore as createStore,
   combineReducers,
 } from 'redux';
+import thunk from 'redux-thunk';
+import { persistStore } from 'redux-persist';
 import { composeWithDevTools, Config } from '@redux-devtools/extension';
 
-import { persistStore } from 'redux-persist';
+import { osrdMiddlewareApi } from 'common/api/osrdMiddlewareApi';
 import persistedReducer, { rootReducer, rootInitialState, RootState } from 'reducers';
-import thunk from 'redux-thunk';
 
 const reduxDevToolsOptions: Config = {
   serialize: {
@@ -21,7 +22,7 @@ const reduxDevToolsOptions: Config = {
 // const composeEnhancers = composeWithDevToolsLogOnlyInProduction(reduxDevToolsOptions);
 const composeEnhancers = composeWithDevTools(reduxDevToolsOptions) || compose;
 
-const enhancers = composeEnhancers(applyMiddleware(thunk));
+const enhancers = composeEnhancers(applyMiddleware(thunk, osrdMiddlewareApi.middleware));
 const store = createStore(persistedReducer, enhancers);
 
 const persistor = persistStore(store);

front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary.js

@@ -1,37 +1,21 @@
-import React, { useEffect, useState } from 'react';
-import {
-  replaceVias,
-  updateDestination,
-  updateItinerary,
-  updateOrigin,
-  updatePathfindingID,
-  updateSuggeredVias,
-} from 'reducers/osrdconf';
+import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-
-import DisplayItinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary';
-import ModalSugerredVias from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias';
 import PropTypes from 'prop-types';
-import DotsLoader from 'common/DotsLoader/DotsLoader';
 import { WebMercatorViewport } from 'viewport-mercator-project';
-import bbox from '@turf/bbox';
-import { post } from 'common/requests';
-import { setFailure } from 'reducers/main';
+
+import { replaceVias, updateDestination, updateOrigin } from 'reducers/osrdconf';
 import { updateFeatureInfoClick } from 'reducers/map';
-import { useTranslation } from 'react-i18next';
-import { getInfraID } from 'reducers/osrdconf/selectors';
 
-const itineraryURI = '/pathfinding/';
+import DisplayItinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary';
+import ModalSugerredVias from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias';
+import { getInfraID } from 'reducers/osrdconf/selectors';
 
 function Itinerary(props) {
-  const [launchPathfinding, setLaunchPathfinding] = useState(false);
-  const [pathfindingInProgress, setPathfindingInProgress] = useState(false);
   const { vias } = useSelector((state) => state.osrdconf);
   const { updateExtViewport } = props;
   const dispatch = useDispatch();
   const map = useSelector((state) => state.map);
   const osrdconf = useSelector((state) => state.osrdconf);
-  const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
   const infra = useSelector(getInfraID);
 
   const zoomToFeature = (boundingBox, id = undefined, source = undefined) => {
@@ -75,130 +59,10 @@ function Itinerary(props) {
     }
   };
 
-  // Obtain only asked vias
-  const convertPathfindingVias = (steps, idxToAdd) => {
-    const count = steps.length - 1;
-    const newVias = [];
-    steps.forEach((step, idx) => {
-      if (idx !== 0 && idx !== count && (!step.suggestion || idxToAdd === idx)) {
-        newVias.push({
-          ...step,
-          id: step.position,
-          clickLngLat: [
-            step[map.mapTrackSources.substr(0, 3)].coordinates[0],
-            step[map.mapTrackSources.substr(0, 3)].coordinates[1],
-          ],
-        });
-      }
-    });
-    dispatch(replaceVias(newVias));
-    dispatch(updateSuggeredVias(steps));
-  };
-
   const removeViaFromPath = (step) => {
     dispatch(replaceVias(vias.filter((via) => via.track !== step.track)));
   };
 
-  // Way to ensure marker position on track
-  const correctWaypointsGPS = (pathfindingData) => {
-    setLaunchPathfinding(false);
-    dispatch(
-      updateOrigin({
-        ...osrdconf.origin,
-        clickLngLat: pathfindingData.steps[0][map.mapTrackSources.substr(0, 3)].coordinates,
-      })
-    );
-
-    if (osrdconf.vias.length > 0 || pathfindingData.steps.length > 2) {
-      convertPathfindingVias(pathfindingData.steps);
-    }
-
-    dispatch(
-      updateDestination({
-        ...osrdconf.destination,
-        clickLngLat:
-          pathfindingData.steps[pathfindingData.steps.length - 1][map.mapTrackSources.substr(0, 3)]
-            .coordinates,
-      })
-    );
-    setLaunchPathfinding(true);
-  };
-
-  const postPathFinding = async (zoom, params) => {
-    try {
-      setPathfindingInProgress(true);
-      const itineraryCreated = await post(itineraryURI, params, {}, true);
-      correctWaypointsGPS(itineraryCreated);
-      dispatch(updateItinerary(itineraryCreated));
-      dispatch(updatePathfindingID(itineraryCreated.id));
-      if (zoom) zoomToFeature(bbox(itineraryCreated[map.mapTrackSources]));
-      setPathfindingInProgress(false);
-    } catch (e) {
-      dispatch(
-        setFailure({
-          name: t('errorMessages.unableToRetrievePathfinding'),
-          message: `${e.message} : ${e.response && e.response.data.detail}`,
-        })
-      );
-      console.log('ERROR', e);
-    }
-  };
-
-  const mapItinerary = (zoom = true) => {
-    dispatch(updateItinerary(undefined));
-
-    if (
-      osrdconf.origin !== undefined &&
-      osrdconf.destination !== undefined &&
-      osrdconf.rollingStockID !== undefined
-    ) {
-      const params = {
-        infra: osrdconf.infraID,
-        steps: [],
-        rolling_stocks: [osrdconf.rollingStockID],
-      };
-
-      // Adding start point
-      params.steps.push({
-        duration: 0,
-        waypoints: [
-          {
-            track_section: osrdconf.origin.id,
-            geo_coordinate: osrdconf.origin.clickLngLat,
-          },
-        ],
-      });
-
-      // Adding via points if exist
-      if (osrdconf.vias.length > 0) {
-        osrdconf.vias.forEach((via) => {
-          params.steps.push({
-            duration: via.duration === undefined ? 0 : parseInt(via.duration, 10),
-            waypoints: [
-              {
-                track_section: via.track || via.id,
-                geo_coordinate: via.clickLngLat,
-              },
-            ],
-          });
-        });
-      }
-
-      // Adding end point
-      params.steps.push({
-        duration: 1,
-        waypoints: [
-          {
-            track_section: osrdconf.destination.id,
-            geo_coordinate: osrdconf.destination.clickLngLat,
-          },
-        ],
-      });
-
-      postPathFinding(zoom, params);
-    }
-  };
-
   const inverseOD = () => {
     if (osrdconf.origin && osrdconf.destination) {
       const origin = { ...osrdconf.origin };
@@ -208,69 +72,30 @@ function Itinerary(props) {
         const newVias = Array.from(osrdconf.vias);
         dispatch(replaceVias(newVias.reverse()));
       }
-      setLaunchPathfinding(true);
     }
   };
 
   const removeAllVias = () => {
     dispatch(replaceVias([]));
-    setLaunchPathfinding(true);
   };
 
   const viaModalContent = (
     <ModalSugerredVias
-      convertPathfindingVias={convertPathfindingVias}
       inverseOD={inverseOD}
       removeAllVias={removeAllVias}
-      pathfindingInProgress={pathfindingInProgress}
       removeViaFromPath={removeViaFromPath}
     />
   );
 
-  useEffect(() => {
-    if (
-      osrdconf?.pathfindingID === undefined ||
-      osrdconf?.geojson?.[map?.mapTrackSources] === undefined
-    ) {
-      mapItinerary();
-    } else {
-      zoomToFeature(bbox(osrdconf.geojson[map.mapTrackSources]));
-    }
-    setLaunchPathfinding(true);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  useEffect(() => {
-    if (launchPathfinding) {
-      mapItinerary();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [osrdconf.origin, osrdconf.destination, map.mapTrackSources, osrdconf.rollingStockID]);
-
-  useEffect(() => {
-    if (launchPathfinding) {
-      mapItinerary(false);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [osrdconf.vias]);
-
-  useEffect(() => {
-    setPathfindingInProgress(false);
-  }, [infra]);
-
   return (
     <div className="osrd-config-item mb-2">
       <div className="osrd-config-item-container" data-testid="itinerary">
         <DisplayItinerary
           data-testid="display-itinerary"
           zoomToFeaturePoint={zoomToFeaturePoint}
+          zoomToFeature={zoomToFeature}
           viaModalContent={viaModalContent}
         />
-        {pathfindingInProgress && (
-          <div className="osrd-config-centered-item">
-            <DotsLoader /> {`${t('pathFindingInProgress')}`}
-          </div>
-        )}
       </div>
     </div>
   );