@vcmap/core 5.0.0-rc.21 → 5.0.0-rc.23

package/src/vcsApp.js

@@ -5,7 +5,7 @@ import Context from './context.js';
 import {
   contextIdSymbol,
   destroyCollection,
-  deserializeViewPoint,
+  deserializeViewpoint,
   deserializeMap,
   getLayerIndex,
   serializeLayer,
@@ -18,7 +18,7 @@ import VcsMap from './map/vcsMap.js';
 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 Viewpoint from './util/viewpoint.js';
 import StyleItem from './style/styleItem.js';
 import IndexedCollection from './util/indexedCollection.js';
 import VcsEvent from './vcsEvent.js';
@@ -144,15 +144,15 @@ class VcsApp {
       ObliqueCollection,
     );
     /**
-     * @type {OverrideCollection<import("@vcmap/core").ViewPoint>}
+     * @type {OverrideCollection<import("@vcmap/core").Viewpoint>}
      * @private
      */
-    this._viewPoints = makeOverrideCollection(
+    this._viewpoints = makeOverrideCollection(
       new Collection(),
       getDynamicContextId,
       null,
-      deserializeViewPoint,
-      ViewPoint,
+      deserializeViewpoint,
+      Viewpoint,
     );
     /**
      * @type {OverrideClassRegistry<StyleItem>}
@@ -275,10 +275,10 @@ class VcsApp {
   get obliqueCollections() { return this._obliqueCollections; }
 
   /**
-   * @type {OverrideCollection<import("@vcmap/core").ViewPoint>}
+   * @type {OverrideCollection<import("@vcmap/core").Viewpoint>}
    * @readonly
    */
-  get viewPoints() { return this._viewPoints; }
+  get viewpoints() { return this._viewpoints; }
 
   /**
    * @type {OverrideCollection<import("@vcmap/core").StyleItem>}
@@ -396,7 +396,7 @@ class VcsApp {
     // TODO add flights & ade here
 
     await this._obliqueCollections.parseItems(config.obliqueCollections, context.id);
-    await this._viewPoints.parseItems(config.viewpoints, context.id);
+    await this._viewpoints.parseItems(config.viewpoints, context.id);
     await this._maps.parseItems(config.maps, context.id);
 
     if (Array.isArray(config.categories)) {
@@ -442,10 +442,10 @@ class VcsApp {
       await this._maps.setActiveMap([...this._maps][0].name);
     }
 
-    if (config.startingViewPointName && this._maps.activeMap) {
-      const startViewPoint = this._viewPoints.getByKey(config.startingViewPointName);
-      if (startViewPoint) {
-        await this._maps.activeMap.gotoViewPoint(startViewPoint);
+    if (config.startingViewpointName && this._maps.activeMap) {
+      const startViewpoint = this._viewpoints.getByKey(config.startingViewpointName);
+      if (startViewpoint) {
+        await this._maps.activeMap.gotoViewpoint(startViewpoint);
       }
     }
   }
@@ -501,7 +501,7 @@ class VcsApp {
     await Promise.all([
       this._maps.removeContext(contextId),
       this._layers.removeContext(contextId),
-      this._viewPoints.removeContext(contextId),
+      this._viewpoints.removeContext(contextId),
       this._styles.removeContext(contextId),
       this._obliqueCollections.removeContext(contextId),
     ]);
@@ -539,7 +539,7 @@ class VcsApp {
     destroyCollection(this._maps);
     destroyCollection(this._layers);
     destroyCollection(this._obliqueCollections);
-    destroyCollection(this._viewPoints);
+    destroyCollection(this._viewpoints);
     destroyCollection(this._styles);
     destroyCollection(this._contexts);
     destroyCollection(this._categories);

package/src/vcsAppContextHelpers.js

@@ -1,5 +1,5 @@
 import { getLogger as getLoggerByName } from '@vcsuite/logger';
-import ViewPoint from './util/viewpoint.js';
+import Viewpoint from './util/viewpoint.js';
 import { getObjectFromClassRegistry } from './classRegistry.js';
 
 /**
@@ -35,15 +35,15 @@ export function deserializeMap(vcsApp, mapConfig) {
 }
 
 /**
- * @param {ViewPointOptions} viewPointObject
- * @returns {null|import("@vcmap/core").ViewPoint}
+ * @param {ViewpointOptions} viewpointObject
+ * @returns {null|import("@vcmap/core").Viewpoint}
  */
-export function deserializeViewPoint(viewPointObject) {
-  const viewpoint = new ViewPoint(viewPointObject);
+export function deserializeViewpoint(viewpointObject) {
+  const viewpoint = new Viewpoint(viewpointObject);
   if (viewpoint && viewpoint.isValid()) {
     return viewpoint;
   }
-  getLogger().warning(`Viewpoint ${viewPointObject.name} is not valid`);
+  getLogger().warning(`Viewpoint ${viewpointObject.name} is not valid`);
   return null;
 }
 

package/tests/unit/helpers/cesiumHelpers.js

@@ -13,10 +13,9 @@ import {
   ScreenSpaceEventHandler,
   Color,
   Cesium3DTileFeature,
+  TweenCollection,
+  ContextLimits,
 } from '@vcmap/cesium';
-import TweenCollection from '@vcmap/cesium/Source/Scene/TweenCollection.js';
-import ContextLimits from '@vcmap/cesium/Source/Renderer/ContextLimits.js';
-
 import CesiumTilesetLayer from '../../../src/layer/cesiumTilesetLayer.js';
 import DataSourceLayer from '../../../src/layer/dataSourceLayer.js';
 import CesiumMap from '../../../src/map/cesiumMap.js';
@@ -158,7 +157,9 @@ export function getMockScene() {
       depthTexture: true,
       stencilBuffer: true,
     },
-    render() {},
+    render(time) {
+      this.postRender.raiseEvent(this, time);
+    },
     pick() {},
     pickPosition() {},
     destroy() {
@@ -259,7 +260,7 @@ class BatchTable {
     this.destroyed = false;
   }
 
-  getPropertyNames() { return Object.keys(this.properties); }
+  getPropertyIds() { return Object.keys(this.properties); }
 
   getProperty(id, prop) { return this.properties[prop]; }
 

package/tests/unit/helpers/obliqueHelpers.js

@@ -1,6 +1,6 @@
 import Projection from '../../../src/util/projection.js';
 import ObliqueMap from '../../../src/map/obliqueMap.js';
-import ViewPoint from '../../../src/util/viewpoint.js';
+import Viewpoint from '../../../src/util/viewpoint.js';
 
 import { getTerrainProvider } from './terrain/terrainData.js';
 import ObliqueCollection from '../../../src/oblique/obliqueCollection.js';
@@ -24,10 +24,10 @@ export const mercatorCoordinates = [1488644.796500772, 6892246.018669462, 0];
 let obliqueProjection = null;
 
 /**
- * @returns {ViewPoint}
+ * @returns {Viewpoint}
  */
 function getStartingViewpoint() {
-  return new ViewPoint({
+  return new Viewpoint({
     name: '5b609a0d-28a1-4f4e-ba6c-29f2592fa889',
     distance: 264.6285087486175,
     cameraPosition: null,
@@ -97,7 +97,7 @@ export async function getObliqueMap(mapOptions = {}, scope) {
 /**
  * @param {VcsApp} app
  * @param {Scope=} scope optional server, if provided the map will be initialized with a terrainProvider
- * @param {ViewPoint=} startingVP
+ * @param {Viewpoint=} startingVP
  * @returns {Promise<ObliqueMap>}
  */
 export async function setObliqueMap(app, scope, startingVP) {
@@ -107,6 +107,6 @@ export async function setObliqueMap(app, scope, startingVP) {
   );
   app.maps.add(map);
   await app.maps.setActiveMap(map.name);
-  await map.gotoViewPoint(startingVP || getStartingViewpoint());
+  await map.gotoViewpoint(startingVP || getStartingViewpoint());
   return map;
 }