front: display bpcc in infra editor

front/public/locales/en/translation.json

@@ -199,7 +199,8 @@
       "switches": "Switches",
       "track_sections": "Track sections",
       "speed_sections": "Speed limits",
-      "platforms": "Platforms"
+      "platforms": "Platforms",
+      "neutral_sections": "Dead sections"
     },
     "layers-modal": {
       "frozen-layer": "needed for the active tool",

front/public/locales/fr/translation.json

@@ -192,7 +192,8 @@
       "switches": "Aiguillages",
       "track_sections": "Sections de lignes",
       "speed_sections": "Vitesses limites",
-      "platforms": "Quais"
+      "platforms": "Quais",
+      "neutral_sections": "BP/CC"
     },
     "layers-modal": {
       "frozen-layer": "nécessaire pour l'outil actif",

front/src/applications/editor/Map.tsx

@@ -18,6 +18,7 @@ import { CUSTOM_ATTRIBUTION } from 'common/Map/const';
 import colors from 'common/Map/Consts/colors';
 import Background from 'common/Map/Layers/Background';
 import { useMapBlankStyle } from 'common/Map/Layers/blankStyle';
+import NeutralSections from 'common/Map/Layers/extensions/SNCF/NeutralSections';
 import Hillshade from 'common/Map/Layers/Hillshade';
 import IGN_BD_ORTHO from 'common/Map/Layers/IGN_BD_ORTHO';
 import IGN_CADASTRE from 'common/Map/Layers/IGN_CADASTRE';
@@ -325,6 +326,14 @@ const MapUnplugged = ({
             layerOrder={LAYER_GROUPS_ORDER[LAYERS.PLATFORMS.GROUP]}
           />
 
+          {editorState.editorLayers.has('neutral_sections') && (
+            <NeutralSections
+              colors={colors[mapStyle]}
+              layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
+              infraID={infraID}
+            />
+          )}
+
           {/* Tool specific layers */}
           {!isNil(infraID) && activeTool.layersComponent && mapRef.current && (
             <activeTool.layersComponent map={mapRef.current.getMap()} />

front/src/applications/editor/components/LayersModal.tsx

@@ -2,7 +2,7 @@ import React, { type FC, useEffect, useMemo, useState } from 'react';
 
 import { groupBy, mapKeys, mapValues, sum, isString, isArray, uniq, isNil } from 'lodash';
 import { useTranslation } from 'react-i18next';
-import { GiElectric } from 'react-icons/gi';
+import { GiElectric, GiUnplugged } from 'react-icons/gi';
 import { MdSpeed } from 'react-icons/md';
 import { TbRectangleVerticalFilled } from 'react-icons/tb';
 import { useSelector } from 'react-redux';
@@ -40,6 +40,10 @@ export const LAYERS: Array<{ layers: Layer[]; icon: string | JSX.Element }> = [
     layers: ['platforms'],
     icon: <TbRectangleVerticalFilled style={{ width: '20px' }} className="mx-2" />,
   },
+  {
+    layers: ['neutral_sections'],
+    icon: <GiUnplugged style={{ width: '20px' }} className="mx-2" />,
+  },
 ];
 
 interface LayersModalProps {

front/src/applications/editor/consts.ts

@@ -15,6 +15,7 @@ const INFRA_EDITOR_LAYERS = [
   'switches',
   'track_sections',
   'platforms',
+  'neutral_sections',
 ] as const;
 export const LAYERS_SET: Set<string> = new Set(INFRA_EDITOR_LAYERS);
 export type Layer = (typeof INFRA_EDITOR_LAYERS)[number];
@@ -28,6 +29,7 @@ export const EDITOAST_TYPES = [
   'SpeedSection',
   'Switch',
   'TrackSection',
+  'NeutralSection',
 ] as const;
 export type EditoastType = (typeof EDITOAST_TYPES)[number];
 
@@ -40,6 +42,7 @@ export const EDITOAST_TO_LAYER_DICT: Record<EditoastType, Layer[]> = {
   SpeedSection: ['speed_sections', 'psl', 'psl_signs'],
   Switch: ['switches'],
   TrackSection: ['track_sections'],
+  NeutralSection: ['neutral_sections'],
 };
 export const LAYER_TO_EDITOAST_DICT = flatMap(EDITOAST_TO_LAYER_DICT, (values, key) =>
   values.map((value) => [value, key])

front/src/applications/referenceMap/Map.tsx

@@ -199,11 +199,13 @@ function Map() {
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.ELECTRIFICATIONS.GROUP]}
           infraID={infraID}
         />
-        <NeutralSections
-          colors={colors[mapStyle]}
-          layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
-          infraID={infraID}
-        />
+        {layersSettings.neutral_sections && (
+          <NeutralSections
+            colors={colors[mapStyle]}
+            layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
+            infraID={infraID}
+          />
+        )}
         <BufferStops
           colors={colors[mapStyle]}
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.BUFFER_STOPS.GROUP]}

front/src/common/Map/Layers/extensions/SNCF/NeutralSections.tsx

@@ -1,12 +1,10 @@
 import React from 'react';
 
 import { type LayerProps, Source } from 'react-map-gl/maplibre';
-import { useSelector } from 'react-redux';
 
 import { MAP_URL } from 'common/Map/const';
 import NeutralSectionSigns from 'common/Map/Layers/extensions/SNCF/NeutralSectionSigns';
 import OrderedLayer from 'common/Map/Layers/OrderedLayer';
-import type { RootState } from 'reducers';
 import type { Theme } from 'types';
 
 type NeutralSectionsProps = {
@@ -16,7 +14,6 @@ type NeutralSectionsProps = {
 };
 
 export default ({ colors, layerOrder, infraID }: NeutralSectionsProps) => {
-  const { layersSettings } = useSelector((state: RootState) => state.map);
   const neutralSectionsParams: LayerProps = {
     type: 'line',
     'source-layer': 'neutral_sections',
@@ -39,23 +36,20 @@ export default ({ colors, layerOrder, infraID }: NeutralSectionsProps) => {
     },
   };
 
-  if (layersSettings.neutral_sections) {
-    return (
-      <>
-        <Source
-          id="neutral_sections_geo"
-          type="vector"
-          url={`${MAP_URL}/layer/neutral_sections/mvt/geo/?infra=${infraID}`}
-        >
-          <OrderedLayer
-            {...neutralSectionsParams}
-            id="chartis/neutral_sections/geo"
-            layerOrder={layerOrder}
-          />
-        </Source>
-        <NeutralSectionSigns colors={colors} layerOrder={layerOrder} infraID={infraID} />
-      </>
-    );
-  }
-  return <div />;
+  return (
+    <>
+      <Source
+        id="neutral_sections_geo"
+        type="vector"
+        url={`${MAP_URL}/layer/neutral_sections/mvt/geo/?infra=${infraID}`}
+      >
+        <OrderedLayer
+          {...neutralSectionsParams}
+          id="chartis/neutral_sections/geo"
+          layerOrder={layerOrder}
+        />
+      </Source>
+      <NeutralSectionSigns colors={colors} layerOrder={layerOrder} infraID={infraID} />
+    </>
+  );
 };

front/src/config/layerOrder.ts

@@ -71,4 +71,5 @@ export const LAYER_ENTITIES_ORDERS: Record<Layer, number> = Object.freeze({
   neutral_signs: LAYER_GROUPS_ORDER[LAYERS.SIGNALS.GROUP],
   errors: LAYER_GROUPS_ORDER[LAYERS.ERRORS.GROUP],
   platforms: LAYER_GROUPS_ORDER[LAYERS.PLATFORMS.GROUP],
+  neutral_sections: LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP],
 });

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

@@ -63,7 +63,7 @@ import VirtualLayers from 'modules/simulationResult/components/SimulationResults
 import type { RootState } from 'reducers';
 import { updateViewport } from 'reducers/map';
 import type { Viewport } from 'reducers/map';
-import { getTerrain3DExaggeration } from 'reducers/map/selectors';
+import { getLayersSettings, getTerrain3DExaggeration } from 'reducers/map/selectors';
 import { getPresentSimulation, getSelectedTrain } from 'reducers/osrdsimulation/selectors';
 import type { Train } from 'reducers/osrdsimulation/types';
 import { useAppDispatch } from 'store';
@@ -86,6 +86,7 @@ const Map: FC<MapProps> = () => {
   const trains = useMemo(() => keyBy(simulation.trains, 'id'), [simulation.trains]);
   const selectedTrain = useSelector(getSelectedTrain);
   const terrain3DExaggeration = useSelector(getTerrain3DExaggeration);
+  const layersSettings = useSelector(getLayersSettings);
 
   const [geojsonPath, setGeojsonPath] = useState<Feature<LineString>>();
   const [selectedTrainHoverPosition, setTrainHoverPosition] = useState<TrainPosition>();
@@ -316,11 +317,13 @@ const Map: FC<MapProps> = () => {
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.ELECTRIFICATIONS.GROUP]}
           infraID={infraID}
         />
-        <NeutralSections
-          colors={colors[mapStyle]}
-          layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
-          infraID={infraID}
-        />
+        {layersSettings.neutral_sections && (
+          <NeutralSections
+            colors={colors[mapStyle]}
+            layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
+            infraID={infraID}
+          />
+        )}
         <BufferStops
           colors={colors[mapStyle]}
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.BUFFER_STOPS.GROUP]}

front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx

@@ -277,11 +277,13 @@ const Map = ({ geometry, pathProperties }: MapProps) => {
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.ELECTRIFICATIONS.GROUP]}
           infraID={infraID}
         />
-        <NeutralSections
-          colors={colors[mapStyle]}
-          layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
-          infraID={infraID}
-        />
+        {layersSettings.neutral_sections && (
+          <NeutralSections
+            colors={colors[mapStyle]}
+            layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
+            infraID={infraID}
+          />
+        )}
         <BufferStops
           colors={colors[mapStyle]}
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.BUFFER_STOPS.GROUP]}