@itowns/geographic 2.45.1 → 2.45.2-next.1

package/lib/Coordinates.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import type { ProjectionLike } from './Crs';
+import type { ProjectionAlias } from './Crs';
 export interface CoordinatesLike {
     readonly crs: string;
     readonly x: number;
@@ -44,9 +44,9 @@ declare class Coordinates {
      */
     readonly isCoordinates: boolean;
     /**
-     * A default or user-defined CRS (see {@link ProjectionLike}).
+     * A default or user-defined CRS (see {@link ProjectionAlias}).
      */
-    crs: ProjectionLike;
+    crs: ProjectionAlias;
     /** The x value (or longitude) of this coordinate. */
     x: number;
     /** The y value (or latitude) of this coordinate. */
@@ -56,17 +56,17 @@ declare class Coordinates {
     private _normal;
     private _normalNeedsUpdate;
     /**
-     * @param crs - A default or user-defined CRS (see {@link ProjectionLike}).
+     * @param crs - A default or user-defined CRS (see {@link ProjectionAlias}).
      * @param x - x or longitude value.
      * @param y - y or latitude value.
      * @param z - z or altitude value.
      */
-    constructor(crs: ProjectionLike, x?: number, y?: number, z?: number);
+    constructor(crs: ProjectionAlias, x?: number, y?: number, z?: number);
     /**
      * Sets the Coordinate Reference System.
      * @param crs - Coordinate Reference System (e.g. 'EPSG:4978')
      */
-    setCrs(crs: ProjectionLike): this;
+    setCrs(crs: ProjectionAlias): this;
     /**
      * Sets the x, y and z components of this coordinate.
      *
@@ -191,6 +191,6 @@ declare class Coordinates {
      * const geographicCoords = geocentricCoords.as('EPSG:4326');
      * ```
      */
-    as(crs: ProjectionLike, target?: Coordinates): Coordinates;
+    as(crs: ProjectionAlias, target?: Coordinates): Coordinates;
 }
 export default Coordinates;

package/lib/Coordinates.js

@@ -56,7 +56,7 @@ class Coordinates {
    */
 
   /**
-   * A default or user-defined CRS (see {@link ProjectionLike}).
+   * A default or user-defined CRS (see {@link ProjectionAlias}).
    */
 
   /** The x value (or longitude) of this coordinate. */
@@ -66,7 +66,7 @@ class Coordinates {
   /** The z value (or altitude) of this coordinate. */
 
   /**
-   * @param crs - A default or user-defined CRS (see {@link ProjectionLike}).
+   * @param crs - A default or user-defined CRS (see {@link ProjectionAlias}).
    * @param x - x or longitude value.
    * @param y - y or latitude value.
    * @param z - z or altitude value.

package/lib/Crs.d.ts

@@ -3,7 +3,7 @@
  * projection definition previously defined with
  * [`proj4.defs`](https://github.com/proj4js/proj4js#named-projections).
  */
-export type ProjectionLike = string;
+export type ProjectionAlias = string;
 /**
  * System units supported for a coordinate system. See
  * [proj](https://proj4.org/en/9.5/operations/conversions/unitconvert.html#angular-units).
@@ -29,35 +29,35 @@ export declare const UNIT: {
  *
  * @param crs - The CRS to test.
  */
-export declare function is4326(crs: ProjectionLike): crs is "EPSG:4326";
+export declare function is4326(crs: ProjectionAlias): crs is "EPSG:4326";
 /**
  * Returns the horizontal coordinates system units associated with this CRS.
  *
  * @param crs - The CRS to extract the unit from.
  * @returns Either `UNIT.METER`, `UNIT.DEGREE`, `UNIT.FOOT` or `undefined`.
  */
-export declare function getUnit(crs: ProjectionLike): 1 | 2 | 3 | undefined;
+export declare function getUnit(crs: ProjectionAlias): 1 | 2 | 3 | undefined;
 /**
  * Asserts that the CRS is using metric units.
  *
  * @param crs - The CRS to check.
  * @throws {@link Error} if the CRS is not valid.
  */
-export declare function isMetricUnit(crs: ProjectionLike): boolean;
+export declare function isMetricUnit(crs: ProjectionAlias): boolean;
 /**
  * Asserts that the CRS is geographic.
  *
  * @param crs - The CRS to check.
  * @throws {@link Error} if the CRS is not valid.
  */
-export declare function isGeographic(crs: ProjectionLike): boolean;
+export declare function isGeographic(crs: ProjectionAlias): boolean;
 /**
  * Asserts that the CRS is geocentric.
  *
  * @param crs - The CRS to test.
  * @returns false if the crs isn't defined.
  */
-export declare function isGeocentric(crs: ProjectionLike): boolean;
+export declare function isGeocentric(crs: ProjectionAlias): boolean;
 /**
  * Asserts that the CRS is valid, meaning it has been previously defined and
  * includes an unit.
@@ -65,14 +65,14 @@ export declare function isGeocentric(crs: ProjectionLike): boolean;
  * @param crs - The CRS to test.
  * @throws {@link Error} if the crs is not valid.
  */
-export declare function isValid(crs: ProjectionLike): void;
+export declare function isValid(crs: ProjectionAlias): void;
 /**
  * Gives a reasonable epsilon for this CRS.
  *
  * @param crs - The CRS to use.
  * @returns 0.01 if the CRS is EPSG:4326, 0.001 otherwise.
  */
-export declare function reasonableEpsilon(crs: ProjectionLike): 0.01 | 0.001;
+export declare function reasonableEpsilon(crs: ProjectionAlias): 0.01 | 0.001;
 /**
  * Returns the axis parameter defined in proj4 for the provided crs.
  * Might be undefined depending on crs definition.
@@ -80,7 +80,7 @@ export declare function reasonableEpsilon(crs: ProjectionLike): 0.01 | 0.001;
  * @param crs - The CRS to get axis from.
  * @returns the matching proj4 axis string, 'enu' for instance (east, north, up)
  */
-export declare function axisOrder(crs: ProjectionLike): string | undefined;
+export declare function axisOrder(crs: ProjectionAlias): string | undefined;
 /**
  * Defines a proj4 projection as a named alias.
  * This function is a specialized wrapper over the

package/lib/Extent.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import Coordinates from './Coordinates';
-import type { ProjectionLike } from './Crs';
+import type { ProjectionAlias } from './Crs';
 export interface ExtentLike {
     readonly west: number;
     readonly east: number;
@@ -22,9 +22,9 @@ declare class Extent {
      */
     readonly isExtent: true;
     /**
-     * A default or user-defined CRS (see {@link ProjectionLike}).
+     * A default or user-defined CRS (see {@link ProjectionAlias}).
      */
-    crs: ProjectionLike;
+    crs: ProjectionAlias;
     /**
      * West longitude bound of this extent.
      */
@@ -42,13 +42,13 @@ declare class Extent {
      */
     north: number;
     /**
-     * @param crs - A default or user-defined CRS (see {@link ProjectionLike}).
+     * @param crs - A default or user-defined CRS (see {@link ProjectionAlias}).
      * @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: ProjectionLike, west?: number, east?: number, south?: number, north?: number);
+    constructor(crs: ProjectionAlias, west?: number, east?: number, south?: number, north?: number);
     /**
      * Returns a new extent with the same bounds and crs as this one.
      */
@@ -190,7 +190,7 @@ declare class Extent {
      * @param crs - Projection of extent to instancied.
      * @param box - Bounding-box
      */
-    static fromBox3(crs: ProjectionLike, box: THREE.Box3): Extent;
+    static fromBox3(crs: ProjectionAlias, box: THREE.Box3): Extent;
     /**
      * Return values of extent in string, separated by the separator input.
      * @param sep - string separator

package/lib/Extent.js

@@ -31,7 +31,7 @@ class Extent {
    */
 
   /**
-   * A default or user-defined CRS (see {@link ProjectionLike}).
+   * A default or user-defined CRS (see {@link ProjectionAlias}).
    */
 
   /**
@@ -51,7 +51,7 @@ class Extent {
    */
 
   /**
-   * @param crs - A default or user-defined CRS (see {@link ProjectionLike}).
+   * @param crs - A default or user-defined CRS (see {@link ProjectionAlias}).
    * @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.

package/lib/OrientationUtils.d.ts

@@ -1,5 +1,5 @@
 import { Quaternion } from 'three';
-import type { ProjectionDefinition } from 'proj4';
+import type { ProjectionDefinition } from 'proj4/dist/lib/defs';
 import Coordinates from './Coordinates';
 interface EulerAngles {
     /** angle in degrees */

package/lib/OrientationUtils.js

@@ -325,13 +325,14 @@ export function quaternionFromEnuToCRS(crsOrProj, coordinates) {
   if (coordinates) {
     return quaternionFromEnuToCRS(crsOrProj)(coordinates, target);
   }
-  const proj = typeof crsOrProj === 'string' ? proj4.defs(crsOrProj) : crsOrProj;
-  switch (proj.projName) {
-    case 'geocent':
+  const proj = typeof crsOrProj === 'string' ? proj4(crsOrProj).oProj : crsOrProj;
+  const names = proj4.Proj.projections.get(proj.projName).names;
+  switch (names[0]) {
+    case 'Geocentric':
       return quaternionFromEnuToGeocent();
-    case 'lcc':
+    case 'Lambert Tangential Conformal Conic Projection':
       return quaternionFromEnuToLCC(proj);
-    case 'tmerc':
+    case 'Fast_Transverse_Mercator':
       return quaternionFromEnuToTMerc(proj);
     case 'longlat':
       return quaternionFromEnuToLongLat();
@@ -355,13 +356,14 @@ export function quaternionFromCRSToEnu(crsOrProj, coordinates) {
   if (coordinates) {
     return quaternionFromCRSToEnu(crsOrProj)(coordinates, target);
   }
-  const proj = typeof crsOrProj === 'string' ? proj4.defs(crsOrProj) : crsOrProj;
-  switch (proj.projName) {
-    case 'geocent':
+  const proj = typeof crsOrProj === 'string' ? proj4(crsOrProj).oProj : crsOrProj;
+  const names = proj4.Proj.projections.get(proj.projName).names;
+  switch (names[0]) {
+    case 'Geocentric':
       return quaternionFromGeocentToEnu();
-    case 'lcc':
+    case 'Lambert Tangential Conformal Conic Projection':
       return quaternionFromLCCToEnu(proj);
-    case 'tmerc':
+    case 'Fast_Transverse_Mercator':
       return quaternionFromTMercToEnu(proj);
     case 'longlat':
       return quaternionFromLongLatToEnu();

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@itowns/geographic",
-  "version": "2.45.1",
+  "version": "2.45.2-next.1",
   "description": "Geodesy",
   "type": "module",
   "main": "lib/Main.js",
-  "exports": "./lib/Main.js",
-  "types": "./lib/Main.d.ts",
+  "exports": {
+    "types": "./src/Main.ts",
+    "default": "./lib/Main.js"
+  },
+  "types": "./src/Main.ts",
   "scripts": {
     "build": "",
     "lint": "eslint \"src/**/*.{js,ts,tsx}\" \"test/**/*.js\"",
@@ -16,7 +19,6 @@
     "test-with-coverage_lcov": "c8 -n src --reporter=lcov cross-env npm run test-unit",
     "watch": "npm run transpile -- --watch",
     "publish-latest": "npm publish --access public --tag=latest --provenance",
-    "prerelease-next": "npm version prerelease --preid next",
     "publish-next": "npm publish --access public --tag=next --provenance"
   },
   "files": [
@@ -33,8 +35,8 @@
     "url": "https://github.com/itowns/itowns/issues"
   },
   "peerDependencies": {
-    "proj4": "^2.12.1",
-    "three": "^0.170.0"
+    "proj4": "^2.19.3",
+    "three": "^0.174.0"
   },
   "homepage": "https://itowns.github.io/"
 }

package/src/Coordinates.ts

@@ -1,12 +1,13 @@
 import * as THREE from 'three';
 import proj4 from 'proj4';
+import type { Converter } from 'proj4/dist/lib/core';
 import Ellipsoid from './Ellipsoid';
 import * as CRS from './Crs';
 
-import type { ProjectionLike } from './Crs';
+import type { ProjectionAlias } from './Crs';
 
 const ellipsoid = new Ellipsoid();
-const projectionCache: Record<string, Record<string, proj4.Converter>> = {};
+const projectionCache: Record<string, Record<string, Converter>> = {};
 
 const v0 = new THREE.Vector3();
 const v1 = new THREE.Vector3();
@@ -21,7 +22,7 @@ export interface CoordinatesLike {
     readonly z: number;
 }
 
-function proj4cache(crsIn: string, crsOut: string): proj4.Converter {
+function proj4cache(crsIn: ProjectionAlias, crsOut: ProjectionAlias): Converter {
     if (!projectionCache[crsIn]) {
         projectionCache[crsIn] = {};
     }
@@ -71,9 +72,9 @@ class Coordinates {
      */
     readonly isCoordinates: boolean;
     /**
-     * A default or user-defined CRS (see {@link ProjectionLike}).
+     * A default or user-defined CRS (see {@link ProjectionAlias}).
      */
-    crs: ProjectionLike;
+    crs: ProjectionAlias;
 
     /** The x value (or longitude) of this coordinate. */
     x: number;
@@ -86,12 +87,12 @@ class Coordinates {
     private _normalNeedsUpdate: boolean;
 
     /**
-     * @param crs - A default or user-defined CRS (see {@link ProjectionLike}).
+     * @param crs - A default or user-defined CRS (see {@link ProjectionAlias}).
      * @param x - x or longitude value.
      * @param y - y or latitude value.
      * @param z - z or altitude value.
      */
-    constructor(crs: ProjectionLike, x: number = 0, y: number = 0, z: number = 0) {
+    constructor(crs: ProjectionAlias, x: number = 0, y: number = 0, z: number = 0) {
         this.isCoordinates = true;
 
         CRS.isValid(crs);
@@ -133,7 +134,7 @@ class Coordinates {
      * Sets the Coordinate Reference System.
      * @param crs - Coordinate Reference System (e.g. 'EPSG:4978')
      */
-    setCrs(crs: ProjectionLike): this {
+    setCrs(crs: ProjectionAlias): this {
         CRS.isValid(crs);
         this.crs = crs;
         return this;
@@ -340,7 +341,7 @@ class Coordinates {
      * const geographicCoords = geocentricCoords.as('EPSG:4326');
      * ```
      */
-    as(crs: ProjectionLike, target = new Coordinates(crs)): Coordinates {
+    as(crs: ProjectionAlias, target = new Coordinates(crs)): Coordinates {
         if (this.crs == crs) {
             target.copy(this);
         } else {

package/src/Crs.ts

@@ -1,6 +1,6 @@
 import proj4 from 'proj4';
 
-import type { ProjectionDefinition } from 'proj4';
+import type { ProjectionDefinition } from 'proj4/dist/lib/defs';
 
 proj4.defs('EPSG:4978', '+proj=geocent +datum=WGS84 +units=m +no_defs');
 
@@ -15,7 +15,7 @@ proj4.defs('WGS84').axis = 'neu';
  * projection definition previously defined with
  * [`proj4.defs`](https://github.com/proj4js/proj4js#named-projections).
  */
-export type ProjectionLike = string;
+export type ProjectionAlias = string;
 
 function isString(s: unknown): s is string {
     return typeof s === 'string' || s instanceof String;
@@ -53,7 +53,7 @@ export const UNIT = {
  *
  * @param crs - The CRS to test.
  */
-export function is4326(crs: ProjectionLike) {
+export function is4326(crs: ProjectionAlias) {
     return crs === 'EPSG:4326';
 }
 
@@ -79,7 +79,7 @@ function unitFromProj4Unit(proj: ProjectionDefinition) {
  * @param crs - The CRS to extract the unit from.
  * @returns Either `UNIT.METER`, `UNIT.DEGREE`, `UNIT.FOOT` or `undefined`.
  */
-export function getUnit(crs: ProjectionLike) {
+export function getUnit(crs: ProjectionAlias) {
     mustBeString(crs);
     const p = proj4.defs(crs);
     if (!p) {
@@ -94,7 +94,7 @@ export function getUnit(crs: ProjectionLike) {
  * @param crs - The CRS to check.
  * @throws {@link Error} if the CRS is not valid.
  */
-export function isMetricUnit(crs: ProjectionLike) {
+export function isMetricUnit(crs: ProjectionAlias) {
     return getUnit(crs) === UNIT.METER;
 }
 
@@ -104,7 +104,7 @@ export function isMetricUnit(crs: ProjectionLike) {
  * @param crs - The CRS to check.
  * @throws {@link Error} if the CRS is not valid.
  */
-export function isGeographic(crs: ProjectionLike) {
+export function isGeographic(crs: ProjectionAlias) {
     return getUnit(crs) === UNIT.DEGREE;
 }
 
@@ -114,7 +114,7 @@ export function isGeographic(crs: ProjectionLike) {
  * @param crs - The CRS to test.
  * @returns false if the crs isn't defined.
  */
-export function isGeocentric(crs: ProjectionLike) {
+export function isGeocentric(crs: ProjectionAlias) {
     mustBeString(crs);
     const projection = proj4.defs(crs);
     return !projection ? false : projection.projName == 'geocent';
@@ -127,7 +127,7 @@ export function isGeocentric(crs: ProjectionLike) {
  * @param crs - The CRS to test.
  * @throws {@link Error} if the crs is not valid.
  */
-export function isValid(crs: ProjectionLike) {
+export function isValid(crs: ProjectionAlias) {
     const proj = proj4.defs(crs);
     if (!proj) {
         throw new Error(`Undefined crs '${crs}'. Add it with proj4.defs('${crs}', string)`);
@@ -143,7 +143,7 @@ export function isValid(crs: ProjectionLike) {
  * @param crs - The CRS to use.
  * @returns 0.01 if the CRS is EPSG:4326, 0.001 otherwise.
  */
-export function reasonableEpsilon(crs: ProjectionLike) {
+export function reasonableEpsilon(crs: ProjectionAlias) {
     if (is4326(crs)) {
         return 0.01;
     } else {
@@ -158,7 +158,7 @@ export function reasonableEpsilon(crs: ProjectionLike) {
  * @param crs - The CRS to get axis from.
  * @returns the matching proj4 axis string, 'enu' for instance (east, north, up)
  */
-export function axisOrder(crs: ProjectionLike) {
+export function axisOrder(crs: ProjectionAlias) {
     mustBeString(crs);
     const projection = proj4.defs(crs);
     return !projection ? undefined : projection.axis;

package/src/Extent.ts

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 import Coordinates from './Coordinates';
 import * as CRS from './Crs';
 
-import type { ProjectionLike } from './Crs';
+import type { ProjectionAlias } from './Crs';
 
 const _dim = new THREE.Vector2();
 const _dim2 = new THREE.Vector2();
@@ -47,9 +47,9 @@ class Extent {
      */
     readonly isExtent: true;
     /**
-     * A default or user-defined CRS (see {@link ProjectionLike}).
+     * A default or user-defined CRS (see {@link ProjectionAlias}).
      */
-    crs: ProjectionLike;
+    crs: ProjectionAlias;
     /**
      * West longitude bound of this extent.
      */
@@ -68,13 +68,13 @@ class Extent {
     north: number;
 
     /**
-     * @param crs - A default or user-defined CRS (see {@link ProjectionLike}).
+     * @param crs - A default or user-defined CRS (see {@link ProjectionAlias}).
      * @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: ProjectionLike, west = 0, east = 0, south = 0, north = 0) {
+    constructor(crs: ProjectionAlias, 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`,
@@ -470,7 +470,7 @@ class Extent {
      * @param crs - Projection of extent to instancied.
      * @param box - Bounding-box
      */
-    static fromBox3(crs: ProjectionLike, box: THREE.Box3) {
+    static fromBox3(crs: ProjectionAlias, box: THREE.Box3) {
         if (CRS.isGeocentric(crs)) {
             // if geocentric reproject box on 'EPSG:4326'
             crs = 'EPSG:4326';

package/src/OrientationUtils.ts

@@ -1,6 +1,6 @@
 import { Euler, MathUtils, Matrix4, Quaternion, Vector3 } from 'three';
 import proj4 from 'proj4';
-import type { ProjectionDefinition } from 'proj4';
+import type { ProjectionDefinition } from 'proj4/dist/lib/defs';
 import Coordinates from './Coordinates';
 
 const DEG2RAD = MathUtils.DEG2RAD;
@@ -410,11 +410,15 @@ export function quaternionFromEnuToCRS(
     target = new Quaternion(),
 ) {
     if (coordinates) { return quaternionFromEnuToCRS(crsOrProj)(coordinates, target); }
-    const proj = typeof crsOrProj === 'string' ? proj4.defs(crsOrProj) : crsOrProj;
-    switch (proj.projName) {
-        case 'geocent': return quaternionFromEnuToGeocent();
-        case 'lcc': return quaternionFromEnuToLCC(proj as LCCProjection);
-        case 'tmerc': return quaternionFromEnuToTMerc(proj as TMercProjection);
+    const proj = typeof crsOrProj === 'string' ?
+        proj4(crsOrProj).oProj as ProjectionDefinition :
+        crsOrProj;
+    const names = proj4.Proj.projections.get(proj.projName).names;
+    switch (names[0]) {
+        case 'Geocentric': return quaternionFromEnuToGeocent();
+        case 'Lambert Tangential Conformal Conic Projection':
+            return quaternionFromEnuToLCC(proj as LCCProjection);
+        case 'Fast_Transverse_Mercator': return quaternionFromEnuToTMerc(proj as TMercProjection);
         case 'longlat': return quaternionFromEnuToLongLat();
         default: return quaternionUnimplemented(proj);
     }
@@ -443,11 +447,15 @@ export function quaternionFromCRSToEnu(
     target = new Quaternion(),
 ) {
     if (coordinates) { return quaternionFromCRSToEnu(crsOrProj)(coordinates, target); }
-    const proj = typeof crsOrProj === 'string' ? proj4.defs(crsOrProj) : crsOrProj;
-    switch (proj.projName) {
-        case 'geocent': return quaternionFromGeocentToEnu();
-        case 'lcc': return quaternionFromLCCToEnu(proj as LCCProjection);
-        case 'tmerc': return quaternionFromTMercToEnu(proj as TMercProjection);
+    const proj = typeof crsOrProj === 'string' ?
+        proj4(crsOrProj).oProj as ProjectionDefinition :
+        crsOrProj;
+    const names = proj4.Proj.projections.get(proj.projName).names;
+    switch (names[0]) {
+        case 'Geocentric': return quaternionFromGeocentToEnu();
+        case 'Lambert Tangential Conformal Conic Projection':
+            return quaternionFromLCCToEnu(proj as LCCProjection);
+        case 'Fast_Transverse_Mercator': return quaternionFromTMercToEnu(proj as TMercProjection);
         case 'longlat': return quaternionFromLongLatToEnu();
         default: return quaternionUnimplemented(proj);
     }