@vcmap/core 6.3.0-rc.1 → 6.3.0-rc.2

package/src/map/cesiumMap.ts

@@ -423,10 +423,6 @@ class CesiumMap extends BaseCesiumMap {
         dataSourceCollection: new DataSourceCollection(),
       });
 
-      cesiumWidget.scene.frameState.creditDisplay.update = (): void => {};
-      cesiumWidget.scene.frameState.creditDisplay.beginFrame = (): void => {};
-      cesiumWidget.scene.frameState.creditDisplay.endFrame = (): void => {};
-
       const { clock } = cesiumWidget;
       clock.shouldAnimate = true;
       this._listeners.push(
@@ -447,17 +443,6 @@ class CesiumMap extends BaseCesiumMap {
 
       cesiumWidget.scene.globe.enableLighting = this.enableLightning;
 
-      // hide default cesium credits container
-      const creditsContainer = document.getElementsByClassName(
-        'cesium-widget-credits',
-      );
-      if (creditsContainer) {
-        for (let i = 0; i < creditsContainer.length; i++) {
-          const element = creditsContainer[i] as HTMLElement;
-          element.style.display = 'none';
-        }
-      }
-
       this.initialized = true;
       this._initializeCesiumWidget(cesiumWidget);
 

package/src/map/obliqueMap.ts

@@ -2,7 +2,6 @@ import { boundingExtent, containsXY } from 'ol/extent.js';
 import { getTransform, transform, transformExtent } from 'ol/proj.js';
 import type { Map as OLMap } from 'ol';
 import type { Coordinate } from 'ol/coordinate.js';
-
 import { check } from '@vcsuite/check';
 import { parseBoolean, parseNumber } from '@vcsuite/parsers';
 import Extent from '../util/extent.js';
@@ -427,15 +426,23 @@ class ObliqueMap extends BaseOLMap {
     const visibleMapUnits = resolution * size.height;
     const visibleMeters = visibleMapUnits * metersPerUnit;
     const height = Math.abs(visibleMeters / 2 / Math.tan(fovy / 2));
-
-    const avgHeight = groundPosition[2] || image.averageHeight;
-    const cameraHeight = height + avgHeight;
+    let pitch = -90;
+    if (image.projectionCenter) {
+      const verticalDistance = image.projectionCenter.z - image.averageHeight;
+      const horizontalDistance = Math.sqrt(
+        (image.projectionCenter.x - image.centerPointOnGround[0]) ** 2 +
+          (image.projectionCenter.y - image.centerPointOnGround[1]) ** 2,
+      );
+      if (horizontalDistance > 0) {
+        pitch =
+          -Math.atan(verticalDistance / horizontalDistance) * (180 / Math.PI);
+      }
+    }
 
     return new Viewpoint({
-      cameraPosition: [groundPosition[0], groundPosition[1], cameraHeight],
       groundPosition,
       heading: defaultHeadings[image.viewDirection],
-      pitch: -90,
+      pitch,
       roll: 0,
       distance: height,
     });

package/src/map/panoramaMap.ts

@@ -165,7 +165,7 @@ export default class PanoramaMap extends BaseCesiumMap {
       cesiumWidget.scene.primitives.destroyPrimitives = false;
 
       cesiumWidget.scene.highDynamicRange = true;
-      cesiumWidget.scene.gamma = 1.8;
+      cesiumWidget.scene.gamma = 2.2;
 
       this.initialized = true;
       this._initializeCesiumWidget(cesiumWidget);

package/src/ol/ol.d.ts

@@ -3,7 +3,14 @@
  * Type overrides for types extended by the @vcmap/core API
  */
 import type CanvasImmediateRenderer from 'ol/render/canvas/Immediate.js';
-import type { Billboard, Color, Entity, Label } from '@vcmap-cesium/engine';
+import type {
+  Billboard,
+  Cartesian3,
+  Color,
+  Entity,
+  I3SNode,
+  Label,
+} from '@vcmap-cesium/engine';
 import type { StyleLike } from 'ol/style/Style.js';
 import type { vectorStyleSymbol } from '../style/vectorStyleItem.js';
 import type VectorStyleItem from '../style/vectorStyleItem.js';
@@ -19,7 +26,7 @@ import type {
   panoramaFeature,
   primitives,
 } from '../layer/vectorSymbols.js';
-import type { vcsLayerName } from '../layer/layerSymbols.js';
+import type { i3sData, vcsLayerName } from '../layer/layerSymbols.js';
 import type {
   isProvidedFeature,
   isProvidedClusterFeature,
@@ -50,6 +57,7 @@ import type { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbo
 import type { PrimitiveType } from '../util/featureconverter/convert.js';
 
 import { PanoramaDatasetFeatureProperties } from '../layer/panoramaDatasetLayer.js';
+import { attributeProviderName } from '../featureProvider/abstractAttributeProvider.js';
 
 declare module 'ol/geom.js' {
   interface Geometry {
@@ -110,6 +118,8 @@ declare module 'ol/index.js' {
     [featureArcStruct]?: ArcStruct;
     [isProvidedFeature]?: boolean;
     [isProvidedClusterFeature]?: boolean;
+    /** Is set in `featureAtPixelInteraction` to be used in `i3sAttributeProvider`; both properties are required to get I3S features */
+    [i3sData]?: { i3sNode: I3SNode; cartesianPosition?: Cartesian3 };
     [globalHidden]?: boolean;
     [hidden]?: boolean;
     [highlighted]?: VectorStyleItem;
@@ -125,6 +135,7 @@ declare module 'ol/index.js' {
     [vectorClusterGroupName]?: string;
     [primitives]?: (PrimitiveType | Label | Billboard | Entity)[];
     [panoramaFeature]?: PanoramaDatasetFeatureProperties;
+    [attributeProviderName]?: string;
   }
 
   class CanvasTileRenderer extends CanvasImmediateRenderer {

package/src/panorama/panoramaImage.ts

@@ -312,7 +312,7 @@ function parseRgbUrl(imageUrl: string): {
   if (!fileName || !fileName.endsWith('_rgb.tif')) {
     throw new Error('Invalid image url');
   }
-  const name = fileName.slice(0, -8);
+  const name = decodeURIComponent(fileName.slice(0, -8));
 
   return {
     name,
@@ -367,11 +367,14 @@ export async function createPanoramaImage(
   );
 
   let getIntensityImages: (() => Promise<GeoTIFFImage[]>) | undefined;
-  if (intensityImage || (hasIntensity && absoluteRootUrl)) {
+  if (intensityImage || (hasIntensity && absoluteRootUrl && name)) {
     getIntensityImages = async (): Promise<GeoTIFFImage[]> => {
       const usedIntensityImage =
         intensityImage ??
-        (await fromUrl(new URL(`${name}_intensity.tif`, absoluteRootUrl).href));
+        (await fromUrl(
+          new URL(`${encodeURIComponent(name!)}_intensity.tif`, absoluteRootUrl)
+            .href,
+        ));
 
       const {
         images: intensity,
@@ -398,10 +401,10 @@ export async function createPanoramaImage(
     | undefined;
 
   let usedDepthImage = depthImage;
-  if (!usedDepthImage && hasDepth && absoluteRootUrl) {
+  if (!usedDepthImage && hasDepth && absoluteRootUrl && name) {
     try {
       usedDepthImage = await fromUrl(
-        new URL(`${name}_depth.tif`, absoluteRootUrl).href,
+        new URL(`${encodeURIComponent(name)}_depth.tif`, absoluteRootUrl).href,
       );
     } catch (e) {
       getLogger('PanoramaImage').warning(

package/src/style/declarativeStyleItem.ts

@@ -55,8 +55,6 @@ export type DeclarativeStyleItemOptions = StyleItemOptions & {
   declarativeStyle?: DeclarativeStyleOptions;
 };
 
-const scratchColor = new Color();
-
 const defaultText = new OLText({
   font: '30px sans-serif',
   fill: new Fill({ color: whiteColor }),
@@ -205,7 +203,7 @@ class DeclarativeStyleItem extends StyleItem {
   private _stylePolygon(feature: Feature): Style {
     const style = new Style({});
     const color = this.cesiumStyle.color
-      ? this.cesiumStyle.color.evaluate<Color>(feature, scratchColor)
+      ? this.cesiumStyle.color.evaluate<Color>(feature, new Color())
       : Color.WHITE;
     if (color) {
       style.setFill(
@@ -223,7 +221,7 @@ class DeclarativeStyleItem extends StyleItem {
     const style = new Style({});
     const isExtruded = !!feature.get('olcs_extrudedHeight');
     const color = this.cesiumStyle.color
-      ? this.cesiumStyle.color.evaluate<Color>(feature, scratchColor)
+      ? this.cesiumStyle.color.evaluate<Color>(feature, new Color())
       : Color.WHITE;
     if (color) {
       if (isExtruded) {
@@ -269,7 +267,7 @@ class DeclarativeStyleItem extends StyleItem {
         if (this.cesiumStyle.labelColor) {
           const textColor = this.cesiumStyle.labelColor.evaluateColor(
             feature,
-            scratchColor,
+            new Color(),
           );
           if (textColor) {
             textStyle.getFill()!.setColor(cesiumColorToColor(textColor));
@@ -279,7 +277,7 @@ class DeclarativeStyleItem extends StyleItem {
           const outlineColor =
             this.cesiumStyle.labelOutlineColor.evaluate<Color>(
               feature,
-              scratchColor,
+              new Color(),
             );
           if (outlineColor) {
             const outlineWidth = this.cesiumStyle.labelOutlineWidth
@@ -314,7 +312,7 @@ class DeclarativeStyleItem extends StyleItem {
       }
     } else {
       const color =
-        this.cesiumStyle.color?.evaluate<Color>(feature, scratchColor) ??
+        this.cesiumStyle.color?.evaluate<Color>(feature, new Color()) ??
         Color.WHITE;
 
       let radius = 4;
@@ -330,7 +328,7 @@ class DeclarativeStyleItem extends StyleItem {
         if (this.cesiumStyle.pointOutlineColor) {
           pointOutlineColor = this.cesiumStyle.pointOutlineColor.evaluateColor(
             feature,
-            scratchColor,
+            new Color(),
           );
         }
         radius += width / 2;
@@ -372,7 +370,7 @@ class DeclarativeStyleItem extends StyleItem {
     if (this.cesiumStyle.strokeColor) {
       const strokeColor = this.cesiumStyle.strokeColor.evaluateColor(
         feature,
-        scratchColor,
+        new Color(),
       );
       if (strokeColor) {
         const strokeWidth = this.cesiumStyle.strokeWidth

package/src/util/fetch.ts

@@ -38,6 +38,13 @@ export async function requestObjectUrl(
   return URL.createObjectURL(blob);
 }
 
+/**
+ * Get a RequestInit object for the given url, adding optional headers. If the url is in the
+ * TrustedServers {@see https://cesium.com/learn/cesiumjs/ref-doc/TrustedServers.html?classFilter=Trusted}
+ * credentials will be included in the request.
+ * @param url
+ * @param headers
+ */
 export function getInitForUrl(
   url: string,
   headers?: Record<string, string>,

package/src/vcsApp.ts

@@ -29,7 +29,11 @@ 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 type {
+  AbstractCtor,
+  CtorType,
+  FeatureProviderClass,
+} from './classRegistry.js';
 import ClassRegistry, {
   categoryClassRegistry,
   featureProviderClassRegistry,
@@ -44,7 +48,6 @@ import { moduleIdSymbol } from './moduleIdSymbol.js';
 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 type { HiddenObject } from './util/hiddenObjects.js';
 import { createHiddenObjectsCollection } from './util/hiddenObjects.js';
 import type { FlightInstanceOptions } from './util/flight/flightInstance.js';
@@ -155,9 +158,7 @@ class VcsApp {
     typeof TileProvider
   >;
 
-  private _featureProviderClassRegistry: OverrideClassRegistry<
-    typeof AbstractFeatureProvider
-  >;
+  private _featureProviderClassRegistry: OverrideClassRegistry<FeatureProviderClass>;
 
   /**
    * @param  options
@@ -402,9 +403,7 @@ class VcsApp {
     return this._tileProviderClassRegistry;
   }
 
-  get featureProviderClassRegistry(): OverrideClassRegistry<
-    typeof AbstractFeatureProvider
-  > {
+  get featureProviderClassRegistry(): OverrideClassRegistry<FeatureProviderClass> {
     return this._featureProviderClassRegistry;
   }
 

package/src/vcsModuleHelpers.ts

@@ -11,8 +11,19 @@ import type {
   StyleItemOptions,
 } from './style/styleItem.js';
 import type { TileProviderOptions } from './layer/tileProvider/tileProvider.js';
-import type { AbstractFeatureProviderOptions } from './featureProvider/abstractFeatureProvider.js';
+import type {
+  // eslint-disable-next-line import/no-named-default
+  default as AbstractFeatureProvider,
+  AbstractFeatureProviderOptions,
+} from './featureProvider/abstractFeatureProvider.js';
 import type VcsApp from './vcsApp.js';
+import type { CompositeFeatureProviderOptions } from './featureProvider/compositeFeatureProvider.js';
+import CompositeFeatureProvider from './featureProvider/compositeFeatureProvider.js';
+import type {
+  // eslint-disable-next-line import/no-named-default
+  default as AbstractAttributeProvider,
+  AbstractAttributeProviderOptions,
+} from './featureProvider/abstractAttributeProvider.js';
 
 function getLogger(): Logger {
   return getLoggerByName('init');
@@ -22,7 +33,7 @@ export type ModuleLayerOptions = LayerOptions & {
   style?: string | StyleItemOptions;
   highlightStyle?: string | StyleItemOptions;
   tileProvider?: TileProviderOptions;
-  featureProvider?: AbstractFeatureProviderOptions;
+  attributeProvider?: AbstractAttributeProviderOptions;
 };
 
 export function deserializeMap(
@@ -48,6 +59,44 @@ export function deserializeViewpoint(
   return null;
 }
 
+export function deserializeFeatureProvider(
+  vcsApp: VcsApp,
+  options:
+    | AbstractFeatureProviderOptions
+    | CompositeFeatureProviderOptions
+    | AbstractAttributeProviderOptions,
+): AbstractAttributeProvider | AbstractFeatureProvider | null {
+  if (options.type === CompositeFeatureProvider.className) {
+    const {
+      featureProviders: featureProviderOptions,
+      attributeProviders: attributeProviderOptions,
+    } = options as CompositeFeatureProviderOptions;
+
+    const featureProviders = featureProviderOptions
+      .map((fpConfig) => deserializeFeatureProvider(vcsApp, fpConfig))
+      .filter((fp): fp is AbstractFeatureProvider => !!fp);
+
+    const attributeProviders = attributeProviderOptions
+      .map((apConfig) => deserializeFeatureProvider(vcsApp, apConfig))
+      .filter((ap): ap is AbstractAttributeProvider => !!ap);
+
+    return new CompositeFeatureProvider({
+      ...options,
+      featureProviders,
+      attributeProviders,
+    });
+  }
+
+  if (options.type) {
+    return getObjectFromClassRegistry(
+      vcsApp.featureProviderClassRegistry,
+      options,
+    );
+  }
+
+  return null;
+}
+
 export function deserializeLayer(
   vcsApp: VcsApp,
   layerConfig: ModuleLayerOptions,
@@ -83,10 +132,18 @@ export function deserializeLayer(
     );
   }
 
+  let attributeProvider;
+  if (layerConfig.attributeProvider) {
+    attributeProvider = deserializeFeatureProvider(
+      vcsApp,
+      layerConfig.attributeProvider,
+    ) as AbstractAttributeProvider | null;
+  }
+
   let featureProvider;
   if (layerConfig.featureProvider) {
-    featureProvider = getObjectFromClassRegistry(
-      vcsApp.featureProviderClassRegistry,
+    featureProvider = deserializeFeatureProvider(
+      vcsApp,
       layerConfig.featureProvider,
     );
   }
@@ -97,6 +154,7 @@ export function deserializeLayer(
     highlightStyle,
     tileProvider,
     featureProvider,
+    attributeProvider,
   });
 }