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

package/src/layer/layer.js

@@ -100,14 +100,18 @@ export const vcsMetaVersion = '2.1';
  */
 class Layer extends VcsObject {
   /** @type {string} */
-  static get className() { return 'Layer'; }
+  static get className() {
+    return 'Layer';
+  }
 
   /**
    * Symbol to declare a layers name on its visualizations, e.g. ol.layer.Layer, Cesium.Cesium3DTileset
    * @type {symbol}
    * @api
    */
-  static get vcsLayerNameSymbol() { return vcsLayerName; }
+  static get vcsLayerNameSymbol() {
+    return vcsLayerName;
+  }
 
   /** @returns {LayerOptions} */
   static getDefaultOptions() {
@@ -143,12 +147,18 @@ class Layer extends VcsObject {
      * @type {boolean}
      * @api
      */
-    this.activeOnStartup = parseBoolean(options.activeOnStartup, defaultOptions.activeOnStartup);
+    this.activeOnStartup = parseBoolean(
+      options.activeOnStartup,
+      defaultOptions.activeOnStartup,
+    );
     /**
      * @type {boolean}
      * @private
      */
-    this._allowPicking = parseBoolean(options.allowPicking, defaultOptions.allowPicking);
+    this._allowPicking = parseBoolean(
+      options.allowPicking,
+      defaultOptions.allowPicking,
+    );
     /**
      * @type {LayerState}
      * @private
@@ -205,9 +215,9 @@ class Layer extends VcsObject {
      * @private
      * @api
      */
-    this._hiddenObjectIds = Array.isArray(options.hiddenObjectIds) ?
-      options.hiddenObjectIds :
-      defaultOptions.hiddenObjectIds;
+    this._hiddenObjectIds = Array.isArray(options.hiddenObjectIds)
+      ? options.hiddenObjectIds
+      : defaultOptions.hiddenObjectIds;
 
     /**
      * @type {import("@vcmap/core").GlobalHider|null}
@@ -219,9 +229,9 @@ class Layer extends VcsObject {
      * @type {Array<string|symbol>}
      * @private
      */
-    this._exclusiveGroups = Array.isArray(options.exclusiveGroups) ?
-      options.exclusiveGroups.slice() :
-      defaultOptions.exclusiveGroups;
+    this._exclusiveGroups = Array.isArray(options.exclusiveGroups)
+      ? options.exclusiveGroups.slice()
+      : defaultOptions.exclusiveGroups;
 
     /**
      * event raised if the exclusives group of the layer changes. is passed the array of exclusive groups as its only argument
@@ -353,7 +363,9 @@ class Layer extends VcsObject {
   /**
    * @type {Array<string>}
    */
-  get hiddenObjectIds() { return this._hiddenObjectIds; }
+  get hiddenObjectIds() {
+    return this._hiddenObjectIds;
+  }
 
   /**
    * @param {Array<string>} hiddenObjectIds
@@ -367,12 +379,13 @@ class Layer extends VcsObject {
     this._hiddenObjectIds = hiddenObjectIds;
   }
 
-
   /**
    * @type {import("@vcmap/core").GlobalHider|null}
    * @readonly
    */
-  get globalHider() { return this._globalHider; }
+  get globalHider() {
+    return this._globalHider;
+  }
 
   /**
    * @param {import("@vcmap/core").GlobalHider} globalHider
@@ -414,7 +427,7 @@ class Layer extends VcsObject {
 
     if (
       groups.length !== this._exclusiveGroups.length ||
-      !groups.every(g => this._exclusiveGroups.includes(g))
+      !groups.every((g) => this._exclusiveGroups.includes(g))
     ) {
       this._exclusiveGroups = groups.slice();
       this.exclusiveGroupsChanged.raiseEvent(groups);
@@ -425,7 +438,9 @@ class Layer extends VcsObject {
    * @type {number}
    * @api
    */
-  get zIndex() { return this._zIndex; }
+  get zIndex() {
+    return this._zIndex;
+  }
 
   /**
    * @param {number} index
@@ -456,7 +471,11 @@ class Layer extends VcsObject {
 
     if (this._locale !== value) {
       this._locale = value;
-      if (this._url && typeof this._url === 'object' && this._url[this._locale]) {
+      if (
+        this._url &&
+        typeof this._url === 'object' &&
+        this._url[this._locale]
+      ) {
         this.reload();
       }
     }
@@ -573,7 +592,9 @@ class Layer extends VcsObject {
    * @returns {Promise<void>}
    */
   async mapActivated(map) {
-    this.getLogger().debug(`Layer: ${this.name} mapActivated is called from Map: ${map.name}`);
+    this.getLogger().debug(
+      `Layer: ${this.name} mapActivated is called from Map: ${map.name}`,
+    );
     this._activeMaps.add(map);
     if (this.active || (this.loading && this.initialized)) {
       await this._activateImplsForMap(map);
@@ -586,13 +607,14 @@ class Layer extends VcsObject {
    * @param {import("@vcmap/core").VcsMap} map
    */
   mapDeactivated(map) {
-    this.getLogger().debug(`Layer: ${this.name} mapDeactivated is called from Map: ${map.name}`);
+    this.getLogger().debug(
+      `Layer: ${this.name} mapDeactivated is called from Map: ${map.name}`,
+    );
     this._activeMaps.delete(map);
     if (this.active || this.loading) {
-      this.getImplementationsForMap(map)
-        .forEach((impl) => {
-          impl.deactivate();
-        });
+      this.getImplementationsForMap(map).forEach((impl) => {
+        impl.deactivate();
+      });
     }
   }
 
@@ -603,10 +625,9 @@ class Layer extends VcsObject {
    */
   removedFromMap(map) {
     this._activeMaps.delete(map);
-    this.getImplementationsForMap(map)
-      .forEach((impl) => {
-        impl.destroy();
-      });
+    this.getImplementationsForMap(map).forEach((impl) => {
+      impl.destroy();
+    });
     this._implementations.delete(map);
   }
 
@@ -617,9 +638,11 @@ class Layer extends VcsObject {
    * @api stable
    */
   isSupported(map) {
-    return map &&
+    return (
+      map &&
       this._supportedMaps.includes(map.className) &&
-      (this.mapNames.length === 0 || this.mapNames.indexOf(map.name) >= 0);
+      (this.mapNames.length === 0 || this.mapNames.indexOf(map.name) >= 0)
+    );
   }
 
   /**
@@ -630,12 +653,16 @@ class Layer extends VcsObject {
   async _activateImplsForMap(map) {
     const impls = this.getImplementationsForMap(map);
     try {
-      await Promise.all(impls.map(i => i.activate()));
+      await Promise.all(impls.map((i) => i.activate()));
     } catch (err) {
-      this.getLogger().error(`Layer ${this.name} could not activate impl for map ${map.name}`);
+      this.getLogger().error(
+        `Layer ${this.name} could not activate impl for map ${map.name}`,
+      );
       this.getLogger().error(err);
       this._implementations.set(map, []);
-      impls.forEach((i) => { i.destroy(); });
+      impls.forEach((i) => {
+        i.destroy();
+      });
     }
   }
 
@@ -648,14 +675,18 @@ class Layer extends VcsObject {
     try {
       this.stateChanged.raiseEvent(LayerState.LOADING);
     } catch (e) {
-      this.getLogger().debug(`Error on raising LayerState.LOADING event for layer ${this.name} : ${e.message}`);
+      this.getLogger().debug(
+        `Error on raising LayerState.LOADING event for layer ${this.name} : ${e.message}`,
+      );
     }
     await this.initialize();
     if (this._state !== LayerState.LOADING) {
       return;
     }
 
-    await Promise.all([...this._activeMaps].map(m => this._activateImplsForMap(m)));
+    await Promise.all(
+      [...this._activeMaps].map((m) => this._activateImplsForMap(m)),
+    );
     if (this._state !== LayerState.LOADING) {
       return;
     }
@@ -666,7 +697,9 @@ class Layer extends VcsObject {
     try {
       this.stateChanged.raiseEvent(LayerState.ACTIVE);
     } catch (e) {
-      this.getLogger().debug(`Error on raising LayerState.ACTIVE event for layer ${this.name} : ${e.message}`);
+      this.getLogger().debug(
+        `Error on raising LayerState.ACTIVE event for layer ${this.name} : ${e.message}`,
+      );
     }
     this._loadingPromise = null;
   }
@@ -685,11 +718,10 @@ class Layer extends VcsObject {
     }
 
     if (this._state === LayerState.INACTIVE) {
-      this._loadingPromise = this._activate()
-        .catch((err) => {
-          this._state = LayerState.INACTIVE;
-          return Promise.reject(err);
-        });
+      this._loadingPromise = this._activate().catch((err) => {
+        this._state = LayerState.INACTIVE;
+        return Promise.reject(err);
+      });
       return this._loadingPromise;
     }
 
@@ -718,7 +750,9 @@ class Layer extends VcsObject {
       try {
         this.stateChanged.raiseEvent(LayerState.INACTIVE);
       } catch (e) {
-        this.getLogger().debug(`Error on raising LayerState.INACTIVE event for layer ${this.name} : ${e.message}`);
+        this.getLogger().debug(
+          `Error on raising LayerState.INACTIVE event for layer ${this.name} : ${e.message}`,
+        );
       }
     }
   }
@@ -777,10 +811,9 @@ class Layer extends VcsObject {
     }
 
     this._activeMaps.clear();
-    this.getImplementations()
-      .forEach((impl) => {
-        impl.destroy();
-      });
+    this.getImplementations().forEach((impl) => {
+      impl.destroy();
+    });
 
     this._initialized = false;
     this._implementations.clear();

package/src/layer/layerImplementation.js

@@ -10,7 +10,9 @@ import LayerState from './layerState.js';
  * @template {import("@vcmap/core").VcsMap} T
  */
 class LayerImplementation extends VcsObject {
-  static get className() { return 'LayerImplementation'; }
+  static get className() {
+    return 'LayerImplementation';
+  }
 
   /**
    * @param {T} map
@@ -42,19 +44,25 @@ class LayerImplementation extends VcsObject {
    * @type {boolean}
    * @readonly
    */
-  get initialized() { return this._initialized; }
+  get initialized() {
+    return this._initialized;
+  }
 
   /**
    * @type {boolean}
    * @api
    */
-  get active() { return this._state === LayerState.ACTIVE; }
+  get active() {
+    return this._state === LayerState.ACTIVE;
+  }
 
   /**
    * @type {boolean}
    * @api
    */
-  get loading() { return this._state === LayerState.LOADING; }
+  get loading() {
+    return this._state === LayerState.LOADING;
+  }
 
   /**
    * interface to initialize this implementation, is used to setup elements which have to be created only once.

package/src/layer/oblique/layerObliqueImpl.js

@@ -59,7 +59,9 @@ class LayerObliqueImpl extends LayerImplementation {
    * @returns {import("ol/layer").Layer<import("ol/source/Source").default>}
    */
   // eslint-disable-next-line class-methods-use-this
-  getOLLayer() { throw new Error(); }
+  getOLLayer() {
+    throw new Error();
+  }
 
   /**
    * @inheritDoc

package/src/layer/oblique/obliqueHelpers.js

@@ -3,9 +3,19 @@ import { fromCircle } from 'ol/geom/Polygon.js';
 import { getTransform } from 'ol/proj.js';
 import { Cartographic, sampleTerrainMostDetailed } from '@vcmap-cesium/engine';
 import { cartesian2DDistance } from '../../util/math.js';
-import Projection, { mercatorProjection, wgs84Projection } from '../../util/projection.js';
-import { actuallyIsCircle, alreadyTransformedToImage, obliqueGeometry } from '../vectorSymbols.js';
-import { convertGeometryToPolygon, getFlatCoordinatesFromGeometry } from '../../util/geometryHelpers.js';
+import Projection, {
+  mercatorProjection,
+  wgs84Projection,
+} from '../../util/projection.js';
+import {
+  actuallyIsCircle,
+  alreadyTransformedToImage,
+  obliqueGeometry,
+} from '../vectorSymbols.js';
+import {
+  convertGeometryToPolygon,
+  getFlatCoordinatesFromGeometry,
+} from '../../util/geometryHelpers.js';
 import { transformFromImage } from '../../oblique/helpers.js';
 
 /**
@@ -76,7 +86,6 @@ export function getZoom(olMap, image, distance) {
   return olMap.getView().getZoomForResolution(resolution);
 }
 
-
 /**
  * converts a geometry in mercator format to image coordinates
  * @param {import("ol/geom/Geometry").default} inputSourceGeometry
@@ -84,14 +93,25 @@ export function getZoom(olMap, image, distance) {
  * @param {import("@vcmap/core").ObliqueImage} image
  * @returns {Promise<import("ol/geom/Geometry").default>}
  */
-export async function mercatorGeometryToImageGeometry(inputSourceGeometry, destinationGeometry, image) {
-  const sourceGeometry = inputSourceGeometry instanceof Circle ?
-    fromCircle(inputSourceGeometry) :
-    inputSourceGeometry;
+export async function mercatorGeometryToImageGeometry(
+  inputSourceGeometry,
+  destinationGeometry,
+  image,
+) {
+  const sourceGeometry =
+    inputSourceGeometry instanceof Circle
+      ? fromCircle(inputSourceGeometry)
+      : inputSourceGeometry;
   const coordinates = sourceGeometry.getCoordinates();
   /** type {Array.<import("ol/coordinate").Coordinate>} */
-  const flattenCoordinates = getFlatCoordinatesFromGeometry(sourceGeometry, coordinates);
-  let transformer = getTransform(mercatorProjection.proj, image.meta.projection.proj);
+  const flattenCoordinates = getFlatCoordinatesFromGeometry(
+    sourceGeometry,
+    coordinates,
+  );
+  let transformer = getTransform(
+    mercatorProjection.proj,
+    image.meta.projection.proj,
+  );
 
   let updatedPositions = [];
   if (image.meta.terrainProvider) {
@@ -99,14 +119,25 @@ export async function mercatorGeometryToImageGeometry(inputSourceGeometry, desti
       Projection.mercatorToWgs84(coord, true);
       return Cartographic.fromDegrees(coord[0], coord[1]);
     });
-    transformer = getTransform(wgs84Projection.proj, image.meta.projection.proj);
-    updatedPositions = await sampleTerrainMostDetailed(image.meta.terrainProvider, cartographicCoordinates);
+    transformer = getTransform(
+      wgs84Projection.proj,
+      image.meta.projection.proj,
+    );
+    updatedPositions = await sampleTerrainMostDetailed(
+      image.meta.terrainProvider,
+      cartographicCoordinates,
+    );
   }
 
   flattenCoordinates.forEach((coord, index) => {
     transformer(coord, coord, 3);
-    const exactHeight = updatedPositions[index] ? updatedPositions[index].height : null;
-    const imageCoords = image.transformRealWorld2Image(coord, exactHeight || coord[2] || image.averageHeight);
+    const exactHeight = updatedPositions[index]
+      ? updatedPositions[index].height
+      : null;
+    const imageCoords = image.transformRealWorld2Image(
+      coord,
+      exactHeight || coord[2] || image.averageHeight,
+    );
     flattenCoordinates[index][0] = imageCoords[0];
     flattenCoordinates[index][1] = imageCoords[1];
   });
@@ -122,21 +153,28 @@ export async function mercatorGeometryToImageGeometry(inputSourceGeometry, desti
  * @param {import("@vcmap/core").ObliqueImage} image
  * @returns {Promise<import("ol/geom/Geometry").default>}
  */
-export function imageGeometryToMercatorGeometry(sourceGeometry, destinationGeometry, image) {
+export function imageGeometryToMercatorGeometry(
+  sourceGeometry,
+  destinationGeometry,
+  image,
+) {
   const coordinates = sourceGeometry.getCoordinates();
   /** type {Array.<import("ol/coordinate").Coordinate>} */
-  const flattenCoordinates = getFlatCoordinatesFromGeometry(sourceGeometry, coordinates);
-  const promises = flattenCoordinates.map(coord => transformFromImage(image, coord)
-    .then((coords) => {
+  const flattenCoordinates = getFlatCoordinatesFromGeometry(
+    sourceGeometry,
+    coordinates,
+  );
+  const promises = flattenCoordinates.map((coord) =>
+    transformFromImage(image, coord).then((coords) => {
       coord[0] = coords.coords[0];
       coord[1] = coords.coords[1];
       coord[2] = coords.coords[2];
-    }));
-  return Promise.all(promises)
-    .then(() => {
-      destinationGeometry.setCoordinates(coordinates);
-      return destinationGeometry;
-    });
+    }),
+  );
+  return Promise.all(promises).then(() => {
+    destinationGeometry.setCoordinates(coordinates);
+    return destinationGeometry;
+  });
 }
 
 /**
@@ -146,7 +184,9 @@ export function imageGeometryToMercatorGeometry(sourceGeometry, destinationGeome
  */
 export function getPolygonizedGeometry(feature, retainRectangle = false) {
   const geom = feature.getGeometry();
-  const isRectangle = geom.get('_vcsGeomType') === 'bbox' || geom.get('_vcsGeomType') === 'rectangle';
+  const isRectangle =
+    geom.get('_vcsGeomType') === 'bbox' ||
+    geom.get('_vcsGeomType') === 'rectangle';
   if (isRectangle && retainRectangle) {
     return geom;
   }
@@ -165,11 +205,16 @@ export function getPolygonizedGeometry(feature, retainRectangle = false) {
 export function setNewGeometry(originalFeature, obliqueFeature) {
   const originalGeometry = originalFeature.getGeometry();
   const originalGeometryClone = originalFeature.getGeometry().clone();
-  obliqueFeature.setGeometry(!originalGeometry[alreadyTransformedToImage] ?
-    convertGeometryToPolygon(originalGeometryClone) :
-    originalGeometryClone);
-  if (originalGeometry[alreadyTransformedToImage]) { // TODO handle UI for bbox and rectangle
-    obliqueFeature.getGeometry().setProperties(originalFeature.getGeometry().getProperties(), false);
+  obliqueFeature.setGeometry(
+    !originalGeometry[alreadyTransformedToImage]
+      ? convertGeometryToPolygon(originalGeometryClone)
+      : originalGeometryClone,
+  );
+  if (originalGeometry[alreadyTransformedToImage]) {
+    // TODO handle UI for bbox and rectangle
+    obliqueFeature
+      .getGeometry()
+      .setProperties(originalFeature.getGeometry().getProperties(), false);
   }
   originalFeature[obliqueGeometry] = obliqueFeature.getGeometry();
 }