mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 09:42:21 +00:00
Review fixes for #1781: - One rule for cards: the world-overlay host hands its hit test to the pick registry, and every click handler reads the topmost interactive card or label once per click (`clickCard`, `isUnderOtherCard` in src/data/pickRegistry.js), so all handlers agree in any listener order. A layer whose own card or label is on top acts on it whatever is drawn under it; a layer under another layer's card neither acts nor treats the click as empty space (a tracked aircraft stays tracked, a selection stays selected); Context names nothing under a card. A selected news card over a vessel no longer opens the link and selects the vessel. - With one rule, the per-owner arbitration options are no longer read and are removed: `passive`, `expanded` and `declinesClick` pick owners, `rememberClickPickActions`, `isActedOnByOtherLayer`, card backgrounds and `cardKeepsClick`. The dispatcher is unchanged from main. - A drag that ends on a quake disc, label or card does nothing; opening the USGS page or clearing the selection needs a clean click. - A click on the map under another layer's card opens no Street Level ground image. - A CCTV card that is going away is still not the scene under it. - Docs and changelog describe the new rule.
69 lines
2.3 KiB
JavaScript
69 lines
2.3 KiB
JavaScript
import test from 'node:test';
|
|
import assert from 'node:assert/strict';
|
|
import { createSelection } from './selection.js';
|
|
import { fakeInput } from '../../input/testDoubles.mjs';
|
|
import { setClickCardHitTest } from '../../data/pickRegistry.js';
|
|
|
|
/** A station layer's selection on a viewer whose pick is scripted. */
|
|
function harness(t) {
|
|
const previousDocument = globalThis.document;
|
|
globalThis.document = new EventTarget();
|
|
let picked = null;
|
|
const viewer = { scene: { canvas: new EventTarget(), pick: () => picked } };
|
|
const input = fakeInput(viewer);
|
|
const noop = () => {};
|
|
const state = {
|
|
_selectedKey: null,
|
|
_clickSubscription: null,
|
|
_stationRenderMap: new Map([['nyc:1', { position: { x: 1, y: 0, z: 0 } }]]),
|
|
_stationSet: { id: 'bikeshare:stations', upsert: noop },
|
|
_selectedSet: {
|
|
id: 'bikeshare:selected',
|
|
set: noop,
|
|
size: () => 0,
|
|
clear: noop,
|
|
},
|
|
_overlayHost: { setEntries: noop, clearSource: noop },
|
|
};
|
|
const selection = createSelection({
|
|
state,
|
|
services: {},
|
|
parts: { rendering: { stationItem: () => ({}) } },
|
|
});
|
|
selection._installClickHandler(viewer);
|
|
t.after(() => {
|
|
state._clickSubscription?.();
|
|
input.destroy();
|
|
if (previousDocument === undefined) delete globalThis.document;
|
|
else globalThis.document = previousDocument;
|
|
});
|
|
return {
|
|
state,
|
|
click(hit) {
|
|
picked = hit ? { id: hit } : null;
|
|
input.tap({ x: 10, y: 10 });
|
|
},
|
|
};
|
|
}
|
|
|
|
// The card or label painted on top takes the click: a station under another
|
|
// layer's card is neither selected nor let go.
|
|
test("another layer's card over a station keeps the click", (t) => {
|
|
const h = harness(t);
|
|
let top = { sourceId: 'earthquake-card', entryId: 'earthquake-card:ak1' };
|
|
setClickCardHitTest(() => top);
|
|
t.after(() => setClickCardHitTest(null));
|
|
const station = { set: 'bikeshare:stations', id: 'nyc:1' };
|
|
h.click(station);
|
|
assert.equal(h.state._selectedKey, null, 'covered: not selected');
|
|
top = null;
|
|
h.click(station);
|
|
assert.equal(h.state._selectedKey, 'nyc:1');
|
|
top = { sourceId: 'earthquake-card', entryId: 'earthquake-card:ak1' };
|
|
h.click(null);
|
|
assert.equal(h.state._selectedKey, 'nyc:1', 'covered: kept');
|
|
top = null;
|
|
h.click(null);
|
|
assert.equal(h.state._selectedKey, null, 'open map lets it go');
|
|
});
|