mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 01:32:19 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c53a6d1c51 | ||
|
|
74d38e6d14 | ||
|
|
71229c8549 | ||
|
|
5feac417d6 | ||
|
|
8675ead171 | ||
|
|
9ac937af82 | ||
|
|
ee37511332 |
No files matched your search
@@ -0,0 +1,6 @@
|
||||
- Space Missions finishes switching off before anything else runs: a launch
|
||||
hovered while the layer is going off shows no preview, and Satellites
|
||||
keeps the state it was saved with when it is still busy. A click on a
|
||||
mission label reaches every layer so each can let go of what it had
|
||||
selected, and none of them selects, turns on, flies to or opens the link
|
||||
of what lies under the label (manjunath22466, samehkhamis, #1829).
|
||||
@@ -5592,7 +5592,11 @@ activeCameraCardEnabled: true })` may publish it through the retained
|
||||
> switching Space Missions off restores the pre-mission Satellite enabled
|
||||
> state and presentation parameters, except that an explicit Satellites action
|
||||
> taken while it ran is kept. Restored parameters never re-show primitives
|
||||
> while the Satellite layer is disabled.
|
||||
> while the Satellite layer is disabled. When Satellites is still busy after
|
||||
> the 30 s limit, the restore changes nothing and keeps the saved state, so
|
||||
> switching Space Missions off again finishes it. While Space Missions goes
|
||||
> off, its panel's roster and controls select, focus, preview and replay
|
||||
> nothing, so no camera move starts that nothing would end.
|
||||
> - **Flights 3D/cockpit hardening:** the destination-direction cue is an
|
||||
> inline SVG rather than a remotely loaded Material Icons ligature, so a
|
||||
> blocked or late font can no longer expand the literal word `navigation`
|
||||
@@ -7491,7 +7495,7 @@ silently demoting every later lookup for the session.
|
||||
protected-card path. Disable tears the tier down completely.
|
||||
Coverage/viewshed semantics unchanged.
|
||||
- **Satellites**: every point moves every frame. Each satellite's SGP4 sample (position, velocity, gravity and its rate of change; `src/layers/satellites/motion.js`) is reckoned forward or back to the world time and turned into the Earth-fixed frame, so points glide at any play speed instead of stepping once a second. Core satellites take a fresh sample every second, or as soon as the world time is 30 s from their sample (fast play, a seek), which keeps every point within about 10 m of SGP4; Starlink extras are sampled round-robin, more per frame the faster time plays, and a point more than two minutes from its sample waits for the next one. Hidden points are not moved until shown. Orbit rings rotate about Earth's Z by ΔGMST every ~1s (exact inertial→ECEF compensation; no SGP4 re-runs); the tracked satellite propagates per frame with one shared epoch for dot/label/camera. Verified: ISS holds <1km perpendicular to its ring while tracked. Pass prediction (`src/data/satellitePass.js`; `getNextSatellitePass`, `getNextIssPass`) scans at 20s, bisects rise/set to ~0.2s, fits the peak with a parabola, and marks a pass visible when the satellite is outside a cylindrical Earth shadow while the observer's Sun is at or below −6°. `next_iss_pass` preserves its geometric-pass ordering and appends visibility metadata. General `next_satellite_pass` accepts a loaded NORAD ID or unambiguous name, searches 24 hours and optionally requires estimated visibility. These estimates do not account for weather or satellite brightness.
|
||||
- **Space Missions (30d)**: recent launches render as bounded shared-host, horizon-occluded mission markers using Launch Library 2 v2.3 detailed records. Enabling the layer reveals its own right-rail button and roster and enables the required satellite layer; it does not touch Context. Before applying its temporary dense/hidden Satellite mode, Space Missions snapshots the complete standalone Satellite parameter set and exact enabled-layer set. Disabling Space Missions from Data Layers hides its rail button and panel and restores those parameters and the exact prior enabled state, so a Satellite layer that was already on stays on while a mode-owned dependency returns off; enabling Satellites by itself remains independent. An explicit user or voice Satellites OFF requested after Space Missions ON exits Space Missions, including after returning from Stories; scene, story, preset and other programmatic Satellites changes do not. The controls under the Space Missions row cycle through available launches. Selecting a mission isolates its launch-to-orbit transfer and dashed satellite orbit, fills the Space Missions panel with details, navigation, and replay controls, and animates a small phase-colored marker along the exact displayed Cartesian samples. Marker hit testing drill-picks through photorealistic tiles so the depth-test-free tactical dot remains reliably selectable. Clicking the launch name on the globe selects and focuses the same mission as its dot. The selected pad is the camera's zoom pivot: the overview remains centered on its launch site, wheel zoom approaches that site instead of drifting elsewhere, and camera pitch progressively changes from global nadir to an oblique close 3D view. Its protected shared-host callout remains visible and expands to include both mission and launch-site names. `FOCUS` flies directly to a 12 km oblique frame around the selected launch site and retains the same anchored zoom/orbit behavior. `REPLAY ASCENT` resets the selected marker at the pad, frames it from an oblique third-person angle, and follows it through the mission-specific compressed ascent directly into one orbital lap at the default `1×` rate. A live `0.25×`–`4×` slider changes ascent and orbit playback speed; adjusting it mid-replay preserves the current path position and historical mission timestamp. Re-entry/recovery cannot be inserted into replay. At orbit insertion the camera smoothly pulls back over the first fifth of the orbital replay and pitches to a globe-scale nadir view while continuing to target the moving replay point. Replay Cancel, mission navigation, deselection, layer disable, and data refresh all release camera ownership. Reconstructed paths are one continuous 128-sample geodetic curve: horizontal departure begins near zero while altitude rises quickly, then the climb progressively bends toward insertion without the former hard 120 km corner. Unmatched orbit fallbacks are smooth planar inclined rings rather than longitude/latitude ground-track curves. The panel lists disclosed payload names, types, operators/manufacturers, mass, multiplicity, and destination when supplied; an empty LL2 payload collection is shown as `CLASSIFIED / MULTI-PAYLOAD`. Launcher, spacecraft, and recoverable payload stages appear in a compact stage table with serial/flight/reuse details, recovery outcome/type, destination, and final coordinates when those records exist; an empty recovery collection omits the section. Stage recoveries with confirmed coordinates use those coordinates; return-to-launch-site records use the pad; downrange-only records receive an explicitly labeled estimated endpoint along the ascent azimuth. Available endpoints render as static 2 px dashed descent/recovery paths with a fixed final-position dot and an estimated atmospheric-interface segment when applicable. The ascent is geodetically densified above the ellipsoid toward the orbit's nearest insertion point, then rendered with `ArcType.NONE`, so it neither cuts through Earth nor separates from the marker. Because LL2 does not normally supply continuous ascent telemetry, pad-to-insertion paths without upstream trajectory samples are labeled `RECONSTRUCTED ESTIMATE` / `ASCENT ESTIMATE`; only supplied trajectory samples receive the replay wording. Selected-orbit framing fits the complete ring, rear-side linework uses normal scene depth occlusion, and current distance, speed, and callout data come only from a launch-year-validated satellite match. Both the loaded-catalog and active-TLE lookups read the launch year from the TLE international designator through one parser (`src/sources/tle.js`); a blank or malformed designator is an unknown year, which skips the year check rather than rejecting the match. Speed is the magnitude of the SGP4 inertial velocity vector at the same propagation epoch as position, displayed in km/s with km/h available as hover detail. Unavailable operator, site, launch-time, orbit, current-altitude, and speed valLine truncated
|
||||
- **Space Missions (30d)**: recent launches render as bounded shared-host, horizon-occluded mission markers using Launch Library 2 v2.3 detailed records. Enabling the layer reveals its own right-rail button and roster and enables the required satellite layer; it does not touch Context. Before applying its temporary dense/hidden Satellite mode, Space Missions snapshots the complete standalone Satellite parameter set and exact enabled-layer set. Disabling Space Missions from Data Layers hides its rail button and panel and restores those parameters and the exact prior enabled state, so a Satellite layer that was already on stays on while a mode-owned dependency returns off; enabling Satellites by itself remains independent. An explicit user or voice Satellites OFF requested after Space Missions ON exits Space Missions, including after returning from Stories; scene, story, preset and other programmatic Satellites changes do not. The controls under the Space Missions row cycle through available launches. Selecting a mission isolates its launch-to-orbit transfer and dashed satellite orbit, fills the Space Missions panel with details, navigation, and replay controls, and animates a small phase-colored marker along the exact displayed Cartesian samples. Marker hit testing drill-picks through photorealistic tiles so the depth-test-free tactical dot remains reliably selectable. Clicking the launch name on the globe selects and focuses the same mission as its dot; what is drawn beneath the name is not picked, and the other layers still hear the click as one on the name, so they close their cards or let go of their selection as for any other click, but never select, turn on, focus or open the link of a contact, card or camera that lies under the name. The selected pad is the camera's zoom pivot: the overview remains centered on its launch site, wheel zoom approaches that site instead of drifting elsewhere, and camera pitch progressively changes from global nadir to an oblique close 3D view. Its protected shared-host callout remains visible and expands to include both mission and launch-site names. `FOCUS` flies directly to a 12 km oblique frame around the selected launch site and retains the same anchored zoom/orbit behavior. `REPLAY ASCENT` resets the selected marker at the pad, frames it from an oblique third-person angle, and follows it through the mission-specific compressed ascent directly into one orbital lap at the default `1×` rate. A live `0.25×`–`4×` slider changes ascent and orbit playback speed; adjusting it mid-replay preserves the current path position and historical mission timestamp. Re-entry/recovery cannot be inserted into replay. At orbit insertion the camera smoothly pulls back over the first fifth of the orbital replay and pitches to a globe-scale nadir view while continuing to target the moving replay point. Replay Cancel, mission navigation, deselection, layer disable, and data refresh all release camera ownership. Reconstructed paths are one continuous 128-sample geodetic curve: horizontal departure begins near zero while altitude rises quickly, then the climb progressively bends toward insertion without the former hard 120 km corner. Unmatched orbit fallbacks are smooth planar inclined rings rather than longitude/latitude ground-track curves. The panel lists disclosed payload names, types, operators/manufacturers, mass, multiplicity, and destination when supplied; an empty LL2 payload collection is shown as `CLASSIFIED / MULTI-PAYLOAD`. Launcher, spacecraft, and recoverable payload stages appear in a compact stage table with serial/flight/reuse details, recovery outcome/type, destination, and final coordinates when those records exist; an empty recovery collection omits the section. Stage recoveries with confirmed coordinates use those coordinates; return-to-launch-site records use the pad; downrange-only records receive an explicitly labeled estimated endpoint along the ascent azimuth. Available endpoints render as static 2 px dashed descent/recovery paths with a fixed final-position dot and an estimated atmospheric-interface segment when applicable. The ascent is geodetically densified above the ellipsoid toward the orbit's nearest insertion point, then rendered with `ArcType.NONE`, so it neither cuts through Earth nor separates from the marker. Because LL2 does not normally supply continuous ascent telemetry, pad-to-insertion paths without upstream trajectory samples are labeled `RECONSTRUCTED ESTIMATE` / `ASCENT ESTIMATE`; only supplied trajectory samples receive the replay wording. Selected-orbit framing fits the complete ring, rear-side linework uses normal scene depth occlusion, and current distance, speed, and callout data come only from a launch-year-validated satellite match. Both the loaded-catalog and active-TLE lookups read the launch year from the TLE international designator through one parser (`src/sources/tle.js`); a blank or malformed designator is an unknown year, whichLine truncated
|
||||
When no mission is selected, the Space Missions panel presents a scrollable newest-first roster of every launch in the rolling window, including the smaller 5 px operator-colored marker, provider, and launch date. Hovering or keyboard-focusing a row shows four compact cyan corner brackets on both that roster row and its corresponding globe dot, rotates the globe at the current zoom to center it, and gives its label declutter priority without selecting it; the globe label remains unbracketed. Selecting a roster row invokes the same mission isolation and full-orbit framing as clicking its globe marker. The replay vehicle is one screen-space SVG/CSS HUD overlay rather than separate Cesium billboard, label, and reticle graphics. It is hidden during ordinary Focus and manual close views, where the standard selected launch-site label remains visible, and exists only while ascent replay is active. Its fixed pixel scale is shared by ascent and insertion, so camera range never resizes the rocket on screen before the phase boundary. Generic Launch Library pad names are reduced to their identifying suffix, and replay timestamps use a cyan state title over unprefixed white UTC date/time values. `REPLAY ASCENT` holds the unframed cyan/white rocket at the pad for a real-time `T−10` countdown, transitions through `LIFTOFF`, and attaches six tapered cyan/white ellipse waves directly below it from liftoff through insertion to convey thrust without adding scene geometry. While replay is active, the single start button is replaced by compact Play, Pause, and Cancel icon controls. Pause freezes countdown or mission time, vehicle/stage positions, camera target, labels, and thrust-wave animation; Play resumes from that exact frame, and Cancel releases replay camera ownership. The rocket and thrust group rotates from the path's live screen-space tangent, so its nose follows the visible ascent curve while the adjacent text remains upright. The camera begins as a close oblique launch chase, then smoothly widens between roughly 120 and 420 km vehicle altitude into a higher oblique context view that keeps the moving rocket targeted while exposing the ascent bend and orbit connection. At insertion the rocket/thrust glyph is replaced by the fixed-size cyan orbit dot, which the camera follows through the existing globe-scale orbit pullback. The chase camera limits per-frame yaw changes across heading wraps so it cannot abruptly cross in front of the vehicle and make ascent read in reverse; the replay-speed slider affects mission playback but not countdown duration.
|
||||
Mission world text has no native `LabelGraphics`: overview launch markers publish at most 48 ambient candidates for a 24-winner budget, while selecting a mission clears that overview source and publishes its launch-site callout, stage re-entry annotations, live/estimated payload-position readout, and orbit annotation as protected selected-lane entries. The source retains the exact former strings and colors. Static anchors reuse the Cartesian values used to build their mission geometry; the moving payload entry reads the layer's per-frame live-position cache; catalog-backed orbit annotation positions are cached in the same one-second matrix update that realigns the orbit primitive. Keyhole edge fade, horizon culling, final collision placement, and UI exclusion are owned by the shared host. Deselect restores the bounded overview, and refresh, disable, and destroy replace or clear both mission sources.
|
||||
A selected mission renders its orbit as four repeating tactical sectors, each containing one prominent cyan dot followed by one hundred thin translucent dashes. The bright dots act as orbit anchors while the subdued dash field remains depth-tested against the globe and is shown only for the selected mission.
|
||||
|
||||
@@ -660,6 +660,7 @@
|
||||
"src/layers/alpr/model.js",
|
||||
"src/layers/alpr/policy.js",
|
||||
"src/layers/alpr/presentation.js",
|
||||
"src/layers/alpr/presentation.test.mjs",
|
||||
"src/layers/alpr/visuals.js",
|
||||
"src/layers/alpr/overlay.js",
|
||||
"src/layers/alpr/overlay.test.mjs",
|
||||
@@ -1599,5 +1600,7 @@
|
||||
"src/ui/omnibarRows.test.mjs",
|
||||
"src/ui/styles/omnibar-dock.css",
|
||||
"src/ui/styles/guide.css",
|
||||
"src/ui/commandDock.test.mjs"
|
||||
"src/ui/commandDock.test.mjs",
|
||||
"src/layers/firms/selection.test.mjs",
|
||||
"src/layers/vessels/selection.test.mjs"
|
||||
]
|
||||
+39
-6
@@ -182,6 +182,11 @@ function topHitOf(hit, foreign) {
|
||||
* when the adapter has none.
|
||||
* @property {unknown} pick `native.pick`, for code still bound to the
|
||||
* 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. 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.
|
||||
*/
|
||||
@@ -192,7 +197,9 @@ function topHitOf(hit, foreign) {
|
||||
* Ambient click subscription. Returns its unsubscribe.
|
||||
* @property {(fn: (event: ClickEvent) => boolean) => () => void} onOverlayClick
|
||||
* Hit-test a painted overlay before ambient clicks. Return true after
|
||||
* handling its topmost target to stop delivery to the geometry beneath it.
|
||||
* handling its topmost target: the geometry beneath it is not picked, and
|
||||
* the click subscribers hear the click as one on that target (`overlay`
|
||||
* true, `topHit` a hit with no set and no id, nothing drilled).
|
||||
* @property {(type: 'down'|'move'|'up'|'click'|'dblclick', fn: Function, options?: {lease?: object|(() => object|null)}) => () => void} onPointer
|
||||
* Raw pointer subscription: `click` gets the {@link ClickEvent}, the others
|
||||
* `{position}` (`move`: `{startPosition, endPosition, pickPosition}`, its
|
||||
@@ -331,7 +338,7 @@ function createDispatcher(viewer, { query: givenQuery, ...portOptions } = {}) {
|
||||
click: (ev) => {
|
||||
if (!unmodifiedLeft(ev)) return;
|
||||
const ambient = free();
|
||||
const event = createClickEvent(
|
||||
const { event, cover } = createClickEvent(
|
||||
viewer,
|
||||
queryOf,
|
||||
xy(ev.position),
|
||||
@@ -340,7 +347,12 @@ function createDispatcher(viewer, { query: givenQuery, ...portOptions } = {}) {
|
||||
if (ambient) {
|
||||
for (const handle of [...overlayClicks]) {
|
||||
try {
|
||||
if (handle(event) === true) return;
|
||||
// A handled overlay target hides the geometry beneath it; every
|
||||
// subscriber still hears the click, as a click on that target.
|
||||
if (handle(event) === true) {
|
||||
cover();
|
||||
break;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Pointer input handler failed', error);
|
||||
}
|
||||
@@ -437,6 +449,10 @@ function createDispatcher(viewer, { query: givenQuery, ...portOptions } = {}) {
|
||||
return self;
|
||||
}
|
||||
|
||||
/** What a click handled by a painted overlay target hits: that target,
|
||||
* drawn outside the draw port and named by no pick id. */
|
||||
const OVERLAY_HIT = Object.freeze({ set: '', id: null, surface: false });
|
||||
|
||||
/** A drill is run at least this deep and sliced, so callers asking for
|
||||
* different depths on one click share one pass. */
|
||||
const DRILL_DEPTH = 16;
|
||||
@@ -446,7 +462,8 @@ const DRILL_DEPTH = 16;
|
||||
* @param {() => import('../render/contract/query').QueryPort|null} queryOf
|
||||
* @param {{x: number, y: number}} at Where the click is, CSS pixels.
|
||||
* @param {ClickGesture} gesture
|
||||
* @returns {ClickEvent}
|
||||
* @returns {{event: ClickEvent, cover: () => void}} The click, and how a
|
||||
* handled overlay target hides the geometry beneath it from the click.
|
||||
*/
|
||||
function createClickEvent(viewer, queryOf, at, gesture) {
|
||||
const position = sensorPickPosition(viewer, at, canvasOf(viewer));
|
||||
@@ -465,11 +482,25 @@ function createClickEvent(viewer, queryOf, at, gesture) {
|
||||
};
|
||||
/** @type {Map<string, {limit: number, hits: Hit[]}>} */
|
||||
const drills = new Map();
|
||||
let covered = false;
|
||||
const cover = () => {
|
||||
covered = true;
|
||||
memo.clear();
|
||||
drills.clear();
|
||||
memo.set('top', OVERLAY_HIT);
|
||||
memo.set('hit', OVERLAY_HIT);
|
||||
memo.set('id', null);
|
||||
memo.set('ownerId', null);
|
||||
memo.set('native', null);
|
||||
};
|
||||
|
||||
return {
|
||||
const event = {
|
||||
screenPosition: at,
|
||||
position,
|
||||
gesture,
|
||||
get overlay() {
|
||||
return covered;
|
||||
},
|
||||
get topHit() {
|
||||
return once('top', () => {
|
||||
const hit = pick();
|
||||
@@ -515,6 +546,7 @@ function createClickEvent(viewer, queryOf, at, gesture) {
|
||||
return !this.hit;
|
||||
},
|
||||
windowHit(width, height) {
|
||||
if (covered) return { id: null, drawHit: null, surface: false };
|
||||
return once(`windowHit:${width}x${height}`, () => {
|
||||
const picked = pick({ width, height });
|
||||
void native()?.native.pickWindow(width, height);
|
||||
@@ -535,7 +567,7 @@ function createClickEvent(viewer, queryOf, at, gesture) {
|
||||
// A deeper pass already made holds these. (One that came back short
|
||||
// may not hold every hit: it drops what is not a draw-set item.)
|
||||
if (done && limit <= done.limit) return done.hits.slice(0, limit);
|
||||
const q = query();
|
||||
const q = covered ? null : query();
|
||||
if (!q) return [];
|
||||
// Only the default window is shared between layers; round that one up.
|
||||
const depth =
|
||||
@@ -568,4 +600,5 @@ function createClickEvent(viewer, queryOf, at, gesture) {
|
||||
return native()?.native.pickWindow(width, height);
|
||||
},
|
||||
};
|
||||
return { event, cover };
|
||||
}
|
||||
@@ -145,7 +145,8 @@ test('a painted overlay can claim a click before its underlying owner', (t) => {
|
||||
h.input.onPointer('click', () => clicks.push('ambient pointer'));
|
||||
|
||||
h.click();
|
||||
assert.deepEqual(clicks, ['mission label']);
|
||||
// The click still reaches every subscriber, as one on the label.
|
||||
assert.deepEqual(clicks, ['mission label', 'ambient pointer', null]);
|
||||
assert.equal(h.calls.pick, 0);
|
||||
|
||||
h.click(11, 10);
|
||||
@@ -154,12 +155,71 @@ test('a painted overlay can claim a click before its underlying owner', (t) => {
|
||||
assert.deepEqual(clicks, [
|
||||
'mission label',
|
||||
'ambient pointer',
|
||||
null,
|
||||
'ambient pointer',
|
||||
'satellites',
|
||||
'ambient pointer',
|
||||
'satellites',
|
||||
]);
|
||||
});
|
||||
|
||||
test('a click a painted overlay handles still reaches subscribers that clear selection', (t) => {
|
||||
const h = harness({
|
||||
pick: () => ({ set: 'flights', id: 'abc123' }),
|
||||
drillPick: () => [{ set: 'flights', id: 'abc123' }],
|
||||
});
|
||||
t.after(() => h.input.destroy());
|
||||
let seenByOverlay = null;
|
||||
h.input.onOverlayClick((event) => {
|
||||
seenByOverlay = event;
|
||||
return true;
|
||||
});
|
||||
const seen = [];
|
||||
h.input.onClick((event) => {
|
||||
seen.push({
|
||||
same: event === seenByOverlay,
|
||||
overlay: event.overlay,
|
||||
topHit: event.topHit,
|
||||
drawHit: event.drawHit,
|
||||
hit: event.hit,
|
||||
id: event.id,
|
||||
ownerId: event.ownerId,
|
||||
surface: event.surface,
|
||||
drill: event.drill(4),
|
||||
windowHit: event.windowHit(8, 8),
|
||||
pick: event.pick,
|
||||
});
|
||||
});
|
||||
h.click();
|
||||
assert.deepEqual(seen, [
|
||||
{
|
||||
same: true,
|
||||
overlay: true,
|
||||
topHit: { set: '', id: null, surface: false },
|
||||
drawHit: null,
|
||||
hit: { set: '', id: null, surface: false },
|
||||
id: null,
|
||||
ownerId: null,
|
||||
surface: false,
|
||||
drill: [],
|
||||
windowHit: { id: null, drawHit: null, surface: false },
|
||||
pick: undefined,
|
||||
},
|
||||
]);
|
||||
assert.equal(h.calls.pick, 0, 'the geometry beneath is not picked');
|
||||
assert.equal(h.calls.drillPick, 0);
|
||||
|
||||
// Without an overlay target the same click picks the geometry.
|
||||
seen.length = 0;
|
||||
h.input.destroy();
|
||||
const g = harness({ pick: () => ({ set: 'flights', id: 'abc123' }) });
|
||||
t.after(() => g.input.destroy());
|
||||
g.input.onClick((event) => seen.push([event.overlay, event.topHit]));
|
||||
g.click();
|
||||
assert.equal(seen[0][0], false);
|
||||
assert.equal(g.calls.pick, 1);
|
||||
});
|
||||
|
||||
test('the gesture carries summed travel and press time', (t) => {
|
||||
const h = harness();
|
||||
t.after(() => h.input.destroy());
|
||||
|
||||
@@ -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 };
|
||||
}
|
||||
@@ -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 &&
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import * as Cesium from 'cesium';
|
||||
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
|
||||
import { fakeDrawPort } from '../../testSupport/fakeDrawPort.mjs';
|
||||
import { bindFakeCesiumScene } from '../../testSupport/fakeCesiumScene.mjs';
|
||||
import { createAlprMarkerSet } from './markerState.js';
|
||||
import { createAlprPresentation } from './presentation.js';
|
||||
|
||||
/** One camera drawn and painted at (100, 100), over a viewer whose clicks a
|
||||
* label may take. */
|
||||
function harness(t) {
|
||||
const previousImage = globalThis.Image;
|
||||
const project = Cesium.SceneTransforms.worldToWindowCoordinates;
|
||||
globalThis.Image = class {
|
||||
complete = true;
|
||||
naturalWidth = 128;
|
||||
};
|
||||
Cesium.SceneTransforms.worldToWindowCoordinates = () => ({ x: 100, y: 100 });
|
||||
const record = {
|
||||
id: 'camera:0',
|
||||
latitude: 30,
|
||||
longitude: -97,
|
||||
directionDeg: 90,
|
||||
};
|
||||
const drawPort = fakeDrawPort();
|
||||
const markers = createAlprMarkerSet();
|
||||
markers.attach(drawPort.icons({ id: 'alpr-cameras:test:markers' }));
|
||||
const viewer = {
|
||||
camera: {
|
||||
positionWC: Cesium.Cartesian3.fromDegrees(-97, 30, 500),
|
||||
pickEllipsoid: () => Cesium.Cartesian3.fromDegrees(-97, 30),
|
||||
},
|
||||
scene: {
|
||||
canvas: { clientWidth: 800, clientHeight: 600 },
|
||||
globe: { show: true, getHeight: () => 150 },
|
||||
pick: () => null,
|
||||
},
|
||||
};
|
||||
const { unbind } = bindFakeCesiumScene(viewer, { draw: drawPort });
|
||||
const fake = fakeInputUnderLabel(viewer);
|
||||
const state = {
|
||||
viewer,
|
||||
enabled: true,
|
||||
selectedId: null,
|
||||
markers,
|
||||
records: [record],
|
||||
recordById: new Map([[record.id, record]]),
|
||||
renderRevision: 0,
|
||||
lastAnchorSampleAt: 0,
|
||||
};
|
||||
let selected = null;
|
||||
let paint;
|
||||
const presentation = createAlprPresentation({
|
||||
state,
|
||||
source: { label: 'Test cameras' },
|
||||
services: {
|
||||
render: { governorRequestRender() {} },
|
||||
context: {
|
||||
clearSelectedEntityContextForLayer() {
|
||||
selected = null;
|
||||
},
|
||||
getSelectedEntityContext: () => selected,
|
||||
registerEntityContext() {},
|
||||
removeEntityContextsForLayer() {},
|
||||
selectEntityContext(carrier) {
|
||||
selected = { id: carrier.id, layerId: 'alpr-cameras' };
|
||||
},
|
||||
},
|
||||
groundFloor: { cachedGroundFloor: () => 150 },
|
||||
overlays: {
|
||||
registerPaintLane(_lane, painter) {
|
||||
paint = painter;
|
||||
return { setActive() {}, requestPaint() {}, unregister() {} };
|
||||
},
|
||||
keyholeAlpha: () => 1,
|
||||
},
|
||||
},
|
||||
});
|
||||
presentation.initOverlay();
|
||||
presentation.installInteraction(viewer);
|
||||
t.after(() => {
|
||||
presentation.destroyOverlay();
|
||||
fake.destroy();
|
||||
unbind();
|
||||
if (previousImage === undefined) delete globalThis.Image;
|
||||
else globalThis.Image = previousImage;
|
||||
Cesium.SceneTransforms.worldToWindowCoordinates = project;
|
||||
});
|
||||
presentation.renderRecords();
|
||||
const ctx = {
|
||||
globalAlpha: 1,
|
||||
save() {},
|
||||
restore() {},
|
||||
beginPath() {},
|
||||
moveTo() {},
|
||||
lineTo() {},
|
||||
closePath() {},
|
||||
stroke() {},
|
||||
fill() {},
|
||||
createLinearGradient: () => ({ addColorStop() {} }),
|
||||
drawImage() {},
|
||||
};
|
||||
paint({ ctx, width: 800, height: 600 });
|
||||
return { state, fake, at: { x: 100, y: 100 } };
|
||||
}
|
||||
|
||||
test('a click a label painted over a camera takes never selects it, and lets go of the selected camera', (t) => {
|
||||
const h = harness(t);
|
||||
h.fake.label.over = true;
|
||||
h.fake.click(h.at);
|
||||
assert.equal(h.state.selectedId, null, 'the camera under the label');
|
||||
|
||||
// Off the label, the same click selects the camera.
|
||||
h.fake.label.over = false;
|
||||
h.fake.click(h.at);
|
||||
assert.equal(h.state.selectedId, 'camera:0');
|
||||
|
||||
h.fake.label.over = true;
|
||||
h.fake.click(h.at);
|
||||
assert.equal(h.state.selectedId, null, 'the selection is let go');
|
||||
});
|
||||
@@ -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,
|
||||
|
||||
@@ -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']);
|
||||
});
|
||||
@@ -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;
|
||||
|
||||
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { createDroneAirspaceLayer } from './index.js';
|
||||
import { layerFeedState } from '../../data/feedState.js';
|
||||
import { fakeInput } from '../../input/testDoubles.mjs';
|
||||
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
|
||||
import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
|
||||
|
||||
// The fills set of the layer the last harness made: zone picks name it.
|
||||
@@ -19,11 +19,12 @@ function harness(source, { pick = () => null, cardHit = () => null } = {}) {
|
||||
const owners = new Map();
|
||||
const viewer = { scene: { pick } };
|
||||
const { draw } = bindFakeDraw(viewer);
|
||||
const input = fakeInput(viewer);
|
||||
const input = fakeInputUnderLabel(viewer);
|
||||
const clicks = {
|
||||
handler: (click) => input.click(click.position),
|
||||
// Only the label's own overlay handler is left.
|
||||
get destroyed() {
|
||||
return input.input.subscriberCount() === 0 ? 1 : 0;
|
||||
return input.input.subscriberCount() === 1 ? 1 : 0;
|
||||
},
|
||||
};
|
||||
const layer = createDroneAirspaceLayer({
|
||||
@@ -61,6 +62,8 @@ function harness(source, { pick = () => null, cardHit = () => null } = {}) {
|
||||
overlay,
|
||||
clicks,
|
||||
owners,
|
||||
/** A label painted over the map: while `over`, it takes each click. */
|
||||
label: input.label,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -143,6 +146,35 @@ test('clicking a zone publishes its card; empty space clears it', async () => {
|
||||
assert.equal(h.overlay.entries.get('drone-airspace')?.length ?? 0, 0);
|
||||
});
|
||||
|
||||
test('a click a label painted over the open zone card takes closes the card, as a click beside it does', async () => {
|
||||
let pickResult = null;
|
||||
let cardHitResult = null;
|
||||
const h = harness(
|
||||
{ getSnapshot: async () => [row] },
|
||||
{ pick: () => pickResult, cardHit: () => cardHitResult },
|
||||
);
|
||||
await h.layer.update(h.viewer);
|
||||
pickResult = zonePick('drone-airspace:310:0');
|
||||
h.clicks.handler({ position: { x: 10, y: 10 } });
|
||||
const [card] = h.overlay.entries.get('drone-airspace');
|
||||
|
||||
// Off the label, a click on the open card keeps it open.
|
||||
pickResult = null;
|
||||
cardHitResult = { entryId: card.id };
|
||||
h.clicks.handler({ position: { x: 12, y: 12 } });
|
||||
assert.equal(h.overlay.entries.get('drone-airspace')?.length, 1);
|
||||
|
||||
// The open card lies under the label: the click is not on the card.
|
||||
h.label.over = true;
|
||||
h.clicks.handler({ position: { x: 12, y: 12 } });
|
||||
assert.equal(
|
||||
h.overlay.entries.get('drone-airspace')?.length ?? 0,
|
||||
0,
|
||||
'the card is closed',
|
||||
);
|
||||
h.layer.destroy();
|
||||
});
|
||||
|
||||
test('late refresh cannot publish after disable or destroy', async () => {
|
||||
for (const action of ['disable', 'destroy']) {
|
||||
let resolve, signal;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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']);
|
||||
});
|
||||
@@ -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,6 +3,7 @@ import test from 'node:test';
|
||||
import { setLocale } from '../../i18n/index.js';
|
||||
import { createGhostMapsLayer } from './index.js';
|
||||
import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
|
||||
import { inputFor } from '../../input/dispatcher.js';
|
||||
import { GHOSTMAPS_PRODUCTS, GHOSTMAPS_LATEST_DROP } from './catalog.js';
|
||||
|
||||
function element(localName, children = [], value = '', attributes = {}) {
|
||||
@@ -672,3 +673,49 @@ test('narrowing to a window the loaded data covers clears a failed wider reload'
|
||||
assert.equal(layer.getStats().error, null);
|
||||
assert.equal(layer.getStats().count, 1);
|
||||
});
|
||||
|
||||
test("a click a label painted over the open card takes never opens the card's link, and closes the card", async (t) => {
|
||||
const cards = [];
|
||||
const opened = [];
|
||||
let cardUnder = null;
|
||||
const { layer, viewer, click } = fixture(t, {
|
||||
now: () => Date.UTC(2026, 10, 3, 12),
|
||||
reports: [
|
||||
{
|
||||
name: 'Linked',
|
||||
description:
|
||||
'<table><tr><td>Date</td><td>11/2/2026</td></tr>' +
|
||||
'<tr><td>Source</td><td><a href="https://example.com/report">report</a></td></tr></table>',
|
||||
},
|
||||
],
|
||||
controls: {
|
||||
overlayHost: {
|
||||
setEntries: (_id, entries) => cards.push(entries),
|
||||
hitTest: () => (cardUnder ? { entryId: cardUnder } : null),
|
||||
},
|
||||
picking: { resolvePickId: (picked) => picked?.id ?? null },
|
||||
openExternal: (url) => opened.push(url),
|
||||
},
|
||||
});
|
||||
// A label painted over the map, as a Space Missions label is: while it is
|
||||
// over, it takes each click.
|
||||
let labelOver = false;
|
||||
inputFor(viewer).onOverlayClick(() => labelOver);
|
||||
await layer.update(viewer);
|
||||
click('ghostmaps:cip:0:0');
|
||||
const [card] = cards.at(-1);
|
||||
assert.equal(card.interactive, true);
|
||||
|
||||
// The open card lies under the label: the click opens nothing.
|
||||
cardUnder = card.id;
|
||||
labelOver = true;
|
||||
click(null);
|
||||
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.
|
||||
labelOver = false;
|
||||
click('ghostmaps:cip:0:0');
|
||||
click(null);
|
||||
assert.deepEqual(opened, ['https://example.com/report']);
|
||||
});
|
||||
@@ -623,6 +623,51 @@ test('a Satellites enable that never settles still lets mission disable complete
|
||||
stuck.resolve();
|
||||
}
|
||||
await f.settle();
|
||||
// The saved Satellites state was kept: turning Space Missions off again
|
||||
// once Satellites settles gives back the Satellites it turned on.
|
||||
assert.equal(f.manager.isEnabled('satellites'), true);
|
||||
await f.manager.setEnabled('rocket-launches', false, { origin: 'user' });
|
||||
await f.settle();
|
||||
assert.equal(f.manager.isEnabled('rocket-launches'), false);
|
||||
assert.equal(f.manager.isEnabled('satellites'), false);
|
||||
});
|
||||
|
||||
test('Space Missions turned on again after a busy restore switches Satellites on', async (t) => {
|
||||
const f = await fixture(t);
|
||||
f.upstream.status = 200;
|
||||
assert.equal(
|
||||
await f.manager.setEnabled('rocket-launches', true, { origin: 'user' }),
|
||||
true,
|
||||
);
|
||||
await f.settle();
|
||||
f.state.satelliteSettleTimeoutMs = 50;
|
||||
const satellites = f.manager.layers.get('satellites').module;
|
||||
const enable = satellites.enable;
|
||||
const stuck = Promise.withResolvers();
|
||||
satellites.enable = () => stuck.promise;
|
||||
try {
|
||||
await f.manager.setEnabled('satellites', false);
|
||||
void f.manager.setEnabled('satellites', true);
|
||||
await f.manager.setEnabled('rocket-launches', false, { origin: 'user' });
|
||||
} finally {
|
||||
satellites.enable = enable;
|
||||
stuck.resolve();
|
||||
}
|
||||
await f.settle();
|
||||
// Something else switches Satellites off, then Space Missions comes back.
|
||||
await f.manager.setEnabled('satellites', false);
|
||||
await f.settle();
|
||||
assert.equal(f.manager.isEnabled('satellites'), false);
|
||||
assert.equal(
|
||||
await f.manager.setEnabled('rocket-launches', true, { origin: 'user' }),
|
||||
true,
|
||||
);
|
||||
await f.settle();
|
||||
assert.equal(f.manager.isEnabled('satellites'), true);
|
||||
// Its own off still gives back the Satellites from before the first start.
|
||||
await f.manager.setEnabled('rocket-launches', false, { origin: 'user' });
|
||||
await f.settle();
|
||||
assert.equal(f.manager.isEnabled('satellites'), false);
|
||||
});
|
||||
|
||||
test('a failed Satellites restore still clears the selected mission panel', async (t) => {
|
||||
|
||||
@@ -108,7 +108,7 @@ export function createIngestion({
|
||||
|
||||
async function captureSatelliteDependency() {
|
||||
const manager = layerState._dataManager;
|
||||
if (!manager || layerState._satelliteStateBeforeMission) return;
|
||||
if (!manager) return;
|
||||
const token = layerState._lifecycleToken;
|
||||
// Let a pending Satellites action finish before reserving dependency ON.
|
||||
// A successful explicit OFF can cancel this mission entry while we wait.
|
||||
@@ -127,12 +127,16 @@ export function createIngestion({
|
||||
!manager.isEffectivelyEnabled('rocket-launches'))
|
||||
)
|
||||
return;
|
||||
layerState._satelliteStateBeforeMission = {
|
||||
enabled: manager.isEnabled('satellites'),
|
||||
params: parts.policyHelpers.satelliteParamsAfterSpaceMissions(
|
||||
manager.getLayerParams('satellites'),
|
||||
),
|
||||
};
|
||||
// A saved state kept by a restore that could not finish (Satellites was
|
||||
// busy) is still the one from before the mission: keep it, and switch
|
||||
// Satellites on for the mission again.
|
||||
if (!layerState._satelliteStateBeforeMission)
|
||||
layerState._satelliteStateBeforeMission = {
|
||||
enabled: manager.isEnabled('satellites'),
|
||||
params: parts.policyHelpers.satelliteParamsAfterSpaceMissions(
|
||||
manager.getLayerParams('satellites'),
|
||||
),
|
||||
};
|
||||
manager.setLayerParams(
|
||||
'satellites',
|
||||
parts.policyHelpers.satelliteParamsForSpaceMissions(
|
||||
@@ -179,18 +183,21 @@ export function createIngestion({
|
||||
layerState._satelliteStateBeforeMission !== snapshot
|
||||
)
|
||||
return;
|
||||
// An accepted Satellites action owns visibility through mission teardown.
|
||||
const restoreVisibility = snapshot.restoreVisibility !== false;
|
||||
// Satellites is still busy: change nothing and keep the saved state, so
|
||||
// turning Space Missions off again can finish the restore.
|
||||
if (restoreVisibility && !idle)
|
||||
throw new Error(
|
||||
'Space Missions could not restore the satellites layer: it did not settle',
|
||||
);
|
||||
layerState._satelliteStateBeforeMission = null;
|
||||
layerState._satelliteActivationPromise = null;
|
||||
manager.setLayerParams(
|
||||
'satellites',
|
||||
parts.policyHelpers.satelliteParamsAfterSpaceMissions(snapshot.params),
|
||||
);
|
||||
// An accepted Satellites action owns visibility through mission teardown.
|
||||
if (snapshot.restoreVisibility === false) return;
|
||||
if (!idle)
|
||||
throw new Error(
|
||||
'Space Missions could not restore the satellites layer: it did not settle',
|
||||
);
|
||||
if (!restoreVisibility) return;
|
||||
const restored = await manager.setEnabled('satellites', snapshot.enabled);
|
||||
if (
|
||||
restored === false ||
|
||||
|
||||
@@ -118,11 +118,15 @@ const label = (
|
||||
entryId,
|
||||
});
|
||||
|
||||
test('a mission label click focuses its launch and stops the click there', (t) => {
|
||||
const r = rig(t, { overlayHit: label('launch:L2') });
|
||||
test('a mission label click focuses its launch and covers the geometry beneath', (t) => {
|
||||
const r = rig(t, { overlayHit: label('launch:L2'), geometryLaunchId: 'L1' });
|
||||
r.click();
|
||||
assert.deepEqual(r.focused, ['L2']);
|
||||
assert.equal(r.ambient.length, 0, 'the layers beneath do not see it');
|
||||
assert.deepEqual(r.focused, ['L2'], 'the mission beneath is not picked');
|
||||
// Other layers still hear it, to close their cards or clear selection,
|
||||
// as a click on the label rather than on the geometry beneath.
|
||||
assert.equal(r.ambient.length, 1);
|
||||
assert.equal(r.ambient[0].overlay, true);
|
||||
assert.equal(r.ambient[0].drawHit, null);
|
||||
|
||||
r.setHit(label('launch:L1', ROCKET_MISSION_SELECTED_OVERLAY_SOURCE_ID));
|
||||
r.click();
|
||||
@@ -156,7 +160,8 @@ test('a throwing globe-pick listener does not stop the pick', (t) => {
|
||||
r.click();
|
||||
assert.deepEqual(r.focused, ['L1']);
|
||||
assert.deepEqual(heard, ['L1']);
|
||||
assert.equal(r.ambient.length, 0);
|
||||
assert.equal(r.ambient.length, 1);
|
||||
assert.equal(r.ambient[0].overlay, true);
|
||||
});
|
||||
|
||||
test('a mission label for an unknown launch falls through to other layers', (t) => {
|
||||
|
||||
@@ -177,3 +177,36 @@ test('without a Satellites action the exit restores the pre-mission visibility',
|
||||
['enabled', 'satellites', false],
|
||||
]);
|
||||
});
|
||||
|
||||
test('a Satellites layer that does not settle keeps the saved state for the next exit', async () => {
|
||||
const r = satelliteRig({ enabledBefore: false });
|
||||
let idle = false;
|
||||
r.state._dataManager.waitForLayerIdle = async () => idle;
|
||||
await assert.rejects(
|
||||
r.ingestion.restoreSatelliteDependency(),
|
||||
/did not settle/,
|
||||
);
|
||||
assert.deepEqual(r.calls, [], 'nothing changes while Satellites is busy');
|
||||
assert.deepEqual(r.state._satelliteStateBeforeMission, {
|
||||
enabled: false,
|
||||
params: { mode: 'before' },
|
||||
});
|
||||
|
||||
// Turning Space Missions off again once Satellites settles finishes it.
|
||||
idle = true;
|
||||
await r.ingestion.restoreSatelliteDependency();
|
||||
assert.deepEqual(r.calls, [
|
||||
['params', 'satellites', { mode: 'before' }],
|
||||
['enabled', 'satellites', false],
|
||||
]);
|
||||
assert.equal(r.state._satelliteStateBeforeMission, null);
|
||||
});
|
||||
|
||||
test('a Satellites action the person took still gets its parameters back when Satellites is busy', async () => {
|
||||
const r = satelliteRig({ enabledBefore: false });
|
||||
r.state._dataManager.waitForLayerIdle = async () => false;
|
||||
r.state._satelliteStateBeforeMission.restoreVisibility = false;
|
||||
await r.ingestion.restoreSatelliteDependency();
|
||||
assert.deepEqual(r.calls, [['params', 'satellites', { mode: 'before' }]]);
|
||||
assert.equal(r.state._satelliteStateBeforeMission, null);
|
||||
});
|
||||
@@ -380,14 +380,20 @@ export function createPanel({ state: layerState, services, parts, source }) {
|
||||
|
||||
function scheduleMissionRosterPreview(index) {
|
||||
const launch = layerState._launches[index];
|
||||
if (!launch || layerState._selectedLaunchId) return;
|
||||
// Once the layer is going off (its Satellites restore may still be
|
||||
// running) hovering or focusing a roster row moves no camera.
|
||||
if (!launch || layerState._selectedLaunchId || !layerState._enabled) return;
|
||||
if (layerState._missionRosterHoverTimer)
|
||||
clearTimeout(layerState._missionRosterHoverTimer);
|
||||
layerState._hoveredRosterLaunchId = launch.id;
|
||||
parts.overlays.syncMissionOverlayEntries();
|
||||
layerState._missionRosterHoverTimer = setTimeout(() => {
|
||||
layerState._missionRosterHoverTimer = null;
|
||||
if (layerState._hoveredRosterLaunchId !== launch.id) return;
|
||||
if (
|
||||
layerState._hoveredRosterLaunchId !== launch.id ||
|
||||
!layerState._enabled
|
||||
)
|
||||
return;
|
||||
const currentLaunch = resolveMissionRosterPreviewLaunch(
|
||||
layerState._launches,
|
||||
launch.id,
|
||||
|
||||
@@ -9,6 +9,7 @@ function fixture() {
|
||||
const state = createState({
|
||||
services: { overlays: {}, render: {} },
|
||||
});
|
||||
state._enabled = true;
|
||||
const calls = [];
|
||||
const parts = {
|
||||
overlays: {
|
||||
@@ -194,3 +195,26 @@ test('the panel commands act on the selected mission', () => {
|
||||
['select', null, undefined],
|
||||
]);
|
||||
});
|
||||
|
||||
test('a roster row hovered or focused while the layer goes off moves no camera', async () => {
|
||||
const { state, panel, calls } = fixture();
|
||||
state._launches = [launch('a'), launch('b')];
|
||||
panel.createMissionPanel();
|
||||
panel.renderMissionRoster();
|
||||
|
||||
// Hovered just before the layer goes off: the pending preview is dropped.
|
||||
panel.commands.rosterPointerEnter(0);
|
||||
state._enabled = false;
|
||||
await new Promise((resolve) => setTimeout(resolve, 160));
|
||||
|
||||
// Hovered or focused after it went off, while the panel still shows.
|
||||
panel.commands.rosterPointerEnter(1);
|
||||
panel.commands.rosterFocus(1);
|
||||
assert.equal(state._missionRosterHoverTimer, null, 'no preview is pending');
|
||||
await new Promise((resolve) => setTimeout(resolve, 160));
|
||||
assert.deepEqual(
|
||||
calls.filter(([name]) => name === 'preview'),
|
||||
[],
|
||||
);
|
||||
panel.clearMissionPanel();
|
||||
});
|
||||
@@ -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 = [];
|
||||
}
|
||||
|
||||
@@ -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({
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -6,6 +6,8 @@ import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
|
||||
import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs';
|
||||
import { NEWS_KEY_PROVIDERS, createNewsLayer } from './index.js';
|
||||
import { getSelectedEntityContext } from '../../data/contextStore.js';
|
||||
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
|
||||
import { NEWS_OVERLAY_SOURCE_ID } from './model.js';
|
||||
|
||||
const NOW = Date.parse('2026-10-28T10:00:00Z');
|
||||
const hotspotsPayload = {
|
||||
@@ -51,6 +53,8 @@ function fixture(
|
||||
now = () => NOW,
|
||||
quality,
|
||||
pictureCards,
|
||||
underLabel = false,
|
||||
hitTestOverlay = () => null,
|
||||
} = {},
|
||||
) {
|
||||
const calls = { feed: [], hotspots: 0, outline: 0 };
|
||||
@@ -137,11 +141,18 @@ function fixture(
|
||||
for (const fn of [...clickHandlers])
|
||||
fn({ screenPosition: { x: 10, y: 10 }, topHit });
|
||||
};
|
||||
// Or the scene's own dispatcher, with a label that may be painted over
|
||||
// the map (`fake.label.over`).
|
||||
let fake = null;
|
||||
if (underLabel) {
|
||||
viewer.scene = { canvas: {}, pick: () => null };
|
||||
fake = fakeInputUnderLabel(viewer);
|
||||
}
|
||||
const layer = createNewsLayer({
|
||||
source,
|
||||
overlayHost,
|
||||
inputFor: () => input,
|
||||
hitTestOverlay: () => null,
|
||||
inputFor: () => fake?.input ?? input,
|
||||
hitTestOverlay,
|
||||
now,
|
||||
matchMedia: () => ({ matches: reduced }),
|
||||
getViewCentre: () => centre(),
|
||||
@@ -158,6 +169,7 @@ function fixture(
|
||||
layer.attachShellServices({ runNavigation: (navigate) => navigate() });
|
||||
t.after(() => {
|
||||
layer.destroy();
|
||||
fake?.destroy();
|
||||
unbind();
|
||||
if (originalWindow === undefined) delete globalThis.window;
|
||||
else globalThis.window = originalWindow;
|
||||
@@ -172,6 +184,7 @@ function fixture(
|
||||
items,
|
||||
click,
|
||||
clickHandlers,
|
||||
fake,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1285,6 +1298,34 @@ test('a click on a marker selects its report, on a beacon chooses its hotspot, o
|
||||
assert.equal(clickHandlers.size, 0);
|
||||
});
|
||||
|
||||
test("a click a label painted over a report's card takes never opens the card, and lets go of the report", async (t) => {
|
||||
let activated = 0;
|
||||
const { layer, fake } = fixture(t, {
|
||||
height: 500_000,
|
||||
underLabel: true,
|
||||
// A report's card lies under every click.
|
||||
hitTestOverlay: (_x, _y, { sourceId }) =>
|
||||
sourceId === NEWS_OVERLAY_SOURCE_ID
|
||||
? { entry: { activate: () => activated++ } }
|
||||
: null,
|
||||
});
|
||||
layer.enable();
|
||||
await layer.update();
|
||||
await flush();
|
||||
layer.setParams({ reportId: 'major', pin: 0 });
|
||||
assert.equal(layer.getRowControls().feed.selected.id, 'major');
|
||||
|
||||
fake.label.over = true;
|
||||
fake.click();
|
||||
assert.equal(activated, 0, 'the card beneath the label is not opened');
|
||||
assert.equal(layer.getRowControls().feed.selected, null);
|
||||
|
||||
// Off the label, the same click opens the card.
|
||||
fake.label.over = false;
|
||||
fake.click();
|
||||
assert.equal(activated, 1);
|
||||
});
|
||||
|
||||
test('zoomed out, a hotspot is one beacon; off, nothing draws; destroyed, the sets go', async (t) => {
|
||||
const { layer, items } = fixture(t);
|
||||
assert.deepEqual(items('points'), []);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { createFirePerimetersLayer } from './index.js';
|
||||
import { fakeInput } from '../../input/testDoubles.mjs';
|
||||
import { fakeInput, fakeInputUnderLabel } from '../../input/testDoubles.mjs';
|
||||
import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
|
||||
|
||||
// The fills set of the layer the last harness made: perimeter picks name it.
|
||||
@@ -30,11 +30,12 @@ function harness(
|
||||
const opened = [];
|
||||
const viewer = { scene: { pick } };
|
||||
const { draw } = bindFakeDraw(viewer);
|
||||
const input = fakeInput(viewer);
|
||||
const input = fakeInputUnderLabel(viewer);
|
||||
const clicks = {
|
||||
handler: (click) => input.click(click.position),
|
||||
// Only the label's own overlay handler is left.
|
||||
get destroyed() {
|
||||
return input.input.subscriberCount() === 0 ? 1 : 0;
|
||||
return input.input.subscriberCount() === 1 ? 1 : 0;
|
||||
},
|
||||
};
|
||||
const layer = createFirePerimetersLayer({
|
||||
@@ -78,6 +79,8 @@ function harness(
|
||||
clicks,
|
||||
owners,
|
||||
opened,
|
||||
/** A label painted over the map: while `over`, it takes each click. */
|
||||
label: input.label,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -311,6 +314,53 @@ test('a matched incident card carries the InciWeb line and click-through', async
|
||||
);
|
||||
});
|
||||
|
||||
test('a click a label painted over the incident card takes never opens its InciWeb page, and closes the card', async () => {
|
||||
let cardHitResult = null;
|
||||
const h = harness(
|
||||
{ getSnapshot: async () => [row] },
|
||||
{
|
||||
pick: () => perimeterPick('fire-perimeter:2026-NMGNF-000123:0'),
|
||||
inciwebIndex: [
|
||||
{
|
||||
incident_id: '329300',
|
||||
tau: 'NMGNF Fixture Fire',
|
||||
incident_title: 'Fixture Fire',
|
||||
},
|
||||
],
|
||||
cardHit: () => cardHitResult,
|
||||
},
|
||||
);
|
||||
await h.layer.update(h.viewer);
|
||||
h.clicks.handler({ position: { x: 10, y: 10 } });
|
||||
await new Promise((done) => setTimeout(done, 0));
|
||||
const [card] = h.overlay.entries.get('fire-perimeters');
|
||||
assert.equal(card.details.at(-1), 'InciWeb ↗ · click card to open');
|
||||
|
||||
// The open card lies under the label: the click opens nothing.
|
||||
cardHitResult = { entryId: card.id };
|
||||
h.viewer.scene.pick = () => null;
|
||||
h.label.over = true;
|
||||
h.clicks.handler({ position: { x: 12, y: 12 } });
|
||||
assert.deepEqual(h.opened, [], 'the page beneath the label is not opened');
|
||||
assert.equal(
|
||||
h.overlay.entries.get('fire-perimeters')?.length ?? 0,
|
||||
0,
|
||||
'the card is closed',
|
||||
);
|
||||
|
||||
// Off the label, a click on the open card opens its page.
|
||||
h.label.over = false;
|
||||
h.viewer.scene.pick = () =>
|
||||
perimeterPick('fire-perimeter:2026-NMGNF-000123:0');
|
||||
h.clicks.handler({ position: { x: 10, y: 10 } });
|
||||
await new Promise((done) => setTimeout(done, 0));
|
||||
cardHitResult = { entryId: h.overlay.entries.get('fire-perimeters')[0].id };
|
||||
h.viewer.scene.pick = () => null;
|
||||
h.clicks.handler({ position: { x: 12, y: 12 } });
|
||||
assert.deepEqual(h.opened, ['https://inciweb.wildfire.gov/node/329300']);
|
||||
h.layer.destroy();
|
||||
});
|
||||
|
||||
test('an unmatched incident renders no InciWeb line and card clicks stay inert', async () => {
|
||||
let cardHitResult = null;
|
||||
const h = harness(
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
@@ -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) {
|
||||
|
||||
@@ -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']);
|
||||
});
|
||||
@@ -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;
|
||||
|
||||
@@ -2,6 +2,7 @@ import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { createSelection } from './selection.js';
|
||||
import { bindWildlifeViewer } from '../../testSupport/wildlifeViewer.mjs';
|
||||
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
|
||||
|
||||
const row = {
|
||||
stableId: 'inat:123',
|
||||
@@ -304,6 +305,35 @@ test('empty clicks and layer removal release the selected row and its overlay',
|
||||
assert.equal(f.entries.size, 0);
|
||||
});
|
||||
|
||||
test("a click a label painted over a sighting's card takes never selects the sighting, and lets go of the selected one", (t) => {
|
||||
let fake = null;
|
||||
const f = fixture(row, {
|
||||
input: (viewer) => {
|
||||
fake ??= fakeInputUnderLabel(viewer);
|
||||
return fake.input;
|
||||
},
|
||||
});
|
||||
f.selection.install();
|
||||
t.after(() => {
|
||||
f.selection.remove();
|
||||
fake.destroy();
|
||||
});
|
||||
f.selection.refreshAmbient();
|
||||
// The sighting's name card lies under every click.
|
||||
f.hit('wildlife-sightings-labels', 'wildlife-sightings-label:inat:123');
|
||||
|
||||
// Off the label, a click on the card selects and focuses the sighting.
|
||||
fake.click();
|
||||
assert.equal(f.state.selectedId, row.stableId);
|
||||
assert.equal(f.flights.length, 1);
|
||||
|
||||
fake.label.over = true;
|
||||
fake.click();
|
||||
assert.equal(f.state.selectedId, null, 'the selected sighting is let go');
|
||||
assert.equal(f.state.selectedRow, null);
|
||||
assert.equal(f.flights.length, 1, 'the camera is not sent to the sighting');
|
||||
});
|
||||
|
||||
test('a tap selects only a sighting exactly under it, not one the touch search found near it', () => {
|
||||
const f = fixture();
|
||||
f.selection.install();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 }),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user