From 585ea176b411df817ef5c30c788f1d4a283d1e07 Mon Sep 17 00:00:00 2001 From: Benoit Simard Date: Wed, 25 Oct 2023 15:09:20 +0200 Subject: [PATCH] front: disable 3D terrain when set to 0 - fix #5392 --- front/src/applications/editor/Map.tsx | 6 +++++- front/src/applications/referenceMap/Map.tsx | 6 +++++- .../simulationResult/components/SimulationResultsMap.tsx | 6 +++++- .../trainschedule/components/ManageTrainSchedule/Map.tsx | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/front/src/applications/editor/Map.tsx b/front/src/applications/editor/Map.tsx index ba3e957678a..36b083ba983 100644 --- a/front/src/applications/editor/Map.tsx +++ b/front/src/applications/editor/Map.tsx @@ -195,7 +195,11 @@ const MapUnplugged: FC> = ({ attributionControl={false} touchZoomRotate maxPitch={85} - terrain={{ source: 'terrain', exaggeration: terrain3DExaggeration }} + terrain={ + terrain3DExaggeration + ? { source: 'terrain', exaggeration: terrain3DExaggeration } + : undefined + } doubleClickZoom={false} interactive cursor={cursor} diff --git a/front/src/applications/referenceMap/Map.tsx b/front/src/applications/referenceMap/Map.tsx index 120e09d2946..c4e489d3114 100644 --- a/front/src/applications/referenceMap/Map.tsx +++ b/front/src/applications/referenceMap/Map.tsx @@ -123,7 +123,11 @@ function Map() { interactiveLayerIds={defineInteractiveLayers()} touchZoomRotate maxPitch={85} - terrain={{ source: 'terrain', exaggeration: terrain3DExaggeration }} + terrain={ + terrain3DExaggeration + ? { source: 'terrain', exaggeration: terrain3DExaggeration } + : undefined + } > diff --git a/front/src/modules/simulationResult/components/SimulationResultsMap.tsx b/front/src/modules/simulationResult/components/SimulationResultsMap.tsx index 539d1dbf563..87b029308dd 100644 --- a/front/src/modules/simulationResult/components/SimulationResultsMap.tsx +++ b/front/src/modules/simulationResult/components/SimulationResultsMap.tsx @@ -247,7 +247,11 @@ const Map: FC = ({ setExtViewport }) => { interactiveLayerIds={interactiveLayerIds} touchZoomRotate maxPitch={85} - terrain={{ source: 'terrain', exaggeration: terrain3DExaggeration }} + terrain={ + terrain3DExaggeration + ? { source: 'terrain', exaggeration: terrain3DExaggeration } + : undefined + } onLoad={handleLoadFinished} > diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx index 79e53027805..ef44a760c39 100644 --- a/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx @@ -171,7 +171,11 @@ function Map() { interactiveLayerIds={defineInteractiveLayers()} touchZoomRotate maxPitch={85} - terrain={{ source: 'terrain', exaggeration: terrain3DExaggeration }} + terrain={ + terrain3DExaggeration + ? { source: 'terrain', exaggeration: terrain3DExaggeration } + : undefined + } >