front: cleanup op format functions in scenarios

Signed-off-by: Alice Khoudli <[email protected]>
OpenRailAssociation · Nov 28, 2024 · 29d6244 · 29d6244
1 parent 782fe85
commit 29d6244
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/front/src/modules/pathfinding/utils.ts b/front/src/modules/pathfinding/utils.ts
@@ -17,8 +17,8 @@ import getStepLocation from './helpers/getStepLocation';
 
 export const formatSuggestedOperationalPoints = (
   operationalPoints: NonNullable<Required<PathProperties['operational_points']>>,
-  geometry?: GeoJsonLineString,
-  pathLength?: number
+  geometry: GeoJsonLineString,
+  pathLength: number
 ): SuggestedOP[] =>
   operationalPoints.map((op) => ({
     opId: op.id,
@@ -33,11 +33,7 @@ export const formatSuggestedOperationalPoints = (
     offsetOnTrack: op.part.position,
     track: op.part.track,
     positionOnPath: op.position,
-    coordinates:
-      (geometry !== undefined &&
-        pathLength !== undefined &&
-        getPointCoordinates(geometry, pathLength, op.position)) ||
-      undefined,
+    coordinates: getPointCoordinates(geometry, pathLength, op.position),
   }));
 
 export const matchPathStepAndOp = (

diff --git a/front/src/modules/simulationResult/SimulationResultExport/utils.ts b/front/src/modules/simulationResult/SimulationResultExport/utils.ts
@@ -100,12 +100,12 @@ const getTimeAndSpeed = (
  * on their positions if they match or interpolate its time if they don't
  * @returns the computed operational points for each simulation (base and finalOutput)
  */
-export const formatOperationalPoints = async (
+export const formatOperationalPoints = (
   operationalPoints: PathPropertiesFormatted['operationalPoints'],
   simulatedTrain: SimulationResponseSuccess,
   train: TrainScheduleBase,
   trackSections: Record<string, TrackSection>
-): Promise<OperationalPointWithTimeAndSpeed[]> => {
+): OperationalPointWithTimeAndSpeed[] => {
   // Format operational points
   const formattedStops: OperationalPointWithTimeAndSpeed[] = [];
 

diff --git a/front/src/modules/simulationResult/hooks/useFormattedOperationalPoints.ts b/front/src/modules/simulationResult/hooks/useFormattedOperationalPoints.ts
@@ -30,7 +30,7 @@ export const useFormattedOperationalPoints = (
 
         const trackIds = pathProperties.operationalPoints.map((op) => op.part.track);
         const trackSections = await getTrackSectionsByIds(trackIds);
-        const formattedOperationalPoints = await formatOperationalPoints(
+        const formattedOperationalPoints = formatOperationalPoints(
           pathProperties.operationalPoints,
           simulatedTrain,
           train,