Skip to content

Commit 8545311

Browse files
thkruzthkruz
authored
Merge pull request #1001 from thkruz/develop
Develop
2 parents f9f5b22 + 84a13b7 commit 8545311

File tree

14 files changed

+134
-67
lines changed

14 files changed

+134
-67
lines changed

‎src/interfaces.ts

+14-8
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,13 @@ export type rgbaArray = [number, number, number, number];
5656

5757
export interface Colors {
5858
notional: rgbaArray;
59-
ageLost: rgbaArray;
60-
ageMed: rgbaArray;
61-
ageNew: rgbaArray;
62-
ageOld: rgbaArray;
59+
age1: rgbaArray;
60+
age2: rgbaArray;
61+
age3: rgbaArray;
62+
age4: rgbaArray;
63+
age5: rgbaArray;
64+
age6: rgbaArray;
65+
age7: rgbaArray;
6366
analyst: rgbaArray;
6467
countryCIS: rgbaArray;
6568
countryOther: rgbaArray;
@@ -222,10 +225,13 @@ export interface SensorGeolocation {
222225
}
223226

224227
export interface ObjectTypeFlags {
225-
ageLost: boolean;
226-
ageMed: boolean;
227-
ageNew: boolean;
228-
ageOld: boolean;
228+
age1: boolean;
229+
age2: boolean;
230+
age3: boolean;
231+
age4: boolean;
232+
age5: boolean;
233+
age6: boolean;
234+
age7: boolean;
229235
countryCIS: boolean;
230236
countryOther: boolean;
231237
countryPRC: boolean;

‎src/locales/de.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"satIntel": "Integriere Satelliten-Informationen...",
8484
"painting": "Male die Erde...",
8585
"coloring": "Färbe innerhalb der Linien...",
86-
"elsets": "Lokalisiere ELSETs...",
86+
"elsets": "Lokalisiere GPs...",
8787
"models": "Erstelle 3D-Modelle..."
8888
},
8989
"splashScreens": {
@@ -189,7 +189,7 @@
189189
"TrackingImpactPredict": {
190190
"bottomIconLabel": "Wiedereintrittsvorhersage",
191191
"title": "Menü für Verfolgung und Einschlagsvorhersage",
192-
"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>"
192+
"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>"
193193
},
194194
"Breakup": {
195195
"bottomIconLabel": "Zerfall erstellen",

‎src/locales/en.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"satIntel": "Integrating Satellite Intel...",
8484
"painting": "Painting the Earth...",
8585
"coloring": "Coloring Inside the Lines..",
86-
"elsets": "Locating ELSETs...",
86+
"elsets": "Locating GPs...",
8787
"models": "Building 3D Models..."
8888
},
8989
"splashScreens": {
@@ -189,7 +189,7 @@
189189
"TrackingImpactPredict": {
190190
"bottomIconLabel": "Reentry Prediction",
191191
"title": "Tracking and Impact Prediction Menu",
192-
"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>"
192+
"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>"
193193
},
194194
"Breakup": {
195195
"bottomIconLabel": "Create Breakup",

‎src/locales/es.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"satIntel": "Integrando inteligencia satelital...",
8484
"painting": "Pintando la Tierra...",
8585
"coloring": "Coloreando dentro de las líneas...",
86-
"elsets": "Localizando ELSETs...",
86+
"elsets": "Localizando GPs...",
8787
"models": "Construyendo modelos 3D..."
8888
},
8989
"splashScreens": {
@@ -189,7 +189,7 @@
189189
"TrackingImpactPredict": {
190190
"bottomIconLabel": "Predicción de Reentrada",
191191
"title": "Menú de Seguimiento y Predicción de Impacto",
192-
"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>"
192+
"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>"
193193
},
194194
"Breakup": {
195195
"bottomIconLabel": "Crear Desintegración",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class ColorMenu extends KeepTrackPlugin {
3333
<li class="menu-selectable" data-color="countries">Countries</li>
3434
<li class="menu-selectable" data-color="near-earth">Near Earth</li>
3535
<li class="menu-selectable" data-color="deep-space">Deep Space</li>
36-
<li class="menu-selectable" data-color="elset-age">Elset Age</li>
36+
<li class="menu-selectable" data-color="elset-age">GP Age</li>
3737
<li class="menu-selectable" data-color="lost-objects">Lost Objects</li>
3838
</ul>
3939
</div>
@@ -57,7 +57,7 @@ export class ColorMenu extends KeepTrackPlugin {
5757
<li id="colors-country-rmb"><a href="#">Country</a></li>
5858
<li id="colors-confidence-rmb"><a href="#">Confidence Level</a></li>
5959
<li id="colors-velocity-rmb"><a href="#">Velocity</a></li>
60-
<li id="colors-ageOfElset-rmb"><a href="#">Age of Elset</a></li>
60+
<li id="colors-ageOfElset-rmb"><a href="#">Age of GP</a></li>
6161
</ul>`;
6262

6363
// eslint-disable-next-line class-methods-use-this

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1066,8 +1066,8 @@ export class SatInfoBox extends KeepTrackPlugin {
10661066
</div>
10671067
<div class="sat-info-row sat-only-info">
10681068
<div class="sat-info-key" data-position="top" data-delay="50"
1069-
data-tooltip="Time Since Official Orbit Calculated (Older ELSETs are Less Accuarate Usually)">
1070-
Age of ELSET
1069+
data-tooltip="Time Since Official Orbit Calculated (Older GPs are Less Accuarate Usually)">
1070+
Age of GP
10711071
</div>
10721072
<div class="sat-info-value" id="sat-elset-age">xxx.xxxx</div>
10731073
</div>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export class TrackingImpactPredict extends KeepTrackPlugin {
182182
const tr = tbl.insertRow();
183183
const names = [
184184
'NORAD', 'Decay Date', 'Latitude', 'Longitude', 'Window (min)',
185-
'Next Report (hrs)', 'Reentry Angle (deg)', 'RCS (m^2)', 'ELSET Age (hrs)',
185+
'Next Report (hrs)', 'Reentry Angle (deg)', 'RCS (m^2)', 'GP Age (hrs)',
186186
'Dry Mass (kg)', 'Volume (m^3)',
187187
];
188188

‎src/settings/settings.ts

+10-7
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ export class SettingsManager {
542542
*/
543543
tle: 'https://storage.keeptrack.space/data/tle.json',
544544
tleDebris: 'https://app.keeptrack.space/tle/TLEdebris.json',
545-
vimpel: 'https://storage.keeptrack.space/data/vimpel.json',
545+
vimpel: 'https://r2.keeptrack.space/vimpel.json',
546546
};
547547
/**
548548
* Determines whether or not to hide the propogation rate text on the GUI.
@@ -1260,9 +1260,9 @@ export class SettingsManager {
12601260
// eslint-disable-next-line no-console
12611261
console.warn('Settings Manager: Unable to get color settings - localStorage issue!');
12621262
}
1263-
if (!this.colors || Object.keys(this.colors).length === 0 || this.colors.version !== '1.3.3') {
1263+
if (!this.colors || Object.keys(this.colors).length === 0 || this.colors.version !== '1.4.1') {
12641264
this.colors = {
1265-
version: '1.3.3',
1265+
version: '1.4.1',
12661266
length: 0,
12671267
facility: [0.64, 0.0, 0.64, 1.0],
12681268
sunlight100: [1.0, 1.0, 1.0, 0.7],
@@ -1332,10 +1332,13 @@ export class SettingsManager {
13321332
rcsMed: [0.2, 0.4, 1.0, 1],
13331333
rcsLarge: [0, 1.0, 0, 0.6],
13341334
rcsUnknown: [1.0, 1.0, 0, 0.6],
1335-
ageNew: [0, 1.0, 0, 0.9],
1336-
ageMed: [1.0, 1.0, 0.0, 0.9],
1337-
ageOld: [1.0, 0.6, 0, 0.9],
1338-
ageLost: [1.0, 0.0, 0, 0.9],
1335+
age1: [0, 1.0, 0, 0.9],
1336+
age2: [0.6, 0.996, 0, 0.9],
1337+
age3: [0.8, 1.0, 0, 0.9],
1338+
age4: [1.0, 1.0, 0, 0.9],
1339+
age5: [1.0, 0.8, 0.0, 0.9],
1340+
age6: [1.0, 0.6, 0.0, 0.9],
1341+
age7: [1.0, 0.0, 0.0, 0.9],
13391342
lostobjects: [0.2, 1.0, 0.0, 0.65],
13401343
satLEO: [0.2, 1.0, 0.0, 0.65],
13411344
satGEO: [0.2, 1.0, 0.0, 0.65],

‎src/settings/versionDate.js

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

‎src/singletons/color-scheme-manager.ts

+59-27
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,14 @@ export class ColorSchemeManager {
8787
velocitySlow: true,
8888
velocityMed: true,
8989
velocityFast: true,
90-
ageNew: true,
91-
ageMed: true,
92-
ageOld: true,
93-
ageLost: true,
90+
age1: true,
91+
age2: true,
92+
age3: true,
93+
age4: true,
94+
age5: true,
95+
age6: true,
96+
age7: true,
97+
lostobjects: true,
9498
countryUS: true,
9599
countryPRC: true,
96100
countryCIS: true,
@@ -258,35 +262,54 @@ export class ColorSchemeManager {
258262

259263
let daysold: Days;
260264
const sat = obj as DetailedSatellite;
265+
const epochYear = sat.tle1.substring(18, 20);
261266

262-
if (sat.tle1.substr(18, 2) === year) {
263-
daysold = (jday - parseInt(sat.tle1.substr(20, 3))) as Days;
267+
if (epochYear === year) {
268+
daysold = (jday - parseFloat(sat.tle1.substring(20, 28))) as Days;
264269
} else {
265-
daysold = (jday + parseInt(year) * 365 - (parseInt(sat.tle1.substr(18, 2)) * 365 + parseInt(sat.tle1.substr(20, 3)))) as Days;
270+
daysold = (jday + parseInt(year) * 365 - (parseInt(epochYear) * 365 + parseFloat(sat.tle1.substring(20, 28)))) as Days;
266271
}
267272

268-
if (daysold < 3 && this.objectTypeFlags.ageNew) {
273+
if (daysold < 0.5 && this.objectTypeFlags.age1) {
269274
return {
270-
color: this.colorTheme.ageNew,
275+
color: this.colorTheme.age1,
271276
pickable: Pickable.Yes,
272277
};
273278
}
274279

275-
if (daysold >= 3 && daysold < 14 && this.objectTypeFlags.ageMed) {
280+
if (daysold >= 0.5 && daysold < 1.0 && this.objectTypeFlags.age2) {
281+
return {
282+
color: this.colorTheme.age2,
283+
pickable: Pickable.Yes,
284+
};
285+
}
286+
if (daysold >= 1.0 && daysold < 1.5 && this.objectTypeFlags.age3) {
287+
return {
288+
color: this.colorTheme.age3,
289+
pickable: Pickable.Yes,
290+
};
291+
}
292+
if (daysold >= 1.5 && daysold < 2.0 && this.objectTypeFlags.age4) {
293+
return {
294+
color: this.colorTheme.age4,
295+
pickable: Pickable.Yes,
296+
};
297+
}
298+
if (daysold >= 2.0 && daysold < 2.5 && this.objectTypeFlags.age5) {
276299
return {
277-
color: this.colorTheme.ageMed,
300+
color: this.colorTheme.age5,
278301
pickable: Pickable.Yes,
279302
};
280303
}
281-
if (daysold >= 14 && daysold < 60 && this.objectTypeFlags.ageOld) {
304+
if (daysold >= 2.5 && daysold < 3.0 && this.objectTypeFlags.age6) {
282305
return {
283-
color: this.colorTheme.ageOld,
306+
color: this.colorTheme.age6,
284307
pickable: Pickable.Yes,
285308
};
286309
}
287-
if (daysold >= 60 && this.objectTypeFlags.ageLost) {
310+
if (daysold >= 3.0 && this.objectTypeFlags.age7) {
288311
return {
289-
color: this.colorTheme.ageLost,
312+
color: this.colorTheme.age7,
290313
pickable: Pickable.Yes,
291314
};
292315
}
@@ -766,10 +789,13 @@ export class ColorSchemeManager {
766789
rcsMed: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
767790
rcsLarge: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
768791
rcsUnknown: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
769-
ageNew: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
770-
ageMed: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
771-
ageOld: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
772-
ageLost: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
792+
age1: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
793+
age2: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
794+
age3: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
795+
age4: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
796+
age5: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
797+
age6: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
798+
age7: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
773799
countryUS: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
774800
countryPRC: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
775801
countryCIS: [0.0, 0.0, 1.0, 1.0] as rgbaArray,
@@ -1226,10 +1252,13 @@ export class ColorSchemeManager {
12261252
this.objectTypeFlags.velocitySlow = true;
12271253
this.objectTypeFlags.velocityMed = true;
12281254
this.objectTypeFlags.velocityFast = true;
1229-
this.objectTypeFlags.ageNew = true;
1230-
this.objectTypeFlags.ageMed = true;
1231-
this.objectTypeFlags.ageOld = true;
1232-
this.objectTypeFlags.ageLost = true;
1255+
this.objectTypeFlags.age1 = true;
1256+
this.objectTypeFlags.age2 = true;
1257+
this.objectTypeFlags.age3 = true;
1258+
this.objectTypeFlags.age4 = true;
1259+
this.objectTypeFlags.age5 = true;
1260+
this.objectTypeFlags.age6 = true;
1261+
this.objectTypeFlags.age7 = true;
12331262
this.objectTypeFlags.starlink = true;
12341263
this.objectTypeFlags.starlinkNot = true;
12351264
}
@@ -1951,10 +1980,13 @@ export interface ColorSchemeColorMap {
19511980
countryCIS: [number, number, number, number];
19521981
countryPRC: [number, number, number, number];
19531982
countryOther: [number, number, number, number];
1954-
ageNew: [number, number, number, number];
1955-
ageMed: [number, number, number, number];
1956-
ageOld: [number, number, number, number];
1957-
ageLost: [number, number, number, number];
1983+
age1: [number, number, number, number];
1984+
age2: [number, number, number, number];
1985+
age3: [number, number, number, number];
1986+
age4: [number, number, number, number];
1987+
age5: [number, number, number, number];
1988+
age6: [number, number, number, number];
1989+
age7: [number, number, number, number];
19581990
satSmall: [number, number, number, number];
19591991
densityPayload: [number, number, number, number];
19601992
densityHi: [number, number, number, number];

‎src/singletons/uiManager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ export class UiManager {
212212
this.toast('Color Scheme Changed to Deep Space', ToastMsgType.normal, false);
213213
break;
214214
case 'ageOfElset':
215-
this.toast('Color Scheme Changed to Elset Age', ToastMsgType.normal, false);
215+
this.toast('Color Scheme Changed to GP Age', ToastMsgType.normal, false);
216216
break;
217217
case 'rcs':
218218
this.toast('Color Scheme Changed to Radar Cross Section', ToastMsgType.normal, false);

‎src/static/catalog-loader.ts

+11
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,17 @@ export class CatalogLoader {
724724
resp[i].source = CatalogSource.USSF;
725725
}
726726

727+
/*
728+
* Embed a confidence level into the 64th character of the TLE1
729+
* All 9s is the default value
730+
* TODO: Generate a better confidence level system
731+
*/
732+
if (resp[i].source === CatalogSource.USSF) {
733+
resp[i].TLE1 = `${resp[i].TLE1.substring(0, 64)}9${resp[i].TLE1.substring(65)}` as TleLine1;
734+
} else {
735+
resp[i].TLE1 = `${resp[i].TLE1.substring(0, 64)}5${resp[i].TLE1.substring(65)}` as TleLine1;
736+
}
737+
727738
let rcs: number;
728739

729740
rcs = resp[i].rcs === 'LARGE' ? 5 : rcs;

‎src/static/legend-manager.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,13 @@ export abstract class LegendManager {
5454
'.legend-countryCIS-box',
5555
'.legend-countryPRC-box',
5656
'.legend-countryOther-box',
57-
'.legend-ageNew-box',
58-
'.legend-ageMed-box',
59-
'.legend-ageOld-box',
60-
'.legend-ageLost-box',
57+
'.legend-age1-box',
58+
'.legend-age2-box',
59+
'.legend-age3-box',
60+
'.legend-age4-box',
61+
'.legend-age5-box',
62+
'.legend-age6-box',
63+
'.legend-age7-box',
6164
'.legend-satSmall-box',
6265
'.legend-densityPayload-box',
6366
'.legend-densityHi-box',

0 commit comments

Comments
 (0)