@vcmap/core 5.0.0-rc.6 → 5.0.0-rc.7

package/index.d.ts

@@ -6913,6 +6913,8 @@ export interface ProjectionOptions {
     prefix?: string | undefined;
 }
 
+
+
 /**
  * Set the default projections epsg and proj4. Does not update
  * projection created prior to this functions call.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "5.0.0-rc.6",
+  "version": "5.0.0-rc.7",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -54,11 +54,11 @@
     "node-fetch": "^3.2.0",
     "sinon": "^9.2.4",
     "sinon-chai": "^3.6.0",
-    "typescript": "^4.4.4"
+    "typescript": "^4.6.2"
   },
   "peerDependencies": {
     "@vcmap/cesium": "~1.87.3",
-    "ol": "^6.9.0"
+    "ol": "~6.13.0"
   },
   "eslintConfig": {
     "extends": [
@@ -77,7 +77,7 @@
     "@vcsuite/logger": "^1.0.1",
     "@vcsuite/parsers": "^1.0.1",
     "fast-deep-equal": "^3.1.3",
-    "proj4": "^2.7.2",
+    "proj4": "^2.7.5",
     "rbush": ">=3.0.1",
     "rbush-knn": "^3.0.1",
     "underscore.template": "^0.1.7",

package/src/vcs/vcm/event/vcsEvent.js

@@ -58,7 +58,7 @@ class VcsEvent {
    * @api
    */
   raiseEvent(event) {
-    this._listeners.forEach((cb) => {
+    [...this._listeners].forEach((cb) => {
       cb(event);
     });
   }
@@ -70,7 +70,7 @@ class VcsEvent {
   async awaitRaisedEvent(event) {
     const promises = new Array(this._listeners.size);
     let i = 0;
-    this._listeners.forEach((cb) => {
+    [...this._listeners].forEach((cb) => {
       promises[i] = cb(event);
       i += 1;
     });

package/src/vcs/vcm/layer/featureVisibility.js

@@ -264,8 +264,9 @@ class FeatureVisibility {
           usedStyle = fromCesiumColor(style);
         } else if (style instanceof Style) {
           usedStyle = new VectorStyleItem({});
-          if (style.getText() && style.getText().getText()) {
-            usedStyle.label = style.getText().getText();
+          if (style.getText() && style.getText().getText() && !Array.isArray(style.getText().getText())) {
+            // getText can return a rich Text Array<string> We do not support this at the moment.
+            usedStyle.label = String(style.getText().getText());
           }
           usedStyle.style = style;
         }

package/src/vcs/vcm/layer/openlayers/rasterLayerOpenlayers.js

@@ -77,7 +77,7 @@ class RasterLayerOpenlayers extends LayerOpenlayers {
         this._splitDirectionRenderListeners
           .push(/** @type {import("ol/events").EventsKey} */
             (this.olLayer.on('postrender', (/** @type {import("ol/render/Event").default} */ event) => {
-              event.context.restore();
+              /** @type {CanvasRenderingContext2D} */ (event.context).restore();
             })),
           );
         this.olLayer.changed();
@@ -93,7 +93,8 @@ class RasterLayerOpenlayers extends LayerOpenlayers {
     if (!this.map.splitScreen) {
       return;
     }
-    const { context } = event;
+    // eslint-disable-next-line prefer-destructuring
+    const context = /** @type {CanvasRenderingContext2D} */ (event.context);
     const width = context.canvas.width * this.map.splitScreen.position;
     context.save();
     context.beginPath();

package/src/vcs/vcm/maps/oblique.js

@@ -420,7 +420,8 @@ class Oblique extends BaseOLMap {
     const gpInternalProjection = image.transformImage2RealWorld(gpImageCoordinates, image.averageHeight);
 
     const transfrom = getTransform(image.meta.projection.proj, wgs84Projection.proj);
-    const gpWGS84 = transfrom(gpInternalProjection.slice(0, 2));
+    // getText can return a rich Text Array<string> We do not support this at the moment.
+    const gpWGS84 = transfrom(gpInternalProjection.slice(0, 2), undefined, undefined);
     return this._computeViewpointInternal(gpWGS84);
   }
 

package/src/vcs/vcm/maps/openlayers.js

@@ -87,7 +87,8 @@ class Openlayers extends BaseOLMap {
     size.width = viewport.offsetWidth || 1;
     const aspectRatio = size.width / size.height;
     const fovy = Math.atan(Math.tan(fov * 0.5) / aspectRatio) * 2.0;
-    const latlon = toLatLon(coord.slice(0, 2));
+    // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+    const latlon = toLatLon(coord.slice(0, 2), undefined, undefined);
     const metersPerUnit = view.getProjection().getMetersPerUnit();
 
     const resolution = view.getResolution();
@@ -129,7 +130,8 @@ class Openlayers extends BaseOLMap {
       coords = viewpoint.cameraPosition.slice(0, 2);
     }
     const { distance } = viewpoint;
-    const center = fromLatLon(coords);
+    // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+    const center = fromLatLon(coords, undefined, undefined);
 
     const fov = Math.PI / 3.0;
     const viewport = this.olMap.getViewport();
@@ -180,7 +182,8 @@ class Openlayers extends BaseOLMap {
     const toLatLon = getTransform(view.getProjection(), 'EPSG:4326');
     const topLeft = [extent[0], extent[3]];
     const bottomRight = [extent[2], extent[1]];
-    const bbox = [toLatLon(topLeft), toLatLon(bottomRight)];
+    // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+    const bbox = [toLatLon(topLeft, undefined, undefined), toLatLon(bottomRight, undefined, undefined)];
 
     return containsXY(boundingExtent(bbox), coords[0], coords[1]);
   }

package/src/vcs/vcm/oblique/ObliqueCollection.js

@@ -79,7 +79,8 @@ function getImageFeatures(images) {
   return images.map((image) => {
     const transform = getTransform(image.meta.projection.proj, mercatorProjection.proj);
     const feature = new Feature({
-      geometry: new Polygon([image.groundCoordinates.map(c => transform(c.slice(0, 2)))]),
+      // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+      geometry: new Polygon([image.groundCoordinates.map(c => transform(c.slice(0, 2), undefined, undefined))]),
       viewDirection: image.viewDirection,
     });
     feature.setId(image.name);
@@ -370,7 +371,8 @@ class ObliqueCollection extends VcsObject {
 
       const transform = getTransform(image.meta.projection.proj, mercatorProjection.proj);
       const coord = image.centerPointOnGround.slice(0, 2);
-      transform(coord, coord);
+      // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+      transform(coord, coord, undefined);
       directions.get(image.viewDirection).push({
         minX: coord[0],
         minY: coord[1],
@@ -539,7 +541,8 @@ class ObliqueCollection extends VcsObject {
     if (image) {
       const transform = getTransform(mercatorProjection.proj, image.meta.projection.proj);
       const internalCoordinates = mercatorCoordinate.slice(0, 2);
-      transform(internalCoordinates, internalCoordinates);
+      // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+      transform(internalCoordinates, internalCoordinates, undefined);
       const extent = boundingExtent(image.groundCoordinates);
       return containsCoordinate(extent, internalCoordinates);
     }
@@ -560,7 +563,8 @@ class ObliqueCollection extends VcsObject {
     const tree = this._directionTrees.get(image.viewDirection);
     if (tree) {
       const transform = getTransform(image.meta.projection.proj, mercatorProjection.proj);
-      const coords = image.groundCoordinates.map(c => transform(c.slice(0, 2)));
+      // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+      const coords = image.groundCoordinates.map(c => transform(c.slice(0, 2), undefined, undefined));
       const extent = boundingExtent(coords);
       await this.loadDataForExtent(buffer(extent, 200));
       const center = getCenter(extent);

package/src/vcs/vcm/oblique/ObliqueProvider.js

@@ -234,7 +234,8 @@ class ObliqueProvider {
       const pulledCenter = this._pullCoordinateToImageCenter(imageCoordinates.slice());
       const worldCoords = this._currentImage.transformImage2RealWorld(pulledCenter).slice(0, 2);
       const transform = getTransform(this._currentImage.meta.projection.proj, mercatorProjection.proj);
-      const mercatorCoords = transform(worldCoords);
+      // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+      const mercatorCoords = transform(worldCoords, undefined, undefined);
       const buffer = 200; // XXX make configurable?
       const extent = [
         mercatorCoords[0] - buffer, mercatorCoords[1] - buffer,
@@ -300,10 +301,11 @@ class ObliqueProvider {
     const [width, height] = this._currentImage.meta.size;
     let center = [width / 2, height / 2];
     if (optCenter) {
+      // error in TransformFunction type definition, remove undefined after openlayer fixed the type
       const worldCenter = getTransform(
         mercatorProjection.proj,
         this._currentImage.meta.projection.proj,
-      )(optCenter.slice(0, 2));
+      )(optCenter.slice(0, 2), undefined, undefined);
       const imageCenter = this._currentImage.transformRealWorld2Image(worldCenter, optCenter[2]);
       imageCenter[0] = withinBounds(imageCenter[0], width);
       imageCenter[1] = withinBounds(imageCenter[1], height);

package/src/vcs/vcm/util/featureProvider/wmsFeatureProvider.js

@@ -198,7 +198,8 @@ class WMSFeatureProvider extends AbstractFeatureProvider {
     let coords = coordinate;
     if (projection) {
       const transform = getTransform(mercatorProjection.proj, projection);
-      coords = transform(coordinate.slice());
+      // error in TransformFunction type definition, remove undefined after openlayer fixed the type
+      coords = transform(coordinate.slice(), undefined, undefined);
     }
 
     const metersPerUnit = 111194.87428468118;

package/src/vcs/vcm/util/projection.js

@@ -14,9 +14,12 @@ import { VcsClassRegistry } from '../classRegistry.js';
  * @property {string|undefined} [prefix='EPSG:'] - an alternate prefix to use for custom projection
  * @api stable
  */
+/**
+ * @typedef {function(Array<number>, Array<number>=, number=): Array<number>} CorrectTransformFunction
+ */
 
-export const wgs84ToMercatorTransformer = getTransform('EPSG:4326', 'EPSG:3857');
-export const mercatorToWgs84Transformer = getTransform('EPSG:3857', 'EPSG:4326');
+export const wgs84ToMercatorTransformer = /** @type {CorrectTransformFunction} */ (getTransform('EPSG:4326', 'EPSG:3857'));
+export const mercatorToWgs84Transformer = /** @type {CorrectTransformFunction} */ (getTransform('EPSG:3857', 'EPSG:4326'));
 
 
 /**