@deck.gl-community/editable-layers 9.2.0-beta.5 → 9.2.0-beta.8

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

@@ -9,7 +9,7 @@ import {
   getPickedIntermediateEditHandle,
   shouldCancelPan
 } from './utils';
-import {FeatureCollection} from '../utils/geojson-types';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {ModeProps, StartDraggingEvent, StopDraggingEvent, DraggingEvent} from './types';
 import {ModifyMode} from './modify-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';
@@ -19,7 +19,7 @@ export class ExtrudeMode extends ModifyMode {
 
   isPointAdded = false;
 
-  handleDragging(event: DraggingEvent, props: ModeProps<FeatureCollection>): void {
+  handleDragging(event: DraggingEvent, props: ModeProps<SimpleFeatureCollection>): void {
     const editHandle = getPickedEditHandle(event.pointerDownPicks);
 
     if (editHandle) {
@@ -61,7 +61,7 @@ export class ExtrudeMode extends ModifyMode {
     }
   }
 
-  handleStartDragging(event: StartDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStartDragging(event: StartDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (shouldCancelPan(event)) {
       event.cancelPan();
     }
@@ -111,7 +111,7 @@ export class ExtrudeMode extends ModifyMode {
     }
   }
 
-  handleStopDragging(event: StopDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStopDragging(event: StopDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     const selectedFeatureIndexes = props.selectedIndexes;
     const editHandle = getPickedEditHandle(event.pointerDownPicks);
     if (selectedFeatureIndexes.length && editHandle) {
@@ -156,7 +156,7 @@ export class ExtrudeMode extends ModifyMode {
   coordinatesSize(
     positionIndexes: number[] | null | undefined,
     featureIndex: number,
-    {features}: FeatureCollection
+    {features}: SimpleFeatureCollection
   ) {
     let size = 0;
     if (Array.isArray(positionIndexes)) {
@@ -190,7 +190,7 @@ export class ExtrudeMode extends ModifyMode {
     positionIndexes: number[] | null | undefined,
     featureIndex: number,
     size: number,
-    features: FeatureCollection
+    features: SimpleFeatureCollection
   ) {
     if (!Array.isArray(positionIndexes)) {
       return false;
@@ -239,7 +239,7 @@ export class ExtrudeMode extends ModifyMode {
   getPointForPositionIndexes(
     positionIndexes: number[] | null | undefined,
     featureIndex: number,
-    {features}: FeatureCollection
+    {features}: SimpleFeatureCollection
   ) {
     let p1;
     if (Array.isArray(positionIndexes)) {

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+import {featureCollection} from '@turf/helpers';
 import turfUnion from '@turf/union';
 import turfDifference from '@turf/difference';
 import turfIntersect from '@turf/intersect';
@@ -20,12 +21,12 @@ import {
   GuideFeatureCollection,
   TentativeFeature
 } from './types';
-import {FeatureCollection, Feature, Polygon, Geometry, Position} from '../utils/geojson-types';
+import {FeatureCollection, Feature, Polygon, SimpleGeometry, Position, SimpleFeatureCollection, SimpleFeature} 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>;
+export type GeoJsonEditAction = EditAction<SimpleFeatureCollection>;
 
 const DEFAULT_GUIDES: GuideFeatureCollection = {
   type: 'FeatureCollection',
@@ -51,14 +52,14 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
     return DEFAULT_TOOLTIPS;
   }
 
-  getSelectedFeature(props: ModeProps<FeatureCollection>): Feature | null | undefined {
+  getSelectedFeature(props: ModeProps<SimpleFeatureCollection>): SimpleFeature | null | undefined {
     if (props.selectedIndexes.length === 1) {
       return props.data.features[props.selectedIndexes[0]];
     }
     return null;
   }
 
-  getSelectedGeometry(props: ModeProps<FeatureCollection>): Geometry | null | undefined {
+  getSelectedGeometry(props: ModeProps<SimpleFeatureCollection>): SimpleGeometry | null | undefined {
     const feature = this.getSelectedFeature(props);
     if (feature) {
       return feature.geometry;
@@ -66,7 +67,7 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
     return null;
   }
 
-  getSelectedFeaturesAsFeatureCollection(props: ModeProps<FeatureCollection>): FeatureCollection {
+  getSelectedFeaturesAsFeatureCollection(props: ModeProps<SimpleFeatureCollection>): SimpleFeatureCollection {
     const {features} = props.data;
     const selectedFeatures = props.selectedIndexes.map((selectedIndex) => features[selectedIndex]);
     return {
@@ -104,21 +105,20 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
     return props.selectedIndexes.some((index) => pickedIndexes.has(index));
   }
 
-  rewindPolygon(feature: Feature): Feature {
+  rewindPolygon(feature: SimpleFeature): SimpleFeature {
     const {geometry} = feature;
 
     const isPolygonal = geometry.type === 'Polygon' || geometry.type === 'MultiPolygon';
     if (isPolygonal) {
-      // @ts-expect-error turf type too wide
-      return rewind(feature);
+      return rewind(feature) as SimpleFeature;
     }
 
     return feature;
   }
 
   getAddFeatureAction(
-    featureOrGeometry: Geometry | Feature,
-    features: FeatureCollection,
+    featureOrGeometry: SimpleGeometry | Feature,
+    features: SimpleFeatureCollection,
     featureProperties?: {}
   ): GeoJsonEditAction {
     // Unsure why flow can't deal with Geometry type, but there I fixed it
@@ -149,8 +149,8 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
   }
 
   getAddManyFeaturesAction(
-    {features: featuresToAdd}: FeatureCollection,
-    features: FeatureCollection
+    {features: featuresToAdd}: SimpleFeatureCollection,
+    features: SimpleFeatureCollection
   ): GeoJsonEditAction {
     let updatedData = new ImmutableFeatureCollection(features);
     const initialIndex = updatedData.getObject().features.length;
@@ -178,7 +178,7 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
   // eslint-disable-next-line complexity
   getAddFeatureOrBooleanPolygonAction(
     featureOrGeometry: Polygon | Feature,
-    props: ModeProps<FeatureCollection>,
+    props: ModeProps<SimpleFeatureCollection>,
     featureProperties?: {}
   ): GeoJsonEditAction | null | undefined {
     const featureOrGeometryAsAny: any = featureOrGeometry;
@@ -209,14 +209,11 @@ export class GeoJsonEditMode implements EditMode<FeatureCollection, GuideFeature
 
       let updatedGeometry;
       if (modeConfig.booleanOperation === 'union') {
-        // @ts-expect-error selectedFeature type too wide
-        updatedGeometry = turfUnion(selectedFeature, feature);
+        updatedGeometry = turfUnion(featureCollection([selectedFeature, feature]));
       } else if (modeConfig.booleanOperation === 'difference') {
-        // @ts-expect-error selectedFeature type too wide
-        updatedGeometry = turfDifference(selectedFeature, feature);
+        updatedGeometry = turfDifference(featureCollection([selectedFeature, feature]));
       } else if (modeConfig.booleanOperation === 'intersection') {
-        // @ts-expect-error selectedFeature type too wide
-        updatedGeometry = turfIntersect(selectedFeature, feature);
+        updatedGeometry = turfIntersect(featureCollection([selectedFeature, feature]));
       } else {
         // eslint-disable-next-line no-console,no-undef
         console.warn(`Invalid booleanOperation ${modeConfig.booleanOperation}`);

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

@@ -3,20 +3,19 @@
 // Copyright (c) vis.gl contributors
 
 import {
-  Feature,
-  FeatureCollection,
-  Geometry,
+  SimpleFeatureCollection,
+  SimpleGeometry,
   Polygon,
   MultiLineString,
   MultiPolygon,
   Position,
-  PolygonCoordinates
+  SimpleFeature,
 } from '../utils/geojson-types';
 
 export class ImmutableFeatureCollection {
-  featureCollection: FeatureCollection;
+  featureCollection: Readonly<SimpleFeatureCollection>;
 
-  constructor(featureCollection: FeatureCollection) {
+  constructor(featureCollection: SimpleFeatureCollection) {
     this.featureCollection = featureCollection;
   }
 
@@ -162,7 +161,7 @@ export class ImmutableFeatureCollection {
     return this.replaceGeometry(featureIndex, updatedGeometry);
   }
 
-  replaceGeometry(featureIndex: number, geometry: Geometry): ImmutableFeatureCollection {
+  replaceGeometry(featureIndex: number, geometry: SimpleGeometry): ImmutableFeatureCollection {
     const updatedFeature: any = {
       ...this.featureCollection.features[featureIndex],
       geometry
@@ -180,11 +179,11 @@ export class ImmutableFeatureCollection {
     return new ImmutableFeatureCollection(updatedFeatureCollection);
   }
 
-  addFeature(feature: Feature): ImmutableFeatureCollection {
+  addFeature(feature: SimpleFeature): ImmutableFeatureCollection {
     return this.addFeatures([feature]);
   }
 
-  addFeatures(features: Feature[]): ImmutableFeatureCollection {
+  addFeatures(features: SimpleFeature[]): ImmutableFeatureCollection {
     const updatedFeatureCollection = {
       ...this.featureCollection,
       features: [...this.featureCollection.features, ...features]
@@ -351,7 +350,7 @@ function immutablyAddPosition(
   ];
 }
 
-function pruneGeometryIfNecessary(geometry: Geometry) {
+function pruneGeometryIfNecessary(geometry: SimpleGeometry) {
   switch (geometry.type) {
     case 'Polygon':
       prunePolygonIfNecessary(geometry);
@@ -413,7 +412,7 @@ function pruneMultiPolygonIfNecessary(geometry: MultiPolygon) {
   }
 }
 
-function removeHoleIfNecessary(polygon: PolygonCoordinates, holeIndex: number) {
+function removeHoleIfNecessary(polygon: Polygon['coordinates'], holeIndex: number) {
   const hole = polygon[holeIndex];
   if (hole.length <= 3) {
     polygon.splice(holeIndex, 1);

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

@@ -5,13 +5,13 @@
 import turfArea from '@turf/area';
 import turfCentroid from '@turf/centroid';
 import {ClickEvent, Tooltip, ModeProps} from './types';
-import {FeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection, SimpleFeatureCollection} from '../utils/geojson-types';
 import {DrawPolygonMode} from './draw-polygon-mode';
 
 const DEFAULT_TOOLTIPS = [];
 
 export class MeasureAreaMode extends DrawPolygonMode {
-  handleClick(event: ClickEvent, props: ModeProps<FeatureCollection>) {
+  handleClick(event: ClickEvent, props: ModeProps<SimpleFeatureCollection>) {
     const propsWithoutEdit = {
       ...props,
       onEdit: () => {}
@@ -20,7 +20,7 @@ export class MeasureAreaMode extends DrawPolygonMode {
     super.handleClick(event, propsWithoutEdit);
   }
 
-  handleKeyUp(event: KeyboardEvent, props: ModeProps<FeatureCollection>): void {
+  handleKeyUp(event: KeyboardEvent, props: ModeProps<SimpleFeatureCollection>): void {
     const propsWithoutEdit = {
       ...props,
       onEdit: () => {}

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

@@ -16,7 +16,7 @@ import {
   NearestPointType,
   shouldCancelPan
 } from './utils';
-import {LineString, Point, Polygon, FeatureCollection, FeatureOf} from '../utils/geojson-types';
+import {LineString, Point, Polygon, FeatureCollection, Feature, SimpleFeatureCollection} from '../utils/geojson-types';
 import {
   ModeProps,
   ClickEvent,
@@ -34,7 +34,7 @@ import {ImmutableFeatureCollection} from './immutable-feature-collection';
 
 export class ModifyMode extends GeoJsonEditMode {
   // eslint-disable-next-line complexity
-  getGuides(props: ModeProps<FeatureCollection>): GuideFeatureCollection {
+  getGuides(props: ModeProps<SimpleFeatureCollection>): GuideFeatureCollection {
     const handles: GuideFeature[] = [];
 
     const {data, lastPointerMoveEvent} = props;
@@ -76,7 +76,7 @@ export class ModifyMode extends GeoJsonEditMode {
           (lineString, prefix) => {
             const lineStringFeature = toLineString(lineString);
             const candidateIntermediatePoint = this.getNearestPoint(
-              // @ts-expect-error turf types too wide
+
               lineStringFeature,
               referencePoint,
               props.modeConfig && props.modeConfig.viewport
@@ -121,8 +121,8 @@ export class ModifyMode extends GeoJsonEditMode {
 
   // turf.js does not support elevation for nearestPointOnLine
   getNearestPoint(
-    line: FeatureOf<LineString>,
-    inPoint: FeatureOf<Point>,
+    line: Feature<LineString>,
+    inPoint: Feature<Point>,
     viewport: Viewport | null | undefined
   ): NearestPointType {
     const {coordinates} = line.geometry;
@@ -139,12 +139,12 @@ export class ModifyMode extends GeoJsonEditMode {
     return nearestPointOnLine(line, inPoint, viewport);
   }
 
-  handleClick(event: ClickEvent, props: ModeProps<FeatureCollection>) {
+  handleClick(event: ClickEvent, props: ModeProps<SimpleFeatureCollection>) {
     const pickedExistingHandle = getPickedExistingEditHandle(event.picks);
     const pickedIntermediateHandle = getPickedIntermediateEditHandle(event.picks);
 
     if (pickedExistingHandle) {
-      const {featureIndex, positionIndexes} = pickedExistingHandle.properties;
+      const { featureIndex, positionIndexes } = pickedExistingHandle.properties;
 
       let updatedData;
       try {
@@ -194,7 +194,7 @@ export class ModifyMode extends GeoJsonEditMode {
     }
   }
 
-  handleDragging(event: DraggingEvent, props: ModeProps<FeatureCollection>): void {
+  handleDragging(event: DraggingEvent, props: ModeProps<SimpleFeatureCollection>): void {
     const editHandle = getPickedEditHandle(event.pointerDownPicks);
 
     if (editHandle) {
@@ -207,7 +207,7 @@ export class ModifyMode extends GeoJsonEditMode {
 
   _dragEditHandle(
     editType: string,
-    props: ModeProps<FeatureCollection>,
+    props: ModeProps<SimpleFeatureCollection>,
     editHandle: EditHandleFeature,
     event: StopDraggingEvent | DraggingEvent
   ) {
@@ -217,7 +217,7 @@ export class ModifyMode extends GeoJsonEditMode {
     let updatedData;
     if (props.modeConfig?.lockRectangles && editedFeature.properties.shape === 'Rectangle') {
       const coordinates = updateRectanglePosition(
-        editedFeature as FeatureOf<Polygon>,
+        editedFeature as Feature<Polygon>,
         editHandleProperties.positionIndexes[1],
         event.mapCoords
       ) as any; // TODO
@@ -251,7 +251,7 @@ export class ModifyMode extends GeoJsonEditMode {
     props.onUpdateCursor(cursor);
   }
 
-  handleStartDragging(event: StartDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStartDragging(event: StartDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (shouldCancelPan(event)) {
       event.cancelPan();
     }
@@ -282,9 +282,9 @@ export class ModifyMode extends GeoJsonEditMode {
     }
   }
 
-  handleStopDragging(event: StopDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStopDragging(event: StopDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     const selectedFeatureIndexes = props.selectedIndexes;
-    const editHandle = getPickedEditHandle(event.picks);
+    const editHandle = getPickedEditHandle(event.pointerDownPicks);
     if (selectedFeatureIndexes.length && editHandle) {
       this._dragEditHandle('finishMovePosition', props, editHandle, event);
     }

package/src/edit-modes/resize-circle-mode.ts

@@ -14,7 +14,7 @@ import {
   getPickedEditHandle,
   NearestPointType
 } from './utils';
-import {LineString, Point, FeatureCollection, FeatureOf} from '../utils/geojson-types';
+import {LineString, Point, FeatureCollection, Feature, SimpleFeatureCollection} from '../utils/geojson-types';
 import {Viewport} from '../utils/types';
 import {
   ModeProps,
@@ -24,7 +24,7 @@ import {
   DraggingEvent,
   EditHandleFeature,
   GuideFeatureCollection,
-  GuideFeature
+  GuideFeature,
 } from './types';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';
@@ -69,7 +69,7 @@ export class ResizeCircleMode extends GeoJsonEditMode {
           (lineString, prefix) => {
             const lineStringFeature = toLineString(lineString);
             const candidateIntermediatePoint = this.getNearestPoint(
-              // @ts-expect-error turf types too wide
+
               lineStringFeature,
               referencePoint,
               props.modeConfig && props.modeConfig.viewport
@@ -114,8 +114,8 @@ export class ResizeCircleMode extends GeoJsonEditMode {
 
   // turf.js does not support elevation for nearestPointOnLine
   getNearestPoint(
-    line: FeatureOf<LineString>,
-    inPoint: FeatureOf<Point>,
+    line: Feature<LineString>,
+    inPoint: Feature<Point>,
     viewport: Viewport | null | undefined
   ): NearestPointType {
     const {coordinates} = line.geometry;
@@ -129,11 +129,10 @@ export class ResizeCircleMode extends GeoJsonEditMode {
         'Editing 3D point but modeConfig.viewport not provided. Falling back to 2D logic.'
       );
     }
-    // @ts-expect-error turf types diff
     return nearestPointOnLine(line, inPoint);
   }
 
-  handleDragging(event: DraggingEvent, props: ModeProps<FeatureCollection>): void {
+  handleDragging(event: DraggingEvent, props: ModeProps<SimpleFeatureCollection>): void {
     const editHandle = getPickedEditHandle(event.pointerDownPicks);
 
     if (editHandle) {
@@ -143,7 +142,6 @@ export class ResizeCircleMode extends GeoJsonEditMode {
       const editHandleProperties = editHandle.properties;
 
       const feature = this.getSelectedFeature(props);
-      // @ts-expect-error turf types diff
       const center = turfCenter(feature).geometry.coordinates;
       const numberOfSteps = Object.entries(feature.geometry.coordinates[0]).length - 1;
       const radius = Math.max(distance(center, event.mapCoords), 0.001);

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

@@ -22,19 +22,18 @@ import {
   GuideFeatureCollection
 } from './types';
 import {getPickedEditHandle} from './utils';
-import {FeatureCollection, Position} from '../utils/geojson-types';
+import {FeatureCollection, Position, SimpleFeatureCollection} from '../utils/geojson-types';
 import {GeoJsonEditMode, GeoJsonEditAction, getIntermediatePosition} from './geojson-edit-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';
 
 export class RotateMode extends GeoJsonEditMode {
   _selectedEditHandle: EditHandleFeature | null | undefined;
-  _geometryBeingRotated: FeatureCollection | null | undefined;
+  _geometryBeingRotated: SimpleFeatureCollection | null | undefined;
   _isRotating = false;
 
   _isSinglePointGeometrySelected = (geometry: FeatureCollection | null | undefined): boolean => {
     const {features} = geometry || {};
     if (Array.isArray(features) && features.length === 1) {
-      // @ts-expect-error turf type diff
       const {type}: {type: string} = getGeom(features[0]);
       return type === 'Point';
     }
@@ -43,7 +42,7 @@ export class RotateMode extends GeoJsonEditMode {
 
   getIsRotating = () => this._isRotating;
 
-  getGuides(props: ModeProps<FeatureCollection>): GuideFeatureCollection {
+  getGuides(props: ModeProps<SimpleFeatureCollection>): GuideFeatureCollection {
     const selectedGeometry =
       this._geometryBeingRotated || this.getSelectedFeaturesAsFeatureCollection(props);
 
@@ -53,7 +52,6 @@ export class RotateMode extends GeoJsonEditMode {
 
     if (this._isRotating) {
       // Display rotate pivot
-      // @ts-expect-error turf types diff
       return featureCollection([turfCentroid(selectedGeometry)]) as GuideFeatureCollection;
     }
 
@@ -96,7 +94,7 @@ export class RotateMode extends GeoJsonEditMode {
     return featureCollection(outFeatures);
   }
 
-  handleDragging(event: DraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleDragging(event: DraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (!this._isRotating) {
       return;
     }
@@ -126,7 +124,7 @@ export class RotateMode extends GeoJsonEditMode {
     this.updateCursor(props);
   }
 
-  handleStartDragging(event: StartDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStartDragging(event: StartDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (this._selectedEditHandle) {
       event.cancelPan();
       this._isRotating = true;
@@ -134,7 +132,7 @@ export class RotateMode extends GeoJsonEditMode {
     }
   }
 
-  handleStopDragging(event: StopDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStopDragging(event: StopDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (this._isRotating) {
       // Rotate the geometry
       const rotateAction = this.getRotateAction(
@@ -167,19 +165,15 @@ export class RotateMode extends GeoJsonEditMode {
     startDragPoint: Position,
     currentPoint: Position,
     editType: string,
-    props: ModeProps<FeatureCollection>
+    props: ModeProps<SimpleFeatureCollection>
   ): GeoJsonEditAction | null | undefined {
     if (!this._geometryBeingRotated) {
       return null;
     }
-    // @ts-expect-error turf types diff
     const centroid = turfCentroid(this._geometryBeingRotated);
-    // @ts-expect-error turf types diff
-    const angle = getRotationAngle(centroid, startDragPoint, currentPoint);
+    const angle = getRotationAngle(centroid.geometry.coordinates, startDragPoint, currentPoint);
+    const rotatedFeatures = turfTransformRotate(
 
-    // @ts-expect-error turf types too wide
-    const rotatedFeatures: FeatureCollection = turfTransformRotate(
-      // @ts-expect-error turf types too wide
       this._geometryBeingRotated,
       angle,
       {

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

@@ -12,7 +12,7 @@ import {coordEach} from '@turf/meta';
 import turfDistance from '@turf/distance';
 import turfTransformScale from '@turf/transform-scale';
 import {getCoord, getGeom} from '@turf/invariant';
-import {FeatureCollection, Position} from '../utils/geojson-types';
+import {FeatureCollection, Position, SimpleFeatureCollection} from '../utils/geojson-types';
 import {
   ModeProps,
   PointerMoveEvent,
@@ -27,7 +27,7 @@ import {GeoJsonEditMode} from './geojson-edit-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';
 
 export class ScaleMode extends GeoJsonEditMode {
-  _geometryBeingScaled: FeatureCollection | null | undefined;
+  _geometryBeingScaled: SimpleFeatureCollection | null | undefined;
   _selectedEditHandle: EditHandleFeature | null | undefined;
   _cornerGuidePoints: Array<EditHandleFeature> = [];
   _cursor: string | null | undefined;
@@ -36,7 +36,6 @@ export class ScaleMode extends GeoJsonEditMode {
   _isSinglePointGeometrySelected = (geometry: FeatureCollection | null | undefined): boolean => {
     const {features} = geometry || {};
     if (Array.isArray(features) && features.length === 1) {
-      // @ts-expect-error turf types diff
       const {type}: {type: string} = getGeom(features[0]);
       return type === 'Point';
     }
@@ -65,7 +64,7 @@ export class ScaleMode extends GeoJsonEditMode {
     );
   };
 
-  _getUpdatedData = (props: ModeProps<FeatureCollection>, editedData: FeatureCollection) => {
+  _getUpdatedData = (props: ModeProps<SimpleFeatureCollection>, editedData: SimpleFeatureCollection) => {
     let updatedData = new ImmutableFeatureCollection(props.data);
     const selectedIndexes = props.selectedIndexes;
     for (let i = 0; i < selectedIndexes.length; i++) {
@@ -82,7 +81,7 @@ export class ScaleMode extends GeoJsonEditMode {
     startDragPoint: Position,
     currentPoint: Position,
     editType: string,
-    props: ModeProps<FeatureCollection>
+    props: ModeProps<SimpleFeatureCollection>
   ) => {
     if (!this._selectedEditHandle) {
       return null;
@@ -93,9 +92,7 @@ export class ScaleMode extends GeoJsonEditMode {
 
     const scaleFactor = getScaleFactor(origin, startDragPoint, currentPoint);
 
-    // @ts-expect-error turf types diff
-    const scaledFeatures: FeatureCollection = turfTransformScale(
-      // @ts-expect-error turf types diff
+    const scaledFeatures = turfTransformScale(
       this._geometryBeingScaled,
       scaleFactor,
       {origin}
@@ -110,7 +107,7 @@ export class ScaleMode extends GeoJsonEditMode {
     };
   };
 
-  updateCursor = (props: ModeProps<FeatureCollection>) => {
+  updateCursor = (props: ModeProps<SimpleFeatureCollection>) => {
     if (this._selectedEditHandle) {
       if (this._cursor) {
         props.onUpdateCursor(this._cursor);
@@ -118,7 +115,6 @@ export class ScaleMode extends GeoJsonEditMode {
       const cursorGeometry = this.getSelectedFeaturesAsFeatureCollection(props);
 
       // Get resize cursor direction from the hovered scale editHandle (e.g. nesw or nwse)
-      // @ts-expect-error turf types diff
       const centroid = turfCentroid(cursorGeometry);
       const bearing = turfBearing(centroid, this._selectedEditHandle);
       const positiveBearing = bearing < 0 ? bearing + 180 : bearing;
@@ -138,7 +134,7 @@ export class ScaleMode extends GeoJsonEditMode {
     }
   };
 
-  handlePointerMove(event: PointerMoveEvent, props: ModeProps<FeatureCollection>) {
+  handlePointerMove(event: PointerMoveEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (!this._isScaling) {
       const selectedEditHandle = getPickedEditHandle(event.picks);
       this._selectedEditHandle =
@@ -150,7 +146,7 @@ export class ScaleMode extends GeoJsonEditMode {
     }
   }
 
-  handleStartDragging(event: StartDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStartDragging(event: StartDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (this._selectedEditHandle) {
       event.cancelPan();
       this._isScaling = true;
@@ -158,7 +154,7 @@ export class ScaleMode extends GeoJsonEditMode {
     }
   }
 
-  handleDragging(event: DraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleDragging(event: DraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (!this._isScaling) {
       return;
     }
@@ -178,7 +174,7 @@ export class ScaleMode extends GeoJsonEditMode {
     event.cancelPan();
   }
 
-  handleStopDragging(event: StopDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStopDragging(event: StopDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (this._isScaling) {
       // Scale the geometry
       const scaleAction = this.getScaleAction(
@@ -200,7 +196,7 @@ export class ScaleMode extends GeoJsonEditMode {
     }
   }
 
-  getGuides(props: ModeProps<FeatureCollection>): GuideFeatureCollection {
+  getGuides(props: ModeProps<SimpleFeatureCollection>): GuideFeatureCollection {
     this._cornerGuidePoints = [];
     const selectedGeometry = this.getSelectedFeaturesAsFeatureCollection(props);
 

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Position, Feature, FeatureCollection} from '../utils/geojson-types';
+import {Position, FeatureCollection, SimpleFeatureCollection, SimpleFeature} from '../utils/geojson-types';
 import {
   PointerMoveEvent,
   StartDraggingEvent,
@@ -55,7 +55,7 @@ export class SnappableMode extends GeoJsonEditMode {
 
   _getUpdatedSnapSourceHandle(
     snapSourceHandle: EditHandleFeature,
-    data: FeatureCollection
+    data: SimpleFeatureCollection
   ): EditHandleFeature {
     const {featureIndex, positionIndexes} = snapSourceHandle.properties;
     if (!Array.isArray(positionIndexes)) {
@@ -82,7 +82,7 @@ export class SnappableMode extends GeoJsonEditMode {
   // method will return those features along with the features
   // that live in the current layer. Otherwise, this method will simply return the
   // features from the current layer
-  _getSnapTargets(props: ModeProps<FeatureCollection>): Feature[] {
+  _getSnapTargets(props: ModeProps<SimpleFeatureCollection>): SimpleFeature[] {
     let {additionalSnapTargets} = props.modeConfig || {};
     additionalSnapTargets = additionalSnapTargets || [];
 
@@ -90,7 +90,7 @@ export class SnappableMode extends GeoJsonEditMode {
     return features;
   }
 
-  _getSnapTargetHandles(props: ModeProps<FeatureCollection>): EditHandleFeature[] {
+  _getSnapTargetHandles(props: ModeProps<SimpleFeatureCollection>): EditHandleFeature[] {
     const handles: EditHandleFeature[] = [];
     const features = this._getSnapTargets(props);
 
@@ -109,7 +109,7 @@ export class SnappableMode extends GeoJsonEditMode {
   // If no snap handle has been picked, only display the edit handles of the
   // selected feature. If a snap handle has been picked, display said snap handle
   // along with all snappable points on all non-selected features.
-  getGuides(props: ModeProps<FeatureCollection>): GuideFeatureCollection {
+  getGuides(props: ModeProps<SimpleFeatureCollection>): GuideFeatureCollection {
     const {modeConfig, lastPointerMoveEvent} = props;
     const {enableSnapping} = modeConfig || {};