@vcmap/core 5.3.3 → 6.0.0-rc.10

package/src/ol/geom/geometryCollection.js

@@ -5,7 +5,7 @@ import { check } from '@vcsuite/check';
  * @returns {Array<import("ol/coordinate").Coordinate|Array<import("ol/coordinate").Coordinate>|Array<Array<import("ol/coordinate").Coordinate>>|Array<Array<Array<import("ol/coordinate").Coordinate>>>>}
  */
 GeometryCollection.prototype.getCoordinates = function getCoordinates() {
-  return this.getGeometries().map((g) => g.getCoordinates());
+  return this.getGeometriesArray().map((g) => g.getCoordinates());
 };
 
 /**
@@ -27,13 +27,103 @@ GeometryCollection.prototype.setCoordinates = function setCoordinates(
   );
 };
 
+/**
+ * @type {Record<import("ol/geom/Geometry").GeometryLayout, number>}
+ */
+const layoutScore = {
+  XY: 1,
+  XYM: 2,
+  XYZ: 3,
+  XYZM: 4,
+};
+
+/**
+ * @type {Record<import("ol/geom/Geometry").GeometryLayout, number>}
+ */
+const layoutStride = {
+  XY: 2,
+  XYM: 3,
+  XYZ: 3,
+  XYZM: 4,
+};
+
+/**
+ * @param {import("ol/geom/Geometry").GeometryLayout} layout
+ * @param {import("ol/geom/Geometry").GeometryLayout=} minLayout
+ * @returns { import("ol/geom/Geometry").GeometryLayout}
+ */
+function getMinLayout(layout, minLayout) {
+  if (!minLayout) {
+    return layout;
+  }
+  if (
+    (minLayout === 'XYM' && layout !== 'XYM') ||
+    (layout === 'XYM' && minLayout !== 'XYM')
+  ) {
+    return 'XY';
+  }
+  const inScore = layoutScore[layout];
+  const minScore = layoutScore[minLayout];
+  if (inScore < minScore) {
+    return layout;
+  }
+
+  return minLayout;
+}
+
 /**
  * @returns {import("ol/geom/Geometry").GeometryLayout}
  */
 GeometryCollection.prototype.getLayout = function getLayout() {
-  const firstGeom = this.getGeometries()[0];
-  if (firstGeom) {
-    return firstGeom.getLayout();
-  }
-  return 'XYZ';
+  let maxCommonLayout;
+  this.getGeometriesArrayRecursive().forEach((geom) => {
+    maxCommonLayout = getMinLayout(geom.getLayout(), maxCommonLayout);
+  });
+
+  return maxCommonLayout ?? 'XY';
 };
+
+/**
+ * @returns {number}
+ */
+GeometryCollection.prototype.getStride = function getStride() {
+  const layout = this.getLayout();
+  return layoutStride[layout];
+};
+
+/**
+ * @returns {number[]}
+ */
+GeometryCollection.prototype.getFlatCoordinates =
+  function getFlatCoordinates() {
+    const commonStride = this.getStride();
+    const flatCoordinates = [];
+    this.getGeometriesArrayRecursive().forEach((geom) => {
+      const geometryStride = geom.getStride();
+      const geometryFlatCoordinates = geom.getFlatCoordinates();
+      if (geometryStride === commonStride) {
+        flatCoordinates.push(geometryFlatCoordinates);
+      } else if (geometryStride > commonStride) {
+        const geometryCoordinateLength = geometryFlatCoordinates.length;
+        const numberOfCoordinates = Math.round(
+          geometryCoordinateLength / geometryStride,
+        );
+        const slicedGeometryCoordinates = new Array(
+          numberOfCoordinates * commonStride,
+        );
+        for (let i = 0; i < geometryCoordinateLength; i += geometryStride) {
+          for (let j = 0; j < commonStride; j++) {
+            const slicedGeometryCoordinateOffset = Math.round(
+              (i / geometryStride) * commonStride,
+            );
+
+            slicedGeometryCoordinates[slicedGeometryCoordinateOffset + j] =
+              geometryFlatCoordinates[i + j];
+          }
+        }
+        flatCoordinates.push(slicedGeometryCoordinates);
+      }
+    });
+
+    return [].concat(...flatCoordinates);
+  };

package/src/ol/ol.d.ts

@@ -41,12 +41,17 @@ import {
   fvLastUpdated,
   globalHiderLastUpdated,
 } from '../layer/vectorHelpers.js';
+import { validityPlaceholder } from '../util/editor/interactions/createPolygonInteraction.js';
 
 declare module 'ol/geom.js' {
   interface Geometry {
     getCoordinates(): any;
-    setCoordinates(coordinates: any, layout?: any): void;
+    setCoordinates(
+      coordinates: any,
+      layout?: import('ol/geom/Geometry.js').GeometryLayout,
+    ): void;
     getFlatCoordinates(): number[];
+    getStride(): number;
     getLayout(): import('ol/geom/Geometry.js').GeometryLayout;
     [alreadyTransformedToMercator]?: boolean;
     [actuallyIsCircle]?: boolean;
@@ -67,15 +72,23 @@ declare module 'ol/geom.js' {
         | Array<Array<import('ol/coordinate.js').Coordinate>>
         | Array<Array<Array<import('ol/coordinate.js').Coordinate>>>
       >,
+      layout?: import('ol/geom/Geometry.js').GeometryLayout,
     ): void;
     getLayout(): import('ol/geom/Geometry.js').GeometryLayout;
   }
 
   interface Circle {
     getCoordinates(): import('ol/coordinate.js').Coordinate[];
-    setCoordinates(coordinates: import('ol/coordinate.js').Coordinate[]): void;
+    setCoordinates(
+      coordinates: import('ol/coordinate.js').Coordinate[],
+      layout?: import('ol/geom/Geometry.js').GeometryLayout,
+    ): void;
     rotate(angle: number, anchor: import('ol/coordinate.js').Coordinate): void;
   }
+
+  interface Polygon {
+    [validityPlaceholder]?: boolean;
+  }
 }
 
 declare module 'ol/index.js' {

package/src/overrideClassRegistry.ts

@@ -1,16 +1,20 @@
 import { check } from '@vcsuite/check';
 import { getLogger, type Logger } from '@vcsuite/logger';
 import VcsEvent from './vcsEvent.js';
-// eslint-disable-next-line import/no-named-default
-import type { default as ClassRegistry, Ctor } from './classRegistry.js';
+import {
+  // eslint-disable-next-line import/no-named-default
+  default as ClassRegistry,
+  Ctor,
+  AbstractCtor,
+} from './classRegistry.js';
 
 function logger(): Logger {
   return getLogger('OverrideClassRegistry');
 }
 
-type ModuleEntry<T extends Ctor<T>> = { moduleId: string; ctor: Ctor<T> };
+type ModuleEntry<T extends AbstractCtor> = { moduleId: string; ctor: Ctor<T> };
 
-class OverrideClassRegistry<T extends Ctor<T>> {
+class OverrideClassRegistry<T extends AbstractCtor> {
   private _coreClassRegistry: ClassRegistry<T>;
 
   private _classMap: Map<string, ModuleEntry<T>> = new Map();
@@ -142,12 +146,13 @@ class OverrideClassRegistry<T extends Ctor<T>> {
   create(className: string, ...args: unknown[]): InstanceType<T> | undefined {
     check(className, String);
 
-    const Ctor = this.getClass(className);
-    if (!Ctor) {
+    const Constructor = this.getClass(className);
+    if (!Constructor) {
       logger().error(`could not find constructor ${className}`);
       return undefined;
     }
-    return new Ctor(...args);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return new Constructor(...args);
   }
 
   /**
@@ -161,6 +166,7 @@ class OverrideClassRegistry<T extends Ctor<T>> {
   ): InstanceType<T> | undefined {
     check(options, { type: String });
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return this.create(options.type as string, options, ...args);
   }
 

package/src/style/arcStyle.ts

@@ -178,6 +178,7 @@ function getArcCoordinates(
   offset: number,
 ): Coordinate[] {
   const midPoint = getMidPoint(p1, p2);
+  midPoint[2] = midPoint[2] ?? 0;
   midPoint[2] += arcHeight / 2;
   const fullDistance = cartesian2DDistance(p1, p2);
 

package/src/style/arrowStyle.ts

@@ -189,22 +189,22 @@ class ArrowStyle extends Style {
    * Same as getStroke().getWidth() / getStroke().setWidth()
    */
   get width(): number | undefined {
-    return this.getStroke().getWidth();
+    return this.getStroke()?.getWidth();
   }
 
   set width(width: number | undefined) {
-    this.getStroke().setWidth(width);
+    this.getStroke()?.setWidth(width);
   }
 
   /**
    * The color of the stroke and icon styles. Setting the color will not re-apply the icons color.
    */
   get color(): ColorType {
-    return this.getStroke().getColor();
+    return this.getStroke()?.getColor() ?? [255, 255, 255, 1];
   }
 
   set color(color: ColorType) {
-    this.getStroke().setColor(color);
+    this.getStroke()?.setColor(color);
   }
 
   private _drawArrow(
@@ -214,7 +214,7 @@ class ArrowStyle extends Style {
     pixelRatio: number,
   ): void {
     ctx.save();
-    let scale = this.getImage().getScale();
+    let scale = this.getImage()?.getScale() ?? 1;
     scale = Array.isArray(scale) ? scale : [scale, scale];
     ctx.setTransform(
       scale[0],
@@ -225,7 +225,7 @@ class ArrowStyle extends Style {
       imagePosition[1],
     );
     ctx.rotate(Math.PI - rotation);
-    const image = this.getImage().getImage(pixelRatio);
+    const image = this.getImage()!.getImage(pixelRatio);
     ctx.translate(0, Math.floor(image.height / 2));
     ctx.drawImage(image, -image.width / 2, -image.height / 2);
     ctx.restore();
@@ -290,7 +290,7 @@ class ArrowStyle extends Style {
     return {
       color: this.color,
       width: this.width,
-      arrowIcon: this.getImage().clone(),
+      arrowIcon: this.getImage()!.clone(),
       zIndex: this.getZIndex(),
     };
   }

package/src/style/declarativeStyleItem.ts

@@ -276,7 +276,7 @@ class DeclarativeStyleItem extends StyleItem {
             scratchColor,
           );
           if (textColor) {
-            textStyle.getFill().setColor(cesiumColorToColor(textColor));
+            textStyle.getFill()!.setColor(cesiumColorToColor(textColor));
           }
         }
         if (this.cesiumStyle.labelOutlineColor) {
@@ -364,7 +364,7 @@ class DeclarativeStyleItem extends StyleItem {
     if (this.cesiumStyle.scale && style.getImage()) {
       const scale = this.cesiumStyle.scale.evaluate<number>(feature);
       if (scale && Number.isFinite(scale)) {
-        style.getImage().setScale(scale);
+        style.getImage()!.setScale(scale);
       }
     }
 

package/src/style/styleHelpers.ts

@@ -401,8 +401,8 @@ export function getStrokeOptions(stroke: Stroke): StrokeOptions {
 export function getTextOptions(text: OLText): VectorStyleItemText {
   return {
     font: text.getFont(),
-    fill: text.getFill() ? getFillOptions(text.getFill()) : undefined,
-    stroke: text.getStroke() ? getStrokeOptions(text.getStroke()) : undefined,
+    fill: text.getFill() ? getFillOptions(text.getFill()!) : undefined,
+    stroke: text.getStroke() ? getStrokeOptions(text.getStroke()!) : undefined,
     textBaseline: text.getTextBaseline(),
     offsetY: text.getOffsetY(),
     offsetX: text.getOffsetX(),
@@ -469,13 +469,13 @@ export function getImageStyleOptions(image: ImageStyle): ImageStyleOptions {
       scale: image.getScale(),
     };
     if (image.getFill()) {
-      options.fill = getFillOptions(image.getFill());
+      options.fill = getFillOptions(image.getFill()!);
     }
     if (image.getRadius() != null) {
       options.radius = image.getRadius();
     }
     if (image.getStroke()) {
-      options.stroke = getStrokeOptions(image.getStroke());
+      options.stroke = getStrokeOptions(image.getStroke()!);
     }
     return options;
   } else if (image instanceof RegularShape) {
@@ -483,7 +483,7 @@ export function getImageStyleOptions(image: ImageStyle): ImageStyleOptions {
       scale: image.getScale(),
     };
     if (image.getFill()) {
-      options.fill = getFillOptions(image.getFill());
+      options.fill = getFillOptions(image.getFill()!);
     }
     if (image.getPoints()) {
       options.points = image.getPoints();
@@ -501,7 +501,7 @@ export function getImageStyleOptions(image: ImageStyle): ImageStyleOptions {
       options.radius2 = image.getRadius2();
     }
     if (image.getStroke()) {
-      options.stroke = getStrokeOptions(image.getStroke());
+      options.stroke = getStrokeOptions(image.getStroke()!);
     }
     return options;
   }
@@ -572,12 +572,14 @@ export function getStyleFromOptions(options: StyleOptions): Style {
 
 export function getStyleOptions(style: Style): StyleOptions {
   return {
-    fill: style.getFill() ? getFillOptions(style.getFill()) : undefined,
-    stroke: style.getStroke() ? getStrokeOptions(style.getStroke()) : undefined,
+    fill: style.getFill() ? getFillOptions(style.getFill()!) : undefined,
+    stroke: style.getStroke()
+      ? getStrokeOptions(style.getStroke()!)
+      : undefined,
     image: style.getImage()
-      ? getImageStyleOptions(style.getImage())
+      ? getImageStyleOptions(style.getImage()!)
       : undefined,
-    text: style.getText() ? getTextOptions(style.getText()) : undefined,
+    text: style.getText() ? getTextOptions(style.getText()!) : undefined,
   };
 }
 
@@ -592,14 +594,14 @@ export function getCssStyleFromTextStyle(textStyle: OLText): {
     color: undefined,
   };
   if (textStyle.getStroke()) {
-    let width = textStyle.getStroke().getWidth() as number;
+    let width = textStyle.getStroke()!.getWidth() as number;
     width = width > 1 ? 1 : width;
-    const color = olColorToHex(parseColor(textStyle.getStroke().getColor()));
+    const color = olColorToHex(parseColor(textStyle.getStroke()!.getColor()));
     style.textShadow = `-${width}px ${width}px 0 ${color},${width}px ${width}px 0 ${color},${width}px -${width}px 0 ${color},-${width}px -${width}px 0 ${color}`;
   }
   if (textStyle.getFill()) {
     style.color = olColorToHex(
-      parseColor(textStyle.getFill().getColor() as ColorType),
+      parseColor(textStyle.getFill()!.getColor() as ColorType),
     );
   }
   return style;

package/src/style/vectorStyleItem.ts

@@ -261,7 +261,7 @@ class VectorStyleItem extends StyleItem {
           options.image.radius = 5;
         }
         if ((options.image.fill as FillOptions)?.color) {
-          checkColor(options.image.fill as FillOptions);
+          checkColor(options.image.fill as { color: ColorType }); // XXX PatternDescriptor
         }
         if ((options.image.stroke as StrokeOptions)?.color) {
           checkStroke(options.image.stroke as StrokeOptions);
@@ -418,10 +418,10 @@ class VectorStyleItem extends StyleItem {
   set style(style: Style | StyleFunction) {
     check(style, maybe(oneOf(Style, Function)));
     if (style instanceof Style) {
-      this._stroke = style.getStroke();
-      this._fill = style.getFill();
-      this._text = style.getText();
-      this._image = style.getImage();
+      this._stroke = style.getStroke() ?? undefined;
+      this._fill = style.getFill() ?? undefined;
+      this._text = style.getText() ?? undefined;
+      this._image = style.getImage() ?? undefined;
     } else {
       this._stroke = undefined;
       this._fill = undefined;
@@ -485,7 +485,7 @@ class VectorStyleItem extends StyleItem {
     if (this._image instanceof Circle && this._image.getFill()) {
       colorConditions.splice(1, 0, [
         `\${olcs_geometryType}===${OlcsGeometryType.POINT}`,
-        getStringColor(this._image.getFill().getColor() as OLColor),
+        getStringColor(this._image.getFill()!.getColor() as OLColor),
       ]);
     }
     if (this.fillColor) {
@@ -538,13 +538,13 @@ class VectorStyleItem extends StyleItem {
         const stroke = this._image.getStroke();
         let size = this._image.getRadius() * 2;
         if (stroke) {
-          if (this._image.getStroke().getColor()) {
+          if (this._image.getStroke()?.getColor()) {
             pointOutlineColorConditions.splice(1, 1, [
               'true',
-              getStringColor(this._image.getStroke().getColor()),
+              getStringColor(this._image.getStroke()!.getColor()),
             ]);
           }
-          const width = this._image.getStroke().getWidth() as number;
+          const width = this._image.getStroke()!.getWidth() as number;
           pointOutlineWidthConditions.splice(1, 1, ['true', `${width}`]);
           size -= width;
         }
@@ -620,21 +620,21 @@ class VectorStyleItem extends StyleItem {
           `'${String(this._text.getText())}'`,
         ]);
       }
-      if (this._text.getFill() && this._text.getFill().getColor()) {
+      if (this._text.getFill()?.getColor()) {
         labelColorConditions.splice(1, 1, [
           'true',
-          getStringColor(this._text.getFill().getColor() as OLColor),
+          getStringColor(this._text.getFill()!.getColor() as OLColor),
         ]);
       }
 
-      if (this._text.getStroke() && this._text.getStroke().getColor()) {
+      if (this._text.getStroke()?.getColor()) {
         labelOutlineColorConditions.splice(1, 1, [
           'true',
-          getStringColor(this._text.getStroke().getColor()),
+          getStringColor(this._text.getStroke()!.getColor()),
         ]);
         labelOutlineWidthConditions.splice(1, 1, [
           'true',
-          `${this._text.getStroke().getWidth() || 1.25}`,
+          `${this._text.getStroke()!.getWidth() || 1.25}`,
         ]);
       }
     }

package/src/util/clipping/clippingObject.ts

@@ -166,9 +166,7 @@ class ClippingObject {
         if (layer.active) {
           const visualisations = map.getVisualizationsForLayer(layer);
           const tilesets = visualisations
-            ? ([...visualisations].filter(
-                (v) => v instanceof Cesium3DTileset,
-              ) as Cesium3DTileset[])
+            ? [...visualisations].filter((v) => v instanceof Cesium3DTileset)
             : [];
 
           if (tilesets.length > 0) {

package/src/util/clipping/clippingPlaneHelper.ts

@@ -13,7 +13,6 @@ import {
   type Camera,
 } from '@vcmap-cesium/engine';
 import type { Coordinate } from 'ol/coordinate.js';
-import type { Geometry } from 'ol/geom.js';
 import Feature from 'ol/Feature.js';
 import LineString from 'ol/geom/LineString.js';
 import { offset } from 'ol/sphere.js';
@@ -27,7 +26,7 @@ import Extent3D from '../featureconverter/extent3D.js';
 import {
   enforceEndingVertex,
   enforceRightHand,
-  getFlatCoordinatesFromGeometry,
+  getFlatCoordinateReferences,
 } from '../geometryHelpers.js';
 import { mercatorToCartesian } from '../math.js';
 
@@ -162,7 +161,7 @@ export function createClippingPlaneCollection(
   check(transformMatrix, optional(Matrix4));
 
   const clippingPlanes = [];
-  const geometry = feature.getGeometry() as Geometry;
+  const geometry = feature.getGeometry()!;
   const geometryType = geometry.getType();
 
   if (geometryType === 'Point') {
@@ -174,7 +173,7 @@ export function createClippingPlaneCollection(
       ),
     );
   } else {
-    const coords = getFlatCoordinatesFromGeometry(geometry);
+    const coords = getFlatCoordinateReferences(geometry);
     if (
       coords.length < 2 ||
       (coords[0][0] === coords[1][0] && coords[0][1] === coords[1][1])

package/src/util/displayQuality/displayQuality.ts

@@ -20,6 +20,7 @@ export type DisplayQualityViewModelOptions = {
   fogScreenSpaceErrorFactor?: number;
   resolutionScale?: number;
   layerSSEFactor?: number;
+  msaa?: 1 | 2 | 4 | 8;
 };
 
 export type DisplayQualityLayerModel = {
@@ -55,6 +56,7 @@ class DisplayQuality {
         fogScreenSpaceErrorFactor: 6,
         resolutionScale: 0.9,
         layerSSEFactor: 2,
+        msaa: 1,
       },
       medium: {
         sse: 2.333,
@@ -64,6 +66,7 @@ class DisplayQuality {
         fogScreenSpaceErrorFactor: 4,
         resolutionScale: 1,
         layerSSEFactor: 1.1,
+        msaa: 1,
       },
       high: {
         sse: 4 / 3,
@@ -73,6 +76,7 @@ class DisplayQuality {
         fogScreenSpaceErrorFactor: 0,
         resolutionScale: 1,
         layerSSEFactor: 0.5,
+        msaa: 4,
       },
     };
   }
@@ -172,7 +176,12 @@ class DisplayQuality {
               key,
               Object.fromEntries(
                 Object.entries(value as Record<string, unknown>).filter(
-                  ([, v]) => v != null,
+                  ([innerKey, v]) => {
+                    if (innerKey === 'msaa') {
+                      return ([1, 2, 4, 8] as Array<unknown>).includes(v);
+                    }
+                    return v != null;
+                  },
                 ),
               ),
             ];
@@ -245,6 +254,9 @@ class DisplayQuality {
       viewer.scene.fog.density = this._viewModel.fogDensity!;
       viewer.scene.fog.screenSpaceErrorFactor =
         this._viewModel.fogScreenSpaceErrorFactor!;
+      if (this._viewModel.msaa) {
+        viewer.scene.msaaSamples = this._viewModel.msaa;
+      }
     }
 
     if (this._currentQualityLevel !== previousLevel) {