Develop

src/interfaces.ts

@@ -56,10 +56,13 @@ export type rgbaArray = [number, number, number, number];
 
 export interface Colors {
   notional: rgbaArray;
-  ageLost: rgbaArray;
-  ageMed: rgbaArray;
-  ageNew: rgbaArray;
-  ageOld: rgbaArray;
+  age1: rgbaArray;
+  age2: rgbaArray;
+  age3: rgbaArray;
+  age4: rgbaArray;
+  age5: rgbaArray;
+  age6: rgbaArray;
+  age7: rgbaArray;
   analyst: rgbaArray;
   countryCIS: rgbaArray;
   countryOther: rgbaArray;
@@ -222,10 +225,13 @@ export interface SensorGeolocation {
 }
 
 export interface ObjectTypeFlags {
-  ageLost: boolean;
-  ageMed: boolean;
-  ageNew: boolean;
-  ageOld: boolean;
+  age1: boolean;
+  age2: boolean;
+  age3: boolean;
+  age4: boolean;
+  age5: boolean;
+  age6: boolean;
+  age7: boolean;
   countryCIS: boolean;
   countryOther: boolean;
   countryPRC: boolean;

src/locales/de.json

@@ -83,7 +83,7 @@
     "satIntel": "Integriere Satelliten-Informationen...",
     "painting": "Male die Erde...",
     "coloring": "Färbe innerhalb der Linien...",
-    "elsets": "Lokalisiere ELSETs...",
+    "elsets": "Lokalisiere GPs...",
     "models": "Erstelle 3D-Modelle..."
   },
   "splashScreens": {
@@ -189,7 +189,7 @@
     "TrackingImpactPredict": {
       "bottomIconLabel": "Wiedereintrittsvorhersage",
       "title": "Menü für Verfolgung und Einschlagsvorhersage",
-      "helpBody": "Das Menü für Verfolgung und Einschlagsvorhersage (TIP) zeigt die neuesten Nachrichten zur Verfolgung und Einschlagsvorhersage für Satelliten an. Die Tabelle zeigt die folgenden Spalten:<br><br> <b>NORAD</b>: Die NORAD-Katalog-ID des Satelliten.<br><br> <b>Zerfallsdatum</b>: Das Datum des vorhergesagten Zerfalls des Satelliten.<br><br> <b>Breitengrad</b>: Der Breitengrad des Satelliten zum Zeitpunkt des Zerfalls.<br><br> <b>Längengrad</b>: Der Längengrad des Satelliten zum Zeitpunkt des Zerfalls.<br><br> <b>Fenster (min)</b>: Das Zeitfenster in Minuten für die Vorhersage.<br><br> <b>Nächster Bericht (Std)</b>: Die Zeit in Stunden bis zum nächsten Bericht.<br><br> <b>Wiedereintrittswinkel (deg)</b>: Der Wiedereintrittswinkel des Satelliten in Grad.<br><br> <b>RCS (m²)</b>: Der Radarquerschnitt des Satelliten in Quadratmetern.<br><br> <b>ELSET-Alter (Std)</b>: Das Alter des neuesten Elementsatzes in Stunden.<br><br> <b>Trockenmasse (kg)</b>: Die Trockenmasse des Satelliten in Kilogramm.<br><br> <b>Volumen (m³)</b>: Das geschätzte Volumen des Satelliten in Kubikmetern.<br><br>"
+      "helpBody": "Das Menü für Verfolgung und Einschlagsvorhersage (TIP) zeigt die neuesten Nachrichten zur Verfolgung und Einschlagsvorhersage für Satelliten an. Die Tabelle zeigt die folgenden Spalten:<br><br> <b>NORAD</b>: Die NORAD-Katalog-ID des Satelliten.<br><br> <b>Zerfallsdatum</b>: Das Datum des vorhergesagten Zerfalls des Satelliten.<br><br> <b>Breitengrad</b>: Der Breitengrad des Satelliten zum Zeitpunkt des Zerfalls.<br><br> <b>Längengrad</b>: Der Längengrad des Satelliten zum Zeitpunkt des Zerfalls.<br><br> <b>Fenster (min)</b>: Das Zeitfenster in Minuten für die Vorhersage.<br><br> <b>Nächster Bericht (Std)</b>: Die Zeit in Stunden bis zum nächsten Bericht.<br><br> <b>Wiedereintrittswinkel (deg)</b>: Der Wiedereintrittswinkel des Satelliten in Grad.<br><br> <b>RCS (m²)</b>: Der Radarquerschnitt des Satelliten in Quadratmetern.<br><br> <b>GP-Alter (Std)</b>: Das Alter des neuesten Elementsatzes in Stunden.<br><br> <b>Trockenmasse (kg)</b>: Die Trockenmasse des Satelliten in Kilogramm.<br><br> <b>Volumen (m³)</b>: Das geschätzte Volumen des Satelliten in Kubikmetern.<br><br>"
     },
     "Breakup": {
       "bottomIconLabel": "Zerfall erstellen",

src/locales/en.json

@@ -83,7 +83,7 @@
     "satIntel": "Integrating Satellite Intel...",
     "painting": "Painting the Earth...",
     "coloring": "Coloring Inside the Lines..",
-    "elsets": "Locating ELSETs...",
+    "elsets": "Locating GPs...",
     "models": "Building 3D Models..."
   },
   "splashScreens": {
@@ -189,7 +189,7 @@
     "TrackingImpactPredict": {
       "bottomIconLabel": "Reentry Prediction",
       "title": "Tracking and Impact Prediction Menu",
-      "helpBody": "The Tracking and Impact Prediction (TIP) menu displays the latest tracking and impact prediction messages for satellites. The table shows the following columns:<br><br> <b>NORAD</b>: The NORAD catalog ID of the satellite.<br><br> <b>Decay Date</b>: The date of the predicted decay of the satellite.<br><br> <b>Latitude</b>: The latitude of the satellite at decay time.<br><br> <b>Longitude</b>: The longitude of the satellite at decay time.<br><br> <b>Window (min)</b>: The time window in minutes for the prediction.<br><br> <b>Next Report (hrs)</b>: The time in hours until the next report.<br><br> <b>Reentry Angle (deg)</b>: The reentry angle of the satellite in degrees.<br><br> <b>RCS (m²)</b>: The Radar Cross Section of the satellite in square meters.<br><br> <b>ELSET Age (hrs)</b>: The age of the latest element set in hours.<br><br> <b>Dry Mass (kg)</b>: The dry mass of the satellite in kilograms.<br><br> <b>Volume (m³)</b>: The estimated volume of the satellite in cubic meters.<br><br>"
+      "helpBody": "The Tracking and Impact Prediction (TIP) menu displays the latest tracking and impact prediction messages for satellites. The table shows the following columns:<br><br> <b>NORAD</b>: The NORAD catalog ID of the satellite.<br><br> <b>Decay Date</b>: The date of the predicted decay of the satellite.<br><br> <b>Latitude</b>: The latitude of the satellite at decay time.<br><br> <b>Longitude</b>: The longitude of the satellite at decay time.<br><br> <b>Window (min)</b>: The time window in minutes for the prediction.<br><br> <b>Next Report (hrs)</b>: The time in hours until the next report.<br><br> <b>Reentry Angle (deg)</b>: The reentry angle of the satellite in degrees.<br><br> <b>RCS (m²)</b>: The Radar Cross Section of the satellite in square meters.<br><br> <b>GP Age (hrs)</b>: The age of the latest element set in hours.<br><br> <b>Dry Mass (kg)</b>: The dry mass of the satellite in kilograms.<br><br> <b>Volume (m³)</b>: The estimated volume of the satellite in cubic meters.<br><br>"
     },
     "Breakup": {
       "bottomIconLabel": "Create Breakup",

src/locales/es.json

@@ -83,7 +83,7 @@
     "satIntel": "Integrando inteligencia satelital...",
     "painting": "Pintando la Tierra...",
     "coloring": "Coloreando dentro de las líneas...",
-    "elsets": "Localizando ELSETs...",
+    "elsets": "Localizando GPs...",
     "models": "Construyendo modelos 3D..."
   },
   "splashScreens": {
@@ -189,7 +189,7 @@
     "TrackingImpactPredict": {
       "bottomIconLabel": "Predicción de Reentrada",
       "title": "Menú de Seguimiento y Predicción de Impacto",
-      "helpBody": "El menú de Seguimiento y Predicción de Impacto (TIP) muestra los últimos mensajes de seguimiento y predicción de impacto para satélites. La tabla muestra las siguientes columnas:<br><br> <b>NORAD</b>: El ID de catálogo NORAD del satélite.<br><br> <b>Fecha de Decaimiento</b>: La fecha de la predicción de decaimiento del satélite.<br><br> <b>Latitud</b>: La latitud del satélite en el momento del decaimiento.<br><br> <b>Longitud</b>: La longitud del satélite en el momento del decaimiento.<br><br> <b>Ventana (min)</b>: La ventana de tiempo en minutos para la predicción.<br><br> <b>Próximo Informe (hrs)</b>: El tiempo en horas hasta el próximo informe.<br><br> <b>Ángulo de Reentrada (deg)</b>: El ángulo de reentrada del satélite en grados.<br><br> <b>RCS (m²)</b>: La sección transversal de radar del satélite en metros cuadrados.<br><br> <b>Edad del ELSET (hrs)</b>: La edad del último conjunto de elementos en horas.<br><br> <b>Masa en Seco (kg)</b>: La masa en seco del satélite en kilogramos.<br><br> <b>Volumen (m³)</b>: El volumen estimado del satélite en metros cúbicos.<br><br>"
+      "helpBody": "El menú de Seguimiento y Predicción de Impacto (TIP) muestra los últimos mensajes de seguimiento y predicción de impacto para satélites. La tabla muestra las siguientes columnas:<br><br> <b>NORAD</b>: El ID de catálogo NORAD del satélite.<br><br> <b>Fecha de Decaimiento</b>: La fecha de la predicción de decaimiento del satélite.<br><br> <b>Latitud</b>: La latitud del satélite en el momento del decaimiento.<br><br> <b>Longitud</b>: La longitud del satélite en el momento del decaimiento.<br><br> <b>Ventana (min)</b>: La ventana de tiempo en minutos para la predicción.<br><br> <b>Próximo Informe (hrs)</b>: El tiempo en horas hasta el próximo informe.<br><br> <b>Ángulo de Reentrada (deg)</b>: El ángulo de reentrada del satélite en grados.<br><br> <b>RCS (m²)</b>: La sección transversal de radar del satélite en metros cuadrados.<br><br> <b>Edad del GP (hrs)</b>: La edad del último conjunto de elementos en horas.<br><br> <b>Masa en Seco (kg)</b>: La masa en seco del satélite en kilogramos.<br><br> <b>Volumen (m³)</b>: El volumen estimado del satélite en metros cúbicos.<br><br>"
     },
     "Breakup": {
       "bottomIconLabel": "Crear Desintegración",

src/plugins/colors-menu/colors-menu.ts

@@ -33,7 +33,7 @@ export class ColorMenu extends KeepTrackPlugin {
         <li class="menu-selectable" data-color="countries">Countries</li>
         <li class="menu-selectable" data-color="near-earth">Near Earth</li>
         <li class="menu-selectable" data-color="deep-space">Deep Space</li>
-        <li class="menu-selectable" data-color="elset-age">Elset Age</li>
+        <li class="menu-selectable" data-color="elset-age">GP Age</li>
         <li class="menu-selectable" data-color="lost-objects">Lost Objects</li>
       </ul>
     </div>
@@ -57,7 +57,7 @@ export class ColorMenu extends KeepTrackPlugin {
     <li id="colors-country-rmb"><a href="#">Country</a></li>
     <li id="colors-confidence-rmb"><a href="#">Confidence Level</a></li>
     <li id="colors-velocity-rmb"><a href="#">Velocity</a></li>
-    <li id="colors-ageOfElset-rmb"><a href="#">Age of Elset</a></li>
+    <li id="colors-ageOfElset-rmb"><a href="#">Age of GP</a></li>
   </ul>`;
 
   // eslint-disable-next-line class-methods-use-this

src/plugins/select-sat-manager/sat-info-box.ts

@@ -1066,8 +1066,8 @@ export class SatInfoBox extends KeepTrackPlugin {
           </div>
           <div class="sat-info-row sat-only-info">
             <div class="sat-info-key" data-position="top" data-delay="50"
-              data-tooltip="Time Since Official Orbit Calculated (Older ELSETs are Less Accuarate Usually)">
-              Age of ELSET
+              data-tooltip="Time Since Official Orbit Calculated (Older GPs are Less Accuarate Usually)">
+              Age of GP
             </div>
             <div class="sat-info-value" id="sat-elset-age">xxx.xxxx</div>
           </div>

src/plugins/tracking-impact-predict/tracking-impact-predict.ts

@@ -182,7 +182,7 @@ export class TrackingImpactPredict extends KeepTrackPlugin {
     const tr = tbl.insertRow();
     const names = [
       'NORAD', 'Decay Date', 'Latitude', 'Longitude', 'Window (min)',
-      'Next Report (hrs)', 'Reentry Angle (deg)', 'RCS (m^2)', 'ELSET Age (hrs)',
+      'Next Report (hrs)', 'Reentry Angle (deg)', 'RCS (m^2)', 'GP Age (hrs)',
       'Dry Mass (kg)', 'Volume (m^3)',
     ];
 

src/settings/settings.ts

@@ -542,7 +542,7 @@ export class SettingsManager {
      */
     tle: 'https://storage.keeptrack.space/data/tle.json',
     tleDebris: 'https://app.keeptrack.space/tle/TLEdebris.json',
-    vimpel: 'https://storage.keeptrack.space/data/vimpel.json',
+    vimpel: 'https://r2.keeptrack.space/vimpel.json',
   };
   /**
    * Determines whether or not to hide the propogation rate text on the GUI.
@@ -1260,9 +1260,9 @@ export class SettingsManager {
       // eslint-disable-next-line no-console
       console.warn('Settings Manager: Unable to get color settings - localStorage issue!');
     }
-    if (!this.colors || Object.keys(this.colors).length === 0 || this.colors.version !== '1.3.3') {
+    if (!this.colors || Object.keys(this.colors).length === 0 || this.colors.version !== '1.4.1') {
       this.colors = {
-        version: '1.3.3',
+        version: '1.4.1',
         length: 0,
         facility: [0.64, 0.0, 0.64, 1.0],
         sunlight100: [1.0, 1.0, 1.0, 0.7],
@@ -1332,10 +1332,13 @@ export class SettingsManager {
         rcsMed: [0.2, 0.4, 1.0, 1],
         rcsLarge: [0, 1.0, 0, 0.6],
         rcsUnknown: [1.0, 1.0, 0, 0.6],
-        ageNew: [0, 1.0, 0, 0.9],
-        ageMed: [1.0, 1.0, 0.0, 0.9],
-        ageOld: [1.0, 0.6, 0, 0.9],
-        ageLost: [1.0, 0.0, 0, 0.9],
+        age1: [0, 1.0, 0, 0.9],
+        age2: [0.6, 0.996, 0, 0.9],
+        age3: [0.8, 1.0, 0, 0.9],
+        age4: [1.0, 1.0, 0, 0.9],
+        age5: [1.0, 0.8, 0.0, 0.9],
+        age6: [1.0, 0.6, 0.0, 0.9],
+        age7: [1.0, 0.0, 0.0, 0.9],
         lostobjects: [0.2, 1.0, 0.0, 0.65],
         satLEO: [0.2, 1.0, 0.0, 0.65],
         satGEO: [0.2, 1.0, 0.0, 0.65],

src/settings/versionDate.js

@@ -1,2 +1,2 @@
 // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-export const VERSION_DATE = 'January 14, 2025';
+export const VERSION_DATE = 'January 20, 2025';

src/singletons/color-scheme-manager.ts

@@ -87,10 +87,14 @@ export class ColorSchemeManager {
     velocitySlow: true,
     velocityMed: true,
     velocityFast: true,
-    ageNew: true,
-    ageMed: true,
-    ageOld: true,
-    ageLost: true,
+    age1: true,
+    age2: true,
+    age3: true,
+    age4: true,
+    age5: true,
+    age6: true,
+    age7: true,
+    lostobjects: true,
     countryUS: true,
     countryPRC: true,
     countryCIS: true,
@@ -258,35 +262,54 @@ export class ColorSchemeManager {
 
     let daysold: Days;
     const sat = obj as DetailedSatellite;
+    const epochYear = sat.tle1.substring(18, 20);
 
-    if (sat.tle1.substr(18, 2) === year) {
-      daysold = (jday - parseInt(sat.tle1.substr(20, 3))) as Days;
+    if (epochYear === year) {
+      daysold = (jday - parseFloat(sat.tle1.substring(20, 28))) as Days;
     } else {
-      daysold = (jday + parseInt(year) * 365 - (parseInt(sat.tle1.substr(18, 2)) * 365 + parseInt(sat.tle1.substr(20, 3)))) as Days;
+      daysold = (jday + parseInt(year) * 365 - (parseInt(epochYear) * 365 + parseFloat(sat.tle1.substring(20, 28)))) as Days;
     }
 
-    if (daysold < 3 && this.objectTypeFlags.ageNew) {
+    if (daysold < 0.5 && this.objectTypeFlags.age1) {
       return {
-        color: this.colorTheme.ageNew,
+        color: this.colorTheme.age1,
         pickable: Pickable.Yes,
       };
     }
 
-    if (daysold >= 3 && daysold < 14 && this.objectTypeFlags.ageMed) {
+    if (daysold >= 0.5 && daysold < 1.0 && this.objectTypeFlags.age2) {
+      return {
+        color: this.colorTheme.age2,
+        pickable: Pickable.Yes,
+      };
+    }
+    if (daysold >= 1.0 && daysold < 1.5 && this.objectTypeFlags.age3) {
+      return {
+        color: this.colorTheme.age3,
+        pickable: Pickable.Yes,
+      };
+    }
+    if (daysold >= 1.5 && daysold < 2.0 && this.objectTypeFlags.age4) {
+      return {
+        color: this.colorTheme.age4,
+        pickable: Pickable.Yes,
+      };
+    }
+    if (daysold >= 2.0 && daysold < 2.5 && this.objectTypeFlags.age5) {
       return {
-        color: this.colorTheme.ageMed,
+        color: this.colorTheme.age5,
         pickable: Pickable.Yes,
       };
     }
-    if (daysold >= 14 && daysold < 60 && this.objectTypeFlags.ageOld) {
+    if (daysold >= 2.5 && daysold < 3.0 && this.objectTypeFlags.age6) {
       return {
-        color: this.colorTheme.ageOld,
+        color: this.colorTheme.age6,
         pickable: Pickable.Yes,
       };
     }
-    if (daysold >= 60 && this.objectTypeFlags.ageLost) {
+    if (daysold >= 3.0 && this.objectTypeFlags.age7) {
       return {
-        color: this.colorTheme.ageLost,
+        color: this.colorTheme.age7,
         pickable: Pickable.Yes,
       };
     }
@@ -766,10 +789,13 @@ export class ColorSchemeManager {
       rcsMed: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
       rcsLarge: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
       rcsUnknown: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
-      ageNew: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
-      ageMed: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
-      ageOld: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
-      ageLost: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
+      age1: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
+      age2: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
+      age3: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
+      age4: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
+      age5: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
+      age6: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
+      age7: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
       countryUS: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
       countryPRC: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
       countryCIS: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
@@ -1226,10 +1252,13 @@ export class ColorSchemeManager {
     this.objectTypeFlags.velocitySlow = true;
     this.objectTypeFlags.velocityMed = true;
     this.objectTypeFlags.velocityFast = true;
-    this.objectTypeFlags.ageNew = true;
-    this.objectTypeFlags.ageMed = true;
-    this.objectTypeFlags.ageOld = true;
-    this.objectTypeFlags.ageLost = true;
+    this.objectTypeFlags.age1 = true;
+    this.objectTypeFlags.age2 = true;
+    this.objectTypeFlags.age3 = true;
+    this.objectTypeFlags.age4 = true;
+    this.objectTypeFlags.age5 = true;
+    this.objectTypeFlags.age6 = true;
+    this.objectTypeFlags.age7 = true;
     this.objectTypeFlags.starlink = true;
     this.objectTypeFlags.starlinkNot = true;
   }
@@ -1951,10 +1980,13 @@ export interface ColorSchemeColorMap {
   countryCIS: [number, number, number, number];
   countryPRC: [number, number, number, number];
   countryOther: [number, number, number, number];
-  ageNew: [number, number, number, number];
-  ageMed: [number, number, number, number];
-  ageOld: [number, number, number, number];
-  ageLost: [number, number, number, number];
+  age1: [number, number, number, number];
+  age2: [number, number, number, number];
+  age3: [number, number, number, number];
+  age4: [number, number, number, number];
+  age5: [number, number, number, number];
+  age6: [number, number, number, number];
+  age7: [number, number, number, number];
   satSmall: [number, number, number, number];
   densityPayload: [number, number, number, number];
   densityHi: [number, number, number, number];

src/singletons/uiManager.ts

@@ -212,7 +212,7 @@ export class UiManager {
         this.toast('Color Scheme Changed to Deep Space', ToastMsgType.normal, false);
         break;
       case 'ageOfElset':
-        this.toast('Color Scheme Changed to Elset Age', ToastMsgType.normal, false);
+        this.toast('Color Scheme Changed to GP Age', ToastMsgType.normal, false);
         break;
       case 'rcs':
         this.toast('Color Scheme Changed to Radar Cross Section', ToastMsgType.normal, false);

src/static/catalog-loader.ts

@@ -724,6 +724,17 @@ export class CatalogLoader {
           resp[i].source = CatalogSource.USSF;
       }
 
+      /*
+       * Embed a confidence level into the 64th character of the TLE1
+       * All 9s is the default value
+       * TODO: Generate a better confidence level system
+       */
+      if (resp[i].source === CatalogSource.USSF) {
+        resp[i].TLE1 = `${resp[i].TLE1.substring(0, 64)}9${resp[i].TLE1.substring(65)}` as TleLine1;
+      } else {
+        resp[i].TLE1 = `${resp[i].TLE1.substring(0, 64)}5${resp[i].TLE1.substring(65)}` as TleLine1;
+      }
+
       let rcs: number;
 
       rcs = resp[i].rcs === 'LARGE' ? 5 : rcs;

src/static/legend-manager.ts

@@ -54,10 +54,13 @@ export abstract class LegendManager {
     '.legend-countryCIS-box',
     '.legend-countryPRC-box',
     '.legend-countryOther-box',
-    '.legend-ageNew-box',
-    '.legend-ageMed-box',
-    '.legend-ageOld-box',
-    '.legend-ageLost-box',
+    '.legend-age1-box',
+    '.legend-age2-box',
+    '.legend-age3-box',
+    '.legend-age4-box',
+    '.legend-age5-box',
+    '.legend-age6-box',
+    '.legend-age7-box',
     '.legend-satSmall-box',
     '.legend-densityPayload-box',
     '.legend-densityHi-box',