@vcmap/core 5.0.3 → 5.1.0-rc.2

package/src/map/vcsMap.ts

@@ -3,7 +3,7 @@ import type { MapEvent as OLMapEvent } from 'ol';
 import type { Layer as OLLayer } from 'ol/layer.js';
 import type { Coordinate } from 'ol/coordinate.js';
 
-import { check, checkMaybe } from '@vcsuite/check';
+import { check, maybe, oneOf } from '@vcsuite/check';
 import VcsObject, { VcsObjectOptions } from '../vcsObject.js';
 import LayerCollection from '../util/layerCollection.js';
 import MapState from './mapState.js';
@@ -256,7 +256,7 @@ class VcsMap<
    * Sets the map target.
    */
   setTarget(target: string | HTMLElement | null): void {
-    checkMaybe(target, [String, HTMLElement]);
+    check(target, maybe(oneOf(String, HTMLElement)));
 
     if (this._target) {
       this._target.removeChild(this.mapElement);

package/src/oblique/helpers.ts

@@ -1,5 +1,6 @@
 /* eslint no-underscore-dangle: ["error", { "allow": ["_listeners", "_scopes", "_toRemove"] }] */
 /* eslint-disable no-continue */
+import { getLogger } from '@vcsuite/logger';
 import {
   boundingExtent,
   getBottomLeft,
@@ -18,6 +19,7 @@ import Projection, {
   wgs84Projection,
 } from '../util/projection.js';
 import type ObliqueImage from './obliqueImage.js';
+import { isSameOrigin } from '../util/urlHelpers.js';
 
 let scratchCartesian2A = new Cartesian2();
 let scratchCartesian2B = new Cartesian2();
@@ -423,7 +425,7 @@ export type ImageTransformationOptions = {
  * Always returns a Promise. When the input coordinates contain a height, it will use this height to compute the image coordinates
  * When not, it will try to get the terrainHeight in case a terrain is defined and use the height from there, to compute the image coordinates
  * @param  image
- * @param  worldCoordinate if not in web mercatpr, specify data-projection in options
+ * @param  worldCoordinate if not in web mercator, specify data-projection in options
  * @param  options
  */
 export function transformToImage(
@@ -614,16 +616,6 @@ export async function transformFromImage(
 }
 
 export function hasSameOrigin(url: string): boolean {
-  const windowUrl = new URL(window.location.href);
-  const parsedUrl = new URL(url, window.location.href);
-
-  if (parsedUrl.protocol === 'data:') {
-    return true;
-  }
-
-  return (
-    windowUrl.origin === parsedUrl.origin &&
-    windowUrl.port === parsedUrl.port &&
-    windowUrl.protocol === parsedUrl.protocol
-  );
+  getLogger('hasSameOrigin').deprecate('hasSameOrigin', 'isSameOrigin');
+  return isSameOrigin(url);
 }

package/src/oblique/obliqueCollection.ts

@@ -64,6 +64,7 @@ export type ObliqueVersion = {
 
 export type ObliqueDataSetTerrainProviderOptions = TerrainProviderOptions & {
   url: string;
+  headers?: Record<string, string>;
 };
 
 export type ObliqueCollectionOptions = VcsObjectOptions & {
@@ -280,6 +281,7 @@ class ObliqueCollection extends VcsObject {
         dataSetOptions.url,
         dataSetOptions.projection,
         dataSetOptions.terrainProvider,
+        dataSetOptions.headers,
       );
     }
     dataSet.imagesLoaded.addEventListener(({ images, tileCoordinate }) => {

package/src/oblique/obliqueDataSet.ts

@@ -13,7 +13,7 @@ import {
 import VcsEvent from '../vcsEvent.js';
 import { getTerrainProviderForUrl } from '../layer/terrainHelpers.js';
 import Projection, { ProjectionOptions } from '../util/projection.js';
-import { requestJson } from '../util/fetch.js';
+import { getInitForUrl, requestJson } from '../util/fetch.js';
 import type ObliqueImage from './obliqueImage.js';
 import type {
   ObliqueDataSetTerrainProviderOptions,
@@ -31,6 +31,7 @@ export type ObliqueDataSetOptions = {
   url: string;
   projection?: ProjectionOptions;
   terrainProvider?: ObliqueDataSetTerrainProviderOptions;
+  headers?: Record<string, string>;
 };
 
 export enum DataState {
@@ -85,12 +86,15 @@ class ObliqueDataSet {
 
   private _loadingPromise: Promise<void> | undefined = undefined;
 
+  private _headers?: Record<string, string>;
+
   copyright: CopyrightOptions | undefined = undefined;
 
   constructor(
     url: string,
     projection?: Projection | ProjectionOptions,
     terrainProviderOptions?: ObliqueDataSetTerrainProviderOptions,
+    headers?: Record<string, string>,
   ) {
     this.url = url;
     if (!/\.json$/.test(this.url)) {
@@ -108,6 +112,8 @@ class ObliqueDataSet {
     this._terrainProviderOptions = terrainProviderOptions
       ? { ...terrainProviderOptions }
       : undefined;
+
+    this._headers = structuredClone(headers);
   }
 
   /**
@@ -131,7 +137,8 @@ class ObliqueDataSet {
   async load(): Promise<void> {
     if (!this._loadingPromise) {
       this._state = DataState.LOADING;
-      this._loadingPromise = requestJson<ObliqueImageJson>(this.url)
+      const init = getInitForUrl(this.url, this._headers);
+      this._loadingPromise = requestJson<ObliqueImageJson>(this.url, init)
         .then((data) => {
           return this._initialize(data);
         })
@@ -174,6 +181,7 @@ class ObliqueDataSet {
       this._terrainProvider = await getTerrainProviderForUrl(
         this._terrainProviderOptions.url,
         terrainProviderOptions,
+        this._terrainProviderOptions.headers,
       );
     }
     this._parseMetaData(json);
@@ -186,6 +194,7 @@ class ObliqueDataSet {
       this.baseUrl,
       this.projection,
       this._terrainProvider,
+      this._headers,
     );
     const { version, buildNumber } = getVersionFromImageJson(json);
 
@@ -304,8 +313,10 @@ class ObliqueDataSet {
     }
 
     this._tiles.set(stringTileCoordinates, DataState.LOADING);
+    const init = getInitForUrl(this.url, this._headers);
     const promise = requestJson<ObliqueImageJson>(
       `${this.baseUrl}/${stringTileCoordinates}.json`,
+      init,
     )
       .then((data) => {
         const images = parseImageData(data, this._imageMetas);
@@ -366,6 +377,9 @@ class ObliqueDataSet {
     if (this._terrainProviderOptions) {
       config.terrainProvider = { ...this._terrainProviderOptions };
     }
+    if (this._headers) {
+      config.headers = this._headers;
+    }
     return config;
   }
 }

package/src/oblique/obliqueImageMeta.ts

@@ -17,6 +17,7 @@ export type ObliqueImageMetaOptions = {
   terrainProvider?: CesiumTerrainProvider;
   name: string;
   format?: string;
+  headers?: Record<string, string>;
 };
 
 class ObliqueImageMeta {
@@ -64,6 +65,8 @@ class ObliqueImageMeta {
 
   format: string;
 
+  headers?: Record<string, string>;
+
   constructor(options: ObliqueImageMetaOptions) {
     this.name = options.name;
     this.principalPoint = options['principal-point'];
@@ -78,6 +81,7 @@ class ObliqueImageMeta {
     this.url = options.url;
     this.terrainProvider = options.terrainProvider;
     this.format = options.format || 'jpg';
+    this.headers = options.headers;
   }
 
   /**

package/src/oblique/obliqueView.ts

@@ -1,4 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
+import { TrustedServers } from '@vcmap-cesium/engine';
 import type { ImageTile } from 'ol';
 import type { Size } from 'ol/size.js';
 import OLProjection from 'ol/proj/Projection.js';
@@ -8,8 +9,9 @@ import TileImage, {
   type Options as TileImageOptions,
 } from 'ol/source/TileImage.js';
 import Tile from 'ol/layer/Tile.js';
-import { hasSameOrigin } from './helpers.js';
 import type ObliqueImageMeta from './obliqueImageMeta.js';
+import { isSameOrigin } from '../util/urlHelpers.js';
+import { getTileLoadFunction } from '../layer/openlayers/loadFunctionHelpers.js';
 
 let defaultImage = '';
 function getDefaultImage(): string {
@@ -61,6 +63,8 @@ class ObliqueView {
 
   private _layer: Tile<TileImage> | undefined;
 
+  private _headers?: Record<string, string>;
+
   constructor(imageMeta: ObliqueImageMeta, options: ObliqueViewOptions) {
     this.size = imageMeta.size;
     this.url = imageMeta.url;
@@ -69,6 +73,7 @@ class ObliqueView {
     this.minZoom = options.minZoom;
     this.maxZoom = options.maxZoom;
     this.scaleFactor = options.scaleFactor;
+    this._headers = imageMeta.headers;
     const { tileResolution } = imageMeta;
     this.tileResolution = tileResolution.slice(
       0,
@@ -106,9 +111,14 @@ class ObliqueView {
         tileSize: this.tileSize,
       }),
     };
-    if (!hasSameOrigin(this.url)) {
+    if (TrustedServers.contains(this.url)) {
+      tileImageOptions.crossOrigin = 'use-credentials';
+    } else if (!isSameOrigin(this.url)) {
       tileImageOptions.crossOrigin = 'anonymous';
     }
+    if (this._headers) {
+      tileImageOptions.tileLoadFunction = getTileLoadFunction(this._headers);
+    }
 
     this._tileImageSource = new TileImage(tileImageOptions);
 

package/src/oblique/parseImageJson.ts

@@ -47,16 +47,18 @@ export function getVersionFromImageJson(json: {
 }
 
 /**
- * @param  json
- * @param  url
- * @param  projection
- * @param  terrainProvider
+ * @param json
+ * @param url
+ * @param projection
+ * @param terrainProvider
+ * @param headers
  */
 export function parseImageMeta(
   json: ObliqueImageJson,
   url: string,
   projection?: Projection,
   terrainProvider?: CesiumTerrainProvider,
+  headers?: Record<string, string>,
 ): ImageMeta[] {
   let size: Size = [0, 0];
   if (json.generalImageInfo.width && json.generalImageInfo.height) {
@@ -84,6 +86,7 @@ export function parseImageMeta(
     projection: imageProjection,
     url,
     terrainProvider,
+    headers,
   };
 
   if (json.generalImageInfo.cameraParameter) {

package/src/ol/geojson.d.ts

@@ -11,8 +11,7 @@ declare module 'geojson' {
     G extends Geometry | null = Geometry,
     P = GeoJsonProperties,
   > {
-    _id?: string | number;
-    id?: string | number;
+    _id?: string;
     radius?: G extends Point ? number : never;
     vcsMeta?: VcsMeta;
     state?: FeatureStoreLayerState;

package/src/ol/geom/circle.ts

@@ -26,7 +26,7 @@ Circle.prototype.setCoordinates = function setCoordinates(
   coordinates: [Coordinate, Coordinate],
   optLayout?: GeometryLayout,
 ): void {
-  check(coordinates, [[Number]]);
+  check(coordinates as [Coordinate, Coordinate], [[Number]]);
   check(coordinates.length, 2);
 
   const layout = optLayout || this.getLayout();

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(