Preserve cyclone bulletins, forecast geometry and storm selection across engines

This commit is contained in:
German Khokhlov committed 2026-11-03 03:21:58 +04:00
1 parent cb350fa58d
commit 868d061856
10 files changed
+394 -65

No files matched your search

+49 -25
View File
@@ -69,11 +69,13 @@ export function createCyclonesLayer({
overlayHost,
cesium = Cesium,
createRendering = createCycloneRendering,
createNativeRendering = null,
matchMedia = globalThis.matchMedia?.bind(globalThis),
openLink = (url) => globalThis.open?.(url, '_blank', 'noopener,noreferrer'),
} = {}) {
if (typeof feed?.getSnapshot !== 'function')
throw new TypeError('Cyclones require a snapshot source');
let engine = null;
let viewer = null,
rendering = null,
snapshot = null,
@@ -106,17 +108,11 @@ export function createCyclonesLayer({
(typeof cesium.Cesium3DTileset === 'function' &&
picked.primitive instanceof cesium.Cesium3DTileset)));
function installSelection() {
if (
clickHandler ||
!viewer?.scene?.canvas ||
typeof cesium.ScreenSpaceEventHandler !== 'function'
)
return;
const owner = new cesium.ScreenSpaceEventHandler(viewer.scene.canvas);
const canvas = engine?.host.canvas ?? viewer?.scene?.canvas;
const native = engine?.kind === 'navara';
if (clickHandler || !canvas || (!native && typeof cesium.ScreenSpaceEventHandler !== 'function')) return;
const owner = native ? {} : new cesium.ScreenSpaceEventHandler(canvas);
clickHandler = owner;
// Snapshot before sibling bubble listeners can rebuild the overlay hit
// rectangles. A vessel selection does that synchronously in the same click.
const canvas = viewer.scene.canvas;
let capturedHit = null;
const overlayHit = (x, y) => {
const hit = hitTestOverlay(x, y);
@@ -154,7 +150,7 @@ export function createCyclonesLayer({
canvas.removeEventListener?.(type, resetCapture, { capture: true });
capturedHit = null;
};
owner.setInputAction((click) => {
const onClick = (click) => {
const nativeHit = capturedHit;
capturedHit = null;
// Ambient selection yields to draw tools and Director; it never claims
@@ -184,11 +180,13 @@ export function createCyclonesLayer({
if (id) layer.setParams({ stormId: id });
return;
}
const picked = viewer.scene.pick(click.position);
const picked = native ? click.picked : viewer.scene.pick(click.position);
const id = rendering?.pickStorm(picked);
if (id) layer.setParams({ stormId: id });
else if (isSurfacePick(picked)) layer.setParams({ clear: true });
}, cesium.ScreenSpaceEventType.LEFT_CLICK);
};
if (native) owner.destroy = engine.input.on('click', onClick, { pick: true });
else owner.setInputAction(onClick, cesium.ScreenSpaceEventType.LEFT_CLICK);
}
function removeSelection() {
const owner = clickHandler;
@@ -203,9 +201,32 @@ export function createCyclonesLayer({
icon: '◉',
source: 'NOAA NHC / CPHC',
updateInterval: 300_000,
init(nextViewer) {
init(nextViewer, options = {}) {
if (nextViewer || options.engine) return layer.attachRenderer(nextViewer, options);
},
attachRenderer(nextViewer, options = {}) {
viewer = nextViewer;
rendering = createRendering({ viewer, cesium, overlayHost });
engine = options.engine ?? null;
rendering = engine?.kind === 'navara'
? createNativeRendering(engine, { overlayHost })
: createRendering({ viewer, cesium, overlayHost });
if (!enabled) return;
installSelection();
if (snapshot && !snapshot.unavailable) {
const active = rendering;
return Promise.resolve(active.setSnapshot(snapshot)).then(() => {
if (active === rendering) active.setSelection(selectedId);
});
}
},
detachRenderer() {
removeSelection();
++navigationGeneration;
rendering?.destroy();
rendering = null;
viewer = null;
engine = null;
runNavigation = null;
},
attachShellServices(services) {
runNavigation =
@@ -255,16 +276,19 @@ export function createCyclonesLayer({
return false;
if (next.unavailable) {
// An expired advisory must not remain presented as current hazard context.
rendering.clear();
rendering?.clear();
snapshot = next;
selectedId = null;
++navigationGeneration;
error = next.reason || ADVISORIES_UNAVAILABLE;
return true;
}
const applied = await rendering.setSnapshot(next, {
signal: controller.signal,
});
let applied = true;
let display;
do {
display = rendering;
applied = display ? await display.setSnapshot(next, { signal: controller.signal }) : true;
} while (display !== rendering && enabled && !controller.signal.aborted && request === controller);
if (
!applied ||
!enabled ||
@@ -280,7 +304,7 @@ export function createCyclonesLayer({
? null
: snapshot.storms[0]?.id || null,
);
else rendering.setSelection(selectedId);
else rendering?.setSelection(selectedId);
return true;
} catch (cause) {
if (controller.signal.aborted || request !== controller) return false;
@@ -316,7 +340,7 @@ export function createCyclonesLayer({
}
const storm = selected();
if (params.focus === true && storm && runNavigation) {
const sphere = rendering.getFocusSphere(storm.id);
const sphere = rendering?.getFocusSphere(storm.id);
if (sphere) {
const generation = ++navigationGeneration;
runNavigation(() => {
@@ -327,7 +351,9 @@ export function createCyclonesLayer({
selectedId !== storm.id
)
return;
return viewer.camera.flyToBoundingSphere(sphere, {
const fly = engine ? engine.camera.flyToSphere.bind(engine.camera) :
viewer.camera.flyToBoundingSphere.bind(viewer.camera);
return fly(sphere, {
duration: matchMedia?.('(prefers-reduced-motion: reduce)')
?.matches
? 0
@@ -530,9 +556,7 @@ export function createCyclonesLayer({
if (destroyed) return;
layer.disable();
destroyed = true;
rendering?.destroy();
rendering = null;
viewer = null;
layer.detachRenderer();
listener = null;
runNavigation = null;
},