front: remove isReadOnly from Map props

Signed-off-by: Clara Ni <[email protected]>
OpenRailAssociation · Jan 15, 2025 · 747a70f · 747a70f
1 parent 1fb9860
commit 747a70f
Show file tree

Hide file tree

Showing 2 changed files with 185 additions and 218 deletions.
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx
@@ -62,7 +62,6 @@ type MapProps = {
   pathProperties?: ManageTrainSchedulePathProperties;
   pathGeometry?: NonNullable<PathProperties['geometry']>;
   setMapCanvas?: (mapCanvas: string) => void;
-  isReadOnly?: boolean;
   hideAttribution?: boolean;
   hideItinerary?: boolean;
   preventPointSelection?: boolean;
@@ -76,7 +75,6 @@ const Map = ({
   pathProperties,
   pathGeometry: geometry,
   setMapCanvas,
-  isReadOnly = false,
   hideAttribution = false,
   hideItinerary = false,
   preventPointSelection = false,
@@ -99,17 +97,6 @@ const Map = ({
     [pathProperties, geometry]
   );
 
-  const mapViewport = useMemo(() => {
-    if (isReadOnly && pathGeometry) {
-      return computeBBoxViewport(bbox(pathGeometry), viewport, {
-        width: mapContainer?.clientWidth,
-        height: mapContainer?.clientHeight,
-        padding: 60,
-      });
-    }
-    return viewport;
-  }, [isReadOnly, pathGeometry, viewport, mapContainer]);
-
   const [mapIsLoaded, setMapIsLoaded] = useState(false);
 
   const [hoveredOperationalPointId, setHoveredOperationalPointId] = useState<string>();
@@ -140,7 +127,7 @@ const Map = ({
 
   const resetPitchBearing = () => {
     updateViewportChange({
-      ...mapViewport,
+      ...viewport,
       bearing: 0,
       pitch: 0,
     });
@@ -216,7 +203,7 @@ const Map = ({
   useEffect(() => {
     if (urlLat) {
       updateViewportChange({
-        ...mapViewport,
+        ...viewport,
         latitude: parseFloat(urlLat),
         longitude: parseFloat(urlLon),
         zoom: parseFloat(urlZoom),
@@ -233,7 +220,7 @@ const Map = ({
       type: 'LineString',
     };
     if (points.coordinates.length > 2) {
-      const newViewport = computeBBoxViewport(bbox(points), mapViewport, {
+      const newViewport = computeBBoxViewport(bbox(points), viewport, {
         width: mapContainer?.clientWidth,
         height: mapContainer?.clientHeight,
         padding: 60,
@@ -244,41 +231,33 @@ const Map = ({
 
   return (
     <>
-      {!isReadOnly && (
-        <MapButtons
-          map={mapRef.current ?? undefined}
-          resetPitchBearing={resetPitchBearing}
-          closeFeatureInfoClickPopup={closeFeatureInfoClickPopup}
-          bearing={mapViewport.bearing}
-          withMapKeyButton
-          viewPort={mapViewport}
-          isNewButtons
-        />
-      )}
+      <MapButtons
+        map={mapRef.current ?? undefined}
+        resetPitchBearing={resetPitchBearing}
+        closeFeatureInfoClickPopup={closeFeatureInfoClickPopup}
+        bearing={viewport.bearing}
+        withMapKeyButton
+        viewPort={viewport}
+        isNewButtons
+      />
       <ReactMapGL
-        dragPan={false}
-        scrollZoom={false}
+        id={mapId}
         ref={mapRef}
-        {...mapViewport}
+        {...viewport}
         style={{ width: '100%', height: '100%' }}
-        cursor={isReadOnly || preventPointSelection ? 'default' : 'pointer'}
+        cursor={preventPointSelection ? 'default' : 'pointer'}
         mapStyle={mapBlankStyle}
         attributionControl={false} // Defined below
-        {...(!isReadOnly && {
-          dragPan: true,
-          scrollZoom: true,
-          onMove: (e) => updateViewportChange(e.viewState),
-          onMouseMove: onMoveGetFeature,
-          onClick: onFeatureClick,
-          onResize: (e) => {
-            updateViewportChange({
-              width: e.target.getContainer().offsetWidth,
-              height: e.target.getContainer().offsetHeight,
-            });
-          },
-        })}
+        onMove={(e) => updateViewportChange(e.viewState)}
+        onMouseMove={onMoveGetFeature}
+        onClick={onFeatureClick}
+        onResize={(e) => {
+          updateViewportChange({
+            width: e.target.getContainer().offsetWidth,
+            height: e.target.getContainer().offsetHeight,
+          });
+        }}
         interactiveLayerIds={interactiveLayerIds}
-        touchZoomRotate
         maxPitch={85}
         terrain={
           terrain3DExaggeration
@@ -289,10 +268,12 @@ const Map = ({
           setMapIsLoaded(true);
         }}
         onIdle={() => {
-          captureMap(mapViewport, mapId, setMapCanvas, pathGeometry);
+          captureMap(viewport, mapId, setMapCanvas, pathGeometry);
         }}
         preserveDrawingBuffer
-        id={mapId}
+        dragPan
+        scrollZoom
+        touchZoomRotate
       >
         <VirtualLayers />
         {!hideAttribution && (
@@ -344,73 +325,73 @@ const Map = ({
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.ROUTES.GROUP]}
           infraID={infraID}
         />
-        {!isReadOnly && (
-          <>
-            <OperationalPoints
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.OPERATIONAL_POINTS.GROUP]}
-              infraID={infraID}
-              operationnalPointId={hoveredOperationalPointId}
-            />
 
-            <Electrifications
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.ELECTRIFICATIONS.GROUP]}
-              infraID={infraID}
-            />
+        <OperationalPoints
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.OPERATIONAL_POINTS.GROUP]}
+          infraID={infraID}
+          operationnalPointId={hoveredOperationalPointId}
+        />
 
-            <NeutralSections
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
-              infraID={infraID}
-            />
+        <Electrifications
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.ELECTRIFICATIONS.GROUP]}
+          infraID={infraID}
+        />
 
-            <BufferStops
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.BUFFER_STOPS.GROUP]}
-              infraID={infraID}
-            />
-            <Detectors
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.DETECTORS.GROUP]}
-              infraID={infraID}
-            />
-            <Switches
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.SWITCHES.GROUP]}
-              infraID={infraID}
-            />
+        <NeutralSections
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.DEAD_SECTIONS.GROUP]}
+          infraID={infraID}
+        />
 
-            <SpeedLimits
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.SPEED_LIMITS.GROUP]}
-              infraID={infraID}
-            />
-            <SNCF_PSL
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.SPEED_LIMITS.GROUP]}
-              infraID={infraID}
-            />
+        <BufferStops
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.BUFFER_STOPS.GROUP]}
+          infraID={infraID}
+        />
+        <Detectors
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.DETECTORS.GROUP]}
+          infraID={infraID}
+        />
+        <Switches
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.SWITCHES.GROUP]}
+          infraID={infraID}
+        />
 
-            <Signals
-              sourceTable="signals"
-              colors={colors[mapStyle]}
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.SIGNALS.GROUP]}
-              infraID={infraID}
-            />
-            <LineSearchLayer
-              layerOrder={LAYER_GROUPS_ORDER[LAYERS.LINE_SEARCH.GROUP]}
-              infraID={infraID}
-            />
-            {!showStdcmAssets && featureInfoClick && (
-              <AddPathStepPopup
-                pathProperties={pathProperties}
-                featureInfoClick={featureInfoClick}
-                resetFeatureInfoClick={resetFeatureInfoClick}
-              />
-            )}
-          </>
+        <SpeedLimits
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.SPEED_LIMITS.GROUP]}
+          infraID={infraID}
+        />
+        <SNCF_PSL
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.SPEED_LIMITS.GROUP]}
+          infraID={infraID}
+        />
+
+        <Signals
+          sourceTable="signals"
+          colors={colors[mapStyle]}
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.SIGNALS.GROUP]}
+          infraID={infraID}
+        />
+
+        <LineSearchLayer
+          layerOrder={LAYER_GROUPS_ORDER[LAYERS.LINE_SEARCH.GROUP]}
+          infraID={infraID}
+        />
+
+        {!showStdcmAssets && featureInfoClick && (
+          <AddPathStepPopup
+            pathProperties={pathProperties}
+            featureInfoClick={featureInfoClick}
+            resetFeatureInfoClick={resetFeatureInfoClick}
+          />
         )}
+
         <ItineraryLayer
           layerOrder={LAYER_GROUPS_ORDER[LAYERS.ITINERARY.GROUP]}
           geometry={pathGeometry}