@vcmap/core 5.0.2 → 5.1.0-rc.1

package/src/util/viewpoint.ts

@@ -1,4 +1,5 @@
 import type { Coordinate } from 'ol/coordinate.js';
+import { containsCoordinate } from 'ol/extent.js';
 import { EasingFunction } from '@vcmap-cesium/engine';
 import { parseBoolean, parseNumber } from '@vcsuite/parsers';
 import Projection, { wgs84Projection } from './projection.js';
@@ -159,12 +160,27 @@ class Viewpoint extends VcsObject {
    */
   easingFunctionName: string | undefined;
 
+  static getDefaultOptions(): ViewpointOptions {
+    return {
+      cameraPosition: undefined,
+      groundPosition: undefined,
+      distance: 1000,
+      heading: 0,
+      pitch: -90,
+      roll: 0,
+      animate: false,
+      duration: undefined,
+      easingFunctionName: undefined,
+    };
+  }
+
   /**
    * @param  options
    */
   constructor(options: ViewpointOptions) {
     super(options);
 
+    const defaultOptions = Viewpoint.getDefaultOptions();
     this.cameraPosition = null;
     if (
       Array.isArray(options.cameraPosition) &&
@@ -179,12 +195,12 @@ class Viewpoint extends VcsObject {
     }
     this.distance = parseNumber(
       options.distance,
-      this.cameraPosition ? this.cameraPosition[2] : 1000,
+      this.cameraPosition ? this.cameraPosition[2] : defaultOptions.distance,
     );
-    this.heading = parseNumber(options.heading, 0);
-    this.pitch = parseNumber(options.pitch, -90);
-    this.roll = parseNumber(options.roll, 0);
-    this.animate = parseBoolean(options.animate, false);
+    this.heading = parseNumber(options.heading, defaultOptions.heading);
+    this.pitch = parseNumber(options.pitch, defaultOptions.pitch);
+    this.roll = parseNumber(options.roll, defaultOptions.roll);
+    this.animate = parseBoolean(options.animate, defaultOptions.animate);
     this.duration = parseNumber(options.duration);
     this.easingFunctionName = options.easingFunctionName;
   }
@@ -341,13 +357,17 @@ class Viewpoint extends VcsObject {
       this.cameraPosition &&
       Array.isArray(this.cameraPosition) &&
       this.cameraPosition.length === 3 &&
-      this.cameraPosition.every((position) => Number.isFinite(position));
+      this.cameraPosition.every((position) => Number.isFinite(position)) &&
+      containsCoordinate(Extent.WGS_84_EXTENT, this.cameraPosition);
+
     const hasGround =
       this.groundPosition &&
       Array.isArray(this.groundPosition) &&
       this.groundPosition.length > 1 &&
       this.groundPosition.length < 4 &&
-      this.groundPosition.every((position) => Number.isFinite(position));
+      this.groundPosition.every((position) => Number.isFinite(position)) &&
+      containsCoordinate(Extent.WGS_84_EXTENT, this.groundPosition);
+
     if (!hasGround && !hasCamera) {
       return false;
     }

package/src/vcsApp.ts

@@ -42,6 +42,14 @@ 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 FlightCollection from './util/flight/flightCollection.js';
 
 function getLogger(): Logger {
   return getLoggerByName('init');
@@ -104,7 +112,11 @@ class VcsApp {
 
   private _modules: IndexedCollection<VcsModule>;
 
-  private _categoryClassRegisty: OverrideClassRegistry<typeof Category>;
+  private _hiddenObjects: OverrideCollection<HiddenObject>;
+
+  private _flights: OverrideCollection<FlightInstance, FlightCollection>;
+
+  private _categoryClassRegistry: OverrideClassRegistry<typeof Category>;
 
   private _categories: CategoryCollection;
 
@@ -114,11 +126,11 @@ class VcsApp {
 
   private _categoryItemClassRegistry: OverrideClassRegistry<Ctor<any>>;
 
-  private _tileProviderClassRegsitry: OverrideClassRegistry<
+  private _tileProviderClassRegistry: OverrideClassRegistry<
     typeof TileProvider
   >;
 
-  private _featureProviderClassRegsitry: OverrideClassRegistry<
+  private _featureProviderClassRegistry: OverrideClassRegistry<
     typeof AbstractFeatureProvider
   >;
 
@@ -186,7 +198,20 @@ class VcsApp {
     this._modules = new IndexedCollection('_id');
     this._modules.add(this._dynamicModule);
 
-    this._categoryClassRegisty = new OverrideClassRegistry(
+    this._hiddenObjects = createHiddenObjectsCollection(
+      getDynamicModuleId,
+      this._layers.globalHider,
+    );
+
+    this._flights = makeOverrideCollection(
+      new FlightCollection(this),
+      getDynamicModuleId,
+      undefined,
+      (flightOptions: FlightInstanceOptions) =>
+        new FlightInstance(flightOptions),
+    );
+
+    this._categoryClassRegistry = new OverrideClassRegistry(
       categoryClassRegistry,
     );
     this._categories = new CategoryCollection(this);
@@ -195,10 +220,10 @@ class VcsApp {
     this._categoryItemClassRegistry = new OverrideClassRegistry(
       new ClassRegistry(),
     );
-    this._tileProviderClassRegsitry = new OverrideClassRegistry(
+    this._tileProviderClassRegistry = new OverrideClassRegistry(
       tileProviderClassRegistry,
     );
-    this._featureProviderClassRegsitry = new OverrideClassRegistry(
+    this._featureProviderClassRegistry = new OverrideClassRegistry(
       featureProviderClassRegistry,
     );
 
@@ -262,6 +287,14 @@ class VcsApp {
     return this._categories;
   }
 
+  get hiddenObject(): OverrideCollection<HiddenObject> {
+    return this._hiddenObjects;
+  }
+
+  get flights(): OverrideCollection<FlightInstance, FlightCollection> {
+    return this._flights;
+  }
+
   get destroyed(): VcsEvent<void> {
     return this._destroyed;
   }
@@ -299,7 +332,7 @@ class VcsApp {
   }
 
   get categoryClassRegistry(): OverrideClassRegistry<typeof Category> {
-    return this._categoryClassRegisty;
+    return this._categoryClassRegistry;
   }
 
   get categoryItemClassRegistry(): OverrideClassRegistry<Ctor<any>> {
@@ -307,13 +340,13 @@ class VcsApp {
   }
 
   get tileProviderClassRegistry(): OverrideClassRegistry<typeof TileProvider> {
-    return this._tileProviderClassRegsitry;
+    return this._tileProviderClassRegistry;
   }
 
   get featureProviderClassRegistry(): OverrideClassRegistry<
     typeof AbstractFeatureProvider
   > {
-    return this._featureProviderClassRegsitry;
+    return this._featureProviderClassRegistry;
   }
 
   getModuleById(id: string): VcsModule | undefined {
@@ -329,7 +362,7 @@ class VcsApp {
 
     await this._styles.parseItems(config.styles, module._id);
     await this._layers.parseItems(config.layers, module._id);
-    // TODO add flights & ade here
+    // TODO add ade here
 
     await this._obliqueCollections.parseItems(
       config.obliqueCollections,
@@ -337,6 +370,8 @@ class VcsApp {
     );
     await this._viewpoints.parseItems(config.viewpoints, module._id);
     await this._maps.parseItems(config.maps, module._id);
+    await this._hiddenObjects.parseItems(config.hiddenObjects, module._id);
+    await this._flights.parseItems(config.flights, module._id);
 
     if (Array.isArray(config.categories)) {
       await Promise.all(
@@ -358,8 +393,6 @@ class VcsApp {
               `Failed to activate active on startup layer ${l.name}`,
             );
             getLogger().error(String(err));
-            this._layers.remove(l);
-            l.destroy();
           });
         }
       });
@@ -424,6 +457,10 @@ 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.flights = this._flights.serializeModule(moduleId);
     config.categories = [...this._categories]
       .map((c) => c.serializeModule(moduleId))
       .filter((c) => !!c) as { name: string; items: object[] }[];
@@ -461,6 +498,8 @@ class VcsApp {
       this._viewpoints.removeModule(moduleId),
       this._styles.removeModule(moduleId),
       this._obliqueCollections.removeModule(moduleId),
+      this._hiddenObjects.removeModule(moduleId),
+      this._flights.removeModule(moduleId),
     ]);
   }
 
@@ -494,13 +533,15 @@ class VcsApp {
     destroyCollection(this._viewpoints);
     destroyCollection(this._styles);
     destroyCollection(this._categories);
+    this._modules.destroy();
+    this._hiddenObjects.destroy();
     this._mapClassRegistry.destroy();
     this._layerClassRegistry.destroy();
     this._styleClassRegistry.destroy();
-    this._categoryClassRegisty.destroy();
+    this._categoryClassRegistry.destroy();
     this._categoryItemClassRegistry.destroy();
-    this._tileProviderClassRegsitry.destroy();
-    this._featureProviderClassRegsitry.destroy();
+    this._tileProviderClassRegistry.destroy();
+    this._featureProviderClassRegistry.destroy();
     this.destroyed.raiseEvent();
     this.destroyed.destroy();
     this.localeChanged.destroy();

package/src/vcsModule.ts

@@ -7,6 +7,8 @@ import type { ViewpointOptions } from './util/viewpoint.js';
 import type { ObliqueCollectionOptions } from './oblique/obliqueCollection.js';
 import type VcsApp from './vcsApp.js';
 import { moduleIdSymbol } from './moduleIdSymbol.js';
+import { HiddenObject } from './util/hiddenObjects.js';
+import { FlightInstanceOptions } from './util/flight/flightInstance.js';
 
 export type VcsModuleConfig = {
   _id?: string | undefined;
@@ -23,6 +25,8 @@ export type VcsModuleConfig = {
   projection?: ProjectionOptions;
   obliqueCollections?: ObliqueCollectionOptions[];
   categories?: { name: string; items: object[] }[];
+  hiddenObjects?: HiddenObject[];
+  flights?: FlightInstanceOptions[];
 };
 
 /**