@vcmap/core 6.3.0-rc.1 → 6.3.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 +12 -0
- package/dist/index.d.ts +10 -2
- package/dist/index.js +9 -2
- package/dist/index.js.map +1 -1
- package/dist/ol.d.ts +13 -2
- package/dist/src/cesium/cesium3DTileFeature.d.ts +1 -0
- package/dist/src/cesium/cesium3DTileFeature.js +16 -3
- package/dist/src/cesium/cesium3DTileFeature.js.map +1 -1
- package/dist/src/cesium/cesium3DTilePointFeature.js +2 -1
- package/dist/src/cesium/cesium3DTilePointFeature.js.map +1 -1
- package/dist/src/classRegistry.d.ts +7 -1
- package/dist/src/classRegistry.js.map +1 -1
- package/dist/src/featureProvider/abstractAttributeProvider.d.ts +62 -0
- package/dist/src/featureProvider/abstractAttributeProvider.js +129 -0
- package/dist/src/featureProvider/abstractAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/abstractFeatureProvider.d.ts +9 -18
- package/dist/src/featureProvider/abstractFeatureProvider.js +7 -38
- package/dist/src/featureProvider/abstractFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/compositeFeatureProvider.d.ts +27 -0
- package/dist/src/featureProvider/compositeFeatureProvider.js +53 -0
- package/dist/src/featureProvider/compositeFeatureProvider.js.map +1 -0
- package/dist/src/featureProvider/csvAttributeProvider.d.ts +41 -0
- package/dist/src/featureProvider/csvAttributeProvider.js +126 -0
- package/dist/src/featureProvider/csvAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/featureProviderFactory.d.ts +3 -0
- package/dist/src/featureProvider/featureProviderFactory.js +17 -0
- package/dist/src/featureProvider/featureProviderFactory.js.map +1 -0
- package/dist/src/featureProvider/i3sAttributeProvider.d.ts +7 -0
- package/dist/src/featureProvider/i3sAttributeProvider.js +43 -0
- package/dist/src/featureProvider/i3sAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/jsonAttributeProvider.d.ts +26 -0
- package/dist/src/featureProvider/jsonAttributeProvider.js +73 -0
- package/dist/src/featureProvider/jsonAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/tileProviderFeatureProvider.d.ts +4 -6
- package/dist/src/featureProvider/tileProviderFeatureProvider.js +9 -11
- package/dist/src/featureProvider/tileProviderFeatureProvider.js.map +1 -1
- package/dist/src/featureProvider/urlIdAttributeProvider.d.ts +28 -0
- package/dist/src/featureProvider/urlIdAttributeProvider.js +50 -0
- package/dist/src/featureProvider/urlIdAttributeProvider.js.map +1 -0
- package/dist/src/featureProvider/wmsFeatureProvider.d.ts +12 -3
- package/dist/src/featureProvider/wmsFeatureProvider.js +17 -6
- package/dist/src/featureProvider/wmsFeatureProvider.js.map +1 -1
- package/dist/src/interaction/featureAtPixelInteraction.d.ts +15 -3
- package/dist/src/interaction/featureAtPixelInteraction.js +41 -1
- package/dist/src/interaction/featureAtPixelInteraction.js.map +1 -1
- package/dist/src/interaction/featureProviderInteraction.js +42 -26
- package/dist/src/interaction/featureProviderInteraction.js.map +1 -1
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.d.ts +14 -5
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js +243 -128
- package/dist/src/layer/cesium/cesiumTilesetCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/i3sCesiumImpl.d.ts +33 -0
- package/dist/src/layer/cesium/i3sCesiumImpl.js +107 -0
- package/dist/src/layer/cesium/i3sCesiumImpl.js.map +1 -0
- package/dist/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.js +2 -1
- package/dist/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.js.map +1 -1
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js +7 -6
- package/dist/src/layer/cesium/vectorRasterTileCesiumImpl.js.map +1 -1
- package/dist/src/layer/cesium/vectorTileImageryProvider.js +2 -2
- package/dist/src/layer/cesium/vectorTileImageryProvider.js.map +1 -1
- package/dist/src/layer/cesiumTilesetLayer.d.ts +9 -0
- package/dist/src/layer/cesiumTilesetLayer.js +26 -1
- package/dist/src/layer/cesiumTilesetLayer.js.map +1 -1
- package/dist/src/layer/i3sLayer.d.ts +80 -0
- package/dist/src/layer/i3sLayer.js +242 -0
- package/dist/src/layer/i3sLayer.js.map +1 -0
- package/dist/src/layer/layer.d.ts +8 -3
- package/dist/src/layer/layer.js +7 -1
- package/dist/src/layer/layer.js.map +1 -1
- package/dist/src/layer/layerSymbols.d.ts +4 -0
- package/dist/src/layer/layerSymbols.js +4 -0
- package/dist/src/layer/layerSymbols.js.map +1 -1
- package/dist/src/layer/panoramaDatasetLayer.d.ts +2 -0
- package/dist/src/layer/panoramaDatasetLayer.js +33 -13
- package/dist/src/layer/panoramaDatasetLayer.js.map +1 -1
- package/dist/src/layer/tileProvider/flatGeobufTileProvider.js +3 -2
- package/dist/src/layer/tileProvider/flatGeobufTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/mvtTileProvider.js +3 -2
- package/dist/src/layer/tileProvider/mvtTileProvider.js.map +1 -1
- package/dist/src/layer/tileProvider/tileProvider.d.ts +6 -0
- package/dist/src/layer/tileProvider/tileProvider.js +12 -1
- package/dist/src/layer/tileProvider/tileProvider.js.map +1 -1
- package/dist/src/layer/vectorLayer.js +2 -2
- package/dist/src/layer/vectorLayer.js.map +1 -1
- package/dist/src/layer/vectorProperties.js +10 -1
- package/dist/src/layer/vectorProperties.js.map +1 -1
- package/dist/src/layer/vectorTileLayer.d.ts +14 -5
- package/dist/src/layer/vectorTileLayer.js +78 -26
- package/dist/src/layer/vectorTileLayer.js.map +1 -1
- package/dist/src/layer/wmsLayer.d.ts +3 -0
- package/dist/src/layer/wmsLayer.js +62 -32
- package/dist/src/layer/wmsLayer.js.map +1 -1
- package/dist/src/map/baseCesiumMap.d.ts +4 -4
- package/dist/src/map/baseCesiumMap.js +12 -0
- package/dist/src/map/baseCesiumMap.js.map +1 -1
- package/dist/src/map/cesiumMap.js +0 -11
- package/dist/src/map/cesiumMap.js.map +1 -1
- package/dist/src/map/obliqueMap.js +11 -4
- package/dist/src/map/obliqueMap.js.map +1 -1
- package/dist/src/map/panoramaMap.js +1 -1
- package/dist/src/panorama/panoramaImage.js +6 -5
- package/dist/src/panorama/panoramaImage.js.map +1 -1
- package/dist/src/style/declarativeStyleItem.js +7 -8
- package/dist/src/style/declarativeStyleItem.js.map +1 -1
- package/dist/src/util/fetch.d.ts +7 -0
- package/dist/src/util/fetch.js +7 -0
- package/dist/src/util/fetch.js.map +1 -1
- package/dist/src/vcsApp.d.ts +2 -3
- package/dist/src/vcsApp.js.map +1 -1
- package/dist/src/vcsModuleHelpers.d.ts +5 -2
- package/dist/src/vcsModuleHelpers.js +27 -1
- package/dist/src/vcsModuleHelpers.js.map +1 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js +7 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js.map +1 -1
- package/index.ts +27 -0
- package/package.json +2 -2
- package/src/cesium/cesium.d.ts +12 -0
- package/src/cesium/cesium3DTileFeature.ts +25 -3
- package/src/cesium/cesium3DTilePointFeature.ts +3 -1
- package/src/classRegistry.ts +8 -3
- package/src/featureProvider/abstractAttributeProvider.ts +201 -0
- package/src/featureProvider/abstractFeatureProvider.ts +27 -47
- package/src/featureProvider/compositeFeatureProvider.ts +103 -0
- package/src/featureProvider/csvAttributeProvider.ts +186 -0
- package/src/featureProvider/featureProviderFactory.ts +31 -0
- package/src/featureProvider/i3sAttributeProvider.ts +60 -0
- package/src/featureProvider/jsonAttributeProvider.ts +109 -0
- package/src/featureProvider/tileProviderFeatureProvider.ts +13 -14
- package/src/featureProvider/urlIdAttributeProvider.ts +82 -0
- package/src/featureProvider/wmsFeatureProvider.ts +24 -7
- package/src/global.d.ts +2 -0
- package/src/interaction/featureAtPixelInteraction.ts +53 -3
- package/src/interaction/featureProviderInteraction.ts +59 -38
- package/src/layer/cesium/cesiumTilesetCesiumImpl.ts +296 -157
- package/src/layer/cesium/i3sCesiumImpl.ts +141 -0
- package/src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.ts +4 -3
- package/src/layer/cesium/vectorRasterTileCesiumImpl.ts +7 -6
- package/src/layer/cesium/vectorTileImageryProvider.ts +2 -2
- package/src/layer/cesiumTilesetLayer.ts +51 -1
- package/src/layer/i3sLayer.ts +343 -0
- package/src/layer/layer.ts +30 -3
- package/src/layer/layerSymbols.ts +5 -0
- package/src/layer/panoramaDatasetLayer.ts +44 -13
- package/src/layer/tileProvider/flatGeobufTileProvider.ts +3 -2
- package/src/layer/tileProvider/mvtTileProvider.ts +3 -2
- package/src/layer/tileProvider/tileProvider.ts +13 -1
- package/src/layer/vectorLayer.ts +4 -2
- package/src/layer/vectorProperties.ts +10 -1
- package/src/layer/vectorTileLayer.ts +135 -47
- package/src/layer/wmsLayer.ts +77 -44
- package/src/map/baseCesiumMap.ts +29 -5
- package/src/map/cesiumMap.ts +0 -15
- package/src/map/obliqueMap.ts +13 -6
- package/src/map/panoramaMap.ts +1 -1
- package/src/ol/ol.d.ts +13 -2
- package/src/panorama/panoramaImage.ts +8 -5
- package/src/style/declarativeStyleItem.ts +7 -9
- package/src/util/fetch.ts +7 -0
- package/src/vcsApp.ts +7 -8
- package/src/vcsModuleHelpers.ts +62 -4
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { Cesium3DTile, Cesium3DTileContent, SplitDirection } from '@vcmap-cesium/engine';
|
|
2
|
+
import { I3SDataProvider } from '@vcmap-cesium/engine';
|
|
3
|
+
import type BaseCesiumMap from '../../map/baseCesiumMap.js';
|
|
4
|
+
import type StyleItem from '../../style/styleItem.js';
|
|
5
|
+
import type { AttributeProvider } from '../../featureProvider/abstractAttributeProvider.js';
|
|
6
|
+
import type { FeatureLayerImplementation } from '../featureLayer.js';
|
|
7
|
+
import type FeatureVisibility from '../featureVisibility.js';
|
|
8
|
+
import type GlobalHider from '../globalHider.js';
|
|
9
|
+
import type { I3SImplementationOptions } from '../i3sLayer.js';
|
|
10
|
+
import LayerImplementation from '../layerImplementation.js';
|
|
11
|
+
declare class I3SCesiumImpl extends LayerImplementation<BaseCesiumMap> implements FeatureLayerImplementation {
|
|
12
|
+
static get className(): string;
|
|
13
|
+
data: I3SDataProvider | null;
|
|
14
|
+
i3sOptions: I3SImplementationOptions;
|
|
15
|
+
splitDirection: SplitDirection;
|
|
16
|
+
style: StyleItem;
|
|
17
|
+
featureVisibility: FeatureVisibility;
|
|
18
|
+
globalHider: GlobalHider | undefined;
|
|
19
|
+
allowPicking: boolean;
|
|
20
|
+
attributeProvider?: AttributeProvider;
|
|
21
|
+
private _initializedPromise;
|
|
22
|
+
private _destroyStyle;
|
|
23
|
+
styleContent: (content: Cesium3DTileContent) => void;
|
|
24
|
+
updateStyle: (style: StyleItem) => void;
|
|
25
|
+
applyStyle: (tile: Cesium3DTile) => void;
|
|
26
|
+
constructor(map: BaseCesiumMap, options: I3SImplementationOptions);
|
|
27
|
+
initialize(): Promise<void>;
|
|
28
|
+
activate(): Promise<void>;
|
|
29
|
+
deactivate(): void;
|
|
30
|
+
updateSplitDirection(splitDirection: SplitDirection): void;
|
|
31
|
+
destroy(): void;
|
|
32
|
+
}
|
|
33
|
+
export default I3SCesiumImpl;
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { I3SDataProvider } from '@vcmap-cesium/engine';
|
|
2
|
+
import LayerImplementation from '../layerImplementation.js';
|
|
3
|
+
import { allowPicking, vcsLayerName } from '../layerSymbols.js';
|
|
4
|
+
import { getResourceOrUrl } from './resourceHelper.js';
|
|
5
|
+
import { createCesiumStylingContext, createTilesetEventListeners, } from './cesiumTilesetCesiumImpl.js';
|
|
6
|
+
class I3SCesiumImpl extends LayerImplementation {
|
|
7
|
+
static get className() {
|
|
8
|
+
return 'I3SCesiumImpl';
|
|
9
|
+
}
|
|
10
|
+
data;
|
|
11
|
+
i3sOptions;
|
|
12
|
+
splitDirection;
|
|
13
|
+
style;
|
|
14
|
+
featureVisibility;
|
|
15
|
+
globalHider;
|
|
16
|
+
allowPicking;
|
|
17
|
+
attributeProvider;
|
|
18
|
+
_initializedPromise = null;
|
|
19
|
+
_destroyStyle = null;
|
|
20
|
+
styleContent;
|
|
21
|
+
updateStyle;
|
|
22
|
+
applyStyle;
|
|
23
|
+
constructor(map, options) {
|
|
24
|
+
super(map, options);
|
|
25
|
+
this.data = null;
|
|
26
|
+
this.i3sOptions = options;
|
|
27
|
+
this.splitDirection = options.splitDirection;
|
|
28
|
+
this.style = options.style;
|
|
29
|
+
this.featureVisibility = options.featureVisibility;
|
|
30
|
+
this.globalHider = options.globalHider;
|
|
31
|
+
this.allowPicking = options.allowPicking;
|
|
32
|
+
this.attributeProvider = options.attributeProvider;
|
|
33
|
+
const stylingContext = createCesiumStylingContext(this);
|
|
34
|
+
this.styleContent = stylingContext.styleContent;
|
|
35
|
+
this.updateStyle = stylingContext.updateStyle;
|
|
36
|
+
this.applyStyle = stylingContext.applyStyle;
|
|
37
|
+
this._destroyStyle = stylingContext.destroy;
|
|
38
|
+
}
|
|
39
|
+
async initialize() {
|
|
40
|
+
if (!this._initializedPromise) {
|
|
41
|
+
this._initializedPromise = I3SDataProvider.fromUrl(getResourceOrUrl(this.url, this.headers), { ...this.i3sOptions, show: false });
|
|
42
|
+
this.data = await this._initializedPromise;
|
|
43
|
+
if (this.isDestroyed) {
|
|
44
|
+
this.data.destroy();
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
this.data[vcsLayerName] = this.name;
|
|
48
|
+
this.data[allowPicking] = this.allowPicking;
|
|
49
|
+
this.data.layers.forEach(({ tileset }) => {
|
|
50
|
+
if (tileset) {
|
|
51
|
+
createTilesetEventListeners(this, tileset);
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
this.map.addPrimitiveCollection(this.data);
|
|
55
|
+
await super.initialize();
|
|
56
|
+
if (this.splitDirection) {
|
|
57
|
+
this.data.layers.forEach(({ tileset }) => {
|
|
58
|
+
if (tileset) {
|
|
59
|
+
tileset.splitDirection = this.splitDirection;
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
this.updateStyle(this.style);
|
|
64
|
+
}
|
|
65
|
+
await this._initializedPromise;
|
|
66
|
+
}
|
|
67
|
+
async activate() {
|
|
68
|
+
await super.activate();
|
|
69
|
+
if (this.active && this.data) {
|
|
70
|
+
this.data.show = true;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
deactivate() {
|
|
74
|
+
super.deactivate();
|
|
75
|
+
if (this.data) {
|
|
76
|
+
this.data.show = false;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
updateSplitDirection(splitDirection) {
|
|
80
|
+
this.splitDirection = splitDirection;
|
|
81
|
+
if (this.data) {
|
|
82
|
+
this.data.layers.forEach(({ tileset }) => {
|
|
83
|
+
if (tileset) {
|
|
84
|
+
tileset.splitDirection = splitDirection;
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
destroy() {
|
|
90
|
+
if (this.data) {
|
|
91
|
+
if (this.map.initialized) {
|
|
92
|
+
const toRemove = this.data;
|
|
93
|
+
this.map.removePrimitiveCollection(toRemove);
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
this.data.destroy();
|
|
97
|
+
}
|
|
98
|
+
this.data = null;
|
|
99
|
+
}
|
|
100
|
+
if (this._destroyStyle) {
|
|
101
|
+
this._destroyStyle();
|
|
102
|
+
}
|
|
103
|
+
super.destroy();
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
export default I3SCesiumImpl;
|
|
107
|
+
//# sourceMappingURL=i3sCesiumImpl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"i3sCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/i3sCesiumImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,8 @@ export default class VcsQuadtreeTileProvider {
|
|
|
38
38
|
this.tilingScheme = layerOptions.tileProvider.tilingScheme;
|
|
39
39
|
this._levelZeroMaximumError =
|
|
40
40
|
QuadtreeTileProvider.computeDefaultLevelZeroMaximumGeometricError(this.tilingScheme);
|
|
41
|
-
const {
|
|
41
|
+
const { tileProvider } = layerOptions;
|
|
42
|
+
const { dataLevels, dataRange } = getDataTiles(layerOptions.minLevel ?? tileProvider.baseLevels.at(-1) ?? 0, layerOptions.maxLevel ?? tileProvider.baseLevels[0], tileProvider);
|
|
42
43
|
this._dataLevels = dataLevels;
|
|
43
44
|
this._dataRange = dataRange;
|
|
44
45
|
const vcsExtent = layerOptions.extent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vcsQuadtreeTileProvider.js","sourceRoot":"","sources":["../../../../../src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.ts"],"names":[],"mappings":"AASA,OAAO,EACL,UAAU,EACV,KAAK,IAAI,WAAW,EACpB,SAAS,EACT,IAAI,IAAI,UAAU,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EACL,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,YAAY,EACZ,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAC7C,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAK7C,MAAM,oBAAoB,GAAG,IAAI,UAAU,EAAE,CAAC;AAE9C,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAG1C,kDAAkD;IAClD,IAAI,SAAS;QACX,OAAO,yBAAyB,CAAC;IACnC,CAAC;IAED,QAAQ,CAAgC;IAE/B,YAAY,CAAe;IAE3B,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC;IAEhC,UAAU,GAAG,KAAK,CAAC;IAEnB,sBAAsB,CAAS;IAE/B,YAAY,CAAiB;IAE7B,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,WAAW,CAAc;IAEzB,UAAU,CAAmB;IAE7B,YAAY,CAAuB;IAEnC,MAAM,GAAG,KAAK,CAAC;IAEvB,YACE,GAAc,EACd,mBAAwC,EACxC,YAA6C;QAE7C,IAAI,CAAC,YAAY,GAAG;YAClB,GAAG;YACH,mBAAmB;YACnB,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK;YAC/B,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,YAAY,EAAE,YAAY,CAAC,YAAY;YACvC,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,cAAc,EAAE,YAAY,CAAC,cAAc;SAC5C,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAEtD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC;QAC3D,IAAI,CAAC,sBAAsB;YACzB,oBAAoB,CAAC,4CAA4C,CAC/D,IAAI,CAAC,YAAY,CAClB,CAAC;QAEJ,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,YAAY,CAC5C,YAAY,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"vcsQuadtreeTileProvider.js","sourceRoot":"","sources":["../../../../../src/layer/cesium/vcsTile/vcsQuadtreeTileProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,14 @@ class VectorRasterTileCesiumImpl extends RasterLayerCesiumImpl {
|
|
|
15
15
|
_reloadTimeout = undefined;
|
|
16
16
|
imageryProvider = undefined;
|
|
17
17
|
constructor(map, options) {
|
|
18
|
+
const minRenderingLevel = options.minLevel;
|
|
19
|
+
const maxRenderingLevel = options.maxLevel;
|
|
18
20
|
const rasterLayerOptions = {
|
|
21
|
+
maxLevel: 25,
|
|
22
|
+
minLevel: 0,
|
|
19
23
|
...options,
|
|
24
|
+
minRenderingLevel,
|
|
25
|
+
maxRenderingLevel,
|
|
20
26
|
tilingSchema: TilingScheme.MERCATOR,
|
|
21
27
|
opacity: 1,
|
|
22
28
|
};
|
|
@@ -30,12 +36,7 @@ class VectorRasterTileCesiumImpl extends RasterLayerCesiumImpl {
|
|
|
30
36
|
tileSize: this.tileSize,
|
|
31
37
|
headers: this.headers,
|
|
32
38
|
});
|
|
33
|
-
const layerOptions =
|
|
34
|
-
alpha: this.opacity,
|
|
35
|
-
splitDirection: this.splitDirection,
|
|
36
|
-
minimumTerrainLevel: this.minLevel,
|
|
37
|
-
maximumTerrainLevel: this.maxLevel,
|
|
38
|
-
};
|
|
39
|
+
const layerOptions = this.getCesiumLayerOptions();
|
|
39
40
|
if (this.extent && this.extent.isValid()) {
|
|
40
41
|
const extent = this.extent.getCoordinatesInProjection(wgs84Projection);
|
|
41
42
|
layerOptions.rectangle = Rectangle.fromDegrees(extent[0], extent[1], extent[2], extent[3]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorRasterTileCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/vectorRasterTileCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,IAAI,kBAAkB,EAClC,SAAS,GACV,MAAM,sBAAsB,CAAC;AAG9B,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAEL,YAAY,GACb,MAAM,mBAAmB,CAAC;AAI3B;;GAEG;AACH,MAAM,0BAA2B,SAAQ,qBAAqB;IAC5D,MAAM,KAAK,SAAS;QAClB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAED,YAAY,CAAe;IAE3B,QAAQ,CAAO;IAEP,cAAc,GAAuB,SAAS,CAAC;IAEvD,eAAe,GAA0C,SAAS,CAAC;IAEnE,YAAY,GAAc,EAAE,OAAwC;QAClE,MAAM,kBAAkB,GAAqC;YAC3D,GAAG,OAAO;YACV,YAAY,EAAE,YAAY,CAAC,QAAQ;YACnC,OAAO,EAAE,CAAC;SACX,CAAC;QACF,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,eAAe,GAAG,IAAI,yBAAyB,CAAC;YACnD,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QAEH,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"vectorRasterTileCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/vectorRasterTileCesiumImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Event as CesiumEvent, Rectangle, Math as CesiumMath, } from '@vcmap-cesium/engine';
|
|
2
2
|
import { compose, create as createTransform, scale as scaleTransform, } from 'ol/transform.js';
|
|
3
|
-
import { rectangleToExtent } from '../tileProvider/tileProvider.js';
|
|
4
3
|
import { wgs84ToMercatorTransformer } from '../../util/projection.js';
|
|
5
4
|
import CanvasTileRenderer from '../../ol/render/canvas/canvasTileRenderer.js';
|
|
5
|
+
import { rectangleToMercatorExtent } from '../../util/math.js';
|
|
6
6
|
export function toContext(extent, center, context, tileSize) {
|
|
7
7
|
const { canvas } = context;
|
|
8
8
|
canvas.width = tileSize[0];
|
|
@@ -124,7 +124,7 @@ class VectorTileImageryProvider {
|
|
|
124
124
|
return this.emptyCanvas;
|
|
125
125
|
}
|
|
126
126
|
const rectangle = this.tileProvider.tilingScheme.tileXYToRectangle(x, y, level);
|
|
127
|
-
const extent =
|
|
127
|
+
const extent = rectangleToMercatorExtent(rectangle);
|
|
128
128
|
const center = Rectangle.center(rectangle);
|
|
129
129
|
return getCanvasFromFeatures(features, extent, center, this._tileSize);
|
|
130
130
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorTileImageryProvider.js","sourceRoot":"","sources":["../../../../src/layer/cesium/vectorTileImageryProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,WAAW,EACpB,SAAS,EACT,IAAI,IAAI,UAAU,GAGnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,OAAO,EACP,MAAM,IAAI,eAAe,EACzB,KAAK,IAAI,cAAc,GACxB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"vectorTileImageryProvider.js","sourceRoot":"","sources":["../../../../src/layer/cesium/vectorTileImageryProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import Extent from '../util/extent.js';
|
|
|
9
9
|
import type { LayerOptions } from './layer.js';
|
|
10
10
|
import type FeatureVisibility from './featureVisibility.js';
|
|
11
11
|
import type VcsMap from '../map/vcsMap.js';
|
|
12
|
+
import { type AbstractAttributeProviderOptions, type AttributeProvider } from '../featureProvider/abstractAttributeProvider.js';
|
|
12
13
|
export type CesiumTilesetOptions = LayerOptions & {
|
|
13
14
|
/**
|
|
14
15
|
* relates inversely to the depth over which the layer is activated
|
|
@@ -29,6 +30,10 @@ export type CesiumTilesetOptions = LayerOptions & {
|
|
|
29
30
|
* a css string color to be used as an outline.
|
|
30
31
|
*/
|
|
31
32
|
outlineColor?: string;
|
|
33
|
+
/**
|
|
34
|
+
* an optional attribute provider to provide custom attributes for the tileset features on load
|
|
35
|
+
*/
|
|
36
|
+
attributeProvider?: AttributeProvider | AbstractAttributeProviderOptions;
|
|
32
37
|
};
|
|
33
38
|
export type CesiumTilesetTilesetProperties = {
|
|
34
39
|
key: keyof Cesium3DTileset;
|
|
@@ -41,6 +46,7 @@ export type CesiumTilesetImplementationOptions = FeatureLayerImplementationOptio
|
|
|
41
46
|
modelMatrix?: Matrix4;
|
|
42
47
|
offset?: Coordinate;
|
|
43
48
|
customShader?: CustomShader;
|
|
49
|
+
attributeProvider?: AttributeProvider;
|
|
44
50
|
};
|
|
45
51
|
/**
|
|
46
52
|
* represents a specific Building layer for cesium.
|
|
@@ -57,6 +63,7 @@ declare class CesiumTilesetLayer extends FeatureLayer<CesiumTilesetCesiumImpl> {
|
|
|
57
63
|
private _offset;
|
|
58
64
|
protected _supportedMaps: string[];
|
|
59
65
|
private _customShader;
|
|
66
|
+
private _attributeProvider?;
|
|
60
67
|
constructor(options: CesiumTilesetOptions);
|
|
61
68
|
/**
|
|
62
69
|
* A model matrix to apply to each cesium3DTileset created from this layer.
|
|
@@ -73,6 +80,8 @@ declare class CesiumTilesetLayer extends FeatureLayer<CesiumTilesetCesiumImpl> {
|
|
|
73
80
|
set offset(offset: Coordinate | undefined);
|
|
74
81
|
get customShader(): CustomShader | undefined;
|
|
75
82
|
set customShader(shader: CustomShader | undefined);
|
|
83
|
+
get attributeProvider(): AttributeProvider | undefined;
|
|
84
|
+
set attributeProvider(provider: AttributeProvider | undefined);
|
|
76
85
|
getImplementationOptions(): CesiumTilesetImplementationOptions;
|
|
77
86
|
createImplementationsForMap(map: VcsMap): CesiumTilesetCesiumImpl[];
|
|
78
87
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Color, Matrix4, } from '@vcmap-cesium/engine';
|
|
2
|
-
import { check, maybe } from '@vcsuite/check';
|
|
2
|
+
import { check, is, maybe, oneOf } from '@vcsuite/check';
|
|
3
3
|
import { parseInteger } from '@vcsuite/parsers';
|
|
4
4
|
import VectorStyleItem from '../style/vectorStyleItem.js';
|
|
5
5
|
import FeatureLayer from './featureLayer.js';
|
|
@@ -12,6 +12,9 @@ import { layerClassRegistry } from '../classRegistry.js';
|
|
|
12
12
|
import { cesiumColorToColor, getStringColor } from '../style/styleHelpers.js';
|
|
13
13
|
import PanoramaMap from '../map/panoramaMap.js';
|
|
14
14
|
import BaseCesiumMap from '../map/baseCesiumMap.js';
|
|
15
|
+
import AbstractAttributeProvider from '../featureProvider/abstractAttributeProvider.js';
|
|
16
|
+
import { getProviderForOption } from '../featureProvider/featureProviderFactory.js';
|
|
17
|
+
import CompositeFeatureProvider from '../featureProvider/compositeFeatureProvider.js';
|
|
15
18
|
/**
|
|
16
19
|
* represents a specific Building layer for cesium.
|
|
17
20
|
* @group Layer
|
|
@@ -39,6 +42,7 @@ class CesiumTilesetLayer extends FeatureLayer {
|
|
|
39
42
|
_offset;
|
|
40
43
|
_supportedMaps = [CesiumMap.className, PanoramaMap.className];
|
|
41
44
|
_customShader = undefined;
|
|
45
|
+
_attributeProvider;
|
|
42
46
|
constructor(options) {
|
|
43
47
|
const defaultOptions = CesiumTilesetLayer.getDefaultOptions();
|
|
44
48
|
super({ ...defaultOptions, ...options });
|
|
@@ -63,6 +67,10 @@ class CesiumTilesetLayer extends FeatureLayer {
|
|
|
63
67
|
};
|
|
64
68
|
this._modelMatrix = undefined;
|
|
65
69
|
this._offset = options.offset || defaultOptions.offset;
|
|
70
|
+
const attributeProvider = getProviderForOption(options.attributeProvider);
|
|
71
|
+
if (is(attributeProvider, oneOf(CompositeFeatureProvider, AbstractAttributeProvider))) {
|
|
72
|
+
this._attributeProvider = attributeProvider;
|
|
73
|
+
}
|
|
66
74
|
}
|
|
67
75
|
/**
|
|
68
76
|
* A model matrix to apply to each cesium3DTileset created from this layer.
|
|
@@ -104,6 +112,18 @@ class CesiumTilesetLayer extends FeatureLayer {
|
|
|
104
112
|
});
|
|
105
113
|
}
|
|
106
114
|
}
|
|
115
|
+
get attributeProvider() {
|
|
116
|
+
return this._attributeProvider;
|
|
117
|
+
}
|
|
118
|
+
set attributeProvider(provider) {
|
|
119
|
+
check(provider, maybe(oneOf(AbstractAttributeProvider, CompositeFeatureProvider)));
|
|
120
|
+
if (this._attributeProvider !== provider) {
|
|
121
|
+
this._attributeProvider = provider;
|
|
122
|
+
this.forceRedraw().catch((e) => {
|
|
123
|
+
this.getLogger().error(`Error forcing redraw after setting attribute provider: ${String(e)}`);
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
}
|
|
107
127
|
getImplementationOptions() {
|
|
108
128
|
return {
|
|
109
129
|
...super.getImplementationOptions(),
|
|
@@ -112,6 +132,7 @@ class CesiumTilesetLayer extends FeatureLayer {
|
|
|
112
132
|
modelMatrix: this.modelMatrix,
|
|
113
133
|
offset: this.offset,
|
|
114
134
|
customShader: this.customShader,
|
|
135
|
+
attributeProvider: this._attributeProvider,
|
|
115
136
|
};
|
|
116
137
|
}
|
|
117
138
|
createImplementationsForMap(map) {
|
|
@@ -182,12 +203,16 @@ class CesiumTilesetLayer extends FeatureLayer {
|
|
|
182
203
|
if (Array.isArray(this.offset)) {
|
|
183
204
|
config.offset = this.offset.slice();
|
|
184
205
|
}
|
|
206
|
+
if (this._attributeProvider) {
|
|
207
|
+
config.attributeProvider = this._attributeProvider.toJSON();
|
|
208
|
+
}
|
|
185
209
|
return config;
|
|
186
210
|
}
|
|
187
211
|
/**
|
|
188
212
|
* disposes of this layer, removes instances from the current maps and the framework
|
|
189
213
|
*/
|
|
190
214
|
destroy() {
|
|
215
|
+
this.attributeProvider?.destroy();
|
|
191
216
|
super.destroy();
|
|
192
217
|
}
|
|
193
218
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cesiumTilesetLayer.js","sourceRoot":"","sources":["../../../src/layer/cesiumTilesetLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAEL,OAAO,GACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"cesiumTilesetLayer.js","sourceRoot":"","sources":["../../../src/layer/cesiumTilesetLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import type { Cesium3DTileset } from '@vcmap-cesium/engine';
|
|
2
|
+
import I3SCesiumImpl from './cesium/i3sCesiumImpl.js';
|
|
3
|
+
import FeatureLayer from './featureLayer.js';
|
|
4
|
+
import type { LayerOptions } from './layer.js';
|
|
5
|
+
import type FeatureVisibility from './featureVisibility.js';
|
|
6
|
+
import type { FeatureLayerImplementationOptions } from './featureLayer.js';
|
|
7
|
+
import type VcsMap from '../map/vcsMap.js';
|
|
8
|
+
import type { VcsObjectOptions } from '../vcsObject.js';
|
|
9
|
+
import Extent from '../util/extent.js';
|
|
10
|
+
import type { VectorStyleItemOptions } from '../style/vectorStyleItem.js';
|
|
11
|
+
import VectorStyleItem from '../style/vectorStyleItem.js';
|
|
12
|
+
import type { AttributeProvider } from '../featureProvider/abstractAttributeProvider.js';
|
|
13
|
+
export type I3SOptions = LayerOptions & {
|
|
14
|
+
adjustMaterialAlphaMode?: boolean;
|
|
15
|
+
applySymbology?: boolean;
|
|
16
|
+
calculateNormals?: boolean;
|
|
17
|
+
showFeatures?: boolean;
|
|
18
|
+
cesium3dTilesetOptions?: Cesium3DTileset.ConstructorOptions;
|
|
19
|
+
lightColor?: {
|
|
20
|
+
x: number;
|
|
21
|
+
y: number;
|
|
22
|
+
z: number;
|
|
23
|
+
};
|
|
24
|
+
outlineColor?: string;
|
|
25
|
+
screenSpaceError?: number;
|
|
26
|
+
screenSpaceErrorMobile?: number;
|
|
27
|
+
highlightStyle?: VectorStyleItem | VectorStyleItemOptions;
|
|
28
|
+
featureVisibility?: FeatureVisibility;
|
|
29
|
+
/** A flag to indicate if the layer has batch tables, in which case features attributes are loaded on load */
|
|
30
|
+
hasBatchTable?: boolean;
|
|
31
|
+
/** an optional attribute provider to provide custom attributes for the tileset features on load */
|
|
32
|
+
attributeProvider?: AttributeProvider | VcsObjectOptions;
|
|
33
|
+
};
|
|
34
|
+
export type I3SImplementationOptions = FeatureLayerImplementationOptions & {
|
|
35
|
+
allowPicking: boolean;
|
|
36
|
+
adjustMaterialAlphaMode?: boolean;
|
|
37
|
+
applySymbology?: boolean;
|
|
38
|
+
calculateNormals?: boolean;
|
|
39
|
+
showFeatures?: boolean;
|
|
40
|
+
cesium3dTilesetOptions?: Cesium3DTileset.ConstructorOptions;
|
|
41
|
+
hasBatchTable?: boolean;
|
|
42
|
+
attributeProvider?: AttributeProvider;
|
|
43
|
+
};
|
|
44
|
+
declare class I3SLayer extends FeatureLayer<I3SCesiumImpl> {
|
|
45
|
+
static get className(): string;
|
|
46
|
+
static getDefaultOptions(): I3SOptions;
|
|
47
|
+
adjustMaterialAlphaMode: boolean;
|
|
48
|
+
applySymbology: boolean;
|
|
49
|
+
calculateNormals: boolean;
|
|
50
|
+
showFeatures: boolean;
|
|
51
|
+
cesium3dTilesetOptions: Partial<Cesium3DTileset.ConstructorOptions> | undefined;
|
|
52
|
+
lightColor: {
|
|
53
|
+
x: number;
|
|
54
|
+
y: number;
|
|
55
|
+
z: number;
|
|
56
|
+
} | undefined;
|
|
57
|
+
outlineColor: string | undefined;
|
|
58
|
+
screenSpaceError: number;
|
|
59
|
+
screenSpaceErrorMobile: number;
|
|
60
|
+
highlightStyle: VectorStyleItem | null;
|
|
61
|
+
hasBatchTable: boolean;
|
|
62
|
+
protected _supportedMaps: string[];
|
|
63
|
+
private _attributeProvider?;
|
|
64
|
+
constructor(options: I3SOptions);
|
|
65
|
+
get attributeProvider(): AttributeProvider | undefined;
|
|
66
|
+
set attributeProvider(provider: AttributeProvider | undefined);
|
|
67
|
+
getImplementationOptions(): I3SImplementationOptions;
|
|
68
|
+
createImplementationsForMap(map: VcsMap): I3SCesiumImpl[];
|
|
69
|
+
getZoomToExtent(): Extent | null;
|
|
70
|
+
/**
|
|
71
|
+
* set the maximum screenspace error of this layer
|
|
72
|
+
*/
|
|
73
|
+
setMaximumScreenSpaceError(value: number): void;
|
|
74
|
+
toJSON(defaultOptions?: I3SOptions): I3SOptions;
|
|
75
|
+
/**
|
|
76
|
+
* disposes of this layer, removes instances from the current maps and the framework
|
|
77
|
+
*/
|
|
78
|
+
destroy(): void;
|
|
79
|
+
}
|
|
80
|
+
export default I3SLayer;
|