From df0fcb5d376f3c38e655a1afbb383889d019306d Mon Sep 17 00:00:00 2001 From: Theodore Kruczek Date: Thu, 9 Jan 2025 11:27:03 -0500 Subject: [PATCH 1/5] fix: :ambulance: fix single bad TLE breaking sccIndex and cosparIndex --- src/static/catalog-loader.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/static/catalog-loader.ts b/src/static/catalog-loader.ts index 53e45e3c..dd66f837 100644 --- a/src/static/catalog-loader.ts +++ b/src/static/catalog-loader.ts @@ -700,8 +700,6 @@ export class CatalogLoader { const intlDes = CatalogLoader.parseIntlDes_(resp[i].TLE1); resp[i].intlDes = intlDes; - catalogManagerInstance.sccIndex[`${resp[i].sccNum}`] = i; - catalogManagerInstance.cosparIndex[`${resp[i].intlDes}`] = i; resp[i].active = true; if (!settingsManager.isDebrisOnly || (settingsManager.isDebrisOnly && (resp[i].type === 2 || resp[i].type === 3))) { resp[i].id = tempObjData.length; @@ -733,6 +731,8 @@ export class CatalogLoader { rcs = resp[i].rcs && !isNaN(parseFloat(resp[i].rcs)) ? parseFloat(resp[i].rcs) : rcs ?? null; // Never fail just because of one bad satellite + let isAddedToCatalog = false; + try { const satellite = new DetailedSatellite({ id: tempObjData.length, @@ -743,9 +743,15 @@ export class CatalogLoader { }); tempObjData.push(satellite); + isAddedToCatalog = true; } catch (e) { errorManagerInstance.log(e); } + + if (isAddedToCatalog) { + catalogManagerInstance.sccIndex[`${resp[i].sccNum}`] = tempObjData.length - 1; + catalogManagerInstance.cosparIndex[`${resp[i].intlDes}`] = tempObjData.length - 1; + } } if (settingsManager.isNotionalDebris && resp[i].type === 3) { From 3db1475090bb15b78a4bd8e5039757c35d130a6f Mon Sep 17 00:00:00 2001 From: Theodore Kruczek Date: Thu, 9 Jan 2025 11:28:44 -0500 Subject: [PATCH 2/5] fix: :arrow_up: bump ootk to fix leap year errors --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index a74d33b4..e04556cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "material-icons": "^1.13.12", "new-github-issue-url": "^1.0.0", "numeric": "^1.2.6", - "ootk": "^4.0.2", + "ootk": "^4.0.3", "resizable": "^1.2.1", "uuid": "^9.0.1", "webgl-obj-loader": "^2.0.8" @@ -13098,18 +13098,18 @@ } }, "node_modules/ootk": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/ootk/-/ootk-4.0.2.tgz", - "integrity": "sha512-XXbphQ+XfVUuaLO7GKI3erHrrQd1Up3I7Wc5D9JHTLP8W/Ki7FY1DeUMFidbJ2U6h/QMn9uspuLx+HvX8KBIkw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/ootk/-/ootk-4.0.3.tgz", + "integrity": "sha512-F7GAO0BxK5urlFgVYGNWDdYFBGrnLg4lWTjdMmMzZ9wVYN7DxTVuOY/dkt/fWEqaG9vh9tP+pbyoyuSYuuOYDw==", "license": "APGL-3.0", "dependencies": { - "ootk-core": "^1.2.4" + "ootk-core": "^1.2.6" } }, "node_modules/ootk-core": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/ootk-core/-/ootk-core-1.2.4.tgz", - "integrity": "sha512-AykpA8qta0vhXoHJry/ebNJlZSP7jiTHlq/5FJ4yLKMww2iQ2LftZm8kAdwkjnO4tp1CpeWn84cknXBgh1m6tg==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/ootk-core/-/ootk-core-1.2.6.tgz", + "integrity": "sha512-gLT/7FNvIOYRg9TT9RUKpaIuh3RnXUcRcec6NKn+g6+QkGauB1nFC3j7e2+sBjmEM9k/Hi3nqmoEaa2+arcPgQ==", "license": "MIT" }, "node_modules/opener": { diff --git a/package.json b/package.json index d030ea2a..ed46f9c6 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "material-icons": "^1.13.12", "new-github-issue-url": "^1.0.0", "numeric": "^1.2.6", - "ootk": "^4.0.2", + "ootk": "^4.0.3", "resizable": "^1.2.1", "uuid": "^9.0.1", "webgl-obj-loader": "^2.0.8" From 670f57d440da442714d460a76eb4c40cccd5425d Mon Sep 17 00:00:00 2001 From: Theodore Kruczek Date: Thu, 9 Jan 2025 11:34:02 -0500 Subject: [PATCH 3/5] fix: :lock: fix security issues in dependencies --- package-lock.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e04556cb..f6717451 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6355,10 +6355,11 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -12845,9 +12846,9 @@ "integrity": "sha512-xT72r2GVIzWJF1zT8Oa9GlL1+QYmo0pfZwxT1hmsBWljP1D5I8t2NeLD+3QKM7uYhrMVxGF76MLfOSp3Vn3F8g==" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -12855,6 +12856,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, From d5c187e3747bf1d1292c9d5c2bfc13a1f97f4123 Mon Sep 17 00:00:00 2001 From: Theodore Kruczek Date: Thu, 9 Jan 2025 11:34:52 -0500 Subject: [PATCH 4/5] chore: :memo: update version date --- src/settings/versionDate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/versionDate.js b/src/settings/versionDate.js index e2eac3f8..a9f09e06 100644 --- a/src/settings/versionDate.js +++ b/src/settings/versionDate.js @@ -1,2 +1,2 @@ // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -export const VERSION_DATE = 'December 12, 2024'; +export const VERSION_DATE = 'January 9, 2025'; From 80b7053be687577f5817d521cca09792610688b7 Mon Sep 17 00:00:00 2001 From: Theodore Kruczek Date: Thu, 9 Jan 2025 11:37:20 -0500 Subject: [PATCH 5/5] fix: :zap: disable the camera widget by default since it is for a small number of users --- src/settings/settings.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/settings.ts b/src/settings/settings.ts index 0bfab9a0..0e971cb9 100644 --- a/src/settings/settings.ts +++ b/src/settings/settings.ts @@ -1039,8 +1039,8 @@ export class SettingsManager { externalTLEsOnly = false; positionCruncher: Worker = null; orbitCruncher: Worker = null; - /** Enables the camera widget */ - drawCameraWidget = true; + /** Disables the camera widget by default */ + drawCameraWidget = false; loadPersistedSettings() { const isShowNotionalSatsString = PersistenceManager.getInstance().getItem(StorageKey.SETTINGS_NOTIONAL_SATS);