@deck.gl-community/editable-layers 9.2.8 → 9.3.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/edit-modes/draw-polygon-mode.js +3 -3
- package/dist/edit-modes/draw-polygon-mode.js.map +1 -1
- package/dist/edit-modes/two-click-polygon-mode.d.ts.map +1 -1
- package/dist/edit-modes/two-click-polygon-mode.js +1 -2
- package/dist/edit-modes/two-click-polygon-mode.js.map +1 -1
- package/dist/editable-layers/editable-h3-cluster-layer.d.ts +2 -2
- package/dist/editable-layers/editable-h3-cluster-layer.d.ts.map +1 -1
- package/dist/editable-layers/editable-h3-cluster-layer.js +13 -6
- package/dist/editable-layers/editable-h3-cluster-layer.js.map +1 -1
- package/dist/editable-layers/editable-layer.d.ts +13 -12
- package/dist/editable-layers/editable-layer.d.ts.map +1 -1
- package/dist/editable-layers/editable-layer.js +58 -48
- package/dist/editable-layers/editable-layer.js.map +1 -1
- package/dist/index.cjs +76 -63
- package/dist/index.cjs.map +3 -3
- package/dist/widgets/edit-mode-tray-widget.d.ts +1 -0
- package/dist/widgets/edit-mode-tray-widget.d.ts.map +1 -1
- package/dist/widgets/edit-mode-tray-widget.js +1 -0
- package/dist/widgets/edit-mode-tray-widget.js.map +1 -1
- package/dist/widgets/editor-toolbar-widget.d.ts +1 -0
- package/dist/widgets/editor-toolbar-widget.d.ts.map +1 -1
- package/dist/widgets/editor-toolbar-widget.js +1 -0
- package/dist/widgets/editor-toolbar-widget.js.map +1 -1
- package/package.json +14 -16
- package/src/edit-modes/draw-polygon-mode.ts +3 -3
- package/src/edit-modes/two-click-polygon-mode.ts +3 -2
- package/src/editable-layers/editable-h3-cluster-layer.ts +12 -6
- package/src/editable-layers/editable-layer.ts +72 -66
- package/src/widgets/edit-mode-tray-widget.tsx +1 -0
- package/src/widgets/editor-toolbar-widget.tsx +1 -0
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
// deck.gl-community
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import
|
|
4
|
+
import lineIntersect from '@turf/line-intersect';
|
|
5
5
|
import { polygon as turfPolygon } from '@turf/helpers';
|
|
6
|
-
import
|
|
7
|
-
import
|
|
6
|
+
import booleanWithin from '@turf/boolean-within';
|
|
7
|
+
import kinks from '@turf/kinks';
|
|
8
8
|
import { getPickedEditHandle } from "./utils.js";
|
|
9
9
|
import { GeoJsonEditMode } from "./geojson-edit-mode.js";
|
|
10
10
|
import { ImmutableFeatureCollection } from "./immutable-feature-collection.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draw-polygon-mode.js","sourceRoot":"","sources":["../../src/edit-modes/draw-polygon-mode.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,
|
|
1
|
+
{"version":3,"file":"draw-polygon-mode.js","sourceRoot":"","sources":["../../src/edit-modes/draw-polygon-mode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"two-click-polygon-mode.d.ts","sourceRoot":"","sources":["../../src/edit-modes/two-click-polygon-mode.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,SAAS,EACT,sBAAsB,EACtB,gBAAgB,EACjB,mBAAgB;AACjB,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,OAAO,EACP,QAAQ,EACR,uBAAuB,EACxB,kCAA+B;AAChC,OAAO,EAAC,eAAe,EAAC,+BAA4B;
|
|
1
|
+
{"version":3,"file":"two-click-polygon-mode.d.ts","sourceRoot":"","sources":["../../src/edit-modes/two-click-polygon-mode.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,SAAS,EACT,sBAAsB,EACtB,gBAAgB,EACjB,mBAAgB;AACjB,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,OAAO,EACP,QAAQ,EACR,uBAAuB,EACxB,kCAA+B;AAChC,OAAO,EAAC,eAAe,EAAC,+BAA4B;AAEpD,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,uBAAuB,CAAC;IAWxE,mBAAmB,CAAC,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,CAAC,uBAAuB,CAAC,GAAG,IAAI;IAU/F,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,CAAC,uBAAuB,CAAC,GAAG,IAAI;IAU7F,qBAAqB,CAAC,KAAK,EAAE,SAAS,CAAC,uBAAuB,CAAC;IA6B/D,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,iBAAiB,CAAC,GAAG,sBAAsB;IAgCtE,kBAAkB,CAChB,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,QAAQ,EAChB,UAAU,EAAE,GAAG,GACd,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS;IAItC,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,CAAC,iBAAiB,CAAC;IAK9E,sBAAsB,CAAC,KAAK,EAAE,SAAS,CAAC,iBAAiB,CAAC,GAAG,gBAAgB;CAa9E"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { GeoJsonEditMode } from "./geojson-edit-mode.js";
|
|
5
|
-
import omit from 'lodash.omit';
|
|
6
5
|
export class TwoClickPolygonMode extends GeoJsonEditMode {
|
|
7
6
|
handleClick(event, props) {
|
|
8
7
|
if (props.modeConfig && props.modeConfig.dragToDraw) {
|
|
@@ -36,7 +35,7 @@ export class TwoClickPolygonMode extends GeoJsonEditMode {
|
|
|
36
35
|
tentativeFeature.geometry.type === 'Polygon') {
|
|
37
36
|
const feature = {
|
|
38
37
|
type: 'Feature',
|
|
39
|
-
properties:
|
|
38
|
+
properties: Object.fromEntries(Object.entries(tentativeFeature.properties ?? {}).filter(([key]) => key !== 'guideType')),
|
|
40
39
|
geometry: {
|
|
41
40
|
type: 'Polygon',
|
|
42
41
|
coordinates: tentativeFeature.geometry.coordinates
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"two-click-polygon-mode.js","sourceRoot":"","sources":["../../src/edit-modes/two-click-polygon-mode.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,+BAA+B;AAC/B,oCAAoC;AAkBpC,OAAO,EAAC,eAAe,EAAC,+BAA4B;
|
|
1
|
+
{"version":3,"file":"two-click-polygon-mode.js","sourceRoot":"","sources":["../../src/edit-modes/two-click-polygon-mode.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,8 @@ export declare class EditableH3ClusterLayer extends EditableLayer<any, EditableH
|
|
|
24
24
|
tentativeHexagonIDs: string[];
|
|
25
25
|
};
|
|
26
26
|
initializeState(): void;
|
|
27
|
-
getDerivedHexagonIDs(coords: any):
|
|
28
|
-
getDerivedHexagonID(coords: any):
|
|
27
|
+
getDerivedHexagonIDs(coords: any): string[];
|
|
28
|
+
getDerivedHexagonID(coords: any): string;
|
|
29
29
|
renderLayers(): any;
|
|
30
30
|
getSelectedHexIDs(): number[];
|
|
31
31
|
getCursor({ isDragging }: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editable-h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/editable-layers/editable-h3-cluster-layer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"editable-h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/editable-layers/editable-h3-cluster-layer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAKhD,OAAO,EAAC,aAAa,EAAE,kBAAkB,EAAC,4BAAyB;AAUnE,MAAM,MAAM,2BAA2B,CAAC,KAAK,IAAI,kBAAkB,GAAG;IACpE,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,gBAAgB,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE,EAAE,eAAe,EAAE,GAAG,KAAK,GAAG,CAAC;IACzE,WAAW,CAAC,EAAE,CAAC,CAAC,KAAA,KAAK,MAAM,EAAE,CAAC;IAC9B,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,KAAA,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,KAAA,KAAK,IAAI,CAAC;IAC5F,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AA+BF,qBAAa,sBAAuB,SAAQ,aAAa,CAAC,GAAG,EAAE,2BAA2B,CAAC,GAAG,CAAC,CAAC;IAC9F,MAAM,CAAC,SAAS,SAA4B;IAC5C,MAAM,CAAC,YAAY,iDAAgB;IAEnC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG;QAC9B,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC;QACpC,mBAAmB,EAAE,MAAM,EAAE,CAAC;KAC/B,CAAc;IAEf,eAAe;IASf,oBAAoB,CAAC,MAAM,KAAA;IAc3B,mBAAmB,CAAC,MAAM,KAAA;IAI1B,YAAY;IAiHZ,iBAAiB;IAUjB,SAAS,CAAC,EAAC,UAAU,EAAC,EAAE;QAAC,UAAU,EAAE,OAAO,CAAA;KAAC,GAAG,UAAU,GAAG,MAAM;CAQpE"}
|
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { H3ClusterLayer } from '@deck.gl/geo-layers';
|
|
5
|
-
|
|
6
|
-
// import { polyfill, geoToH3 } from 'h3-js';
|
|
5
|
+
import { polygonToCells, latLngToCell } from 'h3-js';
|
|
7
6
|
import { PROJECTED_PIXEL_SIZE_MULTIPLIER } from "../constants.js";
|
|
8
7
|
import { EditableGeoJsonLayer } from "./editable-geojson-layer.js";
|
|
9
8
|
import { EditableLayer } from "./editable-layer.js";
|
|
@@ -52,13 +51,21 @@ export class EditableH3ClusterLayer extends EditableLayer {
|
|
|
52
51
|
}
|
|
53
52
|
// convert array of (lng, lat) coords to cluster of hexes
|
|
54
53
|
getDerivedHexagonIDs(coords) {
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
const outerRing = coords?.[0];
|
|
55
|
+
if (!outerRing || outerRing.length < 4) {
|
|
56
|
+
return [];
|
|
57
|
+
}
|
|
58
|
+
try {
|
|
59
|
+
return polygonToCells(coords, this.props.resolution, true);
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
// h3 rejects degenerate polygons (zero area, collinear points, etc.)
|
|
63
|
+
return [];
|
|
64
|
+
}
|
|
57
65
|
}
|
|
58
66
|
// convert pair of (lng, lat) coords into single hex
|
|
59
67
|
getDerivedHexagonID(coords) {
|
|
60
|
-
|
|
61
|
-
// return geoToH3(coords[1], coords[0], this.props.resolution);
|
|
68
|
+
return latLngToCell(coords[1], coords[0], this.props.resolution);
|
|
62
69
|
}
|
|
63
70
|
renderLayers() {
|
|
64
71
|
const layers = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editable-h3-cluster-layer.js","sourceRoot":"","sources":["../../src/editable-layers/editable-h3-cluster-layer.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,
|
|
1
|
+
{"version":3,"file":"editable-h3-cluster-layer.js","sourceRoot":"","sources":["../../src/editable-layers/editable-h3-cluster-layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { CompositeLayerProps } from '@deck.gl/core';
|
|
2
2
|
import { CompositeLayer } from '@deck.gl/core';
|
|
3
|
-
import {
|
|
3
|
+
import { MjolnirEvent, MjolnirGestureEvent, MjolnirKeyEvent } from 'mjolnir.js';
|
|
4
|
+
import { DraggingEvent, ClickEvent, StartDraggingEvent, StopDraggingEvent, PointerMoveEvent, DoubleClickEvent, BasePointerEvent, ScreenCoordinates } from "../edit-modes/types.js";
|
|
4
5
|
import { Position } from "../utils/geojson-types.js";
|
|
6
|
+
export declare const EVENT_TYPES: string[];
|
|
5
7
|
export type EditableLayerProps<DataType = any> = CompositeLayerProps & {
|
|
6
8
|
pickingRadius?: number;
|
|
7
9
|
pickingDepth?: number;
|
|
@@ -23,17 +25,16 @@ export declare abstract class EditableLayer<DataT = any, ExtraPropsT = Record<st
|
|
|
23
25
|
finalizeState(): void;
|
|
24
26
|
_addEventHandlers(): void;
|
|
25
27
|
_removeEventHandlers(): void;
|
|
26
|
-
_forwardEventToCurrentLayer(event:
|
|
27
|
-
_onclick(
|
|
28
|
-
_ondblclick(
|
|
29
|
-
_onkeyup({ srcEvent }:
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
getPicks(screenCoords: [number, number]): {
|
|
28
|
+
_forwardEventToCurrentLayer(event: MjolnirEvent): void;
|
|
29
|
+
_onclick(event: MjolnirGestureEvent): void;
|
|
30
|
+
_ondblclick(event: MjolnirGestureEvent): void;
|
|
31
|
+
_onkeyup({ srcEvent }: MjolnirKeyEvent): void;
|
|
32
|
+
_onpanstart(event: MjolnirGestureEvent): void;
|
|
33
|
+
_onpanmove(event: MjolnirGestureEvent): void;
|
|
34
|
+
_onpanend(event: MjolnirGestureEvent): void;
|
|
35
|
+
_onpointermove(event: MjolnirGestureEvent): void;
|
|
36
|
+
toBasePointerEvent(event: MjolnirGestureEvent): BasePointerEvent;
|
|
37
|
+
getPicks(screenCoords: ScreenCoordinates): {
|
|
37
38
|
color: Uint8Array | null;
|
|
38
39
|
layer: import("@deck.gl/core").Layer | null;
|
|
39
40
|
sourceLayer?: import("@deck.gl/core").Layer | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editable-layer.d.ts","sourceRoot":"","sources":["../../src/editable-layers/editable-layer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"editable-layer.d.ts","sourceRoot":"","sources":["../../src/editable-layers/editable-layer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAE,eAAe,EAAC,MAAM,YAAY,CAAC;AAE9E,OAAO,EACL,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EAClB,+BAA4B;AAC7B,OAAO,EAAC,QAAQ,EAAC,kCAA+B;AAEhD,eAAO,MAAM,WAAW,UAQvB,CAAC;AAIF,MAAM,MAAM,kBAAkB,CAAC,QAAQ,GAAG,GAAG,IAAI,mBAAmB,GAAG;IACrE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B,CAAC;AAEF,8BAAsB,aAAa,CACjC,KAAK,GAAG,GAAG,EACX,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACrC,SAAQ,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE,MAAM,CAAC,SAAS,SAAmB;IAEnC,KAAK,EAAE;QAAC,mBAAmB,EAAE,GAAG,CAAA;KAAC,CAAc;IAG/C,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAGrC,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAIjD,eAAe,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAIhD,cAAc,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAI9C,UAAU,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAItC,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAI5C,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAKxC,eAAe;IAkBf,aAAa;IAIb,iBAAiB;IAajB,oBAAoB;IAapB,2BAA2B,CAAC,KAAK,EAAE,YAAY;IAY/C,QAAQ,CAAC,KAAK,EAAE,mBAAmB;IAInC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAItC,QAAQ,CAAC,EAAC,QAAQ,EAAC,EAAE,eAAe;IAIpC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IA2BtC,UAAU,CAAC,KAAK,EAAE,mBAAmB;IAmBrC,SAAS,CAAC,KAAK,EAAE,mBAAmB;IAsBpC,cAAc,CAAC,KAAK,EAAE,mBAAmB;IAczC,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,GAAG,gBAAgB;IAYhE,QAAQ,CAAC,YAAY,EAAE,iBAAiB;;;;;;;;;;;;;;;IAUxC,eAAe,CAAC,YAAY,EAAE,GAAG,GAAG,QAAQ;IAS5C,YAAY,CAAC,YAAY,EAAE,QAAQ,GAAG,QAAQ;CAsB/C"}
|
|
@@ -2,7 +2,15 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { CompositeLayer } from '@deck.gl/core';
|
|
5
|
-
const EVENT_TYPES = [
|
|
5
|
+
export const EVENT_TYPES = [
|
|
6
|
+
'click',
|
|
7
|
+
'pointermove',
|
|
8
|
+
'panstart',
|
|
9
|
+
'panmove',
|
|
10
|
+
'panend',
|
|
11
|
+
'keyup',
|
|
12
|
+
'dblclick'
|
|
13
|
+
];
|
|
6
14
|
export class EditableLayer extends CompositeLayer {
|
|
7
15
|
static layerName = 'EditableLayer';
|
|
8
16
|
state = undefined;
|
|
@@ -79,39 +87,29 @@ export class EditableLayer extends CompositeLayer {
|
|
|
79
87
|
}
|
|
80
88
|
func(event);
|
|
81
89
|
}
|
|
82
|
-
_onclick(
|
|
83
|
-
|
|
84
|
-
const mapCoords = this.getMapCoords(screenCoords);
|
|
85
|
-
const picks = this.getPicks(screenCoords);
|
|
86
|
-
this.onLayerClick({
|
|
87
|
-
mapCoords,
|
|
88
|
-
screenCoords,
|
|
89
|
-
picks,
|
|
90
|
-
sourceEvent: srcEvent
|
|
91
|
-
});
|
|
90
|
+
_onclick(event) {
|
|
91
|
+
this.onLayerClick(this.toBasePointerEvent(event));
|
|
92
92
|
}
|
|
93
|
-
_ondblclick(
|
|
94
|
-
this.onLayerDoubleClick(
|
|
93
|
+
_ondblclick(event) {
|
|
94
|
+
this.onLayerDoubleClick(this.toBasePointerEvent(event));
|
|
95
95
|
}
|
|
96
96
|
_onkeyup({ srcEvent }) {
|
|
97
97
|
this.onLayerKeyUp(srcEvent);
|
|
98
98
|
}
|
|
99
99
|
_onpanstart(event) {
|
|
100
|
-
const
|
|
101
|
-
const mapCoords =
|
|
102
|
-
const picks = this.getPicks(screenCoords);
|
|
100
|
+
const basePointerEvent = this.toBasePointerEvent(event);
|
|
101
|
+
const { picks, screenCoords, mapCoords } = basePointerEvent;
|
|
103
102
|
this.setState({
|
|
104
103
|
_editableLayerState: {
|
|
105
104
|
...this.state._editableLayerState,
|
|
105
|
+
pointerDownPicks: picks,
|
|
106
106
|
pointerDownScreenCoords: screenCoords,
|
|
107
|
-
pointerDownMapCoords: mapCoords
|
|
108
|
-
pointerDownPicks: picks
|
|
107
|
+
pointerDownMapCoords: mapCoords
|
|
109
108
|
}
|
|
110
109
|
});
|
|
111
110
|
this.onStartDragging({
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
mapCoords,
|
|
111
|
+
...basePointerEvent,
|
|
112
|
+
pointerDownPicks: picks,
|
|
115
113
|
pointerDownScreenCoords: screenCoords,
|
|
116
114
|
pointerDownMapCoords: mapCoords,
|
|
117
115
|
cancelPan: () => {
|
|
@@ -119,24 +117,17 @@ export class EditableLayer extends CompositeLayer {
|
|
|
119
117
|
this.props.onCancelPan();
|
|
120
118
|
}
|
|
121
119
|
event.stopImmediatePropagation();
|
|
122
|
-
}
|
|
123
|
-
sourceEvent: event.srcEvent
|
|
120
|
+
}
|
|
124
121
|
});
|
|
125
122
|
}
|
|
126
123
|
_onpanmove(event) {
|
|
127
|
-
const
|
|
128
|
-
const screenCoords = this.getScreenCoords(srcEvent);
|
|
129
|
-
const mapCoords = this.getMapCoords(screenCoords);
|
|
124
|
+
const basePointerEvent = this.toBasePointerEvent(event);
|
|
130
125
|
const { pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords } = this.state._editableLayerState;
|
|
131
|
-
const picks = this.getPicks(screenCoords);
|
|
132
126
|
this.onDragging({
|
|
133
|
-
|
|
134
|
-
mapCoords,
|
|
135
|
-
picks,
|
|
127
|
+
...basePointerEvent,
|
|
136
128
|
pointerDownPicks,
|
|
137
129
|
pointerDownScreenCoords,
|
|
138
130
|
pointerDownMapCoords,
|
|
139
|
-
sourceEvent: srcEvent,
|
|
140
131
|
cancelPan: event.stopImmediatePropagation
|
|
141
132
|
// another (hacky) approach for cancelling map panning
|
|
142
133
|
// const controller = this.context.deck.viewManager.controllers[
|
|
@@ -145,19 +136,14 @@ export class EditableLayer extends CompositeLayer {
|
|
|
145
136
|
// controller._state.isDragging = false;
|
|
146
137
|
});
|
|
147
138
|
}
|
|
148
|
-
_onpanend(
|
|
149
|
-
const
|
|
150
|
-
const mapCoords = this.getMapCoords(screenCoords);
|
|
139
|
+
_onpanend(event) {
|
|
140
|
+
const basePointerEvent = this.toBasePointerEvent(event);
|
|
151
141
|
const { pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords } = this.state._editableLayerState;
|
|
152
|
-
const picks = this.getPicks(screenCoords);
|
|
153
142
|
this.onStopDragging({
|
|
154
|
-
|
|
155
|
-
screenCoords,
|
|
156
|
-
mapCoords,
|
|
143
|
+
...basePointerEvent,
|
|
157
144
|
pointerDownPicks,
|
|
158
145
|
pointerDownScreenCoords,
|
|
159
|
-
pointerDownMapCoords
|
|
160
|
-
sourceEvent: srcEvent
|
|
146
|
+
pointerDownMapCoords
|
|
161
147
|
});
|
|
162
148
|
this.setState({
|
|
163
149
|
_editableLayerState: {
|
|
@@ -169,22 +155,27 @@ export class EditableLayer extends CompositeLayer {
|
|
|
169
155
|
});
|
|
170
156
|
}
|
|
171
157
|
_onpointermove(event) {
|
|
172
|
-
const
|
|
173
|
-
const screenCoords = this.getScreenCoords(srcEvent);
|
|
174
|
-
const mapCoords = this.getMapCoords(screenCoords);
|
|
158
|
+
const basePointerEvent = this.toBasePointerEvent(event);
|
|
175
159
|
const { pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords } = this.state._editableLayerState;
|
|
176
|
-
const picks = this.getPicks(screenCoords);
|
|
177
160
|
this.onPointerMove({
|
|
178
|
-
|
|
179
|
-
mapCoords,
|
|
180
|
-
picks,
|
|
161
|
+
...basePointerEvent,
|
|
181
162
|
pointerDownPicks,
|
|
182
163
|
pointerDownScreenCoords,
|
|
183
164
|
pointerDownMapCoords,
|
|
184
|
-
sourceEvent: srcEvent,
|
|
185
165
|
cancelPan: event.stopImmediatePropagation
|
|
186
166
|
});
|
|
187
167
|
}
|
|
168
|
+
toBasePointerEvent(event) {
|
|
169
|
+
const screenCoords = [event.offsetCenter.x, event.offsetCenter.y];
|
|
170
|
+
const mapCoords = this.getMapCoords(screenCoords);
|
|
171
|
+
const picks = this.getPicks(screenCoords);
|
|
172
|
+
return {
|
|
173
|
+
screenCoords,
|
|
174
|
+
mapCoords,
|
|
175
|
+
picks,
|
|
176
|
+
sourceEvent: event.srcEvent
|
|
177
|
+
};
|
|
178
|
+
}
|
|
188
179
|
getPicks(screenCoords) {
|
|
189
180
|
return this.context.deck.pickMultipleObjects({
|
|
190
181
|
x: screenCoords[0],
|
|
@@ -203,6 +194,25 @@ export class EditableLayer extends CompositeLayer {
|
|
|
203
194
|
];
|
|
204
195
|
}
|
|
205
196
|
getMapCoords(screenCoords) {
|
|
197
|
+
if (this.context.deck) {
|
|
198
|
+
const layerIds = this.context.layerManager
|
|
199
|
+
.getLayers()
|
|
200
|
+
.filter((l) => l.props.pickable === '3d')
|
|
201
|
+
.map((l) => l.id);
|
|
202
|
+
if (layerIds.length > 0) {
|
|
203
|
+
const pickInfo = this.context.deck.pickObject({
|
|
204
|
+
x: screenCoords[0],
|
|
205
|
+
y: screenCoords[1],
|
|
206
|
+
layerIds,
|
|
207
|
+
unproject3D: true
|
|
208
|
+
});
|
|
209
|
+
if (pickInfo?.coordinate) {
|
|
210
|
+
// Return only lon/lat — discard Z so that TerrainExtension
|
|
211
|
+
// can drape geometry onto the surface without double-offsetting.
|
|
212
|
+
return [pickInfo.coordinate[0], pickInfo.coordinate[1]];
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}
|
|
206
216
|
return this.context.viewport.unproject([screenCoords[0], screenCoords[1]]);
|
|
207
217
|
}
|
|
208
218
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editable-layer.js","sourceRoot":"","sources":["../../src/editable-layers/editable-layer.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"editable-layer.js","sourceRoot":"","sources":["../../src/editable-layers/editable-layer.ts"],"names":[],"mappings":"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"}
|