Stop scene attachments of Bhote Koshi, GhostMaps, cables and infrastructure waiting once their scene is released

This commit is contained in:
German Khokhlov committed 2026-11-03 15:23:21 +04:00
1 parent cf6d04b7db
commit 9cc34e324f
7 files changed
+209 -14

No files matched your search

+30 -4
View File
@@ -1,3 +1,4 @@
import { waitForSignal } from '../sources/requestDeadline.js';
import * as Cesium from 'cesium';
import { isPointerFree } from './inputOwnership.js';
import {
@@ -3521,10 +3522,19 @@ export function createBhoteKoshiEventLayer({
// the release that follows it owns whatever it had already created.
let _attachGeneration = 0;
// Settle when `promise` does, or as soon as the scene signal aborts. The
// promise keeps running; the stale checks then ignore what it brings.
function untilSceneReleased(promise, signal) {
return waitForSignal(promise, signal).catch((error) => {
if (!signal?.aborted) throw error;
});
}
async function attachRenderer(viewer, { engine = null, signal = null } = {}) {
const generation = ++_attachGeneration;
const current = () =>
generation === _attachGeneration && signal?.aborted !== true;
const stack = _mapStackController;
_viewer = viewer;
_engine = engine;
if (!_viewer && _engine) _native = createNativeRenderer(engine);
@@ -3539,10 +3549,13 @@ export function createBhoteKoshiEventLayer({
? 'preserve'
: 'esri',
});
await _comparisonLease.ready;
// The incoming map can take long to switch; a released scene stops
// waiting (its release returns the lease).
await untilSceneReleased(_comparisonLease.ready, signal);
if (!current()) return;
}
await createImagery(_event, current);
// createImagery checks `current` itself before it adds anything.
await untilSceneReleased(createImagery(_event, current), signal);
if (!current()) return;
if (_floodDataSource) {
if (_native) _nativeFlood = _native.draw(_floodDataSource);
@@ -3552,8 +3565,21 @@ export function createBhoteKoshiEventLayer({
registerDynamicCredit(engine ?? viewer, BHOTE_KOSHI_CREDIT);
_scenePathPositionCache.clear();
_lastCinematicProgress = null;
await syncTerrainComparison();
if (!current()) return;
const terrain = syncTerrainComparison();
await untilSceneReleased(terrain, signal);
if (!current()) {
// The release already cleared the comparison terrain; one this
// attachment set afterwards is removed when it lands, unless a newer
// attachment owns the same map stack again.
terrain.then(
() => {
if (stack && stack !== _mapStackController)
stack.clearTerrainComparison?.();
},
() => {},
);
return;
}
createSplitControl(_event);
syncPresentationMode();
attachCameraInputRelease();
+46
View File
@@ -3051,3 +3051,49 @@ for (const stop of ['detach', 'scene-abort']) {
}
});
}
test('Bhote Koshi stops waiting for a stalled map switch when its scene is released', async () => {
const event = JSON.parse(await readFile(eventUrl, 'utf8'));
const originalDocument = globalThis.document;
const originalWindow = globalThis.window;
installEventDom();
globalThis.window = { setTimeout: () => 1, clearTimeout() {} };
const first = eventViewer();
const second = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
embeddedMediaFactory: () => ({ show() {}, hide() {}, pause() {}, destroy() {} }),
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
renderHost: { request() {}, hold() {}, release() {} },
});
layer.attachMapStackController({
getActiveId: () => 'esri-imagery',
getSwitchGeneration: () => 1,
async setStack() {},
});
const manager = new LayerLifecycle(first);
manager.register(layer);
try {
assert.equal(await manager.setEnabled(layer.id, true, { origin: 'local-restore' }), true);
await layer.detachRenderer();
// The incoming map's switch to Esri never finishes; restoring returns.
let active = 'photoreal';
layer.attachMapStackController({
getActiveId: () => active,
getSwitchGeneration: () => 1,
setStack: (id) => (id === 'esri-imagery' ? new Promise(() => {}) : Promise.resolve()),
});
const scene = new AbortController();
const attaching = layer.attachRenderer(second, { signal: scene.signal });
scene.abort();
await attaching;
await layer.detachRenderer();
assert.deepEqual(second._test.imagery, []);
assert.deepEqual(second._test.dataSources, []);
} finally {
await manager.destroyLayer(layer.id);
globalThis.document = originalDocument;
globalThis.window = originalWindow;
}
});