@vcmap/core 5.1.0-rc.2 → 5.1.0

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.
Files changed (54) hide show
  1. package/README.md +1 -1
  2. package/dist/src/layer/geojsonHelpers.js +2 -2
  3. package/dist/src/layer/geojsonHelpers.js.map +1 -1
  4. package/dist/src/layer/geojsonLayer.js +4 -2
  5. package/dist/src/layer/geojsonLayer.js.map +1 -1
  6. package/dist/src/layer/layer.js +5 -1
  7. package/dist/src/layer/layer.js.map +1 -1
  8. package/dist/src/layer/rasterLayer.js +1 -2
  9. package/dist/src/layer/rasterLayer.js.map +1 -1
  10. package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js +1 -2
  11. package/dist/src/layer/tileProvider/staticGeojsonTileProvider.js.map +1 -1
  12. package/dist/src/layer/tmsLayer.js +1 -2
  13. package/dist/src/layer/tmsLayer.js.map +1 -1
  14. package/dist/src/layer/vectorProperties.d.ts +2 -1
  15. package/dist/src/layer/vectorProperties.js.map +1 -1
  16. package/dist/src/layer/wfsLayer.js +1 -2
  17. package/dist/src/layer/wfsLayer.js.map +1 -1
  18. package/dist/src/layer/wmtsLayer.js +1 -2
  19. package/dist/src/layer/wmtsLayer.js.map +1 -1
  20. package/dist/src/util/editor/createFeatureSession.d.ts +4 -1
  21. package/dist/src/util/editor/createFeatureSession.js +54 -2
  22. package/dist/src/util/editor/createFeatureSession.js.map +1 -1
  23. package/dist/src/util/editor/editGeometrySession.d.ts +1 -1
  24. package/dist/src/util/editor/editGeometrySession.js +50 -7
  25. package/dist/src/util/editor/editGeometrySession.js.map +1 -1
  26. package/dist/src/util/editor/editorHelpers.d.ts +4 -4
  27. package/dist/src/util/editor/editorHelpers.js +17 -4
  28. package/dist/src/util/editor/editorHelpers.js.map +1 -1
  29. package/dist/src/util/editor/editorSessionHelpers.d.ts +7 -0
  30. package/dist/src/util/editor/editorSessionHelpers.js +20 -1
  31. package/dist/src/util/editor/editorSessionHelpers.js.map +1 -1
  32. package/dist/src/util/editor/interactions/insertVertexInteraction.js +2 -2
  33. package/dist/src/util/editor/interactions/insertVertexInteraction.js.map +1 -1
  34. package/dist/src/util/editor/interactions/translateVertexInteraction.js +3 -0
  35. package/dist/src/util/editor/interactions/translateVertexInteraction.js.map +1 -1
  36. package/dist/src/util/featureconverter/pointToCesium.js +1 -8
  37. package/dist/src/util/featureconverter/pointToCesium.js.map +1 -1
  38. package/package.json +1 -1
  39. package/src/layer/geojsonHelpers.ts +2 -2
  40. package/src/layer/geojsonLayer.ts +4 -3
  41. package/src/layer/layer.ts +6 -1
  42. package/src/layer/rasterLayer.ts +1 -2
  43. package/src/layer/tileProvider/staticGeojsonTileProvider.ts +1 -2
  44. package/src/layer/tmsLayer.ts +1 -2
  45. package/src/layer/vectorProperties.ts +7 -2
  46. package/src/layer/wfsLayer.ts +1 -2
  47. package/src/layer/wmtsLayer.ts +1 -2
  48. package/src/util/editor/createFeatureSession.ts +66 -1
  49. package/src/util/editor/editGeometrySession.ts +81 -8
  50. package/src/util/editor/editorHelpers.ts +26 -4
  51. package/src/util/editor/editorSessionHelpers.ts +28 -1
  52. package/src/util/editor/interactions/insertVertexInteraction.ts +5 -1
  53. package/src/util/editor/interactions/translateVertexInteraction.ts +3 -0
  54. package/src/util/featureconverter/pointToCesium.ts +1 -7
@@ -1,7 +1,8 @@
1
1
  import { check, ofEnum } from '@vcsuite/check';
2
2
  import { Feature } from 'ol';
3
+ import { unByKey } from 'ol/Observable.js';
3
4
  import VcsEvent from '../../vcsEvent.js';
4
- import { GeometryType, SessionType, setupInteractionChain, } from './editorSessionHelpers.js';
5
+ import { createPickingBehavior, GeometryType, SessionType, setupInteractionChain, } from './editorSessionHelpers.js';
5
6
  import CreateLineStringInteraction from './interactions/createLineStringInteraction.js';
6
7
  import CreateCircleInteraction from './interactions/createCircleInteraction.js';
7
8
  import CreateBBoxInteraction from './interactions/createBBoxInteraction.js';
@@ -42,9 +43,10 @@ function createInteractionForGeometryType(geometryType) {
42
43
  * @param app
43
44
  * @param layer
44
45
  * @param geometryType
46
+ * @param initialAltitudeMode - whether to use the layers altitude mode or set this on the feature
45
47
  * @group Editor
46
48
  */
47
- function startCreateFeatureSession(app, layer, geometryType) {
49
+ function startCreateFeatureSession(app, layer, geometryType, initialAltitudeMode) {
48
50
  check(app, VcsApp);
49
51
  check(layer, VectorLayer);
50
52
  check(geometryType, ofEnum(GeometryType));
@@ -59,8 +61,23 @@ function startCreateFeatureSession(app, layer, geometryType) {
59
61
  * Ture if the currently active map is an ObliqueMap. set in setupActiveMap
60
62
  */
61
63
  let isOblique = false;
64
+ let featureAltitudeMode = initialAltitudeMode;
65
+ const pickingBehavior = createPickingBehavior(app);
66
+ const altitudeModeChanged = () => {
67
+ const altitudeModeFeature = currentFeature ?? new Feature({ olcs_altitudeMode: featureAltitudeMode });
68
+ const altitudeModeInUse = layer.vectorProperties.getAltitudeMode(altitudeModeFeature);
69
+ pickingBehavior.setForAltitudeMode(altitudeModeInUse);
70
+ };
71
+ const vectorPropertiesListener = layer.vectorProperties.propertyChanged.addEventListener((properties) => {
72
+ if (properties.includes('altitudeMode') && !featureAltitudeMode) {
73
+ altitudeModeChanged();
74
+ }
75
+ });
76
+ altitudeModeChanged();
77
+ let currentFeatureListener = () => { };
62
78
  let interactionListeners = [];
63
79
  const destroyCurrentInteraction = () => {
80
+ currentFeatureListener();
64
81
  if (currentInteraction) {
65
82
  interactionChain.removeInteraction(currentInteraction);
66
83
  currentInteraction.destroy();
@@ -81,6 +98,17 @@ function startCreateFeatureSession(app, layer, geometryType) {
81
98
  }
82
99
  currentFeature = new Feature({ geometry });
83
100
  currentFeature[createSync] = true;
101
+ if (featureAltitudeMode) {
102
+ currentFeature.set('olcs_altitudeMode', featureAltitudeMode);
103
+ }
104
+ const propChangeListener = currentFeature.on('propertychange', (event) => {
105
+ if (event.key === 'olcs_altitudeMode') {
106
+ altitudeModeChanged();
107
+ }
108
+ });
109
+ currentFeatureListener = () => {
110
+ unByKey(propChangeListener);
111
+ };
84
112
  layer.addFeatures([currentFeature]);
85
113
  featureCreated.raiseEvent(currentFeature);
86
114
  }),
@@ -98,7 +126,9 @@ function startCreateFeatureSession(app, layer, geometryType) {
98
126
  ]);
99
127
  currentFeature = null;
100
128
  }
129
+ currentFeatureListener();
101
130
  }
131
+ altitudeModeChanged();
102
132
  creationFinished.raiseEvent(currentFeature);
103
133
  currentFeature = null;
104
134
  if (!isStopped) {
@@ -148,6 +178,9 @@ function startCreateFeatureSession(app, layer, geometryType) {
148
178
  }
149
179
  destroyCurrentInteraction();
150
180
  destroyInteractionChain();
181
+ currentFeatureListener();
182
+ vectorPropertiesListener();
183
+ pickingBehavior.reset();
151
184
  stopped.raiseEvent();
152
185
  stopped.destroy();
153
186
  featureCreated.destroy();
@@ -156,6 +189,25 @@ function startCreateFeatureSession(app, layer, geometryType) {
156
189
  return {
157
190
  type: SessionType.CREATE,
158
191
  geometryType,
192
+ get featureAltitudeMode() {
193
+ return featureAltitudeMode;
194
+ },
195
+ set featureAltitudeMode(value) {
196
+ if (featureAltitudeMode !== value) {
197
+ featureAltitudeMode = value;
198
+ if (currentFeature) {
199
+ if (featureAltitudeMode) {
200
+ currentFeature.set('olcs_altitudeMode', featureAltitudeMode);
201
+ }
202
+ else {
203
+ currentFeature.unset('olcs_altitudeMode');
204
+ }
205
+ }
206
+ else {
207
+ altitudeModeChanged();
208
+ }
209
+ }
210
+ },
159
211
  featureCreated,
160
212
  creationFinished,
161
213
  stopped,
@@ -1 +1 @@
1
- {"version":3,"file":"createFeatureSession.js","sourceRoot":"","sources":["../../../../src/util/editor/createFeatureSession.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createFeatureSession.js","sourceRoot":"","sources":["../../../../src/util/editor/createFeatureSession.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ import { EditorSession, SessionType } from './editorSessionHelpers.js';
3
3
  import type VectorLayer from '../../layer/vectorLayer.js';
4
4
  import type VcsApp from '../../vcsApp.js';
5
5
  export type EditGeometrySession = EditorSession<SessionType.EDIT_GEOMETRY> & {
6
- setFeature(feature: Feature): void;
6
+ setFeature(feature?: Feature): void;
7
7
  feature: Feature | null;
8
8
  };
9
9
  /**
@@ -1,17 +1,20 @@
1
1
  import { getLogger } from '@vcsuite/logger';
2
2
  import { unByKey } from 'ol/Observable.js';
3
- import { GeometryType, SessionType, setupInteractionChain, setupScratchLayer, } from './editorSessionHelpers.js';
3
+ import { createPickingBehavior, GeometryType, SessionType, setupInteractionChain, setupScratchLayer, } from './editorSessionHelpers.js';
4
4
  import InteractionChain from '../../interaction/interactionChain.js';
5
5
  import VcsEvent from '../../vcsEvent.js';
6
6
  import TranslateVertexInteraction from './interactions/translateVertexInteraction.js';
7
7
  import RemoveVertexInteraction from './interactions/removeVertexInteraction.js';
8
- import { createVertex, geometryChangeKeys } from './editorHelpers.js';
8
+ import { createVertex, geometryChangeKeys, getOlcsPropsFromFeature, vectorPropertyChangeKeys, } from './editorHelpers.js';
9
9
  import InsertVertexInteraction from './interactions/insertVertexInteraction.js';
10
10
  import EditGeometryMouseOverInteraction from './interactions/editGeometryMouseOverInteraction.js';
11
11
  import { cartesian2DDistance, modulo } from '../math.js';
12
12
  import { createSync, obliqueGeometry } from '../../layer/vectorSymbols.js';
13
13
  import geometryIsValid from './validateGeoemetry.js';
14
14
  import MapInteractionController from './interactions/mapInteractionController.js';
15
+ function assignVectorProperty(props, key, value) {
16
+ props[key] = value;
17
+ }
15
18
  /**
16
19
  * Create the editing interaction for a feature with a line geometry
17
20
  * @param feature
@@ -20,7 +23,10 @@ import MapInteractionController from './interactions/mapInteractionController.js
20
23
  */
21
24
  function createEditLineStringGeometryInteraction(feature, scratchLayer) {
22
25
  const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
23
- const vertices = geometry.getCoordinates().map(createVertex);
26
+ const olcsProps = getOlcsPropsFromFeature(feature);
27
+ const vertices = geometry
28
+ .getCoordinates()
29
+ .map((c) => createVertex(c, olcsProps));
24
30
  scratchLayer.addFeatures(vertices);
25
31
  const resetGeometry = () => {
26
32
  geometry.setCoordinates(vertices.map((f) => f.getGeometry().getCoordinates()));
@@ -57,7 +63,10 @@ function createEditLineStringGeometryInteraction(feature, scratchLayer) {
57
63
  }
58
64
  function createEditCircleGeometryInteraction(feature, scratchLayer) {
59
65
  const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
60
- const vertices = geometry.getCoordinates().map(createVertex);
66
+ const olcsProps = getOlcsPropsFromFeature(feature);
67
+ const vertices = geometry
68
+ .getCoordinates()
69
+ .map((c) => createVertex(c, olcsProps));
61
70
  scratchLayer.addFeatures(vertices);
62
71
  const translateVertex = new TranslateVertexInteraction();
63
72
  let suspend = false;
@@ -94,7 +103,10 @@ function createEditCircleGeometryInteraction(feature, scratchLayer) {
94
103
  }
95
104
  function createEditBBoxGeometryInteraction(feature, scratchLayer) {
96
105
  const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
97
- const vertices = geometry.getCoordinates()[0].map(createVertex);
106
+ const olcsProps = getOlcsPropsFromFeature(feature);
107
+ const vertices = geometry
108
+ .getCoordinates()[0]
109
+ .map((c) => createVertex(c, olcsProps));
98
110
  scratchLayer.addFeatures(vertices);
99
111
  let suspend = false;
100
112
  const translateVertex = new TranslateVertexInteraction();
@@ -156,7 +168,10 @@ function createEditBBoxGeometryInteraction(feature, scratchLayer) {
156
168
  function createEditSimplePolygonInteraction(feature, scratchLayer) {
157
169
  const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
158
170
  const linearRing = geometry.getLinearRing(0);
159
- const vertices = linearRing.getCoordinates().map(createVertex);
171
+ const olcsProps = getOlcsPropsFromFeature(feature);
172
+ const vertices = linearRing
173
+ .getCoordinates()
174
+ .map((c) => createVertex(c, olcsProps));
160
175
  scratchLayer.addFeatures(vertices);
161
176
  const resetGeometry = () => {
162
177
  const coordinates = vertices.map((f) => f.getGeometry().getCoordinates());
@@ -197,7 +212,8 @@ function createEditSimplePolygonInteraction(feature, scratchLayer) {
197
212
  }
198
213
  function createEditPointInteraction(feature, scratchLayer, layer) {
199
214
  const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
200
- const vertex = createVertex(geometry.getCoordinates());
215
+ const olcsProps = getOlcsPropsFromFeature(feature);
216
+ const vertex = createVertex(geometry.getCoordinates(), olcsProps);
201
217
  const featureIdArray = [feature.getId()];
202
218
  layer.featureVisibility.hideObjects(featureIdArray);
203
219
  vertex[createSync] = true;
@@ -246,6 +262,27 @@ function startEditGeometrySession(app, layer, interactionId) {
246
262
  * The feature that is set for the edit session.
247
263
  */
248
264
  let currentFeature = null;
265
+ const pickingBehavior = createPickingBehavior(app);
266
+ const altitudeModeChanged = () => {
267
+ const altitudeMode = currentFeature
268
+ ? layer.vectorProperties.getAltitudeMode(currentFeature)
269
+ : layer.vectorProperties.altitudeMode;
270
+ pickingBehavior.setForAltitudeMode(altitudeMode);
271
+ };
272
+ altitudeModeChanged();
273
+ vectorPropertyChangeKeys.forEach((key) => {
274
+ assignVectorProperty(scratchLayer.vectorProperties, key, layer.vectorProperties[key]);
275
+ });
276
+ const vectorPropertiesChangedListener = layer.vectorProperties.propertyChanged.addEventListener((props) => {
277
+ vectorPropertyChangeKeys.forEach((key) => {
278
+ if (props.includes(key)) {
279
+ assignVectorProperty(scratchLayer.vectorProperties, key, layer.vectorProperties[key]);
280
+ if (key === 'altitudeMode') {
281
+ altitudeModeChanged();
282
+ }
283
+ }
284
+ });
285
+ });
249
286
  const destroyCurrentInteractionSet = () => {
250
287
  if (currentInteractionSet) {
251
288
  interactionChain.removeInteraction(currentInteractionSet.interactionChain);
@@ -257,8 +294,10 @@ function startEditGeometrySession(app, layer, interactionId) {
257
294
  if (!geometryIsValid(currentFeature.getGeometry())) {
258
295
  layer.removeFeaturesById([currentFeature.getId()]);
259
296
  }
297
+ currentFeature.unset('olcs_allowPicking');
260
298
  }
261
299
  currentFeature = null;
300
+ altitudeModeChanged();
262
301
  };
263
302
  let featureListener;
264
303
  /**
@@ -301,6 +340,8 @@ function startEditGeometrySession(app, layer, interactionId) {
301
340
  }
302
341
  if (currentInteractionSet) {
303
342
  interactionChain.addInteraction(currentInteractionSet.interactionChain);
343
+ currentFeature.set('olcs_allowPicking', false);
344
+ altitudeModeChanged();
304
345
  }
305
346
  else {
306
347
  getLogger('EditGeometrySession').warning(`Geometry of type ${geometryType} is currently not supported`);
@@ -326,6 +367,8 @@ function startEditGeometrySession(app, layer, interactionId) {
326
367
  mouseOverInteraction.reset();
327
368
  destroyCurrentInteractionSet();
328
369
  destroyInteractionChain();
370
+ vectorPropertiesChangedListener();
371
+ pickingBehavior.reset();
329
372
  stopped.raiseEvent();
330
373
  stopped.destroy();
331
374
  };
@@ -1 +1 @@
1
- {"version":3,"file":"editGeometrySession.js","sourceRoot":"","sources":["../../../../src/util/editor/editGeometrySession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAW3C,OAAO,EAEL,YAAY,EACZ,WAAW,EACX,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AACrE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,0BAA0B,MAAM,8CAA8C,CAAC;AACtF,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,gCAAgC,MAAM,oDAAoD,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,eAAe,MAAM,wBAAwB,CAAC;AACrD,OAAO,wBAAwB,MAAM,4CAA4C,CAAC;AAclF;;;;;GAKG;AACH,SAAS,uCAAuC,CAC9C,OAA4B,EAC5B,YAAyB;IAEzB,MAAM,QAAQ,GACZ,OAAO,CAAC,eAAe,CAAC,IAAK,OAAO,CAAC,WAAW,EAAiB,CAAC;IACpE,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7D,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,GAAS,EAAE;QAC/B,QAAQ,CAAC,cAAc,CACrB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC,CACvD,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,eAAe,GAAG,IAAI,0BAA0B,EAAE,CAAC;IACzD,eAAe,CAAC,aAAa,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,IAAI,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACpE,YAAY,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;QACjE,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACnC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAClC,aAAa,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,uBAAuB,EAAE,CAAC;IACnD,YAAY,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,YAAY,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAY,CAAC,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACd,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1B,aAAa,EAAE,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC;QAC5C,eAAe;QACf,YAAY;QACZ,YAAY;KACb,CAAC,CAAC;IAEH,OAAO;QACL,gBAAgB;QAChB,OAAO,EAAE,GAAS,EAAE;YAClB,YAAY,CAAC,kBAAkB,CAC7B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAa,CAC3C,CAAC;YACF,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,mCAAmC,CAC1C,OAAwB,EACxB,YAAyB;IAEzB,MAAM,QAAQ,GACZ,OAAO,CAAC,eAAe,CAAC,IAAK,OAAO,CAAC,WAAW,EAAa,CAAC;IAChE,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7D,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAEnC,MAAM,eAAe,GAAG,IAAI,0BAA0B,EAAE,CAAC;IACzD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,eAAe,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,EAAE;QACxD,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;YACzC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;SAC/B;aAAM;YACL,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC,CAAC;YAC3D,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SACzE;QACD,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAClD,IAAI,CAAC,OAAO,EAAE;YACZ,QAAQ,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC7C,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,EAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;IAEjE,OAAO;QACL,gBAAgB;QAChB,OAAO,EAAE,GAAS,EAAE;YAClB,YAAY,CAAC,kBAAkB,CAC7B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAa,CAC3C,CAAC;YACF,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iCAAiC,CACxC,OAAyB,EACzB,YAAyB;IAEzB,MAAM,QAAQ,GACZ,OAAO,CAAC,eAAe,CAAC,IAAK,OAAO,CAAC,WAAW,EAAc,CAAC;IACjE,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAChE,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,eAAe,GAAG,IAAI,0BAA0B,EAAE,CAAC;IACzD,eAAe,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,EAAE;QACxD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAE/C,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC;QAC3E,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC;QAC5D,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE;YACvC,YAAY,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;YACxB,eAAe,GAAG,IAAI,CAAC;SACxB;QACD,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE;YACvC,YAAY,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;YACxB,eAAe,GAAG,IAAI,CAAC;SACxB;QAED,IAAI,eAAe,EAAE;YACnB,MAAM,CAAC,WAAW,EAAG,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;SACpD;QACD,MAAM,iBAAiB,GAAG,CAAC,gBAAwB,EAAQ,EAAE;YAC3D,MAAM,mBAAmB,GAAG,QAAQ,CAClC,gBAAgB,CACjB,CAAC,WAAW,EAAW,CAAC;YACzB,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,cAAc,EAAE,CAAC;YAC/D,IAAI,iBAAiB,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE;gBAC5C,iBAAiB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;aACxC;iBAAM;gBACL,iBAAiB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;aACxC;YACD,mBAAmB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QACxD,CAAC,CAAC;QAEF,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAChC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/B,OAAO,GAAG,IAAI,CAAC;QACf,QAAQ,CAAC,cAAc,CAAC;YACtB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC;SACvD,CAAC,CAAC;QACH,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAClD,IAAI,CAAC,OAAO,EAAE;YACZ,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBAChD,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,EAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;IAEjE,OAAO;QACL,gBAAgB;QAChB,OAAO,EAAE,GAAS,EAAE;YAClB,YAAY,CAAC,kBAAkB,CAC7B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAa,CAC3C,CAAC;YACF,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,kCAAkC,CACzC,OAAyB,EACzB,YAAyB;IAEzB,MAAM,QAAQ,GACZ,OAAO,CAAC,eAAe,CAAC,IAAK,OAAO,CAAC,WAAW,EAAc,CAAC;IACjE,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAe,CAAC;IAC3D,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC/D,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,GAAS,EAAE;QAC/B,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC,CAAC;QAC3E,UAAU,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,iDAAiD;QACzF,QAAQ,CAAC,cAAc,CAAC;YACtB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC;SACvD,CAAC,CAAC,CAAC,qEAAqE;IAC3E,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,0BAA0B,EAAE,CAAC;IACzD,eAAe,CAAC,aAAa,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,IAAI,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACtE,YAAY,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;QACjE,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACnC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAClC,aAAa,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,uBAAuB,EAAE,CAAC;IACnD,YAAY,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,YAAY,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAY,CAAC,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACd,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1B,aAAa,EAAE,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC;QAC5C,eAAe;QACf,YAAY;QACZ,YAAY;KACb,CAAC,CAAC;IAEH,OAAO;QACL,gBAAgB;QAChB,OAAO,EAAE,GAAS,EAAE;YAClB,YAAY,CAAC,kBAAkB,CAC7B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAa,CAC3C,CAAC;YACF,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,OAAuB,EACvB,YAAyB,EACzB,KAAkB;IAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,IAAK,OAAO,CAAC,WAAW,EAAY,CAAC;IAC9E,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,KAAK,EAAY,CAAC,CAAC;IACnD,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACpD,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,IAAI,0BAA0B,EAAE,CAAC;IACzD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,eAAe,CAAC,aAAa,CAAC,gBAAgB,CAAC,GAAG,EAAE;QAClD,OAAO,GAAG,IAAI,CAAC;QACf,OAAO;aACJ,WAAW,EAAG;aACd,cAAc,CAAC,MAAM,CAAC,WAAW,EAAG,CAAC,cAAc,EAAE,CAAC,CAAC;QAC1D,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAClD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,CAAC,WAAW,EAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;SACjE;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;IAEjE,OAAO;QACL,gBAAgB;QAChB,OAAO,EAAE,GAAS,EAAE;YAClB,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3B,YAAY,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAY,CAAC,CAAC,CAAC;YAC5D,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YACpD,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,wBAAwB,CAC/B,GAAW,EACX,KAAkB,EAClB,aAAsB;IAEtB,MAAM,EACJ,gBAAgB,EAChB,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,uBAAuB,GACjC,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IAEhE,MAAM,YAAY,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEnD,MAAM,wBAAwB,GAAG,IAAI,wBAAwB,EAAE,CAAC;IAChE,gBAAgB,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;IAE1D,MAAM,oBAAoB,GAAG,IAAI,gCAAgC,EAAE,CAAC;IACpE,gBAAgB,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG,IAAI,QAAQ,EAAQ,CAAC;IACrC,IAAI,qBAAqB,GAAmC,IAAI,CAAC;IACjE;;OAEG;IACH,IAAI,cAAc,GAAmB,IAAI,CAAC;IAE1C,MAAM,4BAA4B,GAAG,GAAS,EAAE;QAC9C,IAAI,qBAAqB,EAAE;YACzB,gBAAgB,CAAC,iBAAiB,CAChC,qBAAqB,CAAC,gBAAgB,CACvC,CAAC;YACF,qBAAqB,CAAC,OAAO,EAAE,CAAC;YAChC,qBAAqB,GAAG,IAAI,CAAC;SAC9B;QAED,IAAI,cAAc,EAAE;YAClB,OAAO,cAAc,CAAC,UAAU,CAAC,CAAC;YAClC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,EAAE;gBAClD,KAAK,CAAC,kBAAkB,CAAC,CAAC,cAAc,CAAC,KAAK,EAAqB,CAAC,CAAC,CAAC;aACvE;SACF;QACD,cAAc,GAAG,IAAI,CAAC;IACxB,CAAC,CAAC;IAEF,IAAI,eAAsC,CAAC;IAE3C;;;OAGG;IACH,SAAS,2BAA2B,CAAC,OAAiB;QACpD,4BAA4B,EAAE,CAAC;QAC/B,IAAI,eAAe,EAAE;YACnB,OAAO,CAAC,eAAe,CAAC,CAAC;SAC1B;QACD,IAAI,OAAO,EAAE;YACX,eAAe,GAAG,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;gBACzD,IAAI,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACpC,2BAA2B,CAAC,OAAO,CAAC,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;YACH,cAAc,GAAG,OAAO,CAAC;YACzB,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YAClC,MAAM,QAAQ,GACZ,OAAO,CAAC,eAAe,CAAC,IAAK,OAAO,CAAC,WAAW,EAAe,CAAC;YAClE,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;YACxC,YAAY,CAAC,gBAAgB,CAAC,YAAY;gBACxC,KAAK,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,YAAY,KAAK,YAAY,CAAC,OAAO,EAAE;gBACzC,IAAI,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,YAAY,CAAC,IAAI,EAAE;oBACtD,qBAAqB,GAAG,iCAAiC,CACvD,OAA2B,EAC3B,YAAY,CACb,CAAC;iBACH;qBAAM,IAAK,QAAoB,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE;oBAC3D,qBAAqB,GAAG,kCAAkC,CACxD,OAA2B,EAC3B,YAAY,CACb,CAAC;iBACH;aACF;iBAAM,IAAI,YAAY,KAAK,YAAY,CAAC,UAAU,EAAE;gBACnD,qBAAqB,GAAG,uCAAuC,CAC7D,OAA8B,EAC9B,YAAY,CACb,CAAC;aACH;iBAAM,IAAI,YAAY,KAAK,YAAY,CAAC,KAAK,EAAE;gBAC9C,qBAAqB,GAAG,0BAA0B,CAChD,OAAyB,EACzB,YAAY,EACZ,KAAK,CACN,CAAC;aACH;iBAAM,IAAI,YAAY,KAAK,YAAY,CAAC,MAAM,EAAE;gBAC/C,qBAAqB,GAAG,mCAAmC,CACzD,OAA0B,EAC1B,YAAY,CACb,CAAC;aACH;YAED,IAAI,qBAAqB,EAAE;gBACzB,gBAAgB,CAAC,cAAc,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;aACzE;iBAAM;gBACL,SAAS,CAAC,qBAAqB,CAAC,CAAC,OAAO,CACtC,oBAAoB,YAAY,6BAA6B,CAC9D,CAAC;gBACF,cAAc,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;gBACnC,cAAc,GAAG,IAAI,CAAC;aACvB;SACF;IACH,CAAC;IAED,MAAM,cAAc,GAAG,GAAS,EAAE;QAChC,wBAAwB,CAAC,KAAK,EAAE,CAAC;QACjC,oBAAoB,CAAC,KAAK,EAAE,CAAC;QAC7B,2BAA2B,EAAE,CAAC;IAChC,CAAC,CAAC;IACF,MAAM,oBAAoB,GACxB,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACzD,cAAc,EAAE,CAAC;IAEjB,MAAM,IAAI,GAAG,GAAS,EAAE;QACtB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAChC,IAAI,eAAe,EAAE;YACnB,OAAO,CAAC,eAAe,CAAC,CAAC;SAC1B;QACD,oBAAoB,EAAE,CAAC;QACvB,wBAAwB,CAAC,KAAK,EAAE,CAAC;QACjC,oBAAoB,CAAC,KAAK,EAAE,CAAC;QAC7B,4BAA4B,EAAE,CAAC;QAC/B,uBAAuB,EAAE,CAAC;QAC1B,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,OAAO,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC;IACF,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAE1C,OAAO;QACL,IAAI,EAAE,WAAW,CAAC,aAAa;QAC/B,OAAO;QACP,IAAI;QACJ,UAAU,CAAC,OAAgB;YACzB,2BAA2B,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,OAAO;YACT,OAAO,cAAc,CAAC;QACxB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,eAAe,wBAAwB,CAAC"}
1
+ {"version":3,"file":"editGeometrySession.js","sourceRoot":"","sources":["../../../../src/util/editor/editGeometrySession.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { Cartesian2, Plane, Cartographic, Cesium3DTileFeature, type Scene, type
6
6
  import CesiumMap from '../../map/cesiumMap.js';
7
7
  import type VectorLayer from '../../layer/vectorLayer.js';
8
8
  import type VcsMap from '../../map/vcsMap.js';
9
+ import { PropertyChangedKey } from '../../layer/vectorProperties.js';
9
10
  export type Vertex = Feature<Point>;
10
11
  export type SelectableFeatureType = Feature | Cesium3DTileFeature;
11
12
  export interface SelectFeatureInteraction {
@@ -14,10 +15,9 @@ export interface SelectFeatureInteraction {
14
15
  hasFeatureId(id: string): boolean;
15
16
  }
16
17
  export declare const geometryChangeKeys: string[];
17
- /**
18
- * @param coordinate
19
- */
20
- export declare function createVertex(coordinate: Coordinate): Vertex;
18
+ export declare const vectorPropertyChangeKeys: PropertyChangedKey[];
19
+ export declare function getOlcsPropsFromFeature(feature: Feature): Record<string, number | string>;
20
+ export declare function createVertex(coordinate: Coordinate, olcsProps: Record<string, number | string>): Vertex;
21
21
  /**
22
22
  * Returns the closest point on a 2D line. the Z index is taken from the point.
23
23
  * @param start - line segment start
@@ -11,14 +11,27 @@ export const geometryChangeKeys = [
11
11
  'olcs_groundLevel',
12
12
  'olcs_heightAboveGround',
13
13
  ];
14
- /**
15
- * @param coordinate
16
- */
17
- export function createVertex(coordinate) {
14
+ export const vectorPropertyChangeKeys = [
15
+ 'altitudeMode',
16
+ 'groundLevel',
17
+ 'heightAboveGround',
18
+ ];
19
+ export function getOlcsPropsFromFeature(feature) {
20
+ const props = {};
21
+ geometryChangeKeys.forEach((key) => {
22
+ const value = feature.get(key);
23
+ if (value != null) {
24
+ props[key] = value;
25
+ }
26
+ });
27
+ return props;
28
+ }
29
+ export function createVertex(coordinate, olcsProps) {
18
30
  const geometry = new Point(coordinate);
19
31
  geometry[alreadyTransformedToImage] = true;
20
32
  const vertex = new Feature({
21
33
  geometry,
34
+ ...olcsProps,
22
35
  });
23
36
  vertex[vertexSymbol] = true;
24
37
  vertex[doNotTransform] = true;
@@ -1 +1 @@
1
- {"version":3,"file":"editorHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/editorHelpers.ts"],"names":[],"mappings":"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"}
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;AAIpC,OAAO,EACL,UAAU,EACV,UAAU,EACV,IAAI,IAAI,UAAU,EAClB,KAAK,EACL,GAAG,EACH,iBAAiB,EACjB,YAAY,EACZ,eAAe,GAIhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,yBAAyB,EACzB,UAAU,EACV,cAAc,GACf,MAAM,8BAA8B,CAAC;AAgBtC,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,mBAAmB;IACnB,kBAAkB;IAClB,wBAAwB;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAyB;IAC5D,cAAc;IACd,aAAa;IACb,mBAAmB;CACpB,CAAC;AAEF,MAAM,UAAU,uBAAuB,CACrC,OAAgB;IAEhB,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,kBAAkB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACjC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAuB,CAAC;QACrD,IAAI,KAAK,IAAI,IAAI,EAAE;YACjB,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACpB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,UAAsB,EACtB,SAA0C;IAE1C,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IACvC,QAAQ,CAAC,yBAAyB,CAAC,GAAG,IAAI,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC;QACzB,QAAQ;QACR,GAAG,SAAS;KACb,CAAC,CAAC;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IAC1B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,IAAI,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAC;AAC1C,IAAI,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAC;AAC1C,IAAI,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAC;AAC1C,IAAI,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAC;AAC1C,IAAI,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAC;AAC1C,IAAI,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAC;AAE1C;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAAiB,EACjB,GAAe,EACf,KAAiB;IAEjB,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjB,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjB,kBAAkB,CACnB,CAAC;IACF,IAAI,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAC9C,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC;KACxE;IACD,kBAAkB,GAAG,UAAU,CAAC,SAAS,CACvC,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAC1C,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACnB,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACnB,kBAAkB,CACnB,CAAC;IACF,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;IACtE,kBAAkB,GAAG,UAAU,CAAC,gBAAgB,CAC9C,kBAAkB,EAClB,MAAM,EACN,kBAAkB,CACnB,CAAC;IACF,OAAO;QACL,kBAAkB,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QAC/B,kBAAkB,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QAC/B,KAAK,CAAC,CAAC,CAAC;KACT,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,KAAiB,EACjB,GAAe,EACf,KAAiB,EACjB,OAAgB;IAEhB,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjB,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjB,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAC1C,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACnB,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACnB,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACnB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAC1C,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EACjB,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EACjB,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACnB,kBAAkB,CACnB,CAAC;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACtD,IACE,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC;QAC/C,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAC/C;QACA,OAAO,KAAK,CAAC;KACd;IAED,kBAAkB,GAAG,UAAU,CAAC,SAAS,CACvC,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,SAAS,CACvC,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IACF,OAAO,kBAAkB,CAAC,aAAa,CACrC,kBAAkB,EAClB,OAAO,IAAI,UAAU,CAAC,QAAQ,CAC/B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,KAAiB,EACjB,GAAe,EACf,KAAiB,EACjB,OAAgB;IAEhB,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjB,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACjB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAC1C,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACnB,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EACnB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,YAAY,CAC1C,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EACjB,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EACjB,kBAAkB,CACnB,CAAC;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACtD,IACE,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC;QAC/C,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAC/C;QACA,OAAO,KAAK,CAAC;KACd;IAED,kBAAkB,GAAG,UAAU,CAAC,SAAS,CACvC,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,SAAS,CACvC,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IAEF,OAAO,kBAAkB,CAAC,aAAa,CACrC,kBAAkB,EAClB,OAAO,IAAI,UAAU,CAAC,QAAQ,CAC/B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,iBAA6B,EAC7B,KAAY;IAEZ,kBAAkB,GAAG,mBAAmB,CACtC,iBAAiB,EACjB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,qBAAqB,CAC9D,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,KAAK,CACnC,KAAK,CAAC,MAAM,CAAC,OAAO,EACpB,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,UAAU,CAAC,SAAS,CACvC,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IAEF,OAAO,KAAK,CAAC,eAAe,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;AACvE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACnC,iBAA6B,EAC7B,KAAY;IAEZ,kBAAkB,GAAG,mBAAmB,CACtC,iBAAiB,EACjB,kBAAkB,CACnB,CAAC;IACF,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,qBAAqB,CAC9D,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;IAEF,OAAO,KAAK,CAAC,eAAe,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;AACvE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAAY,EACZ,MAAc,EACd,cAA0B;IAE1B,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAI,EAAE,KAAK,CAAC,CAAC;IAC7D,IAAI,YAAY,EAAE;QAChB,OAAO,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;KACjD;IACD,OAAO,YAAY,CAAC,IAAI,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAkB,EAClB,GAAW;IAEX,IAAI,GAAG,YAAY,SAAS,EAAE;QAC5B,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAW,CAAC;QACvD,MAAM,KAAK,GAAG,8BAA8B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACpE,MAAM,GAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACtC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KACtC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAkB,EAClB,GAAW;IAEX,IAAI,GAAG,YAAY,SAAS,EAAE;QAC5B,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAW,CAAC;QACvD,MAAM,KAAK,GAAG,8BAA8B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACpE,MAAM,GAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,SAAS,GAAG,QAAQ,CAAC;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,IAAI,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;gBACxB,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;aACtB;QACH,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KACtC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAgB,EAChB,KAAkB,EAClB,SAAoB;IAEpB,0CAA0C;IAC1C,MAAM,cAAc,GAClB,KAAK,CAAC,gBAAgB,CAAC,YAAY,KAAK,eAAe,CAAC,eAAe,CAAC;IAC1E,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAW,CAAC;IAChE,IAAI,YAAY,KAAK,eAAe,IAAI,CAAC,CAAC,YAAY,IAAI,cAAc,CAAC,EAAE;QACzE,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QACvC,IAAI,QAAQ,EAAE;YACZ,MAAM,sBAAsB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;SACnD;KACF;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAA6B;IACxD,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;AACpD,CAAC"}
@@ -1,9 +1,11 @@
1
1
  import type { Point, Polygon, Circle, LineString } from 'ol/geom.js';
2
+ import { HeightReference } from '@vcmap-cesium/engine';
2
3
  import VectorLayer from '../../layer/vectorLayer.js';
3
4
  import InteractionChain from '../../interaction/interactionChain.js';
4
5
  import VcsEvent from '../../vcsEvent.js';
5
6
  import LayerCollection from '../layerCollection.js';
6
7
  import EventHandler from '../../interaction/eventHandler.js';
8
+ import type VcsApp from '../../vcsApp.js';
7
9
  export declare enum SessionType {
8
10
  CREATE = "create",
9
11
  EDIT_GEOMETRY = "editGeometry",
@@ -47,3 +49,8 @@ export declare enum GeometryType {
47
49
  BBox = "BBox"
48
50
  }
49
51
  export type GeometryToType<T extends GeometryType> = T extends GeometryType.Point ? Point : T extends GeometryType.Polygon ? Polygon : T extends GeometryType.BBox ? Polygon : T extends GeometryType.LineString ? LineString : T extends GeometryType.Circle ? Circle : never;
52
+ export type PickingBehavior = {
53
+ setForAltitudeMode(altitudeMode: HeightReference): void;
54
+ reset(): void;
55
+ };
56
+ export declare function createPickingBehavior(app: VcsApp): PickingBehavior;
@@ -1,3 +1,4 @@
1
+ import { HeightReference } from '@vcmap-cesium/engine';
1
2
  import VectorLayer from '../../layer/vectorLayer.js';
2
3
  import { mercatorProjection } from '../projection.js';
3
4
  import InteractionChain from '../../interaction/interactionChain.js';
@@ -69,7 +70,7 @@ export function setupInteractionChain(eventHandler, interactionId) {
69
70
  removed.raiseEvent();
70
71
  }, undefined, interactionId);
71
72
  const currentFeatureInteractionEvent = eventHandler.featureInteraction.active;
72
- eventHandler.featureInteraction.setActive(EventType.CLICKMOVE | EventType.DRAGSTART);
73
+ eventHandler.featureInteraction.setActive(EventType.CLICKMOVE | EventType.DRAGEVENTS);
73
74
  return {
74
75
  interactionChain,
75
76
  destroy() {
@@ -89,4 +90,22 @@ export var GeometryType;
89
90
  GeometryType["Polygon"] = "Polygon";
90
91
  GeometryType["BBox"] = "BBox";
91
92
  })(GeometryType = GeometryType || (GeometryType = {}));
93
+ export function createPickingBehavior(app) {
94
+ const initialPickPosition = app.maps.eventHandler.featureInteraction.pickPosition;
95
+ return {
96
+ setForAltitudeMode(altitudeMode) {
97
+ if (altitudeMode === HeightReference.NONE) {
98
+ app.maps.eventHandler.featureInteraction.pickPosition =
99
+ EventType.CLICKMOVE | EventType.DRAGEVENTS;
100
+ }
101
+ else {
102
+ app.maps.eventHandler.featureInteraction.pickPosition = EventType.NONE;
103
+ }
104
+ },
105
+ reset() {
106
+ app.maps.eventHandler.featureInteraction.pickPosition =
107
+ initialPickPosition;
108
+ },
109
+ };
110
+ }
92
111
  //# sourceMappingURL=editorSessionHelpers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"editorSessionHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/editorSessionHelpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editorSessionHelpers.js","sourceRoot":"","sources":["../../../../src/util/editor/editorSessionHelpers.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { LinearRing } from 'ol/geom.js';
2
2
  import AbstractInteraction from '../../../interaction/abstractInteraction.js';
3
3
  import { EventType, ModificationKeyType, } from '../../../interaction/interactionType.js';
4
4
  import { cartesian2DDistance } from '../../math.js';
5
- import { createVertex, pointOnLine2D, pointOnLine3D, } from '../editorHelpers.js';
5
+ import { createVertex, getOlcsPropsFromFeature, pointOnLine2D, pointOnLine3D, } from '../editorHelpers.js';
6
6
  import VcsEvent from '../../../vcsEvent.js';
7
7
  class InsertVertexInteraction extends AbstractInteraction {
8
8
  vertexInserted = new VcsEvent();
@@ -45,7 +45,7 @@ class InsertVertexInteraction extends AbstractInteraction {
45
45
  index = 0;
46
46
  }
47
47
  this.vertexInserted.raiseEvent({
48
- vertex: createVertex(closestCoord),
48
+ vertex: createVertex(closestCoord, getOlcsPropsFromFeature(this._feature)),
49
49
  index,
50
50
  });
51
51
  }
@@ -1 +1 @@
1
- {"version":3,"file":"insertVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/insertVertexInteraction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"insertVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/insertVertexInteraction.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import AbstractInteraction from '../../../interaction/abstractInteraction.js';
2
2
  import { EventType } from '../../../interaction/interactionType.js';
3
3
  import { vertexSymbol } from '../editorSymbols.js';
4
4
  import VcsEvent from '../../../vcsEvent.js';
5
+ import { emptyStyle } from '../../../style/styleHelpers.js';
5
6
  /**
6
7
  * Class to translate a vertex. Will call the passed in vertex changed event with the changed vertex.
7
8
  * Will modify the vertex in place
@@ -19,6 +20,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
19
20
  this.vertexChanged.raiseEvent(this._vertex);
20
21
  if (event.type & EventType.DRAGEND) {
21
22
  this._vertex.unset('olcs_allowPicking');
23
+ this._vertex.setStyle(undefined);
22
24
  this._vertex = null;
23
25
  }
24
26
  event.stopPropagation = true;
@@ -28,6 +30,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
28
30
  event.feature[vertexSymbol]) {
29
31
  this._vertex = event.feature;
30
32
  this._vertex.set('olcs_allowPicking', false);
33
+ this._vertex.setStyle(emptyStyle);
31
34
  event.stopPropagation = true;
32
35
  }
33
36
  return Promise.resolve(event);
@@ -1 +1 @@
1
- {"version":3,"file":"translateVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translateVertexInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAG5C;;;GAGG;AACH,MAAM,0BAA2B,SAAQ,mBAAmB;IACjD,aAAa,GAAG,IAAI,QAAQ,EAAU,CAAC;IAExC,OAAO,GAAkB,IAAI,CAAC;IAEtC;QACE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC5B,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,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,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"}
1
+ {"version":3,"file":"translateVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translateVertexInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,mBAEN,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,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;IAEtC;QACE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC5B,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,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,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"}
@@ -166,14 +166,7 @@ export function getCartesian3AndWGS84FromCoordinates(coordinates, heightInfo) {
166
166
  heightInfo.storeyHeightsAboveGround.reduce((sum, currentValue) => sum + currentValue, 0);
167
167
  coordinates.forEach((coord, index) => {
168
168
  wgs84Positions[index] = Projection.mercatorToWgs84(coord, true);
169
- let height = null;
170
- if (heightInfo.heightReference === HeightReference.RELATIVE_TO_GROUND) {
171
- height = heightValue + heightInfo.heightAboveGroundAdjustment;
172
- }
173
- else {
174
- height = heightValue;
175
- }
176
- positions[index] = Cartesian3.fromDegrees(coord[0], coord[1], height);
169
+ positions[index] = Cartesian3.fromDegrees(coord[0], coord[1], heightValue);
177
170
  });
178
171
  return {
179
172
  positions,