Never act on what lies under a mission label when it is clicked

A click on a Space Missions label reaches every click subscriber so they can
let go of their selection, but the layers that test their own painted cards
or pick the scene themselves still found what lay under the label: CCTV
turned that camera on, FIRMS and Vessels selected and flew to theirs, News
and Wildlife Sightings opened their item, Perimeters, Ghost Maps and
Shipwrecks opened the card's link, ALPR selected its reader, and Local ADS-B
drilled the scene itself and selected the aircraft. Each now skips its own
test on such a click, and Local ADS-B drills through the click, so the click
only releases selections, as a click on empty map or another layer's
contact does. Ordinary clicks behave as before.

Co-authored-by: Manjunath Paparaju <[email protected]>
This commit is contained in:
Sameh KhamisandManjunath Paparaju committed 2026-11-18 17:05:43 -08:00
1 parent 8675ead171
commit 5feac417d6
22 files changed
+453 -72

No files matched your search

+3 -1
View File
@@ -184,7 +184,9 @@ function topHitOf(hit, foreign) {
* engine's pick objects that reads it here.
* @property {boolean} overlay Whether a painted overlay target took the
* click ({@link InputDispatcher.onOverlayClick}). Its hits then name only
* that target: something drawn outside the draw port, with no id.
* that target: something drawn outside the draw port, with no id. A
* subscriber with its own hit test (painted cards, a pick of its own)
* skips it then: what lies under the target is not clicked.
* @property {(width: number, height: number) => unknown} pickWindow
* `native.pickWindow`, the same.
*/
+15
View File
@@ -140,3 +140,18 @@ export function fakeInput(viewer, { now } = {}) {
destroy: () => input.destroy(),
};
}
/**
* `fakeInput` with a label painted over the map, as a Space Missions label
* is: while `label.over` is true the label takes each click, so every click
* subscriber hears it as an overlay click (`event.overlay`), and the
* geometry beneath it is not picked.
* @param {object} viewer
* @param {{now?: () => number}} [options]
*/
export function fakeInputUnderLabel(viewer, options) {
const fake = fakeInput(viewer, options);
const label = { over: false };
fake.input.onOverlayClick(() => label.over);
return { ...fake, label };
}
+2 -1
View File
@@ -582,9 +582,10 @@ export function createAlprPresentation({ state, services, source }) {
state.clickSubscription = inputFor(viewer).onClick((event) => {
if (!state.enabled) return;
// The painted overlay answers first; the scene is picked only if not.
// A click a label painted over both took is on neither.
const hit = event.drawHit;
const id =
overlay.pick(event.screenPosition) ||
(!event.overlay && overlay.pick(event.screenPosition)) ||
(hit && hit.set === markers.icons?.id ? hit.id : null);
if (
id &&
+9 -6
View File
@@ -411,12 +411,15 @@ export function createLifecycle({
// painted ambient cards. The cards canvas is pointer-events:none (this
// handler owns the events), so a click landing on a card's rect selects
// its camera exactly like a click on the icon. Click positions
// and the recorded rects are both CSS px — direct comparison.
const cardId = layerState._cctvOverlayHost.hitTest(
event.screenPosition.x,
event.screenPosition.y,
{ sourceId: CCTV_OVERLAY_SOURCE_ID },
)?.entryId;
// and the recorded rects are both CSS px — direct comparison. A
// click a label painted over the cards took is not on a card.
const cardId = event.overlay
? null
: layerState._cctvOverlayHost.hitTest(
event.screenPosition.x,
event.screenPosition.y,
{ sourceId: CCTV_OVERLAY_SOURCE_ID },
)?.entryId;
if (cardId && layerState._recordById.has(cardId)) {
activateCctvCameraFromWorldClick(
cardId,
+81
View File
@@ -3,6 +3,9 @@ import assert from 'node:assert/strict';
import { createLifecycle } from './lifecycle.js';
import { bindRenderer } from '../../render/rendererOf.js';
import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs';
import { CCTV_OVERLAY_SOURCE_ID } from '../../data/cctvCards.js';
import { resolvePickId } from '../../data/pickRegistry.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
function viewerWithCamera() {
const camera = fakeCameraPort();
@@ -72,3 +75,81 @@ test('the view listeners follow the camera port and let go on teardown', () => {
assert.deepEqual(counts(second.camera), [0, 0]);
assert.equal(state._viewListenerCamera, null);
});
/** A part whose members are `own`'s, and any other a function that does
* nothing. */
const inert = (own = {}) =>
new Proxy(own, {
get: (target, name) => (name in target ? target[name] : () => {}),
});
test("a click a label painted over a camera's card takes never turns that camera on, and lets go of the active one", async (t) => {
const { viewer } = viewerWithCamera();
viewer.scene = { canvas: {}, pick: () => null };
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const activated = [];
const deactivated = [];
const state = {};
const lifecycle = createLifecycle({
state,
services: {
activation: {
activateCctvCameraFromWorldClick: (id) => activated.push(id),
},
picking: { resolvePickId },
focus: {},
render: {},
},
parts: {
calibration: { loadCalibrationStore: () => new Map() },
catalog: {
loadCameraSources: async () => [],
buildCatalogFromSources: () => [],
seedCatalog: () => [],
},
ground: {
resolveGroundPriors: async () => [],
currentSurfaceRegime: () => null,
},
rendering: inert({ refreshHorizonCulling: () => false }),
health: { syncHealthState: async () => {} },
geometryQueue: inert(),
cards: inert(),
projection: inert(),
presentation: inert(),
navigation: inert(),
hover: inert(),
selection: {
// The camera's own gate takes only clean clicks; these are.
bindCctvWorldClickGesture: (input, onClick) => input.onClick(onClick),
extractPickedCameraId: () => null,
cctvEmptyClickDeselects: (picked, { activeCameraId }) =>
Boolean(activeCameraId) && resolvePickId(picked) === null,
deactivateActiveCamera: () => deactivated.push(state._activeCameraId),
},
},
});
// Init's bounded wait for ground heights never runs out here: they are in.
t.mock.timers.enable({ apis: ['setTimeout'] });
await lifecycle.methods.init(viewer);
t.after(() => state._clickSubscription?.());
state._enabled = true;
state._activeCameraId = 'cam-0';
state._recordById.set('cam-1', {});
// The card of camera `cam-1` lies under every click.
state._cctvOverlayHost = {
hitTest: (_x, _y, { sourceId }) =>
sourceId === CCTV_OVERLAY_SOURCE_ID ? { entryId: 'cam-1' } : null,
};
fake.label.over = true;
fake.click();
assert.deepEqual(activated, [], 'the camera under the label stays off');
assert.deepEqual(deactivated, ['cam-0'], 'the active camera is let go');
// Off the label, a click on the card turns its camera on.
fake.label.over = false;
fake.click();
assert.deepEqual(activated, ['cam-1']);
});
+8 -5
View File
@@ -130,11 +130,14 @@ export function createDroneAirspaceLayer({
// cards inert anywhere over a zone. Unowned, our picks read as
// "empty space" to siblings — the same contract as fire perimeters.
_clickSubscription = inputFor(_viewer).onClick((event) => {
const cardHit = overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: DRONE_AIRSPACE_OVERLAY_SOURCE_ID },
);
// A click a label painted over the cards took is not on a card.
const cardHit = event.overlay
? null
: overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: DRONE_AIRSPACE_OVERLAY_SOURCE_ID },
);
if (cardHit && cardHit.entryId === _selectedCardId) return;
const picked = event.topHit;
const zoneId = picked ? pickedZoneId(event.drawHit) : null;
+10 -7
View File
@@ -46,13 +46,16 @@ export function createSelection({
const pickedId = resolvePickId(picked);
if (pickedId && isOwnedByOtherLayer(id, pickedId)) return;
}
const cardHit = overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
sourceId: FIRMS_OVERLAY_SOURCE_ID,
},
);
// A click a label painted over the cards took is not on a card.
const cardHit = event.overlay
? null
: overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
sourceId: FIRMS_OVERLAY_SOURCE_ID,
},
);
if (cardHit) {
const carded = layerState._fireByCardId.get(cardHit.entryId);
if (carded) selectAndFocusFire(carded);
+80
View File
@@ -0,0 +1,80 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { FIRMS_OVERLAY_SOURCE_ID } from '../../data/firmsLabels.js';
import { resolvePickId } from '../../data/pickRegistry.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { createSelection } from './selection.js';
/** The fire selection over a viewer whose clicks a label may take, with a
* fire's card under every click. */
function selectionHarness(t) {
const viewer = { scene: { canvas: {}, pick: () => null } };
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const fire = { lat: 1, lon: 2, acqMs: 3, frp: 40, satellite: 'N' };
const focused = [];
const cleared = [];
const layerState = {
_viewer: viewer,
_icons: { id: 'firms:icons' },
_pickIndexById: new Map(),
_fireByCardId: new Map([['firms-card:1', fire]]),
_selectedFire: null,
_contextIds: new Set(),
};
const selection = createSelection({
layerState,
services: {
picking: { resolvePickId, isOwnedByOtherLayer: () => false },
focus: { requestWorldFocus: (request) => focused.push(request.kind) },
context: {
selectEntityContext() {},
clearSelectedEntityContextForLayer: (id) => cleared.push(id),
getContextStore() {},
registerEntityContext() {},
},
},
components: {
model: {
firePosition: () => ({ x: 0, y: 0, z: 0 }),
formatFrp: String,
confidenceBucket: String,
},
cards: { rebuildAmbientLabels() {} },
},
config: {
id: 'firms',
name: 'Fires',
overlayHost: {
hitTest: (_x, _y, { sourceId }) =>
sourceId === FIRMS_OVERLAY_SOURCE_ID
? { entryId: 'firms-card:1' }
: null,
},
},
});
selection.installClickHandler();
t.after(() => selection.removeClickHandler());
return { fake, layerState, fire, focused, cleared };
}
test("a click a label painted over a fire's card takes never selects or focuses the fire", (t) => {
const h = selectionHarness(t);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.layerState._selectedFire, null);
assert.deepEqual(h.focused, [], 'the camera is not sent to the fire');
});
test('a click a label painted over the map takes lets go of the selected fire', (t) => {
const h = selectionHarness(t);
// Off the label, a click on the card selects and focuses its fire.
h.fake.click();
assert.equal(h.layerState._selectedFire, h.fire);
assert.deepEqual(h.focused, ['fire']);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.layerState._selectedFire, null);
assert.deepEqual(h.cleared, ['firms']);
assert.deepEqual(h.focused, ['fire']);
});
+8 -5
View File
@@ -707,11 +707,14 @@ export function createGhostMapsLayer({
typeof pickedId === 'string' && pickedId.startsWith(PICK_PREFIX),
);
_clickSubscription = inputFor(_viewer).onClick((event) => {
const cardHit = overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: GHOSTMAPS_OVERLAY_SOURCE_ID },
);
// A click a label painted over the cards took is not on a card.
const cardHit = event.overlay
? null
: overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: GHOSTMAPS_OVERLAY_SOURCE_ID },
);
if (cardHit && cardHit.entryId === _selectedCardId) {
if (_selectedLink && openExternal) openExternal(_selectedLink);
return;
+3 -10
View File
@@ -8,12 +8,7 @@ import {
} from '../../data/screenRotation.js';
import { fromDegreesInto, toLonLatH } from '../../geo/ellipsoid.js';
import { hexColor } from '../../render/color.js';
import {
drawOf,
findCamera,
findFrame,
findQuery,
} from '../../render/rendererOf.js';
import { drawOf, findCamera, findFrame } from '../../render/rendererOf.js';
import { inputFor } from '../../input/dispatcher.js';
import { pickRenderAltitudeM } from '../../data/renderAltitude.js';
import { routePlausible } from '../../data/routePlausible.js';
@@ -682,10 +677,8 @@ export function createLocalAdsbLayer({
if (ownedElsewhere(topId) && !trail) return 'other';
let hits = [];
try {
hits =
findQuery(viewer)?.drillPick(event.position.x, event.position.y, {
limit: CLICK_DRILL_LIMIT,
}) ?? [];
// The click's own drill: none under a label painted over the map.
hits = event.drill(CLICK_DRILL_LIMIT);
} catch {
hits = [];
}
+38 -1
View File
@@ -17,6 +17,7 @@ import { createLocalAdsbModels } from './models.js';
import { entityRecord, readEntityRecord } from '../../data/entityRecords.js';
import { resolvePickId } from '../../data/pickRegistry.js';
import { fromDegrees, toLonLatH } from '../../geo/ellipsoid.js';
import { inputFor } from '../../input/dispatcher.js';
import { fakeInput } from '../../input/testDoubles.mjs';
import { hexColor } from '../../render/color.js';
import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs';
@@ -1174,7 +1175,8 @@ function iconPick(draw, id) {
return { primitive: {}, id: { set: layerSet(draw, ':markers').spec.id, id } };
}
/** A viewer with a canvas and scripted picks, plus the layer's click action. */
/** A viewer with a canvas and scripted picks, plus the layer's click action.
* A click drills through the viewer's `drillHits`. */
function clickHarness() {
const scene = {
canvas: {},
@@ -1182,6 +1184,8 @@ function clickHarness() {
pick() {
return scene.pickResult;
},
drillPick: () =>
(base.viewer.drillHits ?? []).map((hit) => ({ primitive: {}, id: hit })),
};
const base = fakeViewer({ scene });
return {
@@ -1265,6 +1269,39 @@ test('a click on a local aircraft under an unowned or trail pick still selects i
assert.equal(calls.selected.length, 2, 'the Flights contact is not taken');
});
test('a click a label painted over a local aircraft takes never selects the aircraft, and lets go of the selection', async (t) => {
const receiver = fakeReceiver({ mode: 'adsb', connected: true });
const clock = { now: 100_000 };
const harness = clickHarness();
const { layer, calls, draw } = await enabledLayer(receiver, clock, null, {
viewer: harness.viewer,
});
t.after(() => layer.destroy());
receiver.set({ aircraft: [record()] });
await layer.update();
const label = { over: true };
inputFor(harness.viewer.viewer).onOverlayClick(() => label.over);
const model = {
set: layerSet(draw, ':models').spec.id,
id: 'local-adsb:abc123',
surface: false,
};
// The aircraft is under the label, both exactly and in the drill.
harness.scene.pickResult = iconPick(draw, 'local-adsb:abc123');
harness.viewer.viewer.drillHits = [model];
harness.click();
assert.deepEqual(calls.selected, [], 'the aircraft beneath is not taken');
// Off the label the same click selects it; on the label it lets go.
label.over = false;
harness.click();
assert.deepEqual(calls.selected, ['local-adsb:abc123']);
label.over = true;
harness.click();
assert.deepEqual(calls.selected, ['local-adsb:abc123']);
assert.equal(calls.cleared.length, 1, 'the selection is released');
});
test('a grounded aircraft changing type keeps its drawn model on its own belly offset until the new one is ready', () => {
const { draw, viewer, camera } = modelViewer();
const models = createLocalAdsbModels({
+6 -3
View File
@@ -1348,9 +1348,12 @@ export function createNewsLayer({
clickOff = inputFor(viewer).onClick((event) => {
const at = event?.screenPosition;
if (!enabled || destroyed || !isPointerFree() || !at) return;
const card = hitTestOverlay(at.x, at.y, {
sourceId: NEWS_OVERLAY_SOURCE_ID,
});
// A click a label painted over the cards took is not on a card.
const card = event.overlay
? null
: hitTestOverlay(at.x, at.y, {
sourceId: NEWS_OVERLAY_SOURCE_ID,
});
if (card?.entry?.activate) {
card.entry.activate();
return;
+8 -5
View File
@@ -218,11 +218,14 @@ export function createFirePerimetersLayer({
_clickSubscription = inputFor(_viewer).onClick((event) => {
// A click on the incident card itself opens its InciWeb page (when the
// incident has one) and never disturbs the selection.
const cardHit = overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: PERIMETER_OVERLAY_SOURCE_ID },
);
// A click a label painted over the cards took is not on a card.
const cardHit = event.overlay
? null
: overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: PERIMETER_OVERLAY_SOURCE_ID },
);
if (cardHit && cardHit.entryId === _selectedCardId) {
if (_selectedLink && openExternal) openExternal(_selectedLink);
return;
+6 -3
View File
@@ -278,9 +278,12 @@ export function createShipwrecksLayer({
_clickHandler = clicks.onClick((click) => {
if (pointer && !pointer.isPointerFree()) return;
const at = click.screenPosition;
const cardHit = overlayHost.hitTest?.(at?.x, at?.y, {
sourceId: SHIPWRECKS_OVERLAY_SOURCE_ID,
});
// A click a label painted over the cards took is not on a card.
const cardHit = click.overlay
? null
: overlayHost.hitTest?.(at?.x, at?.y, {
sourceId: SHIPWRECKS_OVERLAY_SOURCE_ID,
});
if (cardHit && cardHit.entryId === _selectedCardId) {
if (_selectedLink) openExternal(_selectedLink);
return;
+49
View File
@@ -2,6 +2,7 @@ import test from 'node:test';
import assert from 'node:assert/strict';
import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
import * as picking from '../../data/pickRegistry.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import {
createShipwrecksLayer,
markerPixelSize,
@@ -393,3 +394,51 @@ test('the page deadline subtracts the newest available source age from the limit
);
assert.equal(snapshotDeadline({ sources: both }, 0), 7 * DAY, 'defaults');
});
test("a click a label painted over the open card takes never opens the card's link, and closes the card", async (t) => {
let picked = null;
const viewer = { scene: { canvas: {}, pick: () => picked } };
bindFakeDraw(viewer);
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const cards = [];
const opened = [];
let cardUnder = null;
const layer = createShipwrecksLayer({
source: { getSnapshot: () => Promise.resolve(snapshot([wreck('a')])) },
overlayHost: {
setEntries: (_source, entries) => cards.push(entries),
setVisible() {},
hitTest: () => (cardUnder ? { entryId: cardUnder } : null),
},
input: () => fake.input,
picking,
pointer: { isPointerFree: () => true },
openExternal: (url) => opened.push(url),
now: () => 1,
});
layer.init(viewer);
t.after(() => layer.destroy());
layer.enable();
await layer.update();
picked = { primitive: {}, id: { set: 'shipwrecks:', id: 'shipwreck:a' } };
fake.click();
const [card] = cards.at(-1);
assert.equal(card.id, 'shipwreck-card:a');
// The open card lies under the label: the click opens nothing.
picked = null;
cardUnder = card.id;
fake.label.over = true;
fake.click();
assert.deepEqual(opened, [], 'the link beneath the label is not opened');
assert.deepEqual(cards.at(-1), [], 'the card is closed');
// Off the label, a click on the open card opens its link.
fake.label.over = false;
picked = { primitive: {}, id: { set: 'shipwrecks:', id: 'shipwreck:a' } };
fake.click();
picked = null;
fake.click();
assert.equal(opened.length, 1);
});
+13 -11
View File
@@ -64,17 +64,19 @@ export function createSelection({
// Cards are painted on a pointer-events:none canvas, so the scene pick is
// usually terrain behind the card. Resolve against the host's current
// actionable hit rectangles before treating the click as empty space.
const cardHit = !record
? vesselState._vesselOverlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
...(cycloneBackground
? {}
: { sourceId: VESSEL_OVERLAY_SOURCE_ID }),
},
)
: null;
// A click a label painted over the cards took is not on a card.
const cardHit =
!record && !event.overlay
? vesselState._vesselOverlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
...(cycloneBackground
? {}
: { sourceId: VESSEL_OVERLAY_SOURCE_ID }),
},
)
: null;
if (cycloneBackground && cardHit?.sourceId !== VESSEL_OVERLAY_SOURCE_ID)
return;
if (!record && cardHit) {
+89
View File
@@ -0,0 +1,89 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { VESSEL_OVERLAY_SOURCE_ID } from '../../data/vesselLabels.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { createSelection } from './selection.js';
/** Calls on any member are recorded by name and do nothing else. */
function recorder(calls) {
return new Proxy(
{},
{
get:
(_target, name) =>
(...args) =>
calls.push([name, ...args]),
},
);
}
/** The vessel selection over a viewer whose clicks a label may take. */
function selectionHarness(t) {
const viewer = { scene: { canvas: {}, pick: () => null } };
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const vessel = { id: 'v1', name: 'NORTHERN STAR', lat: 0, lon: 0 };
const focused = [];
const calls = [];
const state = {
feed: { enabled: true },
records: { byId: new Map([[vessel.id, vessel]]) },
icons: { setId: 'vessels:icons', has: () => false },
selectedRecord: null,
interactionKeyTarget: new EventTarget(),
};
const vesselState = {
state,
// The vessel's card lies under the click.
_vesselOverlayHost: {
hitTest: (_x, _y, { sourceId } = {}) =>
sourceId === VESSEL_OVERLAY_SOURCE_ID
? { sourceId, entryId: `vessel:${vessel.id}` }
: null,
},
};
const selection = createSelection({
vesselState,
services: {
picking: { isOwnedByOtherLayer: () => false },
worldFocus: { requestWorldFocus: (request) => focused.push(request.id) },
context: recorder(calls),
},
parts: {
queries: {
reduceVesselSelection: ({ selectedId, pickedId }) =>
pickedId
? { action: pickedId === selectedId ? 'none' : 'select' }
: { action: selectedId ? 'deselect' : 'none' },
},
rendering: recorder(calls),
cards: recorder(calls),
photos: recorder(calls),
tracking: recorder(calls),
},
layer: { source: 'AIS' },
});
selection.installInteraction(viewer);
t.after(() => selection.removeVesselInteraction());
return { fake, state, vessel, focused };
}
test("a click a label painted over a vessel's card takes never selects or focuses the vessel", (t) => {
const h = selectionHarness(t);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.state.selectedRecord, null);
assert.deepEqual(h.focused, [], 'the camera is not sent to the vessel');
});
test('a click a label painted over the map takes lets go of the selected vessel', (t) => {
const h = selectionHarness(t);
// Off the label, a click on the card selects and focuses its vessel.
h.fake.click();
assert.equal(h.state.selectedRecord, h.vessel);
assert.deepEqual(h.focused, ['v1']);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.state.selectedRecord, null);
assert.deepEqual(h.focused, ['v1']);
});
+9 -7
View File
@@ -483,16 +483,18 @@ export function createSelection({ state, services, parts }) {
if (!state.enabled || services.pointer?.isPointerFree?.() === false)
return;
const at = click.screenPosition;
// A click a label painted over the cards took is not on a card.
const hit =
overlay?.hitTest?.(at?.x, at?.y, {
!click.overlay &&
(overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_SELECTED_SOURCE_ID,
}) ||
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_OVERLAY_SOURCE_ID,
}) ||
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_LABEL_SOURCE_ID,
});
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_OVERLAY_SOURCE_ID,
}) ||
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_LABEL_SOURCE_ID,
}));
if (hit) {
hit.entry?.activate?.();
return;
+4 -2
View File
@@ -483,10 +483,12 @@ export class CockpitViewController {
* A click on the orbital picture: on a mapped point in reach it keeps the
* camera on that point; anywhere else it ends such a focus.
* @param {{x: number, y: number}|null|undefined} position
* @param {{overlay?: boolean}} [options] `overlay`: a label painted over
* the map took the click, which then only ends a focus.
* @returns {boolean} True when the click focused a point.
*/
onOrbitalClick(position) {
return onOrbitalClick.call(this, position);
onOrbitalClick(position, options) {
return onOrbitalClick.call(this, position, options);
}
/**
* A double-click on the orbital picture: on a mapped ground point it keeps
+8 -3
View File
@@ -256,13 +256,16 @@ export function onOrbitalDoubleClick(position) {
* focuses it; any other click ends a focus. A click a tool owns (drawing)
* is left alone, as is every click outside orbit.
* @param {{x: number, y: number}|null|undefined} position Canvas position.
* @param {{overlay?: boolean}} [options] `overlay`: a label painted over the
* map took the click, so it is on no site and only ends a focus.
* @returns {boolean} True when the click focused a point.
*/
export function onOrbitalClick(position) {
export function onOrbitalClick(position, { overlay = false } = {}) {
if (!inOrbit(this) || !isPointerFree()) return false;
if (!Number.isFinite(position?.x) || !Number.isFinite(position?.y))
return false;
const site = siteAt(this, position);
// A click a label painted over the map took is on no site.
const site = overlay ? null : siteAt(this, position);
const state = this.orbital;
if (site) {
if (state.focus?.key === String(site.id)) return true;
@@ -286,7 +289,9 @@ export function routeSceneClick() {
// A viewer with no input (headless tools, partial stubs) has no clicks.
return () => {};
}
return input.onClick((event) => this.onOrbitalClick(event?.position));
return input.onClick((event) =>
this.onOrbitalClick(event?.position, { overlay: event?.overlay === true }),
);
}
/**