Skip to content

Commit 31fae5e

Browse files
thkruzthkruz
authored
Merge pull request #1006 from thkruz/develop
Develop
2 parents c324c02 + ac80694 commit 31fae5e

File tree

4 files changed

+43
-39
lines changed

4 files changed

+43
-39
lines changed

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

+6-36
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import settingsPng from '@public/img/icons/settings.png';
1212
import { KeepTrackPlugin } from '../KeepTrackPlugin';
1313
import { SoundNames } from '../sounds/SoundNames';
1414
import { TimeMachine } from '../time-machine/time-machine';
15+
import { SettingsManager } from '@app/settings/settings';
1516

1617
/**
1718
* /////////////////////////////////////////////////////////////////////////////
@@ -356,7 +357,7 @@ export class SettingsMenuPlugin extends KeepTrackPlugin {
356357
cb: () => {
357358
getEl('settings-form').addEventListener('change', SettingsMenuPlugin.onFormChange_);
358359
getEl('settings-form').addEventListener('submit', SettingsMenuPlugin.onSubmit_);
359-
getEl('settings-reset').addEventListener('click', SettingsMenuPlugin.resetToDefaults_);
360+
getEl('settings-reset').addEventListener('click', SettingsMenuPlugin.resetToDefaults);
360361

361362
const colorPalette = [
362363
// Reds
@@ -521,37 +522,6 @@ export class SettingsMenuPlugin extends KeepTrackPlugin {
521522
// (<HTMLInputElement>getEl('satFieldOfView')).value = settingsManager.selectedSatFOV.toString();
522523
}
523524

524-
static preserveSettings() {
525-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_LEO_SATS, settingsManager.isShowLeoSats.toString());
526-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_STARLINK_SATS, settingsManager.isShowStarlinkSats.toString());
527-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_HEO_SATS, settingsManager.isShowHeoSats.toString());
528-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_MEO_SATS, settingsManager.isShowMeoSats.toString());
529-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_GEO_SATS, settingsManager.isShowGeoSats.toString());
530-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_PAYLOADS, settingsManager.isShowPayloads.toString());
531-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_ROCKET_BODIES, settingsManager.isShowRocketBodies.toString());
532-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DEBRIS, settingsManager.isShowDebris.toString());
533-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_AGENCIES, settingsManager.isShowAgencies.toString());
534-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_CAMERA_WIDGET, settingsManager.drawCameraWidget.toString());
535-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_ORBITS, settingsManager.isDrawOrbits.toString());
536-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_TRAILING_ORBITS, settingsManager.isDrawTrailingOrbits.toString());
537-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_ECF, settingsManager.isOrbitCruncherInEcf.toString());
538-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_IN_COVERAGE_LINES, settingsManager.isDrawInCoverageLines.toString());
539-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_SUN, settingsManager.isDrawSun.toString());
540-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_BLACK_EARTH, settingsManager.isBlackEarth.toString());
541-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_ATMOSPHERE, settingsManager.isDrawAtmosphere.toString());
542-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_AURORA, settingsManager.isDrawAurora.toString());
543-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_MILKY_WAY, settingsManager.isDrawMilkyWay.toString());
544-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_GRAY_SKYBOX, settingsManager.isGraySkybox.toString());
545-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_ECI_ON_HOVER, settingsManager.isEciOnHover.toString());
546-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_HOS, settingsManager.colors.transparent[3] === 0 ? 'true' : 'false');
547-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_CONFIDENCE_LEVELS, settingsManager.isShowConfidenceLevels.toString());
548-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DEMO_MODE, settingsManager.isDemoModeOn.toString());
549-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_SAT_LABEL_MODE, settingsManager.isSatLabelModeOn.toString());
550-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_FREEZE_PROP_RATE_ON_DRAG, settingsManager.isFreezePropRateOnDrag.toString());
551-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DISABLE_TIME_MACHINE_TOASTS, settingsManager.isDisableTimeMachineToasts.toString());
552-
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_SEARCH_LIMIT, settingsManager.searchLimit.toString());
553-
}
554-
555525
private onColorSelected_(context: ColorPick, colorStr: string) {
556526
if (typeof context === 'undefined' || context === null) {
557527
throw new Error('context is undefined');
@@ -632,7 +602,7 @@ export class SettingsMenuPlugin extends KeepTrackPlugin {
632602
}
633603
}
634604

635-
private static resetToDefaults_() {
605+
static resetToDefaults() {
636606
keepTrackApi.getSoundManager().play(SoundNames.BUTTON_CLICK);
637607
settingsManager.isShowLeoSats = true;
638608
settingsManager.isShowHeoSats = true;
@@ -643,7 +613,7 @@ export class SettingsMenuPlugin extends KeepTrackPlugin {
643613
settingsManager.isShowDebris = true;
644614
settingsManager.isShowAgencies = false;
645615
settingsManager.isDrawOrbits = true;
646-
settingsManager.drawCameraWidget = true;
616+
settingsManager.drawCameraWidget = false;
647617
settingsManager.isDrawTrailingOrbits = false;
648618
settingsManager.isOrbitCruncherInEcf = false;
649619
settingsManager.isDrawInCoverageLines = true;
@@ -662,7 +632,7 @@ export class SettingsMenuPlugin extends KeepTrackPlugin {
662632
settingsManager.isFreezePropRateOnDrag = false;
663633
settingsManager.isDisableTimeMachineToasts = false;
664634
settingsManager.searchLimit = 600;
665-
SettingsMenuPlugin.preserveSettings();
635+
SettingsManager.preserveSettings();
666636
SettingsMenuPlugin.syncOnLoad();
667637
}
668638

@@ -798,7 +768,7 @@ export class SettingsMenuPlugin extends KeepTrackPlugin {
798768

799769
colorSchemeManagerInstance.setColorScheme(colorSchemeManagerInstance.currentColorScheme, true);
800770

801-
SettingsMenuPlugin.preserveSettings();
771+
SettingsManager.preserveSettings();
802772
}
803773
}
804774

‎src/settings/settings.ts

+33-2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,37 @@ export class SettingsManager {
9090
calculator: true,
9191
};
9292

93+
static preserveSettings() {
94+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_LEO_SATS, settingsManager.isShowLeoSats.toString());
95+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_STARLINK_SATS, settingsManager.isShowStarlinkSats.toString());
96+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_HEO_SATS, settingsManager.isShowHeoSats.toString());
97+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_MEO_SATS, settingsManager.isShowMeoSats.toString());
98+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_GEO_SATS, settingsManager.isShowGeoSats.toString());
99+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_PAYLOADS, settingsManager.isShowPayloads.toString());
100+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_ROCKET_BODIES, settingsManager.isShowRocketBodies.toString());
101+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DEBRIS, settingsManager.isShowDebris.toString());
102+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_AGENCIES, settingsManager.isShowAgencies.toString());
103+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_CAMERA_WIDGET, settingsManager.drawCameraWidget.toString());
104+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_ORBITS, settingsManager.isDrawOrbits.toString());
105+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_TRAILING_ORBITS, settingsManager.isDrawTrailingOrbits.toString());
106+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_ECF, settingsManager.isOrbitCruncherInEcf.toString());
107+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_IN_COVERAGE_LINES, settingsManager.isDrawInCoverageLines.toString());
108+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_SUN, settingsManager.isDrawSun.toString());
109+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_BLACK_EARTH, settingsManager.isBlackEarth.toString());
110+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_ATMOSPHERE, settingsManager.isDrawAtmosphere.toString());
111+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_AURORA, settingsManager.isDrawAurora.toString());
112+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DRAW_MILKY_WAY, settingsManager.isDrawMilkyWay.toString());
113+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_GRAY_SKYBOX, settingsManager.isGraySkybox.toString());
114+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_ECI_ON_HOVER, settingsManager.isEciOnHover.toString());
115+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_HOS, settingsManager.colors.transparent[3] === 0 ? 'true' : 'false');
116+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_CONFIDENCE_LEVELS, settingsManager.isShowConfidenceLevels.toString());
117+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DEMO_MODE, settingsManager.isDemoModeOn.toString());
118+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_SAT_LABEL_MODE, settingsManager.isSatLabelModeOn.toString());
119+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_FREEZE_PROP_RATE_ON_DRAG, settingsManager.isFreezePropRateOnDrag.toString());
120+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_DISABLE_TIME_MACHINE_TOASTS, settingsManager.isDisableTimeMachineToasts.toString());
121+
PersistenceManager.getInstance().saveItem(StorageKey.SETTINGS_SEARCH_LIMIT, settingsManager.searchLimit.toString());
122+
}
123+
93124
colors: ColorSchemeColorMap;
94125

95126
/** Ensures no html is injected into the page */
@@ -1198,8 +1229,8 @@ export class SettingsManager {
11981229
* Load Order:
11991230
* URL Params > Local Storage > Default
12001231
*/
1201-
this.loadOverrides_(settingsOverride);
12021232
this.loadPersistedSettings();
1233+
this.loadOverrides_(settingsOverride);
12031234

12041235
const params = this.loadOverridesFromUrl_();
12051236

@@ -1469,7 +1500,7 @@ export class SettingsManager {
14691500
this.externalTLEs = decodeURIComponent(val);
14701501
break;
14711502
case 'jsc':
1472-
this.isEnableJscCatalog = true;
1503+
this.isEnableJscCatalog = val === 'true';
14731504
break;
14741505
case 'sat':
14751506
keepTrackApi.register({

‎src/singletons/camera-control-widget.ts

+3
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ export class CameraControlWidget {
195195
}
196196

197197
private draw() {
198+
if (!settingsManager.drawCameraWidget) {
199+
return;
200+
}
198201
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
199202

200203
const camera = keepTrackApi.getMainCamera();

‎test/environment/TLE2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"TLE1":"1 00005U 58002B 23102.57063344 .00000078 00000+0 84911-4 0 9991","TLE2":"2 00005 34.2581 297.5582 1847009 304.1004 39.7575 10.85078443317039","payload":"Vanguard Test Satellite H","Mass":"2","vmag":9.5,"status":"In Orbit","launchDate":"1958 Mar 17","owner":"NRL","country":"US","manufacturer":"NRL","bus":"NRL 6\"","launchMass":"2","dryMass":"2","length":"0.1","diameter":"0.1","span":"0.1","shape":"Sphere","name":"VANGUARD 1","launchSite":"AFETR","launchVehicle":"U","type":1,"rcs":"0.1220"},{"TLE1":"1 00011U 59001A 23102.52381981 .00002247 00000+0 11744-2 0 9995","TLE2":"2 00011 32.8738 149.9410 1462946 303.7300 43.2162 11.86962895397182","payload":"Cloud cover satellite","Mass":"10","vmag":7.5,"name":"VANGUARD 2","country":"US","launchSite":"AFETR","launchVehicle":"U","launchDate":"1959 Feb 17","type":1,"rcs":"0.3931","status":"In Orbit","owner":"BSC","manufacturer":"NRL","bus":"NRL 20\"","launchMass":"10","dryMass":"10","length":"0.5","diameter":"0.5","span":"0.5","shape":"Sphere"},{"TLE1":"1 00012U 59001B 23102.10452989 .00002633 00000+0 15673-2 0 9991","TLE2":"2 00012 32.9014 350.5476 1660406 86.2571 292.5454 11.45391638397850","payload":"GRC 33-KS-2800 175-15-21","Mass":"195","vmag":6.5,"status":"In Orbit","launchDate":"1959 Feb 17","owner":"BSC","country":"US","manufacturer":"GCR","bus":"33-KS-2800","launchMass":"195","dryMass":"22","length":"1.5","diameter":"0.7","span":"1.5","shape":"Cyl","name":"VANGUARD R/B","launchSite":"AFETR","launchVehicle":"U","type":2,"rcs":"0.5266"},{"TLE1":"1 00016U 58002A 23102.24264491 .00000023 00000+0 39726-5 0 9998","TLE2":"2 00016 34.2783 63.7306 2025681 255.9344 80.9042 10.48822741566857","payload":"GRC 33-KS-2800 144-79-22","Mass":"195","vmag":7,"status":"In Orbit","launchDate":"1958 Mar 17","owner":"NRL","country":"US","manufacturer":"GCR","bus":"33-KS-2800","launchMass":"195","dryMass":"22","length":"1.5","diameter":"0.7","span":"1.5","shape":"Cyl","name":"VANGUARD R/B","launchSite":"AFETR","launchVehicle":"U","type":2,"rcs":"0.2282"},{"TLE1":"1 00020U 59007A 23102.46762352 .00003540 00000+0 14326-2 0 9995","TLE2":"2 00020 33.3469 114.0738 1659263 328.5202 22.5716 11.57283969349718","payload":"Magne-Ray satellite","Mass":"23","vmag":7,"status":"Attached in Orbit","launchDate":"1959 Sep 18","owner":"GSFC","country":"US","manufacturer":"NRL","bus":"NRL 20\"","launchMass":"23","dryMass":"23","length":"1.2","diameter":"0.5","span":"1.2","shape":"Sphere + Ant","name":"VANGUARD 3","launchSite":"AFETR","launchVehicle":"U","type":1,"rcs":"0.6412"},{"TLE1":"1 00022U 59009A 23102.83836663 .00005260 00000+0 37193-3 0 9996","TLE2":"2 00022 50.2818 302.6617 0128350 239.4768 119.3460 14.99973922379472","payload":"NASA S-1A","Mass":"41","vmag":7.5,"name":"EXPLORER 7","country":"US","launchSite":"AFETR","launchVehicle":"U","launchDate":"1959 Oct 13","type":1,"rcs":"0.5003","status":"In Orbit","owner":"GSFC","manufacturer":"ABMA","bus":"S-1","launchMass":"41","dryMass":"41","length":"0.8","diameter":"0.8","span":"7.0","shape":"DCone + 2 Ant"}]
1+
[{"tle1":"1 00005U 58002B 23102.57063344 .00000078 00000+0 84911-4 0 9991","tle2":"2 00005 34.2581 297.5582 1847009 304.1004 39.7575 10.85078443317039","payload":"Vanguard Test Satellite H","Mass":"2","vmag":9.5,"status":"In Orbit","launchDate":"1958 Mar 17","owner":"NRL","country":"US","manufacturer":"NRL","bus":"NRL 6\"","launchMass":"2","dryMass":"2","length":"0.1","diameter":"0.1","span":"0.1","shape":"Sphere","name":"VANGUARD 1","launchSite":"AFETR","launchVehicle":"U","type":1,"rcs":"0.1220"},{"tle1":"1 00011U 59001A 23102.52381981 .00002247 00000+0 11744-2 0 9995","tle2":"2 00011 32.8738 149.9410 1462946 303.7300 43.2162 11.86962895397182","payload":"Cloud cover satellite","Mass":"10","vmag":7.5,"name":"VANGUARD 2","country":"US","launchSite":"AFETR","launchVehicle":"U","launchDate":"1959 Feb 17","type":1,"rcs":"0.3931","status":"In Orbit","owner":"BSC","manufacturer":"NRL","bus":"NRL 20\"","launchMass":"10","dryMass":"10","length":"0.5","diameter":"0.5","span":"0.5","shape":"Sphere"},{"tle1":"1 00012U 59001B 23102.10452989 .00002633 00000+0 15673-2 0 9991","tle2":"2 00012 32.9014 350.5476 1660406 86.2571 292.5454 11.45391638397850","payload":"GRC 33-KS-2800 175-15-21","Mass":"195","vmag":6.5,"status":"In Orbit","launchDate":"1959 Feb 17","owner":"BSC","country":"US","manufacturer":"GCR","bus":"33-KS-2800","launchMass":"195","dryMass":"22","length":"1.5","diameter":"0.7","span":"1.5","shape":"Cyl","name":"VANGUARD R/B","launchSite":"AFETR","launchVehicle":"U","type":2,"rcs":"0.5266"},{"tle1":"1 00016U 58002A 23102.24264491 .00000023 00000+0 39726-5 0 9998","tle2":"2 00016 34.2783 63.7306 2025681 255.9344 80.9042 10.48822741566857","payload":"GRC 33-KS-2800 144-79-22","Mass":"195","vmag":7,"status":"In Orbit","launchDate":"1958 Mar 17","owner":"NRL","country":"US","manufacturer":"GCR","bus":"33-KS-2800","launchMass":"195","dryMass":"22","length":"1.5","diameter":"0.7","span":"1.5","shape":"Cyl","name":"VANGUARD R/B","launchSite":"AFETR","launchVehicle":"U","type":2,"rcs":"0.2282"},{"tle1":"1 00020U 59007A 23102.46762352 .00003540 00000+0 14326-2 0 9995","tle2":"2 00020 33.3469 114.0738 1659263 328.5202 22.5716 11.57283969349718","payload":"Magne-Ray satellite","Mass":"23","vmag":7,"status":"Attached in Orbit","launchDate":"1959 Sep 18","owner":"GSFC","country":"US","manufacturer":"NRL","bus":"NRL 20\"","launchMass":"23","dryMass":"23","length":"1.2","diameter":"0.5","span":"1.2","shape":"Sphere + Ant","name":"VANGUARD 3","launchSite":"AFETR","launchVehicle":"U","type":1,"rcs":"0.6412"},{"tle1":"1 00022U 59009A 23102.83836663 .00005260 00000+0 37193-3 0 9996","tle2":"2 00022 50.2818 302.6617 0128350 239.4768 119.3460 14.99973922379472","payload":"NASA S-1A","Mass":"41","vmag":7.5,"name":"EXPLORER 7","country":"US","launchSite":"AFETR","launchVehicle":"U","launchDate":"1959 Oct 13","type":1,"rcs":"0.5003","status":"In Orbit","owner":"GSFC","manufacturer":"ABMA","bus":"S-1","launchMass":"41","dryMass":"41","length":"0.8","diameter":"0.8","span":"7.0","shape":"DCone + 2 Ant"}]

0 commit comments

Comments
 (0)