front: fix relief display

Signed-off-by: Clara Ni <[email protected]>

Author: clarani

front/src/applications/editor/Map.tsx

@@ -309,7 +309,6 @@ const MapUnplugged = ({
               <Hillshade
                 mapStyle={mapStyle}
                 layerOrder={LAYER_GROUPS_ORDER[LAYERS.BACKGROUND.GROUP]}
-                display={terrain3DExaggeration > 0}
               />
             </>
           )}

front/src/applications/referenceMap/Map.tsx

@@ -163,7 +163,6 @@ function Map() {
             <Hillshade
               mapStyle={mapStyle}
               layerOrder={LAYER_GROUPS_ORDER[LAYERS.BACKGROUND.GROUP]}
-              display={terrain3DExaggeration > 0}
             />
           </>
         )}

front/src/common/Map/Layers/Hillshade.tsx

@@ -1,23 +1,27 @@
 import PropTypes from 'prop-types';
 import { Source, type LayerProps } from 'react-map-gl/maplibre';
+import { useSelector } from 'react-redux';
 
 import OrderedLayer from 'common/Map/Layers/OrderedLayer';
+import { getTerrain3DExaggeration } from 'reducers/map/selectors';
 
 interface HillshadeProps {
   mapStyle: string;
   layerOrder?: number;
   display?: boolean;
 }
 
-function Hillshade({ mapStyle, layerOrder, display = true }: HillshadeProps) {
+function Hillshade({ mapStyle, layerOrder }: HillshadeProps) {
+  const terrain3DExaggeration = useSelector(getTerrain3DExaggeration);
+
   const hillshadeParams: LayerProps = {
     id: 'osm/hillshade',
     source: 'hillshade',
     type: 'hillshade',
     paint: {},
   };
 
-  return mapStyle !== 'normal' ? null : (
+  return mapStyle !== 'normal' || terrain3DExaggeration === 0 ? null : (
     <Source
       id="hillshade"
       type="raster-dem"
@@ -26,7 +30,7 @@ function Hillshade({ mapStyle, layerOrder, display = true }: HillshadeProps) {
       tileSize={256}
       maxzoom={12}
     >
-      {display && <OrderedLayer {...hillshadeParams} layerOrder={layerOrder} />}
+      <OrderedLayer {...hillshadeParams} layerOrder={layerOrder} />
     </Source>
   );
 }

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

@@ -245,7 +245,6 @@ const SimulationResultMap = ({ geometry, trainSimulation }: SimulationResultMapP
             <Hillshade
               mapStyle={mapStyle}
               layerOrder={LAYER_GROUPS_ORDER[LAYERS.BACKGROUND.GROUP]}
-              display={terrain3DExaggeration > 0}
             />
           </>
         )}