@saber-usa/node-common 1.7.19 → 1.7.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saber-usa/node-common",
-  "version": "1.7.19",
+  "version": "1.7.20",
   "description": "Common node functions for Saber",
   "main": "src/index.js",
   "type": "module",

package/src/astro.js

@@ -854,6 +854,17 @@ const doesLineSegmentIntersectEarth = (start, end) => {
         {x: 0, y: 0, z: 0}, WGS72_EARTH_EQUATORIAL_RADIUS_KM);
 };
 
+const getRIC = (prim, target) => {
+    const deltaR = {
+        x: prim.p.x - target.p.x,
+        y: prim.p.y - target.p.y,
+        z: prim.p.z - target.p.z,
+    };
+    const cartToRICMatrix = cartesianToRIC(prim.p, prim.v);
+    const ricP = multiplyVector(deltaR, cartToRICMatrix);
+    return ricP;
+};
+
 /**
  * Given primary and target ephems, calculate the time-based, radial, intrack, and crosstrack data
  *
@@ -887,13 +898,7 @@ const getTRIC = (pEphem, tEphem) => {
         datamodes.push(prim.datamode + ", " + target.datamode);
 
         // Calculate RIC values.
-        const deltaR = {
-            x: prim.p.x - target.p.x,
-            y: prim.p.y - target.p.y,
-            z: prim.p.z - target.p.z,
-        };
-        const cartToRICMatrix = cartesianToRIC(prim.p, prim.v);
-        const ricP = multiplyVector(deltaR, cartToRICMatrix);
+        const ricP = getRIC(prim, target);
         r.push(-1 * Math.round(ricP.x * 10000) / 10000);
         i.push(-1 * Math.round(ricP.y * 10000) / 10000);
         c.push(-1 * Math.round(ricP.z * 10000) / 10000);
@@ -1747,7 +1752,7 @@ const cartesianToElsetElements = (pv, epoch) => {
  * @param {Array<{p:number[],v:number[],t:number}>} sEphem threat ephemeris
  * @return {Object|undefined}
  */
-const assembleLeoRpoResult = (s, pEphem, sEphem) => {
+const assembleLeoRpoResult = (s, pEphem, sEphem, includeRIC=false) => {
     if (!isDefined(pEphem)
         || !isDefined(sEphem)
         || pEphem.length === 0
@@ -1777,6 +1782,13 @@ const assembleLeoRpoResult = (s, pEphem, sEphem) => {
         raanDiff: s.raanDiff,
         semiMajorDiff: s.semiMajorDiff,
         raanDrift: s.RaanPrecessionDegreesPerDay,
+        ...(includeRIC ? {
+            r: [],
+            i: [],
+            c: [],
+            d: [],
+            t: [],
+        } : {})
     };
 
     const pv1 = {position: pEphem[0].p, velocity: pEphem[0].v};
@@ -1789,10 +1801,26 @@ const assembleLeoRpoResult = (s, pEphem, sEphem) => {
     };
 
     for (let i = 0; i < pEphem.length; i++) {
-        const distKm = dist(pEphem[i].p, sEphem[i].p);
+        const prim = pEphem[i];
+        const target = sEphem[i];
+        
+        const distKm = dist(prim.p, target.p);
+
+        if(includeRIC) {
+            const ricP = getRIC(prim, target);
+
+            aResult.r.push(-1 * ricP.x);
+            aResult.i.push(-1 * ricP.y);
+            aResult.c.push(-1 * ricP.z);
+
+            aResult.t.push(prim.t);
+            
+            aResult.d.push(distKm);
+        }
+
         if (distKm < aResult.poca) {
             aResult.poca = distKm;
-            aResult.toca = new Date(pEphem[i].t).toISOString();
+            aResult.toca = new Date(prim.t).toISOString();
             aResult.tocaString = getTimeDifference(aResult.toca);
         }
     }
@@ -1803,7 +1831,7 @@ const assembleLeoRpoResult = (s, pEphem, sEphem) => {
     return aResult;
 };
 
-const getLeoRpoData = (line1, line2, sats, startTime, endTime) => {
+const getLeoRpoData = (line1, line2, sats, startTime, endTime, includeRIC=false) => {
     const results = [];
     const pSatRec = checkTle(line1, line2);
     if (!isDefined(pSatRec)) {return results;}
@@ -1816,7 +1844,7 @@ const getLeoRpoData = (line1, line2, sats, startTime, endTime) => {
 
     sats.forEach((s) => {
         const sEphem = prop(s, start, end, 10000);
-        const row = assembleLeoRpoResult(s, pEphem, sEphem);
+        const row = assembleLeoRpoResult(s, pEphem, sEphem, includeRIC);
         if (isDefined(row)) {results.push(row);}
     });
     return results;
@@ -1881,7 +1909,7 @@ const geoRelativeLonDrift = (lon1, drift1, lon2, drift2) => {
  * @param {Object} sLonAndDrift output of `getLonAndDrift(threat)`
  * @return {Object|undefined}
  */
-const assembleGeoRpoResult = (s, pEphem, sEphem, pLonAndDrift, sLonAndDrift) => {
+const assembleGeoRpoResult = (s, pEphem, sEphem, pLonAndDrift, sLonAndDrift, includeRIC=false) => {
     if (!isDefined(pEphem)
         || !isDefined(sEphem)
         || pEphem.length === 0
@@ -1910,6 +1938,13 @@ const assembleGeoRpoResult = (s, pEphem, sEphem, pLonAndDrift, sLonAndDrift) =>
         di: null,
         dv: null,
         danger: null,
+        ...(includeRIC ? {
+            r: [],
+            i: [],
+            c: [],
+            d: [],
+            t: [],
+        } : {})
     };
 
     const lonDiff = Math.abs(
@@ -1935,10 +1970,26 @@ const assembleGeoRpoResult = (s, pEphem, sEphem, pLonAndDrift, sLonAndDrift) =>
     };
 
     for (let i = 0; i < pEphem.length; i++) {
-        const distKm = dist(pEphem[i].p, sEphem[i].p);
+        const prim = pEphem[i];
+        const target = sEphem[i];
+        
+        const distKm = dist(prim.p, target.p);
+
+        if(includeRIC) {
+            const ricP = getRIC(prim, target);
+
+            aResult.r.push(-1 * ricP.x);
+            aResult.i.push(-1 * ricP.y);
+            aResult.c.push(-1 * ricP.z);
+
+            aResult.t.push(prim.t);
+            
+            aResult.d.push(distKm);
+        }
+
         if (distKm < aResult.poca) {
             aResult.poca = distKm;
-            aResult.toca = new Date(pEphem[i].t).toISOString();
+            aResult.toca = new Date(prim.t).toISOString();
             aResult.tocaString = getTimeDifference(aResult.toca);
         }
     }
@@ -1949,7 +2000,7 @@ const assembleGeoRpoResult = (s, pEphem, sEphem, pLonAndDrift, sLonAndDrift) =>
     return aResult;
 };
 
-const getGeoRpoData = (line1, line2, sats, startTime, endTime, lonTime) => {
+const getGeoRpoData = (line1, line2, sats, startTime, endTime, lonTime, includeRIC=false) => {
     const results = [];
     const start = new Date(startTime).getTime();
     const end = new Date(endTime).getTime();
@@ -1964,7 +2015,7 @@ const getGeoRpoData = (line1, line2, sats, startTime, endTime, lonTime) => {
     sats.forEach((s) => {
         const sEphem = prop({Line1: s.Line1, Line2: s.Line2}, start, end, 60000);
         const sLonAndDrift = getLonAndDrift(s.Line1, s.Line2, lonEvalTime);
-        const row = assembleGeoRpoResult(s, pEphem, sEphem, pLonAndDrift, sLonAndDrift);
+        const row = assembleGeoRpoResult(s, pEphem, sEphem, pLonAndDrift, sLonAndDrift, includeRIC);
         if (isDefined(row)) {results.push(row);}
     });
 

package/src/wasmProp/wasmAstro.js

@@ -51,7 +51,7 @@ import {RAD2DEG} from "../constants.js";
  * @param {Number} endTime end time of the analysis, Unix milliseconds
  * @return {Promise<Array<Object>>}
  */
-const getLeoRpoDataBulk = async (line1, line2, sats, startTime, endTime) => {
+const getLeoRpoDataBulk = async (line1, line2, sats, startTime, endTime, includeRIC=false) => {
     const results = [];
     const pSatRec = checkTle(line1, line2);
     if (!isDefined(pSatRec)) {return results;}
@@ -69,7 +69,7 @@ const getLeoRpoDataBulk = async (line1, line2, sats, startTime, endTime) => {
     }
 
     for (let i = 0; i < sats.length; i++) {
-        const row = assembleLeoRpoResult(sats[i], pEphem, ephemerides[i + 1]);
+        const row = assembleLeoRpoResult(sats[i], pEphem, ephemerides[i + 1], includeRIC);
         if (isDefined(row)) {results.push(row);}
     }
     return results;
@@ -97,7 +97,7 @@ const getLeoRpoDataBulk = async (line1, line2, sats, startTime, endTime) => {
  * @param {Number} [lonTime] datetime to analyze longitude and lon drift at, Unix ms
  * @return {Promise<Array<Object>>}
  */
-const getGeoRpoDataBulk = async (line1, line2, sats, startTime, endTime, lonTime) => {
+const getGeoRpoDataBulk = async (line1, line2, sats, startTime, endTime, lonTime, includeRIC=false) => {
     const results = [];
     const start = new Date(startTime).getTime();
     const end = new Date(endTime).getTime();
@@ -116,7 +116,7 @@ const getGeoRpoDataBulk = async (line1, line2, sats, startTime, endTime, lonTime
         const s = sats[i];
         const sLonAndDrift = getLonAndDrift(s.Line1, s.Line2, lonEvalTime);
         const row = assembleGeoRpoResult(s, pEphem, ephemerides[i + 1],
-            pLonAndDrift, sLonAndDrift);
+            pLonAndDrift, sLonAndDrift, includeRIC);
         if (isDefined(row)) {results.push(row);}
     }