@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,242 @@
|
|
|
1
|
+
import { Cartesian3, Color } from '@vcmap-cesium/engine';
|
|
2
|
+
import { parseBoolean, parseInteger } from '@vcsuite/parsers';
|
|
3
|
+
import { check, is, maybe, oneOf } from '@vcsuite/check';
|
|
4
|
+
import AbstractFeatureProvider from '../featureProvider/abstractFeatureProvider.js';
|
|
5
|
+
import I3SCesiumImpl from './cesium/i3sCesiumImpl.js';
|
|
6
|
+
import FeatureLayer from './featureLayer.js';
|
|
7
|
+
import { layerClassRegistry } from '../classRegistry.js';
|
|
8
|
+
import CesiumMap from '../map/cesiumMap.js';
|
|
9
|
+
import BaseCesiumMap from '../map/baseCesiumMap.js';
|
|
10
|
+
import PanoramaMap from '../map/panoramaMap.js';
|
|
11
|
+
import Extent from '../util/extent.js';
|
|
12
|
+
import { isMobile } from '../util/isMobile.js';
|
|
13
|
+
import { mercatorProjection } from '../util/projection.js';
|
|
14
|
+
import { rectangleToMercatorExtent } from '../util/math.js';
|
|
15
|
+
import { cesiumColorToColor, getStringColor } from '../style/styleHelpers.js';
|
|
16
|
+
import VectorStyleItem from '../style/vectorStyleItem.js';
|
|
17
|
+
import I3SAttributeProvider from '../featureProvider/i3sAttributeProvider.js';
|
|
18
|
+
import AbstractAttributeProvider from '../featureProvider/abstractAttributeProvider.js';
|
|
19
|
+
import CompositeFeatureProvider from '../featureProvider/compositeFeatureProvider.js';
|
|
20
|
+
import { getProviderForOption } from '../featureProvider/featureProviderFactory.js';
|
|
21
|
+
class I3SLayer extends FeatureLayer {
|
|
22
|
+
static get className() {
|
|
23
|
+
return 'I3SLayer';
|
|
24
|
+
}
|
|
25
|
+
static getDefaultOptions() {
|
|
26
|
+
return {
|
|
27
|
+
...FeatureLayer.getDefaultOptions(),
|
|
28
|
+
adjustMaterialAlphaMode: false,
|
|
29
|
+
applySymbology: false,
|
|
30
|
+
calculateNormals: false,
|
|
31
|
+
showFeatures: false,
|
|
32
|
+
cesium3dTilesetOptions: undefined,
|
|
33
|
+
lightColor: undefined,
|
|
34
|
+
outlineColor: undefined,
|
|
35
|
+
screenSpaceError: 16,
|
|
36
|
+
screenSpaceErrorMobile: 32,
|
|
37
|
+
highlightStyle: undefined,
|
|
38
|
+
hasBatchTable: true,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
adjustMaterialAlphaMode;
|
|
42
|
+
applySymbology;
|
|
43
|
+
calculateNormals;
|
|
44
|
+
showFeatures;
|
|
45
|
+
cesium3dTilesetOptions;
|
|
46
|
+
lightColor;
|
|
47
|
+
outlineColor;
|
|
48
|
+
screenSpaceError;
|
|
49
|
+
screenSpaceErrorMobile;
|
|
50
|
+
highlightStyle = null;
|
|
51
|
+
hasBatchTable;
|
|
52
|
+
_supportedMaps = [CesiumMap.className, PanoramaMap.className];
|
|
53
|
+
_attributeProvider;
|
|
54
|
+
constructor(options) {
|
|
55
|
+
const defaultOptions = I3SLayer.getDefaultOptions();
|
|
56
|
+
super({ ...defaultOptions, ...options });
|
|
57
|
+
this.adjustMaterialAlphaMode = parseBoolean(options.adjustMaterialAlphaMode ?? defaultOptions.adjustMaterialAlphaMode);
|
|
58
|
+
this.applySymbology = parseBoolean(options.applySymbology ?? defaultOptions.applySymbology);
|
|
59
|
+
this.calculateNormals = parseBoolean(options.calculateNormals ?? defaultOptions.calculateNormals);
|
|
60
|
+
this.showFeatures = parseBoolean(options.showFeatures ?? defaultOptions.showFeatures);
|
|
61
|
+
this.screenSpaceError = parseInteger(options.screenSpaceError, defaultOptions.screenSpaceError);
|
|
62
|
+
this.screenSpaceErrorMobile = parseInteger(options.screenSpaceErrorMobile, defaultOptions.screenSpaceErrorMobile);
|
|
63
|
+
this.hasBatchTable = parseBoolean(options.hasBatchTable ?? defaultOptions.hasBatchTable);
|
|
64
|
+
if (options.highlightStyle) {
|
|
65
|
+
this.highlightStyle =
|
|
66
|
+
options.highlightStyle instanceof VectorStyleItem
|
|
67
|
+
? options.highlightStyle
|
|
68
|
+
: new VectorStyleItem(options.highlightStyle);
|
|
69
|
+
}
|
|
70
|
+
const cesium3dTilesetOptions = options.cesium3dTilesetOptions || defaultOptions.cesium3dTilesetOptions;
|
|
71
|
+
this.cesium3dTilesetOptions = {
|
|
72
|
+
maximumScreenSpaceError: isMobile()
|
|
73
|
+
? this.screenSpaceErrorMobile
|
|
74
|
+
: this.screenSpaceError,
|
|
75
|
+
...cesium3dTilesetOptions,
|
|
76
|
+
...(options.lightColor && {
|
|
77
|
+
lightColor: new Cartesian3(options.lightColor.x, options.lightColor.y, options.lightColor.z),
|
|
78
|
+
}),
|
|
79
|
+
...(options.outlineColor && {
|
|
80
|
+
outlineColor: Color.fromCssColorString(options.outlineColor),
|
|
81
|
+
}),
|
|
82
|
+
};
|
|
83
|
+
const attributeProvider = getProviderForOption(options.attributeProvider);
|
|
84
|
+
if (this.hasBatchTable) {
|
|
85
|
+
if (is(attributeProvider, oneOf(CompositeFeatureProvider, AbstractAttributeProvider))) {
|
|
86
|
+
this._attributeProvider = attributeProvider;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
this._attributeProvider = new I3SAttributeProvider({});
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
else if (this.allowPicking) {
|
|
93
|
+
if (is(this.featureProvider, AbstractFeatureProvider)) {
|
|
94
|
+
this.attributeProvider = new CompositeFeatureProvider({
|
|
95
|
+
featureProviders: [this.featureProvider],
|
|
96
|
+
attributeProviders: [new I3SAttributeProvider({})],
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
this.featureProvider = new I3SAttributeProvider({});
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
get attributeProvider() {
|
|
105
|
+
return this._attributeProvider;
|
|
106
|
+
}
|
|
107
|
+
set attributeProvider(provider) {
|
|
108
|
+
check(provider, maybe(oneOf(AbstractAttributeProvider, CompositeFeatureProvider)));
|
|
109
|
+
if (this._attributeProvider !== provider) {
|
|
110
|
+
this._attributeProvider = provider;
|
|
111
|
+
this.forceRedraw().catch((e) => {
|
|
112
|
+
this.getLogger().error(`Error forcing redraw after setting attribute provider: ${String(e)}`);
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
getImplementationOptions() {
|
|
117
|
+
return {
|
|
118
|
+
...super.getImplementationOptions(),
|
|
119
|
+
allowPicking: this.allowPicking,
|
|
120
|
+
adjustMaterialAlphaMode: this.adjustMaterialAlphaMode,
|
|
121
|
+
applySymbology: this.applySymbology,
|
|
122
|
+
calculateNormals: this.calculateNormals,
|
|
123
|
+
showFeatures: this.showFeatures,
|
|
124
|
+
cesium3dTilesetOptions: this.cesium3dTilesetOptions,
|
|
125
|
+
hasBatchTable: this.hasBatchTable,
|
|
126
|
+
attributeProvider: this._attributeProvider,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
createImplementationsForMap(map) {
|
|
130
|
+
if (map instanceof BaseCesiumMap) {
|
|
131
|
+
return [new I3SCesiumImpl(map, this.getImplementationOptions())];
|
|
132
|
+
}
|
|
133
|
+
return [];
|
|
134
|
+
}
|
|
135
|
+
getZoomToExtent() {
|
|
136
|
+
const metaExtent = super.getZoomToExtent();
|
|
137
|
+
if (metaExtent) {
|
|
138
|
+
return metaExtent;
|
|
139
|
+
}
|
|
140
|
+
const impl = this.getImplementations()[0];
|
|
141
|
+
if (impl?.data) {
|
|
142
|
+
const coordinates = rectangleToMercatorExtent(impl.data.extent);
|
|
143
|
+
const extent = new Extent({
|
|
144
|
+
projection: mercatorProjection.toJSON(),
|
|
145
|
+
coordinates,
|
|
146
|
+
});
|
|
147
|
+
if (extent.isValid()) {
|
|
148
|
+
return extent;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
return null;
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* set the maximum screenspace error of this layer
|
|
155
|
+
*/
|
|
156
|
+
setMaximumScreenSpaceError(value) {
|
|
157
|
+
this.getImplementations().forEach((impl) => {
|
|
158
|
+
if (impl.data) {
|
|
159
|
+
impl.data.layers.forEach(({ tileset }) => {
|
|
160
|
+
if (tileset) {
|
|
161
|
+
tileset.maximumScreenSpaceError = value;
|
|
162
|
+
}
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
toJSON(defaultOptions = I3SLayer.getDefaultOptions()) {
|
|
168
|
+
const config = super.toJSON(defaultOptions);
|
|
169
|
+
if (this.adjustMaterialAlphaMode !== defaultOptions.adjustMaterialAlphaMode) {
|
|
170
|
+
config.adjustMaterialAlphaMode = this.adjustMaterialAlphaMode;
|
|
171
|
+
}
|
|
172
|
+
if (this.applySymbology !== defaultOptions.applySymbology) {
|
|
173
|
+
config.applySymbology = this.applySymbology;
|
|
174
|
+
}
|
|
175
|
+
if (this.calculateNormals !== defaultOptions.calculateNormals) {
|
|
176
|
+
config.calculateNormals = this.calculateNormals;
|
|
177
|
+
}
|
|
178
|
+
if (this.showFeatures !== defaultOptions.showFeatures) {
|
|
179
|
+
config.showFeatures = this.showFeatures;
|
|
180
|
+
}
|
|
181
|
+
if (this.screenSpaceError !== defaultOptions.screenSpaceError) {
|
|
182
|
+
config.screenSpaceError = this.screenSpaceError;
|
|
183
|
+
}
|
|
184
|
+
if (this.screenSpaceErrorMobile !== defaultOptions.screenSpaceErrorMobile) {
|
|
185
|
+
config.screenSpaceErrorMobile = this.screenSpaceErrorMobile;
|
|
186
|
+
}
|
|
187
|
+
if (this.hasBatchTable !== defaultOptions.hasBatchTable) {
|
|
188
|
+
config.hasBatchTable = this.hasBatchTable;
|
|
189
|
+
}
|
|
190
|
+
if (this.highlightStyle) {
|
|
191
|
+
config.highlightStyle = this.highlightStyle.toJSON();
|
|
192
|
+
}
|
|
193
|
+
const tilesetOptions = { ...this.cesium3dTilesetOptions };
|
|
194
|
+
if (tilesetOptions.outlineColor) {
|
|
195
|
+
config.outlineColor = getStringColor(cesiumColorToColor(tilesetOptions.outlineColor));
|
|
196
|
+
}
|
|
197
|
+
delete tilesetOptions.outlineColor;
|
|
198
|
+
if (tilesetOptions.lightColor) {
|
|
199
|
+
config.lightColor = {
|
|
200
|
+
x: tilesetOptions.lightColor.x,
|
|
201
|
+
y: tilesetOptions.lightColor.y,
|
|
202
|
+
z: tilesetOptions.lightColor.z,
|
|
203
|
+
};
|
|
204
|
+
}
|
|
205
|
+
delete tilesetOptions.lightColor;
|
|
206
|
+
const usedScreenSpaceError = isMobile()
|
|
207
|
+
? this.screenSpaceErrorMobile
|
|
208
|
+
: this.screenSpaceError;
|
|
209
|
+
if (tilesetOptions.maximumScreenSpaceError === usedScreenSpaceError) {
|
|
210
|
+
delete tilesetOptions.maximumScreenSpaceError;
|
|
211
|
+
}
|
|
212
|
+
if (Object.keys(tilesetOptions).length > 0) {
|
|
213
|
+
config.cesium3dTilesetOptions = structuredClone(tilesetOptions);
|
|
214
|
+
}
|
|
215
|
+
if (this._attributeProvider &&
|
|
216
|
+
!(this._attributeProvider instanceof I3SAttributeProvider) &&
|
|
217
|
+
!(this._attributeProvider instanceof AbstractFeatureProvider)) {
|
|
218
|
+
config.attributeProvider = this._attributeProvider.toJSON();
|
|
219
|
+
if (this._attributeProvider instanceof CompositeFeatureProvider) {
|
|
220
|
+
const { featureProviders, attributeProviders } = this._attributeProvider.toJSON();
|
|
221
|
+
config.featureProvider = featureProviders[0];
|
|
222
|
+
if (!(attributeProviders[0] instanceof I3SAttributeProvider)) {
|
|
223
|
+
config.attributeProvider = attributeProviders[0];
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
227
|
+
config.attributeProvider = this._attributeProvider.toJSON();
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return config;
|
|
231
|
+
}
|
|
232
|
+
/**
|
|
233
|
+
* disposes of this layer, removes instances from the current maps and the framework
|
|
234
|
+
*/
|
|
235
|
+
destroy() {
|
|
236
|
+
this.attributeProvider?.destroy();
|
|
237
|
+
super.destroy();
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
layerClassRegistry.registerClass(I3SLayer.className, I3SLayer);
|
|
241
|
+
export default I3SLayer;
|
|
242
|
+
//# sourceMappingURL=i3sLayer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"i3sLayer.js","sourceRoot":"","sources":["../../../src/layer/i3sLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,8 @@ import VcsEvent from '../vcsEvent.js';
|
|
|
7
7
|
import GlobalHider from './globalHider.js';
|
|
8
8
|
import type VcsMap from '../map/vcsMap.js';
|
|
9
9
|
import type LayerImplementation from './layerImplementation.js';
|
|
10
|
-
import type AbstractFeatureProvider from '../featureProvider/abstractFeatureProvider.js';
|
|
10
|
+
import { type default as AbstractFeatureProvider, type AbstractFeatureProviderOptions } from '../featureProvider/abstractFeatureProvider.js';
|
|
11
|
+
import type { default as AbstractAttributeProvider, AbstractAttributeProviderOptions } from '../featureProvider/abstractAttributeProvider.js';
|
|
11
12
|
export type CopyrightOptions = {
|
|
12
13
|
provider?: string;
|
|
13
14
|
url?: string;
|
|
@@ -54,6 +55,10 @@ export type LayerOptions = VcsObjectOptions & {
|
|
|
54
55
|
* if true, the layer types of the map will be ignored when checking if the layer is supported
|
|
55
56
|
*/
|
|
56
57
|
ignoreMapLayerTypes?: boolean;
|
|
58
|
+
/**
|
|
59
|
+
* An optional feature or attribute provider to provide or augment features on click events.
|
|
60
|
+
*/
|
|
61
|
+
featureProvider?: AbstractFeatureProvider | AbstractAttributeProvider | AbstractFeatureProviderOptions | AbstractAttributeProviderOptions;
|
|
57
62
|
};
|
|
58
63
|
export type LayerImplementationOptions = {
|
|
59
64
|
name: string;
|
|
@@ -105,9 +110,9 @@ declare class Layer<I extends LayerImplementation<VcsMap> = LayerImplementation<
|
|
|
105
110
|
*/
|
|
106
111
|
stateChanged: VcsEvent<LayerState>;
|
|
107
112
|
/**
|
|
108
|
-
* An optional feature provider to
|
|
113
|
+
* An optional feature or attribute provider to provide or augment features on click events.
|
|
109
114
|
*/
|
|
110
|
-
featureProvider: AbstractFeatureProvider | undefined;
|
|
115
|
+
featureProvider: AbstractFeatureProvider | AbstractAttributeProvider | undefined;
|
|
111
116
|
private _locale;
|
|
112
117
|
protected _headers?: Record<string, string>;
|
|
113
118
|
/**
|
package/dist/src/layer/layer.js
CHANGED
|
@@ -7,6 +7,7 @@ import LayerState from './layerState.js';
|
|
|
7
7
|
import VcsEvent from '../vcsEvent.js';
|
|
8
8
|
import { layerClassRegistry } from '../classRegistry.js';
|
|
9
9
|
import GlobalHider from './globalHider.js';
|
|
10
|
+
import { getProviderForOption } from '../featureProvider/featureProviderFactory.js';
|
|
10
11
|
/**
|
|
11
12
|
* Abstract base class for Layers.
|
|
12
13
|
* To create a layer Implementation the function `createImplementationsForMap` has to be implemented.
|
|
@@ -32,6 +33,7 @@ class Layer extends VcsObject {
|
|
|
32
33
|
headers: undefined,
|
|
33
34
|
ignoreMapLayerTypes: false,
|
|
34
35
|
zIndex: 0,
|
|
36
|
+
featureProvider: undefined,
|
|
35
37
|
};
|
|
36
38
|
}
|
|
37
39
|
extent;
|
|
@@ -70,7 +72,7 @@ class Layer extends VcsObject {
|
|
|
70
72
|
*/
|
|
71
73
|
stateChanged;
|
|
72
74
|
/**
|
|
73
|
-
* An optional feature provider to
|
|
75
|
+
* An optional feature or attribute provider to provide or augment features on click events.
|
|
74
76
|
*/
|
|
75
77
|
featureProvider;
|
|
76
78
|
_locale;
|
|
@@ -110,6 +112,7 @@ class Layer extends VcsObject {
|
|
|
110
112
|
this.datasourceId = options.datasourceId || defaultOptions.datasourceId;
|
|
111
113
|
this._headers = structuredClone(options.headers);
|
|
112
114
|
this._ignoreMapLayerTypes = parseBoolean(options.ignoreMapLayerTypes, defaultOptions.ignoreMapLayerTypes);
|
|
115
|
+
this.featureProvider = getProviderForOption(options.featureProvider);
|
|
113
116
|
}
|
|
114
117
|
/**
|
|
115
118
|
* True if this layer has been initialized, typically after its first activation.
|
|
@@ -576,6 +579,9 @@ class Layer extends VcsObject {
|
|
|
576
579
|
if (this._ignoreMapLayerTypes !== defaultOptions.ignoreMapLayerTypes) {
|
|
577
580
|
config.ignoreMapLayerTypes = this._ignoreMapLayerTypes;
|
|
578
581
|
}
|
|
582
|
+
if (this.featureProvider) {
|
|
583
|
+
config.featureProvider = this.featureProvider.toJSON();
|
|
584
|
+
}
|
|
579
585
|
return config;
|
|
580
586
|
}
|
|
581
587
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../../src/layer/layer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../../src/layer/layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,3 +6,7 @@ export declare const vcsLayerName: unique symbol;
|
|
|
6
6
|
* Symbol added to Cesium3DTilesets to suppress picking.
|
|
7
7
|
*/
|
|
8
8
|
export declare const allowPicking: unique symbol;
|
|
9
|
+
/**
|
|
10
|
+
* Symbol to store the I3SNode and the cartesian position on features created from non Cesium3DTileset sources.
|
|
11
|
+
*/
|
|
12
|
+
export declare const i3sData: unique symbol;
|
|
@@ -6,4 +6,8 @@ export const vcsLayerName = Symbol('vcsLayerName');
|
|
|
6
6
|
* Symbol added to Cesium3DTilesets to suppress picking.
|
|
7
7
|
*/
|
|
8
8
|
export const allowPicking = Symbol('allowPicking');
|
|
9
|
+
/**
|
|
10
|
+
* Symbol to store the I3SNode and the cartesian position on features created from non Cesium3DTileset sources.
|
|
11
|
+
*/
|
|
12
|
+
export const i3sData = Symbol('i3sData');
|
|
9
13
|
//# sourceMappingURL=layerSymbols.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layerSymbols.js","sourceRoot":"","sources":["../../../src/layer/layerSymbols.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAkB,MAAM,CAAC,cAAc,CAAC,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAkB,MAAM,CAAC,cAAc,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"layerSymbols.js","sourceRoot":"","sources":["../../../src/layer/layerSymbols.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAkB,MAAM,CAAC,cAAc,CAAC,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAkB,MAAM,CAAC,cAAc,CAAC,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAkB,MAAM,CAAC,SAAS,CAAC,CAAC"}
|
|
@@ -2,6 +2,7 @@ import type { Coordinate } from 'ol/coordinate.js';
|
|
|
2
2
|
import VectorTileLayer, { type VectorTileImpls, type VectorTileOptions } from './vectorTileLayer.js';
|
|
3
3
|
import PanoramaDatasetPanoramaImpl from './panorama/panoramaDatasetPanoramaImpl.js';
|
|
4
4
|
import type VcsMap from '../map/vcsMap.js';
|
|
5
|
+
import { type VectorPropertiesOptions } from './vectorProperties.js';
|
|
5
6
|
import FlatGeobufTileProvider from './tileProvider/flatGeobufTileProvider.js';
|
|
6
7
|
import { type PanoramaImage } from '../panorama/panoramaImage.js';
|
|
7
8
|
import Extent from '../util/extent.js';
|
|
@@ -9,6 +10,7 @@ export type PanoramaDatasetOptions = Omit<VectorTileOptions, 'url' | 'tileProvid
|
|
|
9
10
|
url: string;
|
|
10
11
|
baseLevel?: number;
|
|
11
12
|
cameraOffset?: number;
|
|
13
|
+
panoramaVectorProperties?: VectorPropertiesOptions;
|
|
12
14
|
};
|
|
13
15
|
export type PanoramaDatasetFeatureProperties = {
|
|
14
16
|
name: string;
|
|
@@ -3,7 +3,7 @@ import { buffer, createOrUpdateFromCoordinate } from 'ol/extent.js';
|
|
|
3
3
|
import VectorTileLayer from './vectorTileLayer.js';
|
|
4
4
|
import PanoramaDatasetPanoramaImpl from './panorama/panoramaDatasetPanoramaImpl.js';
|
|
5
5
|
import PanoramaMap from '../map/panoramaMap.js';
|
|
6
|
-
import VectorProperties, { PrimitiveOptionsType } from './vectorProperties.js';
|
|
6
|
+
import VectorProperties, { PrimitiveOptionsType, } from './vectorProperties.js';
|
|
7
7
|
import { maxZIndexMin50 } from '../util/layerCollection.js';
|
|
8
8
|
import { layerClassRegistry } from '../classRegistry.js';
|
|
9
9
|
import FlatGeobufTileProvider from './tileProvider/flatGeobufTileProvider.js';
|
|
@@ -27,6 +27,17 @@ export default class PanoramaDatasetLayer extends VectorTileLayer {
|
|
|
27
27
|
maxLevel: 22,
|
|
28
28
|
zIndex: maxZIndexMin50,
|
|
29
29
|
ignoreMapLayerTypes: true,
|
|
30
|
+
panoramaVectorProperties: {
|
|
31
|
+
altitudeMode: 'absolute',
|
|
32
|
+
primitiveOptions: {
|
|
33
|
+
type: PrimitiveOptionsType.CYLINDER,
|
|
34
|
+
geometryOptions: {
|
|
35
|
+
topRadius: 1,
|
|
36
|
+
bottomRadius: 1,
|
|
37
|
+
length: 0.01,
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
|
+
},
|
|
30
41
|
};
|
|
31
42
|
}
|
|
32
43
|
_hideInPanorama = false;
|
|
@@ -68,18 +79,15 @@ export default class PanoramaDatasetLayer extends VectorTileLayer {
|
|
|
68
79
|
this.baseUrl = this.url.split('/').slice(0, -1).join('/');
|
|
69
80
|
this.baseLevel = baseLevel;
|
|
70
81
|
this.cameraOffset = parseNumber(options.cameraOffset, defaultOptions.cameraOffset);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
offset: [0, 0, this.cameraOffset],
|
|
81
|
-
},
|
|
82
|
-
});
|
|
82
|
+
defaultOptions.panoramaVectorProperties.primitiveOptions.offset = [
|
|
83
|
+
0,
|
|
84
|
+
0,
|
|
85
|
+
this.cameraOffset,
|
|
86
|
+
];
|
|
87
|
+
this._panoramaVectorProperties = new VectorProperties(defaultOptions.panoramaVectorProperties);
|
|
88
|
+
if (options.panoramaVectorProperties) {
|
|
89
|
+
this._panoramaVectorProperties.setValues(options.panoramaVectorProperties);
|
|
90
|
+
}
|
|
83
91
|
this._supportedMaps.push(PanoramaMap.className);
|
|
84
92
|
}
|
|
85
93
|
async initialize() {
|
|
@@ -187,6 +195,18 @@ export default class PanoramaDatasetLayer extends VectorTileLayer {
|
|
|
187
195
|
if (config.zIndex === defaultOptions.zIndex) {
|
|
188
196
|
delete config.zIndex;
|
|
189
197
|
}
|
|
198
|
+
defaultOptions.panoramaVectorProperties.primitiveOptions.offset = [
|
|
199
|
+
0,
|
|
200
|
+
0,
|
|
201
|
+
this.cameraOffset,
|
|
202
|
+
];
|
|
203
|
+
const vectorPropertiesConfig = this._panoramaVectorProperties.getVcsMeta({
|
|
204
|
+
...VectorProperties.getDefaultOptions(),
|
|
205
|
+
...defaultOptions.panoramaVectorProperties,
|
|
206
|
+
});
|
|
207
|
+
if (Object.keys(vectorPropertiesConfig).length > 0) {
|
|
208
|
+
config.panoramaVectorProperties = vectorPropertiesConfig;
|
|
209
|
+
}
|
|
190
210
|
const thisDefaultStyle = getStyleOrDefaultStyle(defaultOptions.style);
|
|
191
211
|
if (this.style.equals(thisDefaultStyle)) {
|
|
192
212
|
delete config.style;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"panoramaDatasetLayer.js","sourceRoot":"","sources":["../../../src/layer/panoramaDatasetLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAEpE,OAAO,eAGN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,2BAA2B,MAAM,2CAA2C,CAAC;AAEpF,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"panoramaDatasetLayer.js","sourceRoot":"","sources":["../../../src/layer/panoramaDatasetLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import TileProvider
|
|
1
|
+
import TileProvider from './tileProvider.js';
|
|
2
2
|
import Projection, { getDefaultProjection, mercatorProjection, } from '../../util/projection.js';
|
|
3
3
|
import Extent from '../../util/extent.js';
|
|
4
4
|
import { tileProviderClassRegistry } from '../../classRegistry.js';
|
|
5
5
|
import { getOlFeatures, getRootNode, getValidReader, } from '../flatGeobufHelpers.js';
|
|
6
|
+
import { rectangleToMercatorExtent } from '../../util/math.js';
|
|
6
7
|
export default class FlatGeobufTileProvider extends TileProvider {
|
|
7
8
|
static get className() {
|
|
8
9
|
return 'FlatGeobufTileProvider';
|
|
@@ -45,7 +46,7 @@ export default class FlatGeobufTileProvider extends TileProvider {
|
|
|
45
46
|
}
|
|
46
47
|
async loader(x, y, z) {
|
|
47
48
|
const rectangle = this.tilingScheme.tileXYToRectangle(x, y, z);
|
|
48
|
-
const extent =
|
|
49
|
+
const extent = rectangleToMercatorExtent(rectangle);
|
|
49
50
|
const mercatorExtent = new Extent({
|
|
50
51
|
coordinates: extent,
|
|
51
52
|
projection: mercatorProjection,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatGeobufTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/flatGeobufTileProvider.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,
|
|
1
|
+
{"version":3,"file":"flatGeobufTileProvider.js","sourceRoot":"","sources":["../../../../src/layer/tileProvider/flatGeobufTileProvider.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAE7C,OAAO,UAAU,EAAE,EACjB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EACL,aAAa,EACb,WAAW,EACX,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAU/D,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,YAAY;IAC9D,MAAM,KAAK,SAAS;QAClB,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,YAAY,CAAC,iBAAiB,EAAE;YACnC,MAAM,EAAE,EAAE;YACV,UAAU,EAAE,SAAS;SACtB,CAAC;IACJ,CAAC;IAEO,OAAO,CAAoD;IAE3D,WAAW,CAAa;IAEhC,YAAY,OAAsC;QAChD,MAAM,cAAc,GAAG,sBAAsB,CAAC,iBAAiB,EAAE,CAAC;QAClE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9D,KAAK,CAAC,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;QAErD,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CACpB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CACjE,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU;YACnC,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC;YACpC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,KAAa;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACxB,WAAW,CAAC,MAAM,GAAG,MAAM,cAAc,CACvC,WAAW,CAAC,GAAG,EACf,IAAI,CAAC,WAAW,CACjB,CAAC;QACJ,CAAC;QAED,OAAO,WAAW,CAAC,MAAM,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;QAE3C,OAAO,IAAI,MAAM,CAAC;YAChB,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;YACzE,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;SACtC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC;YAChC,WAAW,EAAE,MAAM;YACnB,UAAU,EAAE,kBAAkB;SAC/B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QACpD,OAAO,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CACJ,cAAc,GAAG,sBAAsB,CAAC,iBAAiB,EAAE;QAE3D,MAAM,MAAM,GAA8D;YACxE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACpE,KAAK;gBACL,GAAG;aACJ,CAAC,CAAC;YACH,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC;SAChC,CAAC;QACF,OAAO,MAAM,CAAC,UAAU,CAAC;QACzB,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC,IAAI,EAAE,CAAC;YAC1D,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QAChD,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,yBAAyB,CAAC,aAAa,CACrC,sBAAsB,CAAC,SAAS,EAChC,sBAAsB,CACvB,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import MVT from 'ol/format/MVT.js';
|
|
2
2
|
import Feature from 'ol/Feature.js';
|
|
3
3
|
import { getCenter } from 'ol/extent.js';
|
|
4
|
-
import TileProvider
|
|
4
|
+
import TileProvider from './tileProvider.js';
|
|
5
5
|
import { getURL } from './urlTemplateTileProvider.js';
|
|
6
6
|
import { getInitForUrl, requestArrayBuffer } from '../../util/fetch.js';
|
|
7
7
|
import { tileProviderClassRegistry } from '../../classRegistry.js';
|
|
8
|
+
import { rectangleToMercatorExtent } from '../../util/math.js';
|
|
8
9
|
/**
|
|
9
10
|
* Loads the pbf tiles
|
|
10
11
|
*/
|
|
@@ -43,7 +44,7 @@ class MVTTileProvider extends TileProvider {
|
|
|
43
44
|
async loader(x, y, z, headers) {
|
|
44
45
|
const rectangle = this.tilingScheme.tileXYToRectangle(x, y, z);
|
|
45
46
|
const url = getURL(this.url, x, y, z, rectangle, this.locale);
|
|
46
|
-
const extent =
|
|
47
|
+
const extent = rectangleToMercatorExtent(rectangle);
|
|
47
48
|
const center = getCenter(extent);
|
|
48
49
|
const init = getInitForUrl(this.url, headers);
|
|
49
50
|
const data = await requestArrayBuffer(url, init);
|