@vcmap/core 6.0.7 → 6.1.0-rc.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/cesium.d.ts +3 -0
- package/dist/index.d.ts +16 -1
- package/dist/index.js +16 -1
- package/dist/index.js.map +1 -1
- package/dist/ol.d.ts +8 -1
- package/dist/src/featureProvider/featureProviderSymbols.d.ts +5 -0
- package/dist/src/featureProvider/featureProviderSymbols.js +5 -1
- package/dist/src/featureProvider/featureProviderSymbols.js.map +1 -1
- package/dist/src/interaction/featureAtPixelInteraction.js +58 -62
- package/dist/src/interaction/featureAtPixelInteraction.js.map +1 -1
- package/dist/src/interaction/featureProviderInteraction.js +25 -13
- package/dist/src/interaction/featureProviderInteraction.js.map +1 -1
- package/dist/src/layer/cesium/sourceVectorContextSync.d.ts +27 -0
- package/dist/src/layer/cesium/sourceVectorContextSync.js +94 -0
- package/dist/src/layer/cesium/sourceVectorContextSync.js.map +1 -0
- package/dist/src/layer/cesium/vectorCesiumImpl.d.ts +4 -27
- package/dist/src/layer/cesium/vectorCesiumImpl.js +15 -107
- package/dist/src/layer/cesium/vectorCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorContext.d.ts +12 -1
- package/dist/src/layer/cesium/vectorContext.js +6 -0
- package/dist/src/layer/cesium/vectorContext.js.map +1 -1
- package/dist/src/layer/layerSymbols.js +1 -1
- package/dist/src/layer/layerSymbols.js.map +1 -1
- package/dist/src/layer/oblique/sourceObliqueSync.d.ts +18 -0
- package/dist/src/layer/oblique/sourceObliqueSync.js +319 -0
- package/dist/src/layer/oblique/sourceObliqueSync.js.map +1 -0
- package/dist/src/layer/oblique/vectorObliqueImpl.d.ts +2 -40
- package/dist/src/layer/oblique/vectorObliqueImpl.js +8 -283
- package/dist/src/layer/oblique/vectorObliqueImpl.js.map +1 -1
- package/dist/src/layer/vectorLayer.d.ts +10 -1
- package/dist/src/layer/vectorLayer.js +23 -1
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/map/baseOLMap.js +8 -1
- package/dist/src/map/baseOLMap.js.map +1 -1
- package/dist/src/map/cesiumMap.d.ts +2 -0
- package/dist/src/map/cesiumMap.js +26 -1
- package/dist/src/map/cesiumMap.js.map +1 -1
- package/dist/src/map/vcsMap.d.ts +24 -12
- package/dist/src/map/vcsMap.js +92 -38
- package/dist/src/map/vcsMap.js.map +1 -1
- package/dist/src/ol/source/ClusterEnhancedVectorSource.d.ts +6 -4
- package/dist/src/ol/source/ClusterEnhancedVectorSource.js +4 -9
- package/dist/src/ol/source/ClusterEnhancedVectorSource.js.map +1 -1
- package/dist/src/ol/source/VcsCluster.d.ts +10 -10
- package/dist/src/ol/source/VcsCluster.js +23 -7
- package/dist/src/ol/source/VcsCluster.js.map +1 -1
- package/dist/src/util/clipping/clippingPolygonHelper.d.ts +7 -0
- package/dist/src/util/clipping/clippingPolygonHelper.js +53 -0
- package/dist/src/util/clipping/clippingPolygonHelper.js.map +1 -0
- package/dist/src/util/clipping/clippingPolygonObject.d.ts +59 -0
- package/dist/src/util/clipping/clippingPolygonObject.js +158 -0
- package/dist/src/util/clipping/clippingPolygonObject.js.map +1 -0
- package/dist/src/util/clipping/clippingPolygonObjectCollection.d.ts +18 -0
- package/dist/src/util/clipping/clippingPolygonObjectCollection.js +167 -0
- package/dist/src/util/clipping/clippingPolygonObjectCollection.js.map +1 -0
- package/dist/src/util/layerCollection.d.ts +11 -1
- package/dist/src/util/layerCollection.js +67 -12
- package/dist/src/util/layerCollection.js.map +1 -1
- package/dist/src/util/mapCollection.d.ts +16 -1
- package/dist/src/util/mapCollection.js +37 -3
- package/dist/src/util/mapCollection.js.map +1 -1
- package/dist/src/util/renderScreenshot.d.ts +9 -0
- package/dist/src/util/renderScreenshot.js +162 -0
- package/dist/src/util/renderScreenshot.js.map +1 -0
- package/dist/src/util/rotation.d.ts +30 -0
- package/dist/src/util/rotation.js +145 -0
- package/dist/src/util/rotation.js.map +1 -0
- package/dist/src/util/vcsTemplate.d.ts +7 -0
- package/dist/src/util/vcsTemplate.js +248 -0
- package/dist/src/util/vcsTemplate.js.map +1 -0
- package/dist/src/vcsApp.d.ts +7 -0
- package/dist/src/vcsApp.js +29 -0
- package/dist/src/vcsApp.js.map +1 -1
- package/dist/src/vcsModule.d.ts +6 -2
- package/dist/src/vcsModule.js.map +1 -1
- package/dist/src/vectorCluster/vectorClusterCesiumContext.d.ts +18 -0
- package/dist/src/{layer/cesium/clusterContext.js → vectorCluster/vectorClusterCesiumContext.js} +28 -42
- package/dist/src/vectorCluster/vectorClusterCesiumContext.js.map +1 -0
- package/dist/src/vectorCluster/vectorClusterGroup.d.ts +96 -0
- package/dist/src/vectorCluster/vectorClusterGroup.js +320 -0
- package/dist/src/vectorCluster/vectorClusterGroup.js.map +1 -0
- package/dist/src/vectorCluster/vectorClusterGroupCesiumImpl.d.ts +20 -0
- package/dist/src/vectorCluster/vectorClusterGroupCesiumImpl.js +115 -0
- package/dist/src/vectorCluster/vectorClusterGroupCesiumImpl.js.map +1 -0
- package/dist/src/vectorCluster/vectorClusterGroupCollection.d.ts +19 -0
- package/dist/src/vectorCluster/vectorClusterGroupCollection.js +37 -0
- package/dist/src/vectorCluster/vectorClusterGroupCollection.js.map +1 -0
- package/dist/src/vectorCluster/vectorClusterGroupImpl.d.ts +31 -0
- package/dist/src/vectorCluster/vectorClusterGroupImpl.js +76 -0
- package/dist/src/vectorCluster/vectorClusterGroupImpl.js.map +1 -0
- package/dist/src/vectorCluster/vectorClusterGroupObliqueImpl.d.ts +17 -0
- package/dist/src/vectorCluster/vectorClusterGroupObliqueImpl.js +62 -0
- package/dist/src/vectorCluster/vectorClusterGroupObliqueImpl.js.map +1 -0
- package/dist/src/vectorCluster/vectorClusterGroupOpenlayersImpl.d.ts +17 -0
- package/dist/src/vectorCluster/vectorClusterGroupOpenlayersImpl.js +62 -0
- package/dist/src/vectorCluster/vectorClusterGroupOpenlayersImpl.js.map +1 -0
- package/dist/src/vectorCluster/vectorClusterStyleItem.d.ts +110 -0
- package/dist/src/vectorCluster/vectorClusterStyleItem.js +374 -0
- package/dist/src/vectorCluster/vectorClusterStyleItem.js.map +1 -0
- package/dist/src/vectorCluster/vectorClusterSymbols.d.ts +1 -0
- package/dist/src/vectorCluster/vectorClusterSymbols.js +3 -0
- package/dist/src/vectorCluster/vectorClusterSymbols.js.map +1 -0
- package/index.ts +42 -1
- package/package.json +3 -1
- package/src/cesium/cesium.d.ts +3 -0
- package/src/featureProvider/featureProviderSymbols.ts +6 -1
- package/src/interaction/featureAtPixelInteraction.ts +109 -84
- package/src/interaction/featureProviderInteraction.ts +42 -28
- package/src/layer/cesium/sourceVectorContextSync.ts +134 -0
- package/src/layer/cesium/vcsTile/vcsDebugTile.ts +1 -1
- package/src/layer/cesium/vcsTile/vcsVectorTile.ts +1 -1
- package/src/layer/cesium/vectorCesiumImpl.ts +30 -144
- package/src/layer/cesium/vectorContext.ts +17 -1
- package/src/layer/layerSymbols.ts +1 -1
- package/src/layer/oblique/sourceObliqueSync.ts +436 -0
- package/src/layer/oblique/vectorObliqueImpl.ts +11 -397
- package/src/layer/vectorLayer.ts +35 -2
- package/src/map/baseOLMap.ts +8 -1
- package/src/map/cesiumMap.ts +36 -3
- package/src/map/vcsMap.ts +121 -47
- package/src/ol/ol.d.ts +8 -1
- package/src/ol/source/{ClusterEnhancedVectorSource.js → ClusterEnhancedVectorSource.ts} +7 -10
- package/src/ol/source/VcsCluster.ts +58 -0
- package/src/util/clipping/clippingPolygonHelper.ts +86 -0
- package/src/util/clipping/clippingPolygonObject.ts +223 -0
- package/src/util/clipping/clippingPolygonObjectCollection.ts +249 -0
- package/src/util/layerCollection.ts +90 -12
- package/src/util/mapCollection.ts +53 -2
- package/src/util/renderScreenshot.ts +193 -0
- package/src/util/rotation.ts +215 -0
- package/src/util/vcsTemplate.ts +373 -0
- package/src/vcsApp.ts +65 -0
- package/src/vcsModule.ts +6 -2
- package/src/vectorCluster/vectorClusterCesiumContext.ts +123 -0
- package/src/vectorCluster/vectorClusterGroup.ts +463 -0
- package/src/vectorCluster/vectorClusterGroupCesiumImpl.ts +176 -0
- package/src/vectorCluster/vectorClusterGroupCollection.ts +43 -0
- package/src/vectorCluster/vectorClusterGroupImpl.ts +107 -0
- package/src/vectorCluster/vectorClusterGroupObliqueImpl.ts +84 -0
- package/src/vectorCluster/vectorClusterGroupOpenlayersImpl.ts +81 -0
- package/src/vectorCluster/vectorClusterStyleItem.ts +490 -0
- package/src/vectorCluster/vectorClusterSymbols.ts +2 -0
- package/dist/src/layer/cesium/clusterContext.d.ts +0 -20
- package/dist/src/layer/cesium/clusterContext.js.map +0 -1
- package/src/layer/cesium/clusterContext.ts +0 -140
- package/src/ol/source/VcsCluster.js +0 -37
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
import VectorSource from 'ol/source/Vector.js';
|
|
2
1
|
import OLVectorLayer from 'ol/layer/Vector.js';
|
|
3
|
-
import { unByKey } from 'ol/Observable.js';
|
|
4
|
-
import Feature from 'ol/Feature.js';
|
|
5
|
-
import { mercatorProjection } from '../../util/projection.js';
|
|
6
|
-
import { mercatorGeometryToImageGeometry, imageGeometryToMercatorGeometry, getPolygonizedGeometry, setNewGeometry, } from './obliqueHelpers.js';
|
|
7
|
-
import { actuallyIsCircle, alreadyTransformedToImage, doNotTransform, obliqueGeometry, originalFeatureSymbol, } from '../vectorSymbols.js';
|
|
8
2
|
import LayerObliqueImpl from './layerObliqueImpl.js';
|
|
9
3
|
import { synchronizeFeatureVisibilityWithSource } from '../vectorHelpers.js';
|
|
4
|
+
import { createSourceObliqueSync, } from './sourceObliqueSync.js';
|
|
10
5
|
/**
|
|
11
6
|
* represents a specific vector layer for oblique.
|
|
12
7
|
*/
|
|
@@ -14,28 +9,18 @@ class VectorObliqueImpl extends LayerObliqueImpl {
|
|
|
14
9
|
static get className() {
|
|
15
10
|
return 'VectorObliqueImpl';
|
|
16
11
|
}
|
|
17
|
-
obliqueSource
|
|
18
|
-
_featureListeners = {};
|
|
19
|
-
_sourceListener = [];
|
|
20
|
-
/**
|
|
21
|
-
* The extent of the current image for which features where fetched
|
|
22
|
-
*/
|
|
23
|
-
currentExtent = null;
|
|
24
|
-
/**
|
|
25
|
-
* The image name for which the current features where fetched
|
|
26
|
-
*/
|
|
27
|
-
fetchedFeaturesForImageName = null;
|
|
28
|
-
_updatingMercator = {};
|
|
29
|
-
_updatingOblique = {};
|
|
12
|
+
obliqueSource;
|
|
30
13
|
_featureVisibilityListeners = [];
|
|
31
14
|
globalHider;
|
|
32
15
|
source;
|
|
33
16
|
style;
|
|
34
17
|
featureVisibility;
|
|
35
18
|
olLayer = null;
|
|
36
|
-
|
|
19
|
+
_sourceObliqueSync;
|
|
37
20
|
constructor(map, options) {
|
|
38
21
|
super(map, options);
|
|
22
|
+
this._sourceObliqueSync = createSourceObliqueSync(options.source, map);
|
|
23
|
+
this.obliqueSource = this._sourceObliqueSync.obliqueSource;
|
|
39
24
|
this.globalHider = options.globalHider;
|
|
40
25
|
this.source = options.source;
|
|
41
26
|
this.style = options.style;
|
|
@@ -57,43 +42,6 @@ class VectorObliqueImpl extends LayerObliqueImpl {
|
|
|
57
42
|
}
|
|
58
43
|
// eslint-disable-next-line class-methods-use-this,no-unused-vars
|
|
59
44
|
updateSplitDirection(_splitDirection) { }
|
|
60
|
-
/**
|
|
61
|
-
* clears the current image and fetches features for the next
|
|
62
|
-
*/
|
|
63
|
-
_onObliqueImageChanged() {
|
|
64
|
-
this._clearCurrentImage();
|
|
65
|
-
this._fetchFeaturesInView();
|
|
66
|
-
}
|
|
67
|
-
_featureInExtent(feature) {
|
|
68
|
-
if (this.currentExtent) {
|
|
69
|
-
const geometry = feature.getGeometry();
|
|
70
|
-
if (geometry) {
|
|
71
|
-
return (geometry[alreadyTransformedToImage] ||
|
|
72
|
-
geometry.intersectsExtent(this.currentExtent));
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
return false;
|
|
76
|
-
}
|
|
77
|
-
_addSourceListeners() {
|
|
78
|
-
this._sourceListener.push(this.source.on('addfeature', (event) => {
|
|
79
|
-
const f = event.feature;
|
|
80
|
-
if (this._featureInExtent(f)) {
|
|
81
|
-
// eslint-disable-next-line no-void
|
|
82
|
-
void this.addFeature(f);
|
|
83
|
-
}
|
|
84
|
-
}));
|
|
85
|
-
this._sourceListener.push(this.source.on('removefeature', (event) => {
|
|
86
|
-
this.removeFeature(event.feature);
|
|
87
|
-
}));
|
|
88
|
-
this._sourceListener.push(this.source.on('changefeature', (event) => {
|
|
89
|
-
const f = event.feature;
|
|
90
|
-
const newFeatureId = f.getId();
|
|
91
|
-
if (!this._featureListeners[newFeatureId] && this._featureInExtent(f)) {
|
|
92
|
-
// eslint-disable-next-line no-void
|
|
93
|
-
void this.addFeature(f);
|
|
94
|
-
}
|
|
95
|
-
}));
|
|
96
|
-
}
|
|
97
45
|
async activate() {
|
|
98
46
|
if (!this.active) {
|
|
99
47
|
await super.activate();
|
|
@@ -103,208 +51,8 @@ class VectorObliqueImpl extends LayerObliqueImpl {
|
|
|
103
51
|
this._featureVisibilityListeners =
|
|
104
52
|
synchronizeFeatureVisibilityWithSource(this.featureVisibility, this.source, this.globalHider);
|
|
105
53
|
}
|
|
106
|
-
this.
|
|
107
|
-
this._imageChangedListener = this.map.imageChanged?.addEventListener(this._onObliqueImageChanged.bind(this));
|
|
108
|
-
this._fetchFeaturesInView();
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
async addFeature(originalFeature) {
|
|
113
|
-
if (!this.active) {
|
|
114
|
-
this.fetchedFeaturesForImageName = null;
|
|
115
|
-
}
|
|
116
|
-
if (this.active && this.currentExtent) {
|
|
117
|
-
const id = originalFeature.getId();
|
|
118
|
-
const originalGeometry = originalFeature.getGeometry();
|
|
119
|
-
if (originalFeature[doNotTransform]) {
|
|
120
|
-
if (originalGeometry && !this.obliqueSource.getFeatureById(id)) {
|
|
121
|
-
this.obliqueSource.addFeature(originalFeature);
|
|
122
|
-
}
|
|
123
|
-
return Promise.resolve();
|
|
124
|
-
}
|
|
125
|
-
if (this.obliqueSource.getFeatureById(id) || this._updatingOblique[id]) {
|
|
126
|
-
return Promise.resolve();
|
|
127
|
-
}
|
|
128
|
-
const obliqueFeature = new Feature({});
|
|
129
|
-
obliqueFeature.setId(id);
|
|
130
|
-
obliqueFeature[originalFeatureSymbol] = originalFeature;
|
|
131
|
-
setNewGeometry(originalFeature, obliqueFeature);
|
|
132
|
-
obliqueFeature.setStyle(originalFeature.getStyle());
|
|
133
|
-
this._setFeatureListeners(originalFeature, obliqueFeature);
|
|
134
|
-
await this._convertToOblique(originalFeature, obliqueFeature);
|
|
135
|
-
if (this.source.hasFeature(originalFeature)) {
|
|
136
|
-
// if not in source, feature has been removed in between.
|
|
137
|
-
this.obliqueSource.addFeature(obliqueFeature);
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
return Promise.resolve();
|
|
141
|
-
}
|
|
142
|
-
_originalGeometryChanged(listeners, originalFeature, obliqueFeature) {
|
|
143
|
-
unByKey(listeners.originalGeometryChanged);
|
|
144
|
-
unByKey(listeners.obliqueGeometryChanged);
|
|
145
|
-
setNewGeometry(originalFeature, obliqueFeature);
|
|
146
|
-
this.updateObliqueGeometry(originalFeature, obliqueFeature);
|
|
147
|
-
listeners.originalGeometryChanged = originalFeature
|
|
148
|
-
.getGeometry()
|
|
149
|
-
.on('change', this.updateObliqueGeometry.bind(this, originalFeature, obliqueFeature));
|
|
150
|
-
listeners.obliqueGeometryChanged = obliqueFeature
|
|
151
|
-
.getGeometry()
|
|
152
|
-
.on('change', this.updateMercatorGeometry.bind(this, originalFeature, obliqueFeature));
|
|
153
|
-
}
|
|
154
|
-
_setFeatureListeners(originalFeature, obliqueFeature) {
|
|
155
|
-
const featureId = obliqueFeature.getId();
|
|
156
|
-
const listeners = {
|
|
157
|
-
originalFeatureGeometryChanged: originalFeature.on('change:geometry', () => {
|
|
158
|
-
const originalGeometry = originalFeature.getGeometry();
|
|
159
|
-
if (originalGeometry[actuallyIsCircle]) {
|
|
160
|
-
unByKey(listeners.originalGeometryChanged);
|
|
161
|
-
listeners.originalGeometryChanged = originalFeature
|
|
162
|
-
.getGeometry()
|
|
163
|
-
.on('change', () => {
|
|
164
|
-
if (this._updatingMercator[featureId]) {
|
|
165
|
-
return;
|
|
166
|
-
}
|
|
167
|
-
delete originalGeometry[actuallyIsCircle];
|
|
168
|
-
this._originalGeometryChanged(listeners, originalFeature, obliqueFeature);
|
|
169
|
-
});
|
|
170
|
-
return;
|
|
171
|
-
}
|
|
172
|
-
this._originalGeometryChanged(listeners, originalFeature, obliqueFeature);
|
|
173
|
-
}),
|
|
174
|
-
originalFeatureChanged: originalFeature.on('change', () => {
|
|
175
|
-
obliqueFeature.setStyle(originalFeature.getStyle());
|
|
176
|
-
}),
|
|
177
|
-
originalGeometryChanged: originalFeature
|
|
178
|
-
.getGeometry()
|
|
179
|
-
.on('change', this.updateObliqueGeometry.bind(this, originalFeature, obliqueFeature)),
|
|
180
|
-
obliqueGeometryChanged: obliqueFeature
|
|
181
|
-
.getGeometry()
|
|
182
|
-
.on('change', this.updateMercatorGeometry.bind(this, originalFeature, obliqueFeature)),
|
|
183
|
-
};
|
|
184
|
-
this._featureListeners[featureId] = listeners;
|
|
185
|
-
}
|
|
186
|
-
async _convertToOblique(originalFeature, obliqueFeature) {
|
|
187
|
-
const id = originalFeature.getId();
|
|
188
|
-
const vectorGeometry = originalFeature.getGeometry();
|
|
189
|
-
const imageGeometry = obliqueFeature.getGeometry();
|
|
190
|
-
this._updatingOblique[id] = true;
|
|
191
|
-
let promise;
|
|
192
|
-
if (!vectorGeometry[alreadyTransformedToImage]) {
|
|
193
|
-
promise = mercatorGeometryToImageGeometry(vectorGeometry, imageGeometry, this.map.currentImage);
|
|
194
|
-
}
|
|
195
|
-
else {
|
|
196
|
-
obliqueFeature
|
|
197
|
-
.getGeometry()
|
|
198
|
-
.setCoordinates(vectorGeometry.getCoordinates());
|
|
199
|
-
// we MUST wait for a promise, otherwise this is sync and you can add a feature twice
|
|
200
|
-
promise = Promise.resolve();
|
|
201
|
-
}
|
|
202
|
-
await promise;
|
|
203
|
-
this._updatingOblique[id] = null;
|
|
204
|
-
}
|
|
205
|
-
updateObliqueGeometry(originalFeature, obliqueFeature) {
|
|
206
|
-
const id = originalFeature.getId();
|
|
207
|
-
if (this._updatingMercator[id]) {
|
|
208
|
-
return;
|
|
209
|
-
}
|
|
210
|
-
if (this._updatingOblique[id] != null) {
|
|
211
|
-
clearTimeout(this._updatingOblique[id]);
|
|
212
|
-
}
|
|
213
|
-
if (originalFeature.getGeometry()?.[alreadyTransformedToImage]) {
|
|
214
|
-
// eslint-disable-next-line no-void
|
|
215
|
-
void this._convertToOblique(originalFeature, obliqueFeature);
|
|
216
|
-
}
|
|
217
|
-
else {
|
|
218
|
-
this._updatingOblique[id] = setTimeout(() => {
|
|
219
|
-
// eslint-disable-next-line no-void
|
|
220
|
-
void this._convertToOblique(originalFeature, obliqueFeature);
|
|
221
|
-
}, 200);
|
|
222
|
-
}
|
|
223
|
-
}
|
|
224
|
-
updateMercatorGeometry(originalFeature, obliqueFeature) {
|
|
225
|
-
const id = originalFeature.getId();
|
|
226
|
-
if (this._updatingOblique[id]) {
|
|
227
|
-
return;
|
|
228
|
-
}
|
|
229
|
-
if (this._updatingMercator[id] != null) {
|
|
230
|
-
clearTimeout(this._updatingMercator[id]);
|
|
231
|
-
}
|
|
232
|
-
const imageName = this.fetchedFeaturesForImageName;
|
|
233
|
-
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
234
|
-
this._updatingMercator[id] = setTimeout(async () => {
|
|
235
|
-
const originalGeometry = getPolygonizedGeometry(originalFeature, false);
|
|
236
|
-
if (originalGeometry[actuallyIsCircle]) {
|
|
237
|
-
originalFeature.setGeometry(originalGeometry);
|
|
238
|
-
}
|
|
239
|
-
const imageGeometry = getPolygonizedGeometry(obliqueFeature, true);
|
|
240
|
-
this._updatingMercator[id] = true;
|
|
241
|
-
await imageGeometryToMercatorGeometry(imageGeometry, originalGeometry, this.map.collection.getImageByName(imageName));
|
|
242
|
-
this._updatingMercator[id] = null;
|
|
243
|
-
}, 200);
|
|
244
|
-
}
|
|
245
|
-
/**
|
|
246
|
-
* Synchronizes image Features if the geometry has been changed.
|
|
247
|
-
* also clears source and featureListeners
|
|
248
|
-
*/
|
|
249
|
-
_clearCurrentImage() {
|
|
250
|
-
Object.values(this._featureListeners).forEach((listeners) => {
|
|
251
|
-
unByKey(Object.values(listeners));
|
|
252
|
-
});
|
|
253
|
-
this._featureListeners = {};
|
|
254
|
-
this._updatingOblique = {};
|
|
255
|
-
this._updatingMercator = {};
|
|
256
|
-
this.obliqueSource.getFeatures().forEach((f) => {
|
|
257
|
-
const original = f[originalFeatureSymbol];
|
|
258
|
-
if (original) {
|
|
259
|
-
delete original[obliqueGeometry];
|
|
260
|
-
const originalGeometry = original.getGeometry();
|
|
261
|
-
if (originalGeometry?.[alreadyTransformedToImage]) {
|
|
262
|
-
this.updateMercatorGeometry(original, f);
|
|
263
|
-
}
|
|
264
|
-
delete originalGeometry?.[alreadyTransformedToImage];
|
|
265
|
-
}
|
|
266
|
-
});
|
|
267
|
-
this.obliqueSource.clear(true);
|
|
268
|
-
this.fetchedFeaturesForImageName = null;
|
|
269
|
-
}
|
|
270
|
-
/**
|
|
271
|
-
* Fetches the features within the extent of the current image
|
|
272
|
-
* @private
|
|
273
|
-
*/
|
|
274
|
-
_fetchFeaturesInView() {
|
|
275
|
-
if (this.active &&
|
|
276
|
-
this.map.currentImage &&
|
|
277
|
-
this.fetchedFeaturesForImageName !== this.map.currentImage.name) {
|
|
278
|
-
this.currentExtent = this.map
|
|
279
|
-
.getExtentOfCurrentImage()
|
|
280
|
-
.getCoordinatesInProjection(mercatorProjection);
|
|
281
|
-
this.source.forEachFeatureInExtent(this.currentExtent, (feature) => {
|
|
282
|
-
// eslint-disable-next-line no-void
|
|
283
|
-
void this.addFeature(feature);
|
|
284
|
-
});
|
|
285
|
-
this.source.forEachFeature((feature) => {
|
|
286
|
-
if (feature.getGeometry()?.[alreadyTransformedToImage]) {
|
|
287
|
-
// eslint-disable-next-line no-void
|
|
288
|
-
void this.addFeature(feature);
|
|
289
|
-
}
|
|
290
|
-
});
|
|
291
|
-
this.fetchedFeaturesForImageName = this.map.currentImage.name;
|
|
292
|
-
}
|
|
293
|
-
}
|
|
294
|
-
removeFeature(feature) {
|
|
295
|
-
const id = feature.getId();
|
|
296
|
-
const feat = this.obliqueSource.getFeatureById(id);
|
|
297
|
-
if (this._updatingOblique[id] != null) {
|
|
298
|
-
clearTimeout(this._updatingOblique[id]);
|
|
299
|
-
this._updatingOblique[id] = null;
|
|
300
|
-
}
|
|
301
|
-
if (feat) {
|
|
302
|
-
const listeners = this._featureListeners[id];
|
|
303
|
-
if (listeners) {
|
|
304
|
-
unByKey(Object.values(listeners));
|
|
305
|
-
delete this._featureListeners[id];
|
|
54
|
+
this._sourceObliqueSync.activate();
|
|
306
55
|
}
|
|
307
|
-
this.obliqueSource.removeFeature(feat);
|
|
308
56
|
}
|
|
309
57
|
}
|
|
310
58
|
deactivate() {
|
|
@@ -316,37 +64,14 @@ class VectorObliqueImpl extends LayerObliqueImpl {
|
|
|
316
64
|
cb();
|
|
317
65
|
});
|
|
318
66
|
this._featureVisibilityListeners = [];
|
|
319
|
-
|
|
320
|
-
this._sourceListener = [];
|
|
321
|
-
if (this._imageChangedListener) {
|
|
322
|
-
this._imageChangedListener();
|
|
323
|
-
this._imageChangedListener = null;
|
|
324
|
-
}
|
|
325
|
-
this._clearCurrentImage();
|
|
67
|
+
this._sourceObliqueSync.deactivate();
|
|
326
68
|
}
|
|
327
69
|
destroy() {
|
|
328
70
|
if (this.olLayer) {
|
|
329
71
|
this.map.removeOLLayer(this.olLayer);
|
|
330
72
|
}
|
|
331
73
|
this.olLayer = null;
|
|
332
|
-
|
|
333
|
-
this._sourceListener = [];
|
|
334
|
-
if (this._imageChangedListener) {
|
|
335
|
-
this._imageChangedListener();
|
|
336
|
-
this._imageChangedListener = null;
|
|
337
|
-
}
|
|
338
|
-
this.obliqueSource.clear(true);
|
|
339
|
-
Object.values(this._updatingOblique).forEach((timer) => {
|
|
340
|
-
if (timer != null) {
|
|
341
|
-
clearTimeout(timer);
|
|
342
|
-
}
|
|
343
|
-
});
|
|
344
|
-
Object.values(this._updatingMercator).forEach((timer) => {
|
|
345
|
-
if (timer != null) {
|
|
346
|
-
clearTimeout(timer);
|
|
347
|
-
}
|
|
348
|
-
});
|
|
349
|
-
this._clearCurrentImage();
|
|
74
|
+
this._sourceObliqueSync.destroy();
|
|
350
75
|
super.destroy();
|
|
351
76
|
}
|
|
352
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorObliqueImpl.js","sourceRoot":"","sources":["../../../../src/layer/oblique/vectorObliqueImpl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"vectorObliqueImpl.js","sourceRoot":"","sources":["../../../../src/layer/oblique/vectorObliqueImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,10 @@ import VectorOpenlayersImpl from './openlayers/vectorOpenlayersImpl.js';
|
|
|
12
12
|
import VectorCesiumImpl from './cesium/vectorCesiumImpl.js';
|
|
13
13
|
import VectorObliqueImpl from './oblique/vectorObliqueImpl.js';
|
|
14
14
|
import StyleItem from '../style/styleItem.js';
|
|
15
|
-
import VcsMap from '../map/vcsMap.js';
|
|
15
|
+
import type VcsMap from '../map/vcsMap.js';
|
|
16
16
|
import { GeoJSONwriteOptions } from './geojsonHelpers.js';
|
|
17
17
|
import CesiumTilesetCesiumImpl from './cesium/cesiumTilesetCesiumImpl.js';
|
|
18
|
+
import VcsEvent from '../vcsEvent.js';
|
|
18
19
|
export type VectorOptions = FeatureLayerOptions & {
|
|
19
20
|
/**
|
|
20
21
|
* if not specified, the framework projection is taken
|
|
@@ -30,6 +31,7 @@ export type VectorOptions = FeatureLayerOptions & {
|
|
|
30
31
|
*/
|
|
31
32
|
isDynamic?: boolean;
|
|
32
33
|
vectorProperties?: VectorPropertiesOptions;
|
|
34
|
+
vectorClusterGroup?: string;
|
|
33
35
|
};
|
|
34
36
|
export type VectorImplementationOptions = FeatureLayerImplementationOptions & {
|
|
35
37
|
source: VectorSource;
|
|
@@ -64,11 +66,18 @@ declare class VectorLayer extends FeatureLayer<VectorObliqueImpl | VectorOpenlay
|
|
|
64
66
|
private _onStyleChangeRemover;
|
|
65
67
|
vectorProperties: VectorProperties;
|
|
66
68
|
private _initialStyle;
|
|
69
|
+
private _vectorClusterGroup;
|
|
70
|
+
vectorClusterGroupChanged: VcsEvent<{
|
|
71
|
+
newGroup?: string;
|
|
72
|
+
oldGroup?: string;
|
|
73
|
+
}>;
|
|
67
74
|
constructor(options: VectorOptions);
|
|
68
75
|
get allowPicking(): boolean;
|
|
69
76
|
set allowPicking(allowPicking: boolean);
|
|
70
77
|
get visibility(): boolean;
|
|
71
78
|
set visibility(visible: boolean);
|
|
79
|
+
get vectorClusterGroup(): string | undefined;
|
|
80
|
+
set vectorClusterGroup(newGroup: string | undefined);
|
|
72
81
|
initialize(): Promise<void>;
|
|
73
82
|
/**
|
|
74
83
|
* Returns the layers vcsMeta object
|
|
@@ -23,6 +23,7 @@ import { originalStyle, updateOriginalStyle } from './featureVisibility.js';
|
|
|
23
23
|
import StyleItem from '../style/styleItem.js';
|
|
24
24
|
import { layerClassRegistry } from '../classRegistry.js';
|
|
25
25
|
import { vcsLayerName } from './layerSymbols.js';
|
|
26
|
+
import VcsEvent from '../vcsEvent.js';
|
|
26
27
|
/**
|
|
27
28
|
* VectorLayer Layer for OpenlayersMap, Cesium and ObliqueMap
|
|
28
29
|
* @group Layer
|
|
@@ -42,6 +43,7 @@ class VectorLayer extends FeatureLayer {
|
|
|
42
43
|
highlightStyle: undefined,
|
|
43
44
|
isDynamic: false,
|
|
44
45
|
vectorProperties: {}, // XXX or should we return VectorProperties default options?
|
|
46
|
+
vectorClusterGroup: undefined,
|
|
45
47
|
};
|
|
46
48
|
}
|
|
47
49
|
_supportedMaps = [
|
|
@@ -68,6 +70,8 @@ class VectorLayer extends FeatureLayer {
|
|
|
68
70
|
_onStyleChangeRemover = null;
|
|
69
71
|
vectorProperties;
|
|
70
72
|
_initialStyle;
|
|
73
|
+
_vectorClusterGroup;
|
|
74
|
+
vectorClusterGroupChanged = new VcsEvent();
|
|
71
75
|
constructor(options) {
|
|
72
76
|
super(options);
|
|
73
77
|
const defaultOptions = VectorLayer.getDefaultOptions();
|
|
@@ -101,6 +105,7 @@ class VectorLayer extends FeatureLayer {
|
|
|
101
105
|
initialStyle = options.style;
|
|
102
106
|
}
|
|
103
107
|
this._initialStyle = initialStyle;
|
|
108
|
+
this._vectorClusterGroup = options.vectorClusterGroup;
|
|
104
109
|
}
|
|
105
110
|
get allowPicking() {
|
|
106
111
|
return super.allowPicking;
|
|
@@ -119,6 +124,20 @@ class VectorLayer extends FeatureLayer {
|
|
|
119
124
|
void this.forceRedraw();
|
|
120
125
|
}
|
|
121
126
|
}
|
|
127
|
+
get vectorClusterGroup() {
|
|
128
|
+
return this._vectorClusterGroup;
|
|
129
|
+
}
|
|
130
|
+
set vectorClusterGroup(newGroup) {
|
|
131
|
+
if (this._vectorClusterGroup !== newGroup) {
|
|
132
|
+
const oldGroup = this._vectorClusterGroup;
|
|
133
|
+
this._vectorClusterGroup = newGroup;
|
|
134
|
+
// this will destroy any current implementations which are potentially active and recreate them if needed
|
|
135
|
+
this.forceRedraw().catch(() => {
|
|
136
|
+
this.getLogger().warning('Failed to redraw after setting vector cluster group');
|
|
137
|
+
});
|
|
138
|
+
this.vectorClusterGroupChanged.raiseEvent({ newGroup, oldGroup });
|
|
139
|
+
}
|
|
140
|
+
}
|
|
122
141
|
initialize() {
|
|
123
142
|
return super.initialize().then(() => {
|
|
124
143
|
this._trackStyleChanges();
|
|
@@ -167,7 +186,7 @@ class VectorLayer extends FeatureLayer {
|
|
|
167
186
|
};
|
|
168
187
|
}
|
|
169
188
|
createImplementationsForMap(map) {
|
|
170
|
-
if (!this.visibility) {
|
|
189
|
+
if (!this.visibility || !!this.vectorClusterGroup) {
|
|
171
190
|
return [];
|
|
172
191
|
}
|
|
173
192
|
if (map instanceof OpenlayersMap) {
|
|
@@ -367,6 +386,9 @@ class VectorLayer extends FeatureLayer {
|
|
|
367
386
|
if (Object.keys(vectorPropertiesConfig).length > 0) {
|
|
368
387
|
config.vectorProperties = vectorPropertiesConfig;
|
|
369
388
|
}
|
|
389
|
+
if (this._vectorClusterGroup !== defaultOptions.vectorClusterGroup) {
|
|
390
|
+
config.vectorClusterGroup = this._vectorClusterGroup;
|
|
391
|
+
}
|
|
370
392
|
return config;
|
|
371
393
|
}
|
|
372
394
|
destroy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorLayer.js","sourceRoot":"","sources":["../../../src/layer/vectorLayer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"vectorLayer.js","sourceRoot":"","sources":["../../../src/layer/vectorLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,15 @@ import VcsMap from './vcsMap.js';
|
|
|
6
6
|
import { vcsLayerName } from '../layer/layerSymbols.js';
|
|
7
7
|
import { ModificationKeyType, PointerEventType, PointerKeyType, } from '../interaction/interactionType.js';
|
|
8
8
|
import { mapClassRegistry } from '../classRegistry.js';
|
|
9
|
+
import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
|
|
9
10
|
export function ensureLayerInCollection(layers, layer, layerCollection) {
|
|
10
|
-
|
|
11
|
+
let targetIndex = -1;
|
|
12
|
+
if (layer[vectorClusterGroupName]) {
|
|
13
|
+
targetIndex = layerCollection.size;
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
targetIndex = layerCollection.indexOfKey(layer[vcsLayerName]);
|
|
17
|
+
}
|
|
11
18
|
if (targetIndex > -1) {
|
|
12
19
|
const layerArray = layers.getArray();
|
|
13
20
|
if (!layerArray.includes(layer)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseOLMap.js","sourceRoot":"","sources":["../../../src/map/baseOLMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,EAAE,QAAQ,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAMpE,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,GACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"baseOLMap.js","sourceRoot":"","sources":["../../../src/map/baseOLMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,EAAE,QAAQ,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAMpE,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,GACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAElF,MAAM,UAAU,uBAAuB,CACrC,MAA6B,EAC7B,KAAc,EACd,eAAgC;IAEhC,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;IACrB,IAAI,KAAK,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAClC,WAAW,GAAG,eAAe,CAAC,IAAI,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAW,CAAC;IAC1E,CAAC;IAED,IAAI,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAErC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,IAAI,mBAAmB,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnD,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAC3C,CAAC,CAAC,YAAY,CAAC,CACN,CAAC;gBACZ,OAAO,UAAU,GAAG,WAAW,CAAC;YAClC,CAAC,CAAC,CAAC;YACH,IAAI,mBAAmB,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC/B,mBAAmB,GAAG,UAAU,CAAC,MAAM,CAAC;YAC1C,CAAC;YACD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,SAAU,SAAQ,MAAe;IACrC,MAAM,KAAK,SAAS;QAClB,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,MAAM,GAAiB,IAAI,CAAC;IAE5B,YAAY,GAAgB,EAAE,CAAC;IAEvC,IAAI,aAAa;QACf,OAAO,KAAK,CAAC,aAAa,CAAC;IAC7B,CAAC;IAED,IAAI,aAAa,CAAC,QAAgB;QAChC,KAAK,CAAC,aAAa,GAAG,QAAQ,CAAC;QAC/B,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEO,wBAAwB,CAC9B,OAAsC,EACtC,YAA8B;QAE9B,MAAM,UAAU,GAAmC;YACjD,IAAI,EAAE,cAAc,CAAC,GAAG;YACxB,CAAC,EAAE,cAAc,CAAC,IAAI;YACtB,CAAC,EAAE,cAAc,CAAC,MAAM;YACxB,CAAC,EAAE,cAAc,CAAC,KAAK;SACxB,CAAC;QACF,IAAI,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ;YACtC,CAAC,CAAC,mBAAmB,CAAC,KAAK;YAC3B,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAC7B,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QACrE,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACnE,IAAI,GAAG,KAAK,mBAAmB,CAAC,IAAI,EAAE,CAAC;YACrC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,CAAC;QACD,OAAO,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC;YACtC,GAAG,EAAE,IAAI;YACT,QAAQ;YACR,eAAe,EAAE,QAAQ;YACzB,cAAc,EAAE,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,UAAU,EAAE,CAAC;YACxE,GAAG;YACH,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,IAAI,CAAC,CAAC;YACtD,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,MAAmC;QAC3C,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACxB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,UAAU;QACR,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC;gBACtB,MAAM,EAAE,EAAE;gBACV,QAAQ,EAAE,EAAE;gBACZ,YAAY,EAAE,mBAAmB,CAAC;oBAChC,kBAAkB,EAAE,KAAK;oBACzB,WAAW,EAAE,KAAK;oBAClB,aAAa,EAAE,KAAK;oBACpB,eAAe,EAAE,KAAK;iBACvB,CAAC;gBACF,MAAM,EAAE,IAAI,CAAC,UAAU;aACxB,CAAC,CAAC;YACH,MAAM,mBAAmB;YACvB,6DAA6D;YAC7D,aAAa;YACb,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtC,IAAI,CAAC,wBAAwB,CAC3B,KAAsC,EACtC,gBAAgB,CAAC,IAAI,CACtB,CAAC;YACJ,CAAC,CAAC,CAAC;YACL,MAAM,iBAAiB;YACrB,6DAA6D;YAC7D,aAAa;YACb,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;gBACpC,IAAI,CAAC,wBAAwB,CAC3B,KAAsC,EACtC,gBAAgB,CAAC,EAAE,CACpB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEL,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;gBAClE,IAAI,CAAC,wBAAwB,CAC3B,KAAsC,EACtC,gBAAgB,CAAC,IAAI,CACtB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CACvC,YAAY,EACZ,CAAC,aAAa,EAAE,EAAE;gBAChB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;YAC3D,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,YAAY,CAAC,IAAI,CACpB,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,CACnB,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,YAAY,CAAC,KAAY;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACtB,MAAM,MAAM,GAAI,IAAI,CAAC,MAAgB,CAAC,SAAS,EAAE,CAAC;gBAClD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACvB,uBAAuB,CACrB,MAA+B,EAC/B,OAAO,EACP,IAAI,CAAC,eAAe,CACrB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,UAAU,CAAC,OAAgB;QACzB,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC/B,uBAAuB,CACpB,IAAI,CAAC,MAAgB,CAAC,SAAS,EAA2B,EAC3D,OAAO,EACP,IAAI,CAAC,eAAe,CACrB,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,OAAgB;QAC5B,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,eAAe,CAAC,OAA2C;QACzD,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC1C,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,0CAA0C;IAC1C,oBAAoB,CAAC,WAAuB;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtD,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,aAAa;QACX,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAC/D,eAAe,SAAS,CAAC"}
|
|
@@ -246,6 +246,8 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
|
|
|
246
246
|
* Internal API used to unregister visualizations from layer implementations
|
|
247
247
|
*/
|
|
248
248
|
removeDataSource(dataSource: CustomDataSource): void;
|
|
249
|
+
addClusterDataSource(dataSource: CustomDataSource): Promise<void>;
|
|
250
|
+
removeClusterDataSource(dataSource: CustomDataSource): void;
|
|
249
251
|
/**
|
|
250
252
|
* set the cesium TerrainProvider
|
|
251
253
|
*/
|
|
@@ -10,6 +10,7 @@ import { ModificationKeyType, PointerEventType, PointerKeyType, } from '../inter
|
|
|
10
10
|
import CameraLimiter from './cameraLimiter.js';
|
|
11
11
|
import { mapClassRegistry } from '../classRegistry.js';
|
|
12
12
|
import VcsEvent from '../vcsEvent.js';
|
|
13
|
+
import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
|
|
13
14
|
/**
|
|
14
15
|
* Ensures, a primitive/imageryLayer/entity is part of a collection and placed at the correct location
|
|
15
16
|
* @param cesiumCollection
|
|
@@ -46,7 +47,13 @@ export function ensureInCollection(cesiumCollection, item, layerCollection) {
|
|
|
46
47
|
* @private
|
|
47
48
|
*/
|
|
48
49
|
export async function ensureInDataSourceCollection(dataSourceCollection, dataSource, layerCollection) {
|
|
49
|
-
|
|
50
|
+
let targetIndex = -1;
|
|
51
|
+
if (dataSource[vectorClusterGroupName]) {
|
|
52
|
+
targetIndex = layerCollection.size;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
targetIndex = layerCollection.indexOfKey(dataSource[vcsLayerName]);
|
|
56
|
+
}
|
|
50
57
|
if (targetIndex > -1) {
|
|
51
58
|
if (!dataSourceCollection.contains(dataSource)) {
|
|
52
59
|
await dataSourceCollection.add(dataSource);
|
|
@@ -866,6 +873,24 @@ class CesiumMap extends VcsMap {
|
|
|
866
873
|
this.dataSourceDisplay.dataSources.remove(dataSource);
|
|
867
874
|
}
|
|
868
875
|
}
|
|
876
|
+
async addClusterDataSource(dataSource) {
|
|
877
|
+
const clusterDataSources = this.getClusterDatasources();
|
|
878
|
+
if (!clusterDataSources) {
|
|
879
|
+
throw new Error('Cannot add data source to uninitialized map');
|
|
880
|
+
}
|
|
881
|
+
if (this.validateVisualization(dataSource)) {
|
|
882
|
+
this.addVisualization(dataSource);
|
|
883
|
+
await ensureInDataSourceCollection(clusterDataSources, dataSource, this.layerCollection);
|
|
884
|
+
}
|
|
885
|
+
}
|
|
886
|
+
removeClusterDataSource(dataSource) {
|
|
887
|
+
this.removeVisualization(dataSource);
|
|
888
|
+
if (this._clusterDataSourceDisplay &&
|
|
889
|
+
!this._clusterDataSourceDisplay.isDestroyed() &&
|
|
890
|
+
!this._clusterDataSourceDisplay.dataSources.isDestroyed()) {
|
|
891
|
+
this._clusterDataSourceDisplay.dataSources.remove(dataSource);
|
|
892
|
+
}
|
|
893
|
+
}
|
|
869
894
|
/**
|
|
870
895
|
* set the cesium TerrainProvider
|
|
871
896
|
*/
|