Merge remote-tracking branch 'origin/main' into models/three-km-true-size

This commit is contained in:
Sameh Khamis committed 2026-11-17 16:06:36 -08:00
commit 1f9d88ca1a
99 files changed
+524 -155

No files matched your search

@@ -0,0 +1,5 @@
- Ship the fleet models with named parts: rotors, propellers, landing gear and
doors on every aircraft, helicopter, vessel, ground vehicle and transit
model, so renderers that draw model part state can spin, pose or highlight
them. Stowed gear and closed doors are built hidden, so models look as
before without it (samehkhamis, #1789).
@@ -0,0 +1,3 @@
- Let AIS vessels turn on and off again when their feed fails; the live
position load no longer passes the poll's answer to `enable()`
(samehkhamis, #1790).
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+194
View File
@@ -2033,5 +2033,199 @@
"monorail": 6.0,
"gondola": 20.0
}
},
"rockets": {
"configurations": {
"Falcon 9": [
"falcon9",
70.0
],
"Falcon 9 Block 5": [
"falcon9",
70.0
],
"Falcon 9 v1.2": [
"falcon9",
70.0
],
"Falcon Heavy": [
"falcon_heavy",
70.0
],
"Starship": [
"starship",
123.3
],
"Starship V2": [
"starship",
123.3
],
"Starship V3": [
"starship",
124.4
],
"Electron": [
"electron",
18.0
],
"New Glenn": [
"new_glenn",
98.0
],
"Ariane 62": [
"ariane62",
56.0
],
"Ariane 64": [
"ariane64",
62.0
],
"Soyuz 2.1a": [
"soyuz",
46.3
],
"Soyuz 2.1b": [
"soyuz",
46.3
],
"Soyuz-2.1a": [
"soyuz",
46.3
],
"Soyuz-2.1b": [
"soyuz",
46.3
],
"Soyuz-FG": [
"soyuz",
46.3
],
"Soyuz ST-B": [
"soyuz",
46.3
],
"Soyuz 2.1v": [
"generic_medium",
44.0
],
"Long March 5": [
"long_march5",
57.0
],
"Long March 5B": [
"long_march5",
53.7
],
"Space Launch System (SLS)": [
"sls",
98.1
],
"SLS Block 1": [
"sls",
98.1
],
"SLS Block 1B": [
"sls",
111.3
],
"H3": [
"h3",
57.0
],
"H3-22": [
"h3",
57.0
],
"H3-24": [
"h3",
57.0
],
"H3-30": [
"h3",
57.0
],
"Vulcan": [
"vulcan",
61.6
],
"Vulcan VC0S": [
"vulcan",
61.6
],
"Vulcan VC2S": [
"vulcan",
61.6
],
"Vulcan VC4L": [
"vulcan",
67.3
],
"Vulcan VC6L": [
"vulcan",
67.3
]
},
"families": {
"Falcon": [
"falcon9",
70.0
],
"Starship": [
"starship",
123.3
],
"Electron": [
"electron",
18.0
],
"New Glenn": [
"new_glenn",
98.0
],
"Ariane": [
"ariane62",
56.0
],
"Soyuz": [
"soyuz",
46.3
],
"Long March 5": [
"long_march5",
57.0
],
"SLS": [
"sls",
98.1
],
"H3": [
"h3",
57.0
],
"Vulcan": [
"vulcan",
61.6
]
},
"classes": [
{
"max_leo_kg": 2000,
"model": "generic_small",
"height": 20.0
},
{
"max_leo_kg": 20000,
"model": "generic_medium",
"height": 50.0
},
{
"model": "generic_heavy",
"height": 70.0
}
],
"default_rocket": [
"generic_medium",
50.0
]
}
}
+30
View File
@@ -1461,6 +1461,36 @@ test('enable owns one grace timer and disable/re-enable starts a new session', a
}
});
test('the layer turns on and off when its feed fails', async () => {
const harness = installWireHarness(undefined, { enabled: false });
const priorFetch = globalThis.fetch;
const priorWarn = console.warn;
const clock = makeFakeAisRuntime();
_setAisRuntimeForTest(clock.runtime);
globalThis.fetch = async () => ({
ok: false,
status: 503,
json: async () => ({
status: 'missing-key',
error: 'AISSTREAM_API_KEY is not set',
}),
});
console.warn = () => {};
try {
// Turning it on succeeds; the failure is shown on the layer.
assert.notEqual(await aisLiveVesselsLayer.enable(harness.viewer), false);
const feed = _getVesselFeedStateForTest();
assert.equal(feed.status, 'unavailable');
assert.equal(feed.error, 'AISSTREAM_API_KEY not set');
assert.notEqual(aisLiveVesselsLayer.disable(), false);
} finally {
globalThis.fetch = priorFetch;
console.warn = priorWarn;
harness.cleanup();
_setAisRuntimeForTest();
}
});
test('vessel trail lifecycle: deselect clears the selected-vessel trail', () => {
const harness = installWireHarness(undefined);
try {
+17 -2
View File
@@ -32,7 +32,22 @@ export function createIngestion({
// may still be set while it loads (see resumeLive).
let liveLoad = null;
async function loadLivePositions(viewer, { handover = false } = {}) {
/**
* Poll the live vessels (or take the live poll already out). Resolves
* when it is done, with nothing: a feed that fails is shown on the layer,
* and turning the layer on still succeeds.
* @param {object} viewer
* @returns {Promise<void>}
*/
async function loadLivePositions(viewer) {
await pollLive(viewer);
}
/**
* The live poll: resolves what loadPositions answers (false when it could
* not be had), or that of the live poll already out.
*/
async function pollLive(viewer, { handover = false } = {}) {
// Following the world clock, the layer shows the snapshots loadAt applies.
if (followsClock()) return false;
// Back at live, a snapshot at a time still loading no longer applies:
@@ -63,7 +78,7 @@ export function createIngestion({
* @returns {Promise<boolean>}
*/
async function resumeLive(viewer) {
const applied = await loadLivePositions(viewer || readViewer(), {
const applied = await pollLive(viewer || readViewer(), {
handover: true,
});
return applied === true;