@vcmap/core 5.1.1 → 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.
- package/dist/src/util/clipping/clippingObject.d.ts +1 -1
- package/dist/src/util/clipping/clippingObject.js +11 -8
- package/dist/src/util/clipping/clippingObject.js.map +1 -1
- package/dist/src/util/clipping/clippingObjectManager.js +3 -3
- package/dist/src/util/clipping/clippingObjectManager.js.map +1 -1
- package/dist/src/util/editor/editGeometrySession.js +5 -7
- package/dist/src/util/editor/editGeometrySession.js.map +1 -1
- package/dist/src/util/editor/interactions/translateVertexInteraction.d.ts +3 -1
- package/dist/src/util/editor/interactions/translateVertexInteraction.js +5 -1
- package/dist/src/util/editor/interactions/translateVertexInteraction.js.map +1 -1
- package/dist/src/util/flight/flightAnchor.js +1 -1
- package/dist/src/util/flight/flightAnchor.js.map +1 -1
- package/dist/src/util/flight/flightPlayer.js +28 -10
- package/dist/src/util/flight/flightPlayer.js.map +1 -1
- package/package.json +1 -1
- package/src/util/clipping/clippingObject.ts +12 -11
- package/src/util/clipping/clippingObjectManager.ts +7 -5
- package/src/util/editor/editGeometrySession.ts +5 -7
- package/src/util/editor/interactions/translateVertexInteraction.ts +7 -1
- package/src/util/flight/flightAnchor.ts +1 -1
- package/src/util/flight/flightPlayer.ts +42 -16
|
@@ -50,7 +50,7 @@ declare class ClippingObject {
|
|
|
50
50
|
* Event, raised on changes to the clippingPlaneCollection property
|
|
51
51
|
*/
|
|
52
52
|
clippingPlaneUpdated: VcsEvent<void>;
|
|
53
|
-
private
|
|
53
|
+
private _cachedLayers;
|
|
54
54
|
private _activeMap;
|
|
55
55
|
private _layerCollection;
|
|
56
56
|
constructor(options?: ClippingObjectOptions);
|
|
@@ -6,6 +6,8 @@ import { getLogger as getLoggerByName } from '@vcsuite/logger';
|
|
|
6
6
|
import CesiumMap from '../../map/cesiumMap.js';
|
|
7
7
|
import VcsEvent from '../../vcsEvent.js';
|
|
8
8
|
import LayerCollection from '../layerCollection.js';
|
|
9
|
+
import FeatureStoreLayer from '../../layer/featureStoreLayer.js';
|
|
10
|
+
import CesiumTilesetLayer from '../../layer/cesiumTilesetLayer.js';
|
|
9
11
|
function getLogger() {
|
|
10
12
|
return getLoggerByName('ClippingObject');
|
|
11
13
|
}
|
|
@@ -45,7 +47,7 @@ class ClippingObject {
|
|
|
45
47
|
* Event, raised on changes to the clippingPlaneCollection property
|
|
46
48
|
*/
|
|
47
49
|
clippingPlaneUpdated = new VcsEvent();
|
|
48
|
-
|
|
50
|
+
_cachedLayers = new Set();
|
|
49
51
|
_activeMap = null;
|
|
50
52
|
_layerCollection = null;
|
|
51
53
|
constructor(options = {}) {
|
|
@@ -168,12 +170,13 @@ class ClippingObject {
|
|
|
168
170
|
}
|
|
169
171
|
}
|
|
170
172
|
else if (this.layerNames.includes(layer.name) &&
|
|
171
|
-
layer
|
|
173
|
+
(layer instanceof FeatureStoreLayer ||
|
|
174
|
+
layer instanceof CesiumTilesetLayer)) {
|
|
172
175
|
if (layer.active) {
|
|
173
|
-
this.
|
|
176
|
+
this._cachedLayers.add(layer);
|
|
174
177
|
}
|
|
175
|
-
else if (this.
|
|
176
|
-
this.
|
|
178
|
+
else if (this._cachedLayers.has(layer)) {
|
|
179
|
+
this._cachedLayers.delete(layer);
|
|
177
180
|
}
|
|
178
181
|
}
|
|
179
182
|
}
|
|
@@ -192,11 +195,11 @@ class ClippingObject {
|
|
|
192
195
|
if (raise) {
|
|
193
196
|
this.targetsUpdated.raiseEvent();
|
|
194
197
|
}
|
|
195
|
-
if (this.
|
|
196
|
-
this.
|
|
198
|
+
if (this._cachedLayers.size > 0) {
|
|
199
|
+
this._cachedLayers.forEach((layer) => {
|
|
197
200
|
this.handleLayerChanged(layer);
|
|
198
201
|
});
|
|
199
|
-
this.
|
|
202
|
+
this._cachedLayers.clear();
|
|
200
203
|
}
|
|
201
204
|
}
|
|
202
205
|
this._activeMap = map;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clippingObject.js","sourceRoot":"","sources":["../../../../src/util/clipping/clippingObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EACL,eAAe,GAMhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,IAAI,eAAe,EAAe,MAAM,iBAAiB,CAAC;AAC5E,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,eAAe,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"clippingObject.js","sourceRoot":"","sources":["../../../../src/util/clipping/clippingObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EACL,eAAe,GAMhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,IAAI,eAAe,EAAe,MAAM,iBAAiB,CAAC;AAC5E,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAGjE,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AAiBnE,SAAS,SAAS;IAChB,OAAO,eAAe,CAAC,gBAAgB,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,WAAW,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAElD;;;;;;;;GAQG;AACH,MAAM,cAAc;IAClB,EAAE,GAAG,MAAM,EAAE,CAAC;IAEd;;OAEG;IACM,UAAU,CAAW;IAE9B;;;OAGG;IACH,OAAO,GAAyC,IAAI,GAAG,EAAE,CAAC;IAE1D;;OAEG;IACM,QAAQ,CAA+B;IAExC,wBAAwB,CAAsC;IAE9D,QAAQ,CAAU;IAElB,MAAM,CAAU;IAExB;;OAEG;IACH,cAAc,GAAG,IAAI,QAAQ,EAAQ,CAAC;IAEtC;;OAEG;IACH,oBAAoB,GAAG,IAAI,QAAQ,EAAQ,CAAC;IAEpC,aAAa,GACnB,IAAI,GAAG,EAAE,CAAC;IAEJ,UAAU,GAAkB,IAAI,CAAC;IAEjC,gBAAgB,GAA2B,IAAI,CAAC;IAExD,YAAY,UAAiC,EAAE;QAC7C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;QAChE,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,IAAI,uBAAuB;QACzB,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACvC,CAAC;IAED,IAAI,uBAAuB,CACzB,uBAA4D;QAE5D,IAAI,CAAC,wBAAwB,GAAG,uBAAuB,CAAC;QACxD,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,OAAO,CAAC,OAAgB;QAC1B,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAExB,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE;YAC7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACxC;IACH,CAAC;IAED;;;;OAIG;IACH,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,KAAK,CAAC,KAAc;QACtB,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAEtB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;YACzB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,CAAC;SACxC;IACH,CAAC;IAED,kBAAkB,CAAC,eAAgC;QACjD,KAAK,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,KAAK,eAAe,EAAE;YACtE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;QACD,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,KAAY;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,IAAI,GAAG,YAAY,SAAS,EAAE;YAC5B,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBACxC,IAAI,KAAK,CAAC,MAAM,EAAE;oBAChB,MAAM,cAAc,GAAG,GAAG,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;oBAC5D,MAAM,QAAQ,GAAG,cAAc;wBAC7B,CAAC,CAAE,CAAC,GAAG,cAAc,CAAC,CAAC,MAAM,CACzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,eAAe,CACd;wBACzB,CAAC,CAAC,EAAE,CAAC;oBAEP,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;wBACvB,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;4BAC3B,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE;gCACxD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gCACtC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;6BAClC;wBACH,CAAC,CAAC,CAAC;qBACJ;yBAAM;wBACL,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAClD,SAAS,EAAE,CAAC,OAAO,CACjB,SAAS,KAAK,CAAC,IAAI,uCAAuC,CAC3D,CAAC;wBACF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;qBAClC;iBACF;qBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBACvC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAChC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;iBAClC;aACF;iBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE;gBAClE,IAAI,KAAK,GAAG,KAAK,CAAC;gBAClB,MAAM,cAAc,GAAG,GAAG,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;gBAC5D,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAElE,IAAI,CAAC,UAAU,EAAE;oBACf,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAClD,SAAS,EAAE,CAAC,OAAO,CACjB,SAAS,KAAK,CAAC,IAAI,uCAAuC,CAC3D,CAAC;oBACF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBACjC,OAAO;iBACR;gBAED,IAAI,CAAC,QAAQ;qBACV,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,KAAK,KAAK,CAAC,IAAI,CAAC;qBAC3C,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;oBACd,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;oBAC7C,IAAI,KAAK,CAAC,MAAM,EAAE;wBAChB,MAAM,MAAM,GAAI,UAA+B,CAAC,QAAQ,CAAC,OAAO,CAC9D,EAAE,CAAC,QAAQ,CACZ,CAAC;wBACF,IAAI,MAAM,EAAE;4BACV,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;4BAC9B,KAAK,GAAG,IAAI,CAAC;yBACd;6BAAM;4BACL,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;4BACxC,SAAS,EAAE,CAAC,OAAO,CACjB,iCAAiC,EAAE,CAAC,QAAQ,aAAa,EAAE,CAAC,SAAS,EAAE,CACxE,CAAC;4BACF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;yBAChC;qBACF;yBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACzB,KAAK,GAAG,IAAI,CAAC;qBACd;gBACH,CAAC,CAAC,CAAC;gBAEL,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;iBAClC;aACF;SACF;aAAM,IACL,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;YACpC,CAAC,KAAK,YAAY,iBAAiB;gBACjC,KAAK,YAAY,kBAAkB,CAAC,EACtC;YACA,IAAI,KAAK,CAAC,MAAM,EAAE;gBAChB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aAC/B;iBAAM,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACxC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAClC;SACF;IACH,CAAC;IAED,gBAAgB,CAAC,GAAkB;QACjC,IAAI,GAAG,YAAY,SAAS,EAAE;YAC5B,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAW,CAAC;YAC1C,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBACnD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;gBACrC,KAAK,GAAG,IAAI,CAAC;aACd;iBAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACjC,KAAK,GAAG,IAAI,CAAC;aACd;YAED,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;aAClC;YAED,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;gBAC/B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBACnC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBACjC,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;aAC5B;SACF;QACD,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,SAAiB;QACxB,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACxC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAChC,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB;gBACjC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC3C,CAAC,CAAC,IAAI,CAAC;YACT,2CAA2C;YAC3C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;aAChC;SACF;IACH,CAAC;IAED;;;OAGG;IACH,WAAW,CAAC,SAAiB;QAC3B,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACd,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAClC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC/B,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;SAClC;IACH,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,SAAiB,EAAE,QAAgB;QAC3C,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACzB,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAExB,IACE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CACjB,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAC/D,EACD;YACA,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB;gBACjC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC3C,CAAC,CAAC,IAAI,CAAC;YACT,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;aAChC;SACF;IACH,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,SAAiB,EAAE,QAAgB;QAC9C,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACzB,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAExB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAC5D,CAAC;QACF,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAChC;QAED,MAAM,QAAQ,GAAG,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC;QAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC9B,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;SAClC;IACH,CAAC;CACF;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -83,11 +83,11 @@ class ClippingObjectManager {
|
|
|
83
83
|
if (this.hasClippingObject(clippingObject)) {
|
|
84
84
|
throw new Error('ClippingObject already managed, remove it first');
|
|
85
85
|
}
|
|
86
|
-
clippingObject.setLayerCollection(this._layerCollection);
|
|
87
|
-
this._defaultClippingObjects.add(clippingObject);
|
|
88
86
|
if (this._activeMap instanceof CesiumMap) {
|
|
89
87
|
clippingObject.handleMapChanged(this._activeMap);
|
|
90
88
|
}
|
|
89
|
+
clippingObject.setLayerCollection(this._layerCollection);
|
|
90
|
+
this._defaultClippingObjects.add(clippingObject);
|
|
91
91
|
this._listenersMap.set(clippingObject, [
|
|
92
92
|
clippingObject.targetsUpdated.addEventListener(this._update.bind(this)),
|
|
93
93
|
clippingObject.clippingPlaneUpdated.addEventListener(this._clippingPlaneUpdated.bind(this, clippingObject)),
|
|
@@ -135,10 +135,10 @@ class ClippingObjectManager {
|
|
|
135
135
|
this._exclusiveRemovedCb = removedCb;
|
|
136
136
|
this._exclusiveClippingObjects = clippingObjects;
|
|
137
137
|
this._exclusiveClippingObjects.forEach((clippingObject) => {
|
|
138
|
-
clippingObject.setLayerCollection(this._layerCollection);
|
|
139
138
|
if (this._activeMap instanceof CesiumMap) {
|
|
140
139
|
clippingObject.handleMapChanged(this._activeMap);
|
|
141
140
|
}
|
|
141
|
+
clippingObject.setLayerCollection(this._layerCollection);
|
|
142
142
|
this._listenersMap.set(clippingObject, [
|
|
143
143
|
clippingObject.targetsUpdated.addEventListener(this._update.bind(this)),
|
|
144
144
|
clippingObject.clippingPlaneUpdated.addEventListener(this._clippingPlaneUpdated.bind(this, clippingObject)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clippingObjectManager.js","sourceRoot":"","sources":["../../../../src/util/clipping/clippingObjectManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"clippingObjectManager.js","sourceRoot":"","sources":["../../../../src/util/clipping/clippingObjectManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ function createEditLineStringGeometryInteraction(feature, scratchLayer) {
|
|
|
31
31
|
const resetGeometry = () => {
|
|
32
32
|
geometry.setCoordinates(vertices.map((f) => f.getGeometry().getCoordinates()));
|
|
33
33
|
};
|
|
34
|
-
const translateVertex = new TranslateVertexInteraction();
|
|
34
|
+
const translateVertex = new TranslateVertexInteraction(feature);
|
|
35
35
|
translateVertex.vertexChanged.addEventListener(resetGeometry);
|
|
36
36
|
const insertVertex = new InsertVertexInteraction(feature, geometry);
|
|
37
37
|
insertVertex.vertexInserted.addEventListener(({ vertex, index }) => {
|
|
@@ -68,7 +68,7 @@ function createEditCircleGeometryInteraction(feature, scratchLayer) {
|
|
|
68
68
|
.getCoordinates()
|
|
69
69
|
.map((c) => createVertex(c, olcsProps));
|
|
70
70
|
scratchLayer.addFeatures(vertices);
|
|
71
|
-
const translateVertex = new TranslateVertexInteraction();
|
|
71
|
+
const translateVertex = new TranslateVertexInteraction(feature);
|
|
72
72
|
let suspend = false;
|
|
73
73
|
translateVertex.vertexChanged.addEventListener((vertex) => {
|
|
74
74
|
suspend = true;
|
|
@@ -109,7 +109,7 @@ function createEditBBoxGeometryInteraction(feature, scratchLayer) {
|
|
|
109
109
|
.map((c) => createVertex(c, olcsProps));
|
|
110
110
|
scratchLayer.addFeatures(vertices);
|
|
111
111
|
let suspend = false;
|
|
112
|
-
const translateVertex = new TranslateVertexInteraction();
|
|
112
|
+
const translateVertex = new TranslateVertexInteraction(feature);
|
|
113
113
|
translateVertex.vertexChanged.addEventListener((vertex) => {
|
|
114
114
|
const vertexIndex = vertices.indexOf(vertex);
|
|
115
115
|
const originIndex = modulo(vertexIndex + 2, 4);
|
|
@@ -180,7 +180,7 @@ function createEditSimplePolygonInteraction(feature, scratchLayer) {
|
|
|
180
180
|
vertices.map((f) => f.getGeometry().getCoordinates()),
|
|
181
181
|
]); // update actual geometry, since linear ring is a clone and not a ref
|
|
182
182
|
};
|
|
183
|
-
const translateVertex = new TranslateVertexInteraction();
|
|
183
|
+
const translateVertex = new TranslateVertexInteraction(feature);
|
|
184
184
|
translateVertex.vertexChanged.addEventListener(resetGeometry);
|
|
185
185
|
const insertVertex = new InsertVertexInteraction(feature, linearRing);
|
|
186
186
|
insertVertex.vertexInserted.addEventListener(({ vertex, index }) => {
|
|
@@ -218,7 +218,7 @@ function createEditPointInteraction(feature, scratchLayer, layer) {
|
|
|
218
218
|
layer.featureVisibility.hideObjects(featureIdArray);
|
|
219
219
|
vertex[createSync] = true;
|
|
220
220
|
scratchLayer.addFeatures([vertex]);
|
|
221
|
-
const translateVertex = new TranslateVertexInteraction();
|
|
221
|
+
const translateVertex = new TranslateVertexInteraction(feature);
|
|
222
222
|
let suspend = false;
|
|
223
223
|
translateVertex.vertexChanged.addEventListener(() => {
|
|
224
224
|
suspend = true;
|
|
@@ -294,7 +294,6 @@ function startEditGeometrySession(app, layer, interactionId) {
|
|
|
294
294
|
if (!geometryIsValid(currentFeature.getGeometry())) {
|
|
295
295
|
layer.removeFeaturesById([currentFeature.getId()]);
|
|
296
296
|
}
|
|
297
|
-
currentFeature.unset('olcs_allowPicking');
|
|
298
297
|
}
|
|
299
298
|
currentFeature = null;
|
|
300
299
|
altitudeModeChanged();
|
|
@@ -340,7 +339,6 @@ function startEditGeometrySession(app, layer, interactionId) {
|
|
|
340
339
|
}
|
|
341
340
|
if (currentInteractionSet) {
|
|
342
341
|
interactionChain.addInteraction(currentInteractionSet.interactionChain);
|
|
343
|
-
currentFeature.set('olcs_allowPicking', false);
|
|
344
342
|
altitudeModeChanged();
|
|
345
343
|
}
|
|
346
344
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editGeometrySession.js","sourceRoot":"","sources":["../../../../src/util/editor/editGeometrySession.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"editGeometrySession.js","sourceRoot":"","sources":["../../../../src/util/editor/editGeometrySession.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import Feature from 'ol/Feature.js';
|
|
1
2
|
import AbstractInteraction, { EventAfterEventHandler } from '../../../interaction/abstractInteraction.js';
|
|
2
3
|
import VcsEvent from '../../../vcsEvent.js';
|
|
3
4
|
import { Vertex } from '../editorHelpers.js';
|
|
@@ -8,7 +9,8 @@ import { Vertex } from '../editorHelpers.js';
|
|
|
8
9
|
declare class TranslateVertexInteraction extends AbstractInteraction {
|
|
9
10
|
readonly vertexChanged: VcsEvent<Vertex>;
|
|
10
11
|
private _vertex;
|
|
11
|
-
|
|
12
|
+
private _feature;
|
|
13
|
+
constructor(feature: Feature);
|
|
12
14
|
pipe(event: EventAfterEventHandler): Promise<EventAfterEventHandler>;
|
|
13
15
|
destroy(): void;
|
|
14
16
|
}
|
|
@@ -10,8 +10,10 @@ import { emptyStyle } from '../../../style/styleHelpers.js';
|
|
|
10
10
|
class TranslateVertexInteraction extends AbstractInteraction {
|
|
11
11
|
vertexChanged = new VcsEvent();
|
|
12
12
|
_vertex = null;
|
|
13
|
-
|
|
13
|
+
_feature;
|
|
14
|
+
constructor(feature) {
|
|
14
15
|
super(EventType.DRAGEVENTS);
|
|
16
|
+
this._feature = feature;
|
|
15
17
|
this.setActive();
|
|
16
18
|
}
|
|
17
19
|
pipe(event) {
|
|
@@ -20,6 +22,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
|
|
|
20
22
|
this.vertexChanged.raiseEvent(this._vertex);
|
|
21
23
|
if (event.type & EventType.DRAGEND) {
|
|
22
24
|
this._vertex.unset('olcs_allowPicking');
|
|
25
|
+
this._feature.unset('olcs_allowPicking');
|
|
23
26
|
this._vertex.setStyle(undefined);
|
|
24
27
|
this._vertex = null;
|
|
25
28
|
}
|
|
@@ -30,6 +33,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
|
|
|
30
33
|
event.feature[vertexSymbol]) {
|
|
31
34
|
this._vertex = event.feature;
|
|
32
35
|
this._vertex.set('olcs_allowPicking', false);
|
|
36
|
+
this._feature.set('olcs_allowPicking', false);
|
|
33
37
|
this._vertex.setStyle(emptyStyle);
|
|
34
38
|
event.stopPropagation = true;
|
|
35
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translateVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translateVertexInteraction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"translateVertexInteraction.js","sourceRoot":"","sources":["../../../../../src/util/editor/interactions/translateVertexInteraction.ts"],"names":[],"mappings":"AACA,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;IAE9B,QAAQ,CAAU;IAE1B,YAAY,OAAgB;QAC1B,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,KAA6B;QAChC,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAG,CAAC,cAAc,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAClE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE5C,IAAI,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE;gBAClC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;aACrB;YACD,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;SAC9B;aAAM,IACL,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS;YAChC,KAAK,CAAC,OAAO;YACZ,KAAK,CAAC,OAAkB,CAAC,YAAY,CAAC,EACvC;YACA,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAiB,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC9C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;SAC9B;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC7B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,0BAA0B,CAAC"}
|
|
@@ -108,7 +108,7 @@ export function anchorFromViewpoint(viewpoint) {
|
|
|
108
108
|
export function anchorFromGeojsonFeature(feature) {
|
|
109
109
|
const options = {
|
|
110
110
|
...feature.properties,
|
|
111
|
-
name: String(feature.id)
|
|
111
|
+
name: feature.id ? String(feature.id) : uuidv4(),
|
|
112
112
|
coordinate: feature.geometry.coordinates,
|
|
113
113
|
};
|
|
114
114
|
if (isOptions(options)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flightAnchor.js","sourceRoot":"","sources":["../../../../src/util/flight/flightAnchor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"flightAnchor.js","sourceRoot":"","sources":["../../../../src/util/flight/flightAnchor.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
-
|
|
116
|
-
|
|
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
|
-
|
|
160
|
-
|
|
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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"}
|
package/package.json
CHANGED
|
@@ -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
|
|
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
|
|
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
|
|
236
|
+
(layer instanceof FeatureStoreLayer ||
|
|
237
|
+
layer instanceof CesiumTilesetLayer)
|
|
235
238
|
) {
|
|
236
239
|
if (layer.active) {
|
|
237
|
-
this.
|
|
238
|
-
} else if (
|
|
239
|
-
this.
|
|
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.
|
|
263
|
-
this.
|
|
263
|
+
if (this._cachedLayers.size > 0) {
|
|
264
|
+
this._cachedLayers.forEach((layer) => {
|
|
264
265
|
this.handleLayerChanged(layer);
|
|
265
266
|
});
|
|
266
|
-
this.
|
|
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
|
-
|
|
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
|
}
|
|
@@ -147,7 +147,7 @@ export function anchorFromGeojsonFeature(
|
|
|
147
147
|
): FlightAnchor | undefined {
|
|
148
148
|
const options = {
|
|
149
149
|
...feature.properties,
|
|
150
|
-
name: String(feature.id)
|
|
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
|
-
|
|
175
|
-
|
|
176
|
-
|
|
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
|
-
|
|
227
|
-
|
|
228
|
-
|
|
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>();
|