Skip to content

Commit 29b2d87

Browse files
authored
Merge pull request #998 from thkruz/develop
Develop
2 parents 537ef6a + 80b7053 commit 29b2d87

File tree

5 files changed

+28
-20
lines changed

5 files changed

+28
-20
lines changed

package-lock.json

+16-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
"material-icons": "^1.13.12",
160160
"new-github-issue-url": "^1.0.0",
161161
"numeric": "^1.2.6",
162-
"ootk": "^4.0.2",
162+
"ootk": "^4.0.3",
163163
"resizable": "^1.2.1",
164164
"uuid": "^9.0.1",
165165
"webgl-obj-loader": "^2.0.8"

src/settings/settings.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1039,8 +1039,8 @@ export class SettingsManager {
10391039
externalTLEsOnly = false;
10401040
positionCruncher: Worker = null;
10411041
orbitCruncher: Worker = null;
1042-
/** Enables the camera widget */
1043-
drawCameraWidget = true;
1042+
/** Disables the camera widget by default */
1043+
drawCameraWidget = false;
10441044

10451045
loadPersistedSettings() {
10461046
const isShowNotionalSatsString = PersistenceManager.getInstance().getItem(StorageKey.SETTINGS_NOTIONAL_SATS);

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 = 'December 12, 2024';
2+
export const VERSION_DATE = 'January 9, 2025';

src/static/catalog-loader.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,6 @@ export class CatalogLoader {
700700
const intlDes = CatalogLoader.parseIntlDes_(resp[i].TLE1);
701701

702702
resp[i].intlDes = intlDes;
703-
catalogManagerInstance.sccIndex[`${resp[i].sccNum}`] = i;
704-
catalogManagerInstance.cosparIndex[`${resp[i].intlDes}`] = i;
705703
resp[i].active = true;
706704
if (!settingsManager.isDebrisOnly || (settingsManager.isDebrisOnly && (resp[i].type === 2 || resp[i].type === 3))) {
707705
resp[i].id = tempObjData.length;
@@ -733,6 +731,8 @@ export class CatalogLoader {
733731
rcs = resp[i].rcs && !isNaN(parseFloat(resp[i].rcs)) ? parseFloat(resp[i].rcs) : rcs ?? null;
734732

735733
// Never fail just because of one bad satellite
734+
let isAddedToCatalog = false;
735+
736736
try {
737737
const satellite = new DetailedSatellite({
738738
id: tempObjData.length,
@@ -743,9 +743,15 @@ export class CatalogLoader {
743743
});
744744

745745
tempObjData.push(satellite);
746+
isAddedToCatalog = true;
746747
} catch (e) {
747748
errorManagerInstance.log(e);
748749
}
750+
751+
if (isAddedToCatalog) {
752+
catalogManagerInstance.sccIndex[`${resp[i].sccNum}`] = tempObjData.length - 1;
753+
catalogManagerInstance.cosparIndex[`${resp[i].intlDes}`] = tempObjData.length - 1;
754+
}
749755
}
750756

751757
if (settingsManager.isNotionalDebris && resp[i].type === 3) {

0 commit comments

Comments
 (0)