itowns 2.44.3-next.29 → 2.44.3-next.30

package/lib/Core/Math/Ellipsoid.js

@@ -1,9 +1,26 @@
 import * as THREE from 'three';
 import proj4 from 'proj4';
 import Coordinates from "../Geographic/Coordinates.js";
+
+/**
+ * Length of the semi-axes of the WGS84 ellipsoid.
+ * @internal
+ */
 export const ellipsoidSizes = new THREE.Vector3(proj4.WGS84.a, proj4.WGS84.a, proj4.WGS84.b);
 const normal = new THREE.Vector3();
 class Ellipsoid {
+  /**
+   * Length of the semi-axes of the ellipsoid.
+   */
+
+  /**
+   * Eccentricity of the ellipsoid.
+   */
+
+  /**
+   * @param size - Length of the semi-axes of the ellipsoid. Defaults to those
+   * defined by the WGS84 ellipsoid.
+   */
   constructor() {
     let size = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ellipsoidSizes;
     this.size = new THREE.Vector3();
@@ -12,10 +29,28 @@ class Ellipsoid {
     this.eccentricity = 0;
     this.setSize(size);
   }
+
+  /**
+   * Computes the normal vector to an ellipsoid at the given cartesian
+   * coordinate `(x, y, z)`.
+   *
+   * @param cartesian - The given cartesian coordinate.
+   * @param target - An object to store this vector to. If this is not
+   * specified, a new vector will be created.
+   */
   geodeticSurfaceNormal(cartesian) {
     let target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new THREE.Vector3();
     return cartesian.toVector3(target).multiply(this._invRadiiSquared).normalize();
   }
+
+  /**
+   * Computes the normal vector to an ellipsoid at the given geographic
+   * coordinate `(longitude, latitude, altitude)`.
+   *
+   * @param coordCarto - The given geographic coordinate.
+   * @param target - An object to store this vector to. If this is not
+   * specified, a new vector will be created.
+   */
   geodeticSurfaceNormalCartographic(coordCarto) {
     let target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new THREE.Vector3();
     const longitude = THREE.MathUtils.degToRad(coordCarto.longitude);
@@ -23,13 +58,22 @@ class Ellipsoid {
     const cosLatitude = Math.cos(latitude);
     return target.set(cosLatitude * Math.cos(longitude), cosLatitude * Math.sin(longitude), Math.sin(latitude));
   }
+
+  /**
+   * Sets the length of the semi-axes of this ellipsoid from a 3-dimensional
+   * vector-like object. The object shall have both `x`, `y` and `z`
+   * properties.
+   *
+   * @param size - The source vector.
+   */
   setSize(size) {
     this.size.set(size.x, size.y, size.z);
     this._radiiSquared.multiplyVectors(size, size);
-    this._invRadiiSquared.x = size.x == 0 ? 0 : 1 / this._radiiSquared.x;
-    this._invRadiiSquared.y = size.y == 0 ? 0 : 1 / this._radiiSquared.y;
-    this._invRadiiSquared.z = size.z == 0 ? 0 : 1 / this._radiiSquared.z;
+    this._invRadiiSquared.x = size.x === 0 ? 0 : 1 / this._radiiSquared.x;
+    this._invRadiiSquared.y = size.y === 0 ? 0 : 1 / this._radiiSquared.y;
+    this._invRadiiSquared.z = size.z === 0 ? 0 : 1 / this._radiiSquared.z;
     this.eccentricity = Math.sqrt(this._radiiSquared.x - this._radiiSquared.z) / this.size.x;
+    return this;
   }
   cartographicToCartesian(coordCarto) {
     let target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new THREE.Vector3();
@@ -42,18 +86,18 @@ class Ellipsoid {
   }
 
   /**
-   * Convert cartesian coordinates to geographic according to the current ellipsoid of revolution.
-   * @param {Object} position - The coordinate to convert
-   * @param {number} position.x
-   * @param {number} position.y
-   * @param {number} position.z
-   * @param {Coordinate} [target] coordinate to copy result
-   * @returns {Coordinate} an object describing the coordinates on the reference ellipsoid, angles are in degree
+   * Convert cartesian coordinates to geographic according to the current
+   * ellipsoid of revolution.
+   * @param position - The coordinate to convert
+   * @param target - coordinate to copy result
+   * @returns an object describing the coordinates on the reference ellipsoid,
+   * angles are in degree
    */
   cartesianToCartographic(position) {
     let target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new Coordinates('EPSG:4326', 0, 0, 0);
     // for details, see for example http://www.linz.govt.nz/data/geodetic-system/coordinate-conversion/geodetic-datum-conversions/equations-used-datum
-    // TODO the following is only valable for oblate ellipsoid of revolution. do we want to support triaxial ellipsoid?
+    // TODO the following is only valable for oblate ellipsoid of
+    // revolution. do we want to support triaxial ellipsoid?
     const R = Math.sqrt(position.x * position.x + position.y * position.y + position.z * position.z);
     const a = this.size.x; // x
     const b = this.size.z; // z
@@ -92,9 +136,9 @@ class Ellipsoid {
     const t1 = (-b + d) / (2 * a);
     const t2 = (-b - d) / (2 * a);
     if (t1 <= EPSILON && t2 <= EPSILON) {
+      // both intersections are behind the ray origin
       return false;
-    } // both intersections are behind the ray origin
-    // var back = (t1 <= EPSILON || t2 <= EPSILON); // If only one intersection (t>0) then we are inside the ellipsoid and the intersection is at the back of the ellipsoid
+    }
     let t = 0;
     if (t1 <= EPSILON) {
       t = t2;
@@ -111,19 +155,16 @@ class Ellipsoid {
     inter.addVectors(ray.origin, dir.clone().setLength(t));
     return inter;
   }
-  computeDistance(coordCarto1, coordCarto2) {
-    console.warn('computeDistance is renamed to geodesicDistance');
-    this.geodesicDistance(coordCarto1, coordCarto2);
-  }
 
   /**
    * Calculate the geodesic distance, between coordCarto1 and coordCarto2.
-   * It's most short distance on ellipsoid surface between coordCarto1 and coordCarto2.
+   * It's most short distance on ellipsoid surface between coordCarto1 and
+   * coordCarto2.
    * It's called orthodromy.
    *
-   * @param      {Coordinates}  coordCarto1  The coordinate carto 1
-   * @param      {Coordinates}  coordCarto2  The coordinate carto 2
-   * @return     {number}  The orthodromic distance between the two given coordinates.
+   * @param coordCarto1 - The coordinate carto 1
+   * @param coordCarto2 - The coordinate carto 2
+   * @returns The orthodromic distance between the two given coordinates.
    */
   geodesicDistance(coordCarto1, coordCarto2) {
     // The formula uses the distance on approximated sphere,

package/lib/Renderer/Camera.js

@@ -173,7 +173,7 @@ class Camera {
    * @return  {Coordinates}   Coordinates object holding camera's position.
    */
   position(crs) {
-    return new Coordinates(this.crs, this.camera3D.position).as(crs || this.crs);
+    return new Coordinates(this.crs).setFromVector3(this.camera3D.position).as(crs || this.crs);
   }
 
   /**

package/lib/Utils/CameraUtils.js

@@ -156,7 +156,7 @@ class CameraRig extends THREE.Object3D {
 
   // set rig's objects transformation from camera's position and target's position
   setFromPositions(view, cameraPosition) {
-    this.setTargetFromCoordinate(view, new Coordinates(view.referenceCrs, targetPosition));
+    this.setTargetFromCoordinate(view, new Coordinates(view.referenceCrs).setFromVector3(targetPosition));
     this.target.rotation.set(0, 0, 0);
     this.updateMatrixWorld(true);
     this.camera.position.copy(cameraPosition);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.29",
+  "version": "2.44.3-next.30",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -121,6 +121,7 @@
     "sinon": "^19.0.2",
     "three": "^0.168.0",
     "typescript": "^5.6.2",
+    "undici": "^7.2.0",
     "webgl-mock": "^0.1.7",
     "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4",