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

package/src/editable-layers/editable-geojson-layer.ts

@@ -13,7 +13,8 @@ import {
   StopDraggingEvent,
   DraggingEvent,
   PointerMoveEvent,
-  DoubleClickEvent
+  DoubleClickEvent,
+  ModeProps
 } from '../edit-modes/types';
 
 import {ViewMode} from '../edit-modes/view-mode';
@@ -119,7 +120,7 @@ export type EditableGeoJsonLayerProps<DataT = any> = EditableLayerProps & {
   mode?: any;
   modeConfig?: any;
   selectedFeatureIndexes?: number[];
-  onEdit?: (updatedData?, editType?: string, featureIndexes?: number[], editContext?) => void;
+  onEdit?: (editAction: EditAction<DataT>) => void;
 
   pickable?: boolean;
   pickingRadius?: number;
@@ -141,8 +142,8 @@ export type EditableGeoJsonLayerProps<DataT = any> = EditableLayerProps & {
 
   getLineColor?: Color | ((feature, isSelected, mode) => Color);
   getFillColor?: Color | ((feature, isSelected, mode) => Color);
-  getRadius?: number | ((f) => number);
-  getLineWidth?: number | ((f) => number);
+  getRadius?: number | ((feature, isSelected, mode) => number);
+  getLineWidth?: number | ((feature, isSelected, mode) => number);
 
   getTentativeLineColor?: Color | ((feature, isSelected, mode) => Color);
   getTentativeFillColor?: Color | ((feature, isSelected, mode) => Color);
@@ -332,10 +333,26 @@ export class EditableGeoJsonLayer extends EditableLayer<
       },
 
       updateTriggers: {
-        getLineColor: [this.props.selectedFeatureIndexes, this.props.mode],
-        getFillColor: [this.props.selectedFeatureIndexes, this.props.mode],
-        getPointRadius: [this.props.selectedFeatureIndexes, this.props.mode],
-        getLineWidth: [this.props.selectedFeatureIndexes, this.props.mode]
+        getLineColor: [
+          this.props.updateTriggers.getLineColor,
+          this.props.selectedFeatureIndexes,
+          this.props.mode
+        ],
+        getFillColor: [
+          this.props.updateTriggers.getFillColor,
+          this.props.selectedFeatureIndexes,
+          this.props.mode
+        ],
+        getPointRadius: [
+          this.props.updateTriggers.getPointRadius,
+          this.props.selectedFeatureIndexes,
+          this.props.mode
+        ],
+        getLineWidth: [
+          this.props.updateTriggers.getLineWidth,
+          this.props.selectedFeatureIndexes,
+          this.props.mode
+        ]
       }
     });
 
@@ -414,14 +431,14 @@ export class EditableGeoJsonLayer extends EditableLayer<
     this.setState({selectedFeatures});
   }
 
-  getModeProps(props: EditableGeoJsonLayerProps<any>) {
+  getModeProps<DataT>(props: EditableGeoJsonLayerProps<DataT>): ModeProps<DataT> {
     return {
       modeConfig: props.modeConfig,
       data: props.data,
       selectedIndexes: props.selectedFeatureIndexes,
       lastPointerMoveEvent: this.state.lastPointerMoveEvent,
       cursor: this.state.cursor,
-      onEdit: (editAction: EditAction<FeatureCollection>) => {
+      onEdit: (editAction) => {
         // Force a re-render
         // This supports double-click where we need to ensure that there's a re-render between the two clicks
         // even though the data wasn't changed, just the internal tentative feature.
@@ -551,7 +568,7 @@ export class EditableGeoJsonLayer extends EditableLayer<
 
   createTooltipsLayers() {
     const mode = this.getActiveMode();
-    const tooltips = mode.getTooltips(this.getModeProps(this.props) as any);
+    const tooltips = mode.getTooltips(this.getModeProps(this.props));
 
     const layer = new TextLayer({
       getSize: DEFAULT_TOOLTIP_FONT_SIZE,
@@ -565,34 +582,34 @@ export class EditableGeoJsonLayer extends EditableLayer<
   }
 
   onLayerClick(event: ClickEvent): void {
-    this.getActiveMode().handleClick(event, this.getModeProps(this.props) as any);
+    this.getActiveMode().handleClick(event, this.getModeProps(this.props));
   }
 
   onLayerDoubleClick(event: DoubleClickEvent): void {
     if (this.getActiveMode().handleDoubleClick) {
-      this.getActiveMode().handleDoubleClick(event, this.getModeProps(this.props) as any);
+      this.getActiveMode().handleDoubleClick(event, this.getModeProps(this.props));
     }
   }
 
   onLayerKeyUp(event: KeyboardEvent): void {
-    this.getActiveMode().handleKeyUp(event, this.getModeProps(this.props) as any);
+    this.getActiveMode().handleKeyUp(event, this.getModeProps(this.props));
   }
 
   onStartDragging(event: StartDraggingEvent): void {
-    this.getActiveMode().handleStartDragging(event, this.getModeProps(this.props) as any);
+    this.getActiveMode().handleStartDragging(event, this.getModeProps(this.props));
   }
 
   onDragging(event: DraggingEvent): void {
-    this.getActiveMode().handleDragging(event, this.getModeProps(this.props) as any);
+    this.getActiveMode().handleDragging(event, this.getModeProps(this.props));
   }
 
   onStopDragging(event: StopDraggingEvent): void {
-    this.getActiveMode().handleStopDragging(event, this.getModeProps(this.props) as any);
+    this.getActiveMode().handleStopDragging(event, this.getModeProps(this.props));
   }
 
   onPointerMove(event: PointerMoveEvent): void {
     this.setState({lastPointerMoveEvent: event});
-    this.getActiveMode().handlePointerMove(event, this.getModeProps(this.props) as any);
+    this.getActiveMode().handlePointerMove(event, this.getModeProps(this.props));
   }
 
   getCursor({isDragging}: {isDragging: boolean}): null | 'grabbing' | 'grab' {

package/src/editable-layers/selection-layer.ts

@@ -7,7 +7,7 @@
 import type {CompositeLayerProps, DefaultProps} from '@deck.gl/core';
 import {CompositeLayer} from '@deck.gl/core';
 import {PolygonLayer} from '@deck.gl/layers';
-import {polygon} from '@turf/helpers';
+import {featureCollection, polygon} from '@turf/helpers';
 import turfBuffer from '@turf/buffer';
 import turfDifference from '@turf/difference';
 
@@ -32,7 +32,7 @@ const MODE_CONFIG_MAP = {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-interface SelectionLayerProps<DataT> extends CompositeLayerProps {
+export interface SelectionLayerProps<DataT> extends CompositeLayerProps {
   layerIds: any[];
   onSelect: (info: any) => any;
   selectionType: string | null;
@@ -121,7 +121,7 @@ export class SelectionLayer<DataT, ExtraPropsT> extends CompositeLayer<
     try {
       // turfDifference throws an exception if the polygon
       // intersects with itself (TODO: check if true in all versions)
-      bigPolygon = turfDifference(bigBuffer, landPointsPoly);
+      bigPolygon = turfDifference(featureCollection([bigBuffer, landPointsPoly]));
     } catch (e) {
       // invalid selection polygon
       console.log('turfDifference() error', e); // eslint-disable-line

package/src/index.ts

@@ -2,21 +2,6 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-export {ArrowStyles, DEFAULT_ARROWS, MAX_ARROWS} from './lib/style';
-export {SELECTION_TYPE} from './lib/deck-renderer/deck-drawer';
-
-export {Feature} from './lib/feature';
-export {LayerMouseEvent} from './lib/layer-mouse-event';
-
-export {NebulaLayer} from './lib/nebula-layer';
-export {JunctionsLayer} from './lib/layers/junctions-layer';
-export {TextsLayer} from './lib/layers/texts-layer';
-export {SegmentsLayer} from './lib/layers/segments-layer';
-
-export {NebulaCore} from './lib/nebula-core';
-
-export {PROJECTED_PIXEL_SIZE_MULTIPLIER} from './lib/constants';
-
 // Utils
 export {toDeckColor} from './utils/utils';
 
@@ -37,6 +22,9 @@ export type {
   EditModeTrayWidgetSelectEvent
 } from './widgets/edit-mode-tray-widget';
 
+export {EditorToolbarWidget} from './widgets/editor-toolbar-widget';
+export type {EditorToolbarWidgetProps, BooleanOperation} from './widgets/editor-toolbar-widget';
+
 // Layers move to deck.gl-community/layers?
 export {JunctionScatterplotLayer} from './editable-layers/junction-scatterplot-layer';
 
@@ -53,10 +41,12 @@ export type {GeoJsonEditModeType} from './edit-modes/geojson-edit-mode';
 export type {GeoJsonEditModeConstructor} from './edit-modes/geojson-edit-mode';
 
 export type {EditableGeoJsonLayerProps} from './editable-layers/editable-geojson-layer';
+export type {SelectionLayerProps} from './editable-layers/selection-layer';
 
 export {GeoJsonEditMode} from './edit-modes/geojson-edit-mode';
 
 // Alter modes
+export {DeleteMode} from './edit-modes/delete-mode';
 export {ModifyMode} from './edit-modes/modify-mode';
 export {ResizeCircleMode} from './edit-modes/resize-circle-mode';
 export {TranslateMode} from './edit-modes/translate-mode';
@@ -111,25 +101,18 @@ export type {
 
 export type {
   Position,
-  PointCoordinates,
-  LineStringCoordinates,
-  PolygonCoordinates,
-  MultiPointCoordinates,
-  MultiLineStringCoordinates,
-  MultiPolygonCoordinates,
-  AnyCoordinates,
+  SimpleFeature,
+  SimpleFeatureCollection,
+  SimpleGeometry,
+  SimpleGeometryCoordinates,
   Point,
   LineString,
   Polygon,
   MultiPoint,
   MultiLineString,
   MultiPolygon,
-  Geometry,
-  Polygonal,
-  BoundingBoxArray,
-  FeatureOf,
-  FeatureWithProps,
-  // Feature,
+  PolygonGeometry,
+  Feature,
   FeatureCollection,
   AnyGeoJson
 } from './utils/geojson-types';

package/src/mode-handlers/composite-mode-handler.ts

@@ -1,4 +1,4 @@
-import {FeatureCollection, Feature, Position} from '../utils/geojson-types';
+import {SimpleFeature, SimpleFeatureCollection, Position} from '../utils/geojson-types';
 import {
   ClickEvent,
   PointerMoveEvent,
@@ -35,7 +35,7 @@ export class CompositeModeHandler extends ModeHandler {
     return result;
   }
 
-  setFeatureCollection(featureCollection: FeatureCollection): void {
+  setFeatureCollection(featureCollection: SimpleFeatureCollection): void {
     this.handlers.forEach((handler) => handler.setFeatureCollection(featureCollection));
   }
 
@@ -69,7 +69,7 @@ export class CompositeModeHandler extends ModeHandler {
     return this._coalesce((handler) => handler.handleStopDragging(event));
   }
 
-  getTentativeFeature(): Feature | null | undefined {
+  getTentativeFeature(): SimpleFeature | null | undefined {
     return this._coalesce((handler) => handler.getTentativeFeature());
   }
 

package/src/mode-handlers/draw-90degree-polygon-handler.ts

@@ -76,7 +76,8 @@ export class Draw90DegreePolygonHandler extends ModeHandler {
         geometry: {
           type: 'LineString',
           coordinates: [...clickSequence, p3]
-        }
+        },
+        properties: {}
       });
     } else {
       // Draw a Polygon connecting all the clicked points with the hovered point
@@ -85,7 +86,8 @@ export class Draw90DegreePolygonHandler extends ModeHandler {
         geometry: {
           type: 'Polygon',
           coordinates: [[...clickSequence, p3, clickSequence[0]]]
-        }
+        },
+        properties: {}
       });
     }
 

package/src/mode-handlers/draw-circle-by-bounding-box-handler.ts

@@ -35,7 +35,6 @@ export class DrawCircleByBoundingBoxHandler extends TwoClickPolygonHandler {
     const firstClickedPoint = clickSequence[0];
     const centerCoordinates = getIntermediatePosition(firstClickedPoint, event.mapCoords);
     const radius = Math.max(distance(firstClickedPoint, centerCoordinates), 0.001);
-    // @ts-expect-error turf types diff
     this._setTentativeFeature(circle(centerCoordinates, radius, options));
 
     return result;

package/src/mode-handlers/draw-circle-from-center-handler.ts

@@ -34,7 +34,6 @@ export class DrawCircleFromCenterHandler extends TwoClickPolygonHandler {
 
     const centerCoordinates = clickSequence[0];
     const radius = Math.max(distance(centerCoordinates, event.mapCoords), 0.001);
-    // @ts-expect-error turf types diff
     this._setTentativeFeature(circle(centerCoordinates, radius, options));
 
     return result;

package/src/mode-handlers/draw-ellipse-by-bounding-box-handler.ts

@@ -37,8 +37,7 @@ export class DrawEllipseByBoundingBoxHandler extends TwoClickPolygonHandler {
 
     const xSemiAxis = Math.max(distance(point(polygonPoints[0]), point(polygonPoints[1])), 0.001);
     const ySemiAxis = Math.max(distance(point(polygonPoints[0]), point(polygonPoints[3])), 0.001);
-    // @ts-expect-error turf types diff
-    this._setTentativeFeature(ellipse(centerCoordinates, xSemiAxis, ySemiAxis));
+    this._setTentativeFeature(ellipse(centerCoordinates, xSemiAxis, ySemiAxis, {}));
 
     return result;
   }

package/src/mode-handlers/draw-ellipse-using-three-points-handler.ts

@@ -32,7 +32,8 @@ export class DrawEllipseUsingThreePointsHandler extends ThreeClickPolygonHandler
         geometry: {
           type: 'LineString',
           coordinates: [clickSequence[0], mapCoords]
-        }
+        },
+        properties: {}
       });
     } else if (clickSequence.length === 2) {
       const [p1, p2] = clickSequence;
@@ -41,7 +42,7 @@ export class DrawEllipseUsingThreePointsHandler extends ThreeClickPolygonHandler
       const xSemiAxis = Math.max(distance(centerCoordinates, point(mapCoords)), 0.001);
       const ySemiAxis = Math.max(distance(p1, p2), 0.001) / 2;
       const options = {angle: bearing(p1, p2)};
-      // @ts-expect-error turf types diff
+
       this._setTentativeFeature(ellipse(centerCoordinates, xSemiAxis, ySemiAxis, options));
     }
 

package/src/mode-handlers/draw-point-handler.ts

@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Geometry} from '../utils/geojson-types';
+import {SimpleGeometry} from '../utils/geojson-types';
 import {ClickEvent} from '../edit-modes/types';
 import {EditAction, ModeHandler} from './mode-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 export class DrawPointHandler extends ModeHandler {
   handleClick({mapCoords}: ClickEvent): EditAction | null | undefined {
-    const geometry: Geometry = {
+    const geometry: SimpleGeometry = {
       type: 'Point',
       coordinates: mapCoords
     };

package/src/mode-handlers/draw-polygon-handler.ts

@@ -107,7 +107,8 @@ export class DrawPolygonHandler extends ModeHandler {
         geometry: {
           type: 'LineString',
           coordinates: [...clickSequence, mapCoords]
-        }
+        },
+        properties: {}
       });
     } else {
       // Draw a Polygon connecting all the clicked points with the hovered point
@@ -116,7 +117,8 @@ export class DrawPolygonHandler extends ModeHandler {
         geometry: {
           type: 'Polygon',
           coordinates: [[...clickSequence, mapCoords, clickSequence[0]]]
-        }
+        },
+        properties: {}
       });
     }
 

package/src/mode-handlers/draw-rectangle-handler.ts

@@ -24,7 +24,6 @@ export class DrawRectangleHandler extends TwoClickPolygonHandler {
     const corner1 = clickSequence[0];
     const corner2 = event.mapCoords;
 
-    // @ts-expect-error turf type diff
     this._setTentativeFeature(bboxPolygon([corner1[0], corner1[1], corner2[0], corner2[1]]));
 
     return result;

package/src/mode-handlers/draw-rectangle-using-three-points-handler.ts

@@ -30,7 +30,8 @@ export class DrawRectangleUsingThreePointsHandler extends ThreeClickPolygonHandl
         geometry: {
           type: 'LineString',
           coordinates: [clickSequence[0], mapCoords]
-        }
+        },
+        properties: {}
       });
     } else if (clickSequence.length === 2) {
       const lineString: LineString = {
@@ -55,7 +56,8 @@ export class DrawRectangleUsingThreePointsHandler extends ThreeClickPolygonHandl
               p1
             ]
           ]
-        }
+        },
+        properties: {}
       });
     }
 

package/src/mode-handlers/mode-handler.ts

@@ -4,11 +4,21 @@
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 
+import {featureCollection as turfFeatureCollection} from '@turf/helpers';
 import turfUnion from '@turf/union';
 import turfDifference from '@turf/difference';
 import turfIntersect from '@turf/intersect';
 
-import {FeatureCollection, Feature, Polygon, Geometry, Position} from '../utils/geojson-types';
+import {
+  FeatureCollection,
+  Feature,
+  Polygon,
+  SimpleGeometry,
+  Position,
+  PolygonGeometry,
+  SimpleFeatureCollection,
+  SimpleFeature
+} from '../utils/geojson-types';
 
 import {
   ClickEvent,
@@ -29,7 +39,7 @@ export type EditHandle = {
 };
 
 export type EditAction = {
-  updatedData: FeatureCollection;
+  updatedData: SimpleFeatureCollection;
   editType: string;
   featureIndexes: number[];
   editContext: any;
@@ -38,12 +48,12 @@ export type EditAction = {
 export class ModeHandler {
   // TODO: add underscore
   featureCollection: ImmutableFeatureCollection = undefined!;
-  _tentativeFeature: Feature | null | undefined;
+  _tentativeFeature: SimpleFeature | null | undefined;
   _modeConfig: any = null;
   _selectedFeatureIndexes: number[] = [];
   _clickSequence: Position[] = [];
 
-  constructor(featureCollection?: FeatureCollection) {
+  constructor(featureCollection?: SimpleFeatureCollection) {
     if (featureCollection) {
       this.setFeatureCollection(featureCollection);
     }
@@ -57,14 +67,14 @@ export class ModeHandler {
     return this.featureCollection;
   }
 
-  getSelectedFeature(): Feature | null | undefined {
+  getSelectedFeature(): SimpleFeature | null | undefined {
     if (this._selectedFeatureIndexes.length === 1) {
       return this.featureCollection.getObject().features[this._selectedFeatureIndexes[0]];
     }
     return null;
   }
 
-  getSelectedGeometry(): Geometry | null | undefined {
+  getSelectedGeometry(): SimpleGeometry | null | undefined {
     const feature = this.getSelectedFeature();
     if (feature) {
       return feature.geometry;
@@ -72,7 +82,7 @@ export class ModeHandler {
     return null;
   }
 
-  getSelectedFeaturesAsFeatureCollection(): FeatureCollection {
+  getSelectedFeaturesAsFeatureCollection(): SimpleFeatureCollection {
     const {features} = this.featureCollection.getObject();
     const selectedFeatures = this.getSelectedFeatureIndexes().map(
       (selectedIndex) => features[selectedIndex]
@@ -83,7 +93,7 @@ export class ModeHandler {
     };
   }
 
-  setFeatureCollection(featureCollection: FeatureCollection): void {
+  setFeatureCollection(featureCollection: SimpleFeatureCollection): void {
     this.featureCollection = new ImmutableFeatureCollection(featureCollection);
   }
 
@@ -121,12 +131,12 @@ export class ModeHandler {
     this._clickSequence = [];
   }
 
-  getTentativeFeature(): Feature | null | undefined {
+  getTentativeFeature(): SimpleFeature | null | undefined {
     return this._tentativeFeature;
   }
 
   // TODO: remove the underscore
-  _setTentativeFeature(tentativeFeature: Feature | null | undefined): void {
+  _setTentativeFeature(tentativeFeature: SimpleFeature | null | undefined): void {
     this._tentativeFeature = tentativeFeature;
     if (!tentativeFeature) {
       // Reset the click sequence
@@ -154,7 +164,7 @@ export class ModeHandler {
     return selectedFeatureIndexes.some((index) => pickedIndexes.includes(index));
   }
 
-  getAddFeatureAction(geometry: Geometry): EditAction {
+  getAddFeatureAction(geometry: SimpleGeometry): EditAction {
     // Unsure why flow can't deal with Geometry type, but there I fixed it
     const geometryAsAny: any = geometry;
 
@@ -218,21 +228,25 @@ export class ModeHandler {
         return null;
       }
 
-      const feature = {
+      const feature: Feature<Polygon> = {
         type: 'Feature',
-        geometry
+        geometry,
+        properties: {}
       };
 
       let updatedGeometry;
       if (modeConfig.booleanOperation === 'union') {
-        // @ts-expect-error turf types diff
-        updatedGeometry = turfUnion(selectedFeature, feature);
+        updatedGeometry = turfUnion(
+          turfFeatureCollection([selectedFeature as Feature<PolygonGeometry>, feature])
+        );
       } else if (modeConfig.booleanOperation === 'difference') {
-        // @ts-expect-error turf type diff
-        updatedGeometry = turfDifference(selectedFeature, feature);
+        updatedGeometry = turfDifference(
+          turfFeatureCollection([selectedFeature as Feature<PolygonGeometry>, feature])
+        );
       } else if (modeConfig.booleanOperation === 'intersection') {
-        // @ts-expect-error turf type diff
-        updatedGeometry = turfIntersect(selectedFeature, feature);
+        updatedGeometry = turfIntersect(
+          turfFeatureCollection([selectedFeature as Feature<PolygonGeometry>, feature])
+        );
       } else {
         // eslint-disable-next-line no-console,no-undef
         console.warn(`Invalid booleanOperation ${modeConfig.booleanOperation}`);
@@ -307,7 +321,7 @@ export function getIntermediatePosition(position1: Position, position2: Position
 }
 
 export function getEditHandlesForGeometry(
-  geometry: Geometry,
+  geometry: SimpleGeometry,
   featureIndex: number,
   editHandleType: EditHandleType = 'existing'
 ): EditHandle[] {

package/src/mode-handlers/modify-handler.ts

@@ -4,7 +4,7 @@
 
 import nearestPointOnLine from '@turf/nearest-point-on-line';
 import {point, lineString as toLineString} from '@turf/helpers';
-import {Position, FeatureOf, Point, LineString} from '../utils/geojson-types';
+import {Position, Feature, Point, LineString} from '../utils/geojson-types';
 import {
   recursivelyTraverseNestedArrays,
   nearestPointOnProjectedLine,
@@ -66,7 +66,6 @@ export class ModifyHandler extends ModeHandler {
             const lineStringFeature = toLineString(lineString);
 
             const candidateIntermediatePoint = this.nearestPointOnLine(
-              // @ts-expect-error turf type diff
               lineStringFeature,
               referencePoint
             );
@@ -102,7 +101,7 @@ export class ModifyHandler extends ModeHandler {
   }
 
   // turf.js does not support elevation for nearestPointOnLine
-  nearestPointOnLine(line: FeatureOf<LineString>, inPoint: FeatureOf<Point>): NearestPointType {
+  nearestPointOnLine(line: Feature<LineString>, inPoint: Feature<Point>): NearestPointType {
     const {coordinates} = line.geometry;
     if (coordinates.some((coord) => coord.length > 2)) {
       const modeConfig = this.getModeConfig();
@@ -115,7 +114,6 @@ export class ModifyHandler extends ModeHandler {
         'Editing 3D point but modeConfig.viewport not provided. Falling back to 2D logic.'
       );
     }
-    // @ts-expect-error geojson types diff
     return nearestPointOnLine(line, inPoint);
   }
 

package/src/mode-handlers/rotate-handler.ts

@@ -5,14 +5,14 @@
 import turfCentroid from '@turf/centroid';
 import turfBearing from '@turf/bearing';
 import turfTransformRotate from '@turf/transform-rotate';
-import {FeatureCollection, Position} from '../utils/geojson-types';
+import {SimpleFeatureCollection, Position} from '../utils/geojson-types';
 import {PointerMoveEvent, StartDraggingEvent, StopDraggingEvent} from '../edit-modes/types';
 import {EditAction, ModeHandler} from './mode-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 export class RotateHandler extends ModeHandler {
   _isRotatable: boolean = undefined!;
-  _geometryBeingRotated: FeatureCollection | null | undefined;
+  _geometryBeingRotated: SimpleFeatureCollection | null | undefined;
 
   handlePointerMove(event: PointerMoveEvent): {
     editAction: EditAction | null | undefined;
@@ -66,17 +66,10 @@ export class RotateHandler extends ModeHandler {
 
   getRotateAction(startDragPoint: Position, currentPoint: Position, editType: string): EditAction {
     const startPosition = startDragPoint;
-    // @ts-expect-error turf types diff
     const centroid = turfCentroid(this._geometryBeingRotated);
-    // @ts-expect-error turf types diff
-    const angle = getRotationAngle(centroid, startPosition, currentPoint);
-
-    // @ts-expect-error turf type diff
-    const rotatedFeatures: FeatureCollection = turfTransformRotate(
-      // @ts-expect-error turf type diff
-      this._geometryBeingRotated,
-      angle
-    );
+    const angle = getRotationAngle(centroid.geometry.coordinates, startPosition, currentPoint);
+
+    const rotatedFeatures = turfTransformRotate(this._geometryBeingRotated, angle);
 
     let updatedData = this.getImmutableFeatureCollection();
 

package/src/mode-handlers/scale-handler.ts

@@ -5,14 +5,14 @@
 import turfCentroid from '@turf/centroid';
 import turfDistance from '@turf/distance';
 import turfTransformScale from '@turf/transform-scale';
-import {FeatureCollection, Position} from '../utils/geojson-types';
+import {SimpleFeatureCollection, Position, SimpleGeometry} from '../utils/geojson-types';
 import {PointerMoveEvent, StartDraggingEvent, StopDraggingEvent} from '../edit-modes/types';
 import {EditAction, ModeHandler} from './mode-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 export class ScaleHandler extends ModeHandler {
   _isScalable: boolean = undefined!;
-  _geometryBeingScaled: FeatureCollection | null | undefined;
+  _geometryBeingScaled: SimpleFeatureCollection | null | undefined;
 
   handlePointerMove(event: PointerMoveEvent): {
     editAction: EditAction | null | undefined;
@@ -66,19 +66,11 @@ export class ScaleHandler extends ModeHandler {
 
   getScaleAction(startDragPoint: Position, currentPoint: Position, editType: string): EditAction {
     const startPosition = startDragPoint;
-    // @ts-expect-error turf types diff
     const centroid = turfCentroid(this._geometryBeingScaled);
-    // @ts-expect-error turf types diff
-    const factor = getScaleFactor(centroid, startPosition, currentPoint);
-    // @ts-expect-error turf type diff
-    const scaledFeatures: FeatureCollection = turfTransformScale(
-      // @ts-expect-error turf type diff
-      this._geometryBeingScaled,
-      factor,
-      {
-        origin: centroid
-      }
-    );
+    const factor = getScaleFactor(centroid.geometry.coordinates, startPosition, currentPoint);
+    const scaledFeatures = turfTransformScale(this._geometryBeingScaled, factor, {
+      origin: centroid
+    });
 
     let updatedData = this.getImmutableFeatureCollection();