@itowns/geographic 2.46.1-next.0 → 2.46.1-next.10

package/lib/Coordinates.js

@@ -1,11 +1,11 @@
-import * as THREE from 'three';
+import { Vector3, MathUtils } from 'three';
 import proj4 from 'proj4';
 import Ellipsoid from "./Ellipsoid.js";
 import * as CRS from "./Crs.js";
-const ellipsoid = new Ellipsoid();
+const ellipsoid = /* @__PURE__ */new Ellipsoid();
 const projectionCache = {};
-const v0 = new THREE.Vector3();
-const v1 = new THREE.Vector3();
+const v0 = /* @__PURE__ */new Vector3();
+const v1 = /* @__PURE__ */new Vector3();
 let coord0;
 let coord1;
 function proj4cache(crsIn, crsOut) {
@@ -56,7 +56,7 @@ class Coordinates {
    */
 
   /**
-   * A default or user-defined CRS (see {@link ProjectionAlias}).
+   * A default or user-defined CRS (see {@link ProjectionLike}).
    */
 
   /** The x value (or longitude) of this coordinate. */
@@ -66,15 +66,12 @@ class Coordinates {
   /** The z value (or altitude) of this coordinate. */
 
   /**
-   * @param crs - A default or user-defined CRS (see {@link ProjectionAlias}).
+   * @param crs - A default or user-defined CRS (see {@link ProjectionLike}).
    * @param x - x or longitude value.
    * @param y - y or latitude value.
    * @param z - z or altitude value.
    */
-  constructor(crs) {
-    let x = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-    let y = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    let z = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  constructor(crs, x = 0, y = 0, z = 0) {
     this.isCoordinates = true;
     CRS.isValid(crs);
     this.crs = crs;
@@ -86,7 +83,7 @@ class Coordinates {
     this.z = 0;
 
     // Normal
-    this._normal = new THREE.Vector3();
+    this._normal = new Vector3();
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     if (x.length > 0) {
@@ -122,10 +119,7 @@ class Coordinates {
    * @param y - y or latitude value.
    * @param z - z or altitude value.
    */
-  setFromValues() {
-    let x = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-    let y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-    let z = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  setFromValues(x = 0, y = 0, z = 0) {
     this.x = x;
     this.y = y;
     this.z = z;
@@ -142,8 +136,7 @@ class Coordinates {
    * @param array - The source array.
    * @param offset - Optional offset into the array. Default is 0.
    */
-  setFromArray(array) {
-    let offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  setFromArray(array, offset = 0) {
     return this.setFromValues(array[offset], array[offset + 1], array[offset + 2]);
   }
 
@@ -215,8 +208,7 @@ class Coordinates {
    * @returns A vector `(x, y, z)`, or copies x, y and z into the provided
    * vector.
    */
-  toVector3() {
-    let target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new THREE.Vector3();
+  toVector3(target = new Vector3()) {
     return target.copy(this);
   }
 
@@ -230,10 +222,8 @@ class Coordinates {
    * @returns An array [x, y, z], or copies x, y and z into the provided
    * array.
    */
-  toArray() {
-    let array = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    let offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-    return THREE.Vector3.prototype.toArray.call(this, array, offset);
+  toArray(array = [], offset = 0) {
+    return Vector3.prototype.toArray.call(this, array, offset);
   }
 
   /**
@@ -278,7 +268,7 @@ class Coordinates {
    * @param mat - The matrix.
    */
   applyMatrix4(mat) {
-    THREE.Vector3.prototype.applyMatrix4.call(this, mat);
+    Vector3.prototype.applyMatrix4.call(this, mat);
     return this;
   }
 
@@ -312,13 +302,12 @@ class Coordinates {
    * const geographicCoords = geocentricCoords.as('EPSG:4326');
    * ```
    */
-  as(crs) {
-    let target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new Coordinates(crs);
+  as(crs, target = new Coordinates(crs)) {
     if (this.crs == crs) {
       target.copy(this);
     } else {
       if (CRS.is4326(this.crs) && crs == 'EPSG:3857') {
-        this.y = THREE.MathUtils.clamp(this.y, -89.999999, 89.999999);
+        this.y = MathUtils.clamp(this.y, -89.999999, 89.999999);
       }
       target.setFromArray(proj4cache(this.crs, crs).forward([this.x, this.y, this.z]));
     }
@@ -326,6 +315,6 @@ class Coordinates {
     return target;
   }
 }
-coord0 = new Coordinates('EPSG:4326', 0, 0, 0);
-coord1 = new Coordinates('EPSG:4326', 0, 0, 0);
+coord0 = /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0);
+coord1 = /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0);
 export default Coordinates;

package/lib/Crs.js

@@ -167,4 +167,21 @@ export function axisOrder(crs) {
  * @param code - Named alias of the currently defined projection.
  * @param proj4def - Proj4 or WKT string of the defined projection.
  */
-export const defs = (code, proj4def) => proj4.defs(code, proj4def);
+export const defs = (code, proj4def) => proj4.defs(code, proj4def);
+export function defsFromWkt(wkt) {
+  proj4.defs('unknown', wkt);
+  const proj4Defs = proj4.defs;
+  let projCS;
+  if (proj4Defs('unknown').type === 'COMPD_CS') {
+    console.warn('Compound coordinate system is not yet supported.');
+    projCS = proj4Defs('unknown').PROJCS;
+  } else {
+    projCS = proj4Defs('unknown');
+  }
+  const crsAlias = projCS.title || projCS.name || 'EPSG:XXXX';
+  if (!(crsAlias in proj4.defs)) {
+    proj4.defs(crsAlias, projCS);
+  }
+  delete proj4Defs.unknown;
+  return crsAlias;
+}

package/lib/Ellipsoid.js

@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import { Vector3, MathUtils } from 'three';
 import proj4 from 'proj4';
 import Coordinates from "./Coordinates.js";
 
@@ -6,8 +6,8 @@ import Coordinates from "./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();
+export const ellipsoidSizes = /* @__PURE__ */(() => new Vector3(proj4.WGS84.a, proj4.WGS84.a, proj4.WGS84.b))();
+const normal = /* @__PURE__ */new Vector3();
 class Ellipsoid {
   /**
    * Length of the semi-axes of the ellipsoid.
@@ -21,11 +21,10 @@ class 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();
-    this._radiiSquared = new THREE.Vector3();
-    this._invRadiiSquared = new THREE.Vector3();
+  constructor(size = ellipsoidSizes) {
+    this.size = new Vector3();
+    this._radiiSquared = new Vector3();
+    this._invRadiiSquared = new Vector3();
     this.eccentricity = 0;
     this.setSize(size);
   }
@@ -38,8 +37,7 @@ class Ellipsoid {
    * @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();
+  geodeticSurfaceNormal(cartesian, target = new Vector3()) {
     return cartesian.toVector3(target).multiply(this._invRadiiSquared).normalize();
   }
 
@@ -51,10 +49,9 @@ class Ellipsoid {
    * @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);
-    const latitude = THREE.MathUtils.degToRad(coordCarto.latitude);
+  geodeticSurfaceNormalCartographic(coordCarto, target = new Vector3()) {
+    const longitude = MathUtils.degToRad(coordCarto.longitude);
+    const latitude = MathUtils.degToRad(coordCarto.latitude);
     const cosLatitude = Math.cos(latitude);
     return target.set(cosLatitude * Math.cos(longitude), cosLatitude * Math.sin(longitude), Math.sin(latitude));
   }
@@ -75,8 +72,7 @@ class Ellipsoid {
     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();
+  cartographicToCartesian(coordCarto, target = new Vector3()) {
     normal.copy(coordCarto.geodesicNormal);
     target.multiplyVectors(this._radiiSquared, normal);
     const gamma = Math.sqrt(normal.dot(target));
@@ -93,8 +89,7 @@ class Ellipsoid {
    * @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);
+  cartesianToCartographic(position, target = 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?
@@ -110,7 +105,7 @@ class Ellipsoid {
     const cosu = Math.cos(nu);
     const phi = Math.atan((position.z * (1 - f) + e * a * sinu * sinu * sinu) / ((1 - f) * (rsqXY - e * a * cosu * cosu * cosu)));
     const h = rsqXY * Math.cos(phi) + position.z * Math.sin(phi) - a * Math.sqrt(1 - e * Math.sin(phi) * Math.sin(phi));
-    return target.setFromValues(THREE.MathUtils.radToDeg(theta), THREE.MathUtils.radToDeg(phi), h);
+    return target.setFromValues(MathUtils.radToDeg(theta), MathUtils.radToDeg(phi), h);
   }
   cartographicToCartesianArray(coordCartoArray) {
     const cartesianArray = [];
@@ -151,7 +146,7 @@ class Ellipsoid {
       return false;
     } // Too close to intersection
 
-    const inter = new THREE.Vector3();
+    const inter = new Vector3();
     inter.addVectors(ray.origin, dir.clone().setLength(t));
     return inter;
   }
@@ -170,10 +165,10 @@ class Ellipsoid {
     // The formula uses the distance on approximated sphere,
     // with the nearest local radius of curvature of the ellipsoid
     // https://geodesie.ign.fr/contenu/fichiers/Distance_longitude_latitude.pdf
-    const longitude1 = THREE.MathUtils.degToRad(coordCarto1.longitude);
-    const latitude1 = THREE.MathUtils.degToRad(coordCarto1.latitude);
-    const longitude2 = THREE.MathUtils.degToRad(coordCarto2.longitude);
-    const latitude2 = THREE.MathUtils.degToRad(coordCarto2.latitude);
+    const longitude1 = MathUtils.degToRad(coordCarto1.longitude);
+    const latitude1 = MathUtils.degToRad(coordCarto1.latitude);
+    const longitude2 = MathUtils.degToRad(coordCarto2.longitude);
+    const latitude2 = MathUtils.degToRad(coordCarto2.latitude);
     const distRad = Math.acos(Math.sin(latitude1) * Math.sin(latitude2) + Math.cos(latitude1) * Math.cos(latitude2) * Math.cos(longitude2 - longitude1));
     const e = this.eccentricity;
     const latMoy = (latitude1 + latitude2) * 0.5;

package/lib/Extent.js

@@ -1,21 +1,18 @@
-import * as THREE from 'three';
+import { Vector2, Vector3, Vector4, Box3 } from 'three';
 import Coordinates from "./Coordinates.js";
 import * as CRS from "./Crs.js";
-const _dim = new THREE.Vector2();
-const _dim2 = new THREE.Vector2();
-const _box = new THREE.Box3();
-const defaultScheme = new THREE.Vector2(2, 2);
-const cNorthWest = new Coordinates('EPSG:4326', 0, 0, 0);
-const cSouthWest = new Coordinates('EPSG:4326', 0, 0, 0);
-const cNorthEast = new Coordinates('EPSG:4326', 0, 0, 0);
-const southWest = new THREE.Vector3();
-const northEast = new THREE.Vector3();
+const _dim = /* @__PURE__ */new Vector2();
+const _dim2 = /* @__PURE__ */new Vector2();
+const _box = /* @__PURE__ */new Box3();
+const defaultScheme = /* @__PURE__ */new Vector2(2, 2);
+const cNorthWest = /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0);
+const cSouthWest = /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0);
+const cNorthEast = /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0);
+const southWest = /* @__PURE__ */new Vector3();
+const northEast = /* @__PURE__ */new Vector3();
 let _extent;
-const cardinals = new Array(8);
-for (let i = cardinals.length - 1; i >= 0; i--) {
-  cardinals[i] = new Coordinates('EPSG:4326', 0, 0, 0);
-}
-const _c = new Coordinates('EPSG:4326', 0, 0);
+const cardinals = [/* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0), /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0), /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0), /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0), /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0), /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0), /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0), /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0, 0)];
+const _c = /* @__PURE__ */new Coordinates('EPSG:4326', 0, 0);
 /**
  * A class representing a geographical extent.
  *
@@ -31,7 +28,7 @@ class Extent {
    */
 
   /**
-   * A default or user-defined CRS (see {@link ProjectionAlias}).
+   * A default or user-defined CRS (see {@link ProjectionLike}).
    */
 
   /**
@@ -51,17 +48,13 @@ class Extent {
    */
 
   /**
-   * @param crs - A default or user-defined CRS (see {@link ProjectionAlias}).
+   * @param crs - A default or user-defined CRS (see {@link ProjectionLike}).
    * @param west - the `west` value of this extent. Default is 0.
    * @param east - the `east` value of this extent. Default is 0.
    * @param south - the `south` value of this extent. Default is 0.
    * @param north - the `north` value of this extent. Default is 0.
    */
-  constructor(crs) {
-    let west = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-    let east = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    let south = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-    let north = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  constructor(crs, west = 0, east = 0, south = 0, north = 0) {
     if (CRS.isGeocentric(crs)) {
       throw new Error(`Non-compatible geocentric projection ${crs} to build a geographical extent`);
     }
@@ -88,8 +81,7 @@ class Extent {
    * @param target - The target to store the projected extent. If this not
    * provided a new extent will be created.
    */
-  as(crs) {
-    let target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new Extent('EPSG:4326');
+  as(crs, target = new Extent('EPSG:4326')) {
     CRS.isValid(crs);
     if (this.crs != crs) {
       // Compute min/max in x/y by projecting 8 cardinal points,
@@ -129,8 +121,7 @@ class Extent {
    * @param target - The target to store the center coordinate. If this not
    * provided a new coordinate will be created.
    */
-  center() {
-    let target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Coordinates(this.crs);
+  center(target = new Coordinates(this.crs)) {
     this.planarDimensions(_dim);
     target.crs = this.crs;
     target.setFromValues(this.west + _dim.x * 0.5, this.south + _dim.y * 0.5);
@@ -145,8 +136,7 @@ class Extent {
    *
    * @param target - optional target
    */
-  planarDimensions() {
-    let target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new THREE.Vector2();
+  planarDimensions(target = new Vector2()) {
     // Calculte the dimensions for x and y
     return target.set(Math.abs(this.east - this.west), Math.abs(this.north - this.south));
   }
@@ -159,8 +149,7 @@ class Extent {
    *
    * @param target - optional target
    */
-  geodeticDimensions() {
-    let target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new THREE.Vector2();
+  geodeticDimensions(target = new Vector2()) {
     // set 3 corners extent
     cNorthWest.crs = this.crs;
     cSouthWest.crs = this.crs;
@@ -180,8 +169,7 @@ class Extent {
    *
    * @param target - optional target
    */
-  spatialEuclideanDimensions() {
-    let target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new THREE.Vector2();
+  spatialEuclideanDimensions(target = new Vector2()) {
     // set 3 corners extent
     cNorthWest.crs = this.crs;
     cSouthWest.crs = this.crs;
@@ -201,8 +189,7 @@ class Extent {
    * @param epsilon - error margin when comparing to the coordinates.
    * Default is 0.
    */
-  isPointInside(coord) {
-    let epsilon = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  isPointInside(coord, epsilon = 0) {
     if (this.crs == coord.crs) {
       _c.copy(coord);
     } else {
@@ -219,8 +206,7 @@ class Extent {
    * @param extent - the extent to check
    * @param epsilon - error margin when comparing the extent bounds.
    */
-  isInside(extent) {
-    let epsilon = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : CRS.reasonableEpsilon(this.crs);
+  isInside(extent, epsilon = CRS.reasonableEpsilon(this.crs)) {
     extent.as(this.crs, _extent);
     return this.east - _extent.east <= epsilon && _extent.west - this.west <= epsilon && this.north - _extent.north <= epsilon && _extent.south - this.south <= epsilon;
   }
@@ -236,8 +222,7 @@ class Extent {
    * south-north, the `z` property the scale on west-east, the `w` property
    * the scale on south-north.
    */
-  offsetToParent(extent) {
-    let target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new THREE.Vector4();
+  offsetToParent(extent, target = new Vector4()) {
     if (this.crs != extent.crs) {
       throw new Error('unsupported mix');
     }
@@ -317,8 +302,7 @@ class Extent {
    * @param array - the source array
    * @param offset - offset into the array. Default is 0.
    */
-  setFromArray(array) {
-    let offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  setFromArray(array, offset = 0) {
     this.west = array[offset];
     this.east = array[offset + 1];
     this.south = array[offset + 2];
@@ -442,8 +426,7 @@ class Extent {
    * Return values of extent in string, separated by the separator input.
    * @param sep - string separator
    */
-  toString() {
-    let sep = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  toString(sep = '') {
     return `${this.east}${sep}${this.north}${sep}${this.west}${sep}${this.south}`;
   }
 
@@ -464,8 +447,7 @@ class Extent {
    * @param scheme - The scheme to subdivise.
    * @returns subdivised extents.
    */
-  subdivisionByScheme() {
-    let scheme = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultScheme;
+  subdivisionByScheme(scheme = defaultScheme) {
     const subdivisedExtents = [];
     const dimSub = this.planarDimensions(_dim).divide(scheme);
     for (let x = scheme.x - 1; x >= 0; x--) {
@@ -512,9 +494,7 @@ class Extent {
    * @param north - The max north
    * @returns this extent
    */
-  clampSouthNorth() {
-    let south = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.south;
-    let north = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.north;
+  clampSouthNorth(south = this.south, north = this.north) {
     this.south = Math.max(this.south, south);
     this.north = Math.min(this.north, north);
     return this;
@@ -527,9 +507,7 @@ class Extent {
    * @param east - The max east
    * @returns this extent
    */
-  clampWestEast() {
-    let west = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.west;
-    let east = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.east;
+  clampWestEast(west = this.west, east = this.east) {
     this.west = Math.max(this.west, west);
     this.east = Math.min(this.east, east);
     return this;
@@ -546,5 +524,5 @@ class Extent {
     return this.clampWestEast(extent.west, extent.east);
   }
 }
-_extent = new Extent('EPSG:4326');
+_extent = /* @__PURE__ */new Extent('EPSG:4326');
 export default Extent;