mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-18 01:02:23 +00:00
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.
This commit is contained in:
1 parent
def2e1ecca
commit
fbc40ef3b6
6 files changed
+46
-2
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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 (`<set>:<item>`) 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;
|
||||
},
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in new issue
Block a user