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

package/src/layer/openlayers/vectorTileOpenlayersImpl.js

@@ -11,7 +11,9 @@ import { mercatorProjection } from '../../util/projection.js';
  * @extends {LayerOpenlayersImpl}
  */
 class VectorTileOpenlayersImpl extends LayerOpenlayersImpl {
-  static get className() { return 'VectorTileOpenlayersImpl'; }
+  static get className() {
+    return 'VectorTileOpenlayersImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").OpenlayersMap} map
@@ -74,8 +76,11 @@ class VectorTileOpenlayersImpl extends LayerOpenlayersImpl {
        * @returns {Promise<void>}
        */
       tileLoadFunction: async (tile) => {
-        const features =
-          await this.tileProvider.getFeaturesForTile(tile.tileCoord[1], tile.tileCoord[2], tile.tileCoord[0]);
+        const features = await this.tileProvider.getFeaturesForTile(
+          tile.tileCoord[1],
+          tile.tileCoord[2],
+          tile.tileCoord[0],
+        );
         if (features.length > 0) {
           tile.setFeatures(features);
         } else {
@@ -86,8 +91,10 @@ class VectorTileOpenlayersImpl extends LayerOpenlayersImpl {
       // url needs to be set for the tileLoadFunction to work.
       url: '/{z}/{x}/{y}',
     });
-    const extent = this.extent && this.extent.isValid() ?
-      this.extent.getCoordinatesInProjection(mercatorProjection) : undefined;
+    const extent =
+      this.extent && this.extent.isValid()
+        ? this.extent.getCoordinatesInProjection(mercatorProjection)
+        : undefined;
     // make it so that openlayers and cesium zoom level fit together
     const minZoom = this.minLevel ? this.minLevel : undefined;
     const maxZoom = this.maxLevel ? this.maxLevel + 1 : undefined;

package/src/layer/openlayers/wmsOpenlayersImpl.js

@@ -8,7 +8,9 @@ import { getWMSSource } from '../wmsHelpers.js';
  * @extends {RasterLayerOpenlayersImpl}
  */
 class WmsOpenlayersImpl extends RasterLayerOpenlayersImpl {
-  static get className() { return 'WmsOpenlayersImpl'; }
+  static get className() {
+    return 'WmsOpenlayersImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").OpenlayersMap} map

package/src/layer/openlayers/wmtsOpenlayersImpl.js

@@ -13,7 +13,9 @@ import { isSameOrigin } from '../../util/urlHelpers.js';
  * @extends {RasterLayerOpenlayersImpl}
  */
 class WmtsOpenlayersImpl extends RasterLayerOpenlayersImpl {
-  static get className() { return 'WmtsOpenlayersImpl'; }
+  static get className() {
+    return 'WmtsOpenlayersImpl';
+  }
 
   /**
    * @param {import("@vcmap/core").OpenlayersMap} map
@@ -72,7 +74,10 @@ class WmtsOpenlayersImpl extends RasterLayerOpenlayersImpl {
    * @returns {import("ol/layer/Tile").default}
    */
   getOLLayer() {
-    const projection = this.tilingSchema === TilingScheme.GEOGRAPHIC ? wgs84Projection : mercatorProjection;
+    const projection =
+      this.tilingSchema === TilingScheme.GEOGRAPHIC
+        ? wgs84Projection
+        : mercatorProjection;
     const projectionExtent = projection.proj.getExtent();
     let size = getWidth(projectionExtent) / this.tileSize[0];
     if (this.numberOfLevelZeroTilesX > 1) {
@@ -83,9 +88,11 @@ class WmtsOpenlayersImpl extends RasterLayerOpenlayersImpl {
     }
 
     const maxZoom = this.maxLevel + 1;
-    const resolutions = new Array(maxZoom).fill(undefined).map((value, index) => {
-      return size / (2 ** index);
-    });
+    const resolutions = new Array(maxZoom)
+      .fill(undefined)
+      .map((value, index) => {
+        return size / 2 ** index;
+      });
 
     const extent = this.extent.getCoordinatesInProjection(projection);
     const tileGridOptions = {

package/src/layer/pointCloudLayer.js

@@ -36,7 +36,9 @@ export const defaultPointCloudStyle = new DeclarativeStyleItem({});
  * @api stable
  */
 class PointCloudLayer extends CesiumTilesetLayer {
-  static get className() { return 'PointCloudLayer'; }
+  static get className() {
+    return 'PointCloudLayer';
+  }
 
   /**
    * @returns {PointCloudOptions}
@@ -60,13 +62,12 @@ class PointCloudLayer extends CesiumTilesetLayer {
      * @api
      * @type {number|string|null}
      */
-    this.defaultPointSize = options.pointSize != null ? options.pointSize : defaultOptions.pointSize;
+    this.defaultPointSize =
+      options.pointSize != null ? options.pointSize : defaultOptions.pointSize;
     /** @type {number|string|null} */
     this._pointSize = this.defaultPointSize;
 
-    this._supportedMaps = [
-      CesiumMap.className,
-    ];
+    this._supportedMaps = [CesiumMap.className];
   }
 
   /**
@@ -76,14 +77,19 @@ class PointCloudLayer extends CesiumTilesetLayer {
    * @returns {import("@vcmap/core").StyleItem}
    */
   getStyleOrDefaultStyle(styleOptions, defaultStyle) {
-    return super.getStyleOrDefaultStyle(styleOptions, defaultStyle || defaultPointCloudStyle);
+    return super.getStyleOrDefaultStyle(
+      styleOptions,
+      defaultStyle || defaultPointCloudStyle,
+    );
   }
 
   /**
    * @type {number|string|null}
    * @api
    */
-  get pointSize() { return this._pointSize; }
+  get pointSize() {
+    return this._pointSize;
+  }
 
   /**
    * @param {string|number|undefined} size
@@ -91,7 +97,8 @@ class PointCloudLayer extends CesiumTilesetLayer {
   set pointSize(size) {
     checkMaybe(size, [Number, String]);
     this._pointSize = size;
-    /** @type {DeclarativeStyleItem} */ (this.style).pointSize = size?.toString();
+    /** @type {DeclarativeStyleItem} */ (this.style).pointSize =
+      size?.toString();
   }
 
   async initialize() {
@@ -105,7 +112,9 @@ class PointCloudLayer extends CesiumTilesetLayer {
    */
   createImplementationsForMap(map) {
     if (map instanceof CesiumMap) {
-      return [new CesiumTilesetCesiumImpl(map, this.getImplementationOptions())];
+      return [
+        new CesiumTilesetCesiumImpl(map, this.getImplementationOptions()),
+      ];
     }
 
     return [];
@@ -128,7 +137,9 @@ class PointCloudLayer extends CesiumTilesetLayer {
    */
   setStyle(style, silent) {
     if (style instanceof VectorStyleItem) {
-      this.getLogger().warning('trying to apply vector style to point cloud layer.');
+      this.getLogger().warning(
+        'trying to apply vector style to point cloud layer.',
+      );
     } else {
       super.setStyle(style, silent);
     }

package/src/layer/rasterLayer.js

@@ -1,7 +1,21 @@
-import { SplitDirection, WebMercatorTilingScheme, GeographicTilingScheme, Cartographic } from '@vcmap-cesium/engine';
-import { getBottomLeft, getBottomRight, getTopLeft, getTopRight } from 'ol/extent.js';
+import {
+  SplitDirection,
+  WebMercatorTilingScheme,
+  GeographicTilingScheme,
+  Cartographic,
+} from '@vcmap-cesium/engine';
+import {
+  getBottomLeft,
+  getBottomRight,
+  getTopLeft,
+  getTopRight,
+} from 'ol/extent.js';
 
-import { parseInteger, parseNumberRange, parseEnumValue } from '@vcsuite/parsers';
+import {
+  parseInteger,
+  parseNumberRange,
+  parseEnumValue,
+} from '@vcsuite/parsers';
 import { wgs84Projection } from '../util/projection.js';
 import Layer from './layer.js';
 import VcsEvent from '../vcsEvent.js';
@@ -54,11 +68,19 @@ export const TilingScheme = {
  */
 export function getTilingScheme(layerOptions) {
   const tilingSchemeOptions = {};
-  if (layerOptions.numberOfLevelZeroTilesX && layerOptions.numberOfLevelZeroTilesX > 1) {
-    tilingSchemeOptions.numberOfLevelZeroTilesX = layerOptions.numberOfLevelZeroTilesX;
+  if (
+    layerOptions.numberOfLevelZeroTilesX &&
+    layerOptions.numberOfLevelZeroTilesX > 1
+  ) {
+    tilingSchemeOptions.numberOfLevelZeroTilesX =
+      layerOptions.numberOfLevelZeroTilesX;
   }
-  if (layerOptions.numberOfLevelZeroTilesY && layerOptions.numberOfLevelZeroTilesY > 1) {
-    tilingSchemeOptions.numberOfLevelZeroTilesY = layerOptions.numberOfLevelZeroTilesY;
+  if (
+    layerOptions.numberOfLevelZeroTilesY &&
+    layerOptions.numberOfLevelZeroTilesY > 1
+  ) {
+    tilingSchemeOptions.numberOfLevelZeroTilesY =
+      layerOptions.numberOfLevelZeroTilesY;
   }
   if (layerOptions.tilingSchema === TilingScheme.MERCATOR) {
     return new WebMercatorTilingScheme(tilingSchemeOptions);
@@ -73,7 +95,12 @@ export function getTilingScheme(layerOptions) {
  * @param {number} [minLevel=0]
  * @returns {number}
  */
-export function calculateMinLevel(extent, tilingScheme, maxLevel, minLevel = 0) {
+export function calculateMinLevel(
+  extent,
+  tilingScheme,
+  maxLevel,
+  minLevel = 0,
+) {
   if (!extent.isValid()) {
     return minLevel;
   }
@@ -90,11 +117,15 @@ export function calculateMinLevel(extent, tilingScheme, maxLevel, minLevel = 0)
     getTopRight(wgs84Extent),
     getTopLeft(wgs84Extent),
   ];
-  const extentCoords = olCoords.map(coord => Cartographic.fromDegrees(coord[0], coord[1]));
+  const extentCoords = olCoords.map((coord) =>
+    Cartographic.fromDegrees(coord[0], coord[1]),
+  );
   let usedMinLevel = minLevel;
   while (usedMinLevel < maxLevel) {
     // eslint-disable-next-line no-loop-func
-    const tileCoords = extentCoords.map(position => tilingScheme.positionToTileXY(position, usedMinLevel));
+    const tileCoords = extentCoords.map((position) =>
+      tilingScheme.positionToTileXY(position, usedMinLevel),
+    );
     const distances = [];
     distances.push(Math.abs(tileCoords[0].x - tileCoords[1].x));
     distances.push(Math.abs(tileCoords[0].y - tileCoords[3].y));
@@ -116,7 +147,9 @@ export function calculateMinLevel(extent, tilingScheme, maxLevel, minLevel = 0)
  * @abstract
  */
 class RasterLayer extends Layer {
-  static get className() { return 'RasterLayer'; }
+  static get className() {
+    return 'RasterLayer';
+  }
 
   /**
    * @returns {RasterLayerOptions}
@@ -145,7 +178,11 @@ class RasterLayer extends Layer {
      * @type {string}
      * @api
      */
-    this.tilingSchema = parseEnumValue(options.tilingSchema, TilingScheme, defaultOptions.tilingSchema);
+    this.tilingSchema = parseEnumValue(
+      options.tilingSchema,
+      TilingScheme,
+      defaultOptions.tilingSchema,
+    );
     /** @type {number} */
     this.maxLevel = parseInteger(options.maxLevel, defaultOptions.maxLevel);
     /**
@@ -156,21 +193,32 @@ class RasterLayer extends Layer {
 
     const cesiumTilingScheme = getTilingScheme(options);
     /** @type {number} */
-    this.minLevel = calculateMinLevel(this.extent, cesiumTilingScheme, this.maxLevel, this._minLevel);
+    this.minLevel = calculateMinLevel(
+      this.extent,
+      cesiumTilingScheme,
+      this.maxLevel,
+      this._minLevel,
+    );
 
     /**
      * @type {number}
      * @private
      */
-    this._opacity = parseNumberRange(options.opacity, defaultOptions.opacity, 0.0, 1.0);
+    this._opacity = parseNumberRange(
+      options.opacity,
+      defaultOptions.opacity,
+      0.0,
+      1.0,
+    );
 
     /** @type {import("@vcmap-cesium/engine").SplitDirection} */
     this._splitDirection = SplitDirection.NONE;
 
     if (options.splitDirection) {
-      this._splitDirection = options.splitDirection === 'left' ?
-        SplitDirection.LEFT :
-        SplitDirection.RIGHT;
+      this._splitDirection =
+        options.splitDirection === 'left'
+          ? SplitDirection.LEFT
+          : SplitDirection.RIGHT;
     }
 
     /**
@@ -186,7 +234,9 @@ class RasterLayer extends Layer {
    * @api
    * @type {import("@vcmap-cesium/engine").SplitDirection}
    */
-  get splitDirection() { return this._splitDirection; }
+  get splitDirection() {
+    return this._splitDirection;
+  }
 
   /**
    * @param {import("@vcmap-cesium/engine").SplitDirection} direction
@@ -207,7 +257,9 @@ class RasterLayer extends Layer {
    * @api
    * @type {number}
    */
-  get opacity() { return this._opacity; }
+  get opacity() {
+    return this._opacity;
+  }
 
   /**
    * @param {number} opacity
@@ -271,9 +323,8 @@ class RasterLayer extends Layer {
     }
 
     if (this._splitDirection !== SplitDirection.NONE) {
-      config.splitDirection = this._splitDirection === SplitDirection.RIGHT ?
-        'right' :
-        'left';
+      config.splitDirection =
+        this._splitDirection === SplitDirection.RIGHT ? 'right' : 'left';
     }
 
     return config;

package/src/layer/singleImageLayer.js

@@ -26,7 +26,9 @@ import { wgs84Projection } from '../util/projection.js';
  * @api stable
  */
 class SingleImageLayer extends RasterLayer {
-  static get className() { return 'SingleImageLayer'; }
+  static get className() {
+    return 'SingleImageLayer';
+  }
 
   /**
    * @returns {SingleImageOptions}
@@ -48,17 +50,16 @@ class SingleImageLayer extends RasterLayer {
     this.credit = options.credit || defaultOptions.credit;
 
     if (!this.extent.isValid()) {
-      this.getLogger().warning(`layer ${this.name} was constructed with an invalid extent, defaulting to global extent`);
+      this.getLogger().warning(
+        `layer ${this.name} was constructed with an invalid extent, defaulting to global extent`,
+      );
       this.extent = new Extent({
         projection: wgs84Projection.toJSON(),
         coordinates: [-180, -90, 180, 90],
       });
     }
 
-    this._supportedMaps = [
-      CesiumMap.className,
-      OpenlayersMap.className,
-    ];
+    this._supportedMaps = [CesiumMap.className, OpenlayersMap.className];
   }
 
   /**
@@ -79,7 +80,9 @@ class SingleImageLayer extends RasterLayer {
     if (map instanceof CesiumMap) {
       return [new SingleImageCesiumImpl(map, this.getImplementationOptions())];
     } else if (map instanceof OpenlayersMap) {
-      return [new SingleImageOpenlayersImpl(map, this.getImplementationOptions())];
+      return [
+        new SingleImageOpenlayersImpl(map, this.getImplementationOptions()),
+      ];
     }
     return [];
   }

package/src/layer/terrainHelpers.js

@@ -1,4 +1,9 @@
-import { CesiumTerrainProvider, Cartographic, Cartesian2, sampleTerrainMostDetailed } from '@vcmap-cesium/engine';
+import {
+  CesiumTerrainProvider,
+  Cartographic,
+  Cartesian2,
+  sampleTerrainMostDetailed,
+} from '@vcmap-cesium/engine';
 import { getTransform } from 'ol/proj.js';
 import { wgs84Projection } from '../util/projection.js';
 
@@ -25,10 +30,12 @@ export function getTerrainProviderForUrl(options) {
     return terrainProviders[options.url];
   }
   let terrainProvider = terrainProviders[options.url];
-  if ((options.requestVertexNormals !== undefined &&
+  if (
+    (options.requestVertexNormals !== undefined &&
       terrainProvider.requestVertexNormals !== options.requestVertexNormals) ||
     (options.requestWaterMask !== undefined &&
-      terrainProvider.requestWaterMask !== options.requestWaterMask)) {
+      terrainProvider.requestWaterMask !== options.requestWaterMask)
+  ) {
     terrainProviders[options.url] = new CesiumTerrainProvider(options);
     terrainProvider = terrainProviders[options.url];
   }
@@ -43,29 +50,32 @@ export function getTerrainProviderForUrl(options) {
  * @param {Array<import("ol/coordinate").Coordinate>=} result
  * @returns {Promise<Array<import("ol/coordinate").Coordinate>>}
  */
-export function getHeightFromTerrainProvider(terrainProvider, coordinates, optSourceProjection, result) {
-  const sourceTransformer = optSourceProjection ?
-    getTransform(
-      optSourceProjection.proj,
-      wgs84Projection.proj,
-    ) :
-    null;
+export function getHeightFromTerrainProvider(
+  terrainProvider,
+  coordinates,
+  optSourceProjection,
+  result,
+) {
+  const sourceTransformer = optSourceProjection
+    ? getTransform(optSourceProjection.proj, wgs84Projection.proj)
+    : null;
 
   const positions = coordinates.map((coord) => {
-    const wgs84 = sourceTransformer ?
-      sourceTransformer(coord, coord.slice(), coord.length) :
-      coord;
+    const wgs84 = sourceTransformer
+      ? sourceTransformer(coord, coord.slice(), coord.length)
+      : coord;
     return Cartographic.fromDegrees(wgs84[0], wgs84[1]);
   });
 
-  const outArray = result || coordinates.map(c => c.slice());
-  return sampleTerrainMostDetailed(terrainProvider, positions)
-    .then((updatedPositions) => {
+  const outArray = result || coordinates.map((c) => c.slice());
+  return sampleTerrainMostDetailed(terrainProvider, positions).then(
+    (updatedPositions) => {
       updatedPositions.forEach((position, index) => {
         outArray[index][2] = position.height || 0;
       });
       return outArray;
-    });
+    },
+  );
 }
 
 /**
@@ -80,8 +90,9 @@ export function isTerrainTileAvailable(terrainProvider, level, position) {
     return false;
   }
   const tileXY = terrainProvider.tilingScheme.positionToTileXY(
-    position, level, new Cartesian2(),
+    position,
+    level,
+    new Cartesian2(),
   );
   return terrainProvider.getTileDataAvailable(tileXY.x, tileXY.y, level);
 }
-

package/src/layer/terrainLayer.js

@@ -1,6 +1,9 @@
 import { parseBoolean } from '@vcsuite/parsers';
 import Layer from './layer.js';
-import { getHeightFromTerrainProvider, getTerrainProviderForUrl } from './terrainHelpers.js';
+import {
+  getHeightFromTerrainProvider,
+  getTerrainProviderForUrl,
+} from './terrainHelpers.js';
 import CesiumMap from '../map/cesiumMap.js';
 import TerrainCesiumImpl from './cesium/terrainCesiumImpl.js';
 import { layerClassRegistry } from '../classRegistry.js';
@@ -25,7 +28,9 @@ import { layerClassRegistry } from '../classRegistry.js';
  * @api stable
  */
 class TerrainLayer extends Layer {
-  static get className() { return 'TerrainLayer'; }
+  static get className() {
+    return 'TerrainLayer';
+  }
 
   /**
    * @returns {TerrainOptions}
@@ -45,21 +50,25 @@ class TerrainLayer extends Layer {
     super(options);
     const defaultOptions = TerrainLayer.getDefaultOptions();
 
-    this._supportedMaps = [
-      CesiumMap.className,
-    ];
+    this._supportedMaps = [CesiumMap.className];
 
     /**
      * @type {boolean}
      * @api
      */
-    this.requestVertexNormals = parseBoolean(options.requestVertexNormals, defaultOptions.requestVertexNormals);
+    this.requestVertexNormals = parseBoolean(
+      options.requestVertexNormals,
+      defaultOptions.requestVertexNormals,
+    );
 
     /**
      * @type {boolean}
      * @api
      */
-    this.requestWaterMask = parseBoolean(options.requestWaterMask, defaultOptions.requestWaterMask);
+    this.requestWaterMask = parseBoolean(
+      options.requestWaterMask,
+      defaultOptions.requestWaterMask,
+    );
   }
 
   /**

package/src/layer/tileLoadedHelper.js

@@ -31,13 +31,18 @@ function waitForImplTilesLoaded(impl, timeout) {
  * @returns {Promise<void>}
  */
 export async function tiledLayerLoaded(layer, timeout) {
-  const impls = /** @type {Array<CesiumTilesetCesiumImpl>} */
-    (layer.getImplementations().filter(i => i instanceof CesiumTilesetCesiumImpl));
-  if (!layer.active || impls.every(i => i.cesium3DTileset.tilesLoaded)) {
+  const impls =
+    /** @type {Array<CesiumTilesetCesiumImpl>} */
+    (
+      layer
+        .getImplementations()
+        .filter((i) => i instanceof CesiumTilesetCesiumImpl)
+    );
+  if (!layer.active || impls.every((i) => i.cesium3DTileset.tilesLoaded)) {
     return;
   }
 
-  await Promise.all(impls.map(i => waitForImplTilesLoaded(i, timeout)));
+  await Promise.all(impls.map((i) => waitForImplTilesLoaded(i, timeout)));
 }
 
 /**

package/src/layer/tileProvider/mvtTileProvider.js

@@ -25,7 +25,9 @@ class MVTTileProvider extends TileProvider {
    * @readonly
    * @returns {string}
    */
-  static get className() { return 'MVTTileProvider'; }
+  static get className() {
+    return 'MVTTileProvider';
+  }
 
   /**
    * @returns {MVTTileProviderOptions}
@@ -95,9 +97,10 @@ class MVTTileProvider extends TileProvider {
     const extent = rectangleToExtent(rectangle);
     const center = getCenter(extent);
     const data = await requestArrayBuffer(url);
-    const features = /** @type {Array<import("ol").Feature<import("ol/geom/Geometry").default>>} */
+    const features =
+      /** @type {Array<import("ol").Feature<import("ol/geom/Geometry").default>>} */
       (this._MVTFormat.readFeatures(data));
-    const sx = ((extent[2] - extent[0]) / 4096);
+    const sx = (extent[2] - extent[0]) / 4096;
     const sy = -((extent[3] - extent[1]) / 4096);
     features.forEach((feature) => {
       const idToUse = feature.get(this.idProperty);
@@ -138,4 +141,7 @@ class MVTTileProvider extends TileProvider {
 }
 
 export default MVTTileProvider;
-tileProviderClassRegistry.registerClass(MVTTileProvider.className, MVTTileProvider);
+tileProviderClassRegistry.registerClass(
+  MVTTileProvider.className,
+  MVTTileProvider,
+);

package/src/layer/tileProvider/staticGeojsonTileProvider.js

@@ -21,7 +21,9 @@ class StaticGeoJSONTileProvider extends TileProvider {
    * @readonly
    * @returns {string}
    */
-  static get className() { return 'StaticGeoJSONTileProvider'; }
+  static get className() {
+    return 'StaticGeoJSONTileProvider';
+  }
 
   /**
    * @returns {StaticGeoJSONTileProviderOptions}
@@ -48,7 +50,6 @@ class StaticGeoJSONTileProvider extends TileProvider {
     this.url = options.url || defaultOptions.url;
   }
 
-
   /**
    * @inheritDoc
    * @param {number} x
@@ -67,7 +68,9 @@ class StaticGeoJSONTileProvider extends TileProvider {
    * @returns {StaticGeoJSONTileProviderOptions}
    */
   toJSON() {
-    const config = /** @type {StaticGeoJSONTileProviderOptions} */ (super.toJSON());
+    const config = /** @type {StaticGeoJSONTileProviderOptions} */ (
+      super.toJSON()
+    );
     delete config.baseLevels;
 
     if (this.url) {
@@ -78,4 +81,7 @@ class StaticGeoJSONTileProvider extends TileProvider {
 }
 
 export default StaticGeoJSONTileProvider;
-tileProviderClassRegistry.registerClass(StaticGeoJSONTileProvider.className, StaticGeoJSONTileProvider);
+tileProviderClassRegistry.registerClass(
+  StaticGeoJSONTileProvider.className,
+  StaticGeoJSONTileProvider,
+);