@vcmap/core 6.3.0-rc.1 → 6.3.0-rc.2

package/dist/src/vcsModuleHelpers.js

@@ -1,6 +1,7 @@
 import { getLogger as getLoggerByName } from '@vcsuite/logger';
 import Viewpoint from './util/viewpoint.js';
 import { getObjectFromClassRegistry } from './classRegistry.js';
+import CompositeFeatureProvider from './featureProvider/compositeFeatureProvider.js';
 function getLogger() {
     return getLoggerByName('init');
 }
@@ -19,6 +20,26 @@ export function deserializeViewpoint(viewpointObject) {
     getLogger().warning(`Viewpoint ${String(viewpointObject.name)} is not valid`);
     return null;
 }
+export function deserializeFeatureProvider(vcsApp, options) {
+    if (options.type === CompositeFeatureProvider.className) {
+        const { featureProviders: featureProviderOptions, attributeProviders: attributeProviderOptions, } = options;
+        const featureProviders = featureProviderOptions
+            .map((fpConfig) => deserializeFeatureProvider(vcsApp, fpConfig))
+            .filter((fp) => !!fp);
+        const attributeProviders = attributeProviderOptions
+            .map((apConfig) => deserializeFeatureProvider(vcsApp, apConfig))
+            .filter((ap) => !!ap);
+        return new CompositeFeatureProvider({
+            ...options,
+            featureProviders,
+            attributeProviders,
+        });
+    }
+    if (options.type) {
+        return getObjectFromClassRegistry(vcsApp.featureProviderClassRegistry, options);
+    }
+    return null;
+}
 export function deserializeLayer(vcsApp, layerConfig) {
     let style;
     if (layerConfig.style) {
@@ -42,9 +63,13 @@ export function deserializeLayer(vcsApp, layerConfig) {
     if (layerConfig.tileProvider) {
         tileProvider = getObjectFromClassRegistry(vcsApp.tileProviderClassRegistry, layerConfig.tileProvider);
     }
+    let attributeProvider;
+    if (layerConfig.attributeProvider) {
+        attributeProvider = deserializeFeatureProvider(vcsApp, layerConfig.attributeProvider);
+    }
     let featureProvider;
     if (layerConfig.featureProvider) {
-        featureProvider = getObjectFromClassRegistry(vcsApp.featureProviderClassRegistry, layerConfig.featureProvider);
+        featureProvider = deserializeFeatureProvider(vcsApp, layerConfig.featureProvider);
     }
     return getObjectFromClassRegistry(vcsApp.layerClassRegistry, {
         ...layerConfig,
@@ -52,6 +77,7 @@ export function deserializeLayer(vcsApp, layerConfig) {
         highlightStyle,
         tileProvider,
         featureProvider,
+        attributeProvider,
     });
 }
 export function serializeLayer(vcsApp, layer) {

package/dist/src/vcsModuleHelpers.js.map

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

package/dist/tests/unit/helpers/cesiumHelpers.js

@@ -264,7 +264,7 @@ export function setupCesiumContextLimits() {
 }
 class BatchTable {
     constructor(properties) {
-        this.properties = properties;
+        this.properties = properties ?? {};
         this.color = new Color();
         this.show = true;
         this.destroyed = false;
@@ -275,6 +275,12 @@ class BatchTable {
     getProperty(id, prop) {
         return this.properties[prop];
     }
+    setProperty(id, prop, value) {
+        this.properties[prop] = value;
+    }
+    hasProperty(id, prop) {
+        return this.properties[prop] !== undefined;
+    }
     getColor() {
         return this.color;
     }

package/dist/tests/unit/helpers/cesiumHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"cesiumHelpers.js","sourceRoot":"","sources":["../../../../tests/unit/helpers/cesiumHelpers.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"cesiumHelpers.js","sourceRoot":"","sources":["../../../../tests/unit/helpers/cesiumHelpers.js"],"names":[],"mappings":"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"}

package/index.ts

@@ -30,12 +30,34 @@ export {
 } from './src/classRegistry.js';
 export type { AbstractFeatureProviderOptions } from './src/featureProvider/abstractFeatureProvider.js';
 export { default as AbstractFeatureProvider } from './src/featureProvider/abstractFeatureProvider.js';
+export {
+  default as AbstractAttributeProvider,
+  type AttributeProvider,
+  type AbstractAttributeProviderOptions,
+} from './src/featureProvider/abstractAttributeProvider.js';
+export {
+  default as CompositeFeatureProvider,
+  type CompositeFeatureProviderOptions,
+} from './src/featureProvider/compositeFeatureProvider.js';
+export {
+  default as CsvAttributeProvider,
+  type CsvAttributeProviderOptions,
+} from './src/featureProvider/csvAttributeProvider.js';
 export {
   isProvidedFeature,
   isProvidedClusterFeature,
 } from './src/featureProvider/featureProviderSymbols.js';
+export {
+  default as JSONAttributeProvider,
+  type JsonAttributeProviderOptions,
+  type JsonAttributeData,
+} from './src/featureProvider/jsonAttributeProvider.js';
 export type { TileProviderFeatureProviderOptions } from './src/featureProvider/tileProviderFeatureProvider.js';
 export { default as TileProviderFeatureProvider } from './src/featureProvider/tileProviderFeatureProvider.js';
+export {
+  default as UrlIdAttributeProvider,
+  type UrlIdAttributeProviderOptions,
+} from './src/featureProvider/urlIdAttributeProvider.js';
 export type {
   FormatOptions,
   WMSFeatureProviderOptions,
@@ -70,6 +92,7 @@ export {
 } from './src/layer/cesium/cesiumTilesetCesiumImpl.js';
 export { default as COGCesiumImpl } from './src/layer/cesium/cogCesiumImpl.js';
 export { default as DataSourceCesiumImpl } from './src/layer/cesium/dataSourceCesiumImpl.js';
+export { default as I3SCesiumImpl } from './src/layer/cesium/i3sCesiumImpl.js';
 export { default as OpenStreetMapCesiumImpl } from './src/layer/cesium/openStreetMapCesiumImpl.js';
 export { default as RasterLayerCesiumImpl } from './src/layer/cesium/rasterLayerCesiumImpl.js';
 export { default as SingleImageCesiumImpl } from './src/layer/cesium/singleImageCesiumImpl.js';
@@ -221,6 +244,8 @@ export { default as WmsOpenlayersImpl } from './src/layer/openlayers/wmsOpenlaye
 export { default as WmtsOpenlayersImpl } from './src/layer/openlayers/wmtsOpenlayersImpl.js';
 export type { PointCloudOptions } from './src/layer/pointCloudLayer.js';
 export { default as PointCloudLayer } from './src/layer/pointCloudLayer.js';
+export type { I3SOptions } from './src/layer/i3sLayer.js';
+export { default as I3SLayer } from './src/layer/i3sLayer.js';
 export type {
   RasterLayerOptions,
   RasterLayerImplementation,
@@ -757,6 +782,7 @@ export {
   requestUrl,
   requestJson,
   requestArrayBuffer,
+  getInitForUrl,
 } from './src/util/fetch.js';
 export {
   getFlatCoordinatesFromSimpleGeometry,
@@ -849,6 +875,7 @@ export type { ModuleLayerOptions } from './src/vcsModuleHelpers.js';
 export {
   deserializeMap,
   deserializeViewpoint,
+  deserializeFeatureProvider,
   deserializeLayer,
   serializeLayer,
   getLayerIndex,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "6.3.0-rc.1",
+  "version": "6.3.0-rc.2",
   "description": "",
   "main": "dist/index.js",
   "type": "module",
@@ -76,7 +76,7 @@
   },
   "prettier": "@vcsuite/eslint-config/prettier.js",
   "dependencies": {
-    "@vcsuite/check": "^3.0.0",
+    "@vcsuite/check": "^3.2.2",
     "@vcsuite/logger": "^1.0.1",
     "@vcsuite/parsers": "^2.0.0",
     "fast-deep-equal": "^3.1.3",

package/src/cesium/cesium.d.ts

@@ -21,6 +21,7 @@ import type {
 import type { isTiledFeature } from '../layer/featureStoreLayer.js';
 import type { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
 import { scaleSymbol } from '../layer/vectorSymbols.js';
+import { attributeProviderName } from '../featureProvider/abstractAttributeProvider.js';
 
 declare module '@vcmap-cesium/engine' {
   enum TextureWarp {
@@ -105,6 +106,7 @@ declare module '@vcmap-cesium/engine' {
     [hidden]?: boolean;
     [highlighted]?: VectorStyleItem;
     [originalStyle]?: StyleLike | Color;
+    [attributeProviderName]?: string;
   }
 
   interface Primitive {
@@ -172,8 +174,14 @@ declare module '@vcmap-cesium/engine' {
     [vcsLayerName]?: string;
   }
 
+  interface I3SDataProvider {
+    [vcsLayerName]?: string;
+    [allowPicking]?: boolean;
+  }
+
   interface Cesium3DTile {
     boundingVolume: TileBoundingVolume;
+    contentBoundingVolume: TileBoundingVolume;
     contentReady: boolean;
     [cesiumTilesetLastUpdated]?: number;
   }
@@ -209,6 +217,7 @@ declare module '@vcmap-cesium/engine' {
     _batchId: number;
     getId(): number | string;
     getAttributes(): Record<string, unknown>;
+    setAttribute(key: string, value: unknown): void;
     [vcsLayerName]?: string;
     [globalHidden]?: boolean;
     [hidden]?: boolean;
@@ -216,6 +225,7 @@ declare module '@vcmap-cesium/engine' {
     [originalStyle]?: StyleLike | Color;
     [isTiledFeature]?: boolean;
     [allowPicking]?: boolean;
+    [attributeProviderName]?: string;
   }
 
   interface Cesium3DTilePointFeature {
@@ -223,12 +233,14 @@ declare module '@vcmap-cesium/engine' {
     _batchId: number;
     getId(): number | string;
     getAttributes(): Record<string, unknown>;
+    setAttribute(key: string, value: unknown): void;
     [vcsLayerName]?: string;
     [globalHidden]?: boolean;
     [hidden]?: boolean;
     [highlighted]?: VectorStyleItem;
     [originalStyle]?: StyleLike | Color;
     [allowPicking]?: boolean;
+    [attributeProviderName]?: string;
   }
 
   interface Cesium3DTileStyle {

package/src/cesium/cesium3DTileFeature.ts

@@ -7,14 +7,16 @@ Cesium3DTileFeature.prototype.getId = function getId(
   return (
     (this.getProperty('id') as string | number) ||
     `${this.content.url}${String(this._batchId)}`
-  ); // XXX there is a new property `featureId` on the Cesium3DTileset. this may cause issues when picking b3dm.
+  );
 };
 
 export function getAttributes(
   this: Cesium3DTileFeature | Cesium3DTilePointFeature,
 ): Record<string, unknown> {
   if (
-    (this.tileset.asset as { version: string } | undefined)?.version === '1.1'
+    (this.tileset.asset as { version: string } | undefined)?.version ===
+      '1.1' ||
+    !this.hasProperty('attributes')
   ) {
     const attributes: Record<string, unknown> = {};
     this.getPropertyIds().forEach((id) => {
@@ -22,7 +24,27 @@ export function getAttributes(
     });
     return attributes;
   }
-  return this.getProperty('attributes') as Record<string, unknown>;
+  return (this.getProperty('attributes') as Record<string, unknown>) ?? {};
 }
 
 Cesium3DTileFeature.prototype.getAttributes = getAttributes;
+
+export function setAttribute(
+  this: Cesium3DTileFeature | Cesium3DTilePointFeature,
+  key: string,
+  value: unknown,
+): void {
+  if (
+    (this.tileset.asset as { version: string } | undefined)?.version ===
+      '1.1' ||
+    !this.hasProperty('attributes')
+  ) {
+    this.setProperty(key, value);
+  }
+  const attributes =
+    (this.getProperty('attributes') as Record<string, unknown>) ?? {};
+  attributes[key] = value;
+  this.setProperty('attributes', attributes);
+}
+
+Cesium3DTileFeature.prototype.setAttribute = setAttribute;

package/src/cesium/cesium3DTilePointFeature.ts

@@ -1,5 +1,5 @@
 import { Cesium3DTilePointFeature } from '@vcmap-cesium/engine';
-import { getAttributes } from './cesium3DTileFeature.js';
+import { getAttributes, setAttribute } from './cesium3DTileFeature.js';
 
 Cesium3DTilePointFeature.prototype.getId = function getId(
   this: Cesium3DTilePointFeature,
@@ -11,3 +11,5 @@ Cesium3DTilePointFeature.prototype.getId = function getId(
 };
 
 Cesium3DTilePointFeature.prototype.getAttributes = getAttributes;
+
+Cesium3DTilePointFeature.prototype.setAttribute = setAttribute;

package/src/classRegistry.ts

@@ -7,6 +7,7 @@ import type VcsMap from './map/vcsMap.js';
 import type StyleItem from './style/styleItem.js';
 import type Category from './category/category.js';
 import type AbstractFeatureProvider from './featureProvider/abstractFeatureProvider.js';
+import type AbstractAttributeProvider from './featureProvider/abstractAttributeProvider.js';
 import type TileProvider from './layer/tileProvider/tileProvider.js';
 
 function logger(): Logger {
@@ -102,9 +103,13 @@ export const tileProviderClassRegistry = new ClassRegistry<
   typeof TileProvider
 >();
 
-export const featureProviderClassRegistry = new ClassRegistry<
-  typeof AbstractFeatureProvider
->();
+export type FeatureProviderClass =
+  | ({ new (): AbstractFeatureProvider } & typeof AbstractFeatureProvider)
+  | ({
+      new (): AbstractAttributeProvider;
+    } & typeof AbstractAttributeProvider);
+export const featureProviderClassRegistry =
+  new ClassRegistry<FeatureProviderClass>();
 
 export const mapClassRegistry = new ClassRegistry<typeof VcsMap>();
 

package/src/featureProvider/abstractAttributeProvider.ts

@@ -0,0 +1,201 @@
+import Feature from 'ol/Feature.js';
+import type { Extent } from 'ol/extent.js';
+import { v4 as uuid } from 'uuid';
+import { is, oneOf } from '@vcsuite/check';
+import {
+  Cesium3DTileFeature,
+  Cesium3DTilePointFeature,
+  Entity,
+} from '@vcmap-cesium/engine';
+import VcsObject, { type VcsObjectOptions } from '../vcsObject.js';
+import type { EventFeature } from '../interaction/abstractInteraction.js';
+import { featureExists } from '../layer/featureVisibility.js';
+
+export type AbstractAttributeProviderOptions = VcsObjectOptions & {
+  keyProperty?: string;
+};
+
+export const attributeProviderName = Symbol('attributeProvider');
+
+export interface AttributeProvider extends VcsObject {
+  /**
+   * Augments a feature with attributes from the provider
+   * @param feature
+   */
+  augmentFeature(feature: EventFeature): Promise<void>;
+  /**
+   * Augments multiple features with attributes from the provider
+   * @param features
+   * @param extent - optional extent in webmercator to limit attribute lookup on certain providers.
+   */
+  augmentFeatures(features: EventFeature[], extent?: Extent): Promise<void>;
+}
+
+export default abstract class AbstractAttributeProvider
+  extends VcsObject
+  implements AttributeProvider
+{
+  static get className(): string {
+    return 'AbstractAttributeProvider';
+  }
+
+  static getDefaultOptions(): AbstractAttributeProviderOptions {
+    return {
+      ...VcsObject.getDefaultOptions(),
+      keyProperty: undefined,
+    };
+  }
+
+  private _id = uuid();
+
+  keyProperty?: string;
+
+  constructor(options: AbstractAttributeProviderOptions) {
+    super(options);
+
+    this.keyProperty = options.keyProperty;
+  }
+
+  private _setAttributesOnFeature(
+    feature: EventFeature,
+    attributes: Record<string, unknown>,
+  ): void {
+    if (feature instanceof Feature) {
+      feature.setProperties(attributes, true);
+      feature.changed();
+    } else if (
+      feature instanceof Cesium3DTileFeature ||
+      feature instanceof Cesium3DTilePointFeature
+    ) {
+      if (featureExists(feature)) {
+        for (const key of Object.keys(attributes)) {
+          feature.setAttribute(key, attributes[key]);
+        }
+      }
+
+      feature[attributeProviderName] = this._id;
+    } else if (feature instanceof Entity) {
+      for (const key of Object.keys(attributes)) {
+        feature.properties?.addProperty(key, attributes[key]);
+      }
+      feature[attributeProviderName] = this._id;
+    }
+  }
+
+  private _getKeyForFeature(feature: EventFeature): string | undefined {
+    let key: unknown;
+    if (this.keyProperty) {
+      key = feature.getProperty(this.keyProperty) as unknown;
+    } else {
+      key = feature.getId();
+    }
+
+    if (is(key, oneOf(String, Number))) {
+      return String(key);
+    }
+    return undefined;
+  }
+
+  /**
+   * Retrieves attributes for a given key and feature.
+   * Be sure not to use the feature id for lookup, but the provided key.
+   * @param key - the key to retrieve attributes for
+   * @param feature - the feature requesting the attributes
+   * @protected
+   */
+  protected abstract _getAttributes(
+    key: string,
+    feature: EventFeature,
+  ): Promise<Record<string, unknown> | undefined>;
+
+  /**
+   * Optional bulk attribute retrieval for multiple keys.
+   * Can be implemented for optimal loading of data.
+   * Provides a webmercator extent to limit the lookup if needed.
+   * You MUST return a same length array as keys, with undefined for missing attributes.
+   * @param bulk - array of key and feature pairs to retrieve attributes for
+   * @param _extent - optional extent in webmercator to limit attribute lookup on certain providers.
+   * @protected
+   */
+  protected _getBulkAttributes(
+    bulk: { key: string; feature: EventFeature }[],
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _extent?: Extent,
+  ): Promise<(Record<string, unknown> | undefined)[]> {
+    return Promise.all(
+      bulk.map(({ key, feature }) => this._getAttributes(key, feature)),
+    );
+  }
+
+  /**
+   * Augments a feature with attributes from the provider
+   * @param feature
+   */
+  async augmentFeature(feature: EventFeature): Promise<void> {
+    if (feature[attributeProviderName] !== this._id) {
+      const key = this._getKeyForFeature(feature);
+      if (key) {
+        const attributes = await this._getAttributes(key, feature);
+        if (attributes) {
+          this._setAttributesOnFeature(feature, attributes);
+        }
+      }
+    }
+    feature[attributeProviderName] = this._id;
+  }
+
+  /**
+   * Augments multiple features with attributes from the provider
+   * @param features
+   * @param extent - optional extent in webmercator to limit attribute lookup on certain providers.
+   */
+  async augmentFeatures(
+    features: EventFeature[],
+    extent?: Extent,
+  ): Promise<void> {
+    const bulk = features
+      .map((feature) => {
+        if (feature[attributeProviderName] !== this._id) {
+          const key = this._getKeyForFeature(feature);
+          if (key) {
+            return { key, feature };
+          }
+        }
+        feature[attributeProviderName] = this._id;
+        return undefined;
+      })
+      .filter((i) => !!i);
+
+    if (bulk.length === 0) {
+      return;
+    }
+
+    const attributes = await this._getBulkAttributes(bulk, extent);
+    if (attributes.length !== bulk.length) {
+      this.getLogger().error(
+        `Bulk attribute retrieval returned ${attributes.length} results for ${bulk.length} features.`,
+      );
+      return;
+    }
+
+    for (let i = 0; i < bulk.length; i++) {
+      const attr = attributes[i];
+      if (attr) {
+        this._setAttributesOnFeature(bulk[i].feature, attr);
+      }
+    }
+  }
+
+  toJSON(
+    defaultOptions = AbstractAttributeProvider.getDefaultOptions(),
+  ): AbstractAttributeProviderOptions {
+    const config = super.toJSON(
+      defaultOptions,
+    ) as AbstractAttributeProviderOptions;
+
+    if (this.keyProperty !== defaultOptions.keyProperty) {
+      config.keyProperty = this.keyProperty;
+    }
+    return config;
+  }
+}