@deck.gl-community/editable-layers 9.2.8 → 9.3.0-beta.1

package/dist/index.cjs

@@ -2153,10 +2153,10 @@ var DrawLineStringMode = class extends GeoJsonEditMode {
 };
 
 // dist/edit-modes/draw-polygon-mode.js
-var import_line_intersect2 = require("@turf/line-intersect");
+var import_line_intersect2 = __toESM(require("@turf/line-intersect"), 1);
 var import_helpers9 = require("@turf/helpers");
-var import_boolean_within = require("@turf/boolean-within");
-var import_kinks = require("@turf/kinks");
+var import_boolean_within = __toESM(require("@turf/boolean-within"), 1);
+var import_kinks = __toESM(require("@turf/kinks"), 1);
 var DrawPolygonMode = class extends GeoJsonEditMode {
   holeSequence = [];
   isDrawingHole = false;
@@ -2302,7 +2302,7 @@ var DrawPolygonMode = class extends GeoJsonEditMode {
     const canAddHole = canAddHoleToPolygon(props);
     const canOverlap = canPolygonOverlap(props);
     if (!canOverlap) {
-      const overlapping = (0, import_kinks.kinks)(newPolygon).features;
+      const overlapping = (0, import_kinks.default)(newPolygon).features;
       if (overlapping.length > 0) {
         props.onEdit({
           updatedData: props.data,
@@ -2344,7 +2344,7 @@ var DrawPolygonMode = class extends GeoJsonEditMode {
     const outer = (0, import_helpers9.polygon)(feature.geometry.coordinates);
     for (let i = 1; i < feature.geometry.coordinates.length; i++) {
       const hole = (0, import_helpers9.polygon)([feature.geometry.coordinates[i]]);
-      const intersection = (0, import_line_intersect2.lineIntersect)(hole, newPolygon);
+      const intersection = (0, import_line_intersect2.default)(hole, newPolygon);
       if (intersection.features.length > 0) {
         props.onEdit({
           updatedData: props.data,
@@ -2353,7 +2353,7 @@ var DrawPolygonMode = class extends GeoJsonEditMode {
         });
         return { handled: true };
       }
-      if ((0, import_boolean_within.booleanWithin)(hole, newPolygon) || (0, import_boolean_within.booleanWithin)(newPolygon, hole)) {
+      if ((0, import_boolean_within.default)(hole, newPolygon) || (0, import_boolean_within.default)(newPolygon, hole)) {
         props.onEdit({
           updatedData: props.data,
           editType: "invalidHole",
@@ -2362,7 +2362,7 @@ var DrawPolygonMode = class extends GeoJsonEditMode {
         return { handled: true };
       }
     }
-    const intersectionWithOuter = (0, import_line_intersect2.lineIntersect)(outer, newPolygon);
+    const intersectionWithOuter = (0, import_line_intersect2.default)(outer, newPolygon);
     if (intersectionWithOuter.features.length > 0) {
       props.onEdit({
         updatedData: props.data,
@@ -2371,7 +2371,7 @@ var DrawPolygonMode = class extends GeoJsonEditMode {
       });
       return { handled: true };
     }
-    if ((0, import_boolean_within.booleanWithin)(outer, newPolygon)) {
+    if ((0, import_boolean_within.default)(outer, newPolygon)) {
       props.onEdit({
         updatedData: props.data,
         editType: "invalidPolygon",
@@ -2379,7 +2379,7 @@ var DrawPolygonMode = class extends GeoJsonEditMode {
       });
       return { handled: true };
     }
-    if ((0, import_boolean_within.booleanWithin)(newPolygon, outer)) {
+    if ((0, import_boolean_within.default)(newPolygon, outer)) {
       const updatedData = new ImmutableFeatureCollection(props.data).replaceGeometry(featureIndex, {
         ...feature.geometry,
         coordinates: [...feature.geometry.coordinates, polygon2]
@@ -2412,7 +2412,6 @@ function canPolygonOverlap(props) {
 var import_bbox_polygon3 = __toESM(require("@turf/bbox-polygon"), 1);
 
 // dist/edit-modes/two-click-polygon-mode.js
-var import_lodash = __toESM(require("lodash.omit"), 1);
 var TwoClickPolygonMode = class extends GeoJsonEditMode {
   handleClick(event, props) {
     if (props.modeConfig && props.modeConfig.dragToDraw) {
@@ -2441,7 +2440,7 @@ var TwoClickPolygonMode = class extends GeoJsonEditMode {
     if (clickSequence.length > 1 && tentativeFeature && tentativeFeature.geometry.type === "Polygon") {
       const feature = {
         type: "Feature",
-        properties: (0, import_lodash.default)(tentativeFeature.properties, "guideType"),
+        properties: Object.fromEntries(Object.entries(tentativeFeature.properties ?? {}).filter(([key]) => key !== "guideType")),
         geometry: {
           type: "Polygon",
           coordinates: tentativeFeature.geometry.coordinates
@@ -3017,7 +3016,7 @@ var Draw90DegreePolygonMode = class extends GeoJsonEditMode {
 };
 
 // dist/edit-modes/draw-polygon-by-dragging-mode.js
-var import_lodash2 = __toESM(require("lodash.throttle"), 1);
+var import_lodash = __toESM(require("lodash.throttle"), 1);
 var DrawPolygonByDraggingMode = class extends DrawPolygonMode {
   handleDraggingThrottled = null;
   handleClick(event, props) {
@@ -3025,7 +3024,7 @@ var DrawPolygonByDraggingMode = class extends DrawPolygonMode {
   handleStartDragging(event, props) {
     event.cancelPan();
     if (props.modeConfig && props.modeConfig.throttleMs) {
-      this.handleDraggingThrottled = (0, import_lodash2.default)(this.handleDraggingAux, props.modeConfig.throttleMs);
+      this.handleDraggingThrottled = (0, import_lodash.default)(this.handleDraggingAux, props.modeConfig.throttleMs);
     } else {
       this.handleDraggingThrottled = this.handleDraggingAux;
     }
@@ -3328,7 +3327,15 @@ var PROJECTED_PIXEL_SIZE_MULTIPLIER = 2 / 3;
 
 // dist/editable-layers/editable-layer.js
 var import_core = require("@deck.gl/core");
-var EVENT_TYPES = ["click", "pointermove", "panstart", "panmove", "panend", "keyup", "dblclick"];
+var EVENT_TYPES = [
+  "click",
+  "pointermove",
+  "panstart",
+  "panmove",
+  "panend",
+  "keyup",
+  "dblclick"
+];
 var EditableLayer = class extends import_core.CompositeLayer {
   state = void 0;
   // Overridable interaction event handlers
@@ -3394,39 +3401,29 @@ var EditableLayer = class extends import_core.CompositeLayer {
     }
     func(event);
   }
-  _onclick({ srcEvent }) {
-    const screenCoords = this.getScreenCoords(srcEvent);
-    const mapCoords2 = this.getMapCoords(screenCoords);
-    const picks = this.getPicks(screenCoords);
-    this.onLayerClick({
-      mapCoords: mapCoords2,
-      screenCoords,
-      picks,
-      sourceEvent: srcEvent
-    });
+  _onclick(event) {
+    this.onLayerClick(this.toBasePointerEvent(event));
   }
-  _ondblclick({ srcEvent }) {
-    this.onLayerDoubleClick(srcEvent);
+  _ondblclick(event) {
+    this.onLayerDoubleClick(this.toBasePointerEvent(event));
   }
   _onkeyup({ srcEvent }) {
     this.onLayerKeyUp(srcEvent);
   }
   _onpanstart(event) {
-    const screenCoords = this.getScreenCoords(event.srcEvent);
-    const mapCoords2 = this.getMapCoords(screenCoords);
-    const picks = this.getPicks(screenCoords);
+    const basePointerEvent = this.toBasePointerEvent(event);
+    const { picks, screenCoords, mapCoords: mapCoords2 } = basePointerEvent;
     this.setState({
       _editableLayerState: {
         ...this.state._editableLayerState,
+        pointerDownPicks: picks,
         pointerDownScreenCoords: screenCoords,
-        pointerDownMapCoords: mapCoords2,
-        pointerDownPicks: picks
+        pointerDownMapCoords: mapCoords2
       }
     });
     this.onStartDragging({
-      picks,
-      screenCoords,
-      mapCoords: mapCoords2,
+      ...basePointerEvent,
+      pointerDownPicks: picks,
       pointerDownScreenCoords: screenCoords,
       pointerDownMapCoords: mapCoords2,
       cancelPan: () => {
@@ -3434,24 +3431,17 @@ var EditableLayer = class extends import_core.CompositeLayer {
           this.props.onCancelPan();
         }
         event.stopImmediatePropagation();
-      },
-      sourceEvent: event.srcEvent
+      }
     });
   }
   _onpanmove(event) {
-    const { srcEvent } = event;
-    const screenCoords = this.getScreenCoords(srcEvent);
-    const mapCoords2 = this.getMapCoords(screenCoords);
+    const basePointerEvent = this.toBasePointerEvent(event);
     const { pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords } = this.state._editableLayerState;
-    const picks = this.getPicks(screenCoords);
     this.onDragging({
-      screenCoords,
-      mapCoords: mapCoords2,
-      picks,
+      ...basePointerEvent,
       pointerDownPicks,
       pointerDownScreenCoords,
       pointerDownMapCoords,
-      sourceEvent: srcEvent,
       cancelPan: event.stopImmediatePropagation
       // another (hacky) approach for cancelling map panning
       // const controller = this.context.deck.viewManager.controllers[
@@ -3460,19 +3450,14 @@ var EditableLayer = class extends import_core.CompositeLayer {
       // controller._state.isDragging = false;
     });
   }
-  _onpanend({ srcEvent }) {
-    const screenCoords = this.getScreenCoords(srcEvent);
-    const mapCoords2 = this.getMapCoords(screenCoords);
+  _onpanend(event) {
+    const basePointerEvent = this.toBasePointerEvent(event);
     const { pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords } = this.state._editableLayerState;
-    const picks = this.getPicks(screenCoords);
     this.onStopDragging({
-      picks,
-      screenCoords,
-      mapCoords: mapCoords2,
+      ...basePointerEvent,
       pointerDownPicks,
       pointerDownScreenCoords,
-      pointerDownMapCoords,
-      sourceEvent: srcEvent
+      pointerDownMapCoords
     });
     this.setState({
       _editableLayerState: {
@@ -3484,22 +3469,27 @@ var EditableLayer = class extends import_core.CompositeLayer {
     });
   }
   _onpointermove(event) {
-    const { srcEvent } = event;
-    const screenCoords = this.getScreenCoords(srcEvent);
-    const mapCoords2 = this.getMapCoords(screenCoords);
+    const basePointerEvent = this.toBasePointerEvent(event);
     const { pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords } = this.state._editableLayerState;
-    const picks = this.getPicks(screenCoords);
     this.onPointerMove({
-      screenCoords,
-      mapCoords: mapCoords2,
-      picks,
+      ...basePointerEvent,
       pointerDownPicks,
       pointerDownScreenCoords,
       pointerDownMapCoords,
-      sourceEvent: srcEvent,
       cancelPan: event.stopImmediatePropagation
     });
   }
+  toBasePointerEvent(event) {
+    const screenCoords = [event.offsetCenter.x, event.offsetCenter.y];
+    const mapCoords2 = this.getMapCoords(screenCoords);
+    const picks = this.getPicks(screenCoords);
+    return {
+      screenCoords,
+      mapCoords: mapCoords2,
+      picks,
+      sourceEvent: event.srcEvent
+    };
+  }
   getPicks(screenCoords) {
     return this.context.deck.pickMultipleObjects({
       x: screenCoords[0],
@@ -3516,6 +3506,20 @@ var EditableLayer = class extends import_core.CompositeLayer {
     ];
   }
   getMapCoords(screenCoords) {
+    if (this.context.deck) {
+      const layerIds = this.context.layerManager.getLayers().filter((l) => l.props.pickable === "3d").map((l) => l.id);
+      if (layerIds.length > 0) {
+        const pickInfo = this.context.deck.pickObject({
+          x: screenCoords[0],
+          y: screenCoords[1],
+          layerIds,
+          unproject3D: true
+        });
+        if (pickInfo == null ? void 0 : pickInfo.coordinate) {
+          return [pickInfo.coordinate[0], pickInfo.coordinate[1]];
+        }
+      }
+    }
     return this.context.viewport.unproject([screenCoords[0], screenCoords[1]]);
   }
 };
@@ -3981,6 +3985,7 @@ __publicField(EditableGeoJsonLayer, "defaultProps", defaultProps2);
 
 // dist/editable-layers/editable-h3-cluster-layer.js
 var import_geo_layers = require("@deck.gl/geo-layers");
+var import_h3_js = require("h3-js");
 var DEFAULT_EDIT_MODE2 = ViewMode;
 var DEFAULT_H3_RESOLUTION = 9;
 var EMPTY_FEATURE_COLLECTION = {
@@ -4023,11 +4028,19 @@ var EditableH3ClusterLayer = class extends EditableLayer {
   }
   // convert array of (lng, lat) coords to cluster of hexes
   getDerivedHexagonIDs(coords) {
-    throw new Error("not implemented");
+    const outerRing = coords == null ? void 0 : coords[0];
+    if (!outerRing || outerRing.length < 4) {
+      return [];
+    }
+    try {
+      return (0, import_h3_js.polygonToCells)(coords, this.props.resolution, true);
+    } catch {
+      return [];
+    }
   }
   // convert pair of (lng, lat) coords into single hex
   getDerivedHexagonID(coords) {
-    throw new Error("not implemented");
+    return (0, import_h3_js.latLngToCell)(coords[1], coords[0], this.props.resolution);
   }
   renderLayers() {
     const layers = [