front: simplify categories handling in the space time chart

front/src/modules/simulationResult/components/SpaceTimeChartWrapper/SpaceTimeChartWrapper.tsx

@@ -17,7 +17,6 @@ import {
   type SplitPoint,
   isSegmentPickingElement,
   isPointPickingElement,
-  usePaths,
   isInteractiveWaypoint,
   TrackOccupancyCanvas,
   TrackOccupancyManchette,
@@ -64,7 +63,9 @@ import {
   extractExceptionIdFromOccurrenceId,
   isAddedExceptionId,
 } from 'utils/trainId';
+import { mapBy } from 'utils/types';
 
+import formatSpaceTimeCurves from './helpers/formatSpaceTimeCurves';
 import getPathStyle from './helpers/getPathStyle';
 import makeProjectedItems from './helpers/makeProjectedItems';
 import { cutSpaceTimeChart, getOccupancyBlocks } from './helpers/utils';
@@ -200,7 +201,15 @@ const SpaceTimeChartWrapper = ({
       [waypointsPanelData?.filteredWaypoints, projectedTrains, conflicts, operationalPoints]
     );
 
-  const paths = usePaths(cutProjectedTrains);
+  const timetableItemsWithDetailsById = useMemo(
+    () => mapBy(timetableItemsWithDetails, 'id'),
+    [timetableItemsWithDetails]
+  );
+
+  const paths = useMemo(
+    () => formatSpaceTimeCurves(subCategories, cutProjectedTrains, timetableItemsWithDetailsById),
+    [cutProjectedTrains]
+  );
 
   const manchetteWaypoints = useMemo(() => {
     const rawWaypoints = waypointsPanelData?.filteredWaypoints ?? operationalPoints;
@@ -272,14 +281,7 @@ const SpaceTimeChartWrapper = ({
             }
             if (!path) return zone;
 
-            const pathStyle = getPathStyle(
-              hoveredItem,
-              path,
-              !!draggingState,
-              subCategories,
-              timetableItemsWithDetails,
-              selectedTrainId
-            );
+            const pathStyle = getPathStyle(hoveredItem, path, !!draggingState, selectedTrainId);
             return {
               ...zone,
               trailingText:
@@ -548,14 +550,7 @@ const SpaceTimeChartWrapper = ({
               <PathLayer
                 key={`${path.id}-${path.points[0]?.position}`}
                 path={path}
-                {...getPathStyle(
-                  hoveredItem,
-                  path,
-                  !!draggingState,
-                  subCategories,
-                  timetableItemsWithDetails,
-                  selectedTrainId
-                )}
+                {...getPathStyle(hoveredItem, path, !!draggingState, selectedTrainId)}
               />
             ))}
             {rect && <ZoomRect {...rect} />}

front/src/modules/simulationResult/components/SpaceTimeChartWrapper/helpers/formatSpaceTimeCurves.ts

@@ -0,0 +1,73 @@
+import {
+  DEFAULT_TRAIN_PATH_COLORS,
+  TRAIN_MAIN_CATEGORY_PATH_COLORS,
+} from 'applications/operationalStudies/consts';
+import type { SubCategory } from 'common/api/osrdEditoastApi';
+import isMainCategory from 'modules/rollingStock/helpers/category';
+import type { IndividualTrainProjection } from 'modules/simulationResult/types';
+import { findExceptionWithOccurrenceId } from 'modules/timetableItem/helpers/pacedTrain';
+import type { TimetableItemWithDetails } from 'modules/timetableItem/types';
+import type { TimetableItemId, TrainId } from 'reducers/osrdconf/types';
+import {
+  isOccurrenceId,
+  extractPacedTrainIdFromOccurrenceId,
+  isPacedTrainWithDetails,
+} from 'utils/trainId';
+
+const getTrainCategory = (
+  timetableItemsWithDetailsById: Map<TimetableItemId, TimetableItemWithDetails>,
+  trainId: TrainId
+) => {
+  const timetableItemId = isOccurrenceId(trainId)
+    ? extractPacedTrainIdFromOccurrenceId(trainId)
+    : trainId;
+
+  const item = timetableItemsWithDetailsById.get(timetableItemId);
+
+  if (!item || !isPacedTrainWithDetails(item)) return item?.category;
+
+  const exception =
+    item && isPacedTrainWithDetails(item) && isOccurrenceId(trainId)
+      ? findExceptionWithOccurrenceId(item?.exceptions, trainId)
+      : null;
+  return exception?.rolling_stock_category?.value ?? item.category;
+};
+
+const formatSpaceTimeCurves = (
+  subCategories: SubCategory[],
+  individualTrainProjections: IndividualTrainProjection[],
+  timetableItemsWithDetailsById: Map<TimetableItemId, TimetableItemWithDetails>
+) =>
+  individualTrainProjections.flatMap((train) => {
+    const category = getTrainCategory(timetableItemsWithDetailsById, train.id);
+
+    let colors = DEFAULT_TRAIN_PATH_COLORS;
+    if (category) {
+      if (isMainCategory(category)) {
+        colors = TRAIN_MAIN_CATEGORY_PATH_COLORS[category.main_category];
+      } else {
+        const currentSubCategory = subCategories.find(
+          (option) => option.code === category.sub_category_code
+        );
+        if (currentSubCategory) {
+          colors = {
+            normal: currentSubCategory.color,
+            hovered: currentSubCategory.hovered_color,
+            background: currentSubCategory.background_color,
+          };
+        }
+      }
+    }
+
+    return train.spaceTimeCurves.map((curve) => ({
+      id: train.id,
+      label: train.name,
+      colors,
+      points: curve.positions.map((position, i) => ({
+        time: curve.times[i] + train.departureTime.getTime(),
+        position,
+      })),
+    }));
+  });
+
+export default formatSpaceTimeCurves;

front/src/modules/simulationResult/components/SpaceTimeChartWrapper/helpers/getPathStyle.ts

@@ -1,26 +1,13 @@
 import type { PathLevel, HoveredItem } from '@osrd-project/ui-charts';
 
-import {
-  DEFAULT_TRAIN_PATH_COLORS,
-  TRAIN_MAIN_CATEGORY_PATH_COLORS,
-} from 'applications/operationalStudies/consts';
-import type { SubCategory } from 'common/api/osrdEditoastApi';
-import isMainCategory from 'modules/rollingStock/helpers/category';
-import { findExceptionWithOccurrenceId } from 'modules/timetableItem/helpers/pacedTrain';
-import type { TimetableItemWithDetails } from 'modules/timetableItem/types';
+import type { CategoryColors } from 'applications/operationalStudies/types';
 import type { TrainId } from 'reducers/osrdconf/types';
-import {
-  extractPacedTrainIdFromOccurrenceId,
-  isOccurrenceId,
-  isPacedTrainWithDetails,
-} from 'utils/trainId';
+import { extractPacedTrainIdFromOccurrenceId, isOccurrenceId } from 'utils/trainId';
 
 const getPathStyle = (
   hovered: HoveredItem | null,
-  train: { color: string; id: string },
+  train: { colors: CategoryColors; id: string },
   dragging: boolean,
-  subCategories: SubCategory[],
-  timetableItemsWithDetails?: TimetableItemWithDetails[],
   selectedTrainId?: TrainId
 ): {
   color: string;
@@ -35,32 +22,7 @@ const getPathStyle = (
   const timetableItemId = isOccurrenceId(train.id)
     ? extractPacedTrainIdFromOccurrenceId(train.id)
     : train.id;
-
-  const item = timetableItemsWithDetails?.find((t) => t.id === timetableItemId);
-
-  const exception =
-    item && isPacedTrainWithDetails(item) && isOccurrenceId(train.id)
-      ? findExceptionWithOccurrenceId(item?.exceptions, train.id)
-      : null;
-
-  const category = exception?.rolling_stock_category?.value ?? item?.category;
-
-  const currentSubCategory =
-    category && !isMainCategory(category)
-      ? subCategories.find((option) => option.code === category.sub_category_code)
-      : undefined;
-
-  let colors = DEFAULT_TRAIN_PATH_COLORS;
-
-  if (category && isMainCategory(category)) {
-    colors = TRAIN_MAIN_CATEGORY_PATH_COLORS[category.main_category];
-  } else if (category && !isMainCategory(category) && currentSubCategory) {
-    colors = {
-      normal: currentSubCategory.color || DEFAULT_TRAIN_PATH_COLORS.normal,
-      hovered: currentSubCategory.hovered_color || DEFAULT_TRAIN_PATH_COLORS.hovered,
-      background: currentSubCategory.background_color || DEFAULT_TRAIN_PATH_COLORS.background,
-    };
-  }
+  const { colors } = train;
 
   if (hovered && 'pathId' in hovered.element && !dragging) {
     const hoveredTrainId = hovered.element.pathId as TrainId;