@vcmap/core 6.0.4 → 6.0.6
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/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/src/layer/vectorTileLayer.js +3 -0
- package/dist/src/layer/vectorTileLayer.js.map +1 -1
- package/dist/src/util/editor/createFeatureSession.d.ts +1 -0
- package/dist/src/util/editor/createFeatureSession.js +13 -1
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editGeometrySession.d.ts +1 -0
- package/dist/src/util/editor/editGeometrySession.js +21 -3
- package/dist/src/util/editor/editGeometrySession.js.map +1 -1
- package/dist/src/util/editor/editorSessionHelpers.js +1 -1
- package/dist/src/util/editor/interactions/creationSnapping.js +3 -3
- package/dist/src/util/editor/interactions/creationSnapping.js.map +1 -1
- package/dist/src/util/editor/interactions/layerSnapping.js +1 -1
- package/dist/src/util/editor/interactions/layerSnapping.js.map +1 -1
- package/dist/src/util/editor/interactions/translationSnapping.js +4 -4
- package/dist/src/util/editor/interactions/translationSnapping.js.map +1 -1
- package/dist/src/util/editor/snappingHelpers.d.ts +5 -2
- package/dist/src/util/editor/snappingHelpers.js +16 -9
- package/dist/src/util/editor/snappingHelpers.js.map +1 -1
- package/dist/src/util/math.d.ts +1 -0
- package/dist/src/util/math.js +5 -0
- package/dist/src/util/math.js.map +1 -1
- package/dist/src/util/overrideCollection.js +6 -1
- package/dist/src/util/overrideCollection.js.map +1 -1
- package/index.ts +1 -0
- package/package.json +1 -1
- package/src/layer/vectorTileLayer.ts +4 -0
- package/src/util/editor/createFeatureSession.ts +14 -1
- package/src/util/editor/editGeometrySession.ts +31 -3
- package/src/util/editor/editorSessionHelpers.ts +1 -1
- package/src/util/editor/interactions/creationSnapping.ts +3 -0
- package/src/util/editor/interactions/layerSnapping.ts +1 -0
- package/src/util/editor/interactions/translationSnapping.ts +4 -0
- package/src/util/editor/snappingHelpers.ts +28 -9
- package/src/util/math.ts +9 -0
- package/src/util/overrideCollection.ts +9 -1
|
@@ -2,13 +2,13 @@ import { Fill, Icon, Stroke, Style } from 'ol/style.js';
|
|
|
2
2
|
import { Feature } from 'ol';
|
|
3
3
|
import { Point } from 'ol/geom.js';
|
|
4
4
|
import RegularShape from 'ol/style/RegularShape.js';
|
|
5
|
-
import { Cartesian2, Matrix2, Math as CesiumMath } from '@vcmap-cesium/engine';
|
|
6
|
-
import { cartesian2DDistanceSquared, cartesian2Intersection, getCartesianBearing, getMidPoint, } from '../math.js';
|
|
5
|
+
import { Cartesian2, Matrix2, Math as CesiumMath, HeightReference, } from '@vcmap-cesium/engine';
|
|
6
|
+
import { cartesian2DDistanceSquared, cartesian2Intersection, cartesian3DDistanceSquared, getCartesianBearing, getMidPoint, } from '../math.js';
|
|
7
7
|
import { getClosestPointOn2DLine } from './editorHelpers.js';
|
|
8
8
|
import { alreadyTransformedToImage, alreadyTransformedToMercator, doNotTransform, } from '../../layer/vectorSymbols.js';
|
|
9
9
|
import { blackColor } from '../../style/styleHelpers.js';
|
|
10
10
|
import { PrimitiveOptionsType } from '../../layer/vectorProperties.js';
|
|
11
|
-
import { isRelativeHeightReference } from '../featureconverter/vectorHeightInfo.js';
|
|
11
|
+
import { isClampedHeightReference, isRelativeHeightReference, } from '../featureconverter/vectorHeightInfo.js';
|
|
12
12
|
export const snapTypes = ['orthogonal', 'parallel', 'vertex', 'edge'];
|
|
13
13
|
let scratchCartesian21 = new Cartesian2();
|
|
14
14
|
let scratchCartesian22 = new Cartesian2();
|
|
@@ -156,17 +156,20 @@ function getParallelSnapResult(coordinate, p1, geometryBearings, otherVertexInde
|
|
|
156
156
|
* @param maxDistanceSquared
|
|
157
157
|
* @param snapOrthogonal
|
|
158
158
|
* @param snapParallel
|
|
159
|
+
* @param heightReference
|
|
159
160
|
*/
|
|
160
|
-
export function getAngleSnapResult(coordinate, p1, p2, geometryBearings, otherVertexIndex, maxDistanceSquared, snapOrthogonal = true, snapParallel = true) {
|
|
161
|
+
export function getAngleSnapResult(coordinate, p1, p2, geometryBearings, otherVertexIndex, maxDistanceSquared, snapOrthogonal = true, snapParallel = true, heightReference = HeightReference.CLAMP_TO_GROUND) {
|
|
161
162
|
let snapResult = snapOrthogonal
|
|
162
163
|
? getOrthogonalSnapResult(coordinate, p1, p2, otherVertexIndex)
|
|
163
164
|
: undefined;
|
|
164
165
|
if (!snapResult && snapParallel) {
|
|
165
166
|
snapResult = getParallelSnapResult(coordinate, p1, geometryBearings, otherVertexIndex);
|
|
166
167
|
}
|
|
168
|
+
const getDistanceSquared = coordinate.length === 2 || isClampedHeightReference(heightReference)
|
|
169
|
+
? cartesian2DDistanceSquared
|
|
170
|
+
: cartesian3DDistanceSquared;
|
|
167
171
|
if (snapResult?.snapped &&
|
|
168
|
-
|
|
169
|
-
maxDistanceSquared) {
|
|
172
|
+
getDistanceSquared(snapResult.snapped, coordinate) <= maxDistanceSquared) {
|
|
170
173
|
return snapResult;
|
|
171
174
|
}
|
|
172
175
|
return undefined;
|
|
@@ -178,10 +181,14 @@ export function getAngleSnapResult(coordinate, p1, p2, geometryBearings, otherVe
|
|
|
178
181
|
* @param maxDistanceSquared
|
|
179
182
|
* @param snapToVertex
|
|
180
183
|
* @param snapToEdge
|
|
184
|
+
* @param heightReference
|
|
181
185
|
*/
|
|
182
|
-
export function getGeometrySnapResult(geometries, coordinate, maxDistanceSquared, snapToVertex = true, snapToEdge = true) {
|
|
186
|
+
export function getGeometrySnapResult(geometries, coordinate, maxDistanceSquared, snapToVertex = true, snapToEdge = true, heightReference = HeightReference.CLAMP_TO_GROUND) {
|
|
183
187
|
let distanceSquared = Infinity;
|
|
184
188
|
let result;
|
|
189
|
+
const getDistanceSquared = coordinate.length === 2 || isClampedHeightReference(heightReference)
|
|
190
|
+
? cartesian2DDistanceSquared
|
|
191
|
+
: cartesian3DDistanceSquared;
|
|
185
192
|
if (snapToVertex) {
|
|
186
193
|
geometries.forEach((geometry) => {
|
|
187
194
|
const coordinates = geometry.getFlatCoordinates();
|
|
@@ -192,7 +199,7 @@ export function getGeometrySnapResult(geometries, coordinate, maxDistanceSquared
|
|
|
192
199
|
if (stride > 2) {
|
|
193
200
|
vertex[2] = coordinates[i + 2];
|
|
194
201
|
}
|
|
195
|
-
const currentDistanceSquared =
|
|
202
|
+
const currentDistanceSquared = getDistanceSquared(vertex, coordinate);
|
|
196
203
|
if (currentDistanceSquared < distanceSquared &&
|
|
197
204
|
currentDistanceSquared <= maxDistanceSquared) {
|
|
198
205
|
distanceSquared = currentDistanceSquared;
|
|
@@ -214,7 +221,7 @@ export function getGeometrySnapResult(geometries, coordinate, maxDistanceSquared
|
|
|
214
221
|
distanceSquared = Infinity;
|
|
215
222
|
geometries.forEach((geometry) => {
|
|
216
223
|
const closestPoint = geometry.getClosestPoint(coordinate);
|
|
217
|
-
const currentDistanceSquared =
|
|
224
|
+
const currentDistanceSquared = getDistanceSquared(closestPoint, coordinate);
|
|
218
225
|
if (currentDistanceSquared < distanceSquared &&
|
|
219
226
|
currentDistanceSquared <= maxDistanceSquared) {
|
|
220
227
|
distanceSquared = currentDistanceSquared;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snappingHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/snappingHelpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"snappingHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/snappingHelpers.ts"],"names":[],"mappings":"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"}
|
package/dist/src/util/math.d.ts
CHANGED
|
@@ -29,6 +29,7 @@ export declare function cartesian2DDistanceSquared(point0: Coordinate, point1: C
|
|
|
29
29
|
*/
|
|
30
30
|
export declare function cartesian2DDistance(point0: Coordinate, point1: Coordinate): number;
|
|
31
31
|
export declare function cartesian3DDistance(p1: Coordinate, p2: Coordinate): number;
|
|
32
|
+
export declare function cartesian3DDistanceSquared(p1: Coordinate, p2: Coordinate): number;
|
|
32
33
|
/**
|
|
33
34
|
* Avoid JS negative number modulo bug.
|
|
34
35
|
*/
|
package/dist/src/util/math.js
CHANGED
|
@@ -72,6 +72,11 @@ export function cartesian3DDistance(p1, p2) {
|
|
|
72
72
|
const point1 = Cartesian3.fromElements(p2[0], p2[1], p2[2]);
|
|
73
73
|
return Cartesian3.distance(point0, point1);
|
|
74
74
|
}
|
|
75
|
+
export function cartesian3DDistanceSquared(p1, p2) {
|
|
76
|
+
const point0 = Cartesian3.fromElements(p1[0], p1[1], p1[2]);
|
|
77
|
+
const point1 = Cartesian3.fromElements(p2[0], p2[1], p2[2]);
|
|
78
|
+
return Cartesian3.distanceSquared(point0, point1);
|
|
79
|
+
}
|
|
75
80
|
/**
|
|
76
81
|
* Avoid JS negative number modulo bug.
|
|
77
82
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math.js","sourceRoot":"","sources":["../../../src/util/math.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"math.js","sourceRoot":"","sources":["../../../src/util/math.ts"],"names":[],"mappings":"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"}
|
|
@@ -159,7 +159,12 @@ function makeOverrideCollection(collection, getDynamicModuleId, serializeItem, d
|
|
|
159
159
|
.forEach((item) => {
|
|
160
160
|
overrideCollection.remove(item);
|
|
161
161
|
if (item.destroy) {
|
|
162
|
-
|
|
162
|
+
try {
|
|
163
|
+
item.destroy();
|
|
164
|
+
}
|
|
165
|
+
catch (e) {
|
|
166
|
+
getLogger().error(`Failed to destroy item ${item[overrideCollection.uniqueKey]}`);
|
|
167
|
+
}
|
|
163
168
|
}
|
|
164
169
|
});
|
|
165
170
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overrideCollection.js","sourceRoot":"","sources":["../../../src/util/overrideCollection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"overrideCollection.js","sourceRoot":"","sources":["../../../src/util/overrideCollection.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
package/package.json
CHANGED
|
@@ -36,6 +36,7 @@ export type CreateFeatureSession<T extends GeometryType> =
|
|
|
36
36
|
featureAltitudeMode: AltitudeModeType | undefined;
|
|
37
37
|
featureCreated: VcsEvent<Feature<GeometryToType<T>>>;
|
|
38
38
|
creationFinished: VcsEvent<Feature<GeometryToType<T>> | null>;
|
|
39
|
+
snapTo: SnapType[];
|
|
39
40
|
snapToLayers: VectorLayer[];
|
|
40
41
|
finish(): void;
|
|
41
42
|
};
|
|
@@ -118,7 +119,7 @@ function startCreateFeatureSession<T extends GeometryType>(
|
|
|
118
119
|
check(layer, VectorLayer);
|
|
119
120
|
check(geometryType, ofEnum(GeometryType));
|
|
120
121
|
|
|
121
|
-
|
|
122
|
+
let snapTo: SnapType[] = options?.snapTo?.slice() ?? snapTypes.slice();
|
|
122
123
|
const showSegmentLength = !options?.hideSegmentLength;
|
|
123
124
|
|
|
124
125
|
const {
|
|
@@ -388,6 +389,18 @@ function startCreateFeatureSession<T extends GeometryType>(
|
|
|
388
389
|
layerSnappingInteraction.layers = snapToLayers;
|
|
389
390
|
}
|
|
390
391
|
},
|
|
392
|
+
get snapTo(): SnapType[] {
|
|
393
|
+
return snapTo.slice();
|
|
394
|
+
},
|
|
395
|
+
set snapTo(newSnaps: SnapType[]) {
|
|
396
|
+
snapTo = newSnaps.slice();
|
|
397
|
+
if (layerSnappingInteraction) {
|
|
398
|
+
layerSnappingInteraction.snapTo = snapTo;
|
|
399
|
+
}
|
|
400
|
+
if (snappingInteraction) {
|
|
401
|
+
snappingInteraction.snapTo = snapTo;
|
|
402
|
+
}
|
|
403
|
+
},
|
|
391
404
|
featureCreated,
|
|
392
405
|
creationFinished,
|
|
393
406
|
stopped,
|
|
@@ -50,11 +50,13 @@ import SegmentLengthInteraction from './interactions/segmentLengthInteraction.js
|
|
|
50
50
|
export type EditGeometrySession = EditorSession<SessionType.EDIT_GEOMETRY> & {
|
|
51
51
|
setFeature(feature?: Feature): void;
|
|
52
52
|
feature: Feature | null;
|
|
53
|
+
snapTo: SnapType[];
|
|
53
54
|
snapToLayers: VectorLayer[];
|
|
54
55
|
};
|
|
55
56
|
|
|
56
57
|
type EditGeometryInteraction = {
|
|
57
58
|
interactionChain: InteractionChain;
|
|
59
|
+
setSnapTo?: (snapTo: SnapType[]) => void;
|
|
58
60
|
destroy(): void;
|
|
59
61
|
};
|
|
60
62
|
|
|
@@ -88,8 +90,13 @@ function createEditLineStringGeometryInteraction(
|
|
|
88
90
|
const translateVertex = new TranslateVertexInteraction(feature);
|
|
89
91
|
translateVertex.vertexChanged.addEventListener(resetGeometry);
|
|
90
92
|
|
|
93
|
+
const translationSnapping = new TranslationSnapping(
|
|
94
|
+
scratchLayer,
|
|
95
|
+
geometry,
|
|
96
|
+
snapTo,
|
|
97
|
+
);
|
|
91
98
|
const interactions: AbstractInteraction[] = [
|
|
92
|
-
|
|
99
|
+
translationSnapping,
|
|
93
100
|
translateVertex,
|
|
94
101
|
];
|
|
95
102
|
|
|
@@ -133,6 +140,9 @@ function createEditLineStringGeometryInteraction(
|
|
|
133
140
|
|
|
134
141
|
return {
|
|
135
142
|
interactionChain,
|
|
143
|
+
setSnapTo(newSnapTo): void {
|
|
144
|
+
translationSnapping.snapTo = newSnapTo;
|
|
145
|
+
},
|
|
136
146
|
destroy: (): void => {
|
|
137
147
|
scratchLayer.removeFeaturesById(
|
|
138
148
|
vertices.map((v) => v.getId()) as string[],
|
|
@@ -321,8 +331,13 @@ function createEditSimplePolygonInteraction(
|
|
|
321
331
|
const translateVertex = new TranslateVertexInteraction(feature);
|
|
322
332
|
translateVertex.vertexChanged.addEventListener(resetGeometry);
|
|
323
333
|
|
|
334
|
+
const translationSnapping = new TranslationSnapping(
|
|
335
|
+
scratchLayer,
|
|
336
|
+
geometry,
|
|
337
|
+
snapTo,
|
|
338
|
+
);
|
|
324
339
|
const interactions: AbstractInteraction[] = [
|
|
325
|
-
|
|
340
|
+
translationSnapping,
|
|
326
341
|
translateVertex,
|
|
327
342
|
];
|
|
328
343
|
|
|
@@ -366,6 +381,9 @@ function createEditSimplePolygonInteraction(
|
|
|
366
381
|
|
|
367
382
|
return {
|
|
368
383
|
interactionChain,
|
|
384
|
+
setSnapTo(newSnapTo): void {
|
|
385
|
+
translationSnapping.snapTo = newSnapTo;
|
|
386
|
+
},
|
|
369
387
|
destroy: (): void => {
|
|
370
388
|
scratchLayer.removeFeaturesById(
|
|
371
389
|
vertices.map((v) => v.getId()) as string[],
|
|
@@ -459,7 +477,7 @@ function startEditGeometrySession(
|
|
|
459
477
|
let snapToLayers: VectorLayer[] =
|
|
460
478
|
editVertexOptions?.initialSnapToLayers?.slice() ?? [layer];
|
|
461
479
|
|
|
462
|
-
|
|
480
|
+
let snapTo = editVertexOptions?.snapTo?.slice() ?? [...snapTypes];
|
|
463
481
|
|
|
464
482
|
const resetPickingBehavior = setupPickingBehavior(app);
|
|
465
483
|
const altitudeModeChanged = (): void => {
|
|
@@ -619,6 +637,16 @@ function startEditGeometrySession(
|
|
|
619
637
|
get feature(): Feature | null {
|
|
620
638
|
return currentFeature;
|
|
621
639
|
},
|
|
640
|
+
get snapTo(): SnapType[] {
|
|
641
|
+
return snapTo.slice();
|
|
642
|
+
},
|
|
643
|
+
set snapTo(newSnaps: SnapType[]) {
|
|
644
|
+
snapTo = newSnaps.slice();
|
|
645
|
+
if (layerSnappingInteraction) {
|
|
646
|
+
layerSnappingInteraction.snapTo = snapTo;
|
|
647
|
+
}
|
|
648
|
+
currentInteractionSet?.setSnapTo?.(snapTo);
|
|
649
|
+
},
|
|
622
650
|
get snapToLayers(): VectorLayer[] {
|
|
623
651
|
return snapToLayers.slice();
|
|
624
652
|
},
|
|
@@ -48,7 +48,7 @@ export function setupScratchLayer(
|
|
|
48
48
|
projection: mercatorProjection.toJSON(),
|
|
49
49
|
vectorProperties: {
|
|
50
50
|
altitudeMode: 'clampToGround',
|
|
51
|
-
eyeOffset: [0, 0, -
|
|
51
|
+
eyeOffset: [0, 0, -5],
|
|
52
52
|
primitiveOptions: {
|
|
53
53
|
type: PrimitiveOptionsType.SPHERE,
|
|
54
54
|
geometryOptions: {
|
|
@@ -162,6 +162,7 @@ export default class CreationSnapping extends AbstractInteraction {
|
|
|
162
162
|
maxDistanceSquared,
|
|
163
163
|
this._snapToVertex,
|
|
164
164
|
this._snapToEdge,
|
|
165
|
+
this._scratchLayer.vectorProperties.altitudeMode,
|
|
165
166
|
);
|
|
166
167
|
}
|
|
167
168
|
|
|
@@ -175,6 +176,7 @@ export default class CreationSnapping extends AbstractInteraction {
|
|
|
175
176
|
maxDistanceSquared,
|
|
176
177
|
this._snapOrthogonal,
|
|
177
178
|
this._snapParallel,
|
|
179
|
+
this._scratchLayer.vectorProperties.altitudeMode,
|
|
178
180
|
);
|
|
179
181
|
|
|
180
182
|
if (this._isPolygon) {
|
|
@@ -188,6 +190,7 @@ export default class CreationSnapping extends AbstractInteraction {
|
|
|
188
190
|
maxDistanceSquared,
|
|
189
191
|
this._snapOrthogonal,
|
|
190
192
|
this._snapParallel,
|
|
193
|
+
this._scratchLayer.vectorProperties.altitudeMode,
|
|
191
194
|
);
|
|
192
195
|
}
|
|
193
196
|
}
|
|
@@ -167,6 +167,7 @@ export default class TranslationSnapping extends AbstractInteraction {
|
|
|
167
167
|
maxDistanceSquared,
|
|
168
168
|
this._snapToVertex,
|
|
169
169
|
this._snapToEdge,
|
|
170
|
+
this._scratchLayer.vectorProperties.altitudeMode,
|
|
170
171
|
);
|
|
171
172
|
}
|
|
172
173
|
|
|
@@ -195,6 +196,7 @@ export default class TranslationSnapping extends AbstractInteraction {
|
|
|
195
196
|
maxDistanceSquared,
|
|
196
197
|
this._snapOrthogonal,
|
|
197
198
|
this._snapParallel,
|
|
199
|
+
this._scratchLayer.vectorProperties.altitudeMode,
|
|
198
200
|
);
|
|
199
201
|
} else if (this._isPolygon) {
|
|
200
202
|
if (index === 1) {
|
|
@@ -207,6 +209,7 @@ export default class TranslationSnapping extends AbstractInteraction {
|
|
|
207
209
|
maxDistanceSquared,
|
|
208
210
|
this._snapOrthogonal,
|
|
209
211
|
this._snapParallel,
|
|
212
|
+
this._scratchLayer.vectorProperties.altitudeMode,
|
|
210
213
|
);
|
|
211
214
|
} else {
|
|
212
215
|
results[0] = getAngleSnapResult(
|
|
@@ -218,6 +221,7 @@ export default class TranslationSnapping extends AbstractInteraction {
|
|
|
218
221
|
maxDistanceSquared,
|
|
219
222
|
this._snapOrthogonal,
|
|
220
223
|
this._snapParallel,
|
|
224
|
+
this._scratchLayer.vectorProperties.altitudeMode,
|
|
221
225
|
);
|
|
222
226
|
}
|
|
223
227
|
}
|
|
@@ -3,10 +3,16 @@ import { Fill, Icon, Stroke, Style } from 'ol/style.js';
|
|
|
3
3
|
import { Feature } from 'ol';
|
|
4
4
|
import { Geometry, Point } from 'ol/geom.js';
|
|
5
5
|
import RegularShape from 'ol/style/RegularShape.js';
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
Cartesian2,
|
|
8
|
+
Matrix2,
|
|
9
|
+
Math as CesiumMath,
|
|
10
|
+
HeightReference,
|
|
11
|
+
} from '@vcmap-cesium/engine';
|
|
7
12
|
import {
|
|
8
13
|
cartesian2DDistanceSquared,
|
|
9
14
|
cartesian2Intersection,
|
|
15
|
+
cartesian3DDistanceSquared,
|
|
10
16
|
getCartesianBearing,
|
|
11
17
|
getMidPoint,
|
|
12
18
|
} from '../math.js';
|
|
@@ -19,7 +25,10 @@ import {
|
|
|
19
25
|
} from '../../layer/vectorSymbols.js';
|
|
20
26
|
import { blackColor } from '../../style/styleHelpers.js';
|
|
21
27
|
import { PrimitiveOptionsType } from '../../layer/vectorProperties.js';
|
|
22
|
-
import {
|
|
28
|
+
import {
|
|
29
|
+
isClampedHeightReference,
|
|
30
|
+
isRelativeHeightReference,
|
|
31
|
+
} from '../featureconverter/vectorHeightInfo.js';
|
|
23
32
|
|
|
24
33
|
export const snapTypes = ['orthogonal', 'parallel', 'vertex', 'edge'] as const;
|
|
25
34
|
|
|
@@ -254,6 +263,7 @@ function getParallelSnapResult(
|
|
|
254
263
|
* @param maxDistanceSquared
|
|
255
264
|
* @param snapOrthogonal
|
|
256
265
|
* @param snapParallel
|
|
266
|
+
* @param heightReference
|
|
257
267
|
*/
|
|
258
268
|
export function getAngleSnapResult(
|
|
259
269
|
coordinate: Coordinate,
|
|
@@ -264,6 +274,7 @@ export function getAngleSnapResult(
|
|
|
264
274
|
maxDistanceSquared: number,
|
|
265
275
|
snapOrthogonal = true,
|
|
266
276
|
snapParallel = true,
|
|
277
|
+
heightReference = HeightReference.CLAMP_TO_GROUND,
|
|
267
278
|
): SnapResult<'orthogonal' | 'parallel'> | undefined {
|
|
268
279
|
let snapResult: SnapResult<'orthogonal' | 'parallel'> | undefined =
|
|
269
280
|
snapOrthogonal
|
|
@@ -279,10 +290,14 @@ export function getAngleSnapResult(
|
|
|
279
290
|
);
|
|
280
291
|
}
|
|
281
292
|
|
|
293
|
+
const getDistanceSquared =
|
|
294
|
+
coordinate.length === 2 || isClampedHeightReference(heightReference)
|
|
295
|
+
? cartesian2DDistanceSquared
|
|
296
|
+
: cartesian3DDistanceSquared;
|
|
297
|
+
|
|
282
298
|
if (
|
|
283
299
|
snapResult?.snapped &&
|
|
284
|
-
|
|
285
|
-
maxDistanceSquared
|
|
300
|
+
getDistanceSquared(snapResult.snapped, coordinate) <= maxDistanceSquared
|
|
286
301
|
) {
|
|
287
302
|
return snapResult;
|
|
288
303
|
}
|
|
@@ -296,6 +311,7 @@ export function getAngleSnapResult(
|
|
|
296
311
|
* @param maxDistanceSquared
|
|
297
312
|
* @param snapToVertex
|
|
298
313
|
* @param snapToEdge
|
|
314
|
+
* @param heightReference
|
|
299
315
|
*/
|
|
300
316
|
export function getGeometrySnapResult(
|
|
301
317
|
geometries: Geometry[],
|
|
@@ -303,10 +319,16 @@ export function getGeometrySnapResult(
|
|
|
303
319
|
maxDistanceSquared: number,
|
|
304
320
|
snapToVertex = true,
|
|
305
321
|
snapToEdge = true,
|
|
322
|
+
heightReference = HeightReference.CLAMP_TO_GROUND,
|
|
306
323
|
): SnapResult<'edge' | 'vertex'> | undefined {
|
|
307
324
|
let distanceSquared = Infinity;
|
|
308
325
|
let result: SnapResult<'vertex' | 'edge'> | undefined;
|
|
309
326
|
|
|
327
|
+
const getDistanceSquared =
|
|
328
|
+
coordinate.length === 2 || isClampedHeightReference(heightReference)
|
|
329
|
+
? cartesian2DDistanceSquared
|
|
330
|
+
: cartesian3DDistanceSquared;
|
|
331
|
+
|
|
310
332
|
if (snapToVertex) {
|
|
311
333
|
geometries.forEach((geometry) => {
|
|
312
334
|
const coordinates = geometry.getFlatCoordinates();
|
|
@@ -318,10 +340,7 @@ export function getGeometrySnapResult(
|
|
|
318
340
|
if (stride > 2) {
|
|
319
341
|
vertex[2] = coordinates[i + 2];
|
|
320
342
|
}
|
|
321
|
-
const currentDistanceSquared =
|
|
322
|
-
vertex,
|
|
323
|
-
coordinate,
|
|
324
|
-
);
|
|
343
|
+
const currentDistanceSquared = getDistanceSquared(vertex, coordinate);
|
|
325
344
|
|
|
326
345
|
if (
|
|
327
346
|
currentDistanceSquared < distanceSquared &&
|
|
@@ -346,7 +365,7 @@ export function getGeometrySnapResult(
|
|
|
346
365
|
distanceSquared = Infinity;
|
|
347
366
|
geometries.forEach((geometry) => {
|
|
348
367
|
const closestPoint = geometry.getClosestPoint(coordinate);
|
|
349
|
-
const currentDistanceSquared =
|
|
368
|
+
const currentDistanceSquared = getDistanceSquared(
|
|
350
369
|
closestPoint,
|
|
351
370
|
coordinate,
|
|
352
371
|
);
|
package/src/util/math.ts
CHANGED
|
@@ -105,6 +105,15 @@ export function cartesian3DDistance(p1: Coordinate, p2: Coordinate): number {
|
|
|
105
105
|
return Cartesian3.distance(point0, point1);
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
+
export function cartesian3DDistanceSquared(
|
|
109
|
+
p1: Coordinate,
|
|
110
|
+
p2: Coordinate,
|
|
111
|
+
): number {
|
|
112
|
+
const point0 = Cartesian3.fromElements(p1[0], p1[1], p1[2]);
|
|
113
|
+
const point1 = Cartesian3.fromElements(p2[0], p2[1], p2[2]);
|
|
114
|
+
return Cartesian3.distanceSquared(point0, point1);
|
|
115
|
+
}
|
|
116
|
+
|
|
108
117
|
/**
|
|
109
118
|
* Avoid JS negative number modulo bug.
|
|
110
119
|
*/
|
|
@@ -277,7 +277,15 @@ function makeOverrideCollection<
|
|
|
277
277
|
.forEach((item): void => {
|
|
278
278
|
overrideCollection.remove(item);
|
|
279
279
|
if (item.destroy) {
|
|
280
|
-
|
|
280
|
+
try {
|
|
281
|
+
item.destroy();
|
|
282
|
+
} catch (e) {
|
|
283
|
+
getLogger().error(
|
|
284
|
+
`Failed to destroy item ${
|
|
285
|
+
item[overrideCollection.uniqueKey] as string
|
|
286
|
+
}`,
|
|
287
|
+
);
|
|
288
|
+
}
|
|
281
289
|
}
|
|
282
290
|
});
|
|
283
291
|
};
|