@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
|
@@ -2,12 +2,15 @@ import Point from 'ol/geom/Point.js';
|
|
|
2
2
|
import Feature from 'ol/Feature.js';
|
|
3
3
|
import type { Coordinate } from 'ol/coordinate.js';
|
|
4
4
|
import type { Geometry } from 'ol/geom.js';
|
|
5
|
+
import { GeometryLayout } from 'ol/geom/Geometry.js';
|
|
5
6
|
import { Cartesian2, Plane, Cartographic, Cesium3DTileFeature, type Scene, type Camera } from '@vcmap-cesium/engine';
|
|
6
|
-
import
|
|
7
|
-
import type VectorLayer from '../../layer/vectorLayer.js';
|
|
7
|
+
import { vertexIndexSymbol } from './editorSymbols.js';
|
|
8
8
|
import type VcsMap from '../../map/vcsMap.js';
|
|
9
9
|
import { PropertyChangedKey } from '../../layer/vectorProperties.js';
|
|
10
|
-
|
|
10
|
+
import VectorLayer from '../../layer/vectorLayer.js';
|
|
11
|
+
export type Vertex = Feature<Point> & {
|
|
12
|
+
[vertexIndexSymbol]: number;
|
|
13
|
+
};
|
|
11
14
|
export type SelectableFeatureType = Feature | Cesium3DTileFeature;
|
|
12
15
|
export interface SelectFeatureInteraction {
|
|
13
16
|
readonly selected: Array<Feature>;
|
|
@@ -16,8 +19,13 @@ export interface SelectFeatureInteraction {
|
|
|
16
19
|
}
|
|
17
20
|
export declare const geometryChangeKeys: string[];
|
|
18
21
|
export declare const vectorPropertyChangeKeys: PropertyChangedKey[];
|
|
22
|
+
export declare function syncScratchLayerVectorProperties(scratchLayer: VectorLayer, layer: VectorLayer, altitudeModeChanged?: () => void): () => void;
|
|
19
23
|
export declare function getOlcsPropsFromFeature(feature: Feature): Record<string, number | string>;
|
|
20
|
-
export declare function createVertex(coordinate: Coordinate, olcsProps: Record<string, number | string
|
|
24
|
+
export declare function createVertex(coordinate: Coordinate, olcsProps: Record<string, number | string>, index: number): Vertex;
|
|
25
|
+
export declare function getCoordinatesAndLayoutFromVertices(vertices: Vertex[]): {
|
|
26
|
+
coordinates: Coordinate[];
|
|
27
|
+
layout: GeometryLayout;
|
|
28
|
+
};
|
|
21
29
|
/**
|
|
22
30
|
* Returns the closest point on a 2D line. the Z index is taken from the point.
|
|
23
31
|
* @param start - line segment start
|
|
@@ -51,5 +59,3 @@ export declare function drapeGeometryOnTerrain(geometry: Geometry, map: VcsMap):
|
|
|
51
59
|
* @param map
|
|
52
60
|
*/
|
|
53
61
|
export declare function placeGeometryOnTerrain(geometry: Geometry, map: VcsMap): Promise<void>;
|
|
54
|
-
export declare function ensureFeatureAbsolute(feature: Feature, layer: VectorLayer, cesiumMap: CesiumMap): Promise<void>;
|
|
55
|
-
export declare function clampFeature(feature: import('ol').Feature): void;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import Point from 'ol/geom/Point.js';
|
|
2
2
|
import Feature from 'ol/Feature.js';
|
|
3
|
-
import { Cartesian2, Cartesian3, Math as CesiumMath, Plane, Ray, IntersectionTests, Cartographic,
|
|
3
|
+
import { Cartesian2, Cartesian3, Math as CesiumMath, Plane, Ray, IntersectionTests, Cartographic, } from '@vcmap-cesium/engine';
|
|
4
4
|
import { mercatorToCartesian } from '../math.js';
|
|
5
5
|
import { getFlatCoordinatesFromGeometry } from '../geometryHelpers.js';
|
|
6
6
|
import CesiumMap from '../../map/cesiumMap.js';
|
|
7
|
-
import { vertexSymbol } from './editorSymbols.js';
|
|
7
|
+
import { vertexIndexSymbol, vertexSymbol } from './editorSymbols.js';
|
|
8
8
|
import { alreadyTransformedToImage, createSync, doNotTransform, } from '../../layer/vectorSymbols.js';
|
|
9
9
|
export const geometryChangeKeys = [
|
|
10
10
|
'olcs_altitudeMode',
|
|
@@ -16,6 +16,24 @@ export const vectorPropertyChangeKeys = [
|
|
|
16
16
|
'groundLevel',
|
|
17
17
|
'heightAboveGround',
|
|
18
18
|
];
|
|
19
|
+
function assignVectorProperty(props, key, value) {
|
|
20
|
+
props[key] = value;
|
|
21
|
+
}
|
|
22
|
+
export function syncScratchLayerVectorProperties(scratchLayer, layer, altitudeModeChanged) {
|
|
23
|
+
vectorPropertyChangeKeys.forEach((key) => {
|
|
24
|
+
assignVectorProperty(scratchLayer.vectorProperties, key, layer.vectorProperties[key]);
|
|
25
|
+
});
|
|
26
|
+
return layer.vectorProperties.propertyChanged.addEventListener((props) => {
|
|
27
|
+
vectorPropertyChangeKeys.forEach((key) => {
|
|
28
|
+
if (props.includes(key)) {
|
|
29
|
+
assignVectorProperty(scratchLayer.vectorProperties, key, layer.vectorProperties[key]);
|
|
30
|
+
if (key === 'altitudeMode') {
|
|
31
|
+
altitudeModeChanged?.();
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
}
|
|
19
37
|
export function getOlcsPropsFromFeature(feature) {
|
|
20
38
|
const props = {};
|
|
21
39
|
geometryChangeKeys.forEach((key) => {
|
|
@@ -26,7 +44,7 @@ export function getOlcsPropsFromFeature(feature) {
|
|
|
26
44
|
});
|
|
27
45
|
return props;
|
|
28
46
|
}
|
|
29
|
-
export function createVertex(coordinate, olcsProps) {
|
|
47
|
+
export function createVertex(coordinate, olcsProps, index) {
|
|
30
48
|
const geometry = new Point(coordinate);
|
|
31
49
|
geometry[alreadyTransformedToImage] = true;
|
|
32
50
|
const vertex = new Feature({
|
|
@@ -34,10 +52,34 @@ export function createVertex(coordinate, olcsProps) {
|
|
|
34
52
|
...olcsProps,
|
|
35
53
|
});
|
|
36
54
|
vertex[vertexSymbol] = true;
|
|
55
|
+
vertex[vertexIndexSymbol] = index;
|
|
37
56
|
vertex[doNotTransform] = true;
|
|
38
57
|
vertex[createSync] = true;
|
|
39
58
|
return vertex;
|
|
40
59
|
}
|
|
60
|
+
export function getCoordinatesAndLayoutFromVertices(vertices) {
|
|
61
|
+
let is2D = false;
|
|
62
|
+
const flatCoordinates = new Array(vertices.length * 3);
|
|
63
|
+
vertices.forEach((v, i) => {
|
|
64
|
+
const vertexCoordinates = v.getGeometry().getCoordinates();
|
|
65
|
+
is2D = is2D || vertexCoordinates.length === 2;
|
|
66
|
+
flatCoordinates[i * 3] = vertexCoordinates[0];
|
|
67
|
+
flatCoordinates[i * 3 + 1] = vertexCoordinates[1];
|
|
68
|
+
flatCoordinates[i * 3 + 2] = vertexCoordinates[2];
|
|
69
|
+
});
|
|
70
|
+
const coordinates = new Array(vertices.length);
|
|
71
|
+
for (let i = 0; i < vertices.length; i++) {
|
|
72
|
+
const coordinate = [flatCoordinates[i * 3], flatCoordinates[i * 3 + 1]];
|
|
73
|
+
if (!is2D) {
|
|
74
|
+
coordinate[2] = flatCoordinates[i * 3 + 2];
|
|
75
|
+
}
|
|
76
|
+
coordinates[i] = coordinate;
|
|
77
|
+
}
|
|
78
|
+
return {
|
|
79
|
+
coordinates,
|
|
80
|
+
layout: is2D ? 'XY' : 'XYZ',
|
|
81
|
+
};
|
|
82
|
+
}
|
|
41
83
|
let scratchCartesian21 = new Cartesian2();
|
|
42
84
|
let scratchCartesian22 = new Cartesian2();
|
|
43
85
|
let scratchCartesian23 = new Cartesian2();
|
|
@@ -130,7 +172,7 @@ export async function drapeGeometryOnTerrain(geometry, map) {
|
|
|
130
172
|
const coordinates = geometry.getCoordinates();
|
|
131
173
|
const flats = getFlatCoordinatesFromGeometry(geometry, coordinates);
|
|
132
174
|
await map.getHeightFromTerrain(flats);
|
|
133
|
-
geometry.setCoordinates(coordinates);
|
|
175
|
+
geometry.setCoordinates(coordinates, 'XYZ');
|
|
134
176
|
}
|
|
135
177
|
}
|
|
136
178
|
/**
|
|
@@ -152,22 +194,7 @@ export async function placeGeometryOnTerrain(geometry, map) {
|
|
|
152
194
|
flats.forEach((coord) => {
|
|
153
195
|
coord[2] = minHeight;
|
|
154
196
|
});
|
|
155
|
-
geometry.setCoordinates(coordinates);
|
|
197
|
+
geometry.setCoordinates(coordinates, 'XYZ');
|
|
156
198
|
}
|
|
157
199
|
}
|
|
158
|
-
export async function ensureFeatureAbsolute(feature, layer, cesiumMap) {
|
|
159
|
-
// XXX this does not ensure 3D coordinates
|
|
160
|
-
const layerIsClamped = layer.vectorProperties.altitudeMode === HeightReference.CLAMP_TO_GROUND;
|
|
161
|
-
const altitudeMode = feature.get('olcs_altitudeMode');
|
|
162
|
-
if (altitudeMode === 'clampToGround' || (!altitudeMode && layerIsClamped)) {
|
|
163
|
-
feature.set('olcs_altitudeMode', 'absolute', true);
|
|
164
|
-
const geometry = feature.getGeometry();
|
|
165
|
-
if (geometry) {
|
|
166
|
-
await placeGeometryOnTerrain(geometry, cesiumMap);
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
export function clampFeature(feature) {
|
|
171
|
-
feature.set('olcs_altitudeMode', 'clampToGround');
|
|
172
|
-
}
|
|
173
200
|
//# sourceMappingURL=editorHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editorHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/editorHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,OAAO,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"editorHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/editorHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,11 @@ import VcsEvent from '../../vcsEvent.js';
|
|
|
6
6
|
import LayerCollection from '../layerCollection.js';
|
|
7
7
|
import EventHandler from '../../interaction/eventHandler.js';
|
|
8
8
|
import type VcsApp from '../../vcsApp.js';
|
|
9
|
+
import { InteractionEvent } from '../../interaction/abstractInteraction.js';
|
|
10
|
+
export declare const alreadySnapped: unique symbol;
|
|
11
|
+
export type SnappingInteractionEvent = InteractionEvent & {
|
|
12
|
+
[alreadySnapped]?: boolean;
|
|
13
|
+
};
|
|
9
14
|
export declare enum SessionType {
|
|
10
15
|
CREATE = "create",
|
|
11
16
|
EDIT_GEOMETRY = "editGeometry",
|
|
@@ -7,6 +7,7 @@ import { EventType } from '../../interaction/interactionType.js';
|
|
|
7
7
|
import { maxZIndex } from '../layerCollection.js';
|
|
8
8
|
import { markVolatile } from '../../vcsModule.js';
|
|
9
9
|
import { PrimitiveOptionsType } from '../../layer/vectorProperties.js';
|
|
10
|
+
export const alreadySnapped = Symbol('alreadySnapped');
|
|
10
11
|
export var SessionType;
|
|
11
12
|
(function (SessionType) {
|
|
12
13
|
SessionType["CREATE"] = "create";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editorSessionHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/editorSessionHelpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AACrE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAwB,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"editorSessionHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/editorSessionHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare const vertexSymbol: unique symbol;
|
|
|
5
5
|
/**
|
|
6
6
|
* Symbol to denote the vertexes index in the vertices array. This is important for snapping & bbox operations
|
|
7
7
|
*/
|
|
8
|
-
export declare const
|
|
8
|
+
export declare const vertexIndexSymbol: unique symbol;
|
|
9
9
|
/**
|
|
10
10
|
* Symbol added to primitives and features to denote that these are handlers. It is expected, that the value of the symobl is
|
|
11
11
|
* equal to an {@link AxisAndPlanes}
|
|
@@ -5,7 +5,7 @@ export const vertexSymbol = Symbol('Vertex');
|
|
|
5
5
|
/**
|
|
6
6
|
* Symbol to denote the vertexes index in the vertices array. This is important for snapping & bbox operations
|
|
7
7
|
*/
|
|
8
|
-
export const
|
|
8
|
+
export const vertexIndexSymbol = Symbol('VertexIndex');
|
|
9
9
|
/**
|
|
10
10
|
* Symbol added to primitives and features to denote that these are handlers. It is expected, that the value of the symobl is
|
|
11
11
|
* equal to an {@link AxisAndPlanes}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editorSymbols.js","sourceRoot":"","sources":["../../../../src/util/editor/editorSymbols.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC7C;;GAEG;AACH,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"editorSymbols.js","sourceRoot":"","sources":["../../../../src/util/editor/editorSymbols.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC7C;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AACvD;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAC/C;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ import VcsEvent from '../../../vcsEvent.js';
|
|
|
5
5
|
import { GeometryType } from '../editorSessionHelpers.js';
|
|
6
6
|
import { alreadyTransformedToImage, alreadyTransformedToMercator, } from '../../../layer/vectorSymbols.js';
|
|
7
7
|
import ObliqueMap from '../../../map/obliqueMap.js';
|
|
8
|
+
import { is2DLayout } from '../../geometryHelpers.js';
|
|
8
9
|
/**
|
|
9
10
|
* Offset to prevent bbox from collapsing
|
|
10
11
|
*/
|
|
@@ -16,6 +17,7 @@ class CreateBBoxInteraction extends AbstractInteraction {
|
|
|
16
17
|
_geometry = null;
|
|
17
18
|
_origin = null;
|
|
18
19
|
_lastCoordinate = null;
|
|
20
|
+
_is3D = false;
|
|
19
21
|
finished = new VcsEvent();
|
|
20
22
|
created = new VcsEvent();
|
|
21
23
|
constructor() {
|
|
@@ -36,26 +38,27 @@ class CreateBBoxInteraction extends AbstractInteraction {
|
|
|
36
38
|
if (this._origin[1] === this._lastCoordinate[1]) {
|
|
37
39
|
this._lastCoordinate[1] += precisionOffset;
|
|
38
40
|
}
|
|
39
|
-
this.
|
|
40
|
-
|
|
41
|
+
if (this._is3D) {
|
|
42
|
+
this._lastCoordinate[2] = this._origin[2];
|
|
43
|
+
}
|
|
44
|
+
let lowerRight;
|
|
45
|
+
let upperLeft;
|
|
41
46
|
if ((originXHigher && originYHigher) ||
|
|
42
47
|
(!originXHigher && !originYHigher)) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
[this._lastCoordinate[0], this._origin[1], this._origin[2]],
|
|
46
|
-
this._lastCoordinate,
|
|
47
|
-
[this._origin[0], this._lastCoordinate[1], this._origin[2]],
|
|
48
|
-
];
|
|
48
|
+
lowerRight = [this._lastCoordinate[0], this._origin[1]];
|
|
49
|
+
upperLeft = [this._origin[0], this._lastCoordinate[1]];
|
|
49
50
|
}
|
|
50
51
|
else {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
];
|
|
52
|
+
lowerRight = [this._origin[0], this._lastCoordinate[1]];
|
|
53
|
+
upperLeft = [this._lastCoordinate[0], this._origin[1]];
|
|
54
|
+
}
|
|
55
|
+
if (this._is3D) {
|
|
56
|
+
lowerRight.push(this._origin[2]);
|
|
57
|
+
upperLeft.push(this._origin[2]);
|
|
57
58
|
}
|
|
58
|
-
this._geometry.setCoordinates([
|
|
59
|
+
this._geometry.setCoordinates([
|
|
60
|
+
[this._origin, lowerRight, this._lastCoordinate, upperLeft],
|
|
61
|
+
]);
|
|
59
62
|
}
|
|
60
63
|
}
|
|
61
64
|
pipe(event) {
|
|
@@ -68,8 +71,9 @@ class CreateBBoxInteraction extends AbstractInteraction {
|
|
|
68
71
|
this.finish();
|
|
69
72
|
}
|
|
70
73
|
else {
|
|
71
|
-
this._geometry = new Polygon([[event.positionOrPixel.slice()]]
|
|
74
|
+
this._geometry = new Polygon([[event.positionOrPixel.slice()]]);
|
|
72
75
|
this._geometry.set('_vcsGeomType', GeometryType.BBox);
|
|
76
|
+
this._is3D = !is2DLayout(this._geometry.getLayout());
|
|
73
77
|
if (event.map instanceof ObliqueMap) {
|
|
74
78
|
this._geometry[alreadyTransformedToImage] = true;
|
|
75
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createBBoxInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createBBoxInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,oBAAoB,CAAC;AAGzC,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EACL,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,UAAU,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"createBBoxInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createBBoxInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ class CreateCircleInteraction extends AbstractInteraction {
|
|
|
37
37
|
this.finish();
|
|
38
38
|
}
|
|
39
39
|
else {
|
|
40
|
-
this._geometry = new Circle(event.positionOrPixel, 20
|
|
40
|
+
this._geometry = new Circle(event.positionOrPixel, 20);
|
|
41
41
|
this._geometry[actuallyIsCircle] = event.map instanceof ObliqueMap;
|
|
42
42
|
if (event.map instanceof ObliqueMap) {
|
|
43
43
|
this._geometry[alreadyTransformedToImage] = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCircleInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createCircleInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAEvC,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,UAAU,MAAM,4BAA4B,CAAC;AAGpD;;;;GAIG;AACH,MAAM,uBACJ,SAAQ,mBAAmB;IAGnB,SAAS,GAAkB,IAAI,CAAC;IAEhC,YAAY,GAAiB,EAAE,CAAC;IAEhC,eAAe,GAAsB,IAAI,CAAC;IAElD,QAAQ,GAAG,IAAI,QAAQ,EAAiB,CAAC;IAEzC,OAAO,GAAG,IAAI,QAAQ,EAAU,CAAC;IAEjC;QACE,KAAK,CAAC,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACK,eAAe;QACrB,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAClD;IACH,CAAC;IAED,IAAI,CAAC,KAA6B;QAChC,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE;YACtD,IAAI,CAAC,eAAgB,CAAC,MAAM,CAC1B,CAAC,EACD,KAAK,CAAC,eAAe,CAAC,MAAM,EAC5B,GAAG,KAAK,CAAC,eAAe,CACzB,CAAC;YACF,IAAI,CAAC,eAAe,EAAE,CAAC;SACxB;QAED,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE;YAChC,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,IAAI,CAAC,MAAM,EAAE,CAAC;aACf;iBAAM;gBACL,IAAI,CAAC,SAAS,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"createCircleInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createCircleInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import LineString from 'ol/geom/LineString.js';
|
|
2
2
|
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
3
|
-
import { EventType } from '../../../interaction/interactionType.js';
|
|
3
|
+
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
4
4
|
import VcsEvent from '../../../vcsEvent.js';
|
|
5
5
|
import { alreadyTransformedToImage, alreadyTransformedToMercator, } from '../../../layer/vectorSymbols.js';
|
|
6
6
|
import ObliqueMap from '../../../map/obliqueMap.js';
|
|
@@ -15,7 +15,7 @@ class CreateLineStringInteraction extends AbstractInteraction {
|
|
|
15
15
|
finished = new VcsEvent();
|
|
16
16
|
created = new VcsEvent();
|
|
17
17
|
constructor() {
|
|
18
|
-
super(EventType.CLICKMOVE | EventType.DBLCLICK);
|
|
18
|
+
super(EventType.CLICKMOVE | EventType.DBLCLICK, ModificationKeyType.NONE | ModificationKeyType.CTRL);
|
|
19
19
|
this.setActive();
|
|
20
20
|
}
|
|
21
21
|
/**
|
|
@@ -34,7 +34,7 @@ class CreateLineStringInteraction extends AbstractInteraction {
|
|
|
34
34
|
}
|
|
35
35
|
if (event.type & EventType.CLICK) {
|
|
36
36
|
if (!this._geometry) {
|
|
37
|
-
this._geometry = new LineString([event.positionOrPixel]
|
|
37
|
+
this._geometry = new LineString([event.positionOrPixel]);
|
|
38
38
|
if (event.map instanceof ObliqueMap) {
|
|
39
39
|
this._geometry[alreadyTransformedToImage] = true;
|
|
40
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createLineStringInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createLineStringInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAE/C,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"createLineStringInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createLineStringInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ class CreatePointInteraction extends AbstractInteraction {
|
|
|
17
17
|
this.setActive();
|
|
18
18
|
}
|
|
19
19
|
pipe(event) {
|
|
20
|
-
this._geometry = new Point(event.positionOrPixel
|
|
20
|
+
this._geometry = new Point(event.positionOrPixel);
|
|
21
21
|
if (event.map instanceof ObliqueMap) {
|
|
22
22
|
this._geometry[alreadyTransformedToImage] = true;
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPointInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createPointInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EACL,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,UAAU,MAAM,4BAA4B,CAAC;AAGpD;;;GAGG;AACH,MAAM,sBACJ,SAAQ,mBAAmB;IAGnB,SAAS,GAAiB,IAAI,CAAC;IAEvC,QAAQ,GAAG,IAAI,QAAQ,EAAgB,CAAC;IAExC,OAAO,GAAG,IAAI,QAAQ,EAAS,CAAC;IAEhC;QACE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,KAA6B;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"createPointInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createPointInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EACL,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,UAAU,MAAM,4BAA4B,CAAC;AAGpD;;;GAGG;AACH,MAAM,sBACJ,SAAQ,mBAAmB;IAGnB,SAAS,GAAiB,IAAI,CAAC;IAEvC,QAAQ,GAAG,IAAI,QAAQ,EAAgB,CAAC;IAExC,OAAO,GAAG,IAAI,QAAQ,EAAS,CAAC;IAEhC;QACE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,KAA6B;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,GAAG,YAAY,UAAU,EAAE;YACnC,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,GAAG,IAAI,CAAC;SAClD;aAAM;YACL,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,GAAG,IAAI,CAAC;SACrD;QACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,IAAI,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC1C;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,sBAAsB,CAAC"}
|
|
@@ -2,6 +2,10 @@ import { Polygon } from 'ol/geom.js';
|
|
|
2
2
|
import AbstractInteraction, { EventAfterEventHandler } from '../../../interaction/abstractInteraction.js';
|
|
3
3
|
import VcsEvent from '../../../vcsEvent.js';
|
|
4
4
|
import { CreateInteraction } from '../createFeatureSession.js';
|
|
5
|
+
/**
|
|
6
|
+
* Set on polygon geometries which have a validity placeholder active
|
|
7
|
+
*/
|
|
8
|
+
export declare const validityPlaceholder: unique symbol;
|
|
5
9
|
declare class CreatePolygonInteraction extends AbstractInteraction implements CreateInteraction<Polygon> {
|
|
6
10
|
private _geometry;
|
|
7
11
|
private _coordinates;
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
import { Polygon } from 'ol/geom.js';
|
|
2
2
|
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
3
|
-
import { EventType } from '../../../interaction/interactionType.js';
|
|
3
|
+
import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
|
|
4
4
|
import VcsEvent from '../../../vcsEvent.js';
|
|
5
5
|
import { alreadyTransformedToImage, alreadyTransformedToMercator, } from '../../../layer/vectorSymbols.js';
|
|
6
6
|
import ObliqueMap from '../../../map/obliqueMap.js';
|
|
7
|
+
/**
|
|
8
|
+
* Set on polygon geometries which have a validity placeholder active
|
|
9
|
+
*/
|
|
10
|
+
export const validityPlaceholder = Symbol('validityPlaceholder');
|
|
7
11
|
class CreatePolygonInteraction extends AbstractInteraction {
|
|
8
12
|
_geometry = null;
|
|
9
13
|
_coordinates = [];
|
|
@@ -17,7 +21,7 @@ class CreatePolygonInteraction extends AbstractInteraction {
|
|
|
17
21
|
finished = new VcsEvent();
|
|
18
22
|
created = new VcsEvent();
|
|
19
23
|
constructor() {
|
|
20
|
-
super(EventType.CLICKMOVE | EventType.DBLCLICK);
|
|
24
|
+
super(EventType.CLICKMOVE | EventType.DBLCLICK, ModificationKeyType.NONE | ModificationKeyType.CTRL);
|
|
21
25
|
this.setActive();
|
|
22
26
|
}
|
|
23
27
|
/**
|
|
@@ -36,13 +40,14 @@ class CreatePolygonInteraction extends AbstractInteraction {
|
|
|
36
40
|
}
|
|
37
41
|
if (event.type & EventType.CLICK) {
|
|
38
42
|
if (!this._geometry) {
|
|
39
|
-
this._geometry = new Polygon([[event.positionOrPixel.slice()]]
|
|
43
|
+
this._geometry = new Polygon([[event.positionOrPixel.slice()]]);
|
|
40
44
|
if (event.map instanceof ObliqueMap) {
|
|
41
45
|
this._geometry[alreadyTransformedToImage] = true;
|
|
42
46
|
}
|
|
43
47
|
else {
|
|
44
48
|
this._geometry[alreadyTransformedToMercator] = true;
|
|
45
49
|
}
|
|
50
|
+
this._geometry[validityPlaceholder] = true;
|
|
46
51
|
this.created.raiseEvent(this._geometry);
|
|
47
52
|
this._coordinates = [event.positionOrPixel.slice()];
|
|
48
53
|
this._lastCoordinate = [...event.positionOrPixel];
|
|
@@ -54,6 +59,7 @@ class CreatePolygonInteraction extends AbstractInteraction {
|
|
|
54
59
|
this._lastCoordinate = [...this._lastCoordinate];
|
|
55
60
|
this._coordinates.splice(2, 1, this._lastCoordinate);
|
|
56
61
|
this._validityPlaceHolder = null;
|
|
62
|
+
this._geometry[validityPlaceholder] = false;
|
|
57
63
|
}
|
|
58
64
|
else {
|
|
59
65
|
this._lastCoordinate = [...this._lastCoordinate];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPolygonInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createPolygonInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"createPolygonInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/createPolygonInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { LineString, Polygon } from 'ol/geom.js';
|
|
2
|
+
import AbstractInteraction from '../../../interaction/abstractInteraction.js';
|
|
3
|
+
import { SnapType } from '../snappingHelpers.js';
|
|
4
|
+
import type VectorLayer from '../../../layer/vectorLayer.js';
|
|
5
|
+
import { SnappingInteractionEvent } from '../editorSessionHelpers.js';
|
|
6
|
+
export default class CreationSnapping extends AbstractInteraction {
|
|
7
|
+
private _coordinates;
|
|
8
|
+
private _bearings;
|
|
9
|
+
private _scratchLayer;
|
|
10
|
+
private _isPolygon;
|
|
11
|
+
private _coordinatesDirty;
|
|
12
|
+
private _geometryLister;
|
|
13
|
+
private _removeFeatures;
|
|
14
|
+
private _snappingGeometry;
|
|
15
|
+
private _snapToVertex;
|
|
16
|
+
private _snapToEdge;
|
|
17
|
+
private _snapOrthogonal;
|
|
18
|
+
private _snapParallel;
|
|
19
|
+
constructor(scratchLayer: VectorLayer, snapTo?: SnapType[]);
|
|
20
|
+
get snapTo(): SnapType[];
|
|
21
|
+
set snapTo(snapTo: SnapType[]);
|
|
22
|
+
private _setCoordinates;
|
|
23
|
+
setGeometry(geometry: LineString | Polygon): void;
|
|
24
|
+
pipe(event: SnappingInteractionEvent): Promise<SnappingInteractionEvent>;
|
|
25
|
+
destroy(): void;
|
|
26
|
+
}
|