@vcmap/core 6.0.0-rc.4 → 6.0.0-rc.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/cesium.d.ts +11 -0
- package/dist/index.d.ts +23 -16
- package/dist/index.js +21 -14
- package/dist/index.js.map +1 -1
- package/dist/ol.d.ts +15 -2
- package/dist/src/layer/cesium/clusterContext.d.ts +8 -14
- package/dist/src/layer/cesium/clusterContext.js +62 -41
- package/dist/src/layer/cesium/clusterContext.js.map +1 -1
- package/dist/src/layer/cesium/vectorCesiumImpl.d.ts +2 -3
- package/dist/src/layer/cesium/vectorCesiumImpl.js +16 -10
- package/dist/src/layer/cesium/vectorCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorContext.d.ts +10 -53
- package/dist/src/layer/cesium/vectorContext.js +88 -172
- package/dist/src/layer/cesium/vectorContext.js.map +1 -1
- package/dist/src/layer/geojsonHelpers.d.ts +1 -1
- package/dist/src/layer/geojsonHelpers.js +5 -10
- package/dist/src/layer/geojsonHelpers.js.map +1 -1
- package/dist/src/layer/oblique/obliqueHelpers.js +6 -6
- package/dist/src/layer/oblique/obliqueHelpers.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +0 -37
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorProperties.d.ts +8 -3
- package/dist/src/layer/vectorProperties.js +30 -5
- package/dist/src/layer/vectorProperties.js.map +1 -1
- package/dist/src/map/baseOLMap.js +1 -1
- package/dist/src/map/baseOLMap.js.map +1 -1
- package/dist/src/map/obliqueMap.d.ts +3 -0
- package/dist/src/map/obliqueMap.js +27 -6
- package/dist/src/map/obliqueMap.js.map +1 -1
- package/dist/src/map/vcsMap.d.ts +8 -0
- package/dist/src/map/vcsMap.js +11 -0
- package/dist/src/map/vcsMap.js.map +1 -1
- package/dist/src/oblique/helpers.js +5 -5
- package/dist/src/oblique/helpers.js.map +1 -1
- package/dist/src/oblique/obliqueDataSet.js +4 -4
- package/dist/src/oblique/obliqueDataSet.js.map +1 -1
- package/dist/src/ol/geom/geometryCollection.js +19 -2
- package/dist/src/ol/geom/geometryCollection.js.map +1 -1
- package/dist/src/style/arcStyle.js +1 -0
- package/dist/src/style/arcStyle.js.map +1 -1
- package/dist/src/util/editor/createFeatureSession.d.ts +5 -1
- package/dist/src/util/editor/createFeatureSession.js +48 -4
- package/dist/src/util/editor/createFeatureSession.js.map +1 -1
- package/dist/src/util/editor/editFeaturesSession.d.ts +10 -4
- package/dist/src/util/editor/editFeaturesSession.js +74 -37
- package/dist/src/util/editor/editFeaturesSession.js.map +1 -1
- package/dist/src/util/editor/editGeometrySession.d.ts +5 -1
- package/dist/src/util/editor/editGeometrySession.js +77 -55
- package/dist/src/util/editor/editGeometrySession.js.map +1 -1
- package/dist/src/util/editor/editorHelpers.d.ts +12 -6
- package/dist/src/util/editor/editorHelpers.js +47 -20
- package/dist/src/util/editor/editorHelpers.js.map +1 -1
- package/dist/src/util/editor/editorSessionHelpers.d.ts +5 -0
- package/dist/src/util/editor/editorSessionHelpers.js +1 -0
- package/dist/src/util/editor/editorSessionHelpers.js.map +1 -1
- package/dist/src/util/editor/editorSymbols.d.ts +1 -1
- package/dist/src/util/editor/editorSymbols.js +1 -1
- package/dist/src/util/editor/editorSymbols.js.map +1 -1
- package/dist/src/util/editor/interactions/createBBoxInteraction.d.ts +1 -0
- package/dist/src/util/editor/interactions/createBBoxInteraction.js +20 -16
- package/dist/src/util/editor/interactions/createBBoxInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/createCircleInteraction.js +1 -1
- package/dist/src/util/editor/interactions/createCircleInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/createLineStringInteraction.js +3 -3
- package/dist/src/util/editor/interactions/createLineStringInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/createPointInteraction.js +1 -1
- package/dist/src/util/editor/interactions/createPointInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/createPolygonInteraction.d.ts +4 -0
- package/dist/src/util/editor/interactions/createPolygonInteraction.js +9 -3
- package/dist/src/util/editor/interactions/createPolygonInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/creationSnapping.d.ts +26 -0
- package/dist/src/util/editor/interactions/creationSnapping.js +139 -0
- package/dist/src/util/editor/interactions/creationSnapping.js.map +1 -0
- package/dist/src/util/editor/interactions/editGeometryMouseOverInteraction.js +3 -2
- package/dist/src/util/editor/interactions/editGeometryMouseOverInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/insertVertexInteraction.d.ts +3 -1
- package/dist/src/util/editor/interactions/insertVertexInteraction.js +14 -6
- package/dist/src/util/editor/interactions/insertVertexInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/layerSnapping.d.ts +19 -0
- package/dist/src/util/editor/interactions/layerSnapping.js +87 -0
- package/dist/src/util/editor/interactions/layerSnapping.js.map +1 -0
- package/dist/src/util/editor/interactions/translateVertexInteraction.js +2 -2
- package/dist/src/util/editor/interactions/translateVertexInteraction.js.map +1 -1
- package/dist/src/util/editor/interactions/translationSnapping.d.ts +25 -0
- package/dist/src/util/editor/interactions/translationSnapping.js +179 -0
- package/dist/src/util/editor/interactions/translationSnapping.js.map +1 -0
- package/dist/src/util/editor/snappingHelpers.d.ts +44 -0
- package/dist/src/util/editor/snappingHelpers.js +329 -0
- package/dist/src/util/editor/snappingHelpers.js.map +1 -0
- package/dist/src/util/editor/transformation/create2DHandlers.js +26 -26
- package/dist/src/util/editor/transformation/create2DHandlers.js.map +1 -1
- package/dist/src/util/editor/transformation/create3DHandlers.js +65 -14
- package/dist/src/util/editor/transformation/create3DHandlers.js.map +1 -1
- package/dist/src/util/editor/transformation/scaleInteraction.js +27 -5
- package/dist/src/util/editor/transformation/scaleInteraction.js.map +1 -1
- package/dist/src/util/editor/transformation/transformationHandler.js +56 -38
- package/dist/src/util/editor/transformation/transformationHandler.js.map +1 -1
- package/dist/src/util/editor/transformation/transformationTypes.d.ts +2 -0
- package/dist/src/util/editor/transformation/transformationTypes.js +4 -0
- package/dist/src/util/editor/transformation/transformationTypes.js.map +1 -1
- package/dist/src/util/featureconverter/arcToCesium.d.ts +5 -19
- package/dist/src/util/featureconverter/arcToCesium.js +15 -42
- package/dist/src/util/featureconverter/arcToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/circleToCesium.d.ts +2 -27
- package/dist/src/util/featureconverter/circleToCesium.js +84 -63
- package/dist/src/util/featureconverter/circleToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/clampedPrimitive.d.ts +2 -0
- package/dist/src/util/featureconverter/clampedPrimitive.js +29 -0
- package/dist/src/util/featureconverter/clampedPrimitive.js.map +1 -0
- package/dist/src/util/featureconverter/convert.d.ts +26 -7
- package/dist/src/util/featureconverter/convert.js +221 -44
- package/dist/src/util/featureconverter/convert.js.map +1 -1
- package/dist/src/util/featureconverter/extent3D.d.ts +4 -3
- package/dist/src/util/featureconverter/extent3D.js +4 -3
- package/dist/src/util/featureconverter/extent3D.js.map +1 -1
- package/dist/src/util/featureconverter/lineStringToCesium.d.ts +12 -27
- package/dist/src/util/featureconverter/lineStringToCesium.js +85 -107
- package/dist/src/util/featureconverter/lineStringToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/pointHelpers.d.ts +8 -11
- package/dist/src/util/featureconverter/pointHelpers.js +134 -120
- package/dist/src/util/featureconverter/pointHelpers.js.map +1 -1
- package/dist/src/util/featureconverter/pointToCesium.d.ts +14 -17
- package/dist/src/util/featureconverter/pointToCesium.js +47 -96
- package/dist/src/util/featureconverter/pointToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/polygonToCesium.d.ts +2 -26
- package/dist/src/util/featureconverter/polygonToCesium.js +62 -72
- package/dist/src/util/featureconverter/polygonToCesium.js.map +1 -1
- package/dist/src/util/featureconverter/storeyHelpers.d.ts +17 -0
- package/dist/src/util/featureconverter/storeyHelpers.js +78 -0
- package/dist/src/util/featureconverter/storeyHelpers.js.map +1 -0
- package/dist/src/util/featureconverter/vectorGeometryFactory.d.ts +54 -0
- package/dist/src/util/featureconverter/vectorGeometryFactory.js +278 -0
- package/dist/src/util/featureconverter/vectorGeometryFactory.js.map +1 -0
- package/dist/src/util/featureconverter/vectorHeightInfo.d.ts +86 -0
- package/dist/src/util/featureconverter/vectorHeightInfo.js +242 -0
- package/dist/src/util/featureconverter/vectorHeightInfo.js.map +1 -0
- package/dist/src/util/geometryHelpers.d.ts +22 -1
- package/dist/src/util/geometryHelpers.js +65 -2
- package/dist/src/util/geometryHelpers.js.map +1 -1
- package/dist/src/util/mapCollection.js +8 -0
- package/dist/src/util/mapCollection.js.map +1 -1
- package/dist/src/util/math.d.ts +6 -2
- package/dist/src/util/math.js +34 -12
- package/dist/src/util/math.js.map +1 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js +3 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js.map +1 -1
- package/dist/tests/unit/helpers/helpers.d.ts +2 -9
- package/dist/tests/unit/helpers/helpers.js +2 -8
- package/dist/tests/unit/helpers/helpers.js.map +1 -1
- package/index.ts +74 -35
- package/package.json +3 -3
- package/src/cesium/cesium.d.ts +11 -0
- package/src/layer/cesium/clusterContext.ts +82 -91
- package/src/layer/cesium/vectorCesiumImpl.ts +17 -11
- package/src/layer/cesium/vectorContext.ts +120 -348
- package/src/layer/geojsonHelpers.ts +9 -12
- package/src/layer/oblique/obliqueHelpers.ts +6 -6
- package/src/layer/vectorLayer.ts +0 -71
- package/src/layer/vectorProperties.ts +46 -9
- package/src/map/baseOLMap.ts +1 -1
- package/src/map/obliqueMap.ts +46 -6
- package/src/map/vcsMap.ts +20 -2
- package/src/oblique/helpers.ts +11 -5
- package/src/oblique/obliqueDataSet.ts +4 -4
- package/src/ol/geom/geometryCollection.js +21 -2
- package/src/ol/ol.d.ts +15 -2
- package/src/style/arcStyle.ts +1 -0
- package/src/util/editor/createFeatureSession.ts +64 -6
- package/src/util/editor/editFeaturesSession.ts +105 -39
- package/src/util/editor/editGeometrySession.ts +118 -75
- package/src/util/editor/editorHelpers.ts +78 -30
- package/src/util/editor/editorSessionHelpers.ts +7 -0
- package/src/util/editor/editorSymbols.ts +1 -1
- package/src/util/editor/interactions/createBBoxInteraction.ts +25 -16
- package/src/util/editor/interactions/createCircleInteraction.ts +1 -1
- package/src/util/editor/interactions/createLineStringInteraction.ts +9 -3
- package/src/util/editor/interactions/createPointInteraction.ts +1 -1
- package/src/util/editor/interactions/createPolygonInteraction.ts +16 -3
- package/src/util/editor/interactions/creationSnapping.ts +226 -0
- package/src/util/editor/interactions/editGeometryMouseOverInteraction.ts +3 -2
- package/src/util/editor/interactions/insertVertexInteraction.ts +27 -7
- package/src/util/editor/interactions/layerSnapping.ts +136 -0
- package/src/util/editor/interactions/translateVertexInteraction.ts +8 -2
- package/src/util/editor/interactions/translationSnapping.ts +302 -0
- package/src/util/editor/snappingHelpers.ts +490 -0
- package/src/util/editor/transformation/create2DHandlers.ts +38 -26
- package/src/util/editor/transformation/create3DHandlers.ts +84 -22
- package/src/util/editor/transformation/scaleInteraction.ts +28 -5
- package/src/util/editor/transformation/transformationHandler.ts +72 -41
- package/src/util/editor/transformation/transformationTypes.ts +5 -0
- package/src/util/featureconverter/arcToCesium.ts +25 -95
- package/src/util/featureconverter/circleToCesium.ts +127 -113
- package/src/util/featureconverter/clampedPrimitive.ts +70 -0
- package/src/util/featureconverter/convert.ts +446 -114
- package/src/util/featureconverter/extent3D.ts +13 -6
- package/src/util/featureconverter/lineStringToCesium.ts +132 -179
- package/src/util/featureconverter/pointHelpers.ts +271 -214
- package/src/util/featureconverter/pointToCesium.ts +111 -175
- package/src/util/featureconverter/polygonToCesium.ts +98 -117
- package/src/util/featureconverter/storeyHelpers.ts +104 -0
- package/src/util/featureconverter/vectorGeometryFactory.ts +601 -0
- package/src/util/featureconverter/vectorHeightInfo.ts +393 -0
- package/src/util/geometryHelpers.ts +79 -5
- package/src/util/mapCollection.ts +8 -0
- package/src/util/math.ts +59 -12
- package/dist/src/util/featureconverter/featureconverterHelper.d.ts +0 -35
- package/dist/src/util/featureconverter/featureconverterHelper.js +0 -404
- package/dist/src/util/featureconverter/featureconverterHelper.js.map +0 -1
- package/src/util/featureconverter/featureconverterHelper.ts +0 -672
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { LineString, Polygon } from 'ol/geom.js';
|
|
2
|
+
import { unByKey } from 'ol/Observable.js';
|
|
3
|
+
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
4
|
+
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
5
|
+
import { getSnappedCoordinateForResults, getAngleSnapResult, setSnappingFeatures, getGeometrySnapResult, snapTypes, } from '../snappingHelpers.js';
|
|
6
|
+
import { getCartesianBearing } from '../../math.js';
|
|
7
|
+
import { validityPlaceholder } from './createPolygonInteraction.js';
|
|
8
|
+
import { alreadySnapped, } from '../editorSessionHelpers.js';
|
|
9
|
+
function getBearings(coordinates) {
|
|
10
|
+
// we dont want to take into account the last bearing, since that would be our own
|
|
11
|
+
const length = coordinates.length - 2;
|
|
12
|
+
if (length > 0) {
|
|
13
|
+
const bearings = new Array(length);
|
|
14
|
+
for (let i = 0; i < length; i++) {
|
|
15
|
+
bearings[i] = getCartesianBearing(coordinates[i], coordinates[i + 1]);
|
|
16
|
+
}
|
|
17
|
+
return bearings;
|
|
18
|
+
}
|
|
19
|
+
return [];
|
|
20
|
+
}
|
|
21
|
+
export default class CreationSnapping extends AbstractInteraction {
|
|
22
|
+
_coordinates = [];
|
|
23
|
+
_bearings = [];
|
|
24
|
+
_scratchLayer;
|
|
25
|
+
_isPolygon = false;
|
|
26
|
+
_coordinatesDirty = false;
|
|
27
|
+
_geometryLister;
|
|
28
|
+
_removeFeatures;
|
|
29
|
+
_snappingGeometry;
|
|
30
|
+
_snapToVertex = true;
|
|
31
|
+
_snapToEdge = true;
|
|
32
|
+
_snapOrthogonal = true;
|
|
33
|
+
_snapParallel = true;
|
|
34
|
+
constructor(scratchLayer, snapTo = [...snapTypes]) {
|
|
35
|
+
super(EventType.CLICKMOVE | EventType.DBLCLICK, ModificationKeyType.NONE | ModificationKeyType.CTRL);
|
|
36
|
+
this._scratchLayer = scratchLayer;
|
|
37
|
+
this.snapTo = snapTo;
|
|
38
|
+
}
|
|
39
|
+
get snapTo() {
|
|
40
|
+
const snapTo = [];
|
|
41
|
+
if (this._snapToVertex) {
|
|
42
|
+
snapTo.push('vertex');
|
|
43
|
+
}
|
|
44
|
+
if (this._snapToEdge) {
|
|
45
|
+
snapTo.push('edge');
|
|
46
|
+
}
|
|
47
|
+
if (this._snapOrthogonal) {
|
|
48
|
+
snapTo.push('orthogonal');
|
|
49
|
+
}
|
|
50
|
+
if (this._snapParallel) {
|
|
51
|
+
snapTo.push('parallel');
|
|
52
|
+
}
|
|
53
|
+
return snapTo;
|
|
54
|
+
}
|
|
55
|
+
set snapTo(snapTo) {
|
|
56
|
+
this._snapToVertex = snapTo.includes('vertex');
|
|
57
|
+
this._snapToEdge = snapTo.includes('edge');
|
|
58
|
+
this._snapOrthogonal = snapTo.includes('orthogonal');
|
|
59
|
+
this._snapParallel = snapTo.includes('parallel');
|
|
60
|
+
}
|
|
61
|
+
_setCoordinates(coordinates) {
|
|
62
|
+
this._coordinates = coordinates;
|
|
63
|
+
this._bearings = getBearings(this._coordinates);
|
|
64
|
+
if (this._coordinates.length > 2) {
|
|
65
|
+
this._snappingGeometry = new LineString(this._coordinates.slice(0, this._coordinates.length - 1));
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
setGeometry(geometry) {
|
|
69
|
+
this._geometryLister?.();
|
|
70
|
+
this._snappingGeometry = undefined;
|
|
71
|
+
let setCoordinates;
|
|
72
|
+
if (geometry instanceof Polygon) {
|
|
73
|
+
this._isPolygon = true;
|
|
74
|
+
setCoordinates = () => {
|
|
75
|
+
if (!geometry[validityPlaceholder]) {
|
|
76
|
+
this._setCoordinates(geometry.getCoordinates()[0]);
|
|
77
|
+
}
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
this._isPolygon = false;
|
|
82
|
+
setCoordinates = () => {
|
|
83
|
+
this._setCoordinates(geometry.getCoordinates());
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
setCoordinates();
|
|
87
|
+
const key = geometry.on('change', () => {
|
|
88
|
+
if (this._coordinatesDirty) {
|
|
89
|
+
setCoordinates();
|
|
90
|
+
this._coordinatesDirty = false;
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
this._geometryLister = () => {
|
|
94
|
+
unByKey(key);
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
pipe(event) {
|
|
98
|
+
this._removeFeatures?.();
|
|
99
|
+
if (event.type === EventType.CLICK) {
|
|
100
|
+
event.chainEnded?.addEventListener(() => {
|
|
101
|
+
this._coordinatesDirty = true;
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
if (!event[alreadySnapped] &&
|
|
105
|
+
event.key !== ModificationKeyType.CTRL &&
|
|
106
|
+
this._coordinates.length >= 3) {
|
|
107
|
+
const results = new Array(2);
|
|
108
|
+
const maxDistanceSquared = (event.map.getCurrentResolution(event.positionOrPixel) * 12) ** 2;
|
|
109
|
+
if (this._snappingGeometry) {
|
|
110
|
+
results[0] = getGeometrySnapResult([this._snappingGeometry], event.positionOrPixel, maxDistanceSquared, this._snapToVertex, this._snapToEdge);
|
|
111
|
+
}
|
|
112
|
+
if (!results[0] && (this._snapOrthogonal || this._snapParallel)) {
|
|
113
|
+
results[0] = getAngleSnapResult(event.positionOrPixel, this._coordinates.at(-2), this._coordinates.at(-3), this._bearings, this._coordinates.length - 2, maxDistanceSquared, this._snapOrthogonal, this._snapParallel);
|
|
114
|
+
if (this._isPolygon) {
|
|
115
|
+
const newCandidate = results[0]?.snapped ?? event.positionOrPixel;
|
|
116
|
+
results[1] = getAngleSnapResult(newCandidate, this._coordinates.at(0), this._coordinates.at(1), this._bearings, 0, maxDistanceSquared, this._snapOrthogonal, this._snapParallel);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
const lastResult = getSnappedCoordinateForResults(results, this._coordinates, maxDistanceSquared);
|
|
120
|
+
if (lastResult) {
|
|
121
|
+
if (event.positionOrPixel.length > lastResult.length) {
|
|
122
|
+
lastResult[2] = event.positionOrPixel[2];
|
|
123
|
+
}
|
|
124
|
+
else if (event.positionOrPixel.length < lastResult.length) {
|
|
125
|
+
lastResult.pop();
|
|
126
|
+
}
|
|
127
|
+
event.positionOrPixel = lastResult;
|
|
128
|
+
this._removeFeatures = setSnappingFeatures(results, this._coordinates, this._scratchLayer);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return Promise.resolve(event);
|
|
132
|
+
}
|
|
133
|
+
destroy() {
|
|
134
|
+
this._geometryLister?.();
|
|
135
|
+
this._removeFeatures?.();
|
|
136
|
+
super.destroy();
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=creationSnapping.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"creationSnapping.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/creationSnapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,9 +31,10 @@ class EditGeometryMouseOverInteraction extends AbstractInteraction {
|
|
|
31
31
|
_currentVertex = null;
|
|
32
32
|
cursorStyle;
|
|
33
33
|
constructor(denyRemoval) {
|
|
34
|
-
super(EventType.MOVE, denyRemoval
|
|
34
|
+
super(EventType.MOVE, (denyRemoval
|
|
35
35
|
? ModificationKeyType.NONE
|
|
36
|
-
: ModificationKeyType.NONE | ModificationKeyType.SHIFT)
|
|
36
|
+
: ModificationKeyType.NONE | ModificationKeyType.SHIFT) |
|
|
37
|
+
ModificationKeyType.CTRL);
|
|
37
38
|
this.setActive();
|
|
38
39
|
}
|
|
39
40
|
pipe(event) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editGeometryMouseOverInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/editGeometryMouseOverInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,mBAAmB,EACnB,SAAS,GACV,MAAM,yCAAyC,CAAC;AAGjD,MAAM,UAAU,GAAG;;;;;;OAMZ,CAAC;AAER,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,iEAAiE;IACjE,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,aAAa;IACxB,SAAS,EAAE,aAAa;IACxB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,MAAM;IACjB,MAAM,EAAE,SAAS;IACjB,IAAI,EAAE,yCAAyC,kBAAkB,CAC/D,UAAU,CACX,aAAa;IACd,eAAe,EAAE,MAAM;IACvB,YAAY,EAAE,SAAS;IACvB,YAAY,EAAE,MAAM;IACpB,cAAc,EAAE,MAAM;IACtB,mBAAmB,EAAE,aAAa;CACnC,CAAC;AAEF;;;GAGG;AACH,MAAM,gCAAiC,SAAQ,mBAAmB;IACxD,cAAc,GAAkB,IAAI,CAAC;IAE7C,WAAW,CAAkC;IAE7C,YAAY,WAAqB;QAC/B,KAAK,CACH,SAAS,CAAC,IAAI,EACd,WAAW;
|
|
1
|
+
{"version":3,"file":"editGeometryMouseOverInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/editGeometryMouseOverInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import type { Feature } from 'ol/index.js';
|
|
|
3
3
|
import AbstractInteraction, { EventAfterEventHandler } from '../../../interaction/abstractInteraction.js';
|
|
4
4
|
import { type Vertex } from '../editorHelpers.js';
|
|
5
5
|
import VcsEvent from '../../../vcsEvent.js';
|
|
6
|
+
import VectorProperties from '../../../layer/vectorProperties.js';
|
|
6
7
|
export type VertexInsertedEvent = {
|
|
7
8
|
vertex: Vertex;
|
|
8
9
|
index: number;
|
|
@@ -12,11 +13,12 @@ declare class InsertVertexInteraction extends AbstractInteraction {
|
|
|
12
13
|
private _feature;
|
|
13
14
|
private _geometry;
|
|
14
15
|
private _isLinearRing;
|
|
16
|
+
private _vectorProperties;
|
|
15
17
|
/**
|
|
16
18
|
* @param feature
|
|
17
19
|
* @param geometry
|
|
18
20
|
*/
|
|
19
|
-
constructor(feature: Feature<LineString | Polygon>, geometry: LineString | LinearRing);
|
|
21
|
+
constructor(feature: Feature<LineString | Polygon>, geometry: LineString | LinearRing, vectorProperties: VectorProperties);
|
|
20
22
|
pipe(event: EventAfterEventHandler): Promise<EventAfterEventHandler>;
|
|
21
23
|
destroy(): void;
|
|
22
24
|
}
|
|
@@ -1,22 +1,26 @@
|
|
|
1
1
|
import { LinearRing } from 'ol/geom.js';
|
|
2
2
|
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
3
3
|
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
4
|
-
import {
|
|
4
|
+
import { cartesian2DDistanceSquared } from '../../math.js';
|
|
5
5
|
import { createVertex, getOlcsPropsFromFeature, pointOnLine2D, pointOnLine3D, } from '../editorHelpers.js';
|
|
6
6
|
import VcsEvent from '../../../vcsEvent.js';
|
|
7
|
+
import { is2DLayout } from '../../geometryHelpers.js';
|
|
8
|
+
import { isClampedHeightReference } from '../../featureconverter/vectorHeightInfo.js';
|
|
7
9
|
class InsertVertexInteraction extends AbstractInteraction {
|
|
8
10
|
vertexInserted = new VcsEvent();
|
|
9
11
|
_feature;
|
|
10
12
|
_geometry;
|
|
11
13
|
_isLinearRing;
|
|
14
|
+
_vectorProperties;
|
|
12
15
|
/**
|
|
13
16
|
* @param feature
|
|
14
17
|
* @param geometry
|
|
15
18
|
*/
|
|
16
|
-
constructor(feature, geometry) {
|
|
19
|
+
constructor(feature, geometry, vectorProperties) {
|
|
17
20
|
super(EventType.CLICK, ModificationKeyType.NONE);
|
|
18
21
|
this._feature = feature;
|
|
19
22
|
this._geometry = geometry;
|
|
23
|
+
this._vectorProperties = vectorProperties;
|
|
20
24
|
this._isLinearRing = this._geometry instanceof LinearRing;
|
|
21
25
|
this.setActive();
|
|
22
26
|
}
|
|
@@ -28,12 +32,16 @@ class InsertVertexInteraction extends AbstractInteraction {
|
|
|
28
32
|
if (this._isLinearRing) {
|
|
29
33
|
lineCoords.push(lineCoords[0]);
|
|
30
34
|
}
|
|
31
|
-
const
|
|
32
|
-
|
|
35
|
+
const distanceSquared = cartesian2DDistanceSquared(closestCoord, coordinate); // todo respect altitude mode here. e.g. distance3D
|
|
36
|
+
const is2DLine = is2DLayout(this._geometry.getLayout()) ||
|
|
37
|
+
isClampedHeightReference(this._vectorProperties.getAltitudeMode(this._feature));
|
|
38
|
+
// XXX how to handle relative to ground height references?
|
|
39
|
+
if (distanceSquared <
|
|
40
|
+
(event.map.getCurrentResolution(coordinate) * 5) ** 2) {
|
|
33
41
|
const length = lineCoords.length - 1;
|
|
34
42
|
let i = 0;
|
|
35
43
|
for (i; i < length; i++) {
|
|
36
|
-
const onLine =
|
|
44
|
+
const onLine = is2DLine
|
|
37
45
|
? pointOnLine2D(lineCoords[i], lineCoords[i + 1], closestCoord)
|
|
38
46
|
: pointOnLine3D(lineCoords[i], lineCoords[i + 1], closestCoord);
|
|
39
47
|
if (onLine) {
|
|
@@ -45,7 +53,7 @@ class InsertVertexInteraction extends AbstractInteraction {
|
|
|
45
53
|
index = 0;
|
|
46
54
|
}
|
|
47
55
|
this.vertexInserted.raiseEvent({
|
|
48
|
-
vertex: createVertex(closestCoord, getOlcsPropsFromFeature(this._feature)),
|
|
56
|
+
vertex: createVertex(closestCoord, getOlcsPropsFromFeature(this._feature), -1),
|
|
49
57
|
index,
|
|
50
58
|
});
|
|
51
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/insertVertexInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAiC,MAAM,YAAY,CAAC;AAEvE,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,SAAS,EACT,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"insertVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/insertVertexInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAiC,MAAM,YAAY,CAAC;AAEvE,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,SAAS,EACT,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,aAAa,EACb,aAAa,GAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAQtF,MAAM,uBAAwB,SAAQ,mBAAmB;IACvD,cAAc,GAAG,IAAI,QAAQ,EAAuB,CAAC;IAE7C,QAAQ,CAAgC;IAExC,SAAS,CAA0B;IAEnC,aAAa,CAAU;IAEvB,iBAAiB,CAAmB;IAE5C;;;OAGG;IACH,YACE,OAAsC,EACtC,QAAiC,EACjC,gBAAkC;QAElC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,YAAY,UAAU,CAAC;QAC1D,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,KAA6B;QAChC,IAAI,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,QAAQ,EAAE;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;YACnD,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC;YACzC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YAEhE,IAAI,IAAI,CAAC,aAAa,EAAE;gBACtB,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;aAChC;YACD,MAAM,eAAe,GAAG,0BAA0B,CAChD,YAAY,EACZ,UAAU,CACX,CAAC,CAAC,mDAAmD;YACtD,MAAM,QAAQ,GACZ,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBACtC,wBAAwB,CACtB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CACtD,CAAC;YAEJ,0DAA0D;YAC1D,IACE,eAAe;gBACf,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EACrD;gBACA,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;gBACrC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACV,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;oBACvB,MAAM,MAAM,GAAG,QAAQ;wBACrB,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC;wBAC/D,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;oBAClE,IAAI,MAAM,EAAE;wBACV,MAAM;qBACP;iBACF;gBAED,IAAI,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;gBAClB,IAAI,IAAI,CAAC,aAAa,IAAI,KAAK,KAAK,UAAU,CAAC,MAAM,EAAE;oBACrD,KAAK,GAAG,CAAC,CAAC;iBACX;gBACD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;oBAC7B,MAAM,EAAE,YAAY,CAClB,YAAY,EACZ,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,EACtC,CAAC,CAAC,CACH;oBACD,KAAK;iBACN,CAAC,CAAC;aACJ;SACF;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAC9B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,uBAAuB,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Feature } from 'ol';
|
|
2
|
+
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
3
|
+
import { EventType } from '../../../interaction/interactionType.js';
|
|
4
|
+
import VectorLayer from '../../../layer/vectorLayer.js';
|
|
5
|
+
import { SnappingInteractionEvent } from '../editorSessionHelpers.js';
|
|
6
|
+
import { SnapType } from '../snappingHelpers.js';
|
|
7
|
+
export default class LayerSnapping extends AbstractInteraction {
|
|
8
|
+
layers: VectorLayer[];
|
|
9
|
+
private _scratchLayer;
|
|
10
|
+
private _removeFeatures;
|
|
11
|
+
private _filter;
|
|
12
|
+
private _snapToVertex;
|
|
13
|
+
private _snapToEdge;
|
|
14
|
+
constructor(layers: VectorLayer[], scratchLayer: VectorLayer, filter: (f: Feature) => boolean, snapTo?: SnapType[], type?: EventType);
|
|
15
|
+
get snapTo(): SnapType[];
|
|
16
|
+
set snapTo(snapTo: SnapType[]);
|
|
17
|
+
pipe(event: SnappingInteractionEvent): Promise<SnappingInteractionEvent>;
|
|
18
|
+
destroy(): void;
|
|
19
|
+
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
2
|
+
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
3
|
+
import { originalFeatureSymbol } from '../../../layer/vectorSymbols.js';
|
|
4
|
+
import ObliqueMap from '../../../map/obliqueMap.js';
|
|
5
|
+
import { alreadySnapped, } from '../editorSessionHelpers.js';
|
|
6
|
+
import { setSnappingFeatures, getGeometrySnapResult, } from '../snappingHelpers.js';
|
|
7
|
+
export default class LayerSnapping extends AbstractInteraction {
|
|
8
|
+
layers;
|
|
9
|
+
_scratchLayer;
|
|
10
|
+
_removeFeatures;
|
|
11
|
+
_filter;
|
|
12
|
+
_snapToVertex = true;
|
|
13
|
+
_snapToEdge = true;
|
|
14
|
+
constructor(layers, scratchLayer, filter, snapTo = ['vertex', 'edge'], type = EventType.CLICKMOVE | EventType.DBLCLICK) {
|
|
15
|
+
super(type, ModificationKeyType.NONE | ModificationKeyType.CTRL);
|
|
16
|
+
this.layers = layers;
|
|
17
|
+
this._scratchLayer = scratchLayer;
|
|
18
|
+
this._filter = filter;
|
|
19
|
+
this.snapTo = snapTo;
|
|
20
|
+
}
|
|
21
|
+
get snapTo() {
|
|
22
|
+
const snapTo = [];
|
|
23
|
+
if (this._snapToVertex) {
|
|
24
|
+
snapTo.push('vertex');
|
|
25
|
+
}
|
|
26
|
+
if (this._snapToEdge) {
|
|
27
|
+
snapTo.push('edge');
|
|
28
|
+
}
|
|
29
|
+
return snapTo;
|
|
30
|
+
}
|
|
31
|
+
set snapTo(snapTo) {
|
|
32
|
+
this._snapToVertex = snapTo.includes('vertex');
|
|
33
|
+
this._snapToEdge = snapTo.includes('edge');
|
|
34
|
+
}
|
|
35
|
+
pipe(event) {
|
|
36
|
+
this._removeFeatures?.();
|
|
37
|
+
if (event.key !== ModificationKeyType.CTRL) {
|
|
38
|
+
const coordinate = event.positionOrPixel;
|
|
39
|
+
const bufferDistance = event.map.getCurrentResolution(coordinate) * 12;
|
|
40
|
+
const maxDistanceSquared = bufferDistance ** 2;
|
|
41
|
+
const isOblique = event.map instanceof ObliqueMap;
|
|
42
|
+
const geometries = this.layers
|
|
43
|
+
.flatMap((layer) => {
|
|
44
|
+
let source;
|
|
45
|
+
if (isOblique) {
|
|
46
|
+
source = layer.getImplementationsForMap(event.map)[0]
|
|
47
|
+
.getOLLayer()
|
|
48
|
+
.getSource();
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
source = layer.getSource();
|
|
52
|
+
}
|
|
53
|
+
return source.getFeaturesInExtent([
|
|
54
|
+
coordinate[0] - bufferDistance,
|
|
55
|
+
coordinate[1] - bufferDistance,
|
|
56
|
+
coordinate[0] + bufferDistance,
|
|
57
|
+
coordinate[1] + bufferDistance,
|
|
58
|
+
]);
|
|
59
|
+
})
|
|
60
|
+
.filter((feature) => {
|
|
61
|
+
const originalFeature = feature[originalFeatureSymbol] ?? feature;
|
|
62
|
+
return this._filter(originalFeature);
|
|
63
|
+
})
|
|
64
|
+
.map((f) => f.getGeometry());
|
|
65
|
+
const result = getGeometrySnapResult(geometries, coordinate, maxDistanceSquared, this._snapToVertex, this._snapToEdge);
|
|
66
|
+
if (result) {
|
|
67
|
+
const closest = result.snapped;
|
|
68
|
+
if (coordinate.length > closest.length) {
|
|
69
|
+
closest[2] = coordinate[2];
|
|
70
|
+
}
|
|
71
|
+
else if (coordinate.length < closest.length) {
|
|
72
|
+
closest.pop();
|
|
73
|
+
}
|
|
74
|
+
event.positionOrPixel = closest;
|
|
75
|
+
event[alreadySnapped] = true;
|
|
76
|
+
this._removeFeatures = setSnappingFeatures([result], [result.snapped], this._scratchLayer);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return Promise.resolve(event);
|
|
80
|
+
}
|
|
81
|
+
destroy() {
|
|
82
|
+
this._removeFeatures?.();
|
|
83
|
+
this.layers = [];
|
|
84
|
+
super.destroy();
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=layerSnapping.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"layerSnapping.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/layerSnapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
2
|
-
import { EventType } from '../../../interaction/interactionType.js';
|
|
2
|
+
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
3
3
|
import { vertexSymbol } from '../editorSymbols.js';
|
|
4
4
|
import VcsEvent from '../../../vcsEvent.js';
|
|
5
5
|
import { emptyStyle } from '../../../style/styleHelpers.js';
|
|
@@ -12,7 +12,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
|
|
|
12
12
|
_vertex = null;
|
|
13
13
|
_feature;
|
|
14
14
|
constructor(feature) {
|
|
15
|
-
super(EventType.DRAGEVENTS);
|
|
15
|
+
super(EventType.DRAGEVENTS, ModificationKeyType.NONE | ModificationKeyType.CTRL);
|
|
16
16
|
this._feature = feature;
|
|
17
17
|
this.setActive();
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translateVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translateVertexInteraction.ts"],"names":[],"mappings":"AACA,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"translateVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translateVertexInteraction.ts"],"names":[],"mappings":"AACA,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,SAAS,EACT,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D;;;GAGG;AACH,MAAM,0BAA2B,SAAQ,mBAAmB;IACjD,aAAa,GAAG,IAAI,QAAQ,EAAU,CAAC;IAExC,OAAO,GAAkB,IAAI,CAAC;IAE9B,QAAQ,CAAU;IAE1B,YAAY,OAAgB;QAC1B,KAAK,CACH,SAAS,CAAC,UAAU,EACpB,mBAAmB,CAAC,IAAI,GAAG,mBAAmB,CAAC,IAAI,CACpD,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,KAA6B;QAChC,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAG,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAClE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE5C,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE;gBAClC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;aACrB;YACD,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;SAC9B;aAAM,IACL,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS;YAChC,KAAK,CAAC,OAAO;YACZ,KAAK,CAAC,OAAkB,CAAC,YAAY,CAAC,EACvC;YACA,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAiB,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC9C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;SAC9B;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC7B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,0BAA0B,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { LineString, Polygon } from 'ol/geom.js';
|
|
2
|
+
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
3
|
+
import type VectorLayer from '../../../layer/vectorLayer.js';
|
|
4
|
+
import { SnapType } from '../snappingHelpers.js';
|
|
5
|
+
import { SnappingInteractionEvent } from '../editorSessionHelpers.js';
|
|
6
|
+
export default class TranslationSnapping extends AbstractInteraction {
|
|
7
|
+
private _coordinates;
|
|
8
|
+
private _bearings;
|
|
9
|
+
private _scratchLayer;
|
|
10
|
+
private _isPolygon;
|
|
11
|
+
private _getCoordinates;
|
|
12
|
+
private _removeFeatures;
|
|
13
|
+
private _lastCoordinate;
|
|
14
|
+
private _snappingGeometry;
|
|
15
|
+
private _snapToVertex;
|
|
16
|
+
private _snapToEdge;
|
|
17
|
+
private _snapOrthogonal;
|
|
18
|
+
private _snapParallel;
|
|
19
|
+
constructor(scratchLayer: VectorLayer, geometry: LineString | Polygon, snapTo?: SnapType[]);
|
|
20
|
+
get snapTo(): SnapType[];
|
|
21
|
+
set snapTo(snapTo: SnapType[]);
|
|
22
|
+
private _setCoordinates;
|
|
23
|
+
pipe(event: SnappingInteractionEvent): Promise<SnappingInteractionEvent>;
|
|
24
|
+
destroy(): void;
|
|
25
|
+
}
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
import { LineString, MultiLineString, Polygon } from 'ol/geom.js';
|
|
2
|
+
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
3
|
+
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
4
|
+
import { getCartesianBearing } from '../../math.js';
|
|
5
|
+
import { getSnappedCoordinateForResults, getAngleSnapResult, setSnappingFeatures, getGeometrySnapResult, snapTypes, } from '../snappingHelpers.js';
|
|
6
|
+
import { vertexIndexSymbol, vertexSymbol } from '../editorSymbols.js';
|
|
7
|
+
import { alreadySnapped, } from '../editorSessionHelpers.js';
|
|
8
|
+
function getBearings(coordinates, isPolygon) {
|
|
9
|
+
const length = isPolygon ? coordinates.length : coordinates.length - 1;
|
|
10
|
+
if (length > 0) {
|
|
11
|
+
const bearings = new Array(length);
|
|
12
|
+
for (let i = 0; i < length; i++) {
|
|
13
|
+
if (i === coordinates.length - 1) {
|
|
14
|
+
bearings[i] = getCartesianBearing(coordinates[i], coordinates[0]);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
bearings[i] = getCartesianBearing(coordinates[i], coordinates[i + 1]);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return bearings;
|
|
21
|
+
}
|
|
22
|
+
return [];
|
|
23
|
+
}
|
|
24
|
+
export default class TranslationSnapping extends AbstractInteraction {
|
|
25
|
+
_coordinates = [];
|
|
26
|
+
_bearings = [];
|
|
27
|
+
_scratchLayer;
|
|
28
|
+
_isPolygon = false;
|
|
29
|
+
_getCoordinates;
|
|
30
|
+
_removeFeatures;
|
|
31
|
+
_lastCoordinate;
|
|
32
|
+
_snappingGeometry;
|
|
33
|
+
_snapToVertex = true;
|
|
34
|
+
_snapToEdge = true;
|
|
35
|
+
_snapOrthogonal = true;
|
|
36
|
+
_snapParallel = true;
|
|
37
|
+
constructor(scratchLayer, geometry, snapTo = [...snapTypes]) {
|
|
38
|
+
super(EventType.DRAGEVENTS, ModificationKeyType.NONE | ModificationKeyType.CTRL);
|
|
39
|
+
this._scratchLayer = scratchLayer;
|
|
40
|
+
if (geometry instanceof Polygon) {
|
|
41
|
+
this._isPolygon = true;
|
|
42
|
+
this._getCoordinates = () => geometry.getCoordinates()[0];
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
this._isPolygon = false;
|
|
46
|
+
this._getCoordinates = () => geometry.getCoordinates();
|
|
47
|
+
}
|
|
48
|
+
this.snapTo = snapTo;
|
|
49
|
+
}
|
|
50
|
+
get snapTo() {
|
|
51
|
+
const snapTo = [];
|
|
52
|
+
if (this._snapToVertex) {
|
|
53
|
+
snapTo.push('vertex');
|
|
54
|
+
}
|
|
55
|
+
if (this._snapToEdge) {
|
|
56
|
+
snapTo.push('edge');
|
|
57
|
+
}
|
|
58
|
+
if (this._snapOrthogonal) {
|
|
59
|
+
snapTo.push('orthogonal');
|
|
60
|
+
}
|
|
61
|
+
if (this._snapParallel) {
|
|
62
|
+
snapTo.push('parallel');
|
|
63
|
+
}
|
|
64
|
+
return snapTo;
|
|
65
|
+
}
|
|
66
|
+
set snapTo(snapTo) {
|
|
67
|
+
this._snapToVertex = snapTo.includes('vertex');
|
|
68
|
+
this._snapToEdge = snapTo.includes('edge');
|
|
69
|
+
this._snapOrthogonal = snapTo.includes('orthogonal');
|
|
70
|
+
this._snapParallel = snapTo.includes('parallel');
|
|
71
|
+
}
|
|
72
|
+
_setCoordinates(vertexIndex) {
|
|
73
|
+
this._coordinates = this._getCoordinates();
|
|
74
|
+
this._bearings = getBearings(this._coordinates, this._isPolygon);
|
|
75
|
+
if (this._coordinates.length > 2) {
|
|
76
|
+
if (this._isPolygon) {
|
|
77
|
+
const lineCoordinates = [
|
|
78
|
+
...this._coordinates.slice(0, vertexIndex),
|
|
79
|
+
...this._coordinates.slice(vertexIndex + 1),
|
|
80
|
+
];
|
|
81
|
+
lineCoordinates.push(lineCoordinates[0]);
|
|
82
|
+
this._snappingGeometry = new LineString(lineCoordinates);
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
this._snappingGeometry = new MultiLineString([
|
|
86
|
+
this._coordinates.slice(0, vertexIndex),
|
|
87
|
+
this._coordinates.slice(vertexIndex + 1),
|
|
88
|
+
]);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
pipe(event) {
|
|
93
|
+
this._removeFeatures?.();
|
|
94
|
+
if (event[alreadySnapped]) {
|
|
95
|
+
this._lastCoordinate = undefined;
|
|
96
|
+
this._snappingGeometry = undefined;
|
|
97
|
+
return Promise.resolve(event);
|
|
98
|
+
}
|
|
99
|
+
if (event.type === EventType.DRAGEND && this._lastCoordinate) {
|
|
100
|
+
event.positionOrPixel = this._lastCoordinate;
|
|
101
|
+
this._lastCoordinate = undefined;
|
|
102
|
+
}
|
|
103
|
+
else if (event.key !== ModificationKeyType.CTRL &&
|
|
104
|
+
event.feature?.[vertexSymbol]) {
|
|
105
|
+
const index = event.feature[vertexIndexSymbol];
|
|
106
|
+
if (event.type === EventType.DRAGSTART) {
|
|
107
|
+
this._setCoordinates(index);
|
|
108
|
+
}
|
|
109
|
+
const results = new Array(2);
|
|
110
|
+
const maxDistanceSquared = (event.map.getCurrentResolution(event.positionOrPixel) * 12) ** 2;
|
|
111
|
+
const coordinate = event.positionOrPixel;
|
|
112
|
+
if (this._snappingGeometry) {
|
|
113
|
+
results[0] = getGeometrySnapResult([this._snappingGeometry], event.positionOrPixel, maxDistanceSquared, this._snapToVertex, this._snapToEdge);
|
|
114
|
+
}
|
|
115
|
+
if (!results[0] && (this._snapOrthogonal || this._snapParallel)) {
|
|
116
|
+
const bearings = this._bearings.map((b, i) => {
|
|
117
|
+
if (i === index || i === index - 1) {
|
|
118
|
+
return -1;
|
|
119
|
+
}
|
|
120
|
+
if (this._isPolygon &&
|
|
121
|
+
index === 0 &&
|
|
122
|
+
i === this._bearings.length - 1) {
|
|
123
|
+
return -1;
|
|
124
|
+
}
|
|
125
|
+
return b;
|
|
126
|
+
});
|
|
127
|
+
if (index > 1) {
|
|
128
|
+
results[0] = getAngleSnapResult(coordinate, this._coordinates[index - 1], this._coordinates[index - 2], bearings, index - 1, maxDistanceSquared, this._snapOrthogonal, this._snapParallel);
|
|
129
|
+
}
|
|
130
|
+
else if (this._isPolygon) {
|
|
131
|
+
if (index === 1) {
|
|
132
|
+
results[0] = getAngleSnapResult(coordinate, this._coordinates[index - 1], this._coordinates.at(-1), bearings, index - 1, maxDistanceSquared, this._snapOrthogonal, this._snapParallel);
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
results[0] = getAngleSnapResult(coordinate, this._coordinates.at(-1), this._coordinates.at(-2), bearings, this._coordinates.length - 1, maxDistanceSquared, this._snapOrthogonal, this._snapParallel);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
if (this._coordinates.length > 2) {
|
|
139
|
+
const candidate = results[0]?.snapped ?? coordinate;
|
|
140
|
+
if (index < this._coordinates.length - 2) {
|
|
141
|
+
// snap to following segment
|
|
142
|
+
results[1] = getAngleSnapResult(candidate, this._coordinates[index + 1], this._coordinates[index + 2], bearings, index + 1, maxDistanceSquared, this._snapOrthogonal, this._snapParallel);
|
|
143
|
+
}
|
|
144
|
+
else if (this._isPolygon) {
|
|
145
|
+
if (index === this._coordinates.length - 1) {
|
|
146
|
+
// snap to first segment
|
|
147
|
+
results[1] = getAngleSnapResult(candidate, this._coordinates[0], this._coordinates[1], bearings, 0, maxDistanceSquared, this._snapOrthogonal, this._snapParallel);
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
// we need to wrap around: snap to _last segment
|
|
151
|
+
results[1] = getAngleSnapResult(candidate, this._coordinates.at(-1), this._coordinates[0], bearings, this._coordinates.length - 1, maxDistanceSquared, this._snapOrthogonal, this._snapParallel);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
const lastResult = getSnappedCoordinateForResults(results, this._coordinates, maxDistanceSquared);
|
|
157
|
+
if (lastResult) {
|
|
158
|
+
if (coordinate.length > lastResult.length) {
|
|
159
|
+
lastResult[2] = event.positionOrPixel[2];
|
|
160
|
+
}
|
|
161
|
+
else if (coordinate.length < lastResult.length) {
|
|
162
|
+
lastResult.pop();
|
|
163
|
+
}
|
|
164
|
+
event.positionOrPixel = lastResult;
|
|
165
|
+
this._removeFeatures = setSnappingFeatures(results, this._coordinates, this._scratchLayer);
|
|
166
|
+
this._lastCoordinate = event.positionOrPixel;
|
|
167
|
+
}
|
|
168
|
+
else {
|
|
169
|
+
this._lastCoordinate = undefined;
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
return Promise.resolve(event);
|
|
173
|
+
}
|
|
174
|
+
destroy() {
|
|
175
|
+
this._removeFeatures?.();
|
|
176
|
+
super.destroy();
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
//# sourceMappingURL=translationSnapping.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"translationSnapping.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translationSnapping.ts"],"names":[],"mappings":"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"}
|