fixup! front: fix selected track display

OpenRailAssociation · Jan 17, 2025 · d408ed1 · d408ed1
1 parent aa9a0a2
commit d408ed1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 35 deletions.
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx
@@ -5,7 +5,6 @@ import cx from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 
-import { ScenarioContextProvider } from 'applications/operationalStudies/hooks/useScenarioContext';
 import useStdcmTowedRollingStock from 'applications/stdcm/hooks/useStdcmTowedRollingStock';
 import { extractMarkersInfo } from 'applications/stdcm/utils';
 import {
@@ -248,17 +247,15 @@ const StdcmConfig = ({
 
         <div className="osrd-config-item-container osrd-config-item-container-map stdcm-map">
           {infra && (
-            <ScenarioContextProvider infraId={infra.id}>
-              <NewMap
-                id="stdcm-map-config"
-                hideAttribution
-                hideItinerary
-                preventPointSelection
-                pathGeometry={pathfinding?.geometry}
-                showStdcmAssets
-                simulationPathSteps={markersInfo}
-              />
-            </ScenarioContextProvider>
+            <NewMap
+              id="stdcm-map-config"
+              hideAttribution
+              hideItinerary
+              preventPointSelection
+              pathGeometry={pathfinding?.geometry}
+              showStdcmAssets
+              simulationPathSteps={markersInfo}
+            />
           )}
         </div>
       </div>

diff --git a/front/src/applications/stdcm/components/StdcmResults/StdcmResults.tsx b/front/src/applications/stdcm/components/StdcmResults/StdcmResults.tsx
@@ -3,9 +3,7 @@ import { useMemo } from 'react';
 import { Button } from '@osrd-project/ui-core';
 import { PDFDownloadLink } from '@react-pdf/renderer';
 import { useTranslation, Trans } from 'react-i18next';
-import { useSelector } from 'react-redux';
 
-import { ScenarioContextProvider } from 'applications/operationalStudies/hooks/useScenarioContext';
 import useConflictsMessages from 'applications/stdcm/hooks/useConflictsMessages';
 import type { StdcmSimulation } from 'applications/stdcm/types';
 import { extractMarkersInfo } from 'applications/stdcm/utils';
@@ -15,7 +13,6 @@ import {
 } from 'applications/stdcm/utils/formatSimulationReportSheet';
 import { hasConflicts, hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
 import { type TrackRange } from 'common/api/osrdEditoastApi';
-import { useOsrdConfSelectors } from 'common/osrdContext';
 import NewMap from 'modules/trainschedule/components/ManageTrainSchedule/NewMap';
 
 import SimulationReportSheet from './SimulationReportSheet';
@@ -53,8 +50,6 @@ const StcdmResults = ({
   pathTrackRanges,
 }: StcdmResultsProps) => {
   const { t } = useTranslation('stdcm', { keyPrefix: 'simulation.results' });
-  const { getInfraID } = useOsrdConfSelectors();
-  const infraId = useSelector(getInfraID);
 
   const selectedSimulation = simulationsList[selectedSimulationIndex];
   const { outputs } = selectedSimulation || {};
@@ -181,18 +176,14 @@ const StcdmResults = ({
           </div>
         )}
         <div className="osrd-config-item-container osrd-config-item-container-map map-results">
-          {infraId && (
-            <ScenarioContextProvider infraId={infraId}>
-              <NewMap
-                id="stdcm-map-result"
-                hideAttribution
-                showStdcmAssets
-                isFeasible={!hasConflictResults}
-                pathGeometry={outputs?.pathProperties?.geometry}
-                simulationPathSteps={markersInfo}
-              />
-            </ScenarioContextProvider>
-          )}
+          <NewMap
+            id="stdcm-map-result"
+            hideAttribution
+            showStdcmAssets
+            isFeasible={!hasConflictResults}
+            pathGeometry={outputs?.pathProperties?.geometry}
+            simulationPathSteps={markersInfo}
+          />
         </div>
       </div>
       {isDebugMode && pathTrackRanges && hasSimulationResults && (

diff --git a/.../trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkers.tsx b/.../trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkers.tsx
@@ -5,7 +5,6 @@ import type { Position } from 'geojson';
 import type { Map } from 'maplibre-gl';
 import { Marker } from 'react-map-gl/maplibre';
 
-import { useScenarioContext } from 'applications/operationalStudies/hooks/useScenarioContext';
 import destinationSVG from 'assets/pictures/destination.svg';
 import stdcmDestination from 'assets/pictures/mapMarkers/destination.svg';
 import stdcmVia from 'assets/pictures/mapMarkers/intermediate-point.svg';
@@ -16,6 +15,9 @@ import type { PathItemLocation, TrackSection } from 'common/api/osrdEditoastApi'
 import { matchPathStepAndOp } from 'modules/pathfinding/utils';
 
 import type { SuggestedOP } from '../types';
+import useCachedTrackSections from 'applications/operationalStudies/hooks/useCachedTrackSections';
+import { useOsrdConfSelectors } from 'common/osrdContext';
+import { useSelector } from 'react-redux';
 
 export type MarkerInformation = {
   name?: string;
@@ -26,7 +28,7 @@ export type MarkerInformation = {
     trackName: string;
     trackNumber: number;
   };
-};
+} & PathItemLocation;
 
 enum MARKER_TYPE {
   ORIGIN = 'origin',
@@ -78,9 +80,7 @@ const extractMarkerInformation = (
 ): MarkerProperties[] =>
   pathSteps
     .map((pathStep, index): MarkerProperties | null => {
-      const matchingOp = suggestedOP.find((op) =>
-        matchPathStepAndOp(pathStep as PathItemLocation, op)
-      );
+      const matchingOp = suggestedOP.find((op) => matchPathStepAndOp(pathStep, op));
 
       if (!matchingOp) return null;
 
@@ -124,7 +124,10 @@ const ItineraryMarkers = ({
   pathStepsAndSuggestedOPs,
   showStdcmAssets,
 }: ItineraryMarkersProps) => {
-  const { getTrackSectionsByIds } = useScenarioContext();
+  const { getInfraID } = useOsrdConfSelectors();
+  const infraId = useSelector(getInfraID);
+  if (!infraId) return;
+  const { getTrackSectionsByIds } = useCachedTrackSections(infraId);
 
   const markersInformation = useMemo(
     () =>