@itowns/geographic 2.46.1-next.37 → 2.46.1-next.39

package/lib/OrientationUtils.js

@@ -334,6 +334,7 @@ export function quaternionFromCRSToEnu(crsOrProj, coordinates, target = new Quat
       return quaternionUnimplemented(proj);
   }
 }
+const quaternionCrs2CrsCache = {};
 /**
  * Return the function that computes the quaternion that represents a
  * rotation of coordinates between two CRS frames.
@@ -352,9 +353,18 @@ export function quaternionFromCRSToCRS(crsIn, crsOut, coordinates, target = new
   if (crsIn == crsOut) {
     return (origin, target = new Quaternion()) => target.set(0, 0, 0, 1);
   }
+  if (quaternionCrs2CrsCache[crsIn] && quaternionCrs2CrsCache[crsIn][crsOut]) {
+    return quaternionCrs2CrsCache[crsIn][crsOut];
+  }
 
   // get rotations from the local East/North/Up (ENU) frame to both CRS.
   const fromCrs = quaternionFromCRSToEnu(crsIn);
   const toCrs = quaternionFromEnuToCRS(crsOut);
-  return (origin, target = new Quaternion()) => toCrs(origin, target).multiply(fromCrs(origin, quat));
+  if (!quaternionCrs2CrsCache[crsIn]) {
+    quaternionCrs2CrsCache[crsIn] = {};
+  }
+  if (!quaternionCrs2CrsCache[crsIn][crsOut]) {
+    quaternionCrs2CrsCache[crsIn][crsOut] = (origin, target = new Quaternion()) => toCrs(origin, target).multiply(fromCrs(origin, quat));
+  }
+  return quaternionCrs2CrsCache[crsIn][crsOut];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itowns/geographic",
-  "version": "2.46.1-next.37",
+  "version": "2.46.1-next.39",
   "description": "Proj4-based three.js geodesy toolkit",
   "type": "module",
   "main": "lib/index.js",

package/src/OrientationUtils.ts

@@ -462,13 +462,14 @@ export function quaternionFromCRSToEnu(
     }
 }
 
+const quaternionCrs2CrsCache: Record<string, Record<string, QuaternionFunction>> = {};
 export function quaternionFromCRSToCRS(
-    crsIn: ProjectionLike,
-    crsOut: ProjectionLike,
+    crsIn: string,
+    crsOut: string,
 ): QuaternionFunction;
 export function quaternionFromCRSToCRS(
-    crsIn: ProjectionLike,
-    crsOut: ProjectionLike,
+    crsIn: string,
+    crsOut: string,
     coords: Coordinates,
     target?: Quaternion,
 ): Quaternion;
@@ -484,8 +485,8 @@ export function quaternionFromCRSToCRS(
  * function to compute it from coordinates.
  */
 export function quaternionFromCRSToCRS(
-    crsIn: ProjectionLike,
-    crsOut: ProjectionLike,
+    crsIn: string,
+    crsOut: string,
     coordinates?: Coordinates,
     target = new Quaternion(),
 ) {
@@ -494,9 +495,23 @@ export function quaternionFromCRSToCRS(
         return (origin: Coordinates, target = new Quaternion()) => target.set(0, 0, 0, 1);
     }
 
+    if (quaternionCrs2CrsCache[crsIn] && quaternionCrs2CrsCache[crsIn][crsOut]) {
+        return quaternionCrs2CrsCache[crsIn][crsOut];
+    }
+
     // get rotations from the local East/North/Up (ENU) frame to both CRS.
     const fromCrs = quaternionFromCRSToEnu(crsIn);
     const toCrs = quaternionFromEnuToCRS(crsOut);
-    return (origin: Coordinates, target = new Quaternion()) =>
-        toCrs(origin, target).multiply(fromCrs(origin, quat));
+
+    if (!quaternionCrs2CrsCache[crsIn]) {
+        quaternionCrs2CrsCache[crsIn] = {};
+    }
+
+    if (!quaternionCrs2CrsCache[crsIn][crsOut]) {
+        quaternionCrs2CrsCache[crsIn][crsOut] =
+            (origin: Coordinates, target = new Quaternion()) =>
+                toCrs(origin, target).multiply(fromCrs(origin, quat));
+    }
+
+    return quaternionCrs2CrsCache[crsIn][crsOut];
 }