@vcmap/core 6.1.0-rc.2 → 6.1.0-rc.4
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/build/postinstall.js +19 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/src/interaction/featureAtPixelInteraction.js +18 -5
- package/dist/src/interaction/featureAtPixelInteraction.js.map +1 -1
- package/dist/src/map/baseOLMap.d.ts +0 -3
- package/dist/src/map/baseOLMap.js +27 -11
- package/dist/src/map/baseOLMap.js.map +1 -1
- package/dist/src/util/indexedCollection.d.ts +1 -0
- package/dist/src/util/indexedCollection.js +3 -0
- package/dist/src/util/indexedCollection.js.map +1 -1
- package/dist/src/vectorCluster/vectorClusterGroup.d.ts +3 -0
- package/dist/src/vectorCluster/vectorClusterGroup.js +7 -0
- package/dist/src/vectorCluster/vectorClusterGroup.js.map +1 -1
- package/dist/src/vectorCluster/vectorClusterGroupCesiumImpl.js +4 -0
- package/dist/src/vectorCluster/vectorClusterGroupCesiumImpl.js.map +1 -1
- package/dist/src/vectorCluster/vectorClusterGroupObliqueImpl.js +0 -1
- package/dist/src/vectorCluster/vectorClusterGroupObliqueImpl.js.map +1 -1
- package/dist/src/vectorCluster/vectorClusterGroupOpenlayersImpl.js +0 -1
- package/dist/src/vectorCluster/vectorClusterGroupOpenlayersImpl.js.map +1 -1
- package/index.ts +4 -1
- package/package.json +4 -5
- package/src/interaction/featureAtPixelInteraction.ts +22 -10
- package/src/map/baseOLMap.ts +34 -12
- package/src/util/indexedCollection.ts +4 -0
- package/src/vectorCluster/vectorClusterGroup.ts +11 -0
- package/src/vectorCluster/vectorClusterGroupCesiumImpl.ts +4 -0
- package/src/vectorCluster/vectorClusterGroupObliqueImpl.ts +0 -1
- package/src/vectorCluster/vectorClusterGroupOpenlayersImpl.ts +0 -1
package/build/postinstall.js
CHANGED
|
@@ -32,6 +32,24 @@ async function fixNode16RelativeImport(dir) {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
+
async function fixOpenlayersPaletteTextureUint8Array() {
|
|
36
|
+
const fileName = path.join(
|
|
37
|
+
process.cwd(),
|
|
38
|
+
'node_modules',
|
|
39
|
+
'ol',
|
|
40
|
+
'webgl',
|
|
41
|
+
'PaletteTexture.d.ts',
|
|
42
|
+
);
|
|
43
|
+
if (fs.existsSync(fileName)) {
|
|
44
|
+
const content = await fs.promises.readFile(fileName, 'utf-8');
|
|
45
|
+
const fixedContent = content.replace(
|
|
46
|
+
/Uint8Array<ArrayBufferLike>/g,
|
|
47
|
+
'Uint8Array',
|
|
48
|
+
);
|
|
49
|
+
await fs.promises.writeFile(fileName, fixedContent);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
35
53
|
/**
|
|
36
54
|
* Fixes relative imports in openlayers TS definitions
|
|
37
55
|
* @returns {Promise<void>}
|
|
@@ -42,6 +60,7 @@ async function fixOpenlayers() {
|
|
|
42
60
|
fixNode16RelativeImport(
|
|
43
61
|
path.join(process.cwd(), 'node_modules', 'geotiff', 'dist-module'),
|
|
44
62
|
),
|
|
63
|
+
fixOpenlayersPaletteTextureUint8Array(),
|
|
45
64
|
]);
|
|
46
65
|
}
|
|
47
66
|
|
package/dist/index.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export { default as Category, CategoryOptions, } from './src/category/category.j
|
|
|
10
10
|
export { default as CategoryCollection } from './src/category/categoryCollection.js';
|
|
11
11
|
export { layerClassRegistry, tileProviderClassRegistry, featureProviderClassRegistry, mapClassRegistry, styleClassRegistry, categoryClassRegistry, getObjectFromClassRegistry, default as ClassRegistry, TypedConstructorOptions, Ctor, } from './src/classRegistry.js';
|
|
12
12
|
export { default as AbstractFeatureProvider, AbstractFeatureProviderOptions, } from './src/featureProvider/abstractFeatureProvider.js';
|
|
13
|
-
export { isProvidedFeature } from './src/featureProvider/featureProviderSymbols.js';
|
|
13
|
+
export { isProvidedFeature, isProvidedClusterFeature, } from './src/featureProvider/featureProviderSymbols.js';
|
|
14
14
|
export { default as TileProviderFeatureProvider, TileProviderFeatureProviderOptions, } from './src/featureProvider/tileProviderFeatureProvider.js';
|
|
15
15
|
export { getFormat, default as WMSFeatureProvider, FormatOptions, WMSFeatureProviderOptions, } from './src/featureProvider/wmsFeatureProvider.js';
|
|
16
16
|
export { default as AbstractInteraction, EventAfterEventHandler, InteractionEvent, MapEvent, EventFeature, ObliqueParameters, } from './src/interaction/abstractInteraction.js';
|
package/dist/index.js
CHANGED
|
@@ -10,7 +10,7 @@ export { default as Category, } from './src/category/category.js';
|
|
|
10
10
|
export { default as CategoryCollection } from './src/category/categoryCollection.js';
|
|
11
11
|
export { layerClassRegistry, tileProviderClassRegistry, featureProviderClassRegistry, mapClassRegistry, styleClassRegistry, categoryClassRegistry, getObjectFromClassRegistry, default as ClassRegistry, } from './src/classRegistry.js';
|
|
12
12
|
export { default as AbstractFeatureProvider, } from './src/featureProvider/abstractFeatureProvider.js';
|
|
13
|
-
export { isProvidedFeature } from './src/featureProvider/featureProviderSymbols.js';
|
|
13
|
+
export { isProvidedFeature, isProvidedClusterFeature, } from './src/featureProvider/featureProviderSymbols.js';
|
|
14
14
|
export { default as TileProviderFeatureProvider, } from './src/featureProvider/tileProviderFeatureProvider.js';
|
|
15
15
|
export { getFormat, default as WMSFeatureProvider, } from './src/featureProvider/wmsFeatureProvider.js';
|
|
16
16
|
export { default as AbstractInteraction, } from './src/interaction/abstractInteraction.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,23 @@ import Projection from '../util/projection.js';
|
|
|
4
4
|
import { EventType, ModificationKeyType, PointerKeyType, } from './interactionType.js';
|
|
5
5
|
import { vcsLayerName } from '../layer/layerSymbols.js';
|
|
6
6
|
import { originalFeatureSymbol } from '../layer/vectorSymbols.js';
|
|
7
|
+
import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
|
|
7
8
|
function getFeatureFromOlMap(map, pixel, hitTolerance) {
|
|
8
9
|
let feature;
|
|
9
10
|
map.forEachFeatureAtPixel(pixel, (feat) => {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
let candidateFeature = feat;
|
|
12
|
+
if (candidateFeature &&
|
|
13
|
+
(candidateFeature.get('olcs_allowPicking') == null ||
|
|
14
|
+
candidateFeature.get('olcs_allowPicking') === true)) {
|
|
15
|
+
if (candidateFeature[vectorClusterGroupName]) {
|
|
16
|
+
const features = candidateFeature.get('features');
|
|
17
|
+
if (features.length === 1) {
|
|
18
|
+
candidateFeature = features[0];
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
feature =
|
|
22
|
+
candidateFeature[originalFeatureSymbol] ||
|
|
23
|
+
candidateFeature;
|
|
14
24
|
}
|
|
15
25
|
return true;
|
|
16
26
|
}, { hitTolerance });
|
|
@@ -50,7 +60,10 @@ function getFeatureFromPickObject(object) {
|
|
|
50
60
|
}
|
|
51
61
|
function getFeatureFromScene(scene, windowPosition, hitTolerance) {
|
|
52
62
|
const pickObject = scene.pick(windowPosition, hitTolerance, hitTolerance);
|
|
53
|
-
|
|
63
|
+
if (pickObject) {
|
|
64
|
+
return getFeatureFromPickObject(pickObject);
|
|
65
|
+
}
|
|
66
|
+
return pickObject;
|
|
54
67
|
}
|
|
55
68
|
/**
|
|
56
69
|
* @group Interaction
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureAtPixelInteraction.js","sourceRoot":"","sources":["../../../src/interaction/featureAtPixelInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,UAAU,EACV,IAAI,IAAI,UAAU,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,MAAM,GAGP,MAAM,sBAAsB,CAAC;AAG9B,OAAO,mBAGN,MAAM,0BAA0B,CAAC;AAClC,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"featureAtPixelInteraction.js","sourceRoot":"","sources":["../../../src/interaction/featureAtPixelInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import OLMap from 'ol/Map.js';
|
|
2
|
-
import type { Collection as OLCollection } from 'ol';
|
|
3
2
|
import type { Layer as OLLayer } from 'ol/layer.js';
|
|
4
3
|
import type { Coordinate } from 'ol/coordinate.js';
|
|
5
4
|
import VcsMap from './vcsMap.js';
|
|
6
|
-
import type LayerCollection from '../util/layerCollection.js';
|
|
7
5
|
import type Layer from '../layer/layer.js';
|
|
8
6
|
import { DisableMapControlOptions } from '../util/mapCollection.js';
|
|
9
|
-
export declare function ensureLayerInCollection(layers: OLCollection<OLLayer>, layer: OLLayer, layerCollection: LayerCollection): void;
|
|
10
7
|
/**
|
|
11
8
|
* @group Map
|
|
12
9
|
*/
|
|
@@ -7,20 +7,36 @@ import { vcsLayerName } from '../layer/layerSymbols.js';
|
|
|
7
7
|
import { ModificationKeyType, PointerEventType, PointerKeyType, } from '../interaction/interactionType.js';
|
|
8
8
|
import { mapClassRegistry } from '../classRegistry.js';
|
|
9
9
|
import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
10
|
+
function ensureLayerInCollection(layers, layer, layerCollection) {
|
|
11
|
+
const sortedVectorClusterGroups = [
|
|
12
|
+
...layerCollection.vectorClusterGroups,
|
|
13
|
+
].sort((a, b) => a.zIndex - b.zIndex);
|
|
14
|
+
const getIndexOfOlLayer = (olL) => {
|
|
15
|
+
let layerIndex;
|
|
16
|
+
let clusterIndex = 0;
|
|
17
|
+
if (olL[vectorClusterGroupName]) {
|
|
18
|
+
const clusterGroup = layerCollection.vectorClusterGroups.getByKey(olL[vectorClusterGroupName]);
|
|
19
|
+
layerIndex = layerCollection.findIndex((l) => l.zIndex > clusterGroup.zIndex);
|
|
20
|
+
clusterIndex = sortedVectorClusterGroups.indexOf(clusterGroup);
|
|
21
|
+
layerIndex = layerIndex < 0 ? layerCollection.size : layerIndex;
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
layerIndex = layerCollection.indexOfKey(olL[vcsLayerName]);
|
|
25
|
+
if (sortedVectorClusterGroups.length > 0) {
|
|
26
|
+
const vcsLayer = layerCollection.getByKey(olL[vcsLayerName]);
|
|
27
|
+
clusterIndex = sortedVectorClusterGroups.findIndex((vc) => vc.zIndex >= vcsLayer.zIndex);
|
|
28
|
+
clusterIndex = clusterIndex < 0 ? sortedVectorClusterGroups.length : 0;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
layerIndex += clusterIndex;
|
|
32
|
+
return layerIndex;
|
|
33
|
+
};
|
|
34
|
+
const targetIndex = getIndexOfOlLayer(layer);
|
|
18
35
|
if (targetIndex > -1) {
|
|
19
36
|
const layerArray = layers.getArray();
|
|
20
37
|
if (!layerArray.includes(layer)) {
|
|
21
|
-
let indexInOlCollection = layerArray.findIndex((
|
|
22
|
-
|
|
23
|
-
return layerIndex > targetIndex;
|
|
38
|
+
let indexInOlCollection = layerArray.findIndex((olL) => {
|
|
39
|
+
return getIndexOfOlLayer(olL) > targetIndex;
|
|
24
40
|
});
|
|
25
41
|
if (indexInOlCollection === -1) {
|
|
26
42
|
indexInOlCollection = layerArray.length;
|
|
@@ -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;AAIvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAElF,
|
|
1
|
+
{"version":3,"file":"baseOLMap.js","sourceRoot":"","sources":["../../../src/map/baseOLMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,6 +58,7 @@ declare class IndexedCollection<T> extends Collection<T> {
|
|
|
58
58
|
* Returns the index of a key. Returns undefined, if there is no uniqueness constraint
|
|
59
59
|
*/
|
|
60
60
|
indexOfKey(value: unknown): number | undefined;
|
|
61
|
+
findIndex(predicate: (value: T, index: number, obj: T[]) => boolean): number;
|
|
61
62
|
destroy(): void;
|
|
62
63
|
}
|
|
63
64
|
export default IndexedCollection;
|
|
@@ -128,6 +128,9 @@ class IndexedCollection extends Collection {
|
|
|
128
128
|
}
|
|
129
129
|
return this._array.findIndex((e) => e[this.uniqueKey] === value);
|
|
130
130
|
}
|
|
131
|
+
findIndex(predicate) {
|
|
132
|
+
return this._array.findIndex(predicate);
|
|
133
|
+
}
|
|
131
134
|
destroy() {
|
|
132
135
|
super.destroy();
|
|
133
136
|
this.moved.destroy();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indexedCollection.js","sourceRoot":"","sources":["../../../src/util/indexedCollection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"indexedCollection.js","sourceRoot":"","sources":["../../../src/util/indexedCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export type VectorClusterGroupOptions = VcsObjectOptions & {
|
|
|
14
14
|
highlightStyle?: VectorClusterStyleItemOptions | VectorClusterStyleItem;
|
|
15
15
|
clusterDistance?: number;
|
|
16
16
|
vectorProperties?: VectorPropertiesOptions;
|
|
17
|
+
zIndex?: number;
|
|
17
18
|
};
|
|
18
19
|
export type VectorClusterGroupImplementationOptions = {
|
|
19
20
|
name: string;
|
|
@@ -40,12 +41,14 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
40
41
|
private _activeMaps;
|
|
41
42
|
private _implementations;
|
|
42
43
|
private _globalHider;
|
|
44
|
+
private _zIndex;
|
|
43
45
|
vectorProperties: VectorProperties;
|
|
44
46
|
clusterDistance: number;
|
|
45
47
|
constructor(options: VectorClusterGroupOptions);
|
|
46
48
|
get featureVisibility(): FeatureVisibility;
|
|
47
49
|
get style(): VectorClusterStyleItem;
|
|
48
50
|
get globalHider(): GlobalHider | undefined;
|
|
51
|
+
get zIndex(): number;
|
|
49
52
|
setStyle(style: VectorClusterStyleItem | VectorClusterStyleItemOptions): void;
|
|
50
53
|
getHighlightStyleForFeature(feature: Feature): StyleLike | void;
|
|
51
54
|
addLayer(layer: VectorLayer): void;
|
|
@@ -15,6 +15,7 @@ import VectorClusterGroupOpenlayersImpl from './vectorClusterGroupOpenlayersImpl
|
|
|
15
15
|
import OpenlayersMap from '../map/openlayersMap.js';
|
|
16
16
|
import ObliqueMap from '../map/obliqueMap.js';
|
|
17
17
|
import VectorClusterGroupObliqueImpl from './vectorClusterGroupObliqueImpl.js';
|
|
18
|
+
import { maxZIndex } from '../util/layerCollection.js';
|
|
18
19
|
function featureIsClusterable(feature, vectorProperties) {
|
|
19
20
|
if (feature) {
|
|
20
21
|
const geometry = feature?.getGeometry();
|
|
@@ -46,6 +47,7 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
46
47
|
style: undefined,
|
|
47
48
|
highlightStyle: undefined,
|
|
48
49
|
clusterDistance: 40,
|
|
50
|
+
zIndex: Math.floor(maxZIndex / 2),
|
|
49
51
|
vectorProperties: {
|
|
50
52
|
...VectorProperties.getDefaultOptions(),
|
|
51
53
|
eyeOffset: [0, 0, -100],
|
|
@@ -64,6 +66,7 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
64
66
|
_activeMaps = new Set();
|
|
65
67
|
_implementations = new Map();
|
|
66
68
|
_globalHider;
|
|
69
|
+
_zIndex = maxZIndex - 1;
|
|
67
70
|
vectorProperties;
|
|
68
71
|
clusterDistance;
|
|
69
72
|
constructor(options) {
|
|
@@ -78,6 +81,7 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
78
81
|
}
|
|
79
82
|
this.clusterDistance = parseInteger(options.clusterDistance, defaultOptions.clusterDistance);
|
|
80
83
|
this.vectorProperties = new VectorProperties(options.vectorProperties ?? defaultOptions.vectorProperties);
|
|
84
|
+
this._zIndex = parseInteger(options.zIndex, defaultOptions.zIndex);
|
|
81
85
|
this._styleFunction = this._style.createStyleFunction((layerName) => [...this._layerListeners.keys()].find((l) => l.name === layerName));
|
|
82
86
|
}
|
|
83
87
|
get featureVisibility() {
|
|
@@ -89,6 +93,9 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
89
93
|
get globalHider() {
|
|
90
94
|
return this._globalHider;
|
|
91
95
|
}
|
|
96
|
+
get zIndex() {
|
|
97
|
+
return this._zIndex;
|
|
98
|
+
}
|
|
92
99
|
setStyle(style) {
|
|
93
100
|
this._style = getStyleOrDefaultStyle(style, this._style);
|
|
94
101
|
this._styleFunction = this._style.createStyleFunction((layerName) => [...this._layerListeners.keys()].find((l) => l.name === layerName));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorClusterGroup.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterGroup.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"vectorClusterGroup.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { createSourceVectorContextSync, } from '../layer/cesium/sourceVectorCont
|
|
|
9
9
|
import VectorClusterGroupImpl from './vectorClusterGroupImpl.js';
|
|
10
10
|
import { vectorClusterGroupName } from './vectorClusterSymbols.js';
|
|
11
11
|
import { vcsLayerName } from '../layer/layerSymbols.js';
|
|
12
|
+
import { hidden } from '../layer/featureVisibility.js';
|
|
12
13
|
let scratchCartographic = new Cartographic();
|
|
13
14
|
/**
|
|
14
15
|
* Clusters for vector layers containing point features only
|
|
@@ -48,6 +49,9 @@ export default class VectorClusterGroupCesiumImpl extends VectorClusterGroupImpl
|
|
|
48
49
|
scratchCartographic.height,
|
|
49
50
|
], true);
|
|
50
51
|
feature.setGeometry(new Point(position));
|
|
52
|
+
feature.on('change', () => {
|
|
53
|
+
cluster.billboard.show = !feature[hidden];
|
|
54
|
+
});
|
|
51
55
|
const bbOptions = getBillboardOptions(feature, style, this.vectorProperties.getAltitudeMode(feature), this.vectorProperties);
|
|
52
56
|
if (bbOptions) {
|
|
53
57
|
cluster.billboard.image = bbOptions.image;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorClusterGroupCesiumImpl.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterGroupCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,gBAAgB,EAIhB,IAAI,IAAI,UAAU,GAGnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,OAAO,MAAM,eAAe,CAAC;AACpC,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAG/C,OAAO,0BAA0B,MAAM,iCAAiC,CAAC;AACzE,OAAO,EACL,6BAA6B,GAE9B,MAAM,4CAA4C,CAAC;AACpD,OAAO,sBAAsB,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"vectorClusterGroupCesiumImpl.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterGroupCesiumImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,6 @@ export default class VectorClusterGroupObliqueImpl extends VectorClusterGroupImp
|
|
|
27
27
|
visible: false,
|
|
28
28
|
source: this._clusterSource,
|
|
29
29
|
style: this.style,
|
|
30
|
-
zIndex: Number.MAX_SAFE_INTEGER,
|
|
31
30
|
});
|
|
32
31
|
olLayer[vectorClusterGroupName] = this.name;
|
|
33
32
|
this._olLayer = olLayer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorClusterGroupObliqueImpl.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterGroupObliqueImpl.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,sBAAsB,MAAM,6BAA6B,CAAC;AAEjE,OAAO,UAAU,MAAM,4BAA4B,CAAC;AAEpD,OAAO,EACL,uBAAuB,GAExB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,CAAC,OAAO,OAAO,6BAA8B,SAAQ,sBAAkC;IACnF,cAAc,CAAa;IAE3B,QAAQ,CAA4B;IAEpC,kBAAkB,CAAoB;IAE9C,YACE,GAAe,EACf,OAAgD;QAEhD,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpB,IAAI,CAAC,kBAAkB,GAAG,uBAAuB,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACvE,IAAI,CAAC,cAAc,GAAG,IAAI,UAAU,CAClC;YACE,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,aAAa;YAC7C,QAAQ,EAAE,OAAO,CAAC,eAAe;SAClC,EACD,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC;gBAChC,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,IAAI,CAAC,cAAc;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"vectorClusterGroupObliqueImpl.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterGroupObliqueImpl.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,sBAAsB,MAAM,6BAA6B,CAAC;AAEjE,OAAO,UAAU,MAAM,4BAA4B,CAAC;AAEpD,OAAO,EACL,uBAAuB,GAExB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,CAAC,OAAO,OAAO,6BAA8B,SAAQ,sBAAkC;IACnF,cAAc,CAAa;IAE3B,QAAQ,CAA4B;IAEpC,kBAAkB,CAAoB;IAE9C,YACE,GAAe,EACf,OAAgD;QAEhD,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpB,IAAI,CAAC,kBAAkB,GAAG,uBAAuB,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACvE,IAAI,CAAC,cAAc,GAAG,IAAI,UAAU,CAClC;YACE,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,aAAa;YAC7C,QAAQ,EAAE,OAAO,CAAC,eAAe;SAClC,EACD,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC;gBAChC,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,IAAI,CAAC,cAAc;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CAAC;YACH,OAAO,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;YAC5C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,KAAK,CAAC;YACnC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;YAC9B,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;QACrC,CAAC;IACH,CAAC;IAED,UAAU;QACR,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC;QAClC,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;IACvC,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAE1B,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF"}
|
|
@@ -22,7 +22,6 @@ export default class VectorClusterGroupOpenlayersImpl extends VectorClusterGroup
|
|
|
22
22
|
visible: false,
|
|
23
23
|
source: this._clusterSource,
|
|
24
24
|
style: this.style,
|
|
25
|
-
zIndex: Number.MAX_SAFE_INTEGER,
|
|
26
25
|
});
|
|
27
26
|
olLayer[vectorClusterGroupName] = this.name;
|
|
28
27
|
this._olLayer = olLayer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorClusterGroupOpenlayersImpl.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterGroupOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAG/C,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,sBAAsB,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,CAAC,OAAO,OAAO,gCAAiC,SAAQ,sBAAqC;IACjG,MAAM,KAAK,SAAS;QAClB,OAAO,kCAAkC,CAAC;IAC5C,CAAC;IAEO,cAAc,CAAa;IAE3B,QAAQ,CAA4B;IAE5C,YACE,GAAkB,EAClB,OAAgD;QAEhD,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,UAAU,CAClC;YACE,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE,OAAO,CAAC,eAAe;SAClC,EACD,IAAI,CAAC,IAAI,CACV,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC;gBAChC,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,IAAI,CAAC,cAAc;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"vectorClusterGroupOpenlayersImpl.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterGroupOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAG/C,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,sBAAsB,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,CAAC,OAAO,OAAO,gCAAiC,SAAQ,sBAAqC;IACjG,MAAM,KAAK,SAAS;QAClB,OAAO,kCAAkC,CAAC;IAC5C,CAAC;IAEO,cAAc,CAAa;IAE3B,QAAQ,CAA4B;IAE5C,YACE,GAAkB,EAClB,OAAgD;QAEhD,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,UAAU,CAClC;YACE,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE,OAAO,CAAC,eAAe;SAClC,EACD,IAAI,CAAC,IAAI,CACV,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC;gBAChC,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,IAAI,CAAC,cAAc;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CAAC;YAEH,OAAO,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;YAC5C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,KAAK,CAAC;YACnC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAED,UAAU;QACR,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC;IACpC,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAE1B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAC9B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF"}
|
package/index.ts
CHANGED
|
@@ -32,7 +32,10 @@ export {
|
|
|
32
32
|
default as AbstractFeatureProvider,
|
|
33
33
|
AbstractFeatureProviderOptions,
|
|
34
34
|
} from './src/featureProvider/abstractFeatureProvider.js';
|
|
35
|
-
export {
|
|
35
|
+
export {
|
|
36
|
+
isProvidedFeature,
|
|
37
|
+
isProvidedClusterFeature,
|
|
38
|
+
} from './src/featureProvider/featureProviderSymbols.js';
|
|
36
39
|
export {
|
|
37
40
|
default as TileProviderFeatureProvider,
|
|
38
41
|
TileProviderFeatureProviderOptions,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vcmap/core",
|
|
3
|
-
"version": "6.1.0-rc.
|
|
3
|
+
"version": "6.1.0-rc.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -46,7 +46,6 @@
|
|
|
46
46
|
"@types/proj4": "^2.5.5",
|
|
47
47
|
"@types/sinon": "^10.0.15",
|
|
48
48
|
"@types/sinon-chai": "^3.2.12",
|
|
49
|
-
"@types/uuid": "^10.0.0",
|
|
50
49
|
"@vcsuite/eslint-config": "^3.0.5",
|
|
51
50
|
"c8": "^10.1.2",
|
|
52
51
|
"canvas": "^2.11.2",
|
|
@@ -68,7 +67,7 @@
|
|
|
68
67
|
},
|
|
69
68
|
"peerDependencies": {
|
|
70
69
|
"@vcmap-cesium/engine": "^11.0.2",
|
|
71
|
-
"ol": "^10.
|
|
70
|
+
"ol": "^10.4.0"
|
|
72
71
|
},
|
|
73
72
|
"eslintConfig": {
|
|
74
73
|
"extends": [
|
|
@@ -117,9 +116,9 @@
|
|
|
117
116
|
"@vcsuite/logger": "^1.0.1",
|
|
118
117
|
"@vcsuite/parsers": "^2.0.0",
|
|
119
118
|
"fast-deep-equal": "^3.1.3",
|
|
120
|
-
"proj4": "^2.
|
|
119
|
+
"proj4": "^2.15.0",
|
|
121
120
|
"rbush": ">=4.0.0",
|
|
122
121
|
"rbush-knn": "^4.0.0",
|
|
123
|
-
"uuid": "^
|
|
122
|
+
"uuid": "^11.0.0"
|
|
124
123
|
}
|
|
125
124
|
}
|
|
@@ -25,6 +25,7 @@ import { originalFeatureSymbol } from '../layer/vectorSymbols.js';
|
|
|
25
25
|
import type OpenlayersMap from '../map/openlayersMap.js';
|
|
26
26
|
import type ObliqueMap from '../map/obliqueMap.js';
|
|
27
27
|
import type CesiumMap from '../map/cesiumMap.js';
|
|
28
|
+
import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
|
|
28
29
|
|
|
29
30
|
/**
|
|
30
31
|
* This is the return from cesium scene.pick and scene.drillPick, which returns "any". We cast to this type.
|
|
@@ -50,13 +51,23 @@ function getFeatureFromOlMap(
|
|
|
50
51
|
map.forEachFeatureAtPixel(
|
|
51
52
|
pixel,
|
|
52
53
|
(feat) => {
|
|
54
|
+
let candidateFeature = feat;
|
|
53
55
|
if (
|
|
54
|
-
|
|
55
|
-
(
|
|
56
|
-
|
|
56
|
+
candidateFeature &&
|
|
57
|
+
(candidateFeature.get('olcs_allowPicking') == null ||
|
|
58
|
+
candidateFeature.get('olcs_allowPicking') === true)
|
|
57
59
|
) {
|
|
58
|
-
|
|
60
|
+
if ((candidateFeature as Feature)[vectorClusterGroupName]) {
|
|
61
|
+
const features = candidateFeature.get('features') as Feature[];
|
|
62
|
+
if (features.length === 1) {
|
|
63
|
+
candidateFeature = features[0];
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
feature =
|
|
67
|
+
(candidateFeature as Feature)[originalFeatureSymbol] ||
|
|
68
|
+
(candidateFeature as Feature);
|
|
59
69
|
}
|
|
70
|
+
|
|
60
71
|
return true;
|
|
61
72
|
},
|
|
62
73
|
{ hitTolerance },
|
|
@@ -107,13 +118,14 @@ function getFeatureFromScene(
|
|
|
107
118
|
windowPosition: Cartesian2,
|
|
108
119
|
hitTolerance: number,
|
|
109
120
|
): EventFeature | undefined {
|
|
110
|
-
const pickObject = scene.pick(
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
hitTolerance,
|
|
114
|
-
) as CesiumPickObject;
|
|
121
|
+
const pickObject = scene.pick(windowPosition, hitTolerance, hitTolerance) as
|
|
122
|
+
| CesiumPickObject
|
|
123
|
+
| undefined;
|
|
115
124
|
|
|
116
|
-
|
|
125
|
+
if (pickObject) {
|
|
126
|
+
return getFeatureFromPickObject(pickObject);
|
|
127
|
+
}
|
|
128
|
+
return pickObject;
|
|
117
129
|
}
|
|
118
130
|
|
|
119
131
|
/**
|
package/src/map/baseOLMap.ts
CHANGED
|
@@ -20,27 +20,49 @@ import type Layer from '../layer/layer.js';
|
|
|
20
20
|
import { DisableMapControlOptions } from '../util/mapCollection.js';
|
|
21
21
|
import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
|
|
22
22
|
|
|
23
|
-
|
|
23
|
+
function ensureLayerInCollection(
|
|
24
24
|
layers: OLCollection<OLLayer>,
|
|
25
25
|
layer: OLLayer,
|
|
26
26
|
layerCollection: LayerCollection,
|
|
27
27
|
): void {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
28
|
+
const sortedVectorClusterGroups = [
|
|
29
|
+
...layerCollection.vectorClusterGroups,
|
|
30
|
+
].sort((a, b) => a.zIndex - b.zIndex);
|
|
31
|
+
|
|
32
|
+
const getIndexOfOlLayer = (olL: OLLayer): number => {
|
|
33
|
+
let layerIndex;
|
|
34
|
+
let clusterIndex = 0;
|
|
35
|
+
if (olL[vectorClusterGroupName]) {
|
|
36
|
+
const clusterGroup = layerCollection.vectorClusterGroups.getByKey(
|
|
37
|
+
olL[vectorClusterGroupName],
|
|
38
|
+
)!;
|
|
39
|
+
layerIndex = layerCollection.findIndex(
|
|
40
|
+
(l) => l.zIndex > clusterGroup.zIndex,
|
|
41
|
+
);
|
|
42
|
+
clusterIndex = sortedVectorClusterGroups.indexOf(clusterGroup);
|
|
43
|
+
layerIndex = layerIndex < 0 ? layerCollection.size : layerIndex;
|
|
44
|
+
} else {
|
|
45
|
+
layerIndex = layerCollection.indexOfKey(olL[vcsLayerName]) as number;
|
|
46
|
+
if (sortedVectorClusterGroups.length > 0) {
|
|
47
|
+
const vcsLayer = layerCollection.getByKey(olL[vcsLayerName])!;
|
|
48
|
+
clusterIndex = sortedVectorClusterGroups.findIndex(
|
|
49
|
+
(vc) => vc.zIndex >= vcsLayer.zIndex,
|
|
50
|
+
);
|
|
51
|
+
clusterIndex = clusterIndex < 0 ? sortedVectorClusterGroups.length : 0;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
layerIndex += clusterIndex;
|
|
56
|
+
return layerIndex;
|
|
57
|
+
};
|
|
34
58
|
|
|
59
|
+
const targetIndex = getIndexOfOlLayer(layer);
|
|
35
60
|
if (targetIndex > -1) {
|
|
36
61
|
const layerArray = layers.getArray();
|
|
37
62
|
|
|
38
63
|
if (!layerArray.includes(layer)) {
|
|
39
|
-
let indexInOlCollection = layerArray.findIndex((
|
|
40
|
-
|
|
41
|
-
l[vcsLayerName],
|
|
42
|
-
) as number;
|
|
43
|
-
return layerIndex > targetIndex;
|
|
64
|
+
let indexInOlCollection = layerArray.findIndex((olL) => {
|
|
65
|
+
return getIndexOfOlLayer(olL) > targetIndex;
|
|
44
66
|
});
|
|
45
67
|
if (indexInOlCollection === -1) {
|
|
46
68
|
indexInOlCollection = layerArray.length;
|
|
@@ -148,6 +148,10 @@ class IndexedCollection<T> extends Collection<T> {
|
|
|
148
148
|
return this._array.findIndex((e) => e[this.uniqueKey as keyof T] === value);
|
|
149
149
|
}
|
|
150
150
|
|
|
151
|
+
findIndex(predicate: (value: T, index: number, obj: T[]) => boolean): number {
|
|
152
|
+
return this._array.findIndex(predicate);
|
|
153
|
+
}
|
|
154
|
+
|
|
151
155
|
destroy(): void {
|
|
152
156
|
super.destroy();
|
|
153
157
|
this.moved.destroy();
|
|
@@ -27,12 +27,14 @@ import OpenlayersMap from '../map/openlayersMap.js';
|
|
|
27
27
|
import type VectorClusterGroupImpl from './vectorClusterGroupImpl.js';
|
|
28
28
|
import ObliqueMap from '../map/obliqueMap.js';
|
|
29
29
|
import VectorClusterGroupObliqueImpl from './vectorClusterGroupObliqueImpl.js';
|
|
30
|
+
import { maxZIndex } from '../util/layerCollection.js';
|
|
30
31
|
|
|
31
32
|
export type VectorClusterGroupOptions = VcsObjectOptions & {
|
|
32
33
|
style?: VectorClusterStyleItemOptions | VectorClusterStyleItem;
|
|
33
34
|
highlightStyle?: VectorClusterStyleItemOptions | VectorClusterStyleItem;
|
|
34
35
|
clusterDistance?: number;
|
|
35
36
|
vectorProperties?: VectorPropertiesOptions;
|
|
37
|
+
zIndex?: number;
|
|
36
38
|
};
|
|
37
39
|
|
|
38
40
|
export type VectorClusterGroupImplementationOptions = {
|
|
@@ -92,6 +94,7 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
92
94
|
style: undefined,
|
|
93
95
|
highlightStyle: undefined,
|
|
94
96
|
clusterDistance: 40,
|
|
97
|
+
zIndex: Math.floor(maxZIndex / 2),
|
|
95
98
|
vectorProperties: {
|
|
96
99
|
...VectorProperties.getDefaultOptions(),
|
|
97
100
|
eyeOffset: [0, 0, -100],
|
|
@@ -124,6 +127,8 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
124
127
|
|
|
125
128
|
private _globalHider: GlobalHider | undefined;
|
|
126
129
|
|
|
130
|
+
private _zIndex = maxZIndex - 1;
|
|
131
|
+
|
|
127
132
|
vectorProperties: VectorProperties;
|
|
128
133
|
|
|
129
134
|
clusterDistance: number;
|
|
@@ -153,6 +158,8 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
153
158
|
options.vectorProperties ?? defaultOptions.vectorProperties!,
|
|
154
159
|
);
|
|
155
160
|
|
|
161
|
+
this._zIndex = parseInteger(options.zIndex, defaultOptions.zIndex);
|
|
162
|
+
|
|
156
163
|
this._styleFunction = this._style.createStyleFunction((layerName) =>
|
|
157
164
|
[...this._layerListeners.keys()].find((l) => l.name === layerName),
|
|
158
165
|
);
|
|
@@ -170,6 +177,10 @@ export default class VectorClusterGroup extends VcsObject {
|
|
|
170
177
|
return this._globalHider;
|
|
171
178
|
}
|
|
172
179
|
|
|
180
|
+
get zIndex(): number {
|
|
181
|
+
return this._zIndex;
|
|
182
|
+
}
|
|
183
|
+
|
|
173
184
|
setStyle(
|
|
174
185
|
style: VectorClusterStyleItem | VectorClusterStyleItemOptions,
|
|
175
186
|
): void {
|
|
@@ -25,6 +25,7 @@ import VectorClusterGroupImpl from './vectorClusterGroupImpl.js';
|
|
|
25
25
|
import { vectorClusterGroupName } from './vectorClusterSymbols.js';
|
|
26
26
|
import type VectorLayer from '../layer/vectorLayer.js';
|
|
27
27
|
import { vcsLayerName } from '../layer/layerSymbols.js';
|
|
28
|
+
import { hidden } from '../layer/featureVisibility.js';
|
|
28
29
|
|
|
29
30
|
let scratchCartographic = new Cartographic();
|
|
30
31
|
|
|
@@ -88,6 +89,9 @@ export default class VectorClusterGroupCesiumImpl extends VectorClusterGroupImpl
|
|
|
88
89
|
true,
|
|
89
90
|
);
|
|
90
91
|
feature.setGeometry(new Point(position));
|
|
92
|
+
feature.on('change', () => {
|
|
93
|
+
cluster.billboard.show = !feature[hidden];
|
|
94
|
+
});
|
|
91
95
|
|
|
92
96
|
const bbOptions = getBillboardOptions(
|
|
93
97
|
feature,
|
|
@@ -46,7 +46,6 @@ export default class VectorClusterGroupObliqueImpl extends VectorClusterGroupImp
|
|
|
46
46
|
visible: false,
|
|
47
47
|
source: this._clusterSource,
|
|
48
48
|
style: this.style,
|
|
49
|
-
zIndex: Number.MAX_SAFE_INTEGER,
|
|
50
49
|
});
|
|
51
50
|
olLayer[vectorClusterGroupName] = this.name;
|
|
52
51
|
this._olLayer = olLayer;
|