diff --git a/changelog.d/1829-space-missions-fixes.md b/changelog.d/1829-space-missions-fixes.md new file mode 100644 index 0000000000..626defeb94 --- /dev/null +++ b/changelog.d/1829-space-missions-fixes.md @@ -0,0 +1,9 @@ +- Space Missions going off no longer acts on a launch hovered, selected or + replayed meanwhile, and Satellites keeps the state it was saved with when + it is still busy (unless it was switched on or off by hand meanwhile); a + Satellites setting changed during a mission, such as a place search ending + tracking, is kept when the mission ends. A click on a mission label is a + click on the card on top, so no layer selects, turns on, flies to or opens + the link of what lies under it; in the cockpit a mission chosen by its + label, its dot or the row's arrows is selected without moving the camera + (manjunath22466, samehkhamis, #1829). diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 721350646a..5803d88fbf 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -5677,7 +5677,13 @@ 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; after an explicit +> Satellites on/off action, which keeps its visibility, the parameters are +> restored all the same and the saved state is let go. 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` @@ -7419,7 +7425,7 @@ silently demoting every later lookup for the session. - Context is set for reading in every theme: mode, standby and action labels are 10 px, and the panel draws no glow halo. The two modes form one segmented control, the standby guidance is plain left-aligned text rather than a dashed placeholder, and the panel's section titles share the side panels' dock-label colour. - The expanded desktop header omits the redundant `ON` label; the active mode button carries state. Expanded Contact results also omit the duplicate `GLOBAL CONTEXT` / `CONTEXT ONLY` status row and begin with the selected subject and its 250 km scope. Global Context does not fabricate a selected-entity model preview: the provisional hand-authored aircraft wireframe was removed because it was not geometry extracted from the selected entity's actual asset. - Dependency ownership is reversible: disabling Global Context releases only dependencies it enabled, while user-enabled layers remain on. This also removes the Military-layer suppression handoff when Global Context owned Military, allowing an already-enabled civilian Flights layer to resume its normal mixed rendering. If OpenSky is unavailable and has no last-good cache, Flights requests a capped 250 nm adsb.lol point snapshot around the current view anchor and labels that provenance explicitly; it never relabels military-feed rows as civilian data. If both inputs fail, Flights remains `UNKNOWN`. -- Space Missions is an ordinary layer, not a Context mode. It neither isolates the globe nor refuses other layers, opens no Context session, and runs beside Contacts. Turning it on enables its Satellites dependency in the temporary dense/hidden mode and turning it off restores Satellites' exact prior visibility and parameters; an explicit Satellites action taken while it runs (by the person or by voice) is kept through that restore, and such a Satellites OFF asked for after the newest Space Missions ON ends Space Missions (request order, not settle order, decides; `src/layers/launches/satelliteIntents.js`). A scene, story, preset or other programmatic Satellites change does neither (owner decision). Contacts leaves Satellites as it is. The first mission-index load is part of the enable: an HTTP error, timeout, network failure or malformed payload before any index has loaded fails the enable, the camera returns to its pre-entry view unless navigation took it, and a toast says the mission index could not load. A valid empty index still enables, and a refresh failure after an index loaded keeps its records. Turning the layer on by hand, choosing it at first run, asking for it by voice (`set_context_mode` still accepts `space-missions` and switches the layer), or picking a mission on the globe opens the Space Missions panel; on desktop, opening it closes Context and the other right-rail panels, and opening Context closes it. Voice `set_panel_open` refuses to open the panel while the layer is off and says to turn Space Missions on first. +- Space Missions is an ordinary layer, not a Context mode. It neither isolates the globe nor refuses other layers, opens no Context session, and runs beside Contacts. Turning it on enables its Satellites dependency in the temporary dense/hidden mode and turning it off restores Satellites' exact prior visibility and parameters; an explicit Satellites action taken while it runs (by the person or by voice), a visibility switch or a changed setting (also a place search that stops tracking a satellite), is kept through that restore (also while a restore that found Satellites busy keeps the saved state, for the next Space Missions start, which switches Satellites on again), and such a Satellites OFF asked for after the newest Space Missions ON ends Space Missions (request order, not settle order, decides; `src/layers/launches/satelliteIntents.js`). A scene, story, preset or other programmatic Satellites change does neither (owner decision). Contacts leaves Satellites as it is. The first mission-index load is part of the enable: an HTTP error, timeout, network failure or malformed payload before any index has loaded fails the enable, the camera returns to its pre-entry view unless navigation took it, and a toast says the mission index could not load. A valid empty index still enables, and a refresh failure after an index loaded keeps its records. Turning the layer on by hand, choosing it at first run, asking for it by voice (`set_context_mode` still accepts `space-missions` and switches the layer), or picking a mission on the globe opens the Space Missions panel; on desktop, opening it closes Context and the other right-rail panels, and opening Context closes it. Voice `set_panel_open` refuses to open the panel while the layer is off and says to turn Space Missions on first. - Enabled Data Layer controls report normalized feed health on the button (`LOADING`, `DEGRADED`, `STALE`, `FALLBACK`, or `UNAVAILABLE`) while the metadata line retains the source and reason. A partial CelesTrak group failure keeps the usable catalog and reports `DEGRADED`; a total outage keeps last-good catalog data visible but reports `UNAVAILABLE`. - On activation it focuses the nearest currently observed aircraft across the civilian and military feeds, with military winning an exact distance tie; if none are available, it focuses an observed AIS vessel. The aircraft search is deliberately uncapped and one refresh-tick retry handles initially empty feeds. This is an attention-priority navigation shortcut, not a high-risk, affiliation, or threat classification. - A selected aircraft, AIS vessel, or mapped installation gets a 250 km **context window** with nearby cohort counts, nearest examples, source labels, and stale/unavailable reasons. It emits `NEARBY` or `UNKNOWN`; no detection, engagement, affiliation, or sensor-activity conclusion is calculated. @@ -7576,7 +7582,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 values omit their detail rows instead of reserving panel space with placeholders. Newly launched payloads absent from the core operational groups use CelesTrak's cached active TLE feed as a lookup-only fallback; weak constellation-name matches are rejected. The replay callout maps compressed animation progress onto Launch Library's mission-relative timeline, showing the historical UTC date/time at the marker's current path position; unavailable timelines remain explicit. Matched live satellite positions propagate at one-second cadence and use a distinct green dot/callout with the current UTC date/time. +- **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 (in the cockpit, which holds the camera, a mission chosen by its name, its dot or the layer row's arrows is selected without flying to it, also once its orbit arrives); what is drawn beneath the name is not picked, and the other layers still hear the click as one on the name. The name is an interactive world-overlay label, so it is the card on top for every click handler (`clickCard`, `isUnderOtherCard` in `src/data/pickRegistry.js`): no other layer selects, turns on, focuses or opens the link of a contact, card or camera that lies under the name, and their selections stay. 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 values omit their detail rows instead of reserving panel space with placeholders. Newly launched payloads absent from the core operational groups use CelesTrak's cached active TLE feed as a lookup-only fallback; weak constellation-name matches are rejected. The replay callout maps compressed animation progress onto Launch Library's mission-relative timeline, showing the historical UTC date/time at the marker's current path position; unavailable timelines remain explicit. Matched live satellite positions propagate at one-second cadence and use a distinct green dot/callout with the current UTC date/time. 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. diff --git a/scripts/format-scope.json b/scripts/format-scope.json index 4cc86bda7c..d2f4f549a3 100644 --- a/scripts/format-scope.json +++ b/scripts/format-scope.json @@ -666,6 +666,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", @@ -1608,7 +1609,8 @@ "src/ui/styles/omnibar-dock.css", "src/ui/styles/guide.css", "src/ui/commandDock.test.mjs", + "src/layers/firms/selection.test.mjs", + "src/layers/vessels/selection.test.mjs", "src/layers/bikeshare/selection.test.mjs", - "src/layers/satellites/interaction.test.mjs", - "src/layers/alpr/presentation.test.mjs" + "src/layers/satellites/interaction.test.mjs" ] diff --git a/src/input/dispatcher.js b/src/input/dispatcher.js index b5c8fa86cf..6ae4e125c0 100644 --- a/src/input/dispatcher.js +++ b/src/input/dispatcher.js @@ -182,6 +182,12 @@ 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 + * target the world overlay paints (a Space Missions label) is also the + * card on top for every handler (`clickCard` in src/data/pickRegistry.js), + * so nothing under it acts. * @property {(width: number, height: number) => unknown} pickWindow * `native.pickWindow`, the same. */ @@ -192,7 +198,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 +339,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 +348,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 +450,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 +463,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 +483,25 @@ function createClickEvent(viewer, queryOf, at, gesture) { }; /** @type {Map} */ 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 +547,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 +568,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 +601,5 @@ function createClickEvent(viewer, queryOf, at, gesture) { return native()?.native.pickWindow(width, height); }, }; + return { event, cover }; } diff --git a/src/input/dispatcher.test.mjs b/src/input/dispatcher.test.mjs index c88e1af8b1..965c63374d 100644 --- a/src/input/dispatcher.test.mjs +++ b/src/input/dispatcher.test.mjs @@ -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()); diff --git a/src/input/testDoubles.mjs b/src/input/testDoubles.mjs index 028e88e5fa..93c74b15a3 100644 --- a/src/input/testDoubles.mjs +++ b/src/input/testDoubles.mjs @@ -18,6 +18,8 @@ import { rendererOf } from '../render/rendererOf.js'; import { fakeScenePicks } from '../testSupport/fakeCesiumScene.mjs'; import { provideStyleStageAlias } from '../styles/styleStages.js'; import { inputFor } from './dispatcher.js'; +import { setClickCardHitTest } from '../data/pickRegistry.js'; +import { ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID } from '../layers/launches/policy.js'; /** Cesium's own event types, the ones the input port binds. */ export const FAKE_EVENT_TYPES = Cesium.ScreenSpaceEventType; @@ -140,3 +142,40 @@ export function fakeInput(viewer, { now } = {}) { destroy: () => input.destroy(), }; } + +/** The Space Missions label {@link fakeInputUnderLabel} paints: an + * interactive entry of the missions' world-overlay source. */ +export const MISSION_LABEL = Object.freeze({ + sourceId: ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID, + entryId: 'launch:L1', +}); + +/** + * `fakeInput` with a Space Missions label painted over the map: 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, and the pick registry names it as the card on top + * (`clickCard`), as the world-overlay host's hit test names an interactive + * mission label. `destroy` also clears that hit test. + * @param {object} viewer + * @param {{now?: () => number, beneath?: () => ({sourceId: string, entryId: string}|null)}} [options] + * `beneath`: the card painted under the label, on top when the label is + * not over the click. + */ +export function fakeInputUnderLabel( + viewer, + { beneath = () => null, ...options } = {}, +) { + const fake = fakeInput(viewer, options); + const label = { over: false }; + fake.input.onOverlayClick(() => label.over); + setClickCardHitTest(() => (label.over ? MISSION_LABEL : beneath())); + return { + ...fake, + label, + destroy() { + setClickCardHitTest(null); + fake.destroy(); + }, + }; +} diff --git a/src/layers/alpr/presentation.test.mjs b/src/layers/alpr/presentation.test.mjs index 1232de5665..c74dfe802f 100644 --- a/src/layers/alpr/presentation.test.mjs +++ b/src/layers/alpr/presentation.test.mjs @@ -1,8 +1,127 @@ import test from 'node:test'; import assert from 'node:assert/strict'; -import { createAlprPresentation } from './presentation.js'; -import { fakeInput } from '../../input/testDoubles.mjs'; +import * as Cesium from 'cesium'; +import { fakeInput, fakeInputUnderLabel } from '../../input/testDoubles.mjs'; import { setClickCardHitTest } from '../../data/pickRegistry.js'; +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 on a mission label over a camera never selects it, and keeps 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'); + + // The label on top is its own click: the selection stays. + h.fake.label.over = true; + h.fake.click(h.at); + assert.equal(h.state.selectedId, 'camera:0', 'the selection stays'); +}); // The card or label painted on top takes the click: ALPR does not even pick // under another layer's card, so no camera is selected or released there. diff --git a/src/layers/cctv/lifecycle.test.mjs b/src/layers/cctv/lifecycle.test.mjs index a95c0b9ecd..d8c3a4d8e9 100644 --- a/src/layers/cctv/lifecycle.test.mjs +++ b/src/layers/cctv/lifecycle.test.mjs @@ -3,7 +3,7 @@ import assert from 'node:assert/strict'; import { createLifecycle } from './lifecycle.js'; import { createSelection } from './selection.js'; import { CCTV_OVERLAY_SOURCE_ID } from '../../data/cctvCards.js'; -import { fakeInput } from '../../input/testDoubles.mjs'; +import { fakeInput, fakeInputUnderLabel } from '../../input/testDoubles.mjs'; import * as picking from '../../data/pickRegistry.js'; import { bindRenderer } from '../../render/rendererOf.js'; import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs'; @@ -77,6 +77,82 @@ test('the view listeners follow the camera port and let go on teardown', () => { 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 on a mission label over a camera's card never turns that camera on, and keeps the active one", async (t) => { + const { viewer } = viewerWithCamera(); + viewer.scene = { canvas: {}, pick: () => null }; + // The card of camera `cam-1` lies under every click, under the label. + const fake = fakeInputUnderLabel(viewer, { + beneath: () => ({ sourceId: CCTV_OVERLAY_SOURCE_ID, entryId: 'cam-1' }), + }); + t.after(() => fake.destroy()); + const activated = []; + const deactivated = []; + const state = {}; + const lifecycle = createLifecycle({ + state, + services: { + activation: { + activateCctvCameraFromWorldClick: (id) => activated.push(id), + }, + picking, + 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) && picking.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', {}); + + fake.label.over = true; + fake.click(); + assert.deepEqual(activated, [], 'the camera under the label stays off'); + assert.deepEqual(deactivated, [], 'the active camera stays on'); + + // Off the label, a click on the card turns its camera on. + fake.label.over = false; + fake.click(); + assert.deepEqual(activated, ['cam-1']); +}); + test('the card painted on top takes world clicks, whatever is drawn under it', async (t) => { const noop = () => {}; const { viewer } = viewerWithCamera(); diff --git a/src/layers/droneAirspace/ownership.test.mjs b/src/layers/droneAirspace/ownership.test.mjs index 30045280a6..2a40e510f0 100644 --- a/src/layers/droneAirspace/ownership.test.mjs +++ b/src/layers/droneAirspace/ownership.test.mjs @@ -2,7 +2,8 @@ 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 { clickCard } from '../../data/pickRegistry.js'; +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 +20,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({ @@ -48,7 +50,9 @@ function harness(source, { pick = () => null, cardHit = () => null } = {}) { registerPickOwner: (layerId, predicate) => owners.set(layerId, predicate), unregisterPickOwner: (layerId) => owners.delete(layerId), // The card on top at a click, as the registry answers from the host. + // A mission label painted over everything comes first. clickCard: (click) => + clickCard(click) ?? cardHit(click.screenPosition?.x, click.screenPosition?.y, {}), }, }); @@ -64,6 +68,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, }; } @@ -146,6 +152,40 @@ 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 on a mission label over the open zone card keeps it open and takes no zone beneath', 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'); + + // The open card and its zone lie under the label: the label on top is + // its own click, so the card stays open. + cardHitResult = { sourceId: 'drone-airspace', entryId: card.id }; + h.label.over = true; + h.clicks.handler({ position: { x: 12, y: 12 } }); + assert.equal(h.overlay.entries.get('drone-airspace')?.[0]?.id, card.id); + pickResult = null; + cardHitResult = null; + h.clicks.handler({ position: { x: 12, y: 12 } }); + assert.equal( + h.overlay.entries.get('drone-airspace')?.[0]?.id, + card.id, + 'a label over bare map is not empty space either', + ); + + // Off the label, the same click on bare map closes the card. + h.label.over = false; + h.clicks.handler({ position: { x: 12, y: 12 } }); + assert.equal(h.overlay.entries.get('drone-airspace')?.length ?? 0, 0); + h.layer.destroy(); +}); + // Another layer's card or label painted over the area (a quake's card or // magnitude label) is that layer's click: the area under it stands aside. test("another layer's overlay on top keeps a click off the area", async () => { diff --git a/src/layers/firms/selection.test.mjs b/src/layers/firms/selection.test.mjs new file mode 100644 index 0000000000..4c55729dfe --- /dev/null +++ b/src/layers/firms/selection.test.mjs @@ -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 { clickCard, 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 Space Missions label may + * take, with a fire's card under every click. */ +function selectionHarness(t) { + const viewer = { scene: { canvas: {}, pick: () => null } }; + const fake = fakeInputUnderLabel(viewer, { + beneath: () => ({ + sourceId: FIRMS_OVERLAY_SOURCE_ID, + entryId: 'firms-card:1', + }), + }); + 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, clickCard }, + 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', + }, + }); + selection.installClickHandler(); + t.after(() => selection.removeClickHandler()); + return { fake, layerState, fire, focused, cleared }; +} + +test("a click on a mission label over a fire's card 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 on a mission label keeps 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']); + // The label on top is its own click: the fire stays selected. + h.fake.label.over = true; + h.fake.click(); + assert.equal(h.layerState._selectedFire, h.fire); + assert.deepEqual(h.cleared, []); + assert.deepEqual(h.focused, ['fire']); +}); diff --git a/src/layers/ghostMaps/lifecycle.test.mjs b/src/layers/ghostMaps/lifecycle.test.mjs index f6bb3389bd..9bf2c8648d 100644 --- a/src/layers/ghostMaps/lifecycle.test.mjs +++ b/src/layers/ghostMaps/lifecycle.test.mjs @@ -1,8 +1,11 @@ import assert from 'node:assert/strict'; import test from 'node:test'; import { setLocale } from '../../i18n/index.js'; -import { createGhostMapsLayer } from './index.js'; +import { createGhostMapsLayer, GHOSTMAPS_OVERLAY_SOURCE_ID } from './index.js'; import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs'; +import { inputFor } from '../../input/dispatcher.js'; +import { MISSION_LABEL } from '../../input/testDoubles.mjs'; +import { clickCard, setClickCardHitTest } from '../../data/pickRegistry.js'; import { GHOSTMAPS_PRODUCTS, GHOSTMAPS_LATEST_DROP } from './catalog.js'; function element(localName, children = [], value = '', attributes = {}) { @@ -673,6 +676,57 @@ test('narrowing to a window the loaded data covers clears a failed wider reload' assert.equal(layer.getStats().count, 1); }); +test("a click on a mission label over the open card never opens the card's link, and keeps the card open", async (t) => { + const cards = []; + const opened = []; + let cardUnder = null; + // A Space Missions label painted over the map: while it is over, it takes + // each click and is the card on top; under it may lie our open card. + let labelOver = false; + setClickCardHitTest(() => + labelOver + ? MISSION_LABEL + : cardUnder + ? { sourceId: GHOSTMAPS_OVERLAY_SOURCE_ID, entryId: cardUnder } + : null, + ); + t.after(() => setClickCardHitTest(null)); + const { layer, viewer, click } = fixture(t, { + now: () => Date.UTC(2026, 10, 3, 12), + reports: [ + { + name: 'Linked', + description: + '' + + '
Date11/2/2026
Sourcereport
', + }, + ], + controls: { + overlayHost: { setEntries: (_id, entries) => cards.push(entries) }, + picking: { resolvePickId: (picked) => picked?.id ?? null, clickCard }, + openExternal: (url) => opened.push(url), + }, + }); + 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, and the + // label on top is its own click, so the card stays open. + cardUnder = card.id; + labelOver = true; + click(null); + assert.deepEqual(opened, [], 'the link beneath the label is not opened'); + assert.equal(cards.at(-1)[0]?.id, card.id, 'the card stays open'); + + // Off the label, a click on the open card opens its link. + labelOver = false; + click(null); + assert.deepEqual(opened, ['https://example.com/report']); +}); + test('a covered selected card yields while genuine GhostMaps markers still select', async (t) => { const cards = []; const opened = []; diff --git a/src/layers/launches/clickYield.test.mjs b/src/layers/launches/clickYield.test.mjs index 62dc8c31d4..6e79243749 100644 --- a/src/layers/launches/clickYield.test.mjs +++ b/src/layers/launches/clickYield.test.mjs @@ -1,6 +1,11 @@ import assert from 'node:assert/strict'; import test from 'node:test'; import { createLifecycle } from './lifecycle.js'; +import { createOverlays } from './overlays.js'; +import { + ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID, + ROCKET_MISSION_SELECTED_OVERLAY_SOURCE_ID, +} from './policy.js'; import { fakeInput } from '../../input/testDoubles.mjs'; import * as picking from '../../data/pickRegistry.js'; @@ -10,9 +15,10 @@ const stubs = (given = {}) => get: (target, key) => (key in target ? target[key] : () => undefined), }); -// Mission overlays are not interactive: an overlay entry under the pointer is -// another layer's card or label painted over the mission (a quake label), and -// that layer takes the click, so the mission is not also selected. +// A mission label on top takes its click through the overlay handler first; +// here an overlay entry under the pointer is another layer's card or label +// painted over the mission (a quake label), and that layer takes the click, +// so the mission is not also selected. test('a card painted over a launch marker keeps its click; with none the mission selects', () => { const viewer = { scene: { @@ -66,3 +72,38 @@ test('a card painted over a launch marker keeps its click; with none the mission input.destroy(); } }); + +// A mission label is an interactive world-overlay entry, so the host's hit +// test names it and every other layer reads it as the card on top: a click +// on it never acts on what lies under it. +test('a mission label is the card on top for every other layer', (t) => { + const overlays = createOverlays({ + state: {}, + services: {}, + parts: {}, + source: {}, + }); + const launch = { + id: 'L1', + name: 'Starlink Group 1', + launchTime: '2026-11-01T00:00:00Z', + }; + for (const selected of [false, true]) { + const entry = overlays.createRocketMissionMarkerOverlayEntry( + launch, + { x: 1, y: 2, z: 3 }, + selected, + ); + assert.equal(entry.interactive, true, `selected: ${selected}`); + } + for (const sourceId of [ + ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID, + ROCKET_MISSION_SELECTED_OVERLAY_SOURCE_ID, + ]) { + picking.setClickCardHitTest(() => ({ sourceId, entryId: 'launch:L1' })); + t.after(() => picking.setClickCardHitTest(null)); + const click = { screenPosition: { x: 10, y: 10 } }; + assert.equal(picking.isUnderOtherCard(click, ['vessels']), true); + assert.equal(picking.isUnderOtherCard(click, [sourceId]), false); + } +}); diff --git a/src/layers/launches/failedEntry.test.mjs b/src/layers/launches/failedEntry.test.mjs index de7b8719b3..40436d7a9e 100644 --- a/src/layers/launches/failedEntry.test.mjs +++ b/src/layers/launches/failedEntry.test.mjs @@ -623,6 +623,153 @@ 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 Satellites switch made between missions is what the next mission gives back', 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(); + // The person switches Satellites on, then something else switches it off. + await f.manager.setEnabled('satellites', true, { origin: 'user' }); + await f.settle(); + await f.manager.setEnabled('satellites', false); + await f.settle(); + assert.equal( + await f.manager.setEnabled('rocket-launches', true, { origin: 'user' }), + true, + ); + await f.settle(); + assert.equal(f.manager.isEnabled('satellites'), true); + await f.manager.setEnabled('rocket-launches', false, { origin: 'user' }); + await f.settle(); + assert.equal(f.manager.isEnabled('satellites'), false); +}); + +test('a Satellites setting changed between missions survives the next one', 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(); + f.manager.setLayerParams( + 'satellites', + { showOrbits: false }, + { origin: 'user' }, + ); + await f.settle(); + await f.manager.setEnabled('rocket-launches', true, { origin: 'user' }); + await f.settle(); + await f.manager.setEnabled('rocket-launches', false, { origin: 'user' }); + await f.settle(); + assert.equal(f.manager.getLayerParams('satellites').showOrbits, false); +}); + +test('tracking stopped by a place search during a mission stays stopped after it', 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.manager.setLayerParams( + 'satellites', + { selectedSatTrackingId: 25544 }, + { origin: 'voice' }, + ); + await f.settle(); + // A place search stops tracking with the tool origin. + f.manager.setLayerParams( + 'satellites', + { selectedSatTrackingId: null }, + { origin: 'tool' }, + ); + await f.settle(); + await f.manager.setEnabled('rocket-launches', false, { origin: 'user' }); + await f.settle(); + assert.equal( + f.manager.getLayerParams('satellites').selectedSatTrackingId ?? null, + null, + ); }); test('a failed Satellites restore still clears the selected mission panel', async (t) => { diff --git a/src/layers/launches/ingestion.js b/src/layers/launches/ingestion.js index 35a4c47771..d16bd398b4 100644 --- a/src/layers/launches/ingestion.js +++ b/src/layers/launches/ingestion.js @@ -1,4 +1,8 @@ -import { MAX_POST_TLE_RETRIES, POST_TLE_RETRY_DELAY_MS } from './policy.js'; +import { + MAX_POST_TLE_RETRIES, + POST_TLE_RETRY_DELAY_MS, + cockpitActive, +} from './policy.js'; /** * Let pending Satellites work finish, including requests that join it while @@ -108,7 +112,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 +131,24 @@ 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. A Satellites switch the person + // made since (restoreVisibility false) settled its visibility, so it + // is taken as it is now; its params are still the saved ones. + const kept = layerState._satelliteStateBeforeMission; + if (kept?.restoreVisibility === false) + layerState._satelliteStateBeforeMission = { + enabled: manager.isEnabled('satellites'), + params: kept.params, + }; + else if (!kept) + layerState._satelliteStateBeforeMission = { + enabled: manager.isEnabled('satellites'), + params: parts.policyHelpers.satelliteParamsAfterSpaceMissions( + manager.getLayerParams('satellites'), + ), + }; manager.setLayerParams( 'satellites', parts.policyHelpers.satelliteParamsForSpaceMissions( @@ -179,18 +195,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 || @@ -249,7 +268,9 @@ export function createIngestion({ parts.selection.setSelectedMission(null, false); } else { parts.selection.setSelectedMission(layerState._selectedLaunchId, true); - if (layerState._focusAfterActiveLookup) { + // The cockpit holds the camera: a mission picked there is not flown + // to when its orbit arrives. + if (layerState._focusAfterActiveLookup && !cockpitActive()) { parts.selection.focusMission( launches.find( (launch) => launch.id === layerState._selectedLaunchId, diff --git a/src/layers/launches/labelClick.test.mjs b/src/layers/launches/labelClick.test.mjs index 592b5ccaaf..bd44c62187 100644 --- a/src/layers/launches/labelClick.test.mjs +++ b/src/layers/launches/labelClick.test.mjs @@ -54,6 +54,7 @@ function rig(t, { overlayHit = null, geometryLaunchId = null } = {}) { }; const state = createState({ services }); const focused = []; + const moved = []; const restoreFailure = { error: null }; const parts = { panel: stub(), @@ -63,6 +64,7 @@ function rig(t, { overlayHit = null, geometryLaunchId = null } = {}) { orbitRendering: stub(), selection: stub({ setSelectedMission: (id) => focused.push(id), + focusMission: (launch) => moved.push(launch.id), }), satelliteIntents: stub(), ingestion: stub({ @@ -97,6 +99,7 @@ function rig(t, { overlayHit = null, geometryLaunchId = null } = {}) { }); return { focused, + moved, ambient, state, lifecycle, @@ -118,11 +121,16 @@ 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, as a click on the label rather than on the + // geometry beneath; the label is the card on top, so they keep their + // selections. + 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,17 +164,20 @@ 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) => { +test('a mission label for an unknown launch selects nothing', (t) => { const r = rig(t, { overlayHit: label('launch:gone'), geometryLaunchId: 'L1', }); r.click(); assert.deepEqual(r.focused, [], 'nothing is focused'); - assert.equal(r.ambient.length, 1, 'other layers still get the click'); + // Other layers hear the click; the label is still the card on top for + // them (clickYield.test.mjs), so none acts under it. + assert.equal(r.ambient.length, 1); }); test("another layer's label keeps the click above mission geometry", (t) => { @@ -185,8 +196,8 @@ test("another layer's label keeps the click above mission geometry", (t) => { assert.deepEqual(r.focused, ['L1']); }); -test('a mission label leaves the click to the cockpit while it is on', (t) => { - const r = rig(t, { overlayHit: label('launch:L2') }); +test('in the cockpit a mission label or dot selects its mission without moving the camera', (t) => { + const r = rig(t, { overlayHit: label('launch:L2'), geometryLaunchId: 'L1' }); const previous = Object.getOwnPropertyDescriptor(globalThis, 'document'); Object.defineProperty(globalThis, 'document', { configurable: true, @@ -200,8 +211,28 @@ test('a mission label leaves the click to the cockpit while it is on', (t) => { if (previous) Object.defineProperty(globalThis, 'document', previous); else delete globalThis.document; } - assert.deepEqual(r.focused, []); - assert.equal(r.ambient.length, 1, 'the cockpit click handler gets it'); + assert.deepEqual(r.focused, ['L2'], 'the mission is selected'); + assert.deepEqual(r.moved, [], 'the cockpit keeps the camera'); + // The dot, with no label over it, does the same. + r.setHit(null); + Object.defineProperty(globalThis, 'document', { + configurable: true, + value: { + body: { classList: { contains: (name) => name === 'cockpit-mode' } }, + }, + }); + try { + r.click(); + } finally { + if (previous) Object.defineProperty(globalThis, 'document', previous); + else delete globalThis.document; + } + assert.deepEqual(r.focused, ['L2', 'L1']); + assert.deepEqual(r.moved, []); + r.setHit(label('launch:L2')); + // Out of the cockpit the same click moves there too. + r.click(); + assert.deepEqual(r.moved, ['L2']); }); test('destroy releases the click handlers when the Satellites restore fails', async (t) => { diff --git a/src/layers/launches/lifecycle.js b/src/layers/launches/lifecycle.js index 2e67cba364..947c4750d1 100644 --- a/src/layers/launches/lifecycle.js +++ b/src/layers/launches/lifecycle.js @@ -5,6 +5,7 @@ import { worldClock } from '../../time/worldClock.js'; import { ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID, ROCKET_MISSION_SELECTED_OVERLAY_SOURCE_ID, + cockpitActive, } from './policy.js'; const HOVER_PICK_INTERVAL_MS = 120; @@ -154,13 +155,6 @@ function restoreCameraView(viewer, view, landedView) { /** The longest name a timeline mark carries, as in the mission index. */ const MARK_LABEL_LENGTH = 27; -/** Whether the cockpit view is on. */ -function cockpitActive() { - return Boolean( - globalThis.document?.body?.classList?.contains?.('cockpit-mode'), - ); -} - function markerLaunchId(hit) { if ( hit?.sourceId !== ROCKET_MISSION_AMBIENT_OVERLAY_SOURCE_ID && @@ -181,12 +175,12 @@ export function createLifecycle({ services.overlays?.hitTestWorldOverlay?.(position?.x, position?.y); const missionsShown = () => layerState._enabled && parts.rendering.missionsShown(); - const focusLaunch = (id) => { + const focusLaunch = (id, { move = true } = {}) => { if (!id) return false; const launch = layerState._launches.find((entry) => entry.id === id); if (!launch) return false; parts.selection.setSelectedMission(launch.id); - parts.selection.focusMission(launch); + if (move) parts.selection.focusMission(launch); for (const listener of [...layerState._globePickListeners]) { try { listener(launch.id); @@ -245,14 +239,16 @@ export function createLifecycle({ const input = inputFor(viewer); const overlayClicks = new WeakSet(); const unsubscribeLabelClick = input.onOverlayClick((event) => { - // The cockpit reads ambient clicks; a mission label must not take them. - if (!missionsShown() || cockpitActive()) return false; + if (!missionsShown()) return false; const hit = overlayAt(event.screenPosition); if (!hit) return false; // Capture the painted hit before other handlers can invalidate the // overlay. An unrelated label keeps the click above mission geometry. overlayClicks.add(event); - return focusLaunch(markerLaunchId(hit)); + // The label is the card on top, so every other layer and the cockpit + // leave its click alone. In the cockpit, which holds the camera, the + // label and the dot select the mission without moving there. + return focusLaunch(markerLaunchId(hit), { move: !cockpitActive() }); }); const unsubscribeClick = input.onClick((event) => { // Another layer's card or label on top is that layer's click, read @@ -267,6 +263,7 @@ export function createLifecycle({ parts.rendering.launchIdFromPicks( parts.rendering.missionHitsAt(event.position, 12), ), + { move: !cockpitActive() }, ); }); hover = createLaunchHover({ diff --git a/src/layers/launches/missionCycler.test.mjs b/src/layers/launches/missionCycler.test.mjs index 1f07a12cff..06bf4bf0bf 100644 --- a/src/layers/launches/missionCycler.test.mjs +++ b/src/layers/launches/missionCycler.test.mjs @@ -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); +}); diff --git a/src/layers/launches/panel.js b/src/layers/launches/panel.js index 470adc9d9e..9dc827d5ca 100644 --- a/src/layers/launches/panel.js +++ b/src/layers/launches/panel.js @@ -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, diff --git a/src/layers/launches/panel.test.mjs b/src/layers/launches/panel.test.mjs index 9075d5e5cb..4e0a558944 100644 --- a/src/layers/launches/panel.test.mjs +++ b/src/layers/launches/panel.test.mjs @@ -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(); +}); diff --git a/src/layers/launches/policy.js b/src/layers/launches/policy.js index 34dcaae5bb..07718c26f6 100644 --- a/src/layers/launches/policy.js +++ b/src/layers/launches/policy.js @@ -103,3 +103,10 @@ export const TRAJECTORY_STAGE_COLORS = [ '#ffd166', '#60a5fa', ]; + +/** Whether the cockpit view is on; it holds the camera while it is. */ +export function cockpitActive() { + return Boolean( + globalThis.document?.body?.classList?.contains?.('cockpit-mode'), + ); +} diff --git a/src/layers/launches/satelliteIntents.js b/src/layers/launches/satelliteIntents.js index 7e646fb2fa..0870dc351b 100644 --- a/src/layers/launches/satelliteIntents.js +++ b/src/layers/launches/satelliteIntents.js @@ -16,6 +16,15 @@ function isExplicitOrigin(origin) { return origin === 'user' || origin === 'voice'; } +/** + * A setting changed on purpose: by the person, by voice, or by a tool such + * as a place search (the layer state's own rule, isExplicitLayerStateOrigin + * in src/data/layerState.js). + */ +function isDeliberateOrigin(origin) { + return isExplicitOrigin(origin) || origin === 'tool'; +} + export function createSatelliteIntents({ state: layerState }) { const requestOrder = new Map(); let sequence = 0; @@ -93,6 +102,25 @@ export function createSatelliteIntents({ state: layerState }) { return stop; } + /** + * Keep a Satellites setting changed on purpose while Space Missions holds + * its saved state ("show orbits" off, tracking a satellite, or a place + * search that stops tracking): it survives the mission teardown, as a + * visibility choice does. + */ + function handleParams(change) { + if ( + change?.type !== 'params' || + change.layerId !== 'satellites' || + !isDeliberateOrigin(change.origin) + ) + return; + const previous = layerState._satelliteStateBeforeMission; + const requested = change.requestedParams; + if (!previous || !requested || typeof requested !== 'object') return; + previous.params = { ...previous.params, ...requested }; + } + /** Settle once a Satellites OFF has finished stopping Space Missions. */ function settled() { return pendingStop ?? Promise.resolve(false); @@ -108,6 +136,7 @@ export function createSatelliteIntents({ state: layerState }) { manager.subscribeVisibilityRequests?.(recordRequest) ?? null; const unsubscribeChanges = manager.subscribe?.((change) => { + handleParams(change); void handleVisibility(change); }) ?? null; unsubscribe = () => { @@ -120,6 +149,7 @@ export function createSatelliteIntents({ state: layerState }) { connect, settled, handleVisibility, + handleParams, recordRequest, offFollowsMissionsEntry, }; diff --git a/src/layers/launches/selection.js b/src/layers/launches/selection.js index 0f35eb28dc..281d0ee85c 100644 --- a/src/layers/launches/selection.js +++ b/src/layers/launches/selection.js @@ -11,7 +11,11 @@ import { toRadians, vec, } from '../../geo/vector.js'; -import { MISSION_GLOBE_VIEW_RANGE_M, MISSION_FOCUS_RANGE_M } from './policy.js'; +import { + MISSION_GLOBE_VIEW_RANGE_M, + MISSION_FOCUS_RANGE_M, + cockpitActive, +} from './policy.js'; import { cameraOf, canvasOf, findCamera } from '../../render/rendererOf.js'; export function createSelection({ @@ -122,6 +126,9 @@ export function createSelection({ function focusMission(launch) { if (!layerState._viewer || !launch || !layerState._enabled) return; + // The cockpit holds the camera: a mission chosen there, by its label, + // its dot or the layer row's arrows, is selected without flying to it. + if (cockpitActive()) return; stopMissionZoomAnchor(); parts.rendering.selectLaunchEntity(launch.id); const camera = cameraOf(layerState._viewer); diff --git a/src/layers/launches/worldTime.test.mjs b/src/layers/launches/worldTime.test.mjs index 73eb0b16f3..76f1b02c4e 100644 --- a/src/layers/launches/worldTime.test.mjs +++ b/src/layers/launches/worldTime.test.mjs @@ -36,10 +36,14 @@ function scene(t) { ], }; const viewer = { scene: {} }; + const flights = []; const { draw, unbind } = bindFakeDraw(viewer, { camera: { pose: () => ({ position: { x: 2e7, y: 0, z: 0 } }), on: () => () => {}, + flyTo: (...args) => flights.push(args), + lookAt: noop, + release: noop, }, }); t.after(unbind); @@ -69,6 +73,7 @@ function scene(t) { }; parts.selection = createSelection({ state, services, parts }); const rendering = createRendering({ state, services, parts }); + parts.rendering = rendering; rendering.attach(viewer); rendering.showMissions(true); rendering.addLaunchEntity(launch, null); @@ -88,7 +93,7 @@ function scene(t) { path: item(`rocket-trajectory:${launch.id}:0`).show, }; }; - return { state, rendering, launch, syncs, shown, draw }; + return { state, rendering, launch, syncs, shown, draw, parts, flights }; } test('live shows every launch in the window, lifted off or not', (t) => { @@ -127,3 +132,21 @@ test('the live orbit rings turn at the frame time, not the wall clock', (t) => { ); assert.deepEqual(orbits.spec.motionClock, { kind: 'scene' }); }); + +test('in the cockpit a chosen mission is not flown to', (t) => { + const { launch, parts, flights } = scene(t); + const previous = Object.getOwnPropertyDescriptor(globalThis, 'document'); + Object.defineProperty(globalThis, 'document', { + configurable: true, + value: { + body: { classList: { contains: (name) => name === 'cockpit-mode' } }, + }, + }); + try { + parts.selection.focusMission(launch); + } finally { + if (previous) Object.defineProperty(globalThis, 'document', previous); + else delete globalThis.document; + } + assert.deepEqual(flights, [], 'the cockpit keeps the camera'); +}); diff --git a/src/layers/localAdsb/index.test.mjs b/src/layers/localAdsb/index.test.mjs index a7fbbd047f..acd0b0c3fc 100644 --- a/src/layers/localAdsb/index.test.mjs +++ b/src/layers/localAdsb/index.test.mjs @@ -21,7 +21,8 @@ import { setClickCardHitTest, } from '../../data/pickRegistry.js'; import { fromDegrees, toLonLatH } from '../../geo/ellipsoid.js'; -import { fakeInput } from '../../input/testDoubles.mjs'; +import { inputFor } from '../../input/dispatcher.js'; +import { MISSION_LABEL, fakeInput } from '../../input/testDoubles.mjs'; import { hexColor } from '../../render/color.js'; import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs'; import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs'; @@ -1178,7 +1179,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: {}, @@ -1186,6 +1188,8 @@ function clickHarness() { pick() { return scene.pickResult; }, + drillPick: () => + (base.viewer.drillHits ?? []).map((hit) => ({ primitive: {}, id: hit })), }; const base = fakeViewer({ scene }); return { @@ -1304,6 +1308,52 @@ 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 on a mission label over a local aircraft never selects the aircraft, and keeps the selection', async (t) => { + const receiver = fakeReceiver({ mode: 'adsb', connected: true }); + const clock = { now: 100_000 }; + const harness = clickHarness(); + // A Space Missions label painted over the map: while it is over, it takes + // each click and is the card on top. + const label = { over: true }; + setClickCardHitTest(() => (label.over ? MISSION_LABEL : null)); + t.after(() => setClickCardHitTest(null)); + const { layer, calls, draw } = await enabledLayer(receiver, clock, null, { + viewer: harness.viewer, + services: { + picking: { + registerPickOwner() {}, + unregisterPickOwner() {}, + resolvePickId, + isUnderOtherCard, + }, + }, + }); + t.after(() => layer.destroy()); + receiver.set({ aircraft: [record()] }); + await layer.update(); + 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; the label on top is its own + // click, so the selection stays. + 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, 0, 'the selection stays'); +}); + 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({ diff --git a/src/layers/news/layer.test.mjs b/src/layers/news/layer.test.mjs index 9a31dd9474..7313007e4b 100644 --- a/src/layers/news/layer.test.mjs +++ b/src/layers/news/layer.test.mjs @@ -14,6 +14,11 @@ import { // Registers the shared `gev-trail:` no-op owner, as the app does. import '../../data/trailRenderer.js'; import { getSelectedEntityContext } from '../../data/contextStore.js'; +import { + MISSION_LABEL, + fakeInputUnderLabel, +} from '../../input/testDoubles.mjs'; +import { NEWS_OVERLAY_SOURCE_ID } from './model.js'; const NOW = Date.parse('2026-10-28T10:00:00Z'); const hotspotsPayload = { @@ -59,6 +64,7 @@ function fixture( now = () => NOW, quality, pictureCards, + underLabel = false, hitTestOverlay = () => null, } = {}, ) { @@ -146,12 +152,22 @@ function fixture( for (const fn of [...clickHandlers]) fn({ screenPosition: { x: 10, y: 10 }, topHit }); }; - // The card on top at a click, as the host answers the pick registry. - setClickCardHitTest((x, y) => hitTestOverlay(x, y)); + // Or the scene's own dispatcher, with a Space Missions label that may be + // painted over the map (`fake.label.over`). + let fake = null; + if (underLabel) { + viewer.scene = { canvas: {}, pick: () => null }; + fake = fakeInputUnderLabel(viewer); + } + // The card on top at a click, as the host answers the pick registry: a + // mission label painted over the map comes first. + setClickCardHitTest((x, y) => + fake?.label.over ? MISSION_LABEL : hitTestOverlay(x, y), + ); const layer = createNewsLayer({ source, overlayHost, - inputFor: () => input, + inputFor: () => fake?.input ?? input, now, matchMedia: () => ({ matches: reduced }), getViewCentre: () => centre(), @@ -168,6 +184,7 @@ function fixture( layer.attachShellServices({ runNavigation: (navigate) => navigate() }); t.after(() => { layer.destroy(); + fake?.destroy(); setClickCardHitTest(null); unbind(); if (originalWindow === undefined) delete globalThis.window; @@ -183,6 +200,7 @@ function fixture( items, click, clickHandlers, + fake, }; } @@ -1296,6 +1314,41 @@ test('a click on a marker selects its report, on a beacon chooses its hotspot, o assert.equal(clickHandlers.size, 0); }); +test("a click on a mission label over a report's card never opens the card, and keeps 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 || sourceId === NEWS_OVERLAY_SOURCE_ID + ? { + 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.id, + 'major', + 'the label on top is its own click: the report stays selected', + ); + + // Off the label, the same click opens the card. + fake.label.over = false; + fake.click(); + assert.equal(activated, 1); +}); + test('a covered news card and pin yield; the top news card acts over a trail or a vessel', async (t) => { let hits = []; const { layer, items, entries, click, flights } = fixture(t, { diff --git a/src/layers/perimeters/ownership.test.mjs b/src/layers/perimeters/ownership.test.mjs index 25584f535c..d0dd6075ee 100644 --- a/src/layers/perimeters/ownership.test.mjs +++ b/src/layers/perimeters/ownership.test.mjs @@ -1,7 +1,8 @@ import assert from 'node:assert/strict'; import test from 'node:test'; import { createFirePerimetersLayer } from './index.js'; -import { fakeInput } from '../../input/testDoubles.mjs'; +import { clickCard } from '../../data/pickRegistry.js'; +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 +31,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({ @@ -58,8 +60,10 @@ function harness( String(pickedId).startsWith('other-layer:'), registerPickOwner: (layerId, predicate) => owners.set(layerId, predicate), unregisterPickOwner: (layerId) => owners.delete(layerId), - // The card on top at a click, as the registry answers from the host. + // The card on top at a click, as the registry answers from the host; + // a mission label painted over everything comes first. clickCard: (click) => + clickCard(click) ?? cardHit(click.screenPosition?.x, click.screenPosition?.y, {}), }, inciwebSource: inciwebIndex @@ -81,6 +85,9 @@ function harness( clicks, owners, opened, + /** A Space Missions label painted over the map: while `over`, it takes + * each click and is the card on top. */ + label: input.label, }; } @@ -361,6 +368,44 @@ test('a matched incident card carries the InciWeb line and click-through', async ); }); +test('a click on a mission label over the incident card never opens its InciWeb page, and keeps the card open', 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, and the + // label on top is its own click, so the card stays open. + cardHitResult = { sourceId: 'fire-perimeters', 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')?.[0]?.id, card.id); + + // Off the label, a click on the open card opens its page. + h.label.over = false; + 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( diff --git a/src/layers/shipwrecks/index.test.mjs b/src/layers/shipwrecks/index.test.mjs index 69e80f4eb2..5e5a29ef90 100644 --- a/src/layers/shipwrecks/index.test.mjs +++ b/src/layers/shipwrecks/index.test.mjs @@ -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, @@ -396,6 +397,54 @@ 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 on a mission label over the open card never opens the card's link, and keeps the card open", async (t) => { + let picked = null; + const viewer = { scene: { canvas: {}, pick: () => picked } }; + bindFakeDraw(viewer); + let cardUnder = null; + const fake = fakeInputUnderLabel(viewer, { + beneath: () => + cardUnder ? { sourceId: 'shipwrecks', entryId: cardUnder } : null, + }); + t.after(() => fake.destroy()); + const cards = []; + const opened = []; + const layer = createShipwrecksLayer({ + source: { getSnapshot: () => Promise.resolve(snapshot([wreck('a')])) }, + overlayHost: { + setEntries: (_source, entries) => cards.push(entries), + setVisible() {}, + }, + 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, and the + // label on top is its own click, so the card stays open. + picked = null; + cardUnder = card.id; + fake.label.over = true; + fake.click(); + assert.deepEqual(opened, [], 'the link beneath the label is not opened'); + assert.equal(cards.at(-1)[0]?.id, card.id, 'the card stays open'); + + // Off the label, a click on the open card opens its link. + fake.label.over = false; + fake.click(); + assert.equal(opened.length, 1); +}); + test('a covered selected card and covered markers yield; bare markers select', async () => { let painted = []; const h = harness({ diff --git a/src/layers/vessels/selection.test.mjs b/src/layers/vessels/selection.test.mjs new file mode 100644 index 0000000000..a641b13fa3 --- /dev/null +++ b/src/layers/vessels/selection.test.mjs @@ -0,0 +1,88 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { VESSEL_OVERLAY_SOURCE_ID } from '../../data/vesselLabels.js'; +import { clickCard } from '../../data/pickRegistry.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 Space Missions label + * may take, with the vessel's card under every click. */ +function selectionHarness(t) { + const viewer = { scene: { canvas: {}, pick: () => null } }; + const vessel = { id: 'v1', name: 'NORTHERN STAR', lat: 0, lon: 0 }; + const fake = fakeInputUnderLabel(viewer, { + beneath: () => ({ + sourceId: VESSEL_OVERLAY_SOURCE_ID, + entryId: `vessel:${vessel.id}`, + }), + }); + t.after(() => fake.destroy()); + 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 }; + const selection = createSelection({ + vesselState, + services: { + picking: { isOwnedByOtherLayer: () => false, clickCard }, + 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 on a mission label over a vessel's card 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 on a mission label keeps 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']); + // The label on top is its own click: the vessel stays selected. + h.fake.label.over = true; + h.fake.click(); + assert.equal(h.state.selectedRecord, h.vessel); + assert.deepEqual(h.focused, ['v1']); +}); diff --git a/src/layers/wildlifeSightings/selection.test.mjs b/src/layers/wildlifeSightings/selection.test.mjs index ccd4c11ad0..e719cd46e9 100644 --- a/src/layers/wildlifeSightings/selection.test.mjs +++ b/src/layers/wildlifeSightings/selection.test.mjs @@ -2,6 +2,8 @@ import assert from 'node:assert/strict'; import test from 'node:test'; import { createSelection } from './selection.js'; import { bindWildlifeViewer } from '../../testSupport/wildlifeViewer.mjs'; +import { clickCard } from '../../data/pickRegistry.js'; +import { fakeInputUnderLabel } from '../../input/testDoubles.mjs'; const row = { stableId: 'inat:123', @@ -68,9 +70,11 @@ function fixture(sighting = row, extraServices = {}) { }), eventTarget: new EventTarget(), ...extraServices, - // The card on top at a click, as the registry answers from the host. + // The card on top at a click, as the registry answers from the host; + // a mission label painted over everything comes first. picking: { clickCard: (c) => + clickCard(c) ?? overlayHost.hitTest(c.screenPosition?.x, c.screenPosition?.y), ...extraServices.picking, }, @@ -347,6 +351,44 @@ test('empty clicks and layer removal release the selected row and its overlay', assert.equal(f.entries.size, 0); }); +test("a click on a mission label over a sighting's card never selects the sighting, and keeps 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'); + + // Under the label, the card beneath it selects nothing. + fake.label.over = true; + fake.click(); + assert.equal(f.state.selectedId, null); + assert.equal(f.flights.length, 0); + + // Off the label, a click on the card selects and focuses the sighting. + fake.label.over = false; + fake.click(); + assert.equal(f.state.selectedId, row.stableId); + assert.equal(f.flights.length, 1); + + // The label on top is its own click: the sighting stays selected, and + // the camera is not sent to it again. + fake.label.over = true; + fake.click(); + assert.equal(f.state.selectedId, row.stableId, 'the sighting stays'); + assert.equal(f.state.selectedRow, row); + 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();