From fbc40ef3b6ce6462a5b2b1473d30bd92659975c5 Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Sat, 14 Nov 2026 01:17:08 -0800 Subject: [PATCH] fix(earthquakes, cyclones): an item that goes takes its double-click follow with it Removing a followed entity ended the default renderer's follow. A disc gone from the feed, or a storm point gone from the advisory (or a cleared one), now ends it too. --- src/data/stockFollow.js | 12 +++++++++++- src/layers/cyclones/index.js | 5 +++++ src/layers/cyclones/rendering.js | 7 +++++++ src/layers/cyclones/rendering.test.mjs | 4 ++++ src/layers/earthquakes/index.js | 4 ++++ src/layers/earthquakes/ownership.test.mjs | 16 +++++++++++++++- 6 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/data/stockFollow.js b/src/data/stockFollow.js index 42e1c1df8..9abfe6d09 100644 --- a/src/data/stockFollow.js +++ b/src/data/stockFollow.js @@ -100,7 +100,8 @@ export function followViewFrom(sphere, at, camera) { * radius 0 by default, and the holder whose entity record shows it, as * `entityFollowTarget` reads one), or zoomed to (`zoomTo`); null for * anything else. - * @returns {{readonly following: object|null, stop(): void, destroy(): void}} + * @returns {{readonly following: object|null, retain(drawn: (key: string) => boolean): void, + * stop(): void, destroy(): void}} */ export function followOnDoubleClick({ viewer, @@ -160,6 +161,15 @@ export function followOnDoubleClick({ get following() { return follow && findCamera(viewer)?.followed === follow ? follow : null; }, + /** + * Stop a follow this started of something no longer drawn, as removing + * an entity ended the default renderer's follow of it. + * @param {(key: string) => boolean} drawn Whether the item keyed so is. + */ + retain(drawn) { + const key = this.following?.key; + if (key && !drawn(key)) this.stop(); + }, /** Stop a follow this started, if the camera still keeps it. */ stop() { const camera = findCamera(viewer); diff --git a/src/layers/cyclones/index.js b/src/layers/cyclones/index.js index 4beb19532..c6994bcac 100644 --- a/src/layers/cyclones/index.js +++ b/src/layers/cyclones/index.js @@ -240,6 +240,7 @@ export function createCyclonesLayer({ enabled: () => enabled && !destroyed && selectionOwner === owner, targetFor: (hit) => rendering?.followTargetFor?.(hit) ?? null, }); + owner.follow = follow; owner.unsubscribe = () => { unsubscribe(); follow.destroy(); @@ -312,6 +313,7 @@ export function createCyclonesLayer({ if (next.unavailable) { // An expired advisory must not remain presented as current hazard context. rendering.clear(); + selectionOwner?.follow?.stop(); snapshot = next; selectedId = null; ++navigationGeneration; @@ -331,6 +333,8 @@ export function createCyclonesLayer({ return false; snapshot = next; error = null; + // A storm point no longer in the advisory takes its follow with it. + selectionOwner?.follow?.retain((key) => rendering.drawsFollowKey(key)); if (!snapshot.storms.some((storm) => storm.id === selectedId)) select( selectionIntent === 'cleared' @@ -348,6 +352,7 @@ export function createCyclonesLayer({ error = cause?.message || ADVISORIES_UNAVAILABLE; // Failed acquisition has no bounded last-good age guarantee at this layer. rendering?.clear(); + selectionOwner?.follow?.stop(); snapshot = null; selectedId = null; ++navigationGeneration; diff --git a/src/layers/cyclones/rendering.js b/src/layers/cyclones/rendering.js index e7a10b091..b82907e3a 100644 --- a/src/layers/cyclones/rendering.js +++ b/src/layers/cyclones/rendering.js @@ -269,6 +269,13 @@ export function createCycloneRendering({ viewer, overlayHost }) { const at = place.at; return { key: `${hit.set}:${hit.id}`, position: () => ({ ...at }) }; }, + /** Whether the item a follow's key (`:`) names is drawn now. */ + drawsFollowKey(key) { + for (const set of setIds) + if (key.startsWith(`${set}:`)) + return committed && itemPlaces.has(key.slice(set.length + 1)); + return false; + }, getFocusSphere(id) { return spheres.get(id) || null; }, diff --git a/src/layers/cyclones/rendering.test.mjs b/src/layers/cyclones/rendering.test.mjs index 29b8f84e3..7423575ec 100644 --- a/src/layers/cyclones/rendering.test.mjs +++ b/src/layers/cyclones/rendering.test.mjs @@ -480,7 +480,11 @@ test('a double-click follows a storm’s points and zooms to its tracks and cone }), null, ); + const key = `${h.sets.points.spec.id}:cyclone:ep152026:center`; + assert.equal(h.rendering.drawsFollowKey(key), true); + assert.equal(h.rendering.drawsFollowKey(`other:points:x`), false); h.rendering.clear(); + assert.equal(h.rendering.drawsFollowKey(key), false, 'cleared: not drawn'); assert.equal( h.rendering.followTargetFor(h.hit('points', 'cyclone:ep152026:center')), null, diff --git a/src/layers/earthquakes/index.js b/src/layers/earthquakes/index.js index 6a601aa44..5bcb86f24 100644 --- a/src/layers/earthquakes/index.js +++ b/src/layers/earthquakes/index.js @@ -181,6 +181,10 @@ export function createEarthquakesLayer({ _discs.set(nextDiscs); _discsById = nextById; + // A disc no longer reported takes its follow with it. + _stockFollow?.retain((key) => + _discsById.has(key.slice(_discs.id.length + 1)), + ); _events = nextEvents; if (_enabled) { overlayHost.setEntries( diff --git a/src/layers/earthquakes/ownership.test.mjs b/src/layers/earthquakes/ownership.test.mjs index 5c8a133b9..38962de69 100644 --- a/src/layers/earthquakes/ownership.test.mjs +++ b/src/layers/earthquakes/ownership.test.mjs @@ -178,9 +178,10 @@ test('a double-click follows a disc, framed to fit it, as its entity was', async const viewer = { isDestroyed: () => false }; const unbind = bindRenderer(viewer, renderer); const layer = createEarthquakesLayer({ - source: { getSnapshot: async () => [row] }, + source: { getSnapshot: async () => rows }, overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} }, }); + let rows = [row]; t.after(() => { layer.destroy(viewer); unbind(); @@ -203,6 +204,19 @@ test('a double-click follows a disc, framed to fit it, as its entity was', async const p = followed.position(0); const lon = (Math.atan2(p.y, p.x) * 180) / Math.PI; assert.ok(Math.abs(lon - row.lon) < 1e-9, String(lon)); + await layer.update(viewer); + assert.ok(renderer.camera.followed, 'still reported: still followed'); + rows = [{ ...row, stableId: 'event-b', usgsId: 'event-b' }]; + await layer.update(viewer); + assert.equal( + renderer.camera.followed, + null, + 'gone from the feed: not followed', + ); + rows = [row]; + await layer.update(viewer); + renderer.testing.pointer('dblclick', 10, 10); + assert.ok(renderer.camera.followed); layer.disable(viewer); assert.equal(renderer.camera.followed, null, 'hiding the layer stops it'); });