fix leaflet typing issues

City-of-Helsinki · Jul 30, 2024 · 3e8a09e · 3e8a09e
1 parent 62fe705
commit 3e8a09e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/areaNote/components/AreaNotesEditMap.tsx b/src/areaNote/components/AreaNotesEditMap.tsx
@@ -71,11 +71,16 @@ class AreaNotesEditMap extends Component<Props, State> {
 
       if (!isEmpty(geoJSON)) {
         const featuresGeoJSON = new L.GeoJSON(geoJSON);
-        featuresGeoJSON.eachLayer(layer => {
-          layer.options.color = SHAPE_COLOR;
-          layer.options.fillOpacity = SHAPE_FILL_OPACITY;
-          this.featureGroup?.leafletElement.addLayer(layer);
-          layer.showMeasurements();
+        featuresGeoJSON.eachLayer((layer) => {
+          if (layer instanceof L.Polyline || layer instanceof L.Polygon || layer instanceof L.Circle) {
+            layer.setStyle({
+              "color": SHAPE_COLOR,
+              "fillOpacity": SHAPE_FILL_OPACITY}
+            );
+            this.featureGroup?.leafletElement.addLayer(layer);
+            layer.showMeasurements();
+          }
+
         });
         this.setState({
           isValid: true

diff --git a/src/util/map.ts b/src/util/map.ts
@@ -1,4 +1,5 @@
 import isArray from "lodash/isArray";
+import type { LatLngBounds } from "leaflet";
 
 /**
  * Translate leaflet draw literals in Finnish
@@ -123,7 +124,7 @@ export const getBoundsFromBBox = (bbox: Array<Record<string, any>>): Record<stri
  */
 
 /* istanbul ignore next */
-export const getBoundsFromCoordinates = (coordinates: Array<any>): Record<string, any> => {
+export const getBoundsFromCoordinates = (coordinates: Array<any>): LatLngBounds => {
   const L = require('leaflet');
 
   const lats = [],