@vcmap/core 6.1.11 → 6.2.0-rc.1

package/src/util/mapCollection.ts

@@ -8,12 +8,20 @@ import LayerCollection from './layerCollection.js';
 import ClippingObjectManager from './clipping/clippingObjectManager.js';
 import type OpenlayersMap from '../map/openlayersMap.js';
 import type CesiumMap from '../map/cesiumMap.js';
-// eslint-disable-next-line import/no-named-default
-import type { default as VcsMap, VcsMapRenderEvent } from '../map/vcsMap.js';
+import type {
+  // eslint-disable-next-line import/no-named-default
+  default as VcsMap,
+  VcsMapRenderEvent,
+  VisualisationType,
+} from '../map/vcsMap.js';
 import type Viewpoint from './viewpoint.js';
-import { VisualisationType } from '../map/vcsMap.js';
+import { getViewpointForPanoramaImage } from './viewpoint.js';
 import Navigation from '../map/navigation/navigation.js';
 import KeyboardController from '../map/navigation/controller/keyboardController.js';
+import PanoramaImageSelection from '../interaction/panoramaImageSelection.js';
+import type { PanoramaImage } from '../panorama/panoramaImage.js';
+import type PanoramaMap from '../map/panoramaMap.js';
+import PanoramaFeatureHighlight from '../interaction/panoramaFeatureHighlight.js';
 
 export type MapCollectionInitializationError = {
   error: Error;
@@ -65,7 +73,6 @@ class MapCollection extends Collection<VcsMap> {
     const collection = new MapCollection();
 
     if (iterable) {
-      // eslint-disable-next-line no-restricted-syntax
       for (const map of iterable) {
         collection.add(map);
       }
@@ -93,21 +100,25 @@ class MapCollection extends Collection<VcsMap> {
    */
   private _layerCollection = new LayerCollection();
 
+  private _panoramaImageSelection = new PanoramaImageSelection(this);
+
+  private _panoramaTileHighlight = new PanoramaFeatureHighlight();
+
   /**
    * Called, if a map fails to initialize. The map causing the error will be removed from the collection.
    */
-  initializeError: VcsEvent<MapCollectionInitializationError> = new VcsEvent();
+  initializeError = new VcsEvent<MapCollectionInitializationError>();
 
   /**
    * Called, when a map (typically an oblique map) cannot show the current viewpoint. Is passed
    * the map which cannot show the current viewpoint.
    */
-  fallbackMapActivated: VcsEvent<VcsMap> = new VcsEvent();
+  fallbackMapActivated = new VcsEvent<VcsMap>();
 
   /**
    * Called, when a map is activated. Is passed the activated map.
    */
-  mapActivated: VcsEvent<VcsMap> = new VcsEvent();
+  mapActivated = new VcsEvent<VcsMap>();
 
   /**
    * Manages the clipping object for the maps in this collection.
@@ -126,7 +137,7 @@ class MapCollection extends Collection<VcsMap> {
   /**
    * Event raised when the maps split position changes. It passed the position as its only argument.
    */
-  splitPositionChanged: VcsEvent<number> = new VcsEvent();
+  splitPositionChanged = new VcsEvent<number>();
 
   private _postRender = new VcsEvent<VcsMapRenderEvent<VisualisationType>>();
 
@@ -156,6 +167,9 @@ class MapCollection extends Collection<VcsMap> {
     this.navigation.addController(
       new KeyboardController({ id: 'keyboard', target: this._target }),
     );
+
+    this.eventHandler.addPersistentInteraction(this._panoramaImageSelection);
+    this.eventHandler.addPersistentInteraction(this._panoramaTileHighlight);
   }
 
   /**
@@ -322,6 +336,68 @@ class MapCollection extends Collection<VcsMap> {
     return fallbackMap || this.getByType('OpenlayersMap')[0] || this._array[0];
   }
 
+  private async _setActiveMap(
+    map: VcsMap,
+    viewpoint?: Viewpoint | null,
+  ): Promise<void> {
+    if (this._activeMap) {
+      this._activeMap.deactivate();
+      if (this._target) {
+        const mapClassName = this._activeMap.className;
+        this._target.classList.remove(mapClassName);
+      }
+    }
+
+    const previousMap = this._activeMap;
+    this._activeMap = map;
+    await this._activeMap.activate();
+    this._setActiveMapCSSClass();
+
+    if (viewpoint) {
+      await this._activeMap.gotoViewpoint(viewpoint);
+    }
+
+    const disableMapControlOptions: DisableMapControlOptions = {
+      apiCalls: !!previousMap?.movementApiCallsDisabled,
+      keyEvents: !!previousMap?.movementKeyEventsDisabled,
+      pointerEvents: !!previousMap?.movementPointerEventsDisabled,
+    };
+    map.disableMovement(disableMapControlOptions);
+    previousMap?.disableMovement(false);
+
+    this.clippingObjectManager.mapActivated(map);
+    this.navigation.mapActivated(map);
+    this._postRenderListener();
+    this._postRenderListener = this._activeMap.postRender.addEventListener(
+      (event) => {
+        this.postRender.raiseEvent(event);
+      },
+    );
+    this.mapActivated.raiseEvent(map);
+  }
+
+  async activatePanoramaMap(
+    map: PanoramaMap,
+    panoramaImage: PanoramaImage,
+  ): Promise<void> {
+    if (!this._array.includes(map)) {
+      getLogger('MapCollection').warning(
+        'this map is not part of this collection',
+      );
+      return;
+    }
+
+    if (this._activeMap?.className === 'CesiumMap') {
+      const viewpoint = getViewpointForPanoramaImage(panoramaImage);
+      viewpoint.animate = true;
+      viewpoint.duration = 1;
+      await this._activeMap.gotoViewpoint(viewpoint);
+    }
+
+    map.setCurrentImage(panoramaImage);
+    await this._setActiveMap(map);
+  }
+
   /**
    * Sets the active map. This will 1. get the current viewpoint of an acitve map (if one is set) 2.
    * determine that the map to be activated can show this viewpoint or has no fallback map set and 3.
@@ -369,17 +445,28 @@ class MapCollection extends Collection<VcsMap> {
       throw new Error('cannot activate a single map');
     }
 
+    if (this._activeMap === map) {
+      return map.activate();
+    }
+
     let viewpoint;
     if (this._activeMap || this._cachedViewpoint) {
-      if (this._activeMap === map) {
-        return map.activate();
-      }
-
       viewpoint = this._activeMap
         ? await this._activeMap.getViewpoint()
         : this._cachedViewpoint;
 
-      const canShow = await map.canShowViewpoint(viewpoint as Viewpoint);
+      let canShow = false;
+      if (map.className === 'PanoramaMap' && viewpoint) {
+        const panoramaImage = await (
+          map as PanoramaMap
+        ).getClosestImageFromViewpoint(viewpoint);
+        if (panoramaImage) {
+          return this.activatePanoramaMap(map as PanoramaMap, panoramaImage);
+        }
+      } else {
+        canShow = await map.canShowViewpoint(viewpoint as Viewpoint);
+      }
+
       if (!canShow) {
         const fallbackMap = this._getFallbackMap(map);
         if (fallbackMap) {
@@ -391,43 +478,11 @@ class MapCollection extends Collection<VcsMap> {
           return Promise.resolve();
         }
       }
-      this._cachedViewpoint = null;
-      if (this._activeMap) {
-        this._activeMap.deactivate();
-        if (this._target) {
-          const mapClassName = this._activeMap.className;
-          this._target.classList.remove(mapClassName);
-        }
-      }
-    }
 
-    const previousMap = this._activeMap;
-    this._activeMap = map;
-    await this._activeMap.activate();
-    this._setActiveMapCSSClass();
-
-    if (viewpoint) {
-      await this._activeMap.gotoViewpoint(viewpoint);
+      this._cachedViewpoint = null;
     }
 
-    const disableMapControlOptions: DisableMapControlOptions = {
-      apiCalls: !!previousMap?.movementApiCallsDisabled,
-      keyEvents: !!previousMap?.movementKeyEventsDisabled,
-      pointerEvents: !!previousMap?.movementPointerEventsDisabled,
-    };
-    map.disableMovement(disableMapControlOptions);
-    previousMap?.disableMovement(false);
-
-    this.clippingObjectManager.mapActivated(map);
-    this.navigation.mapActivated(map);
-    this._postRenderListener();
-    this._postRenderListener = this._activeMap.postRender.addEventListener(
-      (event) => {
-        this.postRender.raiseEvent(event);
-      },
-    );
-    this.mapActivated.raiseEvent(map);
-    return Promise.resolve();
+    return this._setActiveMap(map, viewpoint);
   }
 
   /**
@@ -500,6 +555,8 @@ class MapCollection extends Collection<VcsMap> {
       l.destroy();
     });
     this._layerCollection.destroy();
+    this._panoramaImageSelection.destroy();
+    this._panoramaTileHighlight.destroy();
     this.eventHandler.destroy();
     this.mapActivated.destroy();
     this.clippingObjectManager.destroy();

package/src/util/overrideCollection.ts

@@ -51,7 +51,7 @@ export type OverrideCollectionInterface<T, S> = {
   ) => Promise<void>;
   getSerializedByKey: (key: string) => S | undefined;
   removeModule: (moduleId: string) => void;
-  serializeModule: (moduleId: string) => object[];
+  serializeModule: (moduleId: string) => S[];
   [isOverrideCollection]: boolean;
   uniqueKey: keyof T;
 };
@@ -89,6 +89,7 @@ function makeOverrideCollection<
   getDynamicModuleId: () => string,
   serializeItem?: (item: T) => S & { [moduleIdSymbol]?: string },
   deserializeItem?: (item: S) => T | Promise<T> | null,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ctor?: new (...args: any[]) => T,
   determineShadowIndex?: (
     item: T,
@@ -292,9 +293,7 @@ function makeOverrideCollection<
 
   overrideCollection.replaced = new VcsEvent();
 
-  overrideCollection.serializeModule = function serializeModule(
-    moduleId,
-  ): object[] {
+  overrideCollection.serializeModule = function serializeModule(moduleId): S[] {
     return [...overrideCollection]
       .map((item) => {
         if (item[moduleIdSymbol] === moduleId) {
@@ -312,7 +311,7 @@ function makeOverrideCollection<
         }
         return null;
       })
-      .filter((i) => i) as object[];
+      .filter((i) => i) as S[];
   };
 
   const originalDestroy = overrideCollection.destroy.bind(overrideCollection);

package/src/util/projection.ts

@@ -1,9 +1,5 @@
-import {
-  getTransform,
-  get as getProjection,
-  equivalent,
-  Projection as OLProjection,
-} from 'ol/proj.js';
+import type { Projection as OLProjection } from 'ol/proj.js';
+import { getTransform, get as getProjection, equivalent } from 'ol/proj.js';
 import { register } from 'ol/proj/proj4.js';
 import type { Coordinate } from 'ol/coordinate.js';
 import proj4 from 'proj4';
@@ -49,7 +45,7 @@ export function parseEPSGCode(
 ): string {
   if (value) {
     const regex = new RegExp(`^(?:${prefix})?:?(\\d+)`, 'i');
-    const matches = `${value}`.match(regex);
+    const matches = String(value).match(regex);
     if (matches && matches[1]) {
       if (prefix) {
         if (prefix.endsWith(':')) {

package/src/util/renderScreenshot.ts

@@ -1,9 +1,9 @@
-import { Size } from 'ol/size.js';
+import type { Size } from 'ol/size.js';
 import { getLogger } from '@vcsuite/logger';
 import CesiumMap from '../map/cesiumMap.js';
 import OpenlayersMap from '../map/openlayersMap.js';
 import ObliqueMap from '../map/obliqueMap.js';
-import VcsApp from '../vcsApp.js';
+import type VcsApp from '../vcsApp.js';
 /**
  * Prepares the cesium map for the screenshot
  * @param map - The cesium map

package/src/util/rotation.ts

@@ -1,16 +1,15 @@
+import type { JulianDate, HeadingPitchRollValues } from '@vcmap-cesium/engine';
 import {
   Camera,
   Cartesian2,
   Cartesian3,
   Cartographic,
   Math as CesiumMath,
-  JulianDate,
-  HeadingPitchRollValues,
 } from '@vcmap-cesium/engine';
 import Viewpoint from './viewpoint.js';
-import VcsApp from '../vcsApp.js';
-import { CesiumMap } from '../../index.js';
+import type VcsApp from '../vcsApp.js';
 import Projection from './projection.js';
+import CesiumMap from '../map/cesiumMap.js';
 
 /**
  * Unique symbol for rotation.

package/src/util/urlHelpers.ts

@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/prefer-default-export
 export function isSameOrigin(source: string): boolean {
   const { location } = window;
   const url = new URL(

package/src/util/vcsTemplate.ts

@@ -1,9 +1,9 @@
+import type { LiteralValue } from 'ol/expr/expression.js';
 import {
   BooleanType,
   newParsingContext,
   StringType,
   NoneType,
-  LiteralValue,
 } from 'ol/expr/expression.js';
 import { buildExpression, newEvaluationContext } from 'ol/expr/cpu.js';
 import { is } from '@vcsuite/check';
@@ -30,7 +30,8 @@ function evaluateExpression(
   evaluationType: number,
 ): LiteralValue {
   const parsed = expressionString.startsWith('[')
-    ? (JSON.parse(expressionString) as any[])
+    ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (JSON.parse(expressionString) as any[])
     : [
         'get',
         ...expressionString
@@ -81,7 +82,7 @@ function replaceAttributes(
 function regexHits(regexp: RegExp, string: string): RegExpExecArray[] {
   const hits = [];
   let hit;
-  // eslint-disable-next-line no-cond-assign
+
   while ((hit = regexp.exec(string))) {
     hits.push(hit);
   }
@@ -340,7 +341,7 @@ function expandConditionalsAndLoops(
           .slice(0, 3);
 
         const blockTemplate = getSubTemplateForBlock(renderedTemplate, block);
-        // eslint-disable-next-line no-restricted-syntax
+
         for (const args of keyValuePairs) {
           const forEachData = structuredClone(data);
           forEachData[valueName] = args[1];
@@ -382,7 +383,7 @@ function defaultTranslate(key: string): string {
  * 2. expand iterations. this will create new templates for each iteration and re-run the rendering for those blocks
  * 3. render attributes. this will add the attributes to all the blocks not within each blocks
  */
-// eslint-disable-next-line import/prefer-default-export
+
 export function renderTemplate(
   template: string | string[],
   data: Record<string, unknown>,

package/src/util/viewpoint.ts

@@ -1,10 +1,14 @@
 import type { Coordinate } from 'ol/coordinate.js';
+import type { Extent as OLExtent } from 'ol/extent.js';
 import { containsCoordinate } from 'ol/extent.js';
-import { EasingFunction } from '@vcmap-cesium/engine';
+import { EasingFunction, Math as CesiumMath } from '@vcmap-cesium/engine';
 import { parseBoolean, parseNumber } from '@vcsuite/parsers';
 import Projection, { wgs84Projection } from './projection.js';
-import VcsObject, { VcsObjectOptions } from '../vcsObject.js';
+import type { VcsObjectOptions } from '../vcsObject.js';
+import VcsObject from '../vcsObject.js';
 import Extent from './extent.js';
+import type { PanoramaImage } from '../panorama/panoramaImage.js';
+import { cartesianToMercator } from './math.js';
 
 /**
  * compares two numeric properties
@@ -263,7 +267,7 @@ class Viewpoint extends VcsObject {
    * @param  extent
    */
   static createViewpointFromExtent(
-    extent: import('ol/extent.js').Extent | Extent,
+    extent: OLExtent | Extent,
   ): Viewpoint | null {
     const extentCoordinates =
       extent instanceof Extent
@@ -412,3 +416,16 @@ class Viewpoint extends VcsObject {
 }
 
 export default Viewpoint;
+
+export function getViewpointForPanoramaImage(image: PanoramaImage): Viewpoint {
+  const { heading, pitch, roll } = image.orientation;
+
+  return new Viewpoint({
+    cameraPosition: Projection.mercatorToWgs84(
+      cartesianToMercator(image.position),
+    ),
+    heading: CesiumMath.toDegrees(heading),
+    pitch: CesiumMath.toDegrees(pitch),
+    roll: CesiumMath.toDegrees(roll),
+  });
+}

package/src/vcsApp.ts

@@ -1,7 +1,10 @@
-import { getLogger as getLoggerByName, Logger } from '@vcsuite/logger';
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { Logger } from '@vcsuite/logger';
+import { getLogger as getLoggerByName } from '@vcsuite/logger';
 import { v4 as uuidv4 } from 'uuid';
 import { check } from '@vcsuite/check';
-import VcsModule, { VcsModuleConfig } from './vcsModule.js';
+import type { VcsModuleConfig } from './vcsModule.js';
+import VcsModule from './vcsModule.js';
 import {
   destroyCollection,
   deserializeViewpoint,
@@ -10,9 +13,8 @@ import {
   serializeLayer,
   deserializeLayer,
 } from './vcsModuleHelpers.js';
-import makeOverrideCollection, {
-  OverrideCollection,
-} from './util/overrideCollection.js';
+import type { OverrideCollection } from './util/overrideCollection.js';
+import makeOverrideCollection from './util/overrideCollection.js';
 import CategoryCollection from './category/categoryCollection.js';
 import MapCollection from './util/mapCollection.js';
 import VcsMap from './map/vcsMap.js';
@@ -20,16 +22,16 @@ import Layer from './layer/layer.js';
 import Collection from './util/collection.js';
 import ObliqueCollection from './oblique/obliqueCollection.js';
 import Viewpoint from './util/viewpoint.js';
-import StyleItem, { StyleItemOptions } from './style/styleItem.js';
+import type { StyleItemOptions } from './style/styleItem.js';
+import StyleItem from './style/styleItem.js';
 import IndexedCollection from './util/indexedCollection.js';
 import VcsEvent from './vcsEvent.js';
 import { setDefaultProjectionOptions } from './util/projection.js';
 import ObliqueMap from './map/obliqueMap.js';
 import OverrideClassRegistry from './overrideClassRegistry.js';
+import type { AbstractCtor, CtorType } from './classRegistry.js';
 import ClassRegistry, {
-  AbstractCtor,
   categoryClassRegistry,
-  Ctor,
   featureProviderClassRegistry,
   getObjectFromClassRegistry,
   layerClassRegistry,
@@ -43,20 +45,16 @@ import type LayerCollection from './util/layerCollection.js';
 import type Category from './category/category.js';
 import type TileProvider from './layer/tileProvider/tileProvider.js';
 import type AbstractFeatureProvider from './featureProvider/abstractFeatureProvider.js';
-import {
-  createHiddenObjectsCollection,
-  HiddenObject,
-} from './util/hiddenObjects.js';
-import FlightInstance, {
-  FlightInstanceOptions,
-} from './util/flight/flightInstance.js';
+import type { HiddenObject } from './util/hiddenObjects.js';
+import { createHiddenObjectsCollection } from './util/hiddenObjects.js';
+import type { FlightInstanceOptions } from './util/flight/flightInstance.js';
+import FlightInstance from './util/flight/flightInstance.js';
 import FlightCollection from './util/flight/flightCollection.js';
 import DisplayQuality from './util/displayQuality/displayQuality.js';
 import VectorClusterGroup from './vectorCluster/vectorClusterGroup.js';
-import VectorClusterGroupCollection from './vectorCluster/vectorClusterGroupCollection.js';
-import ClippingPolygonObject, {
-  ClippingPolygonObjectOptions,
-} from './util/clipping/clippingPolygonObject.js';
+import type VectorClusterGroupCollection from './vectorCluster/vectorClusterGroupCollection.js';
+import type { ClippingPolygonObjectOptions } from './util/clipping/clippingPolygonObject.js';
+import ClippingPolygonObject from './util/clipping/clippingPolygonObject.js';
 import ClippingPolygonObjectCollection from './util/clipping/clippingPolygonObjectCollection.js';
 
 function getLogger(): Logger {
@@ -70,7 +68,7 @@ export type VcsAppOptions = {
   properties?: Record<string, unknown>;
 };
 
-const vcsApps: Map<string, VcsApp> = new Map();
+const vcsApps = new Map<string, VcsApp>();
 
 export const defaultDynamicModuleId = '_defaultDynamicModule';
 
@@ -151,7 +149,7 @@ class VcsApp {
     }>;
   };
 
-  private _categoryItemClassRegistry: OverrideClassRegistry<Ctor<any>>;
+  private _categoryItemClassRegistry: OverrideClassRegistry<CtorType<any>>;
 
   private _tileProviderClassRegistry: OverrideClassRegistry<
     typeof TileProvider
@@ -457,7 +455,7 @@ class VcsApp {
       .filter((l) => l[moduleIdSymbol] === module._id)
       .forEach((l) => {
         if (l.activeOnStartup) {
-          l.activate().catch((err) => {
+          l.activate().catch((err: unknown) => {
             getLogger().error(
               `Failed to activate active on startup layer ${l.name}`,
             );
@@ -539,7 +537,7 @@ class VcsApp {
     });
   }
 
-  _startModuleMutationChain(): void {
+  private _startModuleMutationChain(): void {
     if (!this._moduleMutationChain.running) {
       const item = this._moduleMutationChain.items.shift();
       if (item) {
@@ -547,8 +545,12 @@ class VcsApp {
           this._moduleMutationChain.running = true;
           item
             .mutation()
-            .then(() => item.resolve())
-            .catch((err) => item.reject(err))
+            .then(() => {
+              item.resolve();
+            })
+            .catch((err: unknown) => {
+              item.reject(err);
+            })
             .finally(() => {
               this._moduleMutationChain.running = false;
               this._startModuleMutationChain();
@@ -578,12 +580,8 @@ class VcsApp {
       this._obliqueCollections.serializeModule(moduleId);
     config.viewpoints = this._viewpoints.serializeModule(moduleId);
     config.styles = this._styles.serializeModule(moduleId);
-    config.hiddenObjects = this._hiddenObjects.serializeModule(
-      moduleId,
-    ) as HiddenObject[];
-    config.clippingPolygons = this._clippingPolygons.serializeModule(
-      moduleId,
-    ) as ClippingPolygonObjectOptions[];
+    config.hiddenObjects = this._hiddenObjects.serializeModule(moduleId);
+    config.clippingPolygons = this._clippingPolygons.serializeModule(moduleId);
     config.flights = this._flights.serializeModule(moduleId);
     config.categories = [...this._categories]
       .map((c) => c.serializeModule(moduleId))
@@ -616,17 +614,16 @@ class VcsApp {
   }
 
   protected async _removeModule(moduleId: string): Promise<void> {
-    await Promise.all([
-      this._maps.removeModule(moduleId),
-      this._layers.removeModule(moduleId),
-      this._viewpoints.removeModule(moduleId),
-      this._styles.removeModule(moduleId),
-      this._obliqueCollections.removeModule(moduleId),
-      this._hiddenObjects.removeModule(moduleId),
-      this._clippingPolygons.removeModule(moduleId),
-      this._flights.removeModule(moduleId),
-      this._vectorClusterGroups.removeModule(moduleId),
-    ]);
+    this._maps.removeModule(moduleId);
+    this._layers.removeModule(moduleId);
+    this._viewpoints.removeModule(moduleId);
+    this._styles.removeModule(moduleId);
+    this._obliqueCollections.removeModule(moduleId);
+    this._hiddenObjects.removeModule(moduleId);
+    this._clippingPolygons.removeModule(moduleId);
+    this._flights.removeModule(moduleId);
+    this._vectorClusterGroups.removeModule(moduleId);
+    return Promise.resolve();
   }
 
   async removeModule(moduleId: string): Promise<void> {
@@ -693,6 +690,9 @@ export function getVcsAppById(id: string): VcsApp | undefined {
 
 window.vcs = window.vcs || {};
 window.vcs.apps = vcsApps;
+window.vcs.getFirstApp = (): VcsApp | undefined => {
+  return vcsApps.values().next().value;
+};
 window.vcs.createModuleFromConfig = (config: VcsModuleConfig): VcsModule =>
   new VcsModule(config);
 

package/src/vcsEvent.ts

@@ -1,7 +1,7 @@
 type Listener<T> = (event: T) => Promise<void> | void;
 
 class VcsEvent<T> {
-  private _listeners: Set<Listener<T>> = new Set();
+  private _listeners = new Set<Listener<T>>();
 
   /**
    * The number of listeners

package/src/vcsModuleHelpers.ts

@@ -33,6 +33,7 @@ export function deserializeMap(
   if (map) {
     map.layerCollection = vcsApp.layers;
   }
+
   return map;
 }
 
@@ -40,7 +41,7 @@ export function deserializeViewpoint(
   viewpointObject: ViewpointOptions,
 ): null | Viewpoint {
   const viewpoint = new Viewpoint(viewpointObject);
-  if (viewpoint && viewpoint.isValid()) {
+  if (viewpoint.isValid()) {
     return viewpoint;
   }
   getLogger().warning(`Viewpoint ${String(viewpointObject.name)} is not valid`);
@@ -108,13 +109,13 @@ export function serializeLayer(
   // @ts-ignore
   serializedLayer.zIndex = layer[vcsApp.layers.zIndexSymbol] as number;
   if (
-    (serializedLayer?.style as StyleItemOptions)?.name &&
+    (serializedLayer.style as StyleItemOptions | undefined)?.name &&
     vcsApp.styles.hasKey((serializedLayer.style as StyleItemOptions).name)
   ) {
     serializedLayer.style = (serializedLayer.style as StyleItemOptions).name;
   }
   if (
-    (serializedLayer?.highlightStyle as StyleItemOptions)?.name &&
+    (serializedLayer.highlightStyle as StyleItemOptions | undefined)?.name &&
     vcsApp.styles.hasKey(
       (serializedLayer.highlightStyle as StyleItemOptions).name,
     )

package/src/vectorCluster/vectorClusterCesiumContext.ts

@@ -1,24 +1,23 @@
-import {
+import type {
   CustomDataSource,
   EntityCollection,
   Entity,
   Scene,
 } from '@vcmap-cesium/engine';
-import { StyleLike } from 'ol/style/Style.js';
+import type { StyleLike } from 'ol/style/Style.js';
 import type { Feature } from 'ol/index.js';
-import {
-  CesiumVectorContext,
-  setReferenceForPicking,
-} from '../layer/cesium/vectorContext.js';
-import VectorProperties from '../layer/vectorProperties.js';
-import convert, { ConvertedItem } from '../util/featureconverter/convert.js';
+import type { CesiumVectorContext } from '../layer/cesium/vectorContext.js';
+import { setReferenceForPicking } from '../layer/cesium/vectorContext.js';
+import type VectorProperties from '../layer/vectorProperties.js';
+import type { ConvertedItem } from '../util/featureconverter/convert.js';
+import convert from '../util/featureconverter/convert.js';
 
 class VectorClusterCesiumContext implements CesiumVectorContext {
   entities: EntityCollection;
 
   private _featureItems = new Map<Feature, () => void>();
 
-  private _convertingFeatures: Map<Feature, () => void> = new Map();
+  private _convertingFeatures = new Map<Feature, () => void>();
 
   constructor(dataSource: CustomDataSource) {
     this.entities = dataSource.entities;