mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-20 18:22:25 +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.
100 lines
3.8 KiB
JavaScript
100 lines
3.8 KiB
JavaScript
import assert from 'node:assert/strict';
|
||
import test from 'node:test';
|
||
|
||
globalThis.window ||= globalThis;
|
||
globalThis.CustomEvent ||= class CustomEvent {
|
||
constructor(type, init) {
|
||
this.type = type;
|
||
this.detail = init?.detail;
|
||
}
|
||
};
|
||
globalThis.dispatchEvent ||= () => true;
|
||
|
||
const { registerEntityContext } = await import('./contextStore.js');
|
||
const { registerPickOwner, unregisterPickOwner, findPickOwner } = await import('./pickRegistry.js');
|
||
const { resolvePickedContext, pickedKindForLayer } = await import('./pickedContext.js');
|
||
|
||
function manager({ enabled = new Set(['flights', 'local-datacenters']), modules = {} } = {}) {
|
||
return {
|
||
isEnabled: (id) => enabled.has(id),
|
||
layers: new Map(Object.entries(modules).map(([id, module]) => [id, { name: id, module }])),
|
||
};
|
||
}
|
||
|
||
test('an aircraft billboard resolves through its pick owner to a live label', () => {
|
||
registerPickOwner('flights', (id) => id === 'a1b2c3');
|
||
const dataManager = manager({
|
||
modules: {
|
||
flights: {
|
||
findByQuery: (q) => (q === 'a1b2c3' ? { icao24: 'a1b2c3', callsign: 'UPS793', latitude: 30.2, longitude: -97.7, altitudeM: 9000 } : null),
|
||
},
|
||
},
|
||
});
|
||
const picked = { set: 'flights:1', id: 'a1b2c3', surface: false };
|
||
assert.equal(findPickOwner('a1b2c3'), 'flights');
|
||
assert.deepEqual(resolvePickedContext(picked, { dataManager }), {
|
||
layerId: 'flights',
|
||
id: 'a1b2c3',
|
||
label: 'UPS793',
|
||
kind: 'aircraft',
|
||
lat: 30.2,
|
||
lon: -97.7,
|
||
altitudeM: 9000,
|
||
});
|
||
unregisterPickOwner('flights');
|
||
});
|
||
|
||
test('a draw-set item resolves through the context record its meta carries', () => {
|
||
const carrier = { show: true };
|
||
registerEntityContext(carrier, {
|
||
id: 'local-datacenters:8',
|
||
layerId: 'local-datacenters',
|
||
label: 'Data Center 8',
|
||
latitude: 30.3,
|
||
longitude: -97.5,
|
||
});
|
||
// A draw-set item's hit carries the item's meta as it was given.
|
||
const picked = { set: 'local-datacenters#1:fills', id: '8', meta: carrier, surface: false };
|
||
assert.deepEqual(resolvePickedContext(picked, { dataManager: manager() }), {
|
||
layerId: 'local-datacenters',
|
||
id: 'local-datacenters:8',
|
||
label: 'Data Center 8',
|
||
kind: 'feature',
|
||
lat: 30.3,
|
||
lon: -97.5,
|
||
});
|
||
// Hidden, it is not what the user points at.
|
||
carrier.show = false;
|
||
assert.equal(resolvePickedContext(picked, { dataManager: manager() }), null);
|
||
});
|
||
|
||
test('something drawn outside the draw port resolves through its pick owner', () => {
|
||
registerPickOwner('flights', (id) => id === 'z9');
|
||
const out = resolvePickedContext({ set: '', id: 'z9', surface: false }, { dataManager: manager() });
|
||
assert.equal(out?.layerId, 'flights');
|
||
assert.equal(out?.id, 'z9');
|
||
unregisterPickOwner('flights');
|
||
});
|
||
|
||
test('a part of an item drawn in parts resolves as the id its parts pick as', () => {
|
||
registerPickOwner('flights', (id) => String(id).startsWith('seq:'));
|
||
const out = resolvePickedContext(
|
||
{ set: 'lines:1', id: 'seq:42#2', meta: { pick: 'seq:42' }, surface: false },
|
||
{ dataManager: manager() },
|
||
);
|
||
assert.equal(out?.id, 'seq:42', 'never the part’s own #n id');
|
||
unregisterPickOwner('flights');
|
||
});
|
||
|
||
test('disabled layers, trails and empty picks never resolve', () => {
|
||
registerPickOwner('military', (id) => id === 'm1');
|
||
const hit = (id) => ({ set: 'x:1', id, surface: false });
|
||
assert.equal(resolvePickedContext(hit('m1'), { dataManager: manager() }), null, 'military is disabled');
|
||
unregisterPickOwner('military');
|
||
assert.equal(resolvePickedContext(hit('gev-trail:1'), { dataManager: manager() }), null);
|
||
assert.equal(resolvePickedContext(null), null);
|
||
assert.equal(resolvePickedContext({ set: '', id: '', surface: true }), null);
|
||
assert.equal(resolvePickedContext(hit('unknown'), { dataManager: manager() }), null);
|
||
assert.equal(pickedKindForLayer('ais-live-vessels'), 'vessel');
|
||
});
|