ootk 6.0.2 → 6.0.3

package/dist/main.cjs

@@ -9849,7 +9849,7 @@ var FormatTle = class _FormatTle {
     const { inc, meanmo, rasc, argPe, meana, ecen, epochyr, epochday, intl } = tleParams;
     const scc = Tle.convert6DigitToA5(tleParams.scc);
     const epochYrStr = String(epochyr).padStart(2, "0");
-    const epochdayStr = parseFloat(String(epochday)).toFixed(8).padStart(12, "0");
+    const epochdayStr = Number(epochday).toFixed(8).padStart(12, "0");
     const incStr = _FormatTle.inclination(inc);
     const meanmoStr = _FormatTle.meanMotion(meanmo);
     const rascStr = _FormatTle.rightAscension(rasc);
@@ -9870,9 +9870,6 @@ var FormatTle = class _FormatTle {
       const bstarStr = _FormatTle.formatTleExponential(tleParams.bstar ?? 0);
       TLE1Ending = ` ${mmDot} ${mmDdot} ${bstarStr} ${ephemerisType} ${elementSetNo}0`;
     }
-    TLE1Ending = TLE1Ending[1] === " " ? _FormatTle.setCharAt(TLE1Ending, 1, "+") : TLE1Ending;
-    TLE1Ending = TLE1Ending[12] === " " ? _FormatTle.setCharAt(TLE1Ending, 12, "+") : TLE1Ending;
-    TLE1Ending = TLE1Ending[21] === " " ? _FormatTle.setCharAt(TLE1Ending, 21, "+") : TLE1Ending;
     const tle1Pre = `1 ${scc}${classification} ${intlStr} ${epochYrStr}${epochdayStr}${TLE1Ending}`;
     const tle1 = _FormatTle.setCharAt(tle1Pre, 68, _FormatTle.tleChecksum(tle1Pre).toString());
     const tle2Pre = `2 ${scc} ${incStr} ${rascStr} ${ecenStr} ${argPeStr} ${meanaStr} ${meanmoStr}${revAtEpoch}0`;
@@ -9890,7 +9887,7 @@ var FormatTle = class _FormatTle {
       argPe = argPe.toString();
     }
     const argPeNum = parseFloat(argPe).toFixed(4);
-    const argPe0 = argPeNum.padStart(8, "0");
+    const argPe0 = argPeNum.padStart(8, " ");
     if (argPe0.length !== 8) {
       throw new ValidationError("Argument of perigee must be 8 characters", "argPe", argPe0);
     }
@@ -9904,7 +9901,10 @@ var FormatTle = class _FormatTle {
    */
   static eccentricity(ecen) {
     if (typeof ecen === "number") {
-      ecen = ecen.toFixed(7);
+      const ecenStr = ecen.toString();
+      const dotIdx = ecenStr.indexOf(".");
+      const afterDot = dotIdx >= 0 ? ecenStr.substring(dotIdx + 1) : "";
+      ecen = `0.${afterDot.substring(0, 7).padEnd(7, "0")}`;
     }
     let ecen0 = ecen.padEnd(9, "0");
     if (ecen0[1] === ".") {
@@ -9928,7 +9928,7 @@ var FormatTle = class _FormatTle {
       inc = inc.toString();
     }
     const incNum = parseFloat(inc).toFixed(4);
-    const inc0 = incNum.padStart(8, "0");
+    const inc0 = incNum.padStart(8, " ");
     if (inc0.length !== 8) {
       throw new ValidationError("Inclination must be 8 characters", "inclination", inc0);
     }
@@ -9945,7 +9945,7 @@ var FormatTle = class _FormatTle {
       meana = meana.toString();
     }
     const meanaNum = parseFloat(meana).toFixed(4);
-    const meana0 = meanaNum.padStart(8, "0");
+    const meana0 = meanaNum.padStart(8, " ");
     if (meana0.length !== 8) {
       throw new ValidationError("Mean anomaly must be 8 characters", "meanAnomaly", meana0);
     }
@@ -9986,7 +9986,7 @@ var FormatTle = class _FormatTle {
       rasc = rasc.toString();
     }
     const rascNum = parseFloat(rasc).toFixed(4);
-    const rasc0 = rascNum.padStart(8, "0");
+    const rasc0 = rascNum.padStart(8, " ");
     if (rasc0.length !== 8) {
       throw new ValidationError("Right ascension must be 8 characters", "rightAscension", rasc0);
     }
@@ -10024,7 +10024,7 @@ var FormatTle = class _FormatTle {
    */
   static formatTleExponential(value) {
     if (value === 0) {
-      return " 00000-0";
+      return " 00000+0";
     }
     const sign2 = value >= 0 ? " " : "-";
     const absVal = Math.abs(value);
@@ -13255,13 +13255,28 @@ var ClassicalElements = class _ClassicalElements {
     const h = pos.cross(vel);
     const i = Math.acos(clamp(h.z / h.magnitude(), -1, 1));
     const n = Vector3D.zAxis.cross(h);
-    let o = Math.acos(clamp(n.x / n.magnitude(), -1, 1));
-    if (n.y < 0) {
-      o = TAU - o;
-    }
-    let w = n.angle(eVec);
-    if (eVec.z < 0) {
-      w = TAU - w;
+    const nMag = n.magnitude();
+    let o;
+    let w;
+    if (nMag < 1e-12) {
+      o = 0;
+      if (e > 1e-12) {
+        w = Math.atan2(eVec.y, eVec.x);
+        if (w < 0) {
+          w = w + TAU;
+        }
+      } else {
+        w = 0;
+      }
+    } else {
+      o = Math.acos(clamp(n.x / nMag, -1, 1));
+      if (n.y < 0) {
+        o = TAU - o;
+      }
+      w = n.angle(eVec);
+      if (eVec.z < 0) {
+        w = TAU - w;
+      }
     }
     let v = eVec.angle(pos);
     if (pos.dot(vel) < 0) {

package/dist/main.js

@@ -9847,7 +9847,7 @@ var FormatTle = class _FormatTle {
     const { inc, meanmo, rasc, argPe, meana, ecen, epochyr, epochday, intl } = tleParams;
     const scc = Tle.convert6DigitToA5(tleParams.scc);
     const epochYrStr = String(epochyr).padStart(2, "0");
-    const epochdayStr = parseFloat(String(epochday)).toFixed(8).padStart(12, "0");
+    const epochdayStr = Number(epochday).toFixed(8).padStart(12, "0");
     const incStr = _FormatTle.inclination(inc);
     const meanmoStr = _FormatTle.meanMotion(meanmo);
     const rascStr = _FormatTle.rightAscension(rasc);
@@ -9868,9 +9868,6 @@ var FormatTle = class _FormatTle {
       const bstarStr = _FormatTle.formatTleExponential(tleParams.bstar ?? 0);
       TLE1Ending = ` ${mmDot} ${mmDdot} ${bstarStr} ${ephemerisType} ${elementSetNo}0`;
     }
-    TLE1Ending = TLE1Ending[1] === " " ? _FormatTle.setCharAt(TLE1Ending, 1, "+") : TLE1Ending;
-    TLE1Ending = TLE1Ending[12] === " " ? _FormatTle.setCharAt(TLE1Ending, 12, "+") : TLE1Ending;
-    TLE1Ending = TLE1Ending[21] === " " ? _FormatTle.setCharAt(TLE1Ending, 21, "+") : TLE1Ending;
     const tle1Pre = `1 ${scc}${classification} ${intlStr} ${epochYrStr}${epochdayStr}${TLE1Ending}`;
     const tle1 = _FormatTle.setCharAt(tle1Pre, 68, _FormatTle.tleChecksum(tle1Pre).toString());
     const tle2Pre = `2 ${scc} ${incStr} ${rascStr} ${ecenStr} ${argPeStr} ${meanaStr} ${meanmoStr}${revAtEpoch}0`;
@@ -9888,7 +9885,7 @@ var FormatTle = class _FormatTle {
       argPe = argPe.toString();
     }
     const argPeNum = parseFloat(argPe).toFixed(4);
-    const argPe0 = argPeNum.padStart(8, "0");
+    const argPe0 = argPeNum.padStart(8, " ");
     if (argPe0.length !== 8) {
       throw new ValidationError("Argument of perigee must be 8 characters", "argPe", argPe0);
     }
@@ -9902,7 +9899,10 @@ var FormatTle = class _FormatTle {
    */
   static eccentricity(ecen) {
     if (typeof ecen === "number") {
-      ecen = ecen.toFixed(7);
+      const ecenStr = ecen.toString();
+      const dotIdx = ecenStr.indexOf(".");
+      const afterDot = dotIdx >= 0 ? ecenStr.substring(dotIdx + 1) : "";
+      ecen = `0.${afterDot.substring(0, 7).padEnd(7, "0")}`;
     }
     let ecen0 = ecen.padEnd(9, "0");
     if (ecen0[1] === ".") {
@@ -9926,7 +9926,7 @@ var FormatTle = class _FormatTle {
       inc = inc.toString();
     }
     const incNum = parseFloat(inc).toFixed(4);
-    const inc0 = incNum.padStart(8, "0");
+    const inc0 = incNum.padStart(8, " ");
     if (inc0.length !== 8) {
       throw new ValidationError("Inclination must be 8 characters", "inclination", inc0);
     }
@@ -9943,7 +9943,7 @@ var FormatTle = class _FormatTle {
       meana = meana.toString();
     }
     const meanaNum = parseFloat(meana).toFixed(4);
-    const meana0 = meanaNum.padStart(8, "0");
+    const meana0 = meanaNum.padStart(8, " ");
     if (meana0.length !== 8) {
       throw new ValidationError("Mean anomaly must be 8 characters", "meanAnomaly", meana0);
     }
@@ -9984,7 +9984,7 @@ var FormatTle = class _FormatTle {
       rasc = rasc.toString();
     }
     const rascNum = parseFloat(rasc).toFixed(4);
-    const rasc0 = rascNum.padStart(8, "0");
+    const rasc0 = rascNum.padStart(8, " ");
     if (rasc0.length !== 8) {
       throw new ValidationError("Right ascension must be 8 characters", "rightAscension", rasc0);
     }
@@ -10022,7 +10022,7 @@ var FormatTle = class _FormatTle {
    */
   static formatTleExponential(value) {
     if (value === 0) {
-      return " 00000-0";
+      return " 00000+0";
     }
     const sign2 = value >= 0 ? " " : "-";
     const absVal = Math.abs(value);
@@ -13253,13 +13253,28 @@ var ClassicalElements = class _ClassicalElements {
     const h = pos.cross(vel);
     const i = Math.acos(clamp(h.z / h.magnitude(), -1, 1));
     const n = Vector3D.zAxis.cross(h);
-    let o = Math.acos(clamp(n.x / n.magnitude(), -1, 1));
-    if (n.y < 0) {
-      o = TAU - o;
-    }
-    let w = n.angle(eVec);
-    if (eVec.z < 0) {
-      w = TAU - w;
+    const nMag = n.magnitude();
+    let o;
+    let w;
+    if (nMag < 1e-12) {
+      o = 0;
+      if (e > 1e-12) {
+        w = Math.atan2(eVec.y, eVec.x);
+        if (w < 0) {
+          w = w + TAU;
+        }
+      } else {
+        w = 0;
+      }
+    } else {
+      o = Math.acos(clamp(n.x / nMag, -1, 1));
+      if (n.y < 0) {
+        o = TAU - o;
+      }
+      w = n.angle(eVec);
+      if (eVec.z < 0) {
+        w = TAU - w;
+      }
     }
     let v = eVec.angle(pos);
     if (pos.dot(vel) < 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ootk",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Orbital Object Toolkit including Multiple Propagators, Initial Orbit Determination, and Maneuver Calculations.",
   "exports": {