@vcmap/core 5.0.0-rc.3 → 5.0.0-rc.30

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

@@ -1,16 +1,21 @@
-import { Rectangle, WebMapTileServiceImageryProvider, ImageryLayer as CesiumImageryLayer } from '@vcmap/cesium';
-import RasterLayerCesium from './rasterLayerCesium.js';
+import {
+  Rectangle,
+  WebMapTileServiceImageryProvider,
+  ImageryLayer as CesiumImageryLayer,
+} from '@vcmap-cesium/engine';
+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
@@ -60,13 +65,15 @@ class WMTSCesium extends RasterLayerCesium {
     this.matrixIds = options.matrixIds;
   }
 
-
   /**
-   * @returns {import("@vcmap/cesium").ImageryLayer}
+   * @returns {import("@vcmap-cesium/engine").ImageryLayer}
    */
   getCesiumLayer() {
     // This is a bug in Cesium, they cant cope with {Layer} placeholder..
-    const url = this.url.indexOf('{Layer}') !== -1 ? this.url.replace('{Layer}', this.layer) : this.url;
+    const url =
+      this.url.indexOf('{Layer}') !== -1
+        ? this.url.replace('{Layer}', this.layer)
+        : this.url;
     const extent = this.extent.getCoordinatesInProjection(wgs84Projection);
     const options = {
       url,
@@ -75,12 +82,16 @@ class WMTSCesium extends RasterLayerCesium {
       format: this.format,
       tileMatrixSetID: this.tileMatrixSetID,
       maximumLevel: this.maxLevel,
-      rectangle: Rectangle.fromDegrees(extent[0], extent[1], extent[2], extent[3]),
+      rectangle: Rectangle.fromDegrees(
+        extent[0],
+        extent[1],
+        extent[2],
+        extent[3],
+      ),
       tileWidth: this.tileSize[0],
       tileHeight: this.tileSize[1],
     };
 
-
     options.tilingScheme = getTilingScheme({
       tilingSchema: this.tilingSchema,
       numberOfLevelZeroTilesX: this.numberOfLevelZeroTilesX,
@@ -98,4 +109,4 @@ class WMTSCesium extends RasterLayerCesium {
   }
 }
 
-export default WMTSCesium;
+export default WmtsCesiumImpl;

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

@@ -1,9 +1,9 @@
 /**
- * @param {import("@vcmap/cesium").Cesium3DTileFeature|import("@vcmap/cesium").Cesium3DTilePointFeature} feature
+ * @param {import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature} feature
  * @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]);
@@ -17,6 +17,9 @@ export default function getJSONObjectFromObject(feature) {
     JSONObject.gmlId = JSONObject.id;
   }
   // @ts-ignore
-  JSONObject.clickedPosition = feature.clickedPosition ? feature.clickedPosition : {};
+  JSONObject.clickedPosition = feature.clickedPosition
+    ? // @ts-ignore
+      feature.clickedPosition
+    : {};
   return JSONObject;
 }

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

@@ -1,18 +1,18 @@
-import { ImagerySplitDirection, Matrix4 } from '@vcmap/cesium';
+import { Matrix4 } from '@vcmap-cesium/engine';
 
 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 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
@@ -22,7 +22,6 @@ import { VcsClassRegistry } from '../classRegistry.js';
  * @property {Object|undefined} tilesetOptions
  * @property {import("@vcmap/core").VectorStyleItem|VectorStyleItemOptions|undefined} highlightStyle
  * @property {import("@vcmap/core").FeatureVisibility|undefined} featureVisibility
- * @property {string|undefined} splitDirection - either 'left' or 'right', if omitted none is applied
  * @property {import("ol/coordinate").Coordinate|undefined} offset - an offset of x, y, z. x and y in degrees longitude/latitude respectively
  * @api
  */
@@ -37,9 +36,8 @@ import { VcsClassRegistry } from '../classRegistry.js';
 /**
  * @typedef {FeatureLayerImplementationOptions} CesiumTilesetImplementationOptions
  * @property {Object|undefined} tilesetOptions
- * @property {import("@vcmap/cesium").ImagerySplitDirection} splitDirection
  * @property {Array<CesiumTilesetTilesetProperties>|undefined} tilesetProperties
- * @property {import("@vcmap/cesium").Matrix4|undefined} modelMatrix
+ * @property {import("@vcmap-cesium/engine").Matrix4|undefined} modelMatrix
  * @property {import("ol/coordinate").Coordinate|undefined} offset
  * @api
  */
@@ -48,13 +46,13 @@ import { VcsClassRegistry } from '../classRegistry.js';
  * represents a specific Building layer for cesium.
  * @class
  * @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}
@@ -67,7 +65,6 @@ class CesiumTileset extends FeatureLayer {
       screenSpaceErrorMobile: 32,
       maximumMemoryUsage: 16,
       tilesetOptions: {},
-      splitDirection: undefined,
       offset: undefined,
     };
   }
@@ -77,10 +74,8 @@ class CesiumTileset extends FeatureLayer {
    */
   constructor(options) {
     super(options);
-    this._supportedMaps = [
-      CesiumMap.className,
-    ];
-    const defaultOptions = CesiumTileset.getDefaultOptions();
+    this._supportedMaps = [CesiumMap.className];
+    const defaultOptions = CesiumTilesetLayer.getDefaultOptions();
     if (this.url && !/\.json$/.test(this.url)) {
       this.url = `${this.url.replace(/\/$/, '')}/tileset.json`;
     }
@@ -88,47 +83,46 @@ class CesiumTileset extends FeatureLayer {
     /** @type {VectorStyleItem} */
     this.highlightStyle = null;
     if (options.highlightStyle) {
-      this.highlightStyle = options.highlightStyle instanceof VectorStyleItem ?
-        options.highlightStyle :
-        new VectorStyleItem(/** @type {VectorStyleItemOptions} */ (options.highlightStyle));
+      this.highlightStyle =
+        options.highlightStyle instanceof VectorStyleItem
+          ? options.highlightStyle
+          : new VectorStyleItem(
+              /** @type {VectorStyleItemOptions} */ (options.highlightStyle),
+            );
     }
     /** @type {number} */
-    this.screenSpaceError = parseInteger(options.screenSpaceError, defaultOptions.screenSpaceError);
+    this.screenSpaceError = parseInteger(
+      options.screenSpaceError,
+      defaultOptions.screenSpaceError,
+    );
 
     /** @type {number} */
-    this.screenSpaceErrorMobile = parseInteger(options.screenSpaceErrorMobile, defaultOptions.screenSpaceErrorMobile);
+    this.screenSpaceErrorMobile = parseInteger(
+      options.screenSpaceErrorMobile,
+      defaultOptions.screenSpaceErrorMobile,
+    );
 
     /** @type {number} */
-    this.maximumMemoryUsage = parseInteger(options.maximumMemoryUsage, defaultOptions.maximumMemoryUsage);
+    this.maximumMemoryUsage = parseInteger(
+      options.maximumMemoryUsage,
+      defaultOptions.maximumMemoryUsage,
+    );
 
-    const tilesetOptions = options.tilesetOptions || defaultOptions.tilesetOptions;
+    const tilesetOptions =
+      options.tilesetOptions || defaultOptions.tilesetOptions;
 
     /** @type {!Object} */
     this.tilesetOptions = {
       url: this.url,
-      maximumScreenSpaceError: isMobile() ? this.screenSpaceErrorMobile : this.screenSpaceError,
+      maximumScreenSpaceError: isMobile()
+        ? this.screenSpaceErrorMobile
+        : this.screenSpaceError,
       maximumMemoryUsage: this.maximumMemoryUsage,
       ...tilesetOptions,
     };
 
-    /** @type {import("@vcmap/cesium").ImagerySplitDirection} */
-    this._splitDirection = ImagerySplitDirection.NONE;
-
-    if (options.splitDirection) {
-      this._splitDirection = options.splitDirection === 'left' ?
-        ImagerySplitDirection.LEFT :
-        ImagerySplitDirection.RIGHT;
-    }
-
-    /**
-     * raised if the split direction changes, is passed the split direction as its only argument
-     * @type {VcsEvent<import("@vcmap/cesium").ImagerySplitDirection>}
-     * @api
-     */
-    this.splitDirectionChanged = new VcsEvent();
-
     /**
-     * @type {import("@vcmap/cesium").Matrix4|undefined}
+     * @type {import("@vcmap-cesium/engine").Matrix4|undefined}
      * @private
      */
     this._modelMatrix = undefined;
@@ -144,23 +138,24 @@ class CesiumTileset extends FeatureLayer {
    * A model matrix to apply to each cesium3DTileset created from this layer.
    * This will overwrite any modelMatrix calculated by the offset property.
    * @api
-   * @returns {import("@vcmap/cesium").Matrix4|undefined}
+   * @returns {import("@vcmap-cesium/engine").Matrix4|undefined}
    */
   get modelMatrix() {
     return this._modelMatrix;
   }
 
   /**
-   * @param {import("@vcmap/cesium").Matrix4|undefined} modelMatrix
+   * @param {import("@vcmap-cesium/engine").Matrix4|undefined} modelMatrix
    */
   set modelMatrix(modelMatrix) {
     checkMaybe(modelMatrix, Matrix4);
 
     this._modelMatrix = modelMatrix;
-    this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */ (impl) => {
+    this.getImplementations().forEach(
+      /** @param {CesiumTilesetCesiumImpl} impl */ (impl) => {
         impl.updateModelMatrix(modelMatrix);
-      });
+      },
+    );
   }
 
   /**
@@ -181,29 +176,11 @@ class CesiumTileset extends FeatureLayer {
     checkMaybe(offset, [Number]);
 
     this._offset = offset;
-    this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */ (impl) => {
+    this.getImplementations().forEach(
+      /** @param {CesiumTilesetCesiumImpl} impl */ (impl) => {
         impl.updateOffset(offset);
-      });
-  }
-
-  /**
-   * @api
-   * @type {import("@vcmap/cesium").ImagerySplitDirection}
-   */
-  get splitDirection() { return this._splitDirection; }
-
-  /**
-   * @param {import("@vcmap/cesium").ImagerySplitDirection} direction
-   */
-  set splitDirection(direction) {
-    if (direction !== this._splitDirection) {
-      this.getImplementations().forEach((impl) => {
-        /** @type {CesiumTilesetCesium} */ (impl).updateSplitDirection(direction);
-      });
-      this._splitDirection = direction;
-      this.splitDirectionChanged.raiseEvent(this._splitDirection);
-    }
+      },
+    );
   }
 
   /**
@@ -214,7 +191,6 @@ class CesiumTileset extends FeatureLayer {
     return {
       ...super.getImplementationOptions(),
       tilesetOptions: this.tilesetOptions,
-      splitDirection: this.splitDirection,
       modelMatrix: this.modelMatrix,
       offset: this.offset,
     };
@@ -223,18 +199,20 @@ 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 [];
   }
 
   /**
    * @inheritDoc
-   * @param {import("@vcmap/cesium").Cesium3DTileFeature|import("@vcmap/cesium").Cesium3DTilePointFeature} object
+   * @param {import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature} object
    * @returns {?Object}
    */
   objectClickedHandler(object) {
@@ -261,12 +239,14 @@ 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,
       });
 
@@ -278,32 +258,19 @@ class CesiumTileset extends FeatureLayer {
     return null;
   }
 
-  // TODO type params
-  getGenericFeatureFromClickedObject(object) {
-    const attributes = { ...this.genericFeatureProperties, ...object.attributes || object };
-    return {
-      layerName: this.name,
-      layerClass: this.className,
-      attributes,
-      longitude: object.clickedPosition.longitude,
-      latitude: object.clickedPosition.latitude,
-      height: object.clickedPosition.height + this.balloonHeightOffset,
-      relativeToGround: false,
-    };
-  }
-
   /**
    * set the maximum screenspace error of this layer
    * @param {number} value
    * @api stable
    */
   setMaximumScreenSpaceError(value) {
-    this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */(impl) => {
+    this.getImplementations().forEach(
+      /** @param {CesiumTilesetCesiumImpl} impl */ (impl) => {
         if (impl.cesium3DTileset) {
           impl.cesium3DTileset.maximumScreenSpaceError = value;
         }
-      });
+      },
+    );
   }
 
   /**
@@ -312,11 +279,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) {
@@ -336,7 +301,9 @@ class CesiumTileset extends FeatureLayer {
       delete tilesetOptions.url;
     }
 
-    const usedScreenSpaceError = isMobile() ? this.screenSpaceErrorMobile : this.screenSpaceError;
+    const usedScreenSpaceError = isMobile()
+      ? this.screenSpaceErrorMobile
+      : this.screenSpaceError;
     if (tilesetOptions.maximumScreenSpaceError === usedScreenSpaceError) {
       delete tilesetOptions.maximumScreenSpaceError;
     }
@@ -349,12 +316,6 @@ class CesiumTileset extends FeatureLayer {
       config.tilesetOptions = tilesetOptions;
     }
 
-    if (this._splitDirection !== ImagerySplitDirection.NONE) {
-      config.splitDirection = this._splitDirection === ImagerySplitDirection.RIGHT ?
-        'right' :
-        'left';
-    }
-
     if (Array.isArray(this.offset)) {
       config.offset = this.offset.slice();
     }
@@ -368,9 +329,11 @@ class CesiumTileset extends FeatureLayer {
    */
   destroy() {
     super.destroy();
-    this.splitDirectionChanged.destroy();
   }
 }
 
-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,29 +1,30 @@
-import { CzmlDataSource } from '@vcmap/cesium';
+import { CzmlDataSource } from '@vcmap-cesium/engine';
 
-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
+ * @typedef {LayerOptions} CzmlOptions
  * @property {string|undefined} sourceUri
  * @api
  */
 
 /**
  * @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 +37,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,14 +45,14 @@ 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
      */
-    this.loaded = new Promise(((resolve, reject) => {
+    this.loaded = new Promise((resolve, reject) => {
       this._loadedResolve = resolve;
       this._loadedReject = reject;
-    }));
+    });
   }
 
   /**
@@ -77,11 +78,13 @@ class Czml extends DataSource {
    * @private
    */
   async _loadData() {
-    const loaded = /** @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);
-    });
+    await /** @type {import("@vcmap-cesium/engine").CzmlDataSource} */ (
+      this.dataSource
+    ).load(
+      this.url,
+      this.sourceUri ? { sourceUri: this.sourceUri } : undefined,
+    );
+
     this.entities.values.forEach((entity) => {
       entity[vcsLayerName] = this.name;
     });
@@ -137,5 +140,5 @@ class Czml extends DataSource {
   }
 }
 
-VcsClassRegistry.registerClass(Czml.className, Czml);
-export default Czml;
+layerClassRegistry.registerClass(CzmlLayer.className, CzmlLayer);
+export default CzmlLayer;