front: introduce MapStyle type

OpenRailAssociation · Feb 12, 2025 · 0d00d5f · 0d00d5f
1 parent 52dc6a2
commit 0d00d5f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/front/src/applications/editor/Map.tsx b/front/src/applications/editor/Map.tsx
@@ -27,7 +27,7 @@ import { removeSearchItemMarkersOnMap } from 'common/Map/utils';
 import { LAYER_GROUPS_ORDER, LAYERS } from 'config/layerOrder';
 import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers';
 import { getEditorState } from 'reducers/editor/selectors';
-import type { Viewport } from 'reducers/map';
+import type { MapStyle, Viewport } from 'reducers/map';
 import { getMap, getShowOSM, getTerrain3DExaggeration } from 'reducers/map/selectors';
 import { useAppDispatch } from 'store';
 import { getMapMouseEventNearestFeature } from 'utils/mapHelper';
@@ -37,7 +37,7 @@ interface MapProps<S extends CommonToolState = CommonToolState> {
   toolState: S;
   setToolState: (state: Partial<S>) => void;
   activeTool: Tool<S>;
-  mapStyle: 'normal' | 'dark' | 'blueprint' | 'minimal';
+  mapStyle: MapStyle;
   viewport: Viewport;
   setViewport: (newViewport: Partial<Viewport>, updateRouter?: boolean) => void;
   mapRef: React.RefObject<MapRef>;

diff --git a/front/src/applications/editor/types.ts b/front/src/applications/editor/types.ts
@@ -9,6 +9,7 @@ import type { SwitchType } from 'applications/editor/tools/switchEdition/types';
 import type { Operation } from 'common/api/osrdEditoastApi';
 import type { ModalContextType } from 'common/BootstrapSNCF/ModalSNCF/ModalProvider';
 import type { EditorState } from 'reducers/editor';
+import type { MapStyle } from 'reducers/map';
 import type { AppDispatch } from 'store';
 
 import type { Layer } from './consts';
@@ -20,7 +21,7 @@ export type Reducer<T> = (value: T) => T;
 export type PartialOrReducer<T> = Partial<T> | Reducer<T>;
 
 export type MapState = {
-  mapStyle: 'normal' | 'dark' | 'blueprint' | 'minimal';
+  mapStyle: MapStyle;
   viewport: ViewState;
 };
 

diff --git a/front/src/common/Map/Layers/InfraObjectLayers/InfraObjectLayers.tsx b/front/src/common/Map/Layers/InfraObjectLayers/InfraObjectLayers.tsx
@@ -1,5 +1,6 @@
 import colors from 'common/Map/Consts/colors';
 import { LAYER_GROUPS_ORDER, LAYERS } from 'config/layerOrder';
+import type { MapStyle } from 'reducers/map';
 
 import BufferStops from './BufferStops';
 import Detectors from './Detectors';
@@ -15,7 +16,7 @@ import TracksGeographic from './TracksGeographic';
 
 type InfraObjectLayersProps = {
   infraId: number;
-  mapStyle: 'normal' | 'dark' | 'blueprint' | 'minimal';
+  mapStyle: MapStyle;
   hoveredOperationalPointId?: string;
 };
 

diff --git a/front/src/common/Map/Layers/OSMLayers/OSMLayers.tsx b/front/src/common/Map/Layers/OSMLayers/OSMLayers.tsx
@@ -1,5 +1,6 @@
 import colors from 'common/Map/Consts/colors';
 import { LAYER_GROUPS_ORDER, LAYERS } from 'config/layerOrder';
+import type { MapStyle } from 'reducers/map';
 
 import Background from '../Background';
 import Hillshade from '../Hillshade';
@@ -9,7 +10,7 @@ import Terrain from '../Terrain';
 import TracksOSM from '../TracksOSM';
 
 type OSMLayersProps = {
-  mapStyle: 'normal' | 'dark' | 'blueprint' | 'minimal';
+  mapStyle: MapStyle;
   showOSM: boolean;
   hidePlatforms?: boolean;
 };

diff --git a/front/src/reducers/map/index.ts b/front/src/reducers/map/index.ts
@@ -18,9 +18,12 @@ export interface MapSearchMarker {
   subtitle?: string;
   lonlat: Position;
 }
+
+export type MapStyle = 'normal' | 'dark' | 'blueprint' | 'minimal';
+
 export interface MapState {
   url: typeof MAP_URL;
-  mapStyle: 'normal' | 'dark' | 'blueprint' | 'minimal';
+  mapStyle: MapStyle;
   showIGNBDORTHO: boolean;
   showIGNSCAN25: boolean;
   showIGNCadastre: boolean;