@vcmap/core 5.3.0 → 5.3.1
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/layer/openlayers/vectorTileOpenlayersImpl.d.ts +1 -0
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js +3 -1
- package/dist/src/layer/openlayers/vectorTileOpenlayersImpl.js.map +1 -1
- package/dist/src/layer/vectorTileLayer.d.ts +6 -0
- package/dist/src/layer/vectorTileLayer.js +8 -1
- package/dist/src/layer/vectorTileLayer.js.map +1 -1
- package/dist/src/style/declarativeStyleItem.d.ts +1 -0
- package/dist/src/style/declarativeStyleItem.js +7 -1
- package/dist/src/style/declarativeStyleItem.js.map +1 -1
- package/package.json +1 -1
- package/src/layer/openlayers/vectorTileOpenlayersImpl.ts +4 -1
- package/src/layer/vectorTileLayer.ts +15 -1
- package/src/style/declarativeStyleItem.ts +7 -1
|
@@ -23,6 +23,7 @@ declare class VectorTileOpenlayersImpl extends LayerOpenlayersImpl implements Ve
|
|
|
23
23
|
minLevel: number | undefined;
|
|
24
24
|
maxLevel: number | undefined;
|
|
25
25
|
extent: Extent | undefined;
|
|
26
|
+
declutter: boolean;
|
|
26
27
|
constructor(map: OpenlayersMap, options: VectorTileImplementationOptions);
|
|
27
28
|
getOLLayer(): OLVectorTileLayer;
|
|
28
29
|
/**
|
|
@@ -21,6 +21,7 @@ class VectorTileOpenlayersImpl extends LayerOpenlayersImpl {
|
|
|
21
21
|
minLevel;
|
|
22
22
|
maxLevel;
|
|
23
23
|
extent;
|
|
24
|
+
declutter;
|
|
24
25
|
constructor(map, options) {
|
|
25
26
|
super(map, options);
|
|
26
27
|
this.tileProvider = options.tileProvider;
|
|
@@ -28,6 +29,7 @@ class VectorTileOpenlayersImpl extends LayerOpenlayersImpl {
|
|
|
28
29
|
this.minLevel = options.minLevel;
|
|
29
30
|
this.maxLevel = options.maxLevel;
|
|
30
31
|
this.extent = options.extent;
|
|
32
|
+
this.declutter = options.declutter;
|
|
31
33
|
}
|
|
32
34
|
getOLLayer() {
|
|
33
35
|
this.source = new VectorTileSource({
|
|
@@ -61,7 +63,7 @@ class VectorTileOpenlayersImpl extends LayerOpenlayersImpl {
|
|
|
61
63
|
source: this.source,
|
|
62
64
|
renderBuffer: 200,
|
|
63
65
|
renderMode: 'hybrid',
|
|
64
|
-
declutter:
|
|
66
|
+
declutter: this.declutter,
|
|
65
67
|
extent,
|
|
66
68
|
minZoom,
|
|
67
69
|
maxZoom,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorTileOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/vectorTileOpenlayersImpl.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AACvD,OAAO,gBAAgB,MAAM,yBAAyB,CAAC;AACvD,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAGxC,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAU9D;;GAEG;AACH,MAAM,wBACJ,SAAQ,mBAAmB;IAG3B,MAAM,KAAK,SAAS;QAClB,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAED,YAAY,CAAe;IAE3B,MAAM,GAAiC,SAAS,CAAC;IAEjD,QAAQ,CAAO;IAEf;;OAEG;IACK,cAAc,GAAgB,IAAI,GAAG,EAAE,CAAC;IAExC,cAAc,GAAuB,SAAS,CAAC;IAEvD,QAAQ,CAAqB;IAE7B,QAAQ,CAAqB;IAE7B,MAAM,CAAqB;IAE3B,YAAY,GAAkB,EAAE,OAAwC;QACtE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"vectorTileOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/vectorTileOpenlayersImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,10 @@ export type VectorTileOptions = FeatureLayerOptions & {
|
|
|
22
22
|
* used to restrict the zoom level visibility
|
|
23
23
|
*/
|
|
24
24
|
maxLevel?: number;
|
|
25
|
+
/**
|
|
26
|
+
* used to forward declutter option to openlayers VectorTileLayer
|
|
27
|
+
*/
|
|
28
|
+
declutter?: boolean;
|
|
25
29
|
};
|
|
26
30
|
export type VectorTileImplementationOptions = FeatureLayerImplementationOptions & {
|
|
27
31
|
tileProvider: TileProvider;
|
|
@@ -29,6 +33,7 @@ export type VectorTileImplementationOptions = FeatureLayerImplementationOptions
|
|
|
29
33
|
minLevel: number;
|
|
30
34
|
maxLevel: number;
|
|
31
35
|
extent?: Extent;
|
|
36
|
+
declutter: boolean;
|
|
32
37
|
};
|
|
33
38
|
export interface VectorTileImplementation extends FeatureLayerImplementation {
|
|
34
39
|
updateTiles(tiles: string[]): void;
|
|
@@ -49,6 +54,7 @@ declare class VectorTileLayer extends FeatureLayer<VectorTileOpenlayersImpl | Ve
|
|
|
49
54
|
tileProvider: TileProvider;
|
|
50
55
|
private _maxLevel;
|
|
51
56
|
private _minLevel;
|
|
57
|
+
private _declutter;
|
|
52
58
|
private _featureVisibilityListeners;
|
|
53
59
|
private _tileLoadEventListener;
|
|
54
60
|
private _vectorPropertiesChangedListener;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Style from 'ol/style/Style.js';
|
|
2
|
-
import { parseInteger } from '@vcsuite/parsers';
|
|
2
|
+
import { parseBoolean, parseInteger } from '@vcsuite/parsers';
|
|
3
3
|
import CesiumMap from '../map/cesiumMap.js';
|
|
4
4
|
import VectorRasterTileCesiumImpl from './cesium/vectorRasterTileCesiumImpl.js';
|
|
5
5
|
import OpenlayersMap from '../map/openlayersMap.js';
|
|
@@ -58,6 +58,7 @@ class VectorTileLayer extends FeatureLayer {
|
|
|
58
58
|
vectorProperties: {},
|
|
59
59
|
minLevel: undefined,
|
|
60
60
|
maxLevel: undefined,
|
|
61
|
+
declutter: true,
|
|
61
62
|
};
|
|
62
63
|
}
|
|
63
64
|
highlightStyle;
|
|
@@ -69,6 +70,7 @@ class VectorTileLayer extends FeatureLayer {
|
|
|
69
70
|
tileProvider;
|
|
70
71
|
_maxLevel;
|
|
71
72
|
_minLevel;
|
|
73
|
+
_declutter;
|
|
72
74
|
_featureVisibilityListeners = [];
|
|
73
75
|
// eslint-disable-next-line class-methods-use-this
|
|
74
76
|
_tileLoadEventListener = () => { };
|
|
@@ -105,6 +107,7 @@ class VectorTileLayer extends FeatureLayer {
|
|
|
105
107
|
}
|
|
106
108
|
this._maxLevel = parseInteger(options.maxLevel, defaultOptions.maxLevel);
|
|
107
109
|
this._minLevel = parseInteger(options.minLevel, defaultOptions.minLevel);
|
|
110
|
+
this._declutter = parseBoolean(options.declutter, defaultOptions.declutter);
|
|
108
111
|
}
|
|
109
112
|
/**
|
|
110
113
|
* returns the currently set locale. Can be used to provide locale specific URLs.
|
|
@@ -273,6 +276,7 @@ class VectorTileLayer extends FeatureLayer {
|
|
|
273
276
|
minLevel: this._minLevel,
|
|
274
277
|
maxLevel: this._maxLevel,
|
|
275
278
|
extent: this.extent ?? new Extent(),
|
|
279
|
+
declutter: this._declutter,
|
|
276
280
|
};
|
|
277
281
|
}
|
|
278
282
|
createImplementationsForMap(map) {
|
|
@@ -339,6 +343,9 @@ class VectorTileLayer extends FeatureLayer {
|
|
|
339
343
|
if (this.tileProvider) {
|
|
340
344
|
config.tileProvider = this.tileProvider.toJSON();
|
|
341
345
|
}
|
|
346
|
+
if (this._declutter !== defaultOptions.declutter) {
|
|
347
|
+
config.declutter = this._declutter;
|
|
348
|
+
}
|
|
342
349
|
return config;
|
|
343
350
|
}
|
|
344
351
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorTileLayer.js","sourceRoot":"","sources":["../../../src/layer/vectorTileLayer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"vectorTileLayer.js","sourceRoot":"","sources":["../../../src/layer/vectorTileLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,7 @@ class DeclarativeStyleItem extends StyleItem {
|
|
|
46
46
|
}
|
|
47
47
|
_styleOptions;
|
|
48
48
|
_circleCache = new Map();
|
|
49
|
+
_iconCache = new Map();
|
|
49
50
|
/**
|
|
50
51
|
* @param options
|
|
51
52
|
*/
|
|
@@ -65,6 +66,7 @@ class DeclarativeStyleItem extends StyleItem {
|
|
|
65
66
|
// XXX is this even still needed?
|
|
66
67
|
this._styleOptions = declarativeStyle;
|
|
67
68
|
this._circleCache = new Map();
|
|
69
|
+
this._iconCache = new Map();
|
|
68
70
|
}
|
|
69
71
|
get styleOptions() {
|
|
70
72
|
return JSON.parse(JSON.stringify(this._styleOptions));
|
|
@@ -209,7 +211,11 @@ class DeclarativeStyleItem extends StyleItem {
|
|
|
209
211
|
else if (!isSameOrigin(src)) {
|
|
210
212
|
iconOptions.crossOrigin = 'anonymous';
|
|
211
213
|
}
|
|
212
|
-
|
|
214
|
+
const iconCacheKey = `${src}${iconOptions.crossOrigin}`;
|
|
215
|
+
if (!this._iconCache.has(iconCacheKey)) {
|
|
216
|
+
this._iconCache.set(iconCacheKey, new Icon(iconOptions));
|
|
217
|
+
}
|
|
218
|
+
style.setImage(this._iconCache.get(iconCacheKey));
|
|
213
219
|
}
|
|
214
220
|
}
|
|
215
221
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declarativeStyleItem.js","sourceRoot":"","sources":["../../../src/style/declarativeStyleItem.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"declarativeStyleItem.js","sourceRoot":"","sources":["../../../src/style/declarativeStyleItem.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -44,6 +44,8 @@ class VectorTileOpenlayersImpl
|
|
|
44
44
|
|
|
45
45
|
extent: Extent | undefined;
|
|
46
46
|
|
|
47
|
+
declutter: boolean;
|
|
48
|
+
|
|
47
49
|
constructor(map: OpenlayersMap, options: VectorTileImplementationOptions) {
|
|
48
50
|
super(map, options);
|
|
49
51
|
|
|
@@ -52,6 +54,7 @@ class VectorTileOpenlayersImpl
|
|
|
52
54
|
this.minLevel = options.minLevel;
|
|
53
55
|
this.maxLevel = options.maxLevel;
|
|
54
56
|
this.extent = options.extent;
|
|
57
|
+
this.declutter = options.declutter;
|
|
55
58
|
}
|
|
56
59
|
|
|
57
60
|
getOLLayer(): OLVectorTileLayer {
|
|
@@ -91,7 +94,7 @@ class VectorTileOpenlayersImpl
|
|
|
91
94
|
source: this.source,
|
|
92
95
|
renderBuffer: 200,
|
|
93
96
|
renderMode: 'hybrid',
|
|
94
|
-
declutter:
|
|
97
|
+
declutter: this.declutter,
|
|
95
98
|
extent,
|
|
96
99
|
minZoom,
|
|
97
100
|
maxZoom,
|
|
@@ -2,7 +2,7 @@ import Style, { type StyleFunction } from 'ol/style/Style.js';
|
|
|
2
2
|
import type { Feature } from 'ol/index.js';
|
|
3
3
|
import type { Size } from 'ol/size.js';
|
|
4
4
|
|
|
5
|
-
import { parseInteger } from '@vcsuite/parsers';
|
|
5
|
+
import { parseBoolean, parseInteger } from '@vcsuite/parsers';
|
|
6
6
|
import CesiumMap from '../map/cesiumMap.js';
|
|
7
7
|
import VectorRasterTileCesiumImpl from './cesium/vectorRasterTileCesiumImpl.js';
|
|
8
8
|
import OpenlayersMap from '../map/openlayersMap.js';
|
|
@@ -85,6 +85,10 @@ export type VectorTileOptions = FeatureLayerOptions & {
|
|
|
85
85
|
* used to restrict the zoom level visibility
|
|
86
86
|
*/
|
|
87
87
|
maxLevel?: number;
|
|
88
|
+
/**
|
|
89
|
+
* used to forward declutter option to openlayers VectorTileLayer
|
|
90
|
+
*/
|
|
91
|
+
declutter?: boolean;
|
|
88
92
|
};
|
|
89
93
|
|
|
90
94
|
export type VectorTileImplementationOptions =
|
|
@@ -94,6 +98,7 @@ export type VectorTileImplementationOptions =
|
|
|
94
98
|
minLevel: number;
|
|
95
99
|
maxLevel: number;
|
|
96
100
|
extent?: Extent;
|
|
101
|
+
declutter: boolean;
|
|
97
102
|
};
|
|
98
103
|
|
|
99
104
|
export interface VectorTileImplementation extends FeatureLayerImplementation {
|
|
@@ -121,6 +126,7 @@ class VectorTileLayer extends FeatureLayer<
|
|
|
121
126
|
vectorProperties: {},
|
|
122
127
|
minLevel: undefined,
|
|
123
128
|
maxLevel: undefined,
|
|
129
|
+
declutter: true,
|
|
124
130
|
};
|
|
125
131
|
}
|
|
126
132
|
|
|
@@ -139,6 +145,8 @@ class VectorTileLayer extends FeatureLayer<
|
|
|
139
145
|
|
|
140
146
|
private _minLevel: number;
|
|
141
147
|
|
|
148
|
+
private _declutter: boolean;
|
|
149
|
+
|
|
142
150
|
private _featureVisibilityListeners: (() => void)[] = [];
|
|
143
151
|
|
|
144
152
|
// eslint-disable-next-line class-methods-use-this
|
|
@@ -188,6 +196,7 @@ class VectorTileLayer extends FeatureLayer<
|
|
|
188
196
|
|
|
189
197
|
this._maxLevel = parseInteger(options.maxLevel, defaultOptions.maxLevel);
|
|
190
198
|
this._minLevel = parseInteger(options.minLevel, defaultOptions.minLevel);
|
|
199
|
+
this._declutter = parseBoolean(options.declutter, defaultOptions.declutter);
|
|
191
200
|
}
|
|
192
201
|
|
|
193
202
|
/**
|
|
@@ -378,6 +387,7 @@ class VectorTileLayer extends FeatureLayer<
|
|
|
378
387
|
minLevel: this._minLevel,
|
|
379
388
|
maxLevel: this._maxLevel,
|
|
380
389
|
extent: this.extent ?? new Extent(),
|
|
390
|
+
declutter: this._declutter,
|
|
381
391
|
};
|
|
382
392
|
}
|
|
383
393
|
|
|
@@ -472,6 +482,10 @@ class VectorTileLayer extends FeatureLayer<
|
|
|
472
482
|
config.tileProvider = this.tileProvider.toJSON();
|
|
473
483
|
}
|
|
474
484
|
|
|
485
|
+
if (this._declutter !== defaultOptions.declutter) {
|
|
486
|
+
config.declutter = this._declutter;
|
|
487
|
+
}
|
|
488
|
+
|
|
475
489
|
return config;
|
|
476
490
|
}
|
|
477
491
|
}
|
|
@@ -102,6 +102,7 @@ class DeclarativeStyleItem extends StyleItem {
|
|
|
102
102
|
private _styleOptions: DeclarativeStyleOptions;
|
|
103
103
|
|
|
104
104
|
private _circleCache: Map<string, Circle> = new Map();
|
|
105
|
+
private _iconCache: Map<string, Icon> = new Map();
|
|
105
106
|
|
|
106
107
|
/**
|
|
107
108
|
* @param options
|
|
@@ -126,6 +127,7 @@ class DeclarativeStyleItem extends StyleItem {
|
|
|
126
127
|
// XXX is this even still needed?
|
|
127
128
|
this._styleOptions = declarativeStyle;
|
|
128
129
|
this._circleCache = new Map();
|
|
130
|
+
this._iconCache = new Map();
|
|
129
131
|
}
|
|
130
132
|
|
|
131
133
|
get styleOptions(): DeclarativeStyleOptions {
|
|
@@ -308,7 +310,11 @@ class DeclarativeStyleItem extends StyleItem {
|
|
|
308
310
|
} else if (!isSameOrigin(src)) {
|
|
309
311
|
iconOptions.crossOrigin = 'anonymous';
|
|
310
312
|
}
|
|
311
|
-
|
|
313
|
+
const iconCacheKey = `${src}${iconOptions.crossOrigin}`;
|
|
314
|
+
if (!this._iconCache.has(iconCacheKey)) {
|
|
315
|
+
this._iconCache.set(iconCacheKey, new Icon(iconOptions));
|
|
316
|
+
}
|
|
317
|
+
style.setImage(this._iconCache.get(iconCacheKey)!);
|
|
312
318
|
}
|
|
313
319
|
} else {
|
|
314
320
|
const color =
|