@deck.gl-community/editable-layers 9.2.0-beta.6 → 9.2.5

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,10 @@ 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 +84,7 @@ export class ScaleMode extends GeoJsonEditMode {
     startDragPoint: Position,
     currentPoint: Position,
     editType: string,
-    props: ModeProps<FeatureCollection>
+    props: ModeProps<SimpleFeatureCollection>
   ) => {
     if (!this._selectedEditHandle) {
       return null;
@@ -93,13 +95,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
-      this._geometryBeingScaled,
-      scaleFactor,
-      {origin}
-    );
+    const scaledFeatures = turfTransformScale(this._geometryBeingScaled, scaleFactor, {origin});
 
     return {
       updatedData: this._getUpdatedData(props, scaledFeatures),
@@ -110,7 +106,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 +114,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 +133,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 +145,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 +153,7 @@ export class ScaleMode extends GeoJsonEditMode {
     }
   }
 
-  handleDragging(event: DraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleDragging(event: DraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (!this._isScaling) {
       return;
     }
@@ -178,7 +173,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 +195,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,12 @@
 // 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 +60,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 +87,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 +95,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 +114,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 || {};
 

package/src/edit-modes/split-polygon-mode.ts

@@ -6,16 +6,15 @@ import booleanPointInPolygon from '@turf/boolean-point-in-polygon';
 import turfDifference from '@turf/difference';
 import turfBuffer from '@turf/buffer';
 import lineIntersect from '@turf/line-intersect';
-import type {Point} from '@turf/helpers';
-import {lineString} from '@turf/helpers';
+import type {Point} from 'geojson';
+import {feature as turfFeature, featureCollection, lineString} from '@turf/helpers';
 import turfBearing from '@turf/bearing';
 import turfDistance from '@turf/distance';
 import turfDestination from '@turf/destination';
 import turfPolygonToLine from '@turf/polygon-to-line';
-import type {NearestPointOnLine} from '@turf/nearest-point-on-line';
 import nearestPointOnLine from '@turf/nearest-point-on-line';
 import {generatePointsParallelToLinePoints} from './utils';
-import {FeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection, PolygonGeometry, SimpleFeatureCollection} from '../utils/geojson-types';
 import {
   ClickEvent,
   PointerMoveEvent,
@@ -27,7 +26,11 @@ import {GeoJsonEditMode, GeoJsonEditAction} from './geojson-edit-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';
 
 export class SplitPolygonMode extends GeoJsonEditMode {
-  calculateMapCoords(clickSequence: any, mapCoords: any, props: ModeProps<FeatureCollection>) {
+  calculateMapCoords(
+    clickSequence: any,
+    mapCoords: any,
+    props: ModeProps<SimpleFeatureCollection>
+  ) {
     const modeConfig = props.modeConfig;
     if (!modeConfig || !modeConfig.lock90Degree || !clickSequence.length) {
       return mapCoords;
@@ -36,12 +39,11 @@ export class SplitPolygonMode extends GeoJsonEditMode {
       // if first point is clicked, then find closest polygon point and build ~90deg vector
       const firstPoint = clickSequence[0];
       const selectedGeometry = this.getSelectedGeometry(props);
-      // @ts-expect-error turf types diff
-      const feature = turfPolygonToLine(selectedGeometry);
+      const feature = turfPolygonToLine(selectedGeometry as PolygonGeometry);
 
       const lines = feature.type === 'FeatureCollection' ? feature.features : [feature];
       let minDistance = Number.MAX_SAFE_INTEGER;
-      let closestPoint: NearestPointOnLine | null = null;
+      let closestPoint: ReturnType<typeof nearestPointOnLine> | null = null;
       // If Multipolygon, then we should find nearest polygon line and stick split to it.
       lines.forEach((line) => {
         const snapPoint = nearestPointOnLine(line, firstPoint);
@@ -75,7 +77,7 @@ export class SplitPolygonMode extends GeoJsonEditMode {
     return nearestPt;
   }
 
-  getGuides(props: ModeProps<FeatureCollection>): GuideFeatureCollection {
+  getGuides(props: ModeProps<SimpleFeatureCollection>): GuideFeatureCollection {
     const clickSequence = this.getClickSequence();
 
     const guides: GuideFeatureCollection = {
@@ -104,7 +106,7 @@ export class SplitPolygonMode extends GeoJsonEditMode {
     return guides;
   }
 
-  handleClick(event: ClickEvent, props: ModeProps<FeatureCollection>) {
+  handleClick(event: ClickEvent, props: ModeProps<SimpleFeatureCollection>) {
     const tentativeFeature = this.getTentativeGuide(props);
 
     const selectedGeometry = this.getSelectedGeometry(props);
@@ -129,8 +131,7 @@ export class SplitPolygonMode extends GeoJsonEditMode {
       coordinates: clickSequence[clickSequence.length - 1]
     };
 
-    // @ts-expect-error turf types diff
-    const isPointInPolygon = booleanPointInPolygon(pt, selectedGeometry);
+    const isPointInPolygon = booleanPointInPolygon(pt, selectedGeometry as PolygonGeometry);
     if (clickSequence.length > 1 && tentativeFeature && !isPointInPolygon) {
       this.resetClickSequence();
       // @ts-expect-error narrow type
@@ -151,7 +152,7 @@ export class SplitPolygonMode extends GeoJsonEditMode {
     props.onUpdateCursor('cell');
   }
 
-  splitPolygon(tentativeFeature: TentativeFeature, props: ModeProps<FeatureCollection>) {
+  splitPolygon(tentativeFeature: TentativeFeature, props: ModeProps<SimpleFeatureCollection>) {
     const selectedGeometry = this.getSelectedGeometry(props);
     const featureIndex = props.selectedIndexes[0];
     const modeConfig = props.modeConfig || {};
@@ -164,8 +165,9 @@ export class SplitPolygonMode extends GeoJsonEditMode {
     }
 
     const buffer = turfBuffer(tentativeFeature, gap, {units});
-    // @ts-expect-error turf types diff
-    const updatedGeometry = turfDifference(selectedGeometry, buffer);
+    const updatedGeometry = turfDifference(
+      featureCollection([turfFeature(selectedGeometry as PolygonGeometry), buffer])
+    );
     if (!updatedGeometry) {
       // eslint-disable-next-line no-console,no-undef
       console.warn('Canceling edit. Split Polygon erased');

package/src/edit-modes/three-click-polygon-mode.ts

@@ -9,26 +9,31 @@ import {
   GuideFeatureCollection,
   TentativeFeature
 } from './types';
-import {Position, Polygon, FeatureOf, FeatureCollection} from '../utils/geojson-types';
+import {
+  Position,
+  Polygon,
+  Feature,
+  FeatureCollection,
+  SimpleFeatureCollection
+} from '../utils/geojson-types';
 import {GeoJsonEditMode} from './geojson-edit-mode';
-import omit from 'lodash.omit';
 
 export class ThreeClickPolygonMode extends GeoJsonEditMode {
-  handleClick(event: ClickEvent, props: ModeProps<FeatureCollection>) {
+  handleClick(event: ClickEvent, props: ModeProps<SimpleFeatureCollection>) {
     this.addClickSequence(event);
+
+    const {modeConfig} = props;
     const clickSequence = this.getClickSequence();
-    const tentativeFeature = this.getTentativeGuide(props);
-
-    if (
-      clickSequence.length > 2 &&
-      tentativeFeature &&
-      tentativeFeature.geometry.type === 'Polygon'
-    ) {
-      const editAction = this.getAddFeatureOrBooleanPolygonAction(
-        tentativeFeature.geometry,
-        props,
-        omit(tentativeFeature.properties, 'guideType')
+
+    if (clickSequence.length > 2) {
+      const {geometry, properties} = this.getThreeClickPolygon(
+        clickSequence[0],
+        clickSequence[1],
+        clickSequence[2],
+        modeConfig
       );
+
+      const editAction = this.getAddFeatureOrBooleanPolygonAction(geometry, props, properties);
       this.resetClickSequence();
 
       if (editAction) {
@@ -46,14 +51,12 @@ export class ThreeClickPolygonMode extends GeoJsonEditMode {
       features: []
     };
 
-    if (clickSequence.length === 0) {
-      // nothing to do yet
-      return guides;
-    }
-
-    const hoveredCoord = lastPointerMoveEvent.mapCoords;
+    const coords = [
+      ...clickSequence,
+      ...(lastPointerMoveEvent ? [lastPointerMoveEvent.mapCoords] : [])
+    ];
 
-    if (clickSequence.length === 1) {
+    if (coords.length === 2) {
       guides.features.push({
         type: 'Feature',
         properties: {
@@ -61,24 +64,18 @@ export class ThreeClickPolygonMode extends GeoJsonEditMode {
         },
         geometry: {
           type: 'LineString',
-          coordinates: [clickSequence[0], hoveredCoord]
+          coordinates: [coords[0], coords[1]]
         }
       });
-    } else {
-      const polygon = this.getThreeClickPolygon(
-        clickSequence[0],
-        clickSequence[1],
-        hoveredCoord,
-        modeConfig
-      );
+    } else if (coords.length > 2) {
+      const polygon = this.getThreeClickPolygon(coords[0], coords[1], coords[2], modeConfig);
       if (polygon) {
         guides.features.push({
-          type: 'Feature',
+          ...polygon,
           properties: {
             ...polygon.properties,
             guideType: 'tentative'
-          },
-          geometry: polygon.geometry
+          }
         });
       }
     }
@@ -91,7 +88,7 @@ export class ThreeClickPolygonMode extends GeoJsonEditMode {
     coord2: Position,
     coord3: Position,
     modeConfig: any
-  ): FeatureOf<Polygon> | null | undefined {
+  ): Feature<Polygon> | null | undefined {
     return null;
   }
 

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

@@ -5,10 +5,14 @@
 import turfBearing from '@turf/bearing';
 import turfDistance from '@turf/distance';
 import clone from '@turf/clone';
-import type {Feature as TurfFeature, Geometry as TurfGeometry} from '@turf/helpers';
 import {point} from '@turf/helpers';
-import {WebMercatorViewport} from 'viewport-mercator-project';
-import {FeatureCollection, Position, Geometry} from '../utils/geojson-types';
+import {WebMercatorViewport} from '@math.gl/web-mercator';
+import {
+  FeatureCollection,
+  Position,
+  SimpleGeometry,
+  SimpleFeatureCollection
+} from '../utils/geojson-types';
 import {
   PointerMoveEvent,
   StartDraggingEvent,
@@ -22,10 +26,10 @@ import {GeoJsonEditMode, GeoJsonEditAction} from './geojson-edit-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';
 
 export class TranslateMode extends GeoJsonEditMode {
-  _geometryBeforeTranslate: FeatureCollection | null | undefined;
+  _geometryBeforeTranslate: SimpleFeatureCollection | null | undefined;
   _isTranslatable: boolean = undefined!;
 
-  handleDragging(event: DraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleDragging(event: DraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (!this._isTranslatable) {
       // Nothing to do
       return;
@@ -55,7 +59,7 @@ export class TranslateMode extends GeoJsonEditMode {
     this.updateCursor(props);
   }
 
-  handleStartDragging(event: StartDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStartDragging(event: StartDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (!this._isTranslatable) {
       return;
     }
@@ -64,7 +68,7 @@ export class TranslateMode extends GeoJsonEditMode {
     this._geometryBeforeTranslate = this.getSelectedFeaturesAsFeatureCollection(props);
   }
 
-  handleStopDragging(event: StopDraggingEvent, props: ModeProps<FeatureCollection>) {
+  handleStopDragging(event: StopDraggingEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (this._geometryBeforeTranslate) {
       // Translate the geometry
       const editAction = this.getTranslateAction(
@@ -95,7 +99,7 @@ export class TranslateMode extends GeoJsonEditMode {
     startDragPoint: Position,
     currentPoint: Position,
     editType: string,
-    props: ModeProps<FeatureCollection>
+    props: ModeProps<SimpleFeatureCollection>
   ): GeoJsonEditAction | null | undefined {
     if (!this._geometryBeforeTranslate) {
       return null;
@@ -131,11 +135,10 @@ export class TranslateMode extends GeoJsonEditMode {
             return null;
           });
 
-          // @ts-expect-error turf types
           updatedData = updatedData.replaceGeometry(selectedIndex, {
             type: feature.geometry.type,
             coordinates
-          });
+          } as SimpleGeometry);
         }
       }
     } else {
@@ -146,13 +149,13 @@ export class TranslateMode extends GeoJsonEditMode {
       const direction = turfBearing(p1, p2);
 
       const movedFeatures = this._geometryBeforeTranslate.features.map((feature) =>
-        translateFromCenter(clone(feature as TurfFeature<TurfGeometry>), distanceMoved, direction)
+        translateFromCenter(clone(feature), distanceMoved, direction)
       );
 
       for (let i = 0; i < selectedIndexes.length; i++) {
         const selectedIndex = selectedIndexes[i];
         const movedFeature = movedFeatures[i];
-        updatedData = updatedData.replaceGeometry(selectedIndex, movedFeature.geometry as Geometry);
+        updatedData = updatedData.replaceGeometry(selectedIndex, movedFeature.geometry);
       }
     }
 

package/src/edit-modes/two-click-polygon-mode.ts

@@ -11,12 +11,18 @@ import {
   GuideFeatureCollection,
   TentativeFeature
 } from './types';
-import {Polygon, FeatureCollection, FeatureOf, Position} from '../utils/geojson-types';
+import {
+  Polygon,
+  FeatureCollection,
+  Feature,
+  Position,
+  SimpleFeatureCollection
+} from '../utils/geojson-types';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 import omit from 'lodash.omit';
 
 export class TwoClickPolygonMode extends GeoJsonEditMode {
-  handleClick(event: ClickEvent, props: ModeProps<FeatureCollection>) {
+  handleClick(event: ClickEvent, props: ModeProps<SimpleFeatureCollection>) {
     if (props.modeConfig && props.modeConfig.dragToDraw) {
       // handled in drag handlers
       return;
@@ -27,7 +33,7 @@ export class TwoClickPolygonMode extends GeoJsonEditMode {
     this.checkAndFinishPolygon(props);
   }
 
-  handleStartDragging(event: StartDraggingEvent, props: ModeProps<FeatureCollection>): void {
+  handleStartDragging(event: StartDraggingEvent, props: ModeProps<SimpleFeatureCollection>): void {
     if (!props.modeConfig || !props.modeConfig.dragToDraw) {
       // handled in click handlers
       return;
@@ -37,7 +43,7 @@ export class TwoClickPolygonMode extends GeoJsonEditMode {
     event.cancelPan();
   }
 
-  handleStopDragging(event: StopDraggingEvent, props: ModeProps<FeatureCollection>): void {
+  handleStopDragging(event: StopDraggingEvent, props: ModeProps<SimpleFeatureCollection>): void {
     if (!props.modeConfig || !props.modeConfig.dragToDraw) {
       // handled in click handlers
       return;
@@ -47,7 +53,7 @@ export class TwoClickPolygonMode extends GeoJsonEditMode {
     this.checkAndFinishPolygon(props);
   }
 
-  checkAndFinishPolygon(props: ModeProps<FeatureCollection>) {
+  checkAndFinishPolygon(props: ModeProps<SimpleFeatureCollection>) {
     const clickSequence = this.getClickSequence();
     const tentativeFeature = this.getTentativeGuide(props);
 
@@ -56,7 +62,7 @@ export class TwoClickPolygonMode extends GeoJsonEditMode {
       tentativeFeature &&
       tentativeFeature.geometry.type === 'Polygon'
     ) {
-      const feature: FeatureOf<Polygon> = {
+      const feature: Feature<Polygon> = {
         type: 'Feature',
         properties: omit(tentativeFeature.properties, 'guideType'),
         geometry: {
@@ -110,7 +116,7 @@ export class TwoClickPolygonMode extends GeoJsonEditMode {
     coord1: Position,
     coord2: Position,
     modeConfig: any
-  ): FeatureOf<Polygon> | null | undefined {
+  ): Feature<Polygon> | null | undefined {
     return null;
   }
 

package/src/edit-modes/types.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Position, Point, Geometry, FeatureWithProps} from '../utils/geojson-types';
+import {Position, Point, SimpleGeometry, Feature} from '../utils/geojson-types';
 
 export type ScreenCoordinates = [number, number];
 
@@ -92,7 +92,7 @@ export type EditHandleType =
   | 'scale'
   | 'rotate';
 
-export type EditHandleFeature = FeatureWithProps<
+export type EditHandleFeature = Feature<
   Point,
   {
     guideType: 'editHandle';
@@ -103,8 +103,8 @@ export type EditHandleFeature = FeatureWithProps<
   }
 >;
 
-export type TentativeFeature = FeatureWithProps<
-  Geometry,
+export type TentativeFeature = Feature<
+  SimpleGeometry,
   {
     guideType: 'tentative';
     shape?: string;

package/src/edit-modes/utils.ts

@@ -8,23 +8,21 @@ import destination from '@turf/destination';
 import bearing from '@turf/bearing';
 import pointToLineDistance from '@turf/point-to-line-distance';
 import {flattenEach} from '@turf/meta';
-// import type {MultiLineString} from '@turf/helpers';
 import {point} from '@turf/helpers';
 import {getCoords} from '@turf/invariant';
-import {WebMercatorViewport} from 'viewport-mercator-project';
+import {WebMercatorViewport} from '@math.gl/web-mercator';
 import {Viewport, Pick, EditHandleFeature, EditHandleType, StartDraggingEvent} from './types';
 import {
-  Geometry,
+  SimpleGeometry,
   Position,
   Point,
   LineString,
   Polygon,
-  FeatureOf,
-  FeatureWithProps,
-  AnyCoordinates
+  Feature,
+  SimpleGeometryCoordinates
 } from '../utils/geojson-types';
 
-export type NearestPointType = FeatureWithProps<Point, {dist: number; index: number}>;
+export type NearestPointType = Feature<Point, {dist: number; index: number}>;
 
 export function toDeckColor(
   color?: [number, number, number, number] | number,
@@ -119,8 +117,8 @@ export function mix(a: number, b: number, ratio: number): number {
 }
 
 export function nearestPointOnProjectedLine(
-  line: FeatureOf<LineString>,
-  inPoint: FeatureOf<Point>,
+  line: Feature<LineString>,
+  inPoint: Feature<Point>,
   viewport: Viewport
 ): NearestPointType {
   const wmViewport = new WebMercatorViewport(viewport);
@@ -187,8 +185,8 @@ export function nearestPointOnProjectedLine(
 }
 
 export function nearestPointOnLine( // <G extends LineString | MultiLineString>(
-  lines: FeatureOf<LineString>,
-  inPoint: FeatureOf<Point>,
+  lines: Feature<LineString>,
+  inPoint: Feature<Point>,
   viewport?: Viewport
 ): NearestPointType {
   let mercator;
@@ -204,11 +202,9 @@ export function nearestPointOnLine( // <G extends LineString | MultiLineString>(
     return closestPoint;
   }
 
-  // @ts-expect-error TODO
   // eslint-disable-next-line max-statements, complexity
   flattenEach(lines, (line: any) => {
     const coords: any = getCoords(line);
-    // @ts-expect-error TODO
     const pointCoords: any = getCoords(inPoint);
 
     let minDist;
@@ -369,7 +365,7 @@ export function getPickedEditHandles(picks: Pick[] | null | undefined): EditHand
 }
 
 export function getEditHandlesForGeometry(
-  geometry: Geometry,
+  geometry: SimpleGeometry,
   featureIndex: number,
   editHandleType: EditHandleType = 'existing'
 ): EditHandleFeature[] {
@@ -474,7 +470,7 @@ function getEditHandlesForCoordinates(
  * @returns Updated coordinates.
  */
 export function updateRectanglePosition(
-  feature: FeatureOf<Polygon>,
+  feature: Feature<Polygon>,
   editHandleIndex: number,
   coords: Position
 ): Position[][] | null {
@@ -501,9 +497,9 @@ export function updateRectanglePosition(
  * @retuns Transformed coordinates.
  */
 export function mapCoords(
-  coords: AnyCoordinates,
+  coords: SimpleGeometryCoordinates,
   callback: (coords: Position) => Position
-): AnyCoordinates {
+): SimpleGeometryCoordinates {
   if (typeof coords[0] === 'number') {
     if (!isNaN(coords[0]) && isFinite(coords[0])) {
       return callback(coords as Position);