@vcmap/core 5.0.2 → 5.1.0-rc.1

package/src/style/declarativeStyleItem.ts

@@ -4,12 +4,13 @@ import {
   ConditionsExpression,
   Expression,
   Cesium3DTileStyle,
+  TrustedServers,
 } from '@vcmap-cesium/engine';
 import { is } from '@vcsuite/check';
 
 import Style, { type StyleFunction } from 'ol/style/Style.js';
 import Stroke from 'ol/style/Stroke.js';
-import Icon from 'ol/style/Icon.js';
+import Icon, { type Options as IconOptions } from 'ol/style/Icon.js';
 import Circle, { type Options as CircleOptions } from 'ol/style/Circle.js';
 import OLText from 'ol/style/Text.js';
 import Fill from 'ol/style/Fill.js';
@@ -23,6 +24,7 @@ import {
 } from './styleHelpers.js';
 import { originalFeatureSymbol } from '../layer/vectorSymbols.js';
 import { styleClassRegistry } from '../classRegistry.js';
+import { isSameOrigin } from '../util/urlHelpers.js';
 
 type DeclarativeStyleItemConditions = {
   conditions: Array<string[] | string>;
@@ -300,7 +302,13 @@ class DeclarativeStyleItem extends StyleItem {
     if (this.cesiumStyle.image) {
       const src = this.cesiumStyle.image.evaluate(feature);
       if (src) {
-        style.setImage(new Icon({ src }));
+        const iconOptions: IconOptions = { src };
+        if (TrustedServers.contains(src)) {
+          iconOptions.crossOrigin = 'use-credentials';
+        } else if (!isSameOrigin(src)) {
+          iconOptions.crossOrigin = 'anonymous';
+        }
+        style.setImage(new Icon(iconOptions));
       }
     } else {
       const color =

package/src/style/styleFactory.ts

@@ -1,4 +1,4 @@
-import { is } from '@vcsuite/check';
+import { is, oneOf } from '@vcsuite/check';
 import StyleItem, { StyleItemOptions } from './styleItem.js';
 import {
   DeclarativeStyleItemOptions,
@@ -15,7 +15,7 @@ export function getStyleOrDefaultStyle(
     | StyleItem,
   defaultStyle?: StyleItem,
 ): StyleItem {
-  if (is(styleOptions, [StyleItem, { type: String }])) {
+  if (is(styleOptions, oneOf(StyleItem, { type: String }))) {
     if (styleOptions instanceof StyleItem) {
       return styleOptions;
     } else {

package/src/style/styleHelpers.ts

@@ -3,12 +3,12 @@ import Fill, { type Options as FillOptions } from 'ol/style/Fill.js';
 import Stroke, { type Options as StrokeOptions } from 'ol/style/Stroke.js';
 import OLText, { type Options as TextOptions } from 'ol/style/Text.js';
 import Style from 'ol/style/Style.js';
-import { Color } from '@vcmap-cesium/engine';
+import { Color, TrustedServers } from '@vcmap-cesium/engine';
 import type { Color as OLColor } from 'ol/color.js';
 import type { Size } from 'ol/size.js';
 import ImageStyle from 'ol/style/Image.js';
 import Circle from 'ol/style/Circle.js';
-import Icon from 'ol/style/Icon.js';
+import Icon, { type Options as IconOptions } from 'ol/style/Icon.js';
 import RegularShape from 'ol/style/RegularShape.js';
 import { getLogger as getLoggerByName, type Logger } from '@vcsuite/logger';
 import type {
@@ -17,6 +17,7 @@ import type {
   VectorStyleItemOptions,
   VectorStyleItemText,
 } from './vectorStyleItem.js';
+import { isSameOrigin } from '../util/urlHelpers.js';
 
 function getLogger(): Logger {
   return getLoggerByName('StyleHelpers');
@@ -535,13 +536,21 @@ export function getImageStyleFromOptions(
       });
     }
   } else {
-    return new Icon({
+    const iconOptions: IconOptions = {
       src: options.src,
       scale: options.scale,
       opacity: options.opacity,
       color: options.color,
       anchor: options.anchor,
-    });
+    };
+    if (options.src) {
+      if (TrustedServers.contains(options.src)) {
+        iconOptions.crossOrigin = 'use-credentials';
+      } else if (!isSameOrigin(options.src)) {
+        iconOptions.crossOrigin = 'anonymous';
+      }
+    }
+    return new Icon(iconOptions);
   }
 }
 

package/src/style/vectorStyleItem.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-template-curly-in-string,@typescript-eslint/ban-ts-comment */
 import Stroke, { Options as StrokeOptions } from 'ol/style/Stroke.js';
-import { Color, VerticalOrigin } from '@vcmap-cesium/engine';
+import { Color, TrustedServers, VerticalOrigin } from '@vcmap-cesium/engine';
 import Icon, { type Options as IconOptions } from 'ol/style/Icon.js';
 import Style, { type StyleFunction } from 'ol/style/Style.js';
 import OLText from 'ol/style/Text.js';
@@ -13,7 +13,7 @@ import { Color as OLColor } from 'ol/color.js';
 import { ColorLike as OLColorLike } from 'ol/colorlike.js';
 import type { Feature } from 'ol/index.js';
 
-import { check, checkMaybe } from '@vcsuite/check';
+import { check, maybe, oneOf, strict } from '@vcsuite/check';
 import StyleItem, { StyleItemOptions } from './styleItem.js';
 import {
   parseColor,
@@ -32,6 +32,7 @@ import {
 } from './styleHelpers.js';
 import { getShapeFromOptions } from './shapesCategory.js';
 import { styleClassRegistry } from '../classRegistry.js';
+import { isSameOrigin } from '../util/urlHelpers.js';
 
 export type ColorType = OLColor | OLColorLike;
 export type VectorStyleItemPattern = {
@@ -148,9 +149,19 @@ class VectorStyleItem extends StyleItem {
     this._cesiumColor = new Color();
     this._image = undefined;
     if (options.image) {
-      this._image = options.image.radius
-        ? getShapeFromOptions({ ...options.image })
-        : new Icon(options.image as IconOptions);
+      if (options.image.radius) {
+        this._image = getShapeFromOptions({ ...options.image });
+      } else {
+        const iconOptions: IconOptions = { ...(options.image as IconOptions) };
+        if (iconOptions.src) {
+          if (TrustedServers.contains(iconOptions.src)) {
+            iconOptions.crossOrigin = 'use-credentials';
+          } else if (!isSameOrigin(iconOptions.src)) {
+            iconOptions.crossOrigin = 'anonymous';
+          }
+        }
+        this._image = new Icon(iconOptions);
+      }
     }
 
     this._style = new Style({
@@ -172,7 +183,7 @@ class VectorStyleItem extends StyleItem {
       try {
         option.color = parseColor(option.color as ColorType);
         check(option.color, [Number]);
-        check(option.color.length, [3, 4]);
+        check(option.color.length, oneOf(3, 4));
       } catch (e) {
         this.getLogger().error((e as Error).message);
         option.color = [255, 255, 255, 0.4];
@@ -306,15 +317,16 @@ class VectorStyleItem extends StyleItem {
       return;
     }
     if (patternOptions) {
-      checkMaybe(
+      check(
         patternOptions,
-        {
-          color: [String, [Number]],
-          width: Number,
-          type: Number,
-          size: [Number, undefined, null],
-        },
-        true,
+        maybe(
+          strict({
+            color: oneOf(String, [Number]),
+            width: Number,
+            type: Number,
+            size: maybe(Number),
+          }),
+        ),
       );
       this._fillOptions.pattern = patternOptions;
     } else {
@@ -330,7 +342,7 @@ class VectorStyleItem extends StyleItem {
   set stroke(stroke: Stroke | undefined) {
     this.exclude.stroke = false;
     if (this._style instanceof Style) {
-      checkMaybe(stroke, Stroke);
+      check(stroke, maybe(Stroke));
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore // bug in ol
       this._style.setStroke(stroke);
@@ -346,7 +358,7 @@ class VectorStyleItem extends StyleItem {
   }
 
   set label(label: string | undefined) {
-    checkMaybe(label, String);
+    check(label, maybe(String));
     if (!label) {
       this._label = undefined;
     } else {
@@ -363,7 +375,7 @@ class VectorStyleItem extends StyleItem {
 
   set text(text: OLText | undefined) {
     if (this._style instanceof Style) {
-      checkMaybe(text, OLText);
+      check(text, maybe(OLText));
       this._text = text;
       this._text?.setText?.(this._label);
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -381,7 +393,7 @@ class VectorStyleItem extends StyleItem {
   set image(image: OLImage | undefined) {
     this.exclude.image = false;
     if (this._style instanceof Style) {
-      checkMaybe(image, OLImage);
+      check(image, maybe(OLImage));
       this._image = image;
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore // bug in ol
@@ -397,7 +409,7 @@ class VectorStyleItem extends StyleItem {
   }
 
   set style(style: Style | StyleFunction) {
-    checkMaybe(style, [Style, Function]);
+    check(style, maybe(oneOf(Style, Function)));
     if (style instanceof Style) {
       this._stroke = style.getStroke();
       this._fill = style.getFill();
@@ -816,7 +828,7 @@ class VectorStyleItem extends StyleItem {
    * @param  section - one of fill, stroke, image
    */
   unset(section: keyof VectorStyleItemExclusion): void {
-    check(section, Object.keys(this.exclude));
+    check(section, oneOf(...Object.keys(this.exclude)));
     if (section === 'fill') {
       this.fillColor = undefined;
     } else {

package/src/util/clipping/clippingPlaneHelper.ts

@@ -18,7 +18,7 @@ import Feature from 'ol/Feature.js';
 import LineString from 'ol/geom/LineString.js';
 import { offset } from 'ol/sphere.js';
 import Polygon from 'ol/geom/Polygon.js';
-import { check, checkMaybe } from '@vcsuite/check';
+import { check, maybe, optional } from '@vcsuite/check';
 import Projection, {
   mercatorProjection,
   wgs84Projection,
@@ -159,7 +159,7 @@ export function createClippingPlaneCollection(
 ): ClippingPlaneCollection | null {
   check(feature, Feature);
   check(options, Object);
-  checkMaybe(transformMatrix, Matrix4);
+  check(transformMatrix, optional(Matrix4));
 
   const clippingPlanes = [];
   const geometry = feature.getGeometry() as Geometry;
@@ -457,7 +457,7 @@ export function getClippingOptions(
   feature?: Feature,
   infinite = false,
 ): ClippingPlaneCreationOptions {
-  checkMaybe(feature, Feature);
+  check(feature, maybe(Feature));
   check(infinite, Boolean);
 
   const vertical = feature

package/src/util/editor/createFeatureSession.ts

@@ -1,4 +1,4 @@
-import { check } from '@vcsuite/check';
+import { check, ofEnum } from '@vcsuite/check';
 import { Feature } from 'ol';
 import type { Geometry } from 'ol/geom.js';
 import VcsEvent from '../../vcsEvent.js';
@@ -21,12 +21,13 @@ import geometryIsValid from './validateGeoemetry.js';
 import ObliqueMap from '../../map/obliqueMap.js';
 import { cursorMap } from './interactions/editGeometryMouseOverInteraction.js';
 
-export type CreateFeatureSession<T extends GeometryType> = EditorSession & {
-  geometryType: T;
-  featureCreated: VcsEvent<Feature<GeometryToType<T>>>;
-  creationFinished: VcsEvent<Feature<GeometryToType<T>> | null>;
-  finish(): void;
-};
+export type CreateFeatureSession<T extends GeometryType> =
+  EditorSession<SessionType.CREATE> & {
+    geometryType: T;
+    featureCreated: VcsEvent<Feature<GeometryToType<T>>>;
+    creationFinished: VcsEvent<Feature<GeometryToType<T>> | null>;
+    finish(): void;
+  };
 
 type InteractionOfGeometryType<T extends GeometryType> =
   T extends GeometryType.Point
@@ -94,7 +95,7 @@ function startCreateFeatureSession<T extends GeometryType>(
 ): CreateFeatureSession<T> {
   check(app, VcsApp);
   check(layer, VectorLayer);
-  check(geometryType, Object.values(GeometryType));
+  check(geometryType, ofEnum(GeometryType));
 
   const {
     interactionChain,

package/src/util/editor/editFeaturesSession.ts

@@ -77,7 +77,7 @@ function clearAllowPicking(
   }
 }
 
-export type EditFeaturesSession = EditorSession & {
+export type EditFeaturesSession = EditorSession<SessionType.EDIT_FEATURES> & {
   readonly mode: TransformationMode;
   /**
    * Function for rotating features. Takes angle in radians as parameter.

package/src/util/editor/editGeometrySession.ts

@@ -31,7 +31,7 @@ import MapInteractionController from './interactions/mapInteractionController.js
 import type VectorLayer from '../../layer/vectorLayer.js';
 import type VcsApp from '../../vcsApp.js';
 
-export type EditGeometrySession = EditorSession & {
+export type EditGeometrySession = EditorSession<SessionType.EDIT_GEOMETRY> & {
   setFeature(feature: Feature): void;
   feature: Feature | null;
 };

package/src/util/editor/editorSessionHelpers.ts

@@ -22,8 +22,8 @@ export enum SessionType {
  * event handler.
  * A stopped session will be destroyed and can no longer be used.
  */
-export type EditorSession = {
-  type: SessionType;
+export type EditorSession<T extends SessionType = SessionType> = {
+  type: T;
   stop(): void;
   stopped: VcsEvent<void>;
 };

package/src/util/editor/selectFeaturesSession.ts

@@ -1,4 +1,4 @@
-import { check } from '@vcsuite/check';
+import { check, ofEnum } from '@vcsuite/check';
 import { Circle, Fill, Style, Stroke } from 'ol/style.js';
 import type { Feature } from 'ol/index.js';
 import { createSync } from '../../layer/vectorSymbols.js';
@@ -117,7 +117,7 @@ export function getDefaultHighlightStyle(): Style {
   });
 }
 
-type SelectFeaturesSession = EditorSession & {
+export type SelectFeaturesSession = EditorSession<SessionType.SELECT> & {
   currentFeatures: Feature[];
   firstFeature: Feature | null;
   featuresChanged: VcsEvent<Feature[]>;
@@ -298,7 +298,7 @@ function startSelectFeaturesSession(
       return currentSelectionMode;
     },
     setMode(newMode: SelectionMode): void {
-      check(newMode, Object.values(SelectionMode));
+      check(newMode, ofEnum(SelectionMode));
 
       createSelectInteraction(newMode);
       modeChanged.raiseEvent(currentSelectionMode);

package/src/util/featureconverter/arcToCesium.ts

@@ -33,10 +33,14 @@ export function getGeometryOptions(
   coords: Coordinate[],
   _geometry: LineString,
   positionHeightAdjustment: number,
+  perPositionHeight: boolean,
+  groundLevelOrMinHeight: number,
 ): { positions: Cartesian3[]; arcType: ArcType } {
   const positions = coords.map((coord) => {
     const wgs84Coords = Projection.mercatorToWgs84(coord);
-    if (wgs84Coords[2] != null) {
+    if (!perPositionHeight && groundLevelOrMinHeight) {
+      wgs84Coords[2] = groundLevelOrMinHeight;
+    } else if (wgs84Coords[2] != null) {
       wgs84Coords[2] += positionHeightAdjustment;
     }
     return Cartesian3.fromDegrees(

package/src/util/featureconverter/circleToCesium.ts

@@ -105,19 +105,25 @@ export function createLineGeometries(
  * extracts the center and radius from the CircleGeometry and converts it to Cartesian3/radius in m
  * @param  geometry
  * @param  positionHeightAdjustment
- * @returns }
+ * @param  perPositionHeight
+ * @param  groundLevelOrMinHeight
+ * @returns
  * @private
  */
 export function getGeometryOptions(
   geometry: Circle,
   positionHeightAdjustment: number,
+  perPositionHeight: boolean,
+  groundLevelOrMinHeight: number,
 ): ConstructorParameters<typeof CircleGeometry>[0] {
   // olCoordinates of center and radius in WGS84
   const olCenter = geometry.getCenter();
   const olPoint = olCenter.slice();
   olPoint[0] += geometry.getRadius();
   const wgs84Center = Projection.mercatorToWgs84(olCenter, true);
-  if (wgs84Center[2] != null) {
+  if (!perPositionHeight && groundLevelOrMinHeight) {
+    wgs84Center[2] = groundLevelOrMinHeight;
+  } else if (wgs84Center[2] != null) {
     wgs84Center[2] += positionHeightAdjustment;
   }
 

package/src/util/featureconverter/extent3D.ts

@@ -13,7 +13,7 @@ class Extent3D {
   static fromArray(
     array: [number, number, number, number, number, number],
   ): Extent3D {
-    check(array, [Number]);
+    check(array as [number, number, number, number, number, number], [Number]);
     check(array.length, 6);
     return new Extent3D(
       array[0],

package/src/util/featureconverter/featureconverterHelper.ts

@@ -520,6 +520,8 @@ export function addPrimitivesToContext(
     const geometryOptions = geometryFactory.getGeometryOptions(
       geometry,
       heightInfo.heightAboveGroundAdjustment,
+      heightInfo.perPositionHeight,
+      heightInfo.groundLevel,
     );
     const storeyOptions = getStoreyOptions(
       heightInfo.storeyHeightsAboveGround,
@@ -609,11 +611,7 @@ export function addPrimitivesToContext(
           );
         } else {
           lineGeometries.push(
-            ...geometryFactory.createLineGeometries(
-              geometryOptions,
-              style,
-              heightInfo.groundLevel,
-            ),
+            ...geometryFactory.createLineGeometries(geometryOptions, style),
           );
         }
       }

package/src/util/featureconverter/lineStringToCesium.ts

@@ -185,6 +185,7 @@ export function createLineGeometries(
   style: Style,
 ): PolylineGeometry[] {
   const width = parseNumber(style.getStroke().getWidth(), 1.0);
+
   return [
     new PolylineGeometry({
       ...options,
@@ -197,16 +198,22 @@ export function createLineGeometries(
  * Creates the positions array for PolylineGeometry
  * @param  geometry
  * @param  positionHeightAdjustment
+ * @param  perPositionHeight
+ * @param  groundLevelOrMinHeight
  * @private
  */
 export function getGeometryOptions(
   geometry: LineString,
   positionHeightAdjustment: number,
+  perPositionHeight: boolean,
+  groundLevelOrMinHeight: number,
 ): LineGeometryOptions {
   const coords = geometry.getCoordinates();
   const positions = coords.map((coord) => {
     const wgs84Coords = Projection.mercatorToWgs84(coord);
-    if (wgs84Coords[2] != null) {
+    if (!perPositionHeight && groundLevelOrMinHeight) {
+      wgs84Coords[2] = groundLevelOrMinHeight;
+    } else if (wgs84Coords[2] != null) {
       wgs84Coords[2] += positionHeightAdjustment;
     }
     return Cartesian3.fromDegrees(

package/src/util/featureconverter/pointToCesium.ts

@@ -228,7 +228,7 @@ export function getCartesian3AndWGS84FromCoordinates(
     wgs84Positions[index] = Projection.mercatorToWgs84(coord, true);
     let height = null;
     if (heightInfo.heightReference === HeightReference.RELATIVE_TO_GROUND) {
-      height = heightInfo.heightAboveGroundAdjustment;
+      height = heightValue + heightInfo.heightAboveGroundAdjustment;
     } else {
       height = heightValue;
     }

package/src/util/featureconverter/polygonToCesium.ts

@@ -7,7 +7,6 @@ import {
   PolygonHierarchy,
   PolylineGeometry,
   type Scene,
-  Cartographic,
 } from '@vcmap-cesium/engine';
 import type { Style } from 'ol/style.js';
 import type { Polygon } from 'ol/geom.js';
@@ -74,7 +73,6 @@ export function createFillGeometries(
 export function getLineGeometryOptions(
   options: PolygonGeometryOptions,
   style: Style,
-  groundLevel?: number,
 ): PolylineGeometryOptions[] {
   const width = parseNumber(style.getStroke().getWidth(), 1.0);
   const geometryOptions: PolylineGeometryOptions[] = [];
@@ -90,16 +88,6 @@ export function getLineGeometryOptions(
       width,
     });
   });
-
-  if (groundLevel) {
-    geometryOptions.forEach((polylineOptions) => {
-      polylineOptions.positions = polylineOptions.positions.map((c) => {
-        const geographic = Cartographic.fromCartesian(c);
-        geographic.height = groundLevel;
-        return Cartographic.toCartesian(geographic);
-      });
-    });
-  }
   return geometryOptions;
 }
 
@@ -114,9 +102,8 @@ export function createGroundLineGeometries(
 export function createLineGeometries(
   options: PolygonGeometryOptions,
   style: Style,
-  groundLevel?: number,
 ): PolylineGeometry[] {
-  return getLineGeometryOptions(options, style, groundLevel).map((option) => {
+  return getLineGeometryOptions(options, style).map((option) => {
     return new PolylineGeometry(option);
   });
 }
@@ -124,6 +111,8 @@ export function createLineGeometries(
 export function getGeometryOptions(
   geometry: Polygon,
   positionHeightAdjustment: number,
+  perPositionHeight: boolean,
+  groundLevelOrMinHeight: number,
 ): PolygonGeometryOptions {
   let hieraryPositions;
   const holes = [];
@@ -132,7 +121,9 @@ export function getGeometryOptions(
     const coords = rings[i].getCoordinates();
     const positions = coords.map((coord) => {
       const wgs84Coords = Projection.mercatorToWgs84(coord);
-      if (wgs84Coords[2] != null) {
+      if (!perPositionHeight && groundLevelOrMinHeight) {
+        wgs84Coords[2] = groundLevelOrMinHeight;
+      } else if (wgs84Coords[2] != null) {
         wgs84Coords[2] += positionHeightAdjustment;
       }
       return Cartesian3.fromDegrees(

package/src/util/fetch.ts

@@ -1,3 +1,5 @@
+import { TrustedServers } from '@vcmap-cesium/engine';
+
 export async function requestUrl(
   url: string,
   init?: RequestInit,
@@ -26,3 +28,26 @@ export async function requestArrayBuffer(
   const response = await requestUrl(url, init);
   return response.arrayBuffer();
 }
+
+export async function requestObjectUrl(
+  url: string,
+  init?: RequestInit,
+): Promise<string> {
+  const response = await requestUrl(url, init);
+  const blob = await response.blob();
+  return URL.createObjectURL(blob);
+}
+
+export function getInitForUrl(
+  url: string,
+  headers?: Record<string, string>,
+): RequestInit {
+  const init: RequestInit = {};
+  if (headers) {
+    init.headers = headers;
+  }
+  if (TrustedServers.contains(url)) {
+    init.credentials = 'include';
+  }
+  return init;
+}