wip: Support new map styling #816

kalisio · Feb 9, 2024 · ea9de3d · ea9de3d
1 parent 4f9e0f1
commit ea9de3d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/map/client/mixins/map/mixin.geojson-layers.js b/map/client/mixins/map/mixin.geojson-layers.js
@@ -8,7 +8,7 @@ import { GradientPath } from '../../leaflet/GradientPath.js'
 import { MaskLayer } from '../../leaflet/MaskLayer.js'
 import { TiledFeatureLayer } from '../../leaflet/TiledFeatureLayer.js'
 import { 
-  fetchGeoJson, LeafletEvents, bindLeafletEvents, unbindLeafletEvents, getFeatureId, isInMemoryLayer, 
+  fetchGeoJson, LeafletEvents, bindLeafletEvents, unbindLeafletEvents, getFeatureId, isInMemoryLayer, getFeatureStyleType,
   convertSimpleStyleToPointStyle, convertSimpleStyleToLineStyle, convertSimpleStyleToPolygonStyle, createMarkerFromPointStyle
 } from '../../utils.map.js'
 import * as wfs from '../../../common/wfs-utils.js'
@@ -400,17 +400,19 @@ export const geojsonLayers = {
           bindLeafletEvents(layer, LeafletEvents.Feature, this, options)
         },
         style: (feature) => {
-          if (['LineString', 'MultiLineString'].includes(feature.geometry.type)) {
-            return this.generateStyle('line', feature, options, _.get(this, 'activityOptions.engine'))
-          }
-          if (['Polygon', 'MultiPolygon'].includes(feature.geometry.type)) {
-            return this.generateStyle('polygon', feature, options, _.get(this, 'activityOptions.engine'))
-          } else {
-            logger.warn(`[KDK] the geometry of type of ${feature.geometry.type} is not supported`)
+          const styleType = getFeatureStyleType(feature)
+          if (!styleType) {
+            logger.warn(`[KDK] cannot get a style type from the feature of geometry type ${feature.geometry.type}`)
+            return
           }
+          return this.generateStyle(styleType, feature, options, _.get(this, 'activityOptions.engine'))
         },
         pointToLayer: (feature, latlng) => {
           const style = this.generateStyle('point', feature, options, _.get(this, 'activityOptions.engine'))
+          if (!style) {
+            logger.warn('[KDK] cannot generate point style from a feature')
+            return
+          }
           return createMarkerFromPointStyle(latlng, style)
         }
       }

diff --git a/map/client/utils/utils.features.js b/map/client/utils/utils.features.js
@@ -1,4 +1,5 @@
 import _ from 'lodash'
+import logger from 'loglevel'
 import moment from 'moment'
 import { getType } from '@turf/invariant'
 import explode from '@turf/explode'
@@ -361,3 +362,16 @@ export async function fetchGeoJson (dataSource, options = {}) {
   }
   return data
 }
+
+export function getFeatureStyleType (feature) {
+  const geometryType = _.get(feature, 'geometry.type')
+  if (!geometryType) {
+    logger.warn('[KDK] feature has undefined geometry')
+    return
+  }
+  if (geometryType === 'Point') return 'point'
+  if (['LineString', 'MultiLineString'].includes(geometryType)) return 'line'
+  if (['Polygon', 'MultiPolygon'].includes(geometryType)) return 'polygon'
+  logger.warn(`[KDK] unsupported geometry of type of ${geometryType}`)
+  return
+}