@vcmap/core 5.1.0 → 5.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. package/dist/src/layer/featureVisibility.d.ts +3 -2
  2. package/dist/src/layer/featureVisibility.js +5 -0
  3. package/dist/src/layer/featureVisibility.js.map +1 -1
  4. package/dist/src/ol/feature.js +6 -3
  5. package/dist/src/ol/feature.js.map +1 -1
  6. package/dist/src/util/clipping/clippingObject.d.ts +1 -1
  7. package/dist/src/util/clipping/clippingObject.js +11 -8
  8. package/dist/src/util/clipping/clippingObject.js.map +1 -1
  9. package/dist/src/util/clipping/clippingObjectManager.js +3 -3
  10. package/dist/src/util/clipping/clippingObjectManager.js.map +1 -1
  11. package/dist/src/util/editor/editGeometrySession.js +5 -7
  12. package/dist/src/util/editor/editGeometrySession.js.map +1 -1
  13. package/dist/src/util/editor/interactions/translateVertexInteraction.d.ts +3 -1
  14. package/dist/src/util/editor/interactions/translateVertexInteraction.js +5 -1
  15. package/dist/src/util/editor/interactions/translateVertexInteraction.js.map +1 -1
  16. package/dist/src/util/editor/selectFeaturesSession.d.ts +2 -1
  17. package/dist/src/util/editor/selectFeaturesSession.js +3 -3
  18. package/dist/src/util/editor/selectFeaturesSession.js.map +1 -1
  19. package/dist/src/util/flight/flightAnchor.js +1 -1
  20. package/dist/src/util/flight/flightAnchor.js.map +1 -1
  21. package/dist/src/util/flight/flightPlayer.js +28 -10
  22. package/dist/src/util/flight/flightPlayer.js.map +1 -1
  23. package/dist/src/vcsApp.js +1 -1
  24. package/dist/src/vcsApp.js.map +1 -1
  25. package/dist/src/vcsEvent.d.ts +3 -2
  26. package/dist/src/vcsEvent.js +11 -8
  27. package/dist/src/vcsEvent.js.map +1 -1
  28. package/package.json +1 -1
  29. package/src/layer/featureVisibility.ts +12 -4
  30. package/src/ol/feature.ts +6 -3
  31. package/src/util/clipping/clippingObject.ts +12 -11
  32. package/src/util/clipping/clippingObjectManager.ts +7 -5
  33. package/src/util/editor/editGeometrySession.ts +5 -7
  34. package/src/util/editor/interactions/translateVertexInteraction.ts +7 -1
  35. package/src/util/editor/selectFeaturesSession.ts +6 -5
  36. package/src/util/flight/flightAnchor.ts +1 -1
  37. package/src/util/flight/flightPlayer.ts +42 -16
  38. package/src/vcsApp.ts +1 -1
  39. package/src/vcsEvent.ts +11 -8
@@ -78,6 +78,18 @@ export async function createFlightPlayer(instance, app) {
78
78
  }
79
79
  }),
80
80
  ];
81
+ const getView = (time) => {
82
+ if (destinationSpline && quaternionSpline) {
83
+ return {
84
+ destination: destinationSpline.evaluate(time),
85
+ orientation: HeadingPitchRoll.fromQuaternion(quaternionSpline.evaluate(time)),
86
+ };
87
+ }
88
+ else {
89
+ getLogger('FlightPlayer').error('cannot evaluate spline');
90
+ }
91
+ return undefined;
92
+ };
81
93
  const cesiumPostRender = (scene) => {
82
94
  const time = Date.now() / 1000;
83
95
  if (!clock.currentSystemTime) {
@@ -111,11 +123,10 @@ export async function createFlightPlayer(instance, app) {
111
123
  return;
112
124
  }
113
125
  }
114
- const view = {
115
- destination: destinationSpline.evaluate(clock.currentTime),
116
- orientation: HeadingPitchRoll.fromQuaternion(quaternionSpline.evaluate(clock.currentTime)),
117
- };
118
- scene.camera.setView(view);
126
+ const view = getView(clock.currentTime);
127
+ if (view) {
128
+ scene.camera.setView(view);
129
+ }
119
130
  if (playerState === 'playing') {
120
131
  if (screenSpaceCameraController) {
121
132
  screenSpaceCameraController.enableInputs = false;
@@ -123,6 +134,10 @@ export async function createFlightPlayer(instance, app) {
123
134
  }
124
135
  };
125
136
  const play = () => {
137
+ if (!instance.isValid()) {
138
+ getLogger('FlightPlayer').error(`cannot play invalid flight ${instance.name}`);
139
+ return;
140
+ }
126
141
  if (playerState === 'playing') {
127
142
  return;
128
143
  }
@@ -148,6 +163,10 @@ export async function createFlightPlayer(instance, app) {
148
163
  setState('playing');
149
164
  };
150
165
  const goToTime = (time) => {
166
+ if (!instance.isValid()) {
167
+ getLogger('FlightPlayer').error(`cannot goToTime of invalid flight ${instance.name}`);
168
+ return;
169
+ }
151
170
  if (time > clock.endTime) {
152
171
  getLogger('FlightPlayer').warning(`time: ${time} out of range`);
153
172
  return;
@@ -155,11 +174,10 @@ export async function createFlightPlayer(instance, app) {
155
174
  clock.currentTime = time;
156
175
  clock.currentSystemTime = undefined;
157
176
  if (playerState !== 'playing') {
158
- const view = {
159
- destination: destinationSpline.evaluate(clock.currentTime),
160
- orientation: HeadingPitchRoll.fromQuaternion(quaternionSpline.evaluate(clock.currentTime)),
161
- };
162
- cesiumMap.getScene()?.camera.setView(view);
177
+ const view = getView(clock.currentTime);
178
+ if (view) {
179
+ cesiumMap.getScene()?.camera.setView(view);
180
+ }
163
181
  }
164
182
  };
165
183
  const destroyed = new VcsEvent();
@@ -1 +1 @@
1
- {"version":3,"file":"flightPlayer.js","sourceRoot":"","sources":["../../../../src/util/flight/flightPlayer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"flightPlayer.js","sourceRoot":"","sources":["../../../../src/util/flight/flightPlayer.ts"],"names":[],"mappings":"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"}
@@ -252,7 +252,7 @@ class VcsApp {
252
252
  addModule(module) {
253
253
  check(module, VcsModule);
254
254
  this._moduleMutationPromise = this._moduleMutationPromise.then(async () => {
255
- if (this._modules.has(module)) {
255
+ if (this._modules.hasKey(module._id)) {
256
256
  getLogger().info(`module with id ${module._id} already loaded`);
257
257
  return;
258
258
  }
@@ -1 +1 @@
1
- {"version":3,"file":"vcsApp.js","sourceRoot":"","sources":["../../src/vcsApp.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vcsApp.js","sourceRoot":"","sources":["../../src/vcsApp.ts"],"names":[],"mappings":"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"}
@@ -19,8 +19,9 @@ declare class VcsEvent<T> {
19
19
  */
20
20
  removeEventListener(listener: Listener<T>): boolean;
21
21
  /**
22
- * Raise the event, calling all listeners
23
- * @param event
22
+ * Raise the event, calling all listeners, if a listener is removed in between calling listeners, the listener is not
23
+ * called.
24
+ * @param event
24
25
  */
25
26
  raiseEvent(event: T): void;
26
27
  awaitRaisedEvent(event: T): Promise<void>;
@@ -31,21 +31,24 @@ class VcsEvent {
31
31
  return false;
32
32
  }
33
33
  /**
34
- * Raise the event, calling all listeners
35
- * @param event
34
+ * Raise the event, calling all listeners, if a listener is removed in between calling listeners, the listener is not
35
+ * called.
36
+ * @param event
36
37
  */
37
38
  raiseEvent(event) {
38
39
  [...this._listeners].forEach((cb) => {
39
- // eslint-disable-next-line no-void
40
- void cb(event);
40
+ if (this._listeners.has(cb)) {
41
+ // eslint-disable-next-line no-void
42
+ void cb(event);
43
+ }
41
44
  });
42
45
  }
43
46
  async awaitRaisedEvent(event) {
44
- const promises = new Array(this._listeners.size);
45
- let i = 0;
47
+ const promises = [];
46
48
  [...this._listeners].forEach((cb) => {
47
- promises[i] = cb(event);
48
- i += 1;
49
+ if (this._listeners.has(cb)) {
50
+ promises.push(cb(event));
51
+ }
49
52
  });
50
53
  await Promise.all(promises);
51
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"vcsEvent.js","sourceRoot":"","sources":["../../src/vcsEvent.ts"],"names":[],"mappings":"AAEA,MAAM,QAAQ;IACJ,UAAU,GAAqB,IAAI,GAAG,EAAE,CAAC;IAEjD;;OAEG;IACH,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,QAAqB;QACpC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,QAAqB;QACvC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,KAAQ;QACjB,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAClC,mCAAmC;YACnC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAQ;QAC7B,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAClC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,IAAI,CAAC,CAAC;QACT,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;CACF;AAED,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"vcsEvent.js","sourceRoot":"","sources":["../../src/vcsEvent.ts"],"names":[],"mappings":"AAEA,MAAM,QAAQ;IACJ,UAAU,GAAqB,IAAI,GAAG,EAAE,CAAC;IAEjD;;OAEG;IACH,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,QAAqB;QACpC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,QAAqB;QACvC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,KAAQ;QACjB,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAClC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC3B,mCAAmC;gBACnC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAQ;QAC7B,MAAM,QAAQ,GAA6B,EAAE,CAAC;QAC9C,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAClC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;CACF;AAED,eAAe,QAAQ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vcmap/core",
3
- "version": "5.1.0",
3
+ "version": "5.1.2",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "type": "module",
@@ -4,8 +4,9 @@ import {
4
4
  Cesium3DTilePointFeature,
5
5
  Entity as CesiumEntity,
6
6
  } from '@vcmap-cesium/engine';
7
+ import { is } from '@vcsuite/check';
7
8
  import Feature from 'ol/Feature.js';
8
- import Style from 'ol/style/Style.js';
9
+ import Style, { StyleFunction } from 'ol/style/Style.js';
9
10
 
10
11
  import VectorStyleItem, { fromCesiumColor } from '../style/vectorStyleItem.js';
11
12
  import VcsEvent from '../vcsEvent.js';
@@ -60,6 +61,12 @@ export type FeatureVisibilityEvent = {
60
61
  ids: (string | number)[];
61
62
  };
62
63
 
64
+ export type HighlightStyleType =
65
+ | VectorStyleItem
66
+ | Color
67
+ | Style
68
+ | StyleFunction;
69
+
63
70
  export function featureExists(
64
71
  feature: Cesium3DTileFeature | Cesium3DTilePointFeature,
65
72
  ): boolean {
@@ -229,9 +236,7 @@ class FeatureVisibility {
229
236
  /**
230
237
  * highlights a number of features by ID (import("@vcmap-cesium/engine").Cesium3DTileFeature|ol/Feature) with the given color.
231
238
  */
232
- highlight(
233
- toHighlight: Record<string, VectorStyleItem | Color | Style>,
234
- ): void {
239
+ highlight(toHighlight: Record<string, HighlightStyleType>): void {
235
240
  const updatedIds: string[] = [];
236
241
  Object.entries(toHighlight).forEach(([id, style]) => {
237
242
  let usedStyle: VectorStyleItem;
@@ -248,6 +253,9 @@ class FeatureVisibility {
248
253
  usedStyle.label = String(style.getText().getText());
249
254
  }
250
255
  usedStyle.style = style;
256
+ } else if (is(style, Function)) {
257
+ usedStyle = new VectorStyleItem({});
258
+ usedStyle.style = style;
251
259
  } else {
252
260
  usedStyle = style;
253
261
  }
package/src/ol/feature.ts CHANGED
@@ -66,9 +66,12 @@ Feature.prototype.getStyleFunction = function getStyleFunction(
66
66
  }
67
67
 
68
68
  if (this[highlighted]) {
69
- return ((): (StyleLike | undefined)[] => [
70
- this[highlighted]?.style,
71
- ]) as StyleFunction;
69
+ return ((feature, res) => {
70
+ if (typeof this[highlighted]?.style === 'function') {
71
+ return this[highlighted]?.style(feature, res);
72
+ }
73
+ return [this[highlighted]?.style];
74
+ }) as StyleFunction;
72
75
  }
73
76
  return originalStyleFunction.bind(this)();
74
77
  };
@@ -14,9 +14,10 @@ import { getLogger as getLoggerByName, type Logger } from '@vcsuite/logger';
14
14
  import CesiumMap from '../../map/cesiumMap.js';
15
15
  import VcsEvent from '../../vcsEvent.js';
16
16
  import LayerCollection from '../layerCollection.js';
17
- import type FeatureStoreLayer from '../../layer/featureStoreLayer.js';
17
+ import FeatureStoreLayer from '../../layer/featureStoreLayer.js';
18
18
  import type VcsMap from '../../map/vcsMap.js';
19
19
  import type Layer from '../../layer/layer.js';
20
+ import CesiumTilesetLayer from '../../layer/cesiumTilesetLayer.js';
20
21
 
21
22
  export type ClippingObjectEntityOption = {
22
23
  layerName: string;
@@ -83,7 +84,8 @@ class ClippingObject {
83
84
  */
84
85
  clippingPlaneUpdated = new VcsEvent<void>();
85
86
 
86
- private _cachedFeatureStoreLayers: Set<FeatureStoreLayer> = new Set();
87
+ private _cachedLayers: Set<FeatureStoreLayer | CesiumTilesetLayer> =
88
+ new Set();
87
89
 
88
90
  private _activeMap: VcsMap | null = null;
89
91
 
@@ -231,14 +233,13 @@ class ClippingObject {
231
233
  }
232
234
  } else if (
233
235
  this.layerNames.includes(layer.name) &&
234
- layer.className === 'FeatureStoreLayer'
236
+ (layer instanceof FeatureStoreLayer ||
237
+ layer instanceof CesiumTilesetLayer)
235
238
  ) {
236
239
  if (layer.active) {
237
- this._cachedFeatureStoreLayers.add(layer as FeatureStoreLayer);
238
- } else if (
239
- this._cachedFeatureStoreLayers.has(layer as FeatureStoreLayer)
240
- ) {
241
- this._cachedFeatureStoreLayers.delete(layer as FeatureStoreLayer);
240
+ this._cachedLayers.add(layer);
241
+ } else if (this._cachedLayers.has(layer)) {
242
+ this._cachedLayers.delete(layer);
242
243
  }
243
244
  }
244
245
  }
@@ -259,11 +260,11 @@ class ClippingObject {
259
260
  this.targetsUpdated.raiseEvent();
260
261
  }
261
262
 
262
- if (this._cachedFeatureStoreLayers.size > 0) {
263
- this._cachedFeatureStoreLayers.forEach((layer) => {
263
+ if (this._cachedLayers.size > 0) {
264
+ this._cachedLayers.forEach((layer) => {
264
265
  this.handleLayerChanged(layer);
265
266
  });
266
- this._cachedFeatureStoreLayers.clear();
267
+ this._cachedLayers.clear();
267
268
  }
268
269
  }
269
270
  this._activeMap = map;
@@ -109,13 +109,14 @@ class ClippingObjectManager {
109
109
  if (this.hasClippingObject(clippingObject)) {
110
110
  throw new Error('ClippingObject already managed, remove it first');
111
111
  }
112
- clippingObject.setLayerCollection(this._layerCollection);
113
-
114
- this._defaultClippingObjects.add(clippingObject);
115
112
  if (this._activeMap instanceof CesiumMap) {
116
113
  clippingObject.handleMapChanged(this._activeMap);
117
114
  }
118
115
 
116
+ clippingObject.setLayerCollection(this._layerCollection);
117
+
118
+ this._defaultClippingObjects.add(clippingObject);
119
+
119
120
  this._listenersMap.set(clippingObject, [
120
121
  clippingObject.targetsUpdated.addEventListener(this._update.bind(this)),
121
122
  clippingObject.clippingPlaneUpdated.addEventListener(
@@ -181,11 +182,12 @@ class ClippingObjectManager {
181
182
  this._exclusiveRemovedCb = removedCb;
182
183
  this._exclusiveClippingObjects = clippingObjects;
183
184
  this._exclusiveClippingObjects.forEach((clippingObject) => {
184
- clippingObject.setLayerCollection(this._layerCollection);
185
-
186
185
  if (this._activeMap instanceof CesiumMap) {
187
186
  clippingObject.handleMapChanged(this._activeMap);
188
187
  }
188
+
189
+ clippingObject.setLayerCollection(this._layerCollection);
190
+
189
191
  this._listenersMap.set(clippingObject, [
190
192
  clippingObject.targetsUpdated.addEventListener(this._update.bind(this)),
191
193
  clippingObject.clippingPlaneUpdated.addEventListener(
@@ -81,7 +81,7 @@ function createEditLineStringGeometryInteraction(
81
81
  vertices.map((f) => f.getGeometry()!.getCoordinates()),
82
82
  );
83
83
  };
84
- const translateVertex = new TranslateVertexInteraction();
84
+ const translateVertex = new TranslateVertexInteraction(feature);
85
85
  translateVertex.vertexChanged.addEventListener(resetGeometry);
86
86
 
87
87
  const insertVertex = new InsertVertexInteraction(feature, geometry);
@@ -130,7 +130,7 @@ function createEditCircleGeometryInteraction(
130
130
  .map((c) => createVertex(c, olcsProps));
131
131
  scratchLayer.addFeatures(vertices);
132
132
 
133
- const translateVertex = new TranslateVertexInteraction();
133
+ const translateVertex = new TranslateVertexInteraction(feature);
134
134
  let suspend = false;
135
135
  translateVertex.vertexChanged.addEventListener((vertex) => {
136
136
  suspend = true;
@@ -181,7 +181,7 @@ function createEditBBoxGeometryInteraction(
181
181
 
182
182
  scratchLayer.addFeatures(vertices);
183
183
  let suspend = false;
184
- const translateVertex = new TranslateVertexInteraction();
184
+ const translateVertex = new TranslateVertexInteraction(feature);
185
185
  translateVertex.vertexChanged.addEventListener((vertex) => {
186
186
  const vertexIndex = vertices.indexOf(vertex);
187
187
  const originIndex = modulo(vertexIndex + 2, 4);
@@ -268,7 +268,7 @@ function createEditSimplePolygonInteraction(
268
268
  ]); // update actual geometry, since linear ring is a clone and not a ref
269
269
  };
270
270
 
271
- const translateVertex = new TranslateVertexInteraction();
271
+ const translateVertex = new TranslateVertexInteraction(feature);
272
272
  translateVertex.vertexChanged.addEventListener(resetGeometry);
273
273
 
274
274
  const insertVertex = new InsertVertexInteraction(feature, linearRing);
@@ -318,7 +318,7 @@ function createEditPointInteraction(
318
318
  layer.featureVisibility.hideObjects(featureIdArray);
319
319
  vertex[createSync] = true;
320
320
  scratchLayer.addFeatures([vertex]);
321
- const translateVertex = new TranslateVertexInteraction();
321
+ const translateVertex = new TranslateVertexInteraction(feature);
322
322
  let suspend = false;
323
323
  translateVertex.vertexChanged.addEventListener(() => {
324
324
  suspend = true;
@@ -425,7 +425,6 @@ function startEditGeometrySession(
425
425
  if (!geometryIsValid(currentFeature.getGeometry())) {
426
426
  layer.removeFeaturesById([currentFeature.getId() as string | number]);
427
427
  }
428
- currentFeature.unset('olcs_allowPicking');
429
428
  }
430
429
  currentFeature = null;
431
430
  altitudeModeChanged();
@@ -488,7 +487,6 @@ function startEditGeometrySession(
488
487
 
489
488
  if (currentInteractionSet) {
490
489
  interactionChain.addInteraction(currentInteractionSet.interactionChain);
491
- currentFeature.set('olcs_allowPicking', false);
492
490
  altitudeModeChanged();
493
491
  } else {
494
492
  getLogger('EditGeometrySession').warning(
@@ -1,3 +1,4 @@
1
+ import Feature from 'ol/Feature.js';
1
2
  import AbstractInteraction, {
2
3
  EventAfterEventHandler,
3
4
  } from '../../../interaction/abstractInteraction.js';
@@ -16,8 +17,11 @@ class TranslateVertexInteraction extends AbstractInteraction {
16
17
 
17
18
  private _vertex: Vertex | null = null;
18
19
 
19
- constructor() {
20
+ private _feature: Feature;
21
+
22
+ constructor(feature: Feature) {
20
23
  super(EventType.DRAGEVENTS);
24
+ this._feature = feature;
21
25
  this.setActive();
22
26
  }
23
27
 
@@ -28,6 +32,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
28
32
 
29
33
  if (event.type & EventType.DRAGEND) {
30
34
  this._vertex.unset('olcs_allowPicking');
35
+ this._feature.unset('olcs_allowPicking');
31
36
  this._vertex.setStyle(undefined);
32
37
  this._vertex = null;
33
38
  }
@@ -39,6 +44,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
39
44
  ) {
40
45
  this._vertex = event.feature as Vertex;
41
46
  this._vertex.set('olcs_allowPicking', false);
47
+ this._feature.set('olcs_allowPicking', false);
42
48
  this._vertex.setStyle(emptyStyle);
43
49
  event.stopPropagation = true;
44
50
  }
@@ -18,6 +18,7 @@ import { vcsLayerName } from '../../layer/layerSymbols.js';
18
18
  import type VectorLayer from '../../layer/vectorLayer.js';
19
19
  import type VcsApp from '../../vcsApp.js';
20
20
  import type VcsMap from '../../map/vcsMap.js';
21
+ import { type HighlightStyleType } from '../../layer/featureVisibility.js';
21
22
 
22
23
  type SelectionHighlightManager = {
23
24
  highlightedFeatures: Feature[];
@@ -36,7 +37,7 @@ type SelectionHighlightManager = {
36
37
  */
37
38
  function createHighlightManager(
38
39
  layer: VectorLayer,
39
- highlightStyle: Style,
40
+ highlightStyle: HighlightStyleType,
40
41
  ): SelectionHighlightManager {
41
42
  const currentFeaturesMap: Map<string | number, Feature> = new Map();
42
43
 
@@ -144,7 +145,7 @@ function startSelectFeaturesSession(
144
145
  layer: VectorLayer,
145
146
  interactionId?: string,
146
147
  initialMode = SelectionMode.MULTI,
147
- highlightStyle = getDefaultHighlightStyle(),
148
+ highlightStyle: HighlightStyleType = getDefaultHighlightStyle(),
148
149
  ): SelectFeaturesSession {
149
150
  const stopped = new VcsEvent<void>();
150
151
  const modeChanged = new VcsEvent<SelectionMode>();
@@ -246,15 +247,15 @@ function startSelectFeaturesSession(
246
247
  const mapChanged = (map: VcsMap): void => {
247
248
  obliqueImageChangedListener();
248
249
  if (map instanceof ObliqueMap) {
249
- currentSelectInteraction!.clear();
250
+ currentSelectInteraction?.clear();
250
251
  obliqueImageChangedListener =
251
252
  map.imageChanged?.addEventListener(() => {
252
- currentSelectInteraction!.clear();
253
+ currentSelectInteraction?.clear();
253
254
  }) ?? ((): void => {});
254
255
  obliqueMap = map;
255
256
  } else {
256
257
  if (obliqueMap) {
257
- currentSelectInteraction!.clear();
258
+ currentSelectInteraction?.clear();
258
259
  }
259
260
  obliqueMap = null;
260
261
  obliqueImageChangedListener = (): void => {};
@@ -147,7 +147,7 @@ export function anchorFromGeojsonFeature(
147
147
  ): FlightAnchor | undefined {
148
148
  const options = {
149
149
  ...feature.properties,
150
- name: String(feature.id) || uuidv4(),
150
+ name: feature.id ? String(feature.id) : uuidv4(),
151
151
  coordinate: feature.geometry.coordinates,
152
152
  };
153
153
  if (isOptions(options)) {
@@ -138,6 +138,27 @@ export async function createFlightPlayer(
138
138
  }),
139
139
  ];
140
140
 
141
+ const getView = (
142
+ time: number,
143
+ ):
144
+ | {
145
+ destination: Cartesian3;
146
+ orientation: HeadingPitchRoll;
147
+ }
148
+ | undefined => {
149
+ if (destinationSpline && quaternionSpline) {
150
+ return {
151
+ destination: destinationSpline.evaluate(time) as Cartesian3,
152
+ orientation: HeadingPitchRoll.fromQuaternion(
153
+ quaternionSpline.evaluate(time),
154
+ ),
155
+ };
156
+ } else {
157
+ getLogger('FlightPlayer').error('cannot evaluate spline');
158
+ }
159
+ return undefined;
160
+ };
161
+
141
162
  const cesiumPostRender = (scene: Scene): void => {
142
163
  const time = Date.now() / 1000;
143
164
  if (!clock.currentSystemTime) {
@@ -170,13 +191,11 @@ export async function createFlightPlayer(
170
191
  }
171
192
  }
172
193
 
173
- const view = {
174
- destination: destinationSpline!.evaluate(clock.currentTime) as Cartesian3,
175
- orientation: HeadingPitchRoll.fromQuaternion(
176
- quaternionSpline!.evaluate(clock.currentTime),
177
- ),
178
- };
179
- scene.camera.setView(view);
194
+ const view = getView(clock.currentTime);
195
+ if (view) {
196
+ scene.camera.setView(view);
197
+ }
198
+
180
199
  if (playerState === 'playing') {
181
200
  if (screenSpaceCameraController) {
182
201
  screenSpaceCameraController.enableInputs = false;
@@ -185,6 +204,12 @@ export async function createFlightPlayer(
185
204
  };
186
205
 
187
206
  const play = (): void => {
207
+ if (!instance.isValid()) {
208
+ getLogger('FlightPlayer').error(
209
+ `cannot play invalid flight ${instance.name}`,
210
+ );
211
+ return;
212
+ }
188
213
  if (playerState === 'playing') {
189
214
  return;
190
215
  }
@@ -215,6 +240,12 @@ export async function createFlightPlayer(
215
240
  };
216
241
 
217
242
  const goToTime = (time: number): void => {
243
+ if (!instance.isValid()) {
244
+ getLogger('FlightPlayer').error(
245
+ `cannot goToTime of invalid flight ${instance.name}`,
246
+ );
247
+ return;
248
+ }
218
249
  if (time > clock.endTime) {
219
250
  getLogger('FlightPlayer').warning(`time: ${time} out of range`);
220
251
  return;
@@ -222,15 +253,10 @@ export async function createFlightPlayer(
222
253
  clock.currentTime = time;
223
254
  clock.currentSystemTime = undefined;
224
255
  if (playerState !== 'playing') {
225
- const view = {
226
- destination: destinationSpline!.evaluate(
227
- clock.currentTime,
228
- ) as Cartesian3,
229
- orientation: HeadingPitchRoll.fromQuaternion(
230
- quaternionSpline!.evaluate(clock.currentTime),
231
- ),
232
- };
233
- cesiumMap.getScene()?.camera.setView(view);
256
+ const view = getView(clock.currentTime);
257
+ if (view) {
258
+ cesiumMap.getScene()?.camera.setView(view);
259
+ }
234
260
  }
235
261
  };
236
262
  const destroyed = new VcsEvent<void>();
package/src/vcsApp.ts CHANGED
@@ -431,7 +431,7 @@ class VcsApp {
431
431
  check(module, VcsModule);
432
432
 
433
433
  this._moduleMutationPromise = this._moduleMutationPromise.then(async () => {
434
- if (this._modules.has(module)) {
434
+ if (this._modules.hasKey(module._id)) {
435
435
  getLogger().info(`module with id ${module._id} already loaded`);
436
436
  return;
437
437
  }