@vcmap/core 5.0.0-rc.2 → 5.0.0-rc.22

package/src/{vcs/vcm/layer/cesium/vectorCesium.js → layer/cesium/vectorCesiumImpl.js}

@@ -5,18 +5,16 @@ import convert from '../../util/featureconverter/convert.js';
 import VectorContext from './vectorContext.js';
 import { vcsLayerName } from '../layerSymbols.js';
 import LayerImplementation from '../layerImplementation.js';
-import { getGlobalHider } from '../globalHider.js';
 import { synchronizeFeatureVisibilityWithSource } from '../vectorHelpers.js';
 
 /**
  * represents a specific vector layer for cesium.
  * @class
- * @export
  * @extends {LayerImplementation<import("@vcmap/core").CesiumMap>}}
  * @implements {FeatureLayerImplementation}
  */
-class VectorCesium extends LayerImplementation {
-  static get className() { return 'vcs.vcm.layer.cesium.VectorCesium'; }
+class VectorCesiumImpl extends LayerImplementation {
+  static get className() { return 'VectorCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -72,7 +70,8 @@ class VectorCesium extends LayerImplementation {
      * @private
      */
     this._scene = null;
-    this.globalHider = getGlobalHider();
+    /** @type {import("@vcmap/core").GlobalHider} */
+    this.globalHider = options.globalHider;
   }
 
   /**
@@ -116,9 +115,9 @@ class VectorCesium extends LayerImplementation {
   async initialize() {
     if (!this.initialized) {
       this._scene = this.map.getScene();
-      await this._setupContext(this.map);
       this._addListeners();
       this._addFeatures(this.source.getFeatures());
+      await this._setupContext(this.map);
     }
     await super.initialize();
   }
@@ -252,4 +251,4 @@ class VectorCesium extends LayerImplementation {
   }
 }
 
-export default VectorCesium;
+export default VectorCesiumImpl;

package/src/{vcs/vcm/layer/cesium/vectorRasterTileCesium.js → layer/cesium/vectorRasterTileCesiumImpl.js}

@@ -1,18 +1,17 @@
 import { ImageryLayer as CesiumImageryLayer, Rectangle } from '@vcmap/cesium';
 import VectorTileImageryProvider from './vectorTileImageryProvider.js';
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 
 /**
  * represents a rasterized tiled vector layer implementation for cesium.
  * @class
- * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  * @implements {VectorTileImplementation}
  */
-class VectorRasterTileCesium extends RasterLayerCesium {
+class VectorRasterTileCesiumImpl extends RasterLayerCesiumImpl {
   static get className() {
-    return 'vcs.vcm.layer.cesium.VectorRasterTileCesium';
+    return 'VectorRasterTileCesiumImpl';
   }
 
   /**
@@ -113,4 +112,4 @@ class VectorRasterTileCesium extends RasterLayerCesium {
   }
 }
 
-export default VectorRasterTileCesium;
+export default VectorRasterTileCesiumImpl;

package/src/{vcs/vcm/layer → layer}/cesium/vectorTileImageryProvider.js

@@ -2,7 +2,7 @@ import { Event as CesiumEvent, Rectangle, Math as CesiumMath } from '@vcmap/cesi
 import { compose, create as createTransform, scale as scaleTransform } from 'ol/transform.js';
 import { rectangleToExtent } from '../tileProvider/tileProvider.js';
 import { wgs84ToMercatorTransformer } from '../../util/projection.js';
-import CanvasTileRenderer from '../../../../ol/render/canvas/canvasTileRenderer.js';
+import CanvasTileRenderer from '../../ol/render/canvas/canvasTileRenderer.js';
 
 /**
  * @param {import("ol/extent").Extent} extent
@@ -64,7 +64,6 @@ export function getCanvasFromFeatures(features, extent, center, tileSize) {
 /**
  * implementation of Cesium ImageryProvider Interface
  * @class
- * @export
  */
 class VectorTileImageryProvider {
   /**

package/src/{vcs/vcm/layer/cesium/wmsCesium.js → layer/cesium/wmsCesiumImpl.js}

@@ -1,16 +1,15 @@
 import { ImageryLayer as CesiumImageryLayer, Rectangle, WebMercatorTilingScheme, WebMapServiceImageryProvider } from '@vcmap/cesium';
 
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 
 /**
- * represents a specific Cesium WMSCesium Layer class.
+ * represents a specific Cesium WmsCesiumImpl Layer class.
  * @class
- * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  */
-class WMSCesium extends RasterLayerCesium {
-  static get className() { return 'vcs.vcm.layer.cesium.WMSCesium'; }
+class WmsCesiumImpl extends RasterLayerCesiumImpl {
+  static get className() { return 'WmsCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -68,4 +67,4 @@ class WMSCesium extends RasterLayerCesium {
   }
 }
 
-export default WMSCesium;
+export default WmsCesiumImpl;

package/src/{vcs/vcm/layer/cesium/wmtsCesium.js → layer/cesium/wmtsCesiumImpl.js}

@@ -1,16 +1,15 @@
 import { Rectangle, WebMapTileServiceImageryProvider, ImageryLayer as CesiumImageryLayer } from '@vcmap/cesium';
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 import { getTilingScheme } from '../rasterLayer.js';
 
 /**
- * represents a specific WMTS Implementation for {@link CesiumMap}.
+ * represents a specific WmtsLayer Implementation for {@link CesiumMap}.
  * @class
- * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  */
-class WMTSCesium extends RasterLayerCesium {
-  static get className() { return 'vcs.vcm.layer.cesium.WMTSCesium'; }
+class WmtsCesiumImpl extends RasterLayerCesiumImpl {
+  static get className() { return 'WmtsCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -98,4 +97,4 @@ class WMTSCesium extends RasterLayerCesium {
   }
 }
 
-export default WMTSCesium;
+export default WmtsCesiumImpl;

package/src/{vcs/vcm/layer → layer}/cesium/x3dmHelper.js

@@ -3,7 +3,7 @@
  * @returns {Object}
  */
 export default function getJSONObjectFromObject(feature) {
-  const properties = feature.getPropertyNames();
+  const properties = feature.getPropertyIds();
   const JSONObject = {};
   for (let i = 0; i < properties.length; i++) {
     JSONObject[properties[i]] = feature.getProperty(properties[i]);

package/src/{vcs/vcm/layer/cesiumTileset.js → layer/cesiumTilesetLayer.js}

@@ -1,18 +1,17 @@
-import { ImagerySplitDirection, Matrix4 } from '@vcmap/cesium';
+import { SplitDirection, Matrix4 } from '@vcmap/cesium';
 
 import { checkMaybe } from '@vcsuite/check';
 import { parseInteger } from '@vcsuite/parsers';
 import getJSONObjectFromObject from './cesium/x3dmHelper.js';
-import VectorStyleItem from '../util/style/vectorStyleItem.js';
+import VectorStyleItem from '../style/vectorStyleItem.js';
 import FeatureLayer from './featureLayer.js';
-import CesiumTilesetCesium, { getExtentFromTileset } from './cesium/cesiumTilesetCesium.js';
-import CesiumMap from '../maps/cesium.js';
-import VcsEvent from '../event/vcsEvent.js';
+import CesiumTilesetCesiumImpl, { getExtentFromTileset } from './cesium/cesiumTilesetCesiumImpl.js';
+import CesiumMap from '../map/cesiumMap.js';
+import VcsEvent from '../vcsEvent.js';
 import Extent from '../util/extent.js';
 import { mercatorProjection } from '../util/projection.js';
 import { isMobile } from '../util/isMobile.js';
-import { referenceableStyleSymbol } from '../util/style/styleItem.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import { layerClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {LayerOptions} CesiumTilesetOptions
@@ -37,7 +36,7 @@ import { VcsClassRegistry } from '../classRegistry.js';
 /**
  * @typedef {FeatureLayerImplementationOptions} CesiumTilesetImplementationOptions
  * @property {Object|undefined} tilesetOptions
- * @property {import("@vcmap/cesium").ImagerySplitDirection} splitDirection
+ * @property {import("@vcmap/cesium").SplitDirection} splitDirection
  * @property {Array<CesiumTilesetTilesetProperties>|undefined} tilesetProperties
  * @property {import("@vcmap/cesium").Matrix4|undefined} modelMatrix
  * @property {import("ol/coordinate").Coordinate|undefined} offset
@@ -50,11 +49,10 @@ import { VcsClassRegistry } from '../classRegistry.js';
  * @extends {FeatureLayer}
  * @implements {SplitLayer}
  * @api stable
- * @export
  */
-class CesiumTileset extends FeatureLayer {
+class CesiumTilesetLayer extends FeatureLayer {
   /** @type {string} */
-  static get className() { return 'vcs.vcm.layer.CesiumTileset'; }
+  static get className() { return 'CesiumTilesetLayer'; }
 
   /**
    * @returns {CesiumTilesetOptions}
@@ -80,7 +78,7 @@ class CesiumTileset extends FeatureLayer {
     this._supportedMaps = [
       CesiumMap.className,
     ];
-    const defaultOptions = CesiumTileset.getDefaultOptions();
+    const defaultOptions = CesiumTilesetLayer.getDefaultOptions();
     if (this.url && !/\.json$/.test(this.url)) {
       this.url = `${this.url.replace(/\/$/, '')}/tileset.json`;
     }
@@ -111,18 +109,18 @@ class CesiumTileset extends FeatureLayer {
       ...tilesetOptions,
     };
 
-    /** @type {import("@vcmap/cesium").ImagerySplitDirection} */
-    this._splitDirection = ImagerySplitDirection.NONE;
+    /** @type {import("@vcmap/cesium").SplitDirection} */
+    this._splitDirection = SplitDirection.NONE;
 
     if (options.splitDirection) {
       this._splitDirection = options.splitDirection === 'left' ?
-        ImagerySplitDirection.LEFT :
-        ImagerySplitDirection.RIGHT;
+        SplitDirection.LEFT :
+        SplitDirection.RIGHT;
     }
 
     /**
      * raised if the split direction changes, is passed the split direction as its only argument
-     * @type {VcsEvent<import("@vcmap/cesium").ImagerySplitDirection>}
+     * @type {VcsEvent<import("@vcmap/cesium").SplitDirection>}
      * @api
      */
     this.splitDirectionChanged = new VcsEvent();
@@ -158,7 +156,7 @@ class CesiumTileset extends FeatureLayer {
 
     this._modelMatrix = modelMatrix;
     this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */ (impl) => {
+      .forEach(/** @param {CesiumTilesetCesiumImpl} impl */ (impl) => {
         impl.updateModelMatrix(modelMatrix);
       });
   }
@@ -182,24 +180,24 @@ class CesiumTileset extends FeatureLayer {
 
     this._offset = offset;
     this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */ (impl) => {
+      .forEach(/** @param {CesiumTilesetCesiumImpl} impl */ (impl) => {
         impl.updateOffset(offset);
       });
   }
 
   /**
    * @api
-   * @type {import("@vcmap/cesium").ImagerySplitDirection}
+   * @type {import("@vcmap/cesium").SplitDirection}
    */
   get splitDirection() { return this._splitDirection; }
 
   /**
-   * @param {import("@vcmap/cesium").ImagerySplitDirection} direction
+   * @param {import("@vcmap/cesium").SplitDirection} direction
    */
   set splitDirection(direction) {
     if (direction !== this._splitDirection) {
       this.getImplementations().forEach((impl) => {
-        /** @type {CesiumTilesetCesium} */ (impl).updateSplitDirection(direction);
+        /** @type {CesiumTilesetCesiumImpl} */ (impl).updateSplitDirection(direction);
       });
       this._splitDirection = direction;
       this.splitDirectionChanged.raiseEvent(this._splitDirection);
@@ -223,11 +221,11 @@ class CesiumTileset extends FeatureLayer {
   /**
    * @inheritDoc
    * @param {import("@vcmap/core").VcsMap} map
-   * @returns {Array<CesiumTilesetCesium>}
+   * @returns {Array<CesiumTilesetCesiumImpl>}
    */
   createImplementationsForMap(map) {
     if (map instanceof CesiumMap) {
-      return [new CesiumTilesetCesium(map, this.getImplementationOptions())];
+      return [new CesiumTilesetCesiumImpl(map, this.getImplementationOptions())];
     }
     return [];
   }
@@ -261,12 +259,12 @@ class CesiumTileset extends FeatureLayer {
     if (metaExtent) {
       return metaExtent;
     }
-    const impl = /** @type {CesiumTilesetCesium} */ (this.getImplementations()[0]);
+    const impl = /** @type {CesiumTilesetCesiumImpl} */ (this.getImplementations()[0]);
     if (impl) {
       const threeDimExtent = getExtentFromTileset(impl.cesium3DTileset);
 
       const actualExtent = new Extent({
-        ...mercatorProjection.toJSON(),
+        projection: mercatorProjection.toJSON(),
         coordinates: threeDimExtent,
       });
 
@@ -299,7 +297,7 @@ class CesiumTileset extends FeatureLayer {
    */
   setMaximumScreenSpaceError(value) {
     this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */(impl) => {
+      .forEach(/** @param {CesiumTilesetCesiumImpl} impl */(impl) => {
         if (impl.cesium3DTileset) {
           impl.cesium3DTileset.maximumScreenSpaceError = value;
         }
@@ -312,11 +310,9 @@ class CesiumTileset extends FeatureLayer {
   toJSON() {
     /** @type {CesiumTilesetOptions} */
     const config = super.toJSON();
-    const defaultOptions = CesiumTileset.getDefaultOptions();
+    const defaultOptions = CesiumTilesetLayer.getDefaultOptions();
     if (this.highlightStyle) {
-      config.highlightStyle = this.highlightStyle[referenceableStyleSymbol] ?
-        this.highlightStyle.getReference() :
-        this.highlightStyle.getOptions();
+      config.highlightStyle = this.highlightStyle.toJSON();
     }
 
     if (this.screenSpaceError !== defaultOptions.screenSpaceError) {
@@ -349,8 +345,8 @@ class CesiumTileset extends FeatureLayer {
       config.tilesetOptions = tilesetOptions;
     }
 
-    if (this._splitDirection !== ImagerySplitDirection.NONE) {
-      config.splitDirection = this._splitDirection === ImagerySplitDirection.RIGHT ?
+    if (this._splitDirection !== SplitDirection.NONE) {
+      config.splitDirection = this._splitDirection === SplitDirection.RIGHT ?
         'right' :
         'left';
     }
@@ -372,5 +368,5 @@ class CesiumTileset extends FeatureLayer {
   }
 }
 
-VcsClassRegistry.registerClass(CesiumTileset.className, CesiumTileset);
-export default CesiumTileset;
+layerClassRegistry.registerClass(CesiumTilesetLayer.className, CesiumTilesetLayer);
+export default CesiumTilesetLayer;

package/src/{vcs/vcm/layer/czml.js → layer/czmlLayer.js}

@@ -1,8 +1,8 @@
 import { CzmlDataSource } from '@vcmap/cesium';
 
-import DataSource from './dataSource.js';
+import DataSourceLayer from './dataSourceLayer.js';
 import { vcsLayerName } from './layerSymbols.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import { layerClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {DataSourceOptions} CzmlOptions
@@ -12,18 +12,17 @@ import { VcsClassRegistry } from '../classRegistry.js';
 
 /**
  * @class
- * @export
- * @extends {DataSource}
+ * @extends {DataSourceLayer}
  */
-class Czml extends DataSource {
-  static get className() { return 'vcs.vcm.layer.Czml'; }
+class CzmlLayer extends DataSourceLayer {
+  static get className() { return 'CzmlLayer'; }
 
   /**
    * @returns {CzmlOptions}
    */
   static getDefaultOptions() {
     return {
-      ...DataSource.getDefaultOptions(),
+      ...DataSourceLayer.getDefaultOptions(),
       sourceUri: undefined,
     };
   }
@@ -36,7 +35,7 @@ class Czml extends DataSource {
     this.dataSource = new CzmlDataSource();
     this.entities = this.dataSource.entities;
 
-    const defaultOptions = Czml.getDefaultOptions();
+    const defaultOptions = CzmlLayer.getDefaultOptions();
     /** @type {string|null} */
     this.sourceUri = options.sourceUri || defaultOptions.sourceUri;
     /** @type {Function} */
@@ -44,7 +43,7 @@ class Czml extends DataSource {
     /** @type {Function} */
     this._loadedReject = () => {};
     /**
-     * A Promise resolving with the DataSource on load
+     * A Promise resolving with the DataSourceLayer on load
      * @type {Promise<void>}
      * @api stable
      */
@@ -77,11 +76,9 @@ class Czml extends DataSource {
    * @private
    */
   async _loadData() {
-    const loaded = /** @type {import("@vcmap/cesium").CzmlDataSource} */ (this.dataSource)
+    await /** @type {import("@vcmap/cesium").CzmlDataSource} */ (this.dataSource)
       .load(this.url, this.sourceUri ? { sourceUri: this.sourceUri } : undefined);
-    await new Promise((resolve, reject) => {
-      loaded.then(resolve, reject);
-    });
+
     this.entities.values.forEach((entity) => {
       entity[vcsLayerName] = this.name;
     });
@@ -137,5 +134,5 @@ class Czml extends DataSource {
   }
 }
 
-VcsClassRegistry.registerClass(Czml.className, Czml);
-export default Czml;
+layerClassRegistry.registerClass(CzmlLayer.className, CzmlLayer);
+export default CzmlLayer;

package/src/{vcs/vcm/layer/dataSource.js → layer/dataSourceLayer.js}

@@ -1,11 +1,10 @@
 import { EntityCollection } from '@vcmap/cesium';
 import Layer from './layer.js';
-import CesiumMap from '../maps/cesium.js';
-import DataSourceCesium from './cesium/dataSourceCesium.js';
+import CesiumMap from '../map/cesiumMap.js';
+import DataSourceCesiumImpl from './cesium/dataSourceCesiumImpl.js';
 import { vcsLayerName } from './layerSymbols.js';
 import FeatureVisibility, { FeatureVisibilityAction } from './featureVisibility.js';
-import { getGlobalHider } from './globalHider.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import { layerClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {LayerOptions} DataSourceOptions
@@ -30,12 +29,11 @@ import { VcsClassRegistry } from '../classRegistry.js';
 /**
  * Represents a layer of Cesium.Entity
  * @class
- * @export
  * @extends {Layer}
  * @api stable
  */
-class DataSource extends Layer {
-  static get className() { return 'vcs.vcm.layer.DataSource'; }
+class DataSourceLayer extends Layer {
+  static get className() { return 'DataSourceLayer'; }
 
   /**
    * @returns {DataSourceOptions}
@@ -52,7 +50,7 @@ class DataSource extends Layer {
    */
   constructor(options) {
     super(options);
-    const defaultOptions = DataSource.getDefaultOptions();
+    const defaultOptions = DataSourceLayer.getDefaultOptions();
     /**
      * The entities of this layer. Use the `addEntity` API to add Enitities to ensure interoperability with vcm interfaces
      * @type {import("@vcmap/cesium").EntityCollection}
@@ -86,12 +84,21 @@ class DataSource extends Layer {
     ];
   }
 
+  /**
+   * @param {import("@vcmap/core").GlobalHider} globalHider
+   */
+  setGlobalHider(globalHider) {
+    super.setGlobalHider(globalHider);
+    this._setUpFeatureVisibility();
+  }
+
   /**
    * Sets up listeners for featureVisibility and global hider
    * @private
    */
   _setUpFeatureVisibility() {
-    const globalHider = getGlobalHider();
+    this._featureVisibilityListeners.forEach((cb) => { cb(); });
+
     this._featureVisibilityListeners = [
       this.featureVisibility.changed.addEventListener(({ action, ids }) => {
         if (action === FeatureVisibilityAction.HIDE) {
@@ -103,28 +110,30 @@ class DataSource extends Layer {
           });
         } // highlight is _possible_ but very tricky with all the possible entity values with potential materials
       }),
-      globalHider.changed.addEventListener(({ action, ids }) => {
-        if (action === FeatureVisibilityAction.HIDE) {
-          ids.forEach((id) => {
-            const entity = this.entities.getById(id);
-            if (entity) {
-              globalHider.addFeature(id, entity);
-            }
-          });
-        }
-      }),
       this.entities.collectionChanged.addEventListener((c, added) => {
         added.forEach((entity) => {
           if (this.featureVisibility.hiddenObjects[entity.id]) {
             this.featureVisibility.addHiddenFeature(entity.id, entity);
           }
-
-          if (globalHider.hiddenObjects[entity.id]) {
-            globalHider.addFeature(entity.id, entity);
+          if (this.globalHider && this.globalHider.hiddenObjects[entity.id]) {
+            this.globalHider.addFeature(entity.id, entity);
           }
         });
       }),
     ];
+
+    if (this.globalHider) {
+      this._featureVisibilityListeners.push(this.globalHider.changed.addEventListener(({ action, ids }) => {
+        if (action === FeatureVisibilityAction.HIDE) {
+          ids.forEach((id) => {
+            const entity = this.entities.getById(id);
+            if (entity) {
+              this.globalHider.addFeature(id, entity);
+            }
+          });
+        }
+      }));
+    }
   }
 
   /**
@@ -151,11 +160,11 @@ class DataSource extends Layer {
 
   /**
    * @param {CesiumMap} map
-   * @returns {Array<DataSourceCesium>}
+   * @returns {Array<DataSourceCesiumImpl>}
    */
   createImplementationsForMap(map) {
     if (map instanceof CesiumMap) {
-      return [new DataSourceCesium(map, this.getImplementationOptions())];
+      return [new DataSourceCesiumImpl(map, this.getImplementationOptions())];
     }
     return [];
   }
@@ -183,7 +192,7 @@ class DataSource extends Layer {
    */
   flyToEntity(id) {
     this.getImplementations().forEach((impl) => {
-      /** @type {DataSourceCesium} */ (impl).flyToEntity(id);
+      /** @type {DataSourceCesiumImpl} */ (impl).flyToEntity(id);
     });
   }
 
@@ -255,5 +264,5 @@ class DataSource extends Layer {
   }
 }
 
-VcsClassRegistry.registerClass(DataSource.className, DataSource);
-export default DataSource;
+layerClassRegistry.registerClass(DataSourceLayer.className, DataSourceLayer);
+export default DataSourceLayer;