@vcmap/core 5.0.0-rc.28 → 5.0.0-rc.29

package/src/layer/cesium/cesiumTilesetCesiumImpl.js

@@ -41,7 +41,12 @@ export function getExtentFromTileset(cesium3DTileset) {
       CesiumMath.toDegrees(scratchNE.longitude),
       CesiumMath.toDegrees(scratchNE.latitude),
     ]);
-    return /** @type {import("ol/extent").Extent} */ ([mercatorSW[0], mercatorSW[1], mercatorNE[0], mercatorNE[1]]);
+    return /** @type {import("ol/extent").Extent} */ ([
+      mercatorSW[0],
+      mercatorSW[1],
+      mercatorNE[0],
+      mercatorNE[1],
+    ]);
   }
 
   const { center, radius } = cesium3DTileset.boundingSphere;
@@ -64,7 +69,9 @@ export function getExtentFromTileset(cesium3DTileset) {
  */
 class CesiumTilesetCesiumImpl extends LayerImplementation {
   /** @type {string} */
-  static get className() { return 'CesiumTilesetCesiumImpl'; }
+  static get className() {
+    return 'CesiumTilesetCesiumImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -122,7 +129,9 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
         });
       }
       this.cesium3DTileset[vcsLayerName] = this.name;
-      this.cesium3DTileset.tileVisible.addEventListener(this.applyStyle.bind(this));
+      this.cesium3DTileset.tileVisible.addEventListener(
+        this.applyStyle.bind(this),
+      );
       this.cesium3DTileset.tileUnload.addEventListener((tile) => {
         delete tile[cesiumTilesetLastUpdated];
       });
@@ -130,7 +139,9 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
       this._initializedPromise = this.cesium3DTileset.readyPromise;
 
       await this._initializedPromise;
-      this._originalOrigin = Cartesian3.clone(this.cesium3DTileset.boundingSphere.center);
+      this._originalOrigin = Cartesian3.clone(
+        this.cesium3DTileset.boundingSphere.center,
+      );
 
       if (this.modelMatrix) {
         this.cesium3DTileset.modelMatrix = this.modelMatrix;
@@ -155,12 +166,18 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
       if (!this.offset) {
         this.cesium3DTileset.modelMatrix = Matrix4.IDENTITY;
       } else {
-        const cartographicCenter = Cartographic.fromCartesian(this._originalOrigin);
+        const cartographicCenter = Cartographic.fromCartesian(
+          this._originalOrigin,
+        );
         cartographicCenter.longitude += CesiumMath.toRadians(this.offset[0]);
         cartographicCenter.latitude += CesiumMath.toRadians(this.offset[1]);
         cartographicCenter.height += this.offset[2];
         const offset = Cartographic.toCartesian(cartographicCenter);
-        const translation = Cartesian3.subtract(offset, this._originalOrigin, offset);
+        const translation = Cartesian3.subtract(
+          offset,
+          this._originalOrigin,
+          offset,
+        );
         this.cesium3DTileset.modelMatrix = Matrix4.fromTranslation(translation);
       }
     }
@@ -225,17 +242,24 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
       if (this._onStyleChangeRemover) {
         this._onStyleChangeRemover();
       }
-      this._onStyleChangeRemover = this.style.styleChanged.addEventListener(() => {
-        this.cesium3DTileset.makeStyleDirty();
-        this._styleLastUpdated = Date.now();
-      });
+      this._onStyleChangeRemover = this.style.styleChanged.addEventListener(
+        () => {
+          this.cesium3DTileset.makeStyleDirty();
+          this._styleLastUpdated = Date.now();
+        },
+      );
       this._styleLastUpdated = Date.now();
       this.cesium3DTileset.readyPromise.then(() => {
         if (this.cesium3DTileset.colorBlendMode !== this.style.colorBlendMode) {
           // we only support replace and mix mode if the _3DTILESDIFFUSE Flag is set in the tileset
-          if (this.style.colorBlendMode !== Cesium3DTileColorBlendMode.HIGHLIGHT) {
-            // eslint-disable-next-line no-underscore-dangle
-            if (this.cesium3DTileset.extras && this.cesium3DTileset.extras._3DTILESDIFFUSE) {
+          if (
+            this.style.colorBlendMode !== Cesium3DTileColorBlendMode.HIGHLIGHT
+          ) {
+            if (
+              this.cesium3DTileset.extras &&
+              // eslint-disable-next-line no-underscore-dangle
+              this.cesium3DTileset.extras._3DTILESDIFFUSE
+            ) {
               this.cesium3DTileset.colorBlendMode = this.style.colorBlendMode;
             }
           } else {
@@ -295,11 +319,17 @@ class CesiumTilesetCesiumImpl extends LayerImplementation {
             this.featureVisibility.addHighlightFeature(id, feature);
           }
 
-          if (this.featureVisibility.hiddenObjects[id] && !this.featureVisibility.hasHiddenFeature(id, feature)) {
+          if (
+            this.featureVisibility.hiddenObjects[id] &&
+            !this.featureVisibility.hasHiddenFeature(id, feature)
+          ) {
             this.featureVisibility.addHiddenFeature(id, feature);
           }
 
-          if (this.globalHider.hiddenObjects[id] && !this.globalHider.hasFeature(id, feature)) {
+          if (
+            this.globalHider.hiddenObjects[id] &&
+            !this.globalHider.hasFeature(id, feature)
+          ) {
             this.globalHider.addFeature(id, feature);
           }
 

package/src/layer/cesium/clusterContext.js

@@ -1,4 +1,8 @@
-import { removeFeatureFromMap, addPrimitiveToContext, removeArrayFromCollection } from './vectorContext.js';
+import {
+  removeFeatureFromMap,
+  addPrimitiveToContext,
+  removeArrayFromCollection,
+} from './vectorContext.js';
 
 /**
  * @class
@@ -39,7 +43,10 @@ class ClusterContext {
    */
   addBillboards(billboardOptions, feature, allowPicking) {
     addPrimitiveToContext(
-      billboardOptions.map(billboard => ({ billboard, position: billboard.position })),
+      billboardOptions.map((billboard) => ({
+        billboard,
+        position: billboard.position,
+      })),
       feature,
       allowPicking,
       this.entities,
@@ -54,7 +61,7 @@ class ClusterContext {
    */
   addLabels(labelOptions, feature, allowPicking) {
     addPrimitiveToContext(
-      labelOptions.map(label => ({ label, position: label.position })),
+      labelOptions.map((label) => ({ label, position: label.position })),
       feature,
       allowPicking,
       this.entities,

package/src/layer/cesium/dataSourceCesiumImpl.js

@@ -18,8 +18,12 @@ function synchronizeEntityCollections(source, destination) {
     destination.add(entity);
   });
   return source.collectionChanged.addEventListener((c, added, removed) => {
-    added.forEach((e) => { destination.add(e); });
-    removed.forEach((e) => { destination.remove(e); });
+    added.forEach((e) => {
+      destination.add(e);
+    });
+    removed.forEach((e) => {
+      destination.remove(e);
+    });
   });
 }
 
@@ -29,7 +33,9 @@ function synchronizeEntityCollections(source, destination) {
  */
 class DataSourceCesiumImpl extends LayerImplementation {
   /** @type {string} */
-  static get className() { return 'DataSourceCesiumImpl'; }
+  static get className() {
+    return 'DataSourceCesiumImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -64,7 +70,10 @@ class DataSourceCesiumImpl extends LayerImplementation {
    */
   async initialize() {
     if (!this.initialized) {
-      this._collectionListener = synchronizeEntityCollections(this.entities, this.dataSource.entities);
+      this._collectionListener = synchronizeEntityCollections(
+        this.entities,
+        this.dataSource.entities,
+      );
       await this.map.addDataSource(this.dataSource);
     }
     await super.initialize();

package/src/layer/cesium/openStreetMapCesiumImpl.js

@@ -1,4 +1,7 @@
-import { OpenStreetMapImageryProvider, ImageryLayer as CesiumImageryLayer } from '@vcmap-cesium/engine';
+import {
+  OpenStreetMapImageryProvider,
+  ImageryLayer as CesiumImageryLayer,
+} from '@vcmap-cesium/engine';
 import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 
 /**
@@ -7,7 +10,9 @@ import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
  * @extends {RasterLayerCesiumImpl}
  */
 class OpenStreetMapCesiumImpl extends RasterLayerCesiumImpl {
-  static get className() { return 'OpenStreetMapCesiumImpl'; }
+  static get className() {
+    return 'OpenStreetMapCesiumImpl';
+  }
 
   /**
    * @inheritDoc
@@ -24,5 +29,4 @@ class OpenStreetMapCesiumImpl extends RasterLayerCesiumImpl {
   }
 }
 
-
 export default OpenStreetMapCesiumImpl;

package/src/layer/cesium/rasterLayerCesiumImpl.js

@@ -8,7 +8,9 @@ import LayerImplementation from '../layerImplementation.js';
  * @implements {RasterLayerImplementation}
  */
 class RasterLayerCesiumImpl extends LayerImplementation {
-  static get className() { return 'RasterLayerCesiumImpl'; }
+  static get className() {
+    return 'RasterLayerCesiumImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -61,7 +63,9 @@ class RasterLayerCesiumImpl extends LayerImplementation {
    * @returns {import("@vcmap-cesium/engine").ImageryLayer}
    */
   // eslint-disable-next-line class-methods-use-this
-  getCesiumLayer() { throw new Error('implementation error'); }
+  getCesiumLayer() {
+    throw new Error('implementation error');
+  }
 
   /**
    * @inheritDoc

package/src/layer/cesium/singleImageCesiumImpl.js

@@ -1,4 +1,8 @@
-import { Rectangle, SingleTileImageryProvider, ImageryLayer } from '@vcmap-cesium/engine';
+import {
+  Rectangle,
+  SingleTileImageryProvider,
+  ImageryLayer,
+} from '@vcmap-cesium/engine';
 import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 
@@ -8,7 +12,9 @@ import { wgs84Projection } from '../../util/projection.js';
  * @extends {RasterLayerCesiumImpl}
  */
 class SingleImageCesiumImpl extends RasterLayerCesiumImpl {
-  static get className() { return 'SingleImageCesiumImpl'; }
+  static get className() {
+    return 'SingleImageCesiumImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -31,7 +37,12 @@ class SingleImageCesiumImpl extends RasterLayerCesiumImpl {
 
     const extent = this.extent.getCoordinatesInProjection(wgs84Projection);
     if (extent) {
-      options.rectangle = Rectangle.fromDegrees(extent[0], extent[1], extent[2], extent[3]);
+      options.rectangle = Rectangle.fromDegrees(
+        extent[0],
+        extent[1],
+        extent[2],
+        extent[3],
+      );
     }
 
     const imageryProvider = new SingleTileImageryProvider(options);

package/src/layer/cesium/terrainCesiumImpl.js

@@ -2,14 +2,15 @@ import LayerImplementation from '../layerImplementation.js';
 import { vcsLayerName } from '../layerSymbols.js';
 import { getTerrainProviderForUrl } from '../terrainHelpers.js';
 
-
 /**
  * TerrainLayer implementation for {@link CesiumMap}
  * @class
  * @extends {LayerImplementation<import("@vcmap/core").CesiumMap>}}
  */
 class TerrainCesiumImpl extends LayerImplementation {
-  static get className() { return 'TerrainCesiumImpl'; }
+  static get className() {
+    return 'TerrainCesiumImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map

package/src/layer/cesium/tmsCesiumImpl.js

@@ -1,4 +1,9 @@
-import { Rectangle, GeographicTilingScheme, TileMapServiceImageryProvider, ImageryLayer as CesiumImageryLayer } from '@vcmap-cesium/engine';
+import {
+  Rectangle,
+  GeographicTilingScheme,
+  TileMapServiceImageryProvider,
+  ImageryLayer as CesiumImageryLayer,
+} from '@vcmap-cesium/engine';
 import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 import { TilingScheme } from '../rasterLayer.js';
@@ -9,7 +14,9 @@ import { TilingScheme } from '../rasterLayer.js';
  * @extends {RasterLayerCesiumImpl}
  */
 class TmsCesiumImpl extends RasterLayerCesiumImpl {
-  static get className() { return 'TmsCesiumImpl'; }
+  static get className() {
+    return 'TmsCesiumImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -35,7 +42,12 @@ class TmsCesiumImpl extends RasterLayerCesiumImpl {
 
     if (this.extent && this.extent.isValid()) {
       const extent = this.extent.getCoordinatesInProjection(wgs84Projection);
-      options.rectangle = Rectangle.fromDegrees(extent[0], extent[1], extent[2], extent[3]);
+      options.rectangle = Rectangle.fromDegrees(
+        extent[0],
+        extent[1],
+        extent[2],
+        extent[3],
+      );
     }
     if (this.tilingSchema === TilingScheme.GEOGRAPHIC) {
       options.tilingScheme = new GeographicTilingScheme();

package/src/layer/cesium/vectorCesiumImpl.js

@@ -14,7 +14,9 @@ import { synchronizeFeatureVisibilityWithSource } from '../vectorHelpers.js';
  * @implements {FeatureLayerImplementation}
  */
 class VectorCesiumImpl extends LayerImplementation {
-  static get className() { return 'VectorCesiumImpl'; }
+  static get className() {
+    return 'VectorCesiumImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -80,23 +82,37 @@ class VectorCesiumImpl extends LayerImplementation {
    * @private
    */
   _addListeners() {
-    this._olListeners.push(this.source
-      .on('addfeature', (event) => {
-        this._addFeature(/** @type {import("ol/source/Vector").VectorSourceEvent} */(event).feature);
-      }));
+    this._olListeners.push(
+      this.source.on('addfeature', (event) => {
+        this._addFeature(
+          /** @type {import("ol/source/Vector").VectorSourceEvent} */ (event)
+            .feature,
+        );
+      }),
+    );
 
-    this._olListeners.push(this.source
-      .on('removefeature', (event) => {
-        this._removeFeature(/** @type {import("ol/source/Vector").VectorSourceEvent} */(event).feature);
-      }));
+    this._olListeners.push(
+      this.source.on('removefeature', (event) => {
+        this._removeFeature(
+          /** @type {import("ol/source/Vector").VectorSourceEvent} */ (event)
+            .feature,
+        );
+      }),
+    );
 
-    this._olListeners.push(this.source
-      .on('changefeature', (event) => {
-        this._featureChanged(/** @type {import("ol/source/Vector").VectorSourceEvent} */(event).feature);
-      }));
+    this._olListeners.push(
+      this.source.on('changefeature', (event) => {
+        this._featureChanged(
+          /** @type {import("ol/source/Vector").VectorSourceEvent} */ (event)
+            .feature,
+        );
+      }),
+    );
 
     this._removeVectorPropertiesChangeHandler =
-      this.vectorProperties.propertyChanged.addEventListener(this.refresh.bind(this));
+      this.vectorProperties.propertyChanged.addEventListener(
+        this.refresh.bind(this),
+      );
   }
 
   /**
@@ -105,8 +121,15 @@ class VectorCesiumImpl extends LayerImplementation {
    * @protected
    */
   async _setupContext(cesiumMap) {
-    const rootCollection = /** @type {import("@vcmap-cesium/engine").PrimitiveCollection} */ (this._rootCollection);
-    this._context = new VectorContext(cesiumMap, rootCollection, this.splitDirection);
+    const rootCollection =
+      /** @type {import("@vcmap-cesium/engine").PrimitiveCollection} */ (
+        this._rootCollection
+      );
+    this._context = new VectorContext(
+      cesiumMap,
+      rootCollection,
+      this.splitDirection,
+    );
     cesiumMap.addPrimitiveCollection(rootCollection);
   }
 
@@ -133,7 +156,9 @@ class VectorCesiumImpl extends LayerImplementation {
    */
   _addFeatures(features) {
     // TODO we should make this non-blocking to better handle larger data sets check in RIWA Impl
-    features.forEach((f) => { this._addFeature(f); });
+    features.forEach((f) => {
+      this._addFeature(f);
+    });
   }
 
   /**
@@ -142,8 +167,15 @@ class VectorCesiumImpl extends LayerImplementation {
    * @private
    */
   _addFeature(feature) {
-    if (this.active) { // XXX cluster check here? or on init?
-      convert(feature, this.style.style, this.vectorProperties, this._context, this._scene);
+    if (this.active) {
+      // XXX cluster check here? or on init?
+      convert(
+        feature,
+        this.style.style,
+        this.vectorProperties,
+        this._context,
+        this._scene,
+      );
     } else {
       this._featureToAdd.add(feature);
     }
@@ -193,7 +225,11 @@ class VectorCesiumImpl extends LayerImplementation {
         this._rootCollection.show = true;
         if (this._featureVisibilityListeners.length === 0) {
           this._featureVisibilityListeners =
-            synchronizeFeatureVisibilityWithSource(this.featureVisibility, this.source, this.globalHider);
+            synchronizeFeatureVisibilityWithSource(
+              this.featureVisibility,
+              this.source,
+              this.globalHider,
+            );
         }
       }
     }
@@ -205,7 +241,9 @@ class VectorCesiumImpl extends LayerImplementation {
   deactivate() {
     super.deactivate();
     this._rootCollection.show = false;
-    this._featureVisibilityListeners.forEach((cb) => { cb(); });
+    this._featureVisibilityListeners.forEach((cb) => {
+      cb();
+    });
     this._featureVisibilityListeners = [];
   }
 
@@ -216,7 +254,7 @@ class VectorCesiumImpl extends LayerImplementation {
   updateStyle(style, silent) {
     this.style = style;
     if (this.initialized && !silent) {
-      const features = this.source.getFeatures().filter(f => !f.getStyle());
+      const features = this.source.getFeatures().filter((f) => !f.getStyle());
       features.forEach((f) => {
         this._featureChanged(f);
       });
@@ -237,7 +275,9 @@ class VectorCesiumImpl extends LayerImplementation {
    * @protected
    */
   _destroyCollection() {
-    this.map.removePrimitiveCollection(/** @type {undefined} */ (this._rootCollection)); // cast to undefined do to missing inheritance
+    this.map.removePrimitiveCollection(
+      /** @type {undefined} */ (this._rootCollection),
+    ); // cast to undefined do to missing inheritance
   }
 
   /**
@@ -251,10 +291,14 @@ class VectorCesiumImpl extends LayerImplementation {
     this._context = null;
     this._scene = null;
     this._removeVectorPropertiesChangeHandler();
-    this._olListeners.forEach((listener) => { unByKey(listener); });
+    this._olListeners.forEach((listener) => {
+      unByKey(listener);
+    });
     this._olListeners = [];
     this._featureToAdd.clear();
-    this._featureVisibilityListeners.forEach((cb) => { cb(); });
+    this._featureVisibilityListeners.forEach((cb) => {
+      cb();
+    });
     this._featureVisibilityListeners = [];
     this.source = null;
     this.vectorProperties = null;

package/src/layer/cesium/vectorContext.js

@@ -43,7 +43,11 @@ export function removeArrayFromCollection(collection, array) {
  * @param {import("@vcmap-cesium/engine").PrimitiveCollection|import("@vcmap-cesium/engine").BillboardCollection|import("@vcmap-cesium/engine").LabelCollection|import("@vcmap-cesium/engine").EntityCollection} primitiveCollection
  * @returns {boolean} - if a feature was removed from the map
  */
-export function removeFeatureFromMap(feature, featuresMap, primitiveCollection) {
+export function removeFeatureFromMap(
+  feature,
+  featuresMap,
+  primitiveCollection,
+) {
   removeArrayFromCollection(primitiveCollection, featuresMap.get(feature));
   return featuresMap.delete(feature);
 }
@@ -117,7 +121,11 @@ const scratchCenter = new Cartesian3();
  * @param {{value: boolean}}dirtyRef
  * @returns {function():void}
  */
-export function setupScalingPrimitiveCollection(map, primitiveCollection, dirtyRef) {
+export function setupScalingPrimitiveCollection(
+  map,
+  primitiveCollection,
+  dirtyRef,
+) {
   let cachedVP = new Viewpoint({});
   return map.getScene().postRender.addEventListener(() => {
     const { length } = primitiveCollection;
@@ -137,7 +145,11 @@ export function setupScalingPrimitiveCollection(map, primitiveCollection, dirtyR
         const center = Matrix4.getTranslation(modelMatrix, scratchCenter);
         const res = map.getCurrentResolutionFromCartesian(center);
         if (primitive[scaleSymbol] !== res) {
-          primitive.modelMatrix = Matrix4.setScale(modelMatrix, new Cartesian3(res, res, res), new Matrix4());
+          primitive.modelMatrix = Matrix4.setScale(
+            modelMatrix,
+            new Cartesian3(res, res, res),
+            new Matrix4(),
+          );
           primitive[scaleSymbol] = res;
         }
       }
@@ -188,7 +200,11 @@ class VectorContext {
     this._rootCollection.add(this.labels);
 
     this._scaledDirty = { value: true };
-    this._postRenderListener = setupScalingPrimitiveCollection(map, this.scaledPrimitives, this._scaledDirty);
+    this._postRenderListener = setupScalingPrimitiveCollection(
+      map,
+      this.scaledPrimitives,
+      this._scaledDirty,
+    );
   }
 
   /**
@@ -261,7 +277,11 @@ class VectorContext {
    */
   removeFeature(feature) {
     removeFeatureFromMap(feature, this.featureToPrimitiveMap, this.primitives);
-    this._scaledDirty.value = removeFeatureFromMap(feature, this.featureToScaledPrimitiveMap, this.scaledPrimitives);
+    this._scaledDirty.value = removeFeatureFromMap(
+      feature,
+      this.featureToScaledPrimitiveMap,
+      this.scaledPrimitives,
+    );
     removeFeatureFromMap(feature, this.featureToBillboardMap, this.billboards);
     removeFeatureFromMap(feature, this.featureToLabelMap, this.labels);
   }

package/src/layer/cesium/vectorRasterTileCesiumImpl.js

@@ -1,4 +1,7 @@
-import { ImageryLayer as CesiumImageryLayer, Rectangle } from '@vcmap-cesium/engine';
+import {
+  ImageryLayer as CesiumImageryLayer,
+  Rectangle,
+} from '@vcmap-cesium/engine';
 import VectorTileImageryProvider from './vectorTileImageryProvider.js';
 import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
@@ -63,14 +66,21 @@ class VectorRasterTileCesiumImpl extends RasterLayerCesiumImpl {
     };
     if (this.extent && this.extent.isValid()) {
       const extent = this.extent.getCoordinatesInProjection(wgs84Projection);
-      layerOptions.rectangle = Rectangle.fromDegrees(extent[0], extent[1], extent[2], extent[3]);
+      layerOptions.rectangle = Rectangle.fromDegrees(
+        extent[0],
+        extent[1],
+        extent[2],
+        extent[3],
+      );
     }
-    // @ts-ignore
-    const imageryLayer = new CesiumImageryLayer(this.imageryProvider, layerOptions);
+    const imageryLayer = new CesiumImageryLayer(
+      // @ts-ignore
+      this.imageryProvider,
+      layerOptions,
+    );
     return imageryLayer;
   }
 
-
   /**
    * reloads the tiles
    * @private