mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 09:42:21 +00:00
fix(click): the card or label on top takes the click in every layer
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.
This commit is contained in:
1 parent
7312280817
commit
bb3bf9858b
87 files changed
+1398
-1775
No files matched your search
@@ -44,6 +44,7 @@ import {
|
||||
uninstallRenderGovernor,
|
||||
} from '../../renderGovernor.js';
|
||||
import { fakeInput } from '../../input/testDoubles.mjs';
|
||||
import { setClickCardHitTest } from '../../data/pickRegistry.js';
|
||||
import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs';
|
||||
import { fakeDrawPort } from '../../testSupport/fakeDrawPort.mjs';
|
||||
import { bindRenderer, rendererOf } from '../../render/rendererOf.js';
|
||||
@@ -3696,6 +3697,30 @@ test('click handler selects a migrated scripted billboard and prepares its drape
|
||||
assert.equal(entry.marker.show, true);
|
||||
});
|
||||
|
||||
// The card or label painted on top takes the click: a vehicle under another
|
||||
// layer's card is neither selected nor released.
|
||||
test("another layer's card over a vehicle keeps the click", async (t) => {
|
||||
const app = harness(t, { floorAt: () => undefined });
|
||||
let top = { sourceId: 'earthquake-card', entryId: 'earthquake-card:ak1' };
|
||||
setClickCardHitTest(() => top);
|
||||
t.after(() => setClickCardHitTest(null));
|
||||
app.layer.enable(app.viewer);
|
||||
app.layer._loadTransitFleetForTest(4, BOSTON, 70);
|
||||
const [first, second] = app.vehicles();
|
||||
app.viewer.scene.pick = () => app.pickOf(first);
|
||||
app.input.click(new Cesium.Cartesian2(500, 400));
|
||||
assert.equal(app.state()._selectedKey, null, 'covered: not selected');
|
||||
top = null;
|
||||
app.input.click(new Cesium.Cartesian2(500, 400));
|
||||
assert.equal(app.state()._selectedKey, first.key);
|
||||
top = { sourceId: 'earthquake-card', entryId: 'earthquake-card:ak1' };
|
||||
app.viewer.scene.pick = () => app.pickOf(second);
|
||||
app.input.click(new Cesium.Cartesian2(500, 400));
|
||||
app.viewer.scene.pick = () => undefined;
|
||||
app.input.click(new Cesium.Cartesian2(500, 400));
|
||||
assert.equal(app.state()._selectedKey, first.key, 'covered: kept');
|
||||
});
|
||||
|
||||
test('intercepted scripted reports resolve their explicit floor and wake without a preRender bootstrap', async (t) => {
|
||||
const app = harness(t, { floorAt: () => undefined });
|
||||
app.layer._setTransitFixtureFloorsForTest(['mbta:sim-straight'], 20);
|
||||
|
||||
Reference in new issue
Block a user