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

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

@@ -1,11 +1,15 @@
-import { Polygon, Position } from '../geojson-types';
-import { ClickEvent, PointerMoveEvent } from '../edit-modes/types';
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import {Polygon, Position} from '../utils/geojson-types';
+import {ClickEvent, PointerMoveEvent} from '../edit-modes/types';
 import {
   EditAction,
   EditHandle,
   ModeHandler,
   getPickedEditHandle,
-  getEditHandlesForGeometry,
+  getEditHandlesForGeometry
 } from './mode-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
@@ -31,7 +35,7 @@ export class DrawPolygonHandler extends ModeHandler {
   handleClick(event: ClickEvent): EditAction | null | undefined {
     super.handleClick(event);
 
-    const { picks } = event;
+    const {picks} = event;
     const tentativeFeature = this.getTentativeFeature();
 
     let editAction: EditAction | null | undefined = null;
@@ -58,7 +62,7 @@ export class DrawPolygonHandler extends ModeHandler {
         // Remove the hovered position
         const polygonToAdd: Polygon = {
           type: 'Polygon',
-          coordinates: [[...polygon.coordinates[0].slice(0, -2), polygon.coordinates[0][0]]],
+          coordinates: [[...polygon.coordinates[0].slice(0, -2), polygon.coordinates[0][0]]]
         };
 
         this.resetClickSequence();
@@ -76,7 +80,7 @@ export class DrawPolygonHandler extends ModeHandler {
       pointerDownPicks: null,
       pointerDownScreenCoords: null,
       pointerDownMapCoords: null,
-      sourceEvent: null,
+      sourceEvent: null
     } as unknown as PointerMoveEvent;
 
     this.handlePointerMove(fakePointerMoveEvent);
@@ -84,12 +88,12 @@ export class DrawPolygonHandler extends ModeHandler {
     return editAction;
   }
 
-  handlePointerMove({ mapCoords }: PointerMoveEvent): {
+  handlePointerMove({mapCoords}: PointerMoveEvent): {
     editAction: EditAction | null | undefined;
     cancelMapPan: boolean;
   } {
     const clickSequence = this.getClickSequence();
-    const result = { editAction: null, cancelMapPan: false };
+    const result = {editAction: null, cancelMapPan: false};
 
     if (clickSequence.length === 0) {
       // nothing to do yet
@@ -102,8 +106,8 @@ export class DrawPolygonHandler extends ModeHandler {
         type: 'Feature',
         geometry: {
           type: 'LineString',
-          coordinates: [...clickSequence, mapCoords],
-        },
+          coordinates: [...clickSequence, mapCoords]
+        }
       });
     } else {
       // Draw a Polygon connecting all the clicked points with the hovered point
@@ -111,8 +115,8 @@ export class DrawPolygonHandler extends ModeHandler {
         type: 'Feature',
         geometry: {
           type: 'Polygon',
-          coordinates: [[...clickSequence, mapCoords, clickSequence[0]]],
-        },
+          coordinates: [[...clickSequence, mapCoords, clickSequence[0]]]
+        }
       });
     }
 

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

@@ -1,7 +1,11 @@
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import bboxPolygon from '@turf/bbox-polygon';
-import { PointerMoveEvent } from '../edit-modes/types';
-import { EditAction } from './mode-handler';
-import { TwoClickPolygonHandler } from './two-click-polygon-handler';
+import {PointerMoveEvent} from '../edit-modes/types';
+import {EditAction} from './mode-handler';
+import {TwoClickPolygonHandler} from './two-click-polygon-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 export class DrawRectangleHandler extends TwoClickPolygonHandler {
@@ -9,7 +13,7 @@ export class DrawRectangleHandler extends TwoClickPolygonHandler {
     editAction: EditAction | null | undefined;
     cancelMapPan: boolean;
   } {
-    const result = { editAction: null, cancelMapPan: false };
+    const result = {editAction: null, cancelMapPan: false};
     const clickSequence = this.getClickSequence();
 
     if (clickSequence.length === 0) {

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

@@ -1,8 +1,12 @@
-import { LineString } from '../geojson-types';
-import { generatePointsParallelToLinePoints } from '../utils';
-import { PointerMoveEvent } from '../edit-modes/types';
-import { EditAction } from './mode-handler';
-import { ThreeClickPolygonHandler } from './three-click-polygon-handler';
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import {LineString} from '../utils/geojson-types';
+import {generatePointsParallelToLinePoints} from '../utils/utils';
+import {PointerMoveEvent} from '../edit-modes/types';
+import {EditAction} from './mode-handler';
+import {ThreeClickPolygonHandler} from './three-click-polygon-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 export class DrawRectangleUsingThreePointsHandler extends ThreeClickPolygonHandler {
@@ -10,7 +14,7 @@ export class DrawRectangleUsingThreePointsHandler extends ThreeClickPolygonHandl
     editAction: EditAction | null | undefined;
     cancelMapPan: boolean;
   } {
-    const result = { editAction: null, cancelMapPan: false };
+    const result = {editAction: null, cancelMapPan: false};
     const clickSequence = this.getClickSequence();
 
     if (clickSequence.length === 0) {
@@ -25,13 +29,13 @@ export class DrawRectangleUsingThreePointsHandler extends ThreeClickPolygonHandl
         type: 'Feature',
         geometry: {
           type: 'LineString',
-          coordinates: [clickSequence[0], mapCoords],
-        },
+          coordinates: [clickSequence[0], mapCoords]
+        }
       });
     } else if (clickSequence.length === 2) {
       const lineString: LineString = {
         type: 'LineString',
-        coordinates: clickSequence,
+        coordinates: clickSequence
       };
       const [p1, p2] = clickSequence;
       const [p3, p4] = generatePointsParallelToLinePoints(p1, p2, mapCoords);
@@ -48,10 +52,10 @@ export class DrawRectangleUsingThreePointsHandler extends ThreeClickPolygonHandl
               ...lineString.coordinates,
               p3,
               p4,
-              p1,
-            ],
-          ],
-        },
+              p1
+            ]
+          ]
+        }
       });
     }
 

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

@@ -1,6 +1,10 @@
-import { StartDraggingEvent } from '../edit-modes/types';
-import { EditAction } from './mode-handler';
-import { TranslateHandler } from './translate-handler';
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import {StartDraggingEvent} from '../edit-modes/types';
+import {EditAction} from './mode-handler';
+import {TranslateHandler} from './translate-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 export class DuplicateHandler extends TranslateHandler {
@@ -16,7 +20,7 @@ export class DuplicateHandler extends TranslateHandler {
       : null;
   }
 
-  getCursor({ isDragging }: { isDragging: boolean }): string {
+  getCursor({isDragging}: {isDragging: boolean}): string {
     if (this._isTranslatable) {
       return 'copy';
     }

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

@@ -1,12 +1,16 @@
-import { Position } from '../geojson-types';
-import { PointerMoveEvent, StopDraggingEvent } from '../edit-modes/types';
-import { EditAction, getPickedEditHandle } from './mode-handler';
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 
-import { ModifyHandler } from './modify-handler';
+import {Position} from '../utils/geojson-types';
+import {PointerMoveEvent, StopDraggingEvent} from '../edit-modes/types';
+import {EditAction, getPickedEditHandle} from './mode-handler';
+
+import {ModifyHandler} from './modify-handler';
 
 function defaultCalculateElevationChange({
   pointerDownScreenCoords,
-  screenCoords,
+  screenCoords
 }: {
   pointerDownScreenCoords: Position;
   screenCoords: Position;
@@ -27,7 +31,7 @@ export class ElevationHandler extends ModifyHandler {
     const {
       minElevation = 0,
       maxElevation = 20000,
-      calculateElevationChange = defaultCalculateElevationChange,
+      calculateElevationChange = defaultCalculateElevationChange
     } = this._modeConfig || {};
 
     // $FlowFixMe - really, I know it has something at index 2
@@ -36,13 +40,13 @@ export class ElevationHandler extends ModifyHandler {
     // calculateElevationChange is configurable becase (at this time) modes are not aware of the viewport
     elevation += calculateElevationChange({
       pointerDownScreenCoords: event.pointerDownScreenCoords,
-      screenCoords: event.screenCoords,
+      screenCoords: event.screenCoords
     });
     elevation = Math.min(elevation, maxElevation);
     elevation = Math.max(elevation, minElevation);
 
     return Object.assign({}, event, {
-      mapCoords: [position[0], position[1], elevation],
+      mapCoords: [position[0], position[1], elevation]
     });
   }
 
@@ -61,7 +65,7 @@ export class ElevationHandler extends ModifyHandler {
     return super.handleStopDragging(this.makeElevatedEvent(event, position));
   }
 
-  getCursor(params: { isDragging: boolean }): string {
+  getCursor(params: {isDragging: boolean}): string {
     let cursor = super.getCursor(params);
     if (cursor === 'cell') {
       cursor = 'ns-resize';
@@ -73,7 +77,7 @@ export class ElevationHandler extends ModifyHandler {
     viewport: any,
     {
       pointerDownScreenCoords,
-      screenCoords,
+      screenCoords
     }: {
       pointerDownScreenCoords: Position;
       screenCoords: Position;

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

@@ -1,9 +1,13 @@
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import bearing from '@turf/bearing';
-import { generatePointsParallelToLinePoints } from '../utils';
-import { PointerMoveEvent, StartDraggingEvent, StopDraggingEvent } from '../edit-modes/types';
-import { EditAction, getPickedEditHandle } from './mode-handler';
+import {generatePointsParallelToLinePoints} from '../utils/utils';
+import {PointerMoveEvent, StartDraggingEvent, StopDraggingEvent} from '../edit-modes/types';
+import {EditAction, getPickedEditHandle} from './mode-handler';
 
-import { ModifyHandler } from './modify-handler';
+import {ModifyHandler} from './modify-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
 export class ExtrudeHandler extends ModifyHandler {
@@ -48,8 +52,8 @@ export class ExtrudeHandler extends ModifyHandler {
           featureIndexes: [editHandle.featureIndex],
           editContext: {
             positionIndexes: this.nextPositionIndexes(editHandle.positionIndexes, size),
-            position: p3,
-          },
+            position: p3
+          }
         };
       }
     }
@@ -57,7 +61,7 @@ export class ExtrudeHandler extends ModifyHandler {
     // Cancel map panning if pointer went down on an edit handle
     const cancelMapPan = Boolean(editHandle);
 
-    return { editAction, cancelMapPan };
+    return {editAction, cancelMapPan};
   }
 
   handleStartDragging(event: StartDraggingEvent): EditAction | null | undefined {
@@ -108,8 +112,8 @@ export class ExtrudeHandler extends ModifyHandler {
           featureIndexes: [editHandle.featureIndex],
           editContext: {
             positionIndexes: editHandle.positionIndexes,
-            position: p1,
-          },
+            position: p1
+          }
         };
       }
     }
@@ -153,8 +157,8 @@ export class ExtrudeHandler extends ModifyHandler {
           featureIndexes: [editHandle.featureIndex],
           editContext: {
             positionIndexes: editHandle.positionIndexes,
-            position: p3,
-          },
+            position: p3
+          }
         };
       }
     }

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

@@ -1,25 +1,23 @@
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // TODO edit-modes: delete handlers once EditMode fully implemented
 
 import turfUnion from '@turf/union';
 import turfDifference from '@turf/difference';
 import turfIntersect from '@turf/intersect';
 
-import {
-  FeatureCollection,
-  Feature,
-  Polygon,
-  Geometry,
-  Position,
-} from '../geojson-types';
+import {FeatureCollection, Feature, Polygon, Geometry, Position} from '../utils/geojson-types';
 
 import {
   ClickEvent,
   Pick,
   PointerMoveEvent,
   StartDraggingEvent,
-  StopDraggingEvent,
+  StopDraggingEvent
 } from '../edit-modes/types';
-import { ImmutableFeatureCollection } from '../edit-modes/immutable-feature-collection';
+import {ImmutableFeatureCollection} from '../edit-modes/immutable-feature-collection';
 
 export type EditHandleType = 'existing' | 'intermediate' | 'snap';
 
@@ -75,13 +73,13 @@ export class ModeHandler {
   }
 
   getSelectedFeaturesAsFeatureCollection(): FeatureCollection {
-    const { features } = this.featureCollection.getObject();
+    const {features} = this.featureCollection.getObject();
     const selectedFeatures = this.getSelectedFeatureIndexes().map(
       (selectedIndex) => features[selectedIndex]
     );
     return {
       type: 'FeatureCollection',
-      features: selectedFeatures,
+      features: selectedFeatures
     };
   }
 
@@ -145,13 +143,13 @@ export class ModeHandler {
     return [];
   }
 
-  getCursor({ isDragging }: { isDragging: boolean }): string {
+  getCursor({isDragging}: {isDragging: boolean}): string {
     return 'cell';
   }
 
   isSelectionPicked(picks: Pick[]): boolean {
     if (!picks.length) return false;
-    const pickedIndexes = picks.map(({ index }) => index);
+    const pickedIndexes = picks.map(({index}) => index);
     const selectedFeatureIndexes = this.getSelectedFeatureIndexes();
     return selectedFeatureIndexes.some((index) => pickedIndexes.includes(index));
   }
@@ -164,7 +162,7 @@ export class ModeHandler {
       .addFeature({
         type: 'Feature',
         properties: {},
-        geometry: geometryAsAny,
+        geometry: geometryAsAny
       })
       .getObject();
 
@@ -173,8 +171,8 @@ export class ModeHandler {
       editType: 'addFeature',
       featureIndexes: [updatedData.features.length - 1],
       editContext: {
-        featureIndexes: [updatedData.features.length - 1],
-      },
+        featureIndexes: [updatedData.features.length - 1]
+      }
     };
   }
 
@@ -184,12 +182,12 @@ export class ModeHandler {
     const initialIndex = updatedData.getObject().features.length;
     const updatedIndexes: number[] = [];
     for (const feature of features) {
-      const { properties, geometry } = feature;
+      const {properties, geometry} = feature;
       const geometryAsAny: any = geometry;
       updatedData = updatedData.addFeature({
         type: 'Feature',
         properties,
-        geometry: geometryAsAny,
+        geometry: geometryAsAny
       });
       updatedIndexes.push(initialIndex + updatedIndexes.length);
     }
@@ -199,8 +197,8 @@ export class ModeHandler {
       editType: 'addFeature',
       featureIndexes: updatedIndexes,
       editContext: {
-        featureIndexes: updatedIndexes,
-      },
+        featureIndexes: updatedIndexes
+      }
     };
   }
 
@@ -222,7 +220,7 @@ export class ModeHandler {
 
       const feature = {
         type: 'Feature',
-        geometry,
+        geometry
       };
 
       let updatedGeometry;
@@ -258,8 +256,8 @@ export class ModeHandler {
         editType: 'unionGeometry',
         featureIndexes: [featureIndex],
         editContext: {
-          featureIndexes: [featureIndex],
-        },
+          featureIndexes: [featureIndex]
+        }
       };
 
       return editAction;
@@ -277,7 +275,7 @@ export class ModeHandler {
     editAction: EditAction | null | undefined;
     cancelMapPan: boolean;
   } {
-    return { editAction: null, cancelMapPan: false };
+    return {editAction: null, cancelMapPan: false};
   }
 
   handleStartDragging(event: StartDraggingEvent): EditAction | null | undefined {
@@ -302,7 +300,7 @@ export function getPickedEditHandle(
 export function getIntermediatePosition(position1: Position, position2: Position): Position {
   const intermediatePosition: Position = [
     (position1[0] + position2[0]) / 2.0,
-    (position1[1] + position2[1]) / 2.0,
+    (position1[1] + position2[1]) / 2.0
   ];
 
   return intermediatePosition;
@@ -323,8 +321,8 @@ export function getEditHandlesForGeometry(
           position: geometry.coordinates,
           positionIndexes: [],
           featureIndex,
-          type: editHandleType,
-        },
+          type: editHandleType
+        }
       ];
       break;
     case 'MultiPoint':
@@ -387,7 +385,7 @@ function getEditHandlesForCoordinates(
       position,
       positionIndexes: [...positionIndexPrefix, i],
       featureIndex,
-      type: editHandleType,
+      type: editHandleType
     });
   }
   return editHandles;

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

@@ -1,23 +1,27 @@
+// deck.gl-community
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import nearestPointOnLine from '@turf/nearest-point-on-line';
-import { point, lineString as toLineString } from '@turf/helpers';
-import { Position, FeatureOf, Point, LineString } from '../geojson-types';
+import {point, lineString as toLineString} from '@turf/helpers';
+import {Position, FeatureOf, Point, LineString} from '../utils/geojson-types';
 import {
   recursivelyTraverseNestedArrays,
   nearestPointOnProjectedLine,
-  NearestPointType,
-} from '../utils';
+  NearestPointType
+} from '../utils/utils';
 import {
   ClickEvent,
   PointerMoveEvent,
   StartDraggingEvent,
-  StopDraggingEvent,
+  StopDraggingEvent
 } from '../edit-modes/types';
 import {
   EditAction,
   EditHandle,
   ModeHandler,
   getPickedEditHandle,
-  getEditHandlesForGeometry,
+  getEditHandlesForGeometry
 } from './mode-handler';
 
 // TODO edit-modes: delete handlers once EditMode fully implemented
@@ -26,11 +30,11 @@ export class ModifyHandler extends ModeHandler {
 
   getEditHandles(picks?: Array<Record<string, any>>, mapCoords?: Position): EditHandle[] {
     let handles: EditHandle[] = [];
-    const { features } = this.featureCollection.getObject();
+    const {features} = this.featureCollection.getObject();
 
     for (const index of this.getSelectedFeatureIndexes()) {
       if (index < features.length) {
-        const { geometry } = features[index];
+        const {geometry} = features[index];
         handles.push(...getEditHandlesForGeometry(geometry, index));
       } else {
         console.warn(`selectedFeatureIndexes out of range ${index}`); // eslint-disable-line no-console,no-undef
@@ -78,8 +82,8 @@ export class ModifyHandler extends ModeHandler {
         // tack on the lone intermediate point to the set of handles
         if (intermediatePoint) {
           const {
-            geometry: { coordinates: position },
-            properties: { index },
+            geometry: {coordinates: position},
+            properties: {index}
           } = intermediatePoint;
           handles = [
             ...handles,
@@ -87,8 +91,8 @@ export class ModifyHandler extends ModeHandler {
               position,
               positionIndexes: [...positionIndexPrefix, index + 1],
               featureIndex: featureAsPick.index,
-              type: 'intermediate',
-            },
+              type: 'intermediate'
+            }
           ];
         }
       }
@@ -99,7 +103,7 @@ export class ModifyHandler extends ModeHandler {
 
   // turf.js does not support elevation for nearestPointOnLine
   nearestPointOnLine(line: FeatureOf<LineString>, inPoint: FeatureOf<Point>): NearestPointType {
-    const { coordinates } = line.geometry;
+    const {coordinates} = line.geometry;
     if (coordinates.some((coord) => coord.length > 2)) {
       const modeConfig = this.getModeConfig();
       if (modeConfig && modeConfig.viewport) {
@@ -138,8 +142,8 @@ export class ModifyHandler extends ModeHandler {
             featureIndexes: [clickedEditHandle.featureIndex],
             editContext: {
               positionIndexes: clickedEditHandle.positionIndexes,
-              position: clickedEditHandle.position,
-            },
+              position: clickedEditHandle.position
+            }
           };
         }
       } else if (clickedEditHandle.type === 'intermediate') {
@@ -158,8 +162,8 @@ export class ModifyHandler extends ModeHandler {
             featureIndexes: [clickedEditHandle.featureIndex],
             editContext: {
               positionIndexes: clickedEditHandle.positionIndexes,
-              position: clickedEditHandle.position,
-            },
+              position: clickedEditHandle.position
+            }
           };
         }
       }
@@ -188,15 +192,15 @@ export class ModifyHandler extends ModeHandler {
         featureIndexes: [editHandle.featureIndex],
         editContext: {
           positionIndexes: editHandle.positionIndexes,
-          position: event.mapCoords,
-        },
+          position: event.mapCoords
+        }
       };
     }
 
     // Cancel map panning if pointer went down on an edit handle
     const cancelMapPan = Boolean(editHandle);
 
-    return { editAction, cancelMapPan };
+    return {editAction, cancelMapPan};
   }
 
   handleStartDragging(event: StartDraggingEvent): EditAction | null | undefined {
@@ -216,8 +220,8 @@ export class ModifyHandler extends ModeHandler {
         featureIndexes: [editHandle.featureIndex],
         editContext: {
           positionIndexes: editHandle.positionIndexes,
-          position: event.mapCoords,
-        },
+          position: event.mapCoords
+        }
       };
     }
 
@@ -240,15 +244,15 @@ export class ModifyHandler extends ModeHandler {
         featureIndexes: [editHandle.featureIndex],
         editContext: {
           positionIndexes: editHandle.positionIndexes,
-          position: event.mapCoords,
-        },
+          position: event.mapCoords
+        }
       };
     }
 
     return editAction;
   }
 
-  getCursor({ isDragging }: { isDragging: boolean }): string {
+  getCursor({isDragging}: {isDragging: boolean}): string {
     const picks = this._lastPointerMovePicks;
 
     if (picks && picks.length > 0) {