improved(core): enhance robustness when handling invalid GeoJSON feature geometry

Signed-off-by: Tim Deubler <[email protected]>

Author: TerminalTim

packages/core/src/features/utils.ts

@@ -18,6 +18,7 @@
  */
 
 import {GeoJSONCoordinate, GeoJSONFeature} from './GeoJSON';
+
 type Point = number[];
 type BBox = number[];
 type Coordinates = Array<Point>;
@@ -63,7 +64,9 @@ const calcBBox = (feature: GeoJSONFeature, bbox?: BBox): BBox | false => {
         if (bbox) {
             updatePointBBox(<[number, number]>coordinates, bbox);
         } else {
-            bbox = [coordinates[0], coordinates[1], coordinates[0], coordinates[1]];
+            const lon = coordinates[0];
+            const lat = coordinates[1];
+            bbox = [lon, lat, lon, lat];
         }
     } else {
         bbox = bbox || [Infinity, Infinity, -Infinity, -Infinity];
@@ -86,6 +89,10 @@ const calcBBox = (feature: GeoJSONFeature, bbox?: BBox): BBox | false => {
         }
     }
 
+    if (!Number.isFinite(bbox[0]) || !Number.isFinite(bbox[1])) {
+        return false;
+    }
+
     return bbox;
 };
 

packages/core/src/providers/EditableFeatureProvider.ts

@@ -20,7 +20,12 @@
 import {FeatureProvider as FeatureTileProvider} from './FeatureProvider';
 import {Feature} from '../features/Feature';
 import {JSUtils} from '@here/xyz-maps-common';
-import {NavlinkSplitHook, NavlinkDisconnectHook, FeatureRemoveHook, CoordinatesUpdateHook} from '@here/xyz-maps-editor';
+import {
+    NavlinkSplitHook,
+    NavlinkDisconnectHook,
+    FeatureRemoveHook,
+    CoordinatesUpdateHook
+} from '@here/xyz-maps-editor';
 import {GeoJSONCoordinate} from '../features/GeoJSON';
 import {TileProviderOptions} from './TileProvider/TileProviderOptions';
 
@@ -186,7 +191,10 @@ export abstract class EditableFeatureProvider extends FeatureTileProvider {
      *
      * @returns true if turn is allowed, otherwise false.
      */
-    abstract readTurnRestriction(turnFrom: { link: Navlink, index: number }, turnTo: { link: Navlink, index: number }): boolean;
+    abstract readTurnRestriction(turnFrom: { link: Navlink, index: number }, turnTo: {
+        link: Navlink,
+        index: number
+    }): boolean;
 
 
     /**
@@ -336,13 +344,13 @@ export abstract class EditableFeatureProvider extends FeatureTileProvider {
         return true;
     };
 
-    prepareFeature(feature: Feature): Feature {
-        if (!feature.properties) {
-            feature.properties = {};
-        }
-        if (feature.id == undefined) {
-            feature.id = JSUtils.String.random();
+    prepareFeature(feature: Feature): Feature | false {
+        feature.id ??= JSUtils.String.random();
+        if (!super.prepareFeature(feature)) {
+            return false;
         }
+        feature.properties ??= {};
+
         return feature;
     }
 }

packages/core/src/providers/FeatureProvider.ts

@@ -98,7 +98,7 @@ export class FeatureProvider extends Provider {
                 }
             } else {
                 // unknown feature
-                console.warn('unkown feature detected..', feature.geometry.type, feature);
+                console.warn('Invalid feature skipped:', feature);
             }
         }
 
@@ -238,7 +238,7 @@ export class FeatureProvider extends Provider {
             }
         } else {
             //  unkown feature
-            console.warn('unkown feature detected..', feature);
+            console.warn('Invalid feature skipped:', feature);
 
             feature = null;
         }
@@ -1084,12 +1084,10 @@ export class FeatureProvider extends Provider {
     __type = 'FeatureProvider';
 
     prepareFeature(feature: GeoJSONFeature): GeoJSONFeature | false {
-        if (feature['id'] == UNDEF) {
-            feature['id'] = Math.random() * 1e8 ^ 0;
-        }
+        feature.id ??= Math.random() * 1e8 ^ 0;
         // calculates object bbox's
         if (!feature.bbox) {
-            // false -> unkown feature -> no success
+            // false -> unknown feature -> no success
             return this.updateBBox(feature) && feature;
         } else if ((<number[]>feature.bbox).length === 6) { // convert to 2D bbox
             feature.bbox = [feature.bbox[0], feature.bbox[1], feature.bbox[3], (<number[]>feature.bbox)[4]];