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

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,12 @@
 
 // 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 +30,7 @@ export type EditHandle = {
 };
 
 export type EditAction = {
-  updatedData: FeatureCollection;
+  updatedData: SimpleFeatureCollection;
   editType: string;
   featureIndexes: number[];
   editContext: any;
@@ -38,12 +39,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 +58,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,8 +73,8 @@ export class ModeHandler {
     return null;
   }
 
-  getSelectedFeaturesAsFeatureCollection(): FeatureCollection {
-    const {features} = this.featureCollection.getObject();
+  getSelectedFeaturesAsFeatureCollection(): SimpleFeatureCollection {
+    const { features } = this.featureCollection.getObject();
     const selectedFeatures = this.getSelectedFeatureIndexes().map(
       (selectedIndex) => features[selectedIndex]
     );
@@ -83,7 +84,7 @@ export class ModeHandler {
     };
   }
 
-  setFeatureCollection(featureCollection: FeatureCollection): void {
+  setFeatureCollection(featureCollection: SimpleFeatureCollection): void {
     this.featureCollection = new ImmutableFeatureCollection(featureCollection);
   }
 
@@ -121,12 +122,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 +155,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 +219,19 @@ 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 +306,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,14 +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);
+    const angle = getRotationAngle(centroid.geometry.coordinates, startPosition, currentPoint);
 
-    // @ts-expect-error turf type diff
-    const rotatedFeatures: FeatureCollection = turfTransformRotate(
-      // @ts-expect-error turf type diff
+    const rotatedFeatures = turfTransformRotate(
       this._geometryBeingRotated,
       angle
     );

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,13 +66,9 @@ 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
+    const factor = getScaleFactor(centroid.geometry.coordinates, startPosition, currentPoint);
+    const scaledFeatures = turfTransformScale(
       this._geometryBeingScaled,
       factor,
       {

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Feature, FeatureCollection, Position} from '../utils/geojson-types';
+import {SimpleFeature, SimpleFeatureCollection, Position} from '../utils/geojson-types';
 import {PointerMoveEvent, StartDraggingEvent, StopDraggingEvent} from '../edit-modes/types';
 import {
   EditHandle,
@@ -25,7 +25,7 @@ export class SnappableHandler extends ModeHandler {
     this._handler = handler;
   }
 
-  setFeatureCollection(featureCollection: FeatureCollection): void {
+  setFeatureCollection(featureCollection: SimpleFeatureCollection): void {
     this._handler.setFeatureCollection(featureCollection);
   }
 
@@ -88,7 +88,7 @@ export class SnappableHandler extends ModeHandler {
   // 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(): Feature[] {
+  _getSnapTargets(): SimpleFeature[] {
     let {additionalSnapTargets} = this.getModeConfig() || {};
     additionalSnapTargets = additionalSnapTargets || [];
 

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

@@ -6,16 +6,16 @@ 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 {lineString} from '@turf/helpers';
+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/utils';
 import {EditAction, ModeHandler} from './mode-handler';
 import {ClickEvent, PointerMoveEvent} from '../edit-modes/types';
+import {PolygonGeometry} from '../utils/geojson-types';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 export class SplitPolygonHandler extends ModeHandler {
@@ -33,7 +33,7 @@ export class SplitPolygonHandler extends ModeHandler {
 
       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);
@@ -120,7 +120,8 @@ export class SplitPolygonHandler extends ModeHandler {
       geometry: {
         type: 'LineString',
         coordinates: [...clickSequence, this.calculateMapCoords(clickSequence, mapCoords)]
-      }
+      },
+      properties: {}
     });
 
     return result;
@@ -138,10 +139,8 @@ export class SplitPolygonHandler extends ModeHandler {
       gap = 0.1;
       units = 'centimeters';
     }
-    // @ts-expect-error turf type diff
     const buffer = turfBuffer(tentativeFeature, gap, {units});
-    // @ts-expect-error turf type diff
-    const updatedGeometry = turfDifference(selectedGeometry, buffer);
+    const updatedGeometry = turfDifference(featureCollection([turfFeature(selectedGeometry as PolygonGeometry), buffer]));
     this._setTentativeFeature(null);
     if (!updatedGeometry) {
       // eslint-disable-next-line no-console,no-undef

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

@@ -6,13 +6,13 @@ import turfBearing from '@turf/bearing';
 import turfDistance from '@turf/distance';
 import turfTransformTranslate from '@turf/transform-translate';
 import {point} from '@turf/helpers';
-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 TranslateHandler extends ModeHandler {
-  _geometryBeforeTranslate: FeatureCollection | null | undefined;
+  _geometryBeforeTranslate: SimpleFeatureCollection | null | undefined;
   _isTranslatable: boolean = undefined!;
 
   handlePointerMove(event: PointerMoveEvent): {
@@ -87,9 +87,7 @@ export class TranslateHandler extends ModeHandler {
     const distanceMoved = turfDistance(p1, p2);
     const direction = turfBearing(p1, p2);
 
-    // @ts-expect-error turf type diff
-    const movedFeatures: FeatureCollection = turfTransformTranslate(
-      // @ts-expect-error turf type diff
+    const movedFeatures: SimpleFeatureCollection = turfTransformTranslate(
       this._geometryBeforeTranslate,
       distanceMoved,
       direction

package/src/utils/geojson-types.ts

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-// Geometry types
-
 import type {
   Point,
   LineString,
@@ -11,64 +9,27 @@ import type {
   MultiPoint,
   MultiLineString,
   MultiPolygon,
-  Position
+  Position,
+  Feature,
+  FeatureCollection,
 } from 'geojson';
 
-export {Point, LineString, Polygon, MultiPoint, MultiLineString, MultiPolygon, Position};
-
-export type PointCoordinates = Position;
-export type LineStringCoordinates = Position[];
-export type PolygonCoordinates = Position[][];
-export type MultiPointCoordinates = Position[];
-export type MultiLineStringCoordinates = Position[][];
-export type MultiPolygonCoordinates = Position[][][];
-
-export type AnyCoordinates =
-  | PointCoordinates
-  | LineStringCoordinates
-  | PolygonCoordinates
-  | MultiPointCoordinates
-  | MultiLineStringCoordinates
-  | MultiPolygonCoordinates;
-
-export type Geometry = Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon;
-
-export type Polygonal = Polygon | MultiPolygon;
-
-// Feature types
+export { Point, LineString, Polygon, MultiPoint, MultiLineString, MultiPolygon, Position, Feature, FeatureCollection };
 
-export type BoundingBoxArray = [number, number, number, number];
+/** Simple geometries (excludes GeometryCollection) */
+export type SimpleGeometry = Point | LineString | Polygon | MultiPoint | MultiLineString | MultiPolygon;
 
-export type FeatureOf<T extends Geometry> = {
-  type: 'Feature';
-  geometry: T;
-  properties?: {
-    [key: string]: any;
-  };
-  id?: string | number;
-  bbox?: BoundingBoxArray;
-};
+/** Feature with any geometry except GeometryCollection */
+export type SimpleFeature = Feature<SimpleGeometry>
 
-export type FeatureWithProps<T extends Geometry, P> = {
-  type: 'Feature';
-  geometry: T;
-  properties: P;
-};
+/** FeatureCollection with any geometries except GeometryCollection */
+export type SimpleFeatureCollection = FeatureCollection<SimpleGeometry>
 
-export type Feature =
-  | FeatureOf<Point>
-  | FeatureOf<LineString>
-  | FeatureOf<Polygon>
-  | FeatureOf<MultiPoint>
-  | FeatureOf<MultiLineString>
-  | FeatureOf<MultiPolygon>;
+/** Coordinates of any geometry except GeometryCollection */
+export type SimpleGeometryCoordinates = SimpleGeometry['coordinates']
 
-export type FeatureCollection = {
-  type: 'FeatureCollection';
-  features: Feature[];
-  properties?: {};
-  id?: string | number;
-  bbox?: BoundingBoxArray;
-};
+/** Polygon and MultiPolygon geometries */
+export type PolygonGeometry = Polygon | MultiPolygon;
 
+/** A Feature or FeatureCollection */
 export type AnyGeoJson = Feature | FeatureCollection;

package/src/utils/translate-from-center.ts

@@ -6,35 +6,30 @@ import turfCenter from '@turf/center';
 import turfRhumbBearing from '@turf/rhumb-bearing';
 import turfRhumbDistance from '@turf/rhumb-distance';
 import turfRhumbDestination from '@turf/rhumb-destination';
-import type {
-  Position as TurfPosition,
-  Feature as TurfFeature,
-  Geometry as TurfGeometry
-} from '@turf/helpers';
 import {mapCoords} from '../edit-modes/utils';
-import type {AnyCoordinates /* , Position */} from './geojson-types';
+import type {SimpleFeature} from './geojson-types';
 
 // This function takes feature's center, moves it,
 // and builds new feature around it keeping the proportions
 export function translateFromCenter(
-  feature: TurfFeature<TurfGeometry>,
+  feature: SimpleFeature,
   distance: number,
   direction: number
 ) {
-  const initialCenterPoint = turfCenter(feature as TurfFeature);
+  const initialCenterPoint = turfCenter(feature);
 
   const movedCenterPoint = turfRhumbDestination(initialCenterPoint, distance, direction);
 
   const movedCoordinates = mapCoords(
-    feature.geometry.coordinates as AnyCoordinates,
+    feature.geometry.coordinates,
     (coordinate) => {
       const rhumbDistance = turfRhumbDistance(
         initialCenterPoint.geometry.coordinates,
-        coordinate as TurfPosition
+        coordinate
       );
       const rhumbDirection = turfRhumbBearing(
         initialCenterPoint.geometry.coordinates,
-        coordinate as TurfPosition
+        coordinate
       );
 
       const movedPosition = turfRhumbDestination(

package/src/utils/utils.ts

@@ -7,12 +7,12 @@ import bearing from '@turf/bearing';
 import pointToLineDistance from '@turf/point-to-line-distance';
 import {point} from '@turf/helpers';
 import {WebMercatorViewport} from 'viewport-mercator-project';
-import {FeatureOf, FeatureWithProps, LineString, Point, Position} from './geojson-types';
+import {Feature, LineString, Point, Position} from './geojson-types';
 import {Viewport} from './types';
 
 // TODO edit-modes: delete and use edit-modes/utils instead
 
-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,
@@ -106,8 +106,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);

package/dist/lib/constants.d.ts

@@ -1,7 +0,0 @@
-/**
- * A multiplier for screen-space width/scale for Arc, Line, Icon and Text layers.
- * Required in order to maintain the same appearance after upgrading to deck.gl v8.5.
- * https://github.com/visgl/deck.gl/blob/master/docs/upgrade-guide.md
- */
-export declare const PROJECTED_PIXEL_SIZE_MULTIPLIER: number;
-//# sourceMappingURL=constants.d.ts.map

package/dist/lib/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/lib/constants.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,QAAQ,CAAC"}

package/dist/lib/constants.js

@@ -1,10 +0,0 @@
-// deck.gl-community
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-/**
- * A multiplier for screen-space width/scale for Arc, Line, Icon and Text layers.
- * Required in order to maintain the same appearance after upgrading to deck.gl v8.5.
- * https://github.com/visgl/deck.gl/blob/master/docs/upgrade-guide.md
- */
-export const PROJECTED_PIXEL_SIZE_MULTIPLIER = 2 / 3;
-//# sourceMappingURL=constants.js.map

package/dist/lib/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/lib/constants.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,+BAA+B;AAC/B,oCAAoC;AAEpC;;;;GAIG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,GAAG,CAAC,CAAC"}

package/dist/lib/deck-renderer/deck-cache.d.ts

@@ -1,15 +0,0 @@
-export declare class DeckCache<TORIG, TCONV> {
-    objects: TCONV[];
-    originals: TORIG[];
-    updateTrigger: number;
-    _idToPosition: Map<string, number>;
-    _getData: () => TORIG[];
-    _convert: (arg0: TORIG) => TCONV;
-    constructor(getData: () => TORIG[], convert: (arg0: TORIG) => TCONV);
-    updateAllDeckObjects(): void;
-    updateDeckObjectsByIds(ids: string[]): void;
-    triggerUpdate(): void;
-    getDeckObjectById(id: string): TCONV | null | undefined;
-    getOriginalById(id: string): TORIG | null | undefined;
-}
-//# sourceMappingURL=deck-cache.d.ts.map

package/dist/lib/deck-renderer/deck-cache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deck-cache.d.ts","sourceRoot":"","sources":["../../../src/lib/deck-renderer/deck-cache.ts"],"names":[],"mappings":"AAAA,qBAAa,SAAS,CAAC,KAAK,EAAE,KAAK;IACjC,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,SAAS,EAAE,KAAK,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,KAAK,EAAE,CAAC;IACxB,QAAQ,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,KAAK,CAAC;gBAErB,OAAO,EAAE,MAAM,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,KAAK;IAUnE,oBAAoB;IAgBpB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE;IAapC,aAAa;IAIb,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,GAAG,SAAS;IAKvD,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,GAAG,SAAS;CAItD"}