ootk 7.0.1 → 7.0.2

package/dist/main.cjs

@@ -638,20 +638,14 @@ var spaceObjTypeStrMap_ = {
 };
 var spaceObjType2Str = (spaceObjType) => spaceObjTypeStrMap_[spaceObjType] || "Unknown";
 var dopplerFactor = (location, position, velocity) => {
-  const range = {
-    x: position.x - location.x,
-    y: position.y - location.y,
-    z: position.z - location.z
-  };
-  const distance = Math.hypot(range.x, range.y, range.z);
-  const rangeVel = {
-    x: velocity.x + angularVelocityOfEarth * location.y,
-    y: velocity.y - angularVelocityOfEarth * location.x,
-    z: velocity.z
-  };
-  const rangeRate = (range.x * rangeVel.x + range.y * rangeVel.y + range.z * rangeVel.z) / distance;
-  const dopplerFactor2 = 1 - rangeRate / cKmPerSec;
-  return dopplerFactor2;
+  const rangeX = position.x - location.x;
+  const rangeY = position.y - location.y;
+  const rangeZ = position.z - location.z;
+  const distance = Math.sqrt(rangeX * rangeX + rangeY * rangeY + rangeZ * rangeZ);
+  const rangeVelX = velocity.x + angularVelocityOfEarth * location.y;
+  const rangeVelY = velocity.y - angularVelocityOfEarth * location.x;
+  const rangeRate = (rangeX * rangeVelX + rangeY * rangeVelY + rangeZ * velocity.z) / distance;
+  return 1 - rangeRate / cKmPerSec;
 };
 function createVec(start, stop, step) {
   const array = [];
@@ -6155,17 +6149,21 @@ function lla2eci(lla, gmst) {
 function lla2sez(lla, ecef) {
   const lon = lla.lon;
   const lat = lla.lat;
+  const sinLat = Math.sin(lat);
+  const cosLat = Math.cos(lat);
+  const sinLon = Math.sin(lon);
+  const cosLon = Math.cos(lon);
   const observerEcef = llaRad2ecef({
     lat,
     lon,
-    alt: 0
+    alt: lla.alt
   });
   const rx = ecef.x - observerEcef.x;
   const ry = ecef.y - observerEcef.y;
   const rz = ecef.z - observerEcef.z;
-  const south = Math.sin(lat) * Math.cos(lon) * rx + Math.sin(lat) * Math.sin(lon) * ry - Math.cos(lat) * rz;
-  const east = -Math.sin(lon) * rx + Math.cos(lon) * ry;
-  const zenith = Math.cos(lat) * Math.cos(lon) * rx + Math.cos(lat) * Math.sin(lon) * ry + Math.sin(lat) * rz;
+  const south = sinLat * cosLon * rx + sinLat * sinLon * ry - cosLat * rz;
+  const east = -sinLon * rx + cosLon * ry;
+  const zenith = cosLat * cosLon * rx + cosLat * sinLon * ry + sinLat * rz;
   return { s: south, e: east, z: zenith };
 }
 function rae2sez(rae) {
@@ -17302,7 +17300,11 @@ var Satellite = class _Satellite extends SpaceObject {
    */
   rae(observer, date, j, gmst) {
     date ??= /* @__PURE__ */ new Date();
-    gmst ??= _Satellite.calculateTimeVariables_(date, this.satrec).gmst;
+    if (typeof j !== "number" || typeof gmst !== "number") {
+      const timeVariables = _Satellite.calculateTimeVariables_(date, this.satrec, j, gmst);
+      j = timeVariables.j;
+      gmst = timeVariables.gmst;
+    }
     const eci = this.eci(date, j, gmst);
     if (!eci) {
       return null;
@@ -17928,18 +17930,32 @@ var Satellite = class _Satellite extends SpaceObject {
    * @returns Time variables
    */
   static calculateTimeVariables_(date, satrec, j, gmst) {
-    j ??= jday(
-      date.getUTCFullYear(),
-      date.getUTCMonth() + 1,
-      date.getUTCDate(),
-      date.getUTCHours(),
-      date.getUTCMinutes(),
-      date.getUTCSeconds()
-    ) + date.getUTCMilliseconds() * MILLISECONDS_TO_DAYS;
+    if (typeof j !== "number") {
+      const ms = date.getTime();
+      if (_Satellite.timeVariablesCacheMs_ !== ms) {
+        const jNew = jday(
+          date.getUTCFullYear(),
+          date.getUTCMonth() + 1,
+          date.getUTCDate(),
+          date.getUTCHours(),
+          date.getUTCMinutes(),
+          date.getUTCSeconds()
+        ) + date.getUTCMilliseconds() * MILLISECONDS_TO_DAYS;
+        _Satellite.timeVariablesCacheMs_ = ms;
+        _Satellite.timeVariablesCacheJ_ = jNew;
+        _Satellite.timeVariablesCacheGmst_ = Sgp4.gstime(jNew);
+      }
+      j = _Satellite.timeVariablesCacheJ_;
+      gmst ??= _Satellite.timeVariablesCacheGmst_;
+    }
     gmst ??= Sgp4.gstime(j);
     const m = satrec ? (j - satrec.jdsatepoch) * MINUTES_PER_DAY : null;
     return { gmst, m, j };
   }
+  /** Single-entry memo for calculateTimeVariables_, keyed on Date.getTime() */
+  static timeVariablesCacheMs_ = null;
+  static timeVariablesCacheJ_ = 0;
+  static timeVariablesCacheGmst_ = 0;
 };
 
 // src/objects/Star.ts

package/dist/main.d.cts

@@ -5294,6 +5294,10 @@ declare class Satellite extends SpaceObject {
      * @returns Time variables
      */
     private static calculateTimeVariables_;
+    /** Single-entry memo for calculateTimeVariables_, keyed on Date.getTime() */
+    private static timeVariablesCacheMs_;
+    private static timeVariablesCacheJ_;
+    private static timeVariablesCacheGmst_;
 }
 
 /**

package/dist/main.d.ts

@@ -5294,6 +5294,10 @@ declare class Satellite extends SpaceObject {
      * @returns Time variables
      */
     private static calculateTimeVariables_;
+    /** Single-entry memo for calculateTimeVariables_, keyed on Date.getTime() */
+    private static timeVariablesCacheMs_;
+    private static timeVariablesCacheJ_;
+    private static timeVariablesCacheGmst_;
 }
 
 /**

package/dist/main.js

@@ -636,20 +636,14 @@ var spaceObjTypeStrMap_ = {
 };
 var spaceObjType2Str = (spaceObjType) => spaceObjTypeStrMap_[spaceObjType] || "Unknown";
 var dopplerFactor = (location, position, velocity) => {
-  const range = {
-    x: position.x - location.x,
-    y: position.y - location.y,
-    z: position.z - location.z
-  };
-  const distance = Math.hypot(range.x, range.y, range.z);
-  const rangeVel = {
-    x: velocity.x + angularVelocityOfEarth * location.y,
-    y: velocity.y - angularVelocityOfEarth * location.x,
-    z: velocity.z
-  };
-  const rangeRate = (range.x * rangeVel.x + range.y * rangeVel.y + range.z * rangeVel.z) / distance;
-  const dopplerFactor2 = 1 - rangeRate / cKmPerSec;
-  return dopplerFactor2;
+  const rangeX = position.x - location.x;
+  const rangeY = position.y - location.y;
+  const rangeZ = position.z - location.z;
+  const distance = Math.sqrt(rangeX * rangeX + rangeY * rangeY + rangeZ * rangeZ);
+  const rangeVelX = velocity.x + angularVelocityOfEarth * location.y;
+  const rangeVelY = velocity.y - angularVelocityOfEarth * location.x;
+  const rangeRate = (rangeX * rangeVelX + rangeY * rangeVelY + rangeZ * velocity.z) / distance;
+  return 1 - rangeRate / cKmPerSec;
 };
 function createVec(start, stop, step) {
   const array = [];
@@ -6153,17 +6147,21 @@ function lla2eci(lla, gmst) {
 function lla2sez(lla, ecef) {
   const lon = lla.lon;
   const lat = lla.lat;
+  const sinLat = Math.sin(lat);
+  const cosLat = Math.cos(lat);
+  const sinLon = Math.sin(lon);
+  const cosLon = Math.cos(lon);
   const observerEcef = llaRad2ecef({
     lat,
     lon,
-    alt: 0
+    alt: lla.alt
   });
   const rx = ecef.x - observerEcef.x;
   const ry = ecef.y - observerEcef.y;
   const rz = ecef.z - observerEcef.z;
-  const south = Math.sin(lat) * Math.cos(lon) * rx + Math.sin(lat) * Math.sin(lon) * ry - Math.cos(lat) * rz;
-  const east = -Math.sin(lon) * rx + Math.cos(lon) * ry;
-  const zenith = Math.cos(lat) * Math.cos(lon) * rx + Math.cos(lat) * Math.sin(lon) * ry + Math.sin(lat) * rz;
+  const south = sinLat * cosLon * rx + sinLat * sinLon * ry - cosLat * rz;
+  const east = -sinLon * rx + cosLon * ry;
+  const zenith = cosLat * cosLon * rx + cosLat * sinLon * ry + sinLat * rz;
   return { s: south, e: east, z: zenith };
 }
 function rae2sez(rae) {
@@ -17300,7 +17298,11 @@ var Satellite = class _Satellite extends SpaceObject {
    */
   rae(observer, date, j, gmst) {
     date ??= /* @__PURE__ */ new Date();
-    gmst ??= _Satellite.calculateTimeVariables_(date, this.satrec).gmst;
+    if (typeof j !== "number" || typeof gmst !== "number") {
+      const timeVariables = _Satellite.calculateTimeVariables_(date, this.satrec, j, gmst);
+      j = timeVariables.j;
+      gmst = timeVariables.gmst;
+    }
     const eci = this.eci(date, j, gmst);
     if (!eci) {
       return null;
@@ -17926,18 +17928,32 @@ var Satellite = class _Satellite extends SpaceObject {
    * @returns Time variables
    */
   static calculateTimeVariables_(date, satrec, j, gmst) {
-    j ??= jday(
-      date.getUTCFullYear(),
-      date.getUTCMonth() + 1,
-      date.getUTCDate(),
-      date.getUTCHours(),
-      date.getUTCMinutes(),
-      date.getUTCSeconds()
-    ) + date.getUTCMilliseconds() * MILLISECONDS_TO_DAYS;
+    if (typeof j !== "number") {
+      const ms = date.getTime();
+      if (_Satellite.timeVariablesCacheMs_ !== ms) {
+        const jNew = jday(
+          date.getUTCFullYear(),
+          date.getUTCMonth() + 1,
+          date.getUTCDate(),
+          date.getUTCHours(),
+          date.getUTCMinutes(),
+          date.getUTCSeconds()
+        ) + date.getUTCMilliseconds() * MILLISECONDS_TO_DAYS;
+        _Satellite.timeVariablesCacheMs_ = ms;
+        _Satellite.timeVariablesCacheJ_ = jNew;
+        _Satellite.timeVariablesCacheGmst_ = Sgp4.gstime(jNew);
+      }
+      j = _Satellite.timeVariablesCacheJ_;
+      gmst ??= _Satellite.timeVariablesCacheGmst_;
+    }
     gmst ??= Sgp4.gstime(j);
     const m = satrec ? (j - satrec.jdsatepoch) * MINUTES_PER_DAY : null;
     return { gmst, m, j };
   }
+  /** Single-entry memo for calculateTimeVariables_, keyed on Date.getTime() */
+  static timeVariablesCacheMs_ = null;
+  static timeVariablesCacheJ_ = 0;
+  static timeVariablesCacheGmst_ = 0;
 };
 
 // src/objects/Star.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ootk",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "type": "module",
   "description": "Orbital Object Toolkit including Multiple Propagators, Initial Orbit Determination, and Maneuver Calculations.",
   "exports": {
@@ -19,6 +19,8 @@
   ],
   "sideEffects": false,
   "scripts": {
+    "bench": "npm run build && node benchmark/run.mjs",
+    "bench:only": "node benchmark/run.mjs",
     "build": "tsup",
     "clean": "node ./scripts/cleanup.mjs",
     "circular": "node scripts/check-circular.mjs",
@@ -71,6 +73,7 @@
     "eslint": "^9.39.1",
     "husky": "^9.1.7",
     "madge": "^8.0.0",
+    "satellite.js": "^7.0.1",
     "semantic-release": "^25.0.5",
     "ts-node": "^10.9.2",
     "tsup": "^8.5.1",