@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,73 @@
|
|
|
1
|
+
import { is, oneOf } from '@vcsuite/check';
|
|
2
|
+
import AbstractAttributeProvider from './abstractAttributeProvider.js';
|
|
3
|
+
import { getInitForUrl, requestJson } from '../util/fetch.js';
|
|
4
|
+
export default class JsonAttributeProvider extends AbstractAttributeProvider {
|
|
5
|
+
static get className() {
|
|
6
|
+
return 'JsonAttributeProvider';
|
|
7
|
+
}
|
|
8
|
+
static getDefaultOptions() {
|
|
9
|
+
return {
|
|
10
|
+
...AbstractAttributeProvider.getDefaultOptions(),
|
|
11
|
+
data: '',
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
_data;
|
|
15
|
+
_dataOrUrl;
|
|
16
|
+
_headers;
|
|
17
|
+
constructor(options) {
|
|
18
|
+
super(options);
|
|
19
|
+
this._dataOrUrl = is(options.data, Object)
|
|
20
|
+
? structuredClone(options.data)
|
|
21
|
+
: options.data;
|
|
22
|
+
this._headers = options.headers;
|
|
23
|
+
}
|
|
24
|
+
async _loadData() {
|
|
25
|
+
if (this._data) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
let serializedData;
|
|
29
|
+
if (is(this._dataOrUrl, String)) {
|
|
30
|
+
const init = getInitForUrl(this._dataOrUrl, this._headers);
|
|
31
|
+
serializedData = await requestJson(this._dataOrUrl, init);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
serializedData = this._dataOrUrl;
|
|
35
|
+
}
|
|
36
|
+
const data = new Map();
|
|
37
|
+
if (Array.isArray(serializedData.features)) {
|
|
38
|
+
serializedData?.features?.forEach(({ id, properties }) => {
|
|
39
|
+
if (is(id, oneOf(String, Number)) && is(properties, Object)) {
|
|
40
|
+
data.set(String(id), properties);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
this._data = data;
|
|
45
|
+
}
|
|
46
|
+
async _getAttributes(key) {
|
|
47
|
+
await this._loadData();
|
|
48
|
+
return this._data?.get(key);
|
|
49
|
+
}
|
|
50
|
+
async _getBulkAttributes(bulk) {
|
|
51
|
+
await this._loadData();
|
|
52
|
+
return bulk.map(({ key }) => this._data?.get(key));
|
|
53
|
+
}
|
|
54
|
+
toJSON(defaultOptions = JsonAttributeProvider.getDefaultOptions()) {
|
|
55
|
+
const config = super.toJSON(defaultOptions);
|
|
56
|
+
if (is(this._dataOrUrl, Object)) {
|
|
57
|
+
config.data = structuredClone(this._dataOrUrl);
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
config.data = this._dataOrUrl;
|
|
61
|
+
}
|
|
62
|
+
if (this._headers) {
|
|
63
|
+
config.headers = structuredClone(this._headers);
|
|
64
|
+
}
|
|
65
|
+
return config;
|
|
66
|
+
}
|
|
67
|
+
destroy() {
|
|
68
|
+
this._data?.clear();
|
|
69
|
+
this._data = undefined;
|
|
70
|
+
super.destroy();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=jsonAttributeProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jsonAttributeProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/jsonAttributeProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,18 +2,16 @@ import type { Coordinate } from 'ol/coordinate.js';
|
|
|
2
2
|
import type { Feature } from 'ol/index.js';
|
|
3
3
|
import AbstractFeatureProvider, { type AbstractFeatureProviderOptions } from './abstractFeatureProvider.js';
|
|
4
4
|
import type TileProvider from '../layer/tileProvider/tileProvider.js';
|
|
5
|
+
import type Layer from '../layer/layer.js';
|
|
5
6
|
export type TileProviderFeatureProviderOptions = AbstractFeatureProviderOptions & {
|
|
6
7
|
tileProvider: TileProvider;
|
|
7
8
|
};
|
|
8
9
|
declare class TileProviderFeatureProvider extends AbstractFeatureProvider {
|
|
9
10
|
static get className(): string;
|
|
10
11
|
tileProvider: TileProvider;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
*/
|
|
15
|
-
constructor(layerName: string, options: TileProviderFeatureProviderOptions);
|
|
16
|
-
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, headers?: Record<string, string>): Promise<Feature[]>;
|
|
12
|
+
constructor(options: TileProviderFeatureProviderOptions);
|
|
13
|
+
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, layer: Layer): Promise<Feature[]>;
|
|
14
|
+
toJSON(defaultOptions?: AbstractFeatureProviderOptions): AbstractFeatureProviderOptions;
|
|
17
15
|
destroy(): void;
|
|
18
16
|
}
|
|
19
17
|
export default TileProviderFeatureProvider;
|
|
@@ -1,31 +1,29 @@
|
|
|
1
1
|
import AbstractFeatureProvider from './abstractFeatureProvider.js';
|
|
2
|
-
import { featureProviderClassRegistry } from '../classRegistry.js';
|
|
3
2
|
class TileProviderFeatureProvider extends AbstractFeatureProvider {
|
|
4
3
|
static get className() {
|
|
5
4
|
return 'TileProviderFeatureProvider';
|
|
6
5
|
}
|
|
7
6
|
tileProvider;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
* @param options
|
|
11
|
-
*/
|
|
12
|
-
constructor(layerName, options) {
|
|
13
|
-
super(layerName, options);
|
|
14
|
-
this.mapTypes = ['CesiumMap'];
|
|
7
|
+
constructor(options) {
|
|
8
|
+
super({ ...options, mapTypes: ['CesiumMap'] });
|
|
15
9
|
this.tileProvider = options.tileProvider;
|
|
16
10
|
}
|
|
17
|
-
async getFeaturesByCoordinate(coordinate, resolution,
|
|
18
|
-
const features = await this.tileProvider.getFeaturesByCoordinate(coordinate, resolution, headers);
|
|
11
|
+
async getFeaturesByCoordinate(coordinate, resolution, layer) {
|
|
12
|
+
const features = await this.tileProvider.getFeaturesByCoordinate(coordinate, resolution, layer.headers);
|
|
19
13
|
const checkShow = (feature) => this.style ? !!this.style.cesiumStyle.show.evaluate(feature) : true;
|
|
20
14
|
return features.filter((feature) => {
|
|
21
15
|
return (this.vectorProperties.getAllowPicking(feature) && checkShow(feature));
|
|
22
16
|
});
|
|
23
17
|
}
|
|
18
|
+
toJSON(defaultOptions = AbstractFeatureProvider.getDefaultOptions()) {
|
|
19
|
+
const options = super.toJSON(defaultOptions);
|
|
20
|
+
delete options.mapTypes;
|
|
21
|
+
return options;
|
|
22
|
+
}
|
|
24
23
|
destroy() {
|
|
25
24
|
this.tileProvider.destroy();
|
|
26
25
|
super.destroy();
|
|
27
26
|
}
|
|
28
27
|
}
|
|
29
28
|
export default TileProviderFeatureProvider;
|
|
30
|
-
featureProviderClassRegistry.registerClass(TileProviderFeatureProvider.className, TileProviderFeatureProvider);
|
|
31
29
|
//# sourceMappingURL=tileProviderFeatureProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tileProviderFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/tileProviderFeatureProvider.ts"],"names":[],"mappings":"AAEA,OAAO,uBAEN,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"tileProviderFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/tileProviderFeatureProvider.ts"],"names":[],"mappings":"AAEA,OAAO,uBAEN,MAAM,8BAA8B,CAAC;AAStC,MAAM,2BAA4B,SAAQ,uBAAuB;IAC/D,MAAM,KAAK,SAAS;QAClB,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,YAAY,CAAe;IAE3B,YAAY,OAA2C;QACrD,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAE/C,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,UAAsB,EACtB,UAAkB,EAClB,KAAY;QAEZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAC9D,UAAU,EACV,UAAU,EACV,KAAK,CAAC,OAAO,CACd,CAAC;QACF,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAW,EAAE,CAC9C,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YACjC,OAAO,CACL,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CACrE,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CACJ,iBAAiD,uBAAuB,CAAC,iBAAiB,EAAE;QAE5F,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC7C,OAAO,OAAO,CAAC,QAAQ,CAAC;QACxB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,2BAA2B,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import AbstractAttributeProvider from './abstractAttributeProvider.js';
|
|
2
|
+
import type { VcsObjectOptions } from '../vcsObject.js';
|
|
3
|
+
export type UrlIdAttributeProviderOptions = VcsObjectOptions & {
|
|
4
|
+
urlTemplate: string;
|
|
5
|
+
headers?: Record<string, string>;
|
|
6
|
+
};
|
|
7
|
+
/**
|
|
8
|
+
* Provides attributes for features by fetching data from a URL based on feature IDs.
|
|
9
|
+
* The URL template should contain a {id} placeholder that will be replaced with the encoded feature ID.
|
|
10
|
+
* urlTemplate: 'https://api.example.com/features/{id}'
|
|
11
|
+
* For a feature with ID "123", this would request: https://api.example.com/features/123
|
|
12
|
+
*
|
|
13
|
+
* The backend should return a JSON object with attribute key-value pairs.
|
|
14
|
+
* {
|
|
15
|
+
* "name": "Feature Name",
|
|
16
|
+
* "description": "Feature description",
|
|
17
|
+
* "value": 42
|
|
18
|
+
* }
|
|
19
|
+
* If the request fails or returns invalid data, the provider returns undefined.
|
|
20
|
+
*/
|
|
21
|
+
export default class UrlIdAttributeProvider extends AbstractAttributeProvider {
|
|
22
|
+
static get className(): string;
|
|
23
|
+
private _urlTemplate;
|
|
24
|
+
private _headers?;
|
|
25
|
+
constructor(options: UrlIdAttributeProviderOptions);
|
|
26
|
+
protected _getAttributes(id: string): Promise<Record<string, unknown> | undefined>;
|
|
27
|
+
toJSON(_defaultOptions?: UrlIdAttributeProviderOptions): UrlIdAttributeProviderOptions;
|
|
28
|
+
}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import AbstractAttributeProvider from './abstractAttributeProvider.js';
|
|
2
|
+
import { getInitForUrl, requestJson } from '../util/fetch.js';
|
|
3
|
+
import { featureProviderClassRegistry } from '../classRegistry.js';
|
|
4
|
+
/**
|
|
5
|
+
* Provides attributes for features by fetching data from a URL based on feature IDs.
|
|
6
|
+
* The URL template should contain a {id} placeholder that will be replaced with the encoded feature ID.
|
|
7
|
+
* urlTemplate: 'https://api.example.com/features/{id}'
|
|
8
|
+
* For a feature with ID "123", this would request: https://api.example.com/features/123
|
|
9
|
+
*
|
|
10
|
+
* The backend should return a JSON object with attribute key-value pairs.
|
|
11
|
+
* {
|
|
12
|
+
* "name": "Feature Name",
|
|
13
|
+
* "description": "Feature description",
|
|
14
|
+
* "value": 42
|
|
15
|
+
* }
|
|
16
|
+
* If the request fails or returns invalid data, the provider returns undefined.
|
|
17
|
+
*/
|
|
18
|
+
export default class UrlIdAttributeProvider extends AbstractAttributeProvider {
|
|
19
|
+
static get className() {
|
|
20
|
+
return 'UrlIdAttributeProvider';
|
|
21
|
+
}
|
|
22
|
+
_urlTemplate;
|
|
23
|
+
_headers;
|
|
24
|
+
constructor(options) {
|
|
25
|
+
super(options);
|
|
26
|
+
this._urlTemplate = options.urlTemplate;
|
|
27
|
+
this._headers = options.headers
|
|
28
|
+
? structuredClone(options.headers)
|
|
29
|
+
: undefined;
|
|
30
|
+
}
|
|
31
|
+
async _getAttributes(id) {
|
|
32
|
+
const url = this._urlTemplate.replace('{id}', encodeURIComponent(String(id)));
|
|
33
|
+
try {
|
|
34
|
+
return await requestJson(url, getInitForUrl(url, this._headers));
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
toJSON(_defaultOptions) {
|
|
41
|
+
const config = super.toJSON(_defaultOptions);
|
|
42
|
+
config.urlTemplate = this._urlTemplate;
|
|
43
|
+
if (this._headers) {
|
|
44
|
+
config.headers = structuredClone(this._headers);
|
|
45
|
+
}
|
|
46
|
+
return config;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
featureProviderClassRegistry.registerClass(UrlIdAttributeProvider.className, UrlIdAttributeProvider);
|
|
50
|
+
//# sourceMappingURL=urlIdAttributeProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"urlIdAttributeProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/urlIdAttributeProvider.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,MAAM,gCAAgC,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAOnE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,yBAAyB;IAC3E,MAAM,KAAK,SAAS;QAClB,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAEO,YAAY,CAAS;IAErB,QAAQ,CAAsC;IAEtD,YAAY,OAAsC;QAChD,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;QAExC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO;YAC7B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC;YAClC,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,cAAc,CAC5B,EAAU;QAEV,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CACnC,MAAM,EACN,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAC/B,CAAC;QAEF,IAAI,CAAC;YACH,OAAO,MAAM,WAAW,CACtB,GAAG,EACH,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAClC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEQ,MAAM,CACb,eAA+C;QAE/C,MAAM,MAAM,GAA2C,KAAK,CAAC,MAAM,CACjE,eAAe,CAChB,CAAC;QAEF,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;QAEvC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,CAAC,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,MAAuC,CAAC;IACjD,CAAC;CACF;AAED,4BAA4B,CAAC,aAAa,CACxC,sBAAsB,CAAC,SAAS,EAChC,sBAAsB,CACvB,CAAC"}
|
|
@@ -10,13 +10,14 @@ import type { Coordinate } from 'ol/coordinate.js';
|
|
|
10
10
|
import type { TileWMS } from 'ol/source.js';
|
|
11
11
|
import type FeatureFormat from 'ol/format/Feature.js';
|
|
12
12
|
import WMSGetFeatureInfo from 'ol/format/WMSGetFeatureInfo.js';
|
|
13
|
-
import type
|
|
13
|
+
import { type AbstractFeatureProviderOptions } from './abstractFeatureProvider.js';
|
|
14
14
|
import AbstractFeatureProvider from './abstractFeatureProvider.js';
|
|
15
15
|
import type { ProjectionOptions } from '../util/projection.js';
|
|
16
16
|
import Projection from '../util/projection.js';
|
|
17
17
|
import type { ExtentOptions } from '../util/extent.js';
|
|
18
18
|
import Extent from '../util/extent.js';
|
|
19
19
|
import { TilingScheme } from '../layer/rasterLayer.js';
|
|
20
|
+
import type Layer from '../layer/layer.js';
|
|
20
21
|
export type FormatOptions = GeoJSONOptions & GMLOptions & Record<string, unknown>;
|
|
21
22
|
export type WMSFeatureProviderOptions = AbstractFeatureProviderOptions & {
|
|
22
23
|
/**
|
|
@@ -64,6 +65,10 @@ export type WMSFeatureProviderOptions = AbstractFeatureProviderOptions & {
|
|
|
64
65
|
*/
|
|
65
66
|
version?: string;
|
|
66
67
|
htmlPositionFeatureTitle?: string;
|
|
68
|
+
/**
|
|
69
|
+
* Optional headers to include in GetFeatureInfo requests. Overrides layer headers.
|
|
70
|
+
*/
|
|
71
|
+
headers?: Record<string, string>;
|
|
67
72
|
};
|
|
68
73
|
declare const gmlFormats: {
|
|
69
74
|
GML: typeof GML3;
|
|
@@ -112,11 +117,15 @@ declare class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
112
117
|
*/
|
|
113
118
|
projection: Projection | undefined;
|
|
114
119
|
htmlPositionFeatureTitle?: string;
|
|
115
|
-
|
|
120
|
+
/**
|
|
121
|
+
* Optional headers to include in GetFeatureInfo requests.
|
|
122
|
+
*/
|
|
123
|
+
headers?: Record<string, string>;
|
|
124
|
+
constructor(options: WMSFeatureProviderOptions);
|
|
116
125
|
get wmsSource(): TileWMS;
|
|
117
126
|
set wmsSource(source: TileWMS);
|
|
118
127
|
featureResponseCallback(data: Document | Element | ArrayBuffer | any | string, coordinate: Coordinate): Feature[];
|
|
119
|
-
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number,
|
|
128
|
+
getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, layer: Layer): Promise<Feature[]>;
|
|
120
129
|
toJSON(defaultOptions?: WMSFeatureProviderOptions): WMSFeatureProviderOptions;
|
|
121
130
|
destroy(): void;
|
|
122
131
|
}
|
|
@@ -105,6 +105,7 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
105
105
|
tileSize: [256, 256],
|
|
106
106
|
parameters: {},
|
|
107
107
|
extent: undefined,
|
|
108
|
+
headers: undefined,
|
|
108
109
|
};
|
|
109
110
|
}
|
|
110
111
|
extent = null;
|
|
@@ -136,9 +137,13 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
136
137
|
*/
|
|
137
138
|
projection;
|
|
138
139
|
htmlPositionFeatureTitle;
|
|
139
|
-
|
|
140
|
+
/**
|
|
141
|
+
* Optional headers to include in GetFeatureInfo requests.
|
|
142
|
+
*/
|
|
143
|
+
headers;
|
|
144
|
+
constructor(options) {
|
|
140
145
|
const defaultOptions = WMSFeatureProvider.getDefaultOptions();
|
|
141
|
-
super(
|
|
146
|
+
super({ ...defaultOptions, ...options });
|
|
142
147
|
if (options.extent) {
|
|
143
148
|
if (options.extent instanceof Extent) {
|
|
144
149
|
this.extent = options.extent;
|
|
@@ -167,6 +172,9 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
167
172
|
? new Projection(options.projection)
|
|
168
173
|
: undefined;
|
|
169
174
|
this.htmlPositionFeatureTitle = options.htmlPositionFeatureTitle;
|
|
175
|
+
this.headers = options.headers
|
|
176
|
+
? structuredClone(options.headers)
|
|
177
|
+
: undefined;
|
|
170
178
|
}
|
|
171
179
|
get wmsSource() {
|
|
172
180
|
if (!this._wmsSource) {
|
|
@@ -208,7 +216,7 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
208
216
|
}
|
|
209
217
|
return [];
|
|
210
218
|
}
|
|
211
|
-
async getFeaturesByCoordinate(coordinate, resolution,
|
|
219
|
+
async getFeaturesByCoordinate(coordinate, resolution, layer) {
|
|
212
220
|
if (this.extent?.isValid() &&
|
|
213
221
|
!containsCoordinate(this.extent.getCoordinatesInProjection(mercatorProjection), coordinate)) {
|
|
214
222
|
return [];
|
|
@@ -228,10 +236,10 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
228
236
|
INFO_FORMAT: this.featureInfoResponseType,
|
|
229
237
|
});
|
|
230
238
|
if (this.featureInfoResponseType === 'text/html') {
|
|
231
|
-
return this.featureResponseCallback(null, coordinate).map((f) => this.getProviderFeature(f));
|
|
239
|
+
return this.featureResponseCallback(null, coordinate).map((f) => this.getProviderFeature(f, layer));
|
|
232
240
|
}
|
|
233
241
|
else if (url) {
|
|
234
|
-
const init = getInitForUrl(url, headers);
|
|
242
|
+
const init = getInitForUrl(url, this.headers ?? layer.headers);
|
|
235
243
|
let data;
|
|
236
244
|
try {
|
|
237
245
|
const response = await requestUrl(url, init);
|
|
@@ -241,7 +249,7 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
241
249
|
this.getLogger().error(`Failed fetching WMS FeatureInfo ${url}`);
|
|
242
250
|
return [];
|
|
243
251
|
}
|
|
244
|
-
return this.featureResponseCallback(data, coordinate).map((f) => this.getProviderFeature(f));
|
|
252
|
+
return this.featureResponseCallback(data, coordinate).map((f) => this.getProviderFeature(f, layer));
|
|
245
253
|
}
|
|
246
254
|
return [];
|
|
247
255
|
}
|
|
@@ -286,6 +294,9 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
|
|
|
286
294
|
if (this.htmlPositionFeatureTitle) {
|
|
287
295
|
config.htmlPositionFeatureTitle = this.htmlPositionFeatureTitle;
|
|
288
296
|
}
|
|
297
|
+
if (this.headers) {
|
|
298
|
+
config.headers = structuredClone(this.headers);
|
|
299
|
+
}
|
|
289
300
|
return config;
|
|
290
301
|
}
|
|
291
302
|
destroy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wmsFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/wmsFeatureProvider.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,mBAAmB,CAAC;AAErC,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,OAA2C,MAAM,sBAAsB,CAAC;AAC/E,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,YAAY,EAAmC,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAI7B,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,uBAAuB,MAAM,8BAA8B,CAAC;AAEnE,OAAO,UAAU,EAAE,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"wmsFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/wmsFeatureProvider.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,mBAAmB,CAAC;AAErC,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,OAA2C,MAAM,sBAAsB,CAAC;AAC/E,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,YAAY,EAAmC,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAI7B,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,uBAAuB,MAAM,8BAA8B,CAAC;AAEnE,OAAO,UAAU,EAAE,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AA2DvD,MAAM,UAAU,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AAEpD,MAAM,iBAAiB,GAAG;IACxB,OAAO;IACP,IAAI;IACJ,IAAI;IACJ,KAAK;IACL,iBAAiB;IACjB,GAAG;CACJ,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,qBAAqB;IACrB,kBAAkB;IAClB,0BAA0B;IAC1B,sBAAsB;CACvB,CAAC;AAEF,MAAM,UAAU,SAAS,CACvB,YAAoB,EACpB,UAAyB,EAAE,EAC3B,MAAuC,EACvC,YAAsC;IAEtC,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,MAAM,IAAI,iBAAiB,CAAC,EAAE,CAAC;YACnC,SAAS,CAAC,oBAAoB,CAAC,CAAC,KAAK,CACnC,6BAA6B,MAAM,EAAE,CACtC,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,aAAa,GAAG;YACpB,GAAG,OAAO;YACV,GAAG,CAAC,YAAY,IAAI,EAAE,SAAS,EAAE,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;SACnE,CAAC;QACF,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,IAAI,iBAAiB,CAAC,OAAmC,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;QAChC,IAAI,YAAY,IAAI,CAAC,CAAC,YAAY,IAAI,UAAU,CAAC,EAAE,CAAC;YAClD,SAAS,CAAC,oBAAoB,CAAC,CAAC,KAAK,CACnC,sBAAsB,YAAY,EAAE,CACrC,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,SAAS,GAAwB,IAAI,UAAU,CACnD,YAAY,IAAI,MAAM,CACvB,EAAE,CAAC;QACJ,OAAO,IAAI,GAAG,CAAC,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,YAAY,KAAK,yBAAyB,EAAE,CAAC;QAC/C,oGAAoG;QACpG,OAAO,IAAI,iBAAiB,CAAC,OAAmC,CAAC,CAAC;IACpE,CAAC;IACD,IACE,YAAY,KAAK,+BAA+B;QAChD,YAAY,KAAK,6BAA6B,EAC9C,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IACD,IACE,YAAY,KAAK,6BAA6B;QAC9C,YAAY,KAAK,4BAA4B,EAC7C,CAAC;QACD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,SAAS,8BAA8B,CAAC,UAAsB;IAC5D,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,eAAe,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;IAEnD,wFAAwF;IACxF,qEAAqE;IACrE,uEAAuE;IACvE,MAAM,wBAAwB,GAAG,MAAM,CAAC;IACxC,OAAO,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,kBAAmB,SAAQ,uBAAuB;IACtD,MAAM,KAAK,SAAS;QAClB,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,uBAAuB,CAAC,iBAAiB,EAAE;YAC9C,YAAY,EAAE,UAAU;YACxB,KAAK,EAAE,SAAS;YAChB,aAAa,EAAE,SAAS;YACxB,UAAU,EAAE,SAAS;YACrB,GAAG,EAAE,EAAE;YACP,YAAY,EAAE,YAAY,CAAC,UAAU;YACrC,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YACpB,UAAU,EAAE,EAAE;YACd,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,SAAS;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,GAAkB,IAAI,CAAC;IAErB,iBAAiB,CAAmB;IAE5C;;OAEG;IACK,UAAU,CAAsB;IAExC;;OAEG;IACH,uBAAuB,CAAS;IAEhC;;OAEG;IACH,iBAAiB,CAA6C;IAEtD,cAAc,CAA4B;IAElD;;;OAGG;IACH,YAAY,CAAsC;IAElD;;OAEG;IACH,aAAa,CAAuB;IAEpC;;OAEG;IACH,UAAU,CAAyB;IAEnC,wBAAwB,CAAU;IAElC;;OAEG;IACH,OAAO,CAA0B;IAEjC,YAAY,OAAkC;QAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,KAAK,CAAC,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,OAAO,CAAC,MAAM,YAAY,MAAM,EAAE,CAAC;gBACrC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,IAAI,CAAC,iBAAiB,GAAG;YACvB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,YAAY,EACV,OAAO,CAAC,YAAY,IAAK,cAAc,CAAC,YAA6B;YACvE,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC;YACjE,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC;YACjE,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAK,cAAc,CAAC,QAAiB;YAC/D,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO,EAAE,OAAO,CAAC,OAAO,IAAK,cAAc,CAAC,OAAkB;SAC/D,CAAC;QAEF,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvD,IAAI,CAAC,uBAAuB;YAC1B,OAAO,CAAC,YAAY,IAAK,cAAc,CAAC,YAAuB,CAAC;QAClE,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,IAAI,cAAc,CAAC,aAAa,CAAC;QAC5E,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,SAAS,CAC5B,IAAI,CAAC,uBAAuB,EAC5B,OAAO,CAAC,aAAa,EACrB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,YAAY,CAClB,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU;YAClC,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC;YACpC,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,CAAC;QACjE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO;YAC5B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC;YAClC,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAI,SAAS;QACX,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,SAAS,CAAC,MAAe;QAC3B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IAC3B,CAAC;IAED,uBAAuB;IACrB,wDAAwD;IACxD,gHAAgH;IAChH,IAAqD,EACrD,UAAsB;QAEtB,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,uBAAuB,KAAK,WAAW,EAAE,CAAC;gBACjD,QAAQ,GAAG,CAAC,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;YACrE,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,IAAI,CAAC,aAAc,CAAC,YAAY,CAAC,IAAI,EAAE;oBAChD,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;oBAClE,iBAAiB,EAAE,kBAAkB,CAAC,IAAI;iBAC3C,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CACtB,6GAA6G,CAC9G,CAAC;YACF,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;gBACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,UAAsB,EACtB,UAAkB,EAClB,KAAY;QAEZ,IACE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;YACtB,CAAC,kBAAkB,CACjB,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,kBAAkB,CAAC,EAC1D,UAAU,CACX,EACD,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,EAAkB,CAAC;QAClE,IAAI,MAAM,GAAG,UAAU,CAAC;QACxB,IAAI,GAAG,GAAG,UAAU,CAAC;QACrB,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,YAAY,CAAC,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACpE,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,UAAU,CAAC,QAAQ,EAAE,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,eAAe,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC;YAC/D,GAAG,GAAG,UAAU,GAAG,eAAe,CAAC;QACrC,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE;YACpE,WAAW,EAAE,IAAI,CAAC,uBAAuB;SAC1C,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,uBAAuB,KAAK,WAAW,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9D,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,KAAK,CAAC,CAClC,CAAC;QACJ,CAAC;aAAM,IAAI,GAAG,EAAE,CAAC;YACf,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;YAC/D,IAAI,IAAY,CAAC;YACjB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC7C,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC/B,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACZ,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAC;gBACjE,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9D,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,KAAK,CAAC,CAClC,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CACJ,cAAc,GAAG,kBAAkB,CAAC,iBAAiB,EAAE;QAEvD,MAAM,MAAM,GAAuC,KAAK,CAAC,MAAM,CAC7D,cAAc,CACf,CAAC;QAEF,IAAI,IAAI,CAAC,uBAAuB,KAAK,cAAc,CAAC,YAAY,EAAE,CAAC;YACjE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC;QACrD,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC1C,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,KAAK,cAAc,CAAC,aAAa,EAAE,CAAC;YACzD,MAAM,CAAC,aAAa,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAC/C,CAAC;QAED,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;QACxC,MAAM,CAAC,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;QAE7D,IAAI,IAAI,CAAC,iBAAiB,CAAC,YAAY,KAAK,cAAc,CAAC,YAAY,EAAE,CAAC;YACxE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC;QAC5D,CAAC;QACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,QAAQ,KAAK,cAAc,CAAC,QAAQ,EAAE,CAAC;YAChE,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;QACpD,CAAC;QACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,QAAQ,KAAK,cAAc,CAAC,QAAQ,EAAE,CAAC;YAChE,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;QACpD,CAAC;QACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,KAAK,cAAc,CAAC,OAAO,EAAE,CAAC;YAC9D,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;QAClD,CAAC;QACD,IACE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACpE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EACpE,CAAC;YACD,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC5D,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAClC,MAAM,CAAC,wBAAwB,GAAG,IAAI,CAAC,wBAAwB,CAAC;QAClE,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,MAAmC,CAAC;IAC7C,CAAC;IAED,OAAO;QACL,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,kBAAkB,CAAC;AAClC,4BAA4B,CAAC,aAAa,CACxC,kBAAkB,CAAC,SAAS,EAC5B,kBAAkB,CACnB,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import type { Scene, Cartesian2 } from '@vcmap-cesium/engine';
|
|
2
|
-
import
|
|
1
|
+
import type { Scene, Cartesian2, I3SNode } from '@vcmap-cesium/engine';
|
|
2
|
+
import { Cartesian3 } from '@vcmap-cesium/engine';
|
|
3
|
+
import Feature from 'ol/Feature.js';
|
|
3
4
|
import AbstractInteraction, { type EventFeature, type InteractionEvent } from './abstractInteraction.js';
|
|
4
5
|
import { EventType } from './interactionType.js';
|
|
5
|
-
import { vcsLayerName } from '../layer/layerSymbols.js';
|
|
6
|
+
import { i3sData, vcsLayerName } from '../layer/layerSymbols.js';
|
|
6
7
|
/**
|
|
7
8
|
* This is the return from cesium scene.pick and scene.drillPick, which returns "any". We cast to this type.
|
|
8
9
|
*/
|
|
@@ -18,6 +19,17 @@ type CesiumPickObject = {
|
|
|
18
19
|
olFeature?: Feature;
|
|
19
20
|
[vcsLayerName]?: string;
|
|
20
21
|
};
|
|
22
|
+
content?: {
|
|
23
|
+
tile?: {
|
|
24
|
+
i3sNode: I3SNode;
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
export declare function isI3SFeature(f: EventFeature): f is Feature & {
|
|
29
|
+
[i3sData]: {
|
|
30
|
+
i3sNode: I3SNode;
|
|
31
|
+
cartesianPosition?: Cartesian3;
|
|
32
|
+
};
|
|
21
33
|
};
|
|
22
34
|
export declare function getFeatureFromPickObject(object: CesiumPickObject): EventFeature | undefined;
|
|
23
35
|
export declare function getFeatureFromScene(scene: Scene, windowPosition: Cartesian2, hitTolerance: number): {
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import { Cartesian3, Cesium3DTileFeature, Cesium3DTilePointFeature, Entity, } from '@vcmap-cesium/engine';
|
|
2
|
+
import Feature from 'ol/Feature.js';
|
|
3
|
+
import { Point } from 'ol/geom.js';
|
|
4
|
+
import { v4 as uuid } from 'uuid';
|
|
2
5
|
import AbstractInteraction from './abstractInteraction.js';
|
|
3
6
|
import { EventType, ModificationKeyType, PointerKeyType, } from './interactionType.js';
|
|
4
|
-
import { allowPicking, vcsLayerName } from '../layer/layerSymbols.js';
|
|
7
|
+
import { allowPicking, i3sData, vcsLayerName } from '../layer/layerSymbols.js';
|
|
5
8
|
import { originalFeatureSymbol, primitives } from '../layer/vectorSymbols.js';
|
|
6
9
|
import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
|
|
7
10
|
import { cartesian3DDistance, cartesianToMercator } from '../util/math.js';
|
|
11
|
+
import { isProvidedFeature } from '../featureProvider/featureProviderSymbols.js';
|
|
8
12
|
function getFeatureFromOlMap(map, pixel, hitTolerance) {
|
|
9
13
|
let feature;
|
|
10
14
|
map.forEachFeatureAtPixel(pixel, (feat) => {
|
|
@@ -26,6 +30,9 @@ function getFeatureFromOlMap(map, pixel, hitTolerance) {
|
|
|
26
30
|
}, { hitTolerance });
|
|
27
31
|
return feature;
|
|
28
32
|
}
|
|
33
|
+
export function isI3SFeature(f) {
|
|
34
|
+
return !!(f != null && f[i3sData]);
|
|
35
|
+
}
|
|
29
36
|
export function getFeatureFromPickObject(object) {
|
|
30
37
|
let feature;
|
|
31
38
|
if (object.primitive && object.primitive.olFeature) {
|
|
@@ -57,6 +64,25 @@ export function getFeatureFromPickObject(object) {
|
|
|
57
64
|
// entity
|
|
58
65
|
feature = object.id;
|
|
59
66
|
}
|
|
67
|
+
else if (object.content?.tile?.i3sNode) {
|
|
68
|
+
// i3s feature
|
|
69
|
+
const dataProvider =
|
|
70
|
+
// @ts-expect-error eslint-disable-next-line no-underscore-dangle, @typescript-eslint/ban-ts-comment
|
|
71
|
+
// eslint-disable-next-line no-underscore-dangle
|
|
72
|
+
object.content.tile.i3sNode._dataProvider;
|
|
73
|
+
const layername = dataProvider[vcsLayerName];
|
|
74
|
+
if (object instanceof Cesium3DTileFeature) {
|
|
75
|
+
feature = object;
|
|
76
|
+
feature[vcsLayerName] = layername;
|
|
77
|
+
}
|
|
78
|
+
else if (dataProvider[allowPicking] !== false) {
|
|
79
|
+
feature = new Feature({});
|
|
80
|
+
feature.setId(uuid());
|
|
81
|
+
feature[vcsLayerName] = layername;
|
|
82
|
+
feature[i3sData] = { i3sNode: object.content.tile.i3sNode };
|
|
83
|
+
feature[isProvidedFeature] = true;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
60
86
|
return feature;
|
|
61
87
|
}
|
|
62
88
|
export function getFeatureFromScene(scene, windowPosition, hitTolerance) {
|
|
@@ -207,6 +233,13 @@ class FeatureAtPixelInteraction extends AbstractInteraction {
|
|
|
207
233
|
if (event.map.className === 'CesiumMap') {
|
|
208
234
|
event.position = cartesianToMercator(cartesianPosition);
|
|
209
235
|
event.positionOrPixel = event.position.slice();
|
|
236
|
+
if (feature instanceof Feature &&
|
|
237
|
+
feature[isProvidedFeature] &&
|
|
238
|
+
isI3SFeature(feature)) {
|
|
239
|
+
feature.setGeometry(new Point(event.position));
|
|
240
|
+
feature.set('olcs_altitudeMode', 'absolute');
|
|
241
|
+
feature[i3sData].cartesianPosition = cartesianPosition;
|
|
242
|
+
}
|
|
210
243
|
}
|
|
211
244
|
else {
|
|
212
245
|
const currentImage = event.map.currentPanoramaImage;
|
|
@@ -220,6 +253,13 @@ class FeatureAtPixelInteraction extends AbstractInteraction {
|
|
|
220
253
|
if (currentDistance == null || newDistance < currentDistance) {
|
|
221
254
|
event.position = newPosition;
|
|
222
255
|
event.positionOrPixel = event.position.slice();
|
|
256
|
+
if (feature instanceof Feature &&
|
|
257
|
+
feature[isProvidedFeature] &&
|
|
258
|
+
isI3SFeature(feature)) {
|
|
259
|
+
feature.setGeometry(new Point(event.position));
|
|
260
|
+
feature.set('olcs_altitudeMode', 'absolute');
|
|
261
|
+
feature[i3sData].cartesianPosition = cartesianPosition;
|
|
262
|
+
}
|
|
223
263
|
}
|
|
224
264
|
}
|
|
225
265
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureAtPixelInteraction.js","sourceRoot":"","sources":["../../../src/interaction/featureAtPixelInteraction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"featureAtPixelInteraction.js","sourceRoot":"","sources":["../../../src/interaction/featureAtPixelInteraction.ts"],"names":[],"mappings":"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"}
|