Skip to content

Commit d658e07

Browse files
committed
front: refacto HillShade layer
Signed-off-by: Clara Ni <[email protected]>
1 parent cb4dc00 commit d658e07

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed
+14-15
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1-
import PropTypes from 'prop-types';
21
import { Source, type LayerProps } from 'react-map-gl/maplibre';
32
import { useSelector } from 'react-redux';
43

54
import OrderedLayer from 'common/Map/Layers/OrderedLayer';
65
import { getTerrain3DExaggeration } from 'reducers/map/selectors';
76

8-
interface HillshadeProps {
7+
type HillshadeProps = {
98
mapStyle: string;
109
layerOrder?: number;
1110
display?: boolean;
12-
}
11+
};
12+
13+
const hillshadeParams: LayerProps = {
14+
id: 'osm/hillshade',
15+
source: 'hillshade',
16+
type: 'hillshade',
17+
paint: {},
18+
};
1319

14-
function Hillshade({ mapStyle, layerOrder }: HillshadeProps) {
20+
const Hillshade = ({ mapStyle, layerOrder }: HillshadeProps) => {
1521
const terrain3DExaggeration = useSelector(getTerrain3DExaggeration);
1622

17-
const hillshadeParams: LayerProps = {
18-
id: 'osm/hillshade',
19-
source: 'hillshade',
20-
type: 'hillshade',
21-
paint: {},
22-
};
23+
if (mapStyle !== 'normal' || terrain3DExaggeration === 0) {
24+
return null;
25+
}
2326

24-
return mapStyle !== 'normal' || terrain3DExaggeration === 0 ? null : (
27+
return (
2528
<Source
2629
id="hillshade"
2730
type="raster-dem"
@@ -33,10 +36,6 @@ function Hillshade({ mapStyle, layerOrder }: HillshadeProps) {
3336
<OrderedLayer {...hillshadeParams} layerOrder={layerOrder} />
3437
</Source>
3538
);
36-
}
37-
38-
Hillshade.propTypes = {
39-
mapStyle: PropTypes.string.isRequired,
4039
};
4140

4241
export default Hillshade;

0 commit comments

Comments
 (0)