mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-04 10:24:02 +00:00
Decode catalog numbers strictly and add the changelog fragment
Route tleCatalogNumber() and noradIdFromSatnum() through one decoder that accepts only plain digits or a valid Alpha-5 field. parseInt and Number() read '2554A', '255 4', '-1234', '0x1F0', '1.5' and blank as numbers; they now return null/NaN. Digit satnums of any length still decode, so OMM satrecs numbered past 99999 keep working. Add a layer test that several Alpha-5 satellites survive ingestion dedupe, the changelog fragment for #767, and note in CURRENT-STATE that this is Alpha-5 TLE compatibility and malformed fields are rejected.
This commit is contained in:
1 parent
6ae854c121
commit
7ec84ac316
5 files changed
+147
-34
No files matched your search
+25
-28
@@ -21,50 +21,47 @@ export function parseTleText(text) {
|
||||
return result;
|
||||
}
|
||||
|
||||
// Alpha-5: a letter A–Z, skipping I and O, then exactly four digits.
|
||||
const ALPHA5 = /^[A-HJ-NP-Z]\d{4}$/;
|
||||
const DIGITS = /^\d+$/;
|
||||
|
||||
/**
|
||||
* The catalog number an Alpha-5 field stands for, or null for any other field.
|
||||
* The catalog number a catalog field stands for, or null for any other field.
|
||||
*
|
||||
* Since the catalog passed 99999 (July 2026) a TLE writes the numbers above it
|
||||
* in Alpha-5: a letter A–Z, skipping I and O, stands for 10–33 in the
|
||||
* ten-thousands place, so 100000 is "A0000" and 339999 is "Z9999".
|
||||
* A field is either plain digits or Alpha-5, the TLE spelling of numbers above
|
||||
* 99999: the letter stands for 10–33 in the ten-thousands place, skipping I
|
||||
* and O, so 100000 is "A0000" and 339999 is "Z9999". Anything else (a sign, a
|
||||
* decimal point, hex, an embedded space, a lowercase or trailing letter) is
|
||||
* not a catalog number.
|
||||
* @param {string} field the field with any leading spaces already removed
|
||||
* @returns {number | null}
|
||||
*/
|
||||
function alpha5CatalogNumber(field) {
|
||||
function decodeCatalogField(field) {
|
||||
if (DIGITS.test(field)) return Number(field);
|
||||
if (!ALPHA5.test(field)) return null;
|
||||
const letter = field[0];
|
||||
if (
|
||||
letter >= 'A' &&
|
||||
letter <= 'Z' &&
|
||||
letter !== 'I' &&
|
||||
letter !== 'O' &&
|
||||
/^\d{4}$/.test(field.slice(1))
|
||||
) {
|
||||
let tens = letter.charCodeAt(0) - 65 + 10;
|
||||
if (letter > 'I') tens -= 1;
|
||||
if (letter > 'O') tens -= 1;
|
||||
return tens * 10000 + Number(field.slice(1));
|
||||
}
|
||||
return null;
|
||||
let tens = letter.charCodeAt(0) - 65 + 10;
|
||||
if (letter > 'I') tens -= 1;
|
||||
if (letter > 'O') tens -= 1;
|
||||
return tens * 10000 + Number(field.slice(1));
|
||||
}
|
||||
|
||||
/**
|
||||
* NORAD catalog number of a satrec as a number.
|
||||
* NORAD catalog number of a satrec as a number, or NaN.
|
||||
*
|
||||
* satellite.js keeps the TLE's five-character field verbatim in
|
||||
* `satrec.satnum`, and `Number("A0000")` is NaN, so every Alpha-5 satellite
|
||||
* would share one NaN key. An Alpha-5 field decodes to its number; a
|
||||
* five-digit field is unchanged; anything else stays NaN.
|
||||
* would share one NaN key. Digits of any length (an OMM satrec carries the
|
||||
* number unpadded) and Alpha-5 decode; anything else, blank included, is NaN.
|
||||
* @param {string} satnum
|
||||
* @returns {number}
|
||||
*/
|
||||
export function noradIdFromSatnum(satnum) {
|
||||
const field = String(satnum ?? '').trim();
|
||||
return alpha5CatalogNumber(field) ?? Number(field);
|
||||
return decodeCatalogField(String(satnum ?? '').trim()) ?? Number.NaN;
|
||||
}
|
||||
|
||||
/** The NORAD catalog number from TLE line 1, or null. */
|
||||
/** The NORAD catalog number from TLE line 1 (columns 3–7), or null. */
|
||||
export function tleCatalogNumber(line1) {
|
||||
const field = String(line1).slice(2, 7);
|
||||
const alpha5 = alpha5CatalogNumber(field);
|
||||
if (alpha5 !== null) return alpha5;
|
||||
const number = Number.parseInt(field, 10);
|
||||
return Number.isInteger(number) ? number : null;
|
||||
return decodeCatalogField(field.replace(/^ +/, ''));
|
||||
}
|
||||
Reference in new issue
Block a user