@deck.gl-community/editable-layers 9.0.0-alpha.1 → 9.0.3

package/src/edit-modes/geojson-edit-mode.ts

@@ -1,3 +1,7 @@
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import turfUnion from '@turf/union';
 import turfDifference from '@turf/difference';
 import turfIntersect from '@turf/intersect';
@@ -14,18 +18,18 @@ import {
   Tooltip,
   ModeProps,
   GuideFeatureCollection,
-  TentativeFeature,
+  TentativeFeature
 } from './types';
-import { FeatureCollection, Feature, Polygon, Geometry, Position } from '../geojson-types';
-import { getPickedEditHandles, getNonGuidePicks } from './utils';
-import { EditMode } from './edit-mode';
-import { ImmutableFeatureCollection } from './immutable-feature-collection';
+import {FeatureCollection, Feature, Polygon, Geometry, Position} from '../utils/geojson-types';
+import {getPickedEditHandles, getNonGuidePicks} from './utils';
+import {EditMode} from './edit-mode';
+import {ImmutableFeatureCollection} from './immutable-feature-collection';
 
 export type GeoJsonEditAction = EditAction<FeatureCollection>;
 
 const DEFAULT_GUIDES: GuideFeatureCollection = {
   type: 'FeatureCollection',
-  features: [],
+  features: []
 };
 const DEFAULT_TOOLTIPS: Tooltip[] = [];
 
@@ -63,11 +67,11 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
   }
 
   getSelectedFeaturesAsFeatureCollection(props: ModeProps<FeatureCollection>): FeatureCollection {
-    const { features } = props.data;
+    const {features} = props.data;
     const selectedFeatures = props.selectedIndexes.map((selectedIndex) => features[selectedIndex]);
     return {
       type: 'FeatureCollection',
-      features: selectedFeatures,
+      features: selectedFeatures
     };
   }
 
@@ -75,7 +79,7 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
     return this._clickSequence;
   }
 
-  addClickSequence({ mapCoords }: ClickEvent): void {
+  addClickSequence({mapCoords}: ClickEvent): void {
     this._clickSequence.push(mapCoords);
   }
 
@@ -92,16 +96,16 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
 
   isSelectionPicked(picks: Pick[], props: ModeProps<FeatureCollection>): boolean {
     if (!picks.length) return false;
-    const pickedFeatures = getNonGuidePicks(picks).map(({ index }) => index);
+    const pickedFeatures = getNonGuidePicks(picks).map(({index}) => index);
     const pickedHandles = getPickedEditHandles(picks).map(
-      ({ properties }) => properties.featureIndex
+      ({properties}) => properties.featureIndex
     );
     const pickedIndexes = new Set([...pickedFeatures, ...pickedHandles]);
     return props.selectedIndexes.some((index) => pickedIndexes.has(index));
   }
 
   rewindPolygon(feature: Feature): Feature {
-    const { geometry } = feature;
+    const {geometry} = feature;
 
     const isPolygonal = geometry.type === 'Polygon' || geometry.type === 'MultiPolygon';
     if (isPolygonal) {
@@ -123,10 +127,10 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
       featureOrGeometryAsAny.type === 'Feature'
         ? featureOrGeometryAsAny
         : {
-          type: 'Feature',
-          properties: {},
-          geometry: featureOrGeometryAsAny,
-        };
+            type: 'Feature',
+            properties: {},
+            geometry: featureOrGeometryAsAny
+          };
 
     const rewindFeature = this.rewindPolygon(feature);
     const updatedData = new ImmutableFeatureCollection(features)
@@ -137,25 +141,25 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
       updatedData,
       editType: 'addFeature',
       editContext: {
-        featureIndexes: [updatedData.features.length - 1],
-      },
+        featureIndexes: [updatedData.features.length - 1]
+      }
     };
   }
 
   getAddManyFeaturesAction(
-    { features: featuresToAdd }: FeatureCollection,
+    {features: featuresToAdd}: FeatureCollection,
     features: FeatureCollection
   ): GeoJsonEditAction {
     let updatedData = new ImmutableFeatureCollection(features);
     const initialIndex = updatedData.getObject().features.length;
     const updatedIndexes: number[] = [];
     for (const feature of featuresToAdd) {
-      const { properties, geometry } = feature;
+      const {properties, geometry} = feature;
       const geometryAsAny: any = geometry;
       updatedData = updatedData.addFeature({
         type: 'Feature',
         properties,
-        geometry: geometryAsAny,
+        geometry: geometryAsAny
       });
       updatedIndexes.push(initialIndex + updatedIndexes.length);
     }
@@ -164,8 +168,8 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
       updatedData: updatedData.getObject(),
       editType: 'addFeature',
       editContext: {
-        featureIndexes: updatedIndexes,
-      },
+        featureIndexes: updatedIndexes
+      }
     };
   }
 
@@ -176,7 +180,7 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
     const featureOrGeometryAsAny: any = featureOrGeometry;
 
     const selectedFeature = this.getSelectedFeature(props);
-    const { modeConfig } = props;
+    const {modeConfig} = props;
     if (modeConfig && modeConfig.booleanOperation) {
       if (
         !selectedFeature ||
@@ -194,9 +198,9 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
         featureOrGeometryAsAny.type === 'Feature'
           ? featureOrGeometryAsAny
           : {
-            type: 'Feature',
-            geometry: featureOrGeometryAsAny,
-          };
+              type: 'Feature',
+              geometry: featureOrGeometryAsAny
+            };
 
       let updatedGeometry;
       if (modeConfig.booleanOperation === 'union') {
@@ -230,8 +234,8 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
         updatedData,
         editType: 'unionGeometry',
         editContext: {
-          featureIndexes: [featureIndex],
-        },
+          featureIndexes: [featureIndex]
+        }
       };
 
       return editAction;
@@ -251,8 +255,8 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
         updatedData: props.data,
         editType: 'updateTentativeFeature',
         editContext: {
-          feature: tentativeFeature,
-        },
+          feature: tentativeFeature
+        }
       });
     }
   }
@@ -267,7 +271,7 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
         // Because the new drawing feature is dropped, so the data will keep as the same.
         updatedData: props.data,
         editType: 'cancelFeature',
-        editContext: {},
+        editContext: {}
       });
     }
   }
@@ -276,7 +280,7 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
 export function getIntermediatePosition(position1: Position, position2: Position): Position {
   const intermediatePosition: Position = [
     (position1[0] + position2[0]) / 2.0,
-    (position1[1] + position2[1]) / 2.0,
+    (position1[1] + position2[1]) / 2.0
   ];
 
   return intermediatePosition;

package/src/edit-modes/immutable-feature-collection.ts

@@ -1,3 +1,7 @@
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {
   Feature,
   FeatureCollection,
@@ -6,8 +10,8 @@ import {
   MultiLineString,
   MultiPolygon,
   Position,
-  PolygonCoordinates,
-} from '../geojson-types';
+  PolygonCoordinates
+} from '../utils/geojson-types';
 
 export class ImmutableFeatureCollection {
   featureCollection: FeatureCollection;
@@ -45,7 +49,7 @@ export class ImmutableFeatureCollection {
         positionIndexes,
         updatedPosition,
         isPolygonal
-      ),
+      )
     };
 
     return this.replaceGeometry(featureIndex, updatedGeometry);
@@ -59,7 +63,9 @@ export class ImmutableFeatureCollection {
    * @param positionIndexes An array containing the indexes of the postion to remove
    *
    * @returns A new `ImmutableFeatureCollection` with the given coordinate removed. Does not modify this `ImmutableFeatureCollection`.
+   *
    */
+  // eslint-disable-next-line complexity
   removePosition(
     featureIndex: number,
     positionIndexes: number[] | null | undefined
@@ -67,19 +73,19 @@ export class ImmutableFeatureCollection {
     const geometry = this.featureCollection.features[featureIndex].geometry;
 
     if (geometry.type === 'Point') {
-      throw Error('Can\'t remove a position from a Point or there\'d be nothing left');
+      throw Error("Can't remove a position from a Point or there'd be nothing left");
     }
     if (
       geometry.type === 'MultiPoint' && // only 1 point left
       geometry.coordinates.length < 2
     ) {
-      throw Error('Can\'t remove the last point of a MultiPoint or there\'d be nothing left');
+      throw Error("Can't remove the last point of a MultiPoint or there'd be nothing left");
     }
     if (
       geometry.type === 'LineString' && // only 2 positions
       geometry.coordinates.length < 3
     ) {
-      throw Error('Can\'t remove position. LineString must have at least two positions');
+      throw Error("Can't remove position. LineString must have at least two positions");
     }
     if (
       geometry.type === 'Polygon' && // outer ring is a triangle
@@ -87,14 +93,14 @@ export class ImmutableFeatureCollection {
       Array.isArray(positionIndexes) && // trying to remove from outer ring
       positionIndexes[0] === 0
     ) {
-      throw Error('Can\'t remove position. Polygon\'s outer ring must have at least four positions');
+      throw Error("Can't remove position. Polygon's outer ring must have at least four positions");
     }
     if (
       geometry.type === 'MultiLineString' && // only 1 LineString left
       geometry.coordinates.length === 1 && // only 2 positions
       geometry.coordinates[0].length < 3
     ) {
-      throw Error('Can\'t remove position. MultiLineString must have at least two positions');
+      throw Error("Can't remove position. MultiLineString must have at least two positions");
     }
     if (
       geometry.type === 'MultiPolygon' && // only 1 polygon left
@@ -105,14 +111,14 @@ export class ImmutableFeatureCollection {
       positionIndexes[1] === 0
     ) {
       throw Error(
-        'Can\'t remove position. MultiPolygon\'s outer ring must have at least four positions'
+        "Can't remove position. MultiPolygon's outer ring must have at least four positions"
       );
     }
 
     const isPolygonal = geometry.type === 'Polygon' || geometry.type === 'MultiPolygon';
     const updatedGeometry: any = {
       ...geometry,
-      coordinates: immutablyRemovePosition(geometry.coordinates, positionIndexes, isPolygonal),
+      coordinates: immutablyRemovePosition(geometry.coordinates, positionIndexes, isPolygonal)
     };
 
     // Handle cases where incomplete geometries need pruned (e.g. holes that were triangles)
@@ -150,7 +156,7 @@ export class ImmutableFeatureCollection {
         positionIndexes,
         positionToAdd,
         isPolygonal
-      ),
+      )
     };
 
     return this.replaceGeometry(featureIndex, updatedGeometry);
@@ -159,7 +165,7 @@ export class ImmutableFeatureCollection {
   replaceGeometry(featureIndex: number, geometry: Geometry): ImmutableFeatureCollection {
     const updatedFeature: any = {
       ...this.featureCollection.features[featureIndex],
-      geometry,
+      geometry
     };
 
     const updatedFeatureCollection = {
@@ -167,8 +173,8 @@ export class ImmutableFeatureCollection {
       features: [
         ...this.featureCollection.features.slice(0, featureIndex),
         updatedFeature,
-        ...this.featureCollection.features.slice(featureIndex + 1),
-      ],
+        ...this.featureCollection.features.slice(featureIndex + 1)
+      ]
     };
 
     return new ImmutableFeatureCollection(updatedFeatureCollection);
@@ -181,7 +187,7 @@ export class ImmutableFeatureCollection {
   addFeatures(features: Feature[]): ImmutableFeatureCollection {
     const updatedFeatureCollection = {
       ...this.featureCollection,
-      features: [...this.featureCollection.features, ...features],
+      features: [...this.featureCollection.features, ...features]
     };
 
     return new ImmutableFeatureCollection(updatedFeatureCollection);
@@ -203,7 +209,7 @@ export class ImmutableFeatureCollection {
 
     const updatedFeatureCollection = {
       ...this.featureCollection,
-      features,
+      features
     };
 
     return new ImmutableFeatureCollection(updatedFeatureCollection);
@@ -237,7 +243,7 @@ function immutablyReplacePosition(
     const updated = [
       ...coordinates.slice(0, positionIndexes[0]),
       getUpdatedPosition(updatedPosition, coordinates[positionIndexes[0]]),
-      ...coordinates.slice(positionIndexes[0] + 1),
+      ...coordinates.slice(positionIndexes[0] + 1)
     ];
 
     if (
@@ -261,7 +267,7 @@ function immutablyReplacePosition(
       updatedPosition,
       isPolygonal
     ),
-    ...coordinates.slice(positionIndexes[0] + 1),
+    ...coordinates.slice(positionIndexes[0] + 1)
   ];
 }
 
@@ -279,7 +285,7 @@ function immutablyRemovePosition(
   if (positionIndexes.length === 1) {
     const updated = [
       ...coordinates.slice(0, positionIndexes[0]),
-      ...coordinates.slice(positionIndexes[0] + 1),
+      ...coordinates.slice(positionIndexes[0] + 1)
     ];
 
     if (
@@ -307,7 +313,7 @@ function immutablyRemovePosition(
       positionIndexes.slice(1, positionIndexes.length),
       isPolygonal
     ),
-    ...coordinates.slice(positionIndexes[0] + 1),
+    ...coordinates.slice(positionIndexes[0] + 1)
   ];
 }
 
@@ -327,7 +333,7 @@ function immutablyAddPosition(
     const updated = [
       ...coordinates.slice(0, positionIndexes[0]),
       positionToAdd,
-      ...coordinates.slice(positionIndexes[0]),
+      ...coordinates.slice(positionIndexes[0])
     ];
     return updated;
   }
@@ -341,7 +347,7 @@ function immutablyAddPosition(
       positionToAdd,
       isPolygonal
     ),
-    ...coordinates.slice(positionIndexes[0] + 1),
+    ...coordinates.slice(positionIndexes[0] + 1)
   ];
 }
 

package/src/edit-modes/measure-angle-mode.ts

@@ -1,63 +1,70 @@
 import turfBearing from '@turf/bearing';
 import turfCenter from '@turf/center';
-import memoize from '../memoize';
+import {memoize} from '../utils/memoize';
 
-import { ClickEvent, PointerMoveEvent, Tooltip, ModeProps, GuideFeatureCollection } from './types';
-import { FeatureCollection, Position } from '../geojson-types';
-import { GeoJsonEditMode } from './geojson-edit-mode';
+import {ClickEvent, PointerMoveEvent, Tooltip, ModeProps, GuideFeatureCollection} from './types';
+import {FeatureCollection, Position} from '../utils/geojson-types';
+import {GeoJsonEditMode} from './geojson-edit-mode';
 
 const DEFAULT_TOOLTIPS: Tooltip[] = [];
 
 export class MeasureAngleMode extends GeoJsonEditMode {
-  _getTooltips = memoize(({ modeConfig, vertex, point1, point2 }: {
-    modeConfig: any,
-    vertex: any,
-    point1: Position,
-    point2: Position
-  }): Tooltip[] => {
-    let tooltips = DEFAULT_TOOLTIPS;
-
-    if (vertex && point1 && point2) {
-      const { formatTooltip, measurementCallback } = modeConfig || {};
-      const units = 'deg';
-
-      const angle1 = turfBearing(vertex, point1);
-      const angle2 = turfBearing(vertex, point2);
-      let angle = Math.abs(angle1 - angle2);
-      if (angle > 180) {
-        angle = 360 - angle;
+  _getTooltips = memoize(
+    ({
+      modeConfig,
+      vertex,
+      point1,
+      point2
+    }: {
+      modeConfig: any;
+      vertex: any;
+      point1: Position;
+      point2: Position;
+    }): Tooltip[] => {
+      let tooltips = DEFAULT_TOOLTIPS;
+
+      if (vertex && point1 && point2) {
+        const {formatTooltip, measurementCallback} = modeConfig || {};
+        const units = 'deg';
+
+        const angle1 = turfBearing(vertex, point1);
+        const angle2 = turfBearing(vertex, point2);
+        let angle = Math.abs(angle1 - angle2);
+        if (angle > 180) {
+          angle = 360 - angle;
+        }
+
+        let text: string;
+        if (formatTooltip) {
+          text = formatTooltip(angle);
+        } else {
+          // By default, round to 2 decimal places and append units
+          // @ts-expect-error angle isn't string
+          text = `${parseFloat(angle).toFixed(2)} ${units}`;
+        }
+
+        if (measurementCallback) {
+          measurementCallback(angle);
+        }
+
+        const position = turfCenter({
+          type: 'FeatureCollection',
+          features: [point1, point2].map((p) => ({
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: p
+            },
+            properties: {}
+          }))
+        }).geometry.coordinates;
+
+        tooltips = [{position, text}];
       }
 
-      let text: string;
-      if (formatTooltip) {
-        text = formatTooltip(angle);
-      } else {
-        // By default, round to 2 decimal places and append units
-        // @ts-expect-error angle isn't string
-        text = `${parseFloat(angle).toFixed(2)} ${units}`;
-      }
-
-      if (measurementCallback) {
-        measurementCallback(angle);
-      }
-
-      const position = turfCenter({
-        type: 'FeatureCollection',
-        features: [point1, point2].map((p) => ({
-          type: 'Feature',
-          geometry: {
-            type: 'Point',
-            coordinates: p,
-          },
-          properties: {}
-        })),
-      }).geometry.coordinates as Position;
-
-      tooltips = [{position, text}];
+      return tooltips;
     }
-
-    return tooltips;
-  });
+  );
 
   handleClick(event: ClickEvent, props: ModeProps<FeatureCollection>): void {
     if (this.getClickSequence().length >= 3) {
@@ -86,28 +93,28 @@ export class MeasureAngleMode extends GeoJsonEditMode {
 
   // Return features that can be used as a guide for editing the data
   getGuides(props: ModeProps<FeatureCollection>): GuideFeatureCollection {
-    const guides: GuideFeatureCollection = { type: 'FeatureCollection', features: [] };
-    const { features } = guides;
+    const guides: GuideFeatureCollection = {type: 'FeatureCollection', features: []};
+    const {features} = guides;
 
     const points = this.getPoints(props);
 
     if (points.length > 2) {
       features.push({
         type: 'Feature',
-        properties: { guideType: 'tentative' },
+        properties: {guideType: 'tentative'},
         geometry: {
           type: 'LineString',
-          coordinates: [points[1], points[0], points[2]],
-        },
+          coordinates: [points[1], points[0], points[2]]
+        }
       });
     } else if (points.length > 1) {
       features.push({
         type: 'Feature',
-        properties: { guideType: 'tentative' },
+        properties: {guideType: 'tentative'},
         geometry: {
           type: 'LineString',
-          coordinates: [points[1], points[0]],
-        },
+          coordinates: [points[1], points[0]]
+        }
       });
     }
 
@@ -121,7 +128,7 @@ export class MeasureAngleMode extends GeoJsonEditMode {
       modeConfig: props.modeConfig,
       vertex: points[0],
       point1: points[1],
-      point2: points[2],
+      point2: points[2]
     }) as Tooltip[];
   }
 }

package/src/edit-modes/measure-area-mode.ts

@@ -1,8 +1,12 @@
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import turfArea from '@turf/area';
 import turfCentroid from '@turf/centroid';
-import { ClickEvent, Tooltip, ModeProps } from './types';
-import { FeatureCollection } from '../geojson-types';
-import { DrawPolygonMode } from './draw-polygon-mode';
+import {ClickEvent, Tooltip, ModeProps} from './types';
+import {FeatureCollection} from '../utils/geojson-types';
+import {DrawPolygonMode} from './draw-polygon-mode';
 
 const DEFAULT_TOOLTIPS = [];
 
@@ -10,7 +14,7 @@ export class MeasureAreaMode extends DrawPolygonMode {
   handleClick(event: ClickEvent, props: ModeProps<FeatureCollection>) {
     const propsWithoutEdit = {
       ...props,
-      onEdit: () => {},
+      onEdit: () => {}
     };
 
     super.handleClick(event, propsWithoutEdit);
@@ -19,7 +23,7 @@ export class MeasureAreaMode extends DrawPolygonMode {
   handleKeyUp(event: KeyboardEvent, props: ModeProps<FeatureCollection>): void {
     const propsWithoutEdit = {
       ...props,
-      onEdit: () => {},
+      onEdit: () => {}
     };
 
     super.handleKeyUp(event, propsWithoutEdit);
@@ -29,8 +33,8 @@ export class MeasureAreaMode extends DrawPolygonMode {
     const tentativeGuide = this.getTentativeGuide(props);
 
     if (tentativeGuide && tentativeGuide.geometry.type === 'Polygon') {
-      const { modeConfig } = props;
-      const { formatTooltip, measurementCallback } = modeConfig || {};
+      const {modeConfig} = props;
+      const {formatTooltip, measurementCallback} = modeConfig || {};
       const units = 'sq. m';
 
       const centroid = turfCentroid(tentativeGuide);
@@ -51,10 +55,9 @@ export class MeasureAreaMode extends DrawPolygonMode {
 
       return [
         {
-          // @ts-expect-error turf types diff
           position: centroid.geometry.coordinates,
-          text,
-        },
+          text
+        }
       ];
     }
     return DEFAULT_TOOLTIPS;