@vcmap/core 6.2.4 → 6.3.0-rc.2

package/dist/src/layer/vectorTileLayer.d.ts

@@ -17,6 +17,7 @@ import type StyleItem from '../style/styleItem.js';
 import VectorTileCesiumImpl from './cesium/vectorTileCesiumImpl.js';
 import VectorTilePanoramaImpl from './panorama/vectorTilePanoramaImpl.js';
 import type LayerImplementation from './layerImplementation.js';
+import { type AbstractAttributeProviderOptions, type AttributeProvider } from '../featureProvider/abstractAttributeProvider.js';
 declare const vectorTileRenderers: readonly ["image", "primitive"];
 export type VectorTileRenderer = (typeof vectorTileRenderers)[number];
 export type VectorTileOptions = FeatureLayerOptions & {
@@ -37,12 +38,16 @@ export type VectorTileOptions = FeatureLayerOptions & {
     declutter?: boolean;
     debug?: boolean;
     renderer?: VectorTileRenderer;
+    /**
+     * an optional attribute provider to provide custom attributes for the tileset features on load
+     */
+    attributeProvider?: AttributeProvider | AbstractAttributeProviderOptions;
 };
 export type VectorTileImplementationOptions = FeatureLayerImplementationOptions & {
     tileProvider: TileProvider;
     tileSize: Size;
-    minLevel: number;
-    maxLevel: number;
+    minLevel?: number;
+    maxLevel?: number;
     extent?: Extent;
     declutter: boolean;
     vectorProperties: VectorProperties;
@@ -66,8 +71,9 @@ declare class VectorTileLayer<I extends LayerImplementation<VcsMap> & FeatureLay
      */
     vectorProperties: VectorProperties;
     tileProvider: TileProvider;
-    private _maxLevel;
-    private _minLevel;
+    private _attributeProvider?;
+    private _maxLevel?;
+    private _minLevel?;
     private _declutter;
     private _featureVisibilityListeners;
     private _tileLoadEventListener;
@@ -78,6 +84,7 @@ declare class VectorTileLayer<I extends LayerImplementation<VcsMap> & FeatureLay
     private _styleZIndex;
     private _debug;
     private _renderer;
+    private _defaultFeatureProvider?;
     /**
      * @param  options
      */
@@ -89,6 +96,8 @@ declare class VectorTileLayer<I extends LayerImplementation<VcsMap> & FeatureLay
     set locale(value: string);
     get allowPicking(): boolean;
     set allowPicking(allowPicking: boolean);
+    get attributeProvider(): AttributeProvider | undefined;
+    set attributeProvider(provider: AttributeProvider | undefined);
     initialize(): Promise<void>;
     private _getNextStyleZIndex;
     private _handleTileLoaded;
@@ -112,7 +121,7 @@ declare class VectorTileLayer<I extends LayerImplementation<VcsMap> & FeatureLay
     getStyleOrDefaultStyle(styleOptions?: DeclarativeStyleItemOptions | VectorStyleItemOptions | StyleItem, defaultStyle?: VectorStyleItem): StyleItem;
     activate(): Promise<void>;
     deactivate(): void;
+    toJSON(defaultOptions?: VectorTileOptions): VectorTileOptions;
     destroy(): void;
-    toJSON(): VectorTileOptions;
 }
 export default VectorTileLayer;

package/dist/src/layer/vectorTileLayer.js

@@ -1,3 +1,4 @@
+import { check, is, maybe, oneOf } from '@vcsuite/check';
 import Style from 'ol/style/Style.js';
 import { parseBoolean, parseStringLiteral, parseInteger, } from '@vcsuite/parsers';
 import CesiumMap from '../map/cesiumMap.js';
@@ -18,6 +19,11 @@ import Extent from '../util/extent.js';
 import VectorTileCesiumImpl from './cesium/vectorTileCesiumImpl.js';
 import VectorTilePanoramaImpl from './panorama/vectorTilePanoramaImpl.js';
 import PanoramaMap from '../map/panoramaMap.js';
+import AbstractFeatureProvider from '../featureProvider/abstractFeatureProvider.js';
+import AbstractAttributeProvider from '../featureProvider/abstractAttributeProvider.js';
+import CompositeFeatureProvider from '../featureProvider/compositeFeatureProvider.js';
+import { rectangleToMercatorExtent } from '../util/math.js';
+import { getProviderForOption } from '../featureProvider/featureProviderFactory.js';
 /**
  * synchronizes featureVisibility Symbols on the feature;
  */
@@ -75,6 +81,7 @@ class VectorTileLayer extends FeatureLayer {
             declutter: true,
             debug: false,
             renderer: 'image',
+            attributeProvider: undefined,
         };
     }
     highlightStyle;
@@ -84,6 +91,7 @@ class VectorTileLayer extends FeatureLayer {
      */
     vectorProperties;
     tileProvider;
+    _attributeProvider;
     _maxLevel;
     _minLevel;
     _declutter;
@@ -98,13 +106,14 @@ class VectorTileLayer extends FeatureLayer {
     _styleZIndex = 0;
     _debug = false;
     _renderer;
+    _defaultFeatureProvider;
     /**
      * @param  options
      */
     constructor(options) {
-        super(options);
-        this._supportedMaps = [CesiumMap.className, OpenlayersMap.className];
         const defaultOptions = VectorTileLayer.getDefaultOptions();
+        super({ ...defaultOptions, ...options });
+        this._supportedMaps = [CesiumMap.className, OpenlayersMap.className];
         this.highlightStyle = undefined;
         if (options.highlightStyle) {
             this.highlightStyle =
@@ -128,6 +137,10 @@ class VectorTileLayer extends FeatureLayer {
         this._declutter = parseBoolean(options.declutter, defaultOptions.declutter);
         this._debug = parseBoolean(options.debug, defaultOptions.debug);
         this._renderer = parseStringLiteral(options.renderer, vectorTileRenderers, defaultOptions.renderer);
+        const attributeProvider = getProviderForOption(options.attributeProvider);
+        if (is(attributeProvider, oneOf(CompositeFeatureProvider, AbstractAttributeProvider))) {
+            this._attributeProvider = attributeProvider;
+        }
     }
     /**
      * returns the currently set locale. Can be used to provide locale specific URLs.
@@ -148,6 +161,18 @@ class VectorTileLayer extends FeatureLayer {
         super.allowPicking = allowPicking;
         this.vectorProperties.allowPicking = allowPicking;
     }
+    get attributeProvider() {
+        return this._attributeProvider;
+    }
+    set attributeProvider(provider) {
+        check(provider, maybe(oneOf(AbstractAttributeProvider, CompositeFeatureProvider)));
+        if (this._attributeProvider !== provider) {
+            this._attributeProvider = provider;
+            this.forceRedraw().catch((e) => {
+                this.getLogger().error(`Error forcing redraw after setting attribute provider: ${String(e)}`);
+            });
+        }
+    }
     async initialize() {
         if (!this.initialized) {
             this._tileLoadEventListener =
@@ -159,14 +184,24 @@ class VectorTileLayer extends FeatureLayer {
                     // eslint-disable-next-line no-void
                     void this.reload();
                 });
-            if (this._renderer === 'image') {
-                // primitives dont need a feature provider
-                this.featureProvider = new TileProviderFeatureProvider(this.name, {
-                    // XXX this overwrites
+            if (this._renderer === 'image' &&
+                !(this.featureProvider instanceof AbstractFeatureProvider)) {
+                const defaultFeatureProvider = new TileProviderFeatureProvider({
                     style: this.style,
                     tileProvider: this.tileProvider,
                     vectorProperties: this.vectorProperties,
                 });
+                if (this.featureProvider instanceof AbstractAttributeProvider) {
+                    const attributeProvider = this.featureProvider;
+                    this._defaultFeatureProvider = new CompositeFeatureProvider({
+                        featureProviders: [defaultFeatureProvider],
+                        attributeProviders: [attributeProvider],
+                    });
+                }
+                else {
+                    this._defaultFeatureProvider = defaultFeatureProvider;
+                }
+                this.featureProvider = this._defaultFeatureProvider;
             }
         }
         await super.initialize();
@@ -175,11 +210,9 @@ class VectorTileLayer extends FeatureLayer {
         this._styleZIndex += 1;
         return this._styleZIndex;
     }
-    _handleTileLoaded({ rtree }) {
-        rtree
-            .all()
-            .map((item) => item.value)
-            .forEach((feature) => {
+    _handleTileLoaded({ rtree, tileId }) {
+        const features = rtree.all().map((item) => {
+            const feature = item.value;
             const featureStyle = feature.getStyle();
             if (featureStyle && featureStyle instanceof Style) {
                 featureStyle.setZIndex(this._getNextStyleZIndex());
@@ -191,7 +224,17 @@ class VectorTileLayer extends FeatureLayer {
             if (this.tileProvider.trackFeaturesToTiles && this.globalHider) {
                 synchronizeFeatureVisibility(this.featureVisibility, this.globalHider, feature);
             }
+            return feature;
         });
+        if (this._attributeProvider) {
+            const { x, y, level } = this.tileProvider.parseCacheKey(tileId);
+            const rectangle = this.tileProvider.tilingScheme.tileXYToRectangle(x, y, level);
+            this._attributeProvider
+                .augmentFeatures(features, rectangleToMercatorExtent(rectangle))
+                .catch((error) => {
+                this.getLogger().error(`Error augmenting features: ${String(error)}`);
+            });
+        }
     }
     setGlobalHider(globalHider) {
         super.setGlobalHider(globalHider);
@@ -354,26 +397,8 @@ class VectorTileLayer extends FeatureLayer {
             cb();
         });
     }
-    destroy() {
-        this._featureVisibilityListeners.forEach((cb) => {
-            cb();
-        });
-        super.destroy();
-        this._tileLoadEventListener();
-        if (this.featureProvider) {
-            this.featureProvider.destroy();
-        }
-        if (this.tileProvider) {
-            this.tileProvider.destroy();
-        }
-        this._vectorPropertiesChangedListener();
-        if (this.vectorProperties) {
-            this.vectorProperties.destroy();
-        }
-    }
-    toJSON() {
-        const config = super.toJSON();
-        const defaultOptions = VectorTileLayer.getDefaultOptions();
+    toJSON(defaultOptions = VectorTileLayer.getDefaultOptions()) {
+        const config = super.toJSON(defaultOptions);
         if (this._maxLevel !== defaultOptions.maxLevel) {
             config.maxLevel = this._maxLevel;
         }
@@ -399,8 +424,34 @@ class VectorTileLayer extends FeatureLayer {
         if (this._debug !== defaultOptions.debug) {
             config.debug = this._debug;
         }
+        if (this.featureProvider === this._defaultFeatureProvider) {
+            delete config.featureProvider;
+            if (this.featureProvider instanceof CompositeFeatureProvider) {
+                const { attributeProviders } = this.featureProvider.toJSON();
+                config.featureProvider = attributeProviders[0];
+            }
+        }
+        if (this._attributeProvider) {
+            config.attributeProvider = this._attributeProvider.toJSON();
+        }
         return config;
     }
+    destroy() {
+        this._featureVisibilityListeners.forEach((cb) => {
+            cb();
+        });
+        this.attributeProvider?.destroy();
+        this._defaultFeatureProvider?.destroy();
+        super.destroy();
+        this._tileLoadEventListener();
+        if (this.tileProvider) {
+            this.tileProvider.destroy();
+        }
+        this._vectorPropertiesChangedListener();
+        if (this.vectorProperties) {
+            this.vectorProperties.destroy();
+        }
+    }
 }
 layerClassRegistry.registerClass(VectorTileLayer.className, VectorTileLayer);
 export default VectorTileLayer;

package/dist/src/layer/vectorTileLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"vectorTileLayer.js","sourceRoot":"","sources":["../../../src/layer/vectorTileLayer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vectorTileLayer.js","sourceRoot":"","sources":["../../../src/layer/vectorTileLayer.ts"],"names":[],"mappings":"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"}

package/dist/src/layer/wfsLayer.d.ts

@@ -41,6 +41,6 @@ declare class WFSLayer extends VectorLayer {
      */
     fetchData(): Promise<void>;
     private _parseWFSData;
-    toJSON(): WFSOptions;
+    toJSON(defaultOptions?: WFSOptions): WFSOptions;
 }
 export default WFSLayer;

package/dist/src/layer/wfsLayer.js

@@ -25,6 +25,7 @@ class WFSLayer extends VectorLayer {
             featurePrefix: '',
             getFeatureOptions: {},
             version: undefined,
+            ignoreMapLayerTypes: false,
         };
     }
     constructor(options) {
@@ -32,7 +33,8 @@ class WFSLayer extends VectorLayer {
         proj.alias = [
             `http://www.opengis.net/gml/srs/epsg.xml#${proj.epsg.match(/\d+/)?.[0]}`,
         ];
-        super({ ...options, projection: proj });
+        const defaultOptions = WFSLayer.getDefaultOptions();
+        super({ ...defaultOptions, ...options, projection: proj });
         this.featureType = Array.isArray(options.featureType)
             ? options.featureType
             : [options.featureType];
@@ -112,9 +114,8 @@ class WFSLayer extends VectorLayer {
         const features = this.wfsFormat.readFeatures(obj);
         this.addFeatures(features);
     }
-    toJSON() {
-        const config = super.toJSON();
-        const defaultOptions = WFSLayer.getDefaultOptions();
+    toJSON(defaultOptions = WFSLayer.getDefaultOptions()) {
+        const config = super.toJSON(defaultOptions);
         config.featureType = this.featureType.slice();
         config.featureNS = this.featureNS;
         config.featurePrefix = this.featurePrefix;

package/dist/src/layer/wfsLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"wfsLayer.js","sourceRoot":"","sources":["../../../src/layer/wfsLayer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wfsLayer.js","sourceRoot":"","sources":["../../../src/layer/wfsLayer.ts"],"names":[],"mappings":"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"}

package/dist/src/layer/wmsLayer.d.ts

@@ -28,6 +28,8 @@ export type WMSOptions = RasterLayerOptions & {
     parameters?: Record<string, string> | string;
     /**
      * whether this layer should send getFeatureInfo requests to the service when objects are clicked.
+     * do not provide this option AND a feature provider. this option will configure a
+     * layer specific WMSFeatureProvider. providing an attribute provider will create a composite feature provider.
      */
     featureInfo?: Partial<WMSFeatureProviderOptions>;
     /**
@@ -56,6 +58,7 @@ declare class WMSLayer extends RasterLayer<WmsCesiumImpl | WmsOpenlayersImpl> {
     highResolution: boolean;
     singleImage2d: boolean;
     private _featureInfoOptions;
+    private _attributeProvider?;
     /**
      * @param  options
      */
@@ -77,6 +80,6 @@ declare class WMSLayer extends RasterLayer<WmsCesiumImpl | WmsOpenlayersImpl> {
      * Returns the currently active layers
      */
     getLayers(): string[];
-    toJSON(): WMSOptions;
+    toJSON(defaultOptions?: WMSOptions): WMSOptions;
 }
 export default WMSLayer;

package/dist/src/layer/wmsLayer.js

@@ -8,6 +8,8 @@ import OpenlayersMap from '../map/openlayersMap.js';
 import WmsOpenlayersImpl from './openlayers/wmsOpenlayersImpl.js';
 import Extent from '../util/extent.js';
 import { layerClassRegistry } from '../classRegistry.js';
+import AbstractAttributeProvider from '../featureProvider/abstractAttributeProvider.js';
+import CompositeFeatureProvider from '../featureProvider/compositeFeatureProvider.js';
 /**
  * WmsLayer layer for Cesium and OpenlayersMap
  * @group Layer
@@ -34,12 +36,13 @@ class WMSLayer extends RasterLayer {
     highResolution;
     singleImage2d;
     _featureInfoOptions;
+    _attributeProvider;
     /**
      * @param  options
      */
     constructor(options) {
-        super(options);
         const defaultOptions = WMSLayer.getDefaultOptions();
+        super({ ...defaultOptions, ...options });
         this.version = options.version || defaultOptions.version;
         this.parameters = {};
         if (options.parameters) {
@@ -70,6 +73,9 @@ class WMSLayer extends RasterLayer {
             options.featureInfo || defaultOptions.featureInfo;
         this._supportedMaps = [CesiumMap.className, OpenlayersMap.className];
         this.singleImage2d = parseBoolean(options.singleImage2d, defaultOptions.singleImage2d);
+        if (this.featureProvider instanceof AbstractAttributeProvider) {
+            this._attributeProvider = this.featureProvider;
+        }
     }
     initialize() {
         if (!this.initialized) {
@@ -91,9 +97,19 @@ class WMSLayer extends RasterLayer {
                 extent: this.extent,
                 parameters: this.parameters,
                 version: this.version,
+                headers: this.headers,
                 ...this._featureInfoOptions,
             };
-            this.featureProvider = new WMSFeatureProvider(this.name, options);
+            const wmsFeatureProvider = new WMSFeatureProvider(options);
+            if (this._attributeProvider) {
+                this.featureProvider = new CompositeFeatureProvider({
+                    featureProviders: [wmsFeatureProvider],
+                    attributeProviders: [this._attributeProvider],
+                });
+            }
+            else {
+                this.featureProvider = wmsFeatureProvider;
+            }
         }
     }
     async reload() {
@@ -138,9 +154,8 @@ class WMSLayer extends RasterLayer {
     getLayers() {
         return this.parameters.LAYERS ? this.parameters.LAYERS.split(',') : [];
     }
-    toJSON() {
-        const config = super.toJSON();
-        const defaultOptions = WMSLayer.getDefaultOptions();
+    toJSON(defaultOptions = WMSLayer.getDefaultOptions()) {
+        const config = super.toJSON(defaultOptions);
         if (this.parameters.LAYERS) {
             config.layers = this.parameters.LAYERS;
         }
@@ -171,39 +186,53 @@ class WMSLayer extends RasterLayer {
         if (this.singleImage2d !== defaultOptions.singleImage2d) {
             config.singleImage2d = this.singleImage2d;
         }
-        if (this.featureProvider &&
-            this.featureProvider instanceof WMSFeatureProvider) {
-            const featureInfoConfig = this.featureProvider.toJSON();
-            if (this.tileSize[0] === featureInfoConfig?.tileSize?.[0] ||
-                this.tileSize[1] === featureInfoConfig?.tileSize?.[1]) {
-                delete featureInfoConfig.tileSize;
-            }
-            if (Object.entries(this.parameters).every(([key, value]) => featureInfoConfig?.parameters?.[key] === value)) {
-                delete featureInfoConfig.parameters;
-            }
-            if (featureInfoConfig.extent &&
-                new Extent(featureInfoConfig.extent).equals(this.extent)) {
-                delete featureInfoConfig.extent;
-            }
-            if (this.url === featureInfoConfig.url) {
-                delete featureInfoConfig.url;
-            }
-            if (this.tilingSchema === featureInfoConfig.tilingSchema) {
-                delete featureInfoConfig.tilingSchema;
-            }
-            if (this.version === featureInfoConfig.version) {
-                delete featureInfoConfig.version;
-            }
-            if (this.minLevel === featureInfoConfig.minLevel) {
-                delete featureInfoConfig.minLevel;
+        if (this._featureInfoOptions) {
+            delete config.featureProvider;
+            if (this.featureProvider) {
+                let featureInfoConfig;
+                if (this._attributeProvider) {
+                    const compositeInfo = this.featureProvider.toJSON();
+                    featureInfoConfig = compositeInfo.featureProviders[0];
+                    config.featureProvider = this._attributeProvider.toJSON();
+                }
+                else {
+                    featureInfoConfig = this.featureProvider.toJSON();
+                }
+                if (this.tileSize[0] === featureInfoConfig?.tileSize?.[0] ||
+                    this.tileSize[1] === featureInfoConfig?.tileSize?.[1]) {
+                    delete featureInfoConfig.tileSize;
+                }
+                if (Object.entries(this.parameters).every(([key, value]) => featureInfoConfig?.parameters?.[key] === value)) {
+                    delete featureInfoConfig.parameters;
+                }
+                if (featureInfoConfig.extent &&
+                    new Extent(featureInfoConfig.extent).equals(this.extent)) {
+                    delete featureInfoConfig.extent;
+                }
+                if (this.url === featureInfoConfig.url) {
+                    delete featureInfoConfig.url;
+                }
+                if (this.tilingSchema === featureInfoConfig.tilingSchema) {
+                    delete featureInfoConfig.tilingSchema;
+                }
+                if (this.version === featureInfoConfig.version) {
+                    delete featureInfoConfig.version;
+                }
+                if (this.minLevel === featureInfoConfig.minLevel) {
+                    delete featureInfoConfig.minLevel;
+                }
+                if (this.maxLevel === featureInfoConfig.maxLevel) {
+                    delete featureInfoConfig.maxLevel;
+                }
+                if (this._featureInfoOptions) {
+                    delete featureInfoConfig.name;
+                    delete featureInfoConfig.type;
+                }
+                config.featureInfo = featureInfoConfig;
             }
-            if (this.maxLevel === featureInfoConfig.maxLevel) {
-                delete featureInfoConfig.maxLevel;
+            else {
+                config.featureInfo = this._featureInfoOptions;
             }
-            config.featureInfo = featureInfoConfig;
-        }
-        else if (this._featureInfoOptions) {
-            config.featureInfo = this._featureInfoOptions;
         }
         return config;
     }

package/dist/src/layer/wmsLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"wmsLayer.js","sourceRoot":"","sources":["../../../src/layer/wmsLayer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wmsLayer.js","sourceRoot":"","sources":["../../../src/layer/wmsLayer.ts"],"names":[],"mappings":"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"}

package/dist/src/layer/wmtsLayer.d.ts

@@ -47,6 +47,6 @@ declare class WMTSLayer extends RasterLayer<WmtsCesiumImpl | WmtsOpenlayersImpl>
     constructor(options: WMTSOptions);
     getImplementationOptions(): WMTSImplementationOptions;
     createImplementationsForMap(map: VcsMap): (WmtsOpenlayersImpl | WmtsCesiumImpl)[];
-    toJSON(): WMTSOptions;
+    toJSON(defaultOptions?: WMTSOptions): WMTSOptions;
 }
 export default WMTSLayer;

package/dist/src/layer/wmtsLayer.js

@@ -54,7 +54,7 @@ class WMTSLayer extends RasterLayer {
     tileSize;
     constructor(options) {
         const defaultOptions = WMTSLayer.getDefaultOptions();
-        super({ tilingSchema: defaultOptions.tilingSchema, ...options });
+        super({ ...defaultOptions, ...options });
         this._supportedMaps = [OpenlayersMap.className, CesiumMap.className];
         this.numberOfLevelZeroTilesX = parseInteger(options.numberOfLevelZeroTilesX, defaultOptions.numberOfLevelZeroTilesX);
         this.numberOfLevelZeroTilesY = parseInteger(options.numberOfLevelZeroTilesY, defaultOptions.numberOfLevelZeroTilesY);
@@ -95,15 +95,8 @@ class WMTSLayer extends RasterLayer {
         }
         return [];
     }
-    toJSON() {
-        const config = super.toJSON();
-        const defaultOptions = WMTSLayer.getDefaultOptions();
-        if (this.tilingSchema !== defaultOptions.tilingSchema) {
-            config.tilingSchema = this.tilingSchema;
-        }
-        else {
-            delete config.tilingSchema;
-        }
+    toJSON(defaultOptions = WMTSLayer.getDefaultOptions()) {
+        const config = super.toJSON(defaultOptions);
         if (this.numberOfLevelZeroTilesX !== defaultOptions.numberOfLevelZeroTilesX) {
             config.numberOfLevelZeroTilesX = this.numberOfLevelZeroTilesX;
         }