Compare commits

..
Author SHA1 Message Date
Sameh KhamisandManjunath Paparaju 84d79f5c76 Add the changelog entry for the Omnibar readings
Co-authored-by: Manjunath Paparaju <[email protected]>
2026-11-18 17:14:37 -08:00
Sameh KhamisandManjunath Paparaju dc31774109 Read "everything except", "from the map", a doubled verb and a grid reference after "near"
"hide everything except flights" (or "all but", "other than") switches off
every layer that is on but the ones named, or says no other layers are on.
"remove flights from the map" is "remove flights", "hide hide everything"
reads the verb once, and "flights near 14R PU 2090 4906" flies to the grid
reference. A keyword that begins a name ("Fire Island", "Radio City Music
Hall") no longer offers a plan to the rest of the name. The arrow keys drop
a check for a list that opens upward, which it never does.

Co-authored-by: Manjunath Paparaju <[email protected]>
2026-11-18 17:12:39 -08:00
Sameh KhamisandManjunath Paparaju 91700f89f8 Keep a country named with "and" whole, and show places as they were typed
"flights near Trinidad and Tobago" flew to Trinidad and offered Tobago on
its own; places whose own name holds "and" or "&" (Trinidad and Tobago,
Bosnia and Herzegovina, Antigua and Barbuda and the like) now stay one
place, while "Austin and Dallas" is still two. "İstanbul" was searched with
a stray combining dot, and labels title-cased what was typed with capitals
("IPhone Store"); a place is searched in plain lower case and labelled as
it was typed.

Co-authored-by: Manjunath Paparaju <[email protected]>
2026-11-18 16:55:00 -08:00
Sameh Khamis 0421813e26 feat(firms): let an application stand in for the fire markers (#1828)
The fire layer takes a stand-in for its markers (setMarkerStandIn({ hitTest })): its glows, heatmap and ambient cards are hidden, and a click the stand-in answers selects and focuses the fire exactly as a marker click does.
2026-11-18 16:47:24 -08:00
60 changed files with 641 additions and 1067 deletions

No files matched your search

@@ -0,0 +1,5 @@
- The fire layer takes a stand-in for its markers (`setMarkerStandIn`), for an
application that draws the same detections another way: the markers,
heatmap and ambient cards hide, and a click on a fire the application draws
selects it and moves the camera to it, with its card, as a click on its
marker does (samehkhamis, #1828).
-6
View File
@@ -1,6 +0,0 @@
- Space Missions finishes switching off before anything else runs: a launch
hovered while the layer is going off shows no preview, and Satellites
keeps the state it was saved with when it is still busy. A click on a
mission label reaches every layer so each can let go of what it had
selected, and none of them selects, turns on, flies to or opens the link
of what lies under the label (manjunath22466, samehkhamis, #1829).
+7
View File
@@ -0,0 +1,7 @@
- The Omnibar reads more lines the way they are meant: a country named with
"and" stays whole ("flights near Trinidad and Tobago"), places show as they
were typed, "hide everything except flights" switches off every other
layer that is on, "remove flights from the map" and a doubled verb are
understood, a grid reference after "near" is the place, and a layer word
that begins a name ("Fire Island") no longer offers a plan to the rest of
it (manjunath22466, samehkhamis, #1831).
+12 -8
View File
@@ -5592,11 +5592,7 @@ 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. When Satellites is still busy after
> the 30 s limit, the restore changes nothing and keeps the saved state, so
> switching Space Missions off again finishes it. While Space Missions goes
> off, its panel's roster and controls select, focus, preview and replay
> nothing, so no camera move starts that nothing would end.
> while the Satellite layer is disabled.
> - **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`
@@ -7495,7 +7491,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; what is drawn beneath the name is not picked, and the other layers still hear the click as one on the name, so they close their cards or let go of their selection as for any other click, but never select, turn on, focus or open the link of a contact, card or camera that lies under the name. The selected pad is the camera's zoom pivot: the overview remains centered on its launch site, wheel zoom approaches that site instead of drifting elsewhere, and camera pitch progressively changes from global nadir to an oblique close 3D view. Its protected shared-host callout remains visible and expands to include both mission and launch-site names. `FOCUS` flies directly to a 12 km oblique frame around the selected launch site and retains the same anchored zoom/orbit behavior. `REPLAY ASCENT` resets the selected marker at the pad, frames it from an oblique third-person angle, and follows it through the mission-specific compressed ascent directly into one orbital lap at the default `1×` rate. A live `0.25×`–`4×` slider changes ascent and orbit playback speed; adjusting it mid-replay preserves the current path position and historical mission timestamp. Re-entry/recovery cannot be inserted into replay. At orbit insertion the camera smoothly pulls back over the first fifth of the orbital replay and pitches to a globe-scale nadir view while continuing to target the moving replay point. Replay Cancel, mission navigation, deselection, layer disable, and data refresh all release camera ownership. Reconstructed paths are one continuous 128-sample geodetic curve: horizontal departure begins near zero while altitude rises quickly, then the climb progressively bends toward insertion without the former hard 120 km corner. Unmatched orbit fallbacks are smooth planar inclined rings rather than longitude/latitude ground-track curves. The panel lists disclosed payload names, types, operators/manufacturers, mass, multiplicity, and destination when supplied; an empty LL2 payload collection is shown as `CLASSIFIED / MULTI-PAYLOAD`. Launcher, spacecraft, and recoverable payload stages appear in a compact stage table with serial/flight/reuse details, recovery outcome/type, destination, and final coordinates when those records exist; an empty recovery collection omits the section. Stage recoveries with confirmed coordinates use those coordinates; return-to-launch-site records use the pad; downrange-only records receive an explicitly labeled estimated endpoint along the ascent azimuth. Available endpoints render as static 2 px dashed descent/recovery paths with a fixed final-position dot and an estimated atmospheric-interface segment when applicable. The ascent is geodetically densified above the ellipsoid toward the orbit's nearest insertion point, then rendered with `ArcType.NONE`, so it neither cuts through Earth nor separates from the marker. Because LL2 does not normally supply continuous ascent telemetry, pad-to-insertion paths without upstream trajectory samples are labeled `RECONSTRUCTED ESTIMATE` / `ASCENT ESTIMATE`; only supplied trajectory samples receive the replay wording. Selected-orbit framing fits the complete ring, rear-side linework uses normal scene depth occlusion, and current distance, speed, and callout data come only from a launch-year-validated satellite match. Both the loaded-catalog and active-TLE lookups read the launch year from the TLE international designator through one parser (`src/sources/tle.js`); a blank or malformed designator is an unknown year, whichLine truncated
- **Space Missions (30d)**: recent launches render as bounded shared-host, horizon-occluded mission markers using Launch Library 2 v2.3 detailed records. Enabling the layer reveals its own right-rail button and roster and enables the required satellite layer; it does not touch Context. Before applying its temporary dense/hidden Satellite mode, Space Missions snapshots the complete standalone Satellite parameter set and exact enabled-layer set. Disabling Space Missions from Data Layers hides its rail button and panel and restores those parameters and the exact prior enabled state, so a Satellite layer that was already on stays on while a mode-owned dependency returns off; enabling Satellites by itself remains independent. An explicit user or voice Satellites OFF requested after Space Missions ON exits Space Missions, including after returning from Stories; scene, story, preset and other programmatic Satellites changes do not. The controls under the Space Missions row cycle through available launches. Selecting a mission isolates its launch-to-orbit transfer and dashed satellite orbit, fills the Space Missions panel with details, navigation, and replay controls, and animates a small phase-colored marker along the exact displayed Cartesian samples. Marker hit testing drill-picks through photorealistic tiles so the depth-test-free tactical dot remains reliably selectable. Clicking the launch name on the globe selects and focuses the same mission as its dot. The selected pad is the camera's zoom pivot: the overview remains centered on its launch site, wheel zoom approaches that site instead of drifting elsewhere, and camera pitch progressively changes from global nadir to an oblique close 3D view. Its protected shared-host callout remains visible and expands to include both mission and launch-site names. `FOCUS` flies directly to a 12 km oblique frame around the selected launch site and retains the same anchored zoom/orbit behavior. `REPLAY ASCENT` resets the selected marker at the pad, frames it from an oblique third-person angle, and follows it through the mission-specific compressed ascent directly into one orbital lap at the default `1×` rate. A live `0.25×`–`4×` slider changes ascent and orbit playback speed; adjusting it mid-replay preserves the current path position and historical mission timestamp. Re-entry/recovery cannot be inserted into replay. At orbit insertion the camera smoothly pulls back over the first fifth of the orbital replay and pitches to a globe-scale nadir view while continuing to target the moving replay point. Replay Cancel, mission navigation, deselection, layer disable, and data refresh all release camera ownership. Reconstructed paths are one continuous 128-sample geodetic curve: horizontal departure begins near zero while altitude rises quickly, then the climb progressively bends toward insertion without the former hard 120 km corner. Unmatched orbit fallbacks are smooth planar inclined rings rather than longitude/latitude ground-track curves. The panel lists disclosed payload names, types, operators/manufacturers, mass, multiplicity, and destination when supplied; an empty LL2 payload collection is shown as `CLASSIFIED / MULTI-PAYLOAD`. Launcher, spacecraft, and recoverable payload stages appear in a compact stage table with serial/flight/reuse details, recovery outcome/type, destination, and final coordinates when those records exist; an empty recovery collection omits the section. Stage recoveries with confirmed coordinates use those coordinates; return-to-launch-site records use the pad; downrange-only records receive an explicitly labeled estimated endpoint along the ascent azimuth. Available endpoints render as static 2 px dashed descent/recovery paths with a fixed final-position dot and an estimated atmospheric-interface segment when applicable. The ascent is geodetically densified above the ellipsoid toward the orbit's nearest insertion point, then rendered with `ArcType.NONE`, so it neither cuts through Earth nor separates from the marker. Because LL2 does not normally supply continuous ascent telemetry, pad-to-insertion paths without upstream trajectory samples are labeled `RECONSTRUCTED ESTIMATE` / `ASCENT ESTIMATE`; only supplied trajectory samples receive the replay wording. Selected-orbit framing fits the complete ring, rear-side linework uses normal scene depth occlusion, and current distance, speed, and callout data come only from a launch-year-validated satellite match. Both the loaded-catalog and active-TLE lookups read the launch year from the TLE international designator through one parser (`src/sources/tle.js`); a blank or malformed designator is an unknown year, which skips the year check rather than rejecting the match. Speed is the magnitude of the SGP4 inertial velocity vector at the same propagation epoch as position, displayed in km/s with km/h available as hover detail. Unavailable operator, site, launch-time, orbit, current-altitude, and speed valLine truncated
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.
@@ -7974,7 +7970,12 @@ over").
Otherwise the place row is the default and moves first ("Thermal,
California", "radio near tokyo" searches Tokyo), and any plan or command is
offered after it; a line with neither ("hi", "NY", "?") runs nothing. "hide everything near tokyo" clears the layers and flies to
Tokyo. Following needs a callsign or ICAO address (letters and a digit), a
Tokyo. "hide everything except flights" (or "all but", "other than", with
"turn off", "clear" or "remove") switches off every layer that is on but
the ones named, or says no other layers are on. "remove flights from the
map" is "remove flights", a doubled verb ("hide hide everything") is read
once, and a grid reference after "near" is the place ("flights near 14R PU
2090 4906"). Following needs a callsign or ICAO address (letters and a digit), a
nine-digit MMSI or the name of something loaded on the map, so "Track
Hill" and "Track 29" are places; "nearest plane" counts alone or before a
place ("Nearest Plane Crash Site" is a name), and "goto" only with a place
@@ -8002,7 +8003,10 @@ noir", "go to London with flights"), a switch and a layer ("go to tokyo show
flights"), or a comma part that is exactly a style, map, camera move or
layer ("go to Tokyo, north up"). A line with one keyword and no verb beside
the rest of a name ("Tilt Cove", "tokyo traffic", "Hurricane, Utah") offers
the whole line as a place first and the plan second. Further places joined
the whole line as a place first and the plan second. When that keyword
starts the line with no comma after it ("Fire Island", "Radio City Music
Hall"), it begins the name: the place and the layer are offered, and no
plan goes to the rest of the name. Further places joined
with "and" are offered as their own rows. Things loaded on the map that
match the line are offered too: a callsign, tail number or transponder
code puts them first, and otherwise the place row keeps the top, so
+1 -4
View File
@@ -660,7 +660,6 @@
"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",
@@ -1600,7 +1599,5 @@
"src/ui/omnibarRows.test.mjs",
"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/ui/commandDock.test.mjs"
]
+143
View File
@@ -25,6 +25,8 @@ import { fakeDrawPort } from '../testSupport/fakeDrawPort.mjs';
import { fakeGlobePort } from '../testSupport/fakeGlobePort.mjs';
import { bindRenderer } from '../render/rendererOf.js';
import { HEAT_REBUILD_MS } from '../layers/firms/policy.js';
import { registerStyleStages } from '../styles/styleStages.js';
import { sensorPickPosition } from '../input/sensorPick.js';
const LAYER_SOURCE = readLayerSource(
path.join(path.dirname(fileURLToPath(import.meta.url)), 'firmsHeatmap.js'),
@@ -649,6 +651,16 @@ test('far zoom drapes one heatmap and the hand-off cross-fades it with the marke
assert.equal(added[0].alpha, 0.5);
assert.equal(glow(1).alpha, 0.5, 'rebuilt markers get the fade');
// An application drawing the detections in their place hides both.
h.layer.setMarkerStandIn({ hitTest: () => null });
assert.equal(added[0].show, false, 'a stand-in hides the heatmap');
assert.equal(markers().show, false, 'and the markers');
h.layer._renderLodForTest('global');
assert.equal(added[0].show, false, 'through a rebuild too');
h.layer.setMarkerStandIn(null);
assert.equal(added[0].show, true);
assert.equal(markers().show, true);
h.layer.disable();
assert.equal(added[0].show, false, 'disable hides the heatmap');
@@ -660,3 +672,134 @@ test('far zoom drapes one heatmap and the hand-off cross-fades it with the marke
restoreDocument();
}
});
test('a click on a fire an application draws in place of the markers selects it as a marker click does', () => {
const fire = makeFire();
const other = makeFire({ index: 8, lat: 31.2, lon: -97.9, frp: 40 });
// The application's records come from the same source, adapted on their own.
let answer = { ...fire };
const asked = [];
const h = harness({ fires: [fire, other], picked: glowPick('firms-8') });
try {
h.layer.setMarkerStandIn({
hitTest: (screen) => {
asked.push(screen);
return answer;
},
});
assert.equal(h.icons().show, false, 'the glows are hidden');
h.published.length = 0;
h.click();
assert.deepEqual(asked, [{ x: 400, y: 300 }]);
assert.equal(h.requests.length, 1, 'the camera moves as for a marker');
assert.equal(h.requests[0].kind, 'fire');
assert.equal(
h.requests[0].id,
fireDetectionKey(fire),
'the stand-in decides, not the hidden glow under the click',
);
assert.equal(h.layer.getSelectedInfo().id, fireDetectionKey(fire));
assert.equal(getSelectedEntityContext().label, 'Fire · FRP 1520 MW');
assert.deepEqual(
h.published.map((entry) => entry.id),
[`selected-fire:${fireDetectionKey(fire)}`],
"only the selected fire's card shows",
);
// Nothing of the application's under the click: empty space.
answer = null;
h.click();
assert.equal(h.requests.length, 1, 'no camera move');
assert.equal(h.layer.getSelectedInfo(), null, 'the selection is cleared');
} finally {
h.cleanup();
}
});
test('a stand-in hit on a fire the layer does not show selects nothing', () => {
const fire = makeFire();
const h = harness({ fires: [fire] });
try {
h.layer.setMarkerStandIn({
hitTest: () => makeFire({ lat: 12.5, lon: 40.1 }),
});
h.click();
assert.equal(h.requests.length, 0);
assert.equal(h.layer.getSelectedInfo(), null);
} finally {
h.cleanup();
}
});
test('taking the stand-in away brings the markers and their cards back and keeps the selection', () => {
const fire = makeFire();
const h = harness({
fires: [fire],
// Near enough for the markers rather than the heatmap.
cameraPosition: Cesium.Cartesian3.fromDegrees(fire.lon, fire.lat, 500_000),
});
try {
h.layer.setMarkerStandIn({ hitTest: () => fire });
assert.equal(h.icons().show, false);
h.click();
h.layer.setMarkerStandIn(null);
assert.equal(h.icons().show, true);
assert.equal(h.layer.getSelectedInfo().id, fireDetectionKey(fire));
const ids = h.published.map((entry) => entry.id);
assert.ok(ids.includes(`selected-fire:${fireDetectionKey(fire)}`));
} finally {
h.cleanup();
}
});
test('the stand-in is asked where a marker is picked: the click as the sensor style draws it', () => {
const fire = makeFire();
const asked = [];
const h = harness({ fires: [fire] });
try {
registerStyleStages(h.viewer.scene, {
surveillance: {
enabled: true,
uniforms: { intensity: 1, pixelation: 4 },
},
});
h.layer.setMarkerStandIn({
hitTest: (screen) => {
asked.push(screen);
return fire;
},
});
h.click();
const expected = sensorPickPosition(
h.viewer.scene,
{ x: 400, y: 300 },
h.viewer.scene.canvas,
);
assert.notDeepEqual([expected.x, expected.y], [400, 300]);
assert.deepEqual([asked[0].x, asked[0].y], [expected.x, expected.y]);
} finally {
h.cleanup();
}
});
test("a sibling layer's item over a stand-in fire wins the click", () => {
const fire = makeFire();
let asked = 0;
registerPickOwner('flights', (pickedId) => pickedId === 'a1b2c3');
const h = harness({ fires: [fire], picked: { id: 'a1b2c3' } });
try {
h.layer.setMarkerStandIn({
hitTest: () => {
asked++;
return fire;
},
});
h.click();
assert.equal(asked, 0, 'the stand-in is not asked');
assert.equal(h.requests.length, 0, 'no camera move');
assert.equal(h.layer.getSelectedInfo(), null);
} finally {
h.cleanup();
unregisterPickOwner('flights');
}
});
+1
View File
@@ -4648,6 +4648,7 @@
"Turn off": "إيقاف",
"Command": "أمر",
"No layers are on": "لا توجد طبقات مفعّلة",
"No other layers are on": "لا توجد طبقات أخرى مفعّلة",
"No matching layers": "لا توجد طبقات مطابقة",
"Show me {thing} settings": "عرض إعدادات {thing}",
"Show me how: {thing}": "طريقة الاستخدام: ‏{thing}",
+1
View File
@@ -4236,6 +4236,7 @@
"Turn off": "Ausschalten",
"Command": "Befehl",
"No layers are on": "Keine Ebenen aktiv",
"No other layers are on": "Keine anderen Ebenen aktiv",
"No matching layers": "Keine passenden Ebenen",
"Show me {thing} settings": "Einstellungen für {thing} zeigen",
"Show me how: {thing}": "Anleitung anzeigen: {thing}",
+1
View File
@@ -4339,6 +4339,7 @@
"Turn off": "Desactivar",
"Command": "Comando",
"No layers are on": "No hay capas activas",
"No other layers are on": "No hay otras capas activas",
"No matching layers": "No se encontraron capas",
"Show me {thing} settings": "Muéstrame los ajustes de {thing}",
"Show me how: {thing}": "Muéstrame cómo: {thing}",
+1
View File
@@ -4339,6 +4339,7 @@
"Turn off": "Désactiver",
"Command": "Commande",
"No layers are on": "Aucune couche active",
"No other layers are on": "Aucune autre couche active",
"No matching layers": "Aucune couche correspondante",
"Show me {thing} settings": "Montrez-moi les réglages de {thing}",
"Show me how: {thing}": "Montrez-moi comment faire : {thing}",
+1
View File
@@ -4339,6 +4339,7 @@
"Turn off": "כיבוי",
"Command": "פקודה",
"No layers are on": "אין שכבות פעילות",
"No other layers are on": "אין שכבות אחרות פעילות",
"No matching layers": "אין שכבות תואמות",
"Show me {thing} settings": "הצגת ההגדרות של {thing}",
"Show me how: {thing}": "איך עושים זאת: ‏{thing}",
+1
View File
@@ -4339,6 +4339,7 @@
"Turn off": "Disattiva",
"Command": "Comando",
"No layers are on": "Nessun livello attivo",
"No other layers are on": "Nessun altro livello attivo",
"No matching layers": "Nessun livello corrispondente",
"Show me {thing} settings": "Mostrami le impostazioni di {thing}",
"Show me how: {thing}": "Mostrami come: {thing}",
+1
View File
@@ -4133,6 +4133,7 @@
"Turn off": "オフにする",
"Command": "コマンド",
"No layers are on": "オンになっているレイヤーはありません",
"No other layers are on": "他にオンになっているレイヤーはありません",
"No matching layers": "該当するレイヤーはありません",
"Show me {thing} settings": "{thing}の設定を表示",
"Show me how: {thing}": "使い方を見る:{thing}",
+1
View File
@@ -4339,6 +4339,7 @@
"Turn off": "Desativar",
"Command": "Comando",
"No layers are on": "Nenhuma camada ativa",
"No other layers are on": "Não há outras camadas ativas",
"No matching layers": "Nenhuma camada encontrada",
"Show me {thing} settings": "Mostre as configurações de {thing}",
"Show me how: {thing}": "Mostre como fazer: {thing}",
+1
View File
@@ -4442,6 +4442,7 @@
"Turn off": "Выключить",
"Command": "Команда",
"No layers are on": "Нет включённых слоёв",
"No other layers are on": "Других включённых слоёв нет",
"No matching layers": "Подходящие слои не найдены",
"Show me {thing} settings": "Показать настройки для {thing}",
"Show me how: {thing}": "Показать как: {thing}",
+1
View File
@@ -4236,6 +4236,7 @@
"Turn off": "Slå av",
"Command": "Kommando",
"No layers are on": "Inga lager är på",
"No other layers are on": "Inga andra lager är på",
"No matching layers": "Inga matchande lager",
"Show me {thing} settings": "Visa inställningarna för {thing}",
"Show me how: {thing}": "Visa hur: {thing}",
+1
View File
@@ -4442,6 +4442,7 @@
"Turn off": "Вимкнути",
"Command": "Команда",
"No layers are on": "Немає увімкнених шарів",
"No other layers are on": "Інших увімкнених шарів немає",
"No matching layers": "Відповідних шарів не знайдено",
"Show me {thing} settings": "Показати налаштування для {thing}",
"Show me how: {thing}": "Показати як: {thing}",
+1
View File
@@ -4133,6 +4133,7 @@
"Turn off": "关闭",
"Command": "命令",
"No layers are on": "没有已启用的图层",
"No other layers are on": "没有其他已启用的图层",
"No matching layers": "没有匹配的图层",
"Show me {thing} settings": "显示{thing}的设置",
"Show me how: {thing}": "查看操作方法:{thing}",
+1
View File
@@ -4133,6 +4133,7 @@
"Turn off": "關閉",
"Command": "命令",
"No layers are on": "沒有已啟用的圖層",
"No other layers are on": "沒有其他已啟用的圖層",
"No matching layers": "沒有匹配的圖層",
"Show me {thing} settings": "顯示{thing}的設置",
"Show me how: {thing}": "查看操作方法:{thing}",
+6 -39
View File
@@ -182,11 +182,6 @@ function topHitOf(hit, foreign) {
* when the adapter has none.
* @property {unknown} pick `native.pick`, for code still bound to the
* engine's pick objects that reads it here.
* @property {boolean} overlay Whether a painted overlay target took the
* click ({@link InputDispatcher.onOverlayClick}). Its hits then name only
* that target: something drawn outside the draw port, with no id. A
* subscriber with its own hit test (painted cards, a pick of its own)
* skips it then: what lies under the target is not clicked.
* @property {(width: number, height: number) => unknown} pickWindow
* `native.pickWindow`, the same.
*/
@@ -197,9 +192,7 @@ 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: 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).
* handling its topmost target to stop delivery to the geometry beneath it.
* @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
@@ -338,7 +331,7 @@ function createDispatcher(viewer, { query: givenQuery, ...portOptions } = {}) {
click: (ev) => {
if (!unmodifiedLeft(ev)) return;
const ambient = free();
const { event, cover } = createClickEvent(
const event = createClickEvent(
viewer,
queryOf,
xy(ev.position),
@@ -347,12 +340,7 @@ function createDispatcher(viewer, { query: givenQuery, ...portOptions } = {}) {
if (ambient) {
for (const handle of [...overlayClicks]) {
try {
// 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;
}
if (handle(event) === true) return;
} catch (error) {
console.error('Pointer input handler failed', error);
}
@@ -449,10 +437,6 @@ 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;
@@ -462,8 +446,7 @@ 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 {{event: ClickEvent, cover: () => void}} The click, and how a
* handled overlay target hides the geometry beneath it from the click.
* @returns {ClickEvent}
*/
function createClickEvent(viewer, queryOf, at, gesture) {
const position = sensorPickPosition(viewer, at, canvasOf(viewer));
@@ -482,25 +465,11 @@ function createClickEvent(viewer, queryOf, at, gesture) {
};
/** @type {Map<string, {limit: number, hits: Hit[]}>} */
const drills = new Map();
let covered = false;
const cover = () => {
covered = true;
memo.clear();
drills.clear();
memo.set('top', OVERLAY_HIT);
memo.set('hit', OVERLAY_HIT);
memo.set('id', null);
memo.set('ownerId', null);
memo.set('native', null);
};
const event = {
return {
screenPosition: at,
position,
gesture,
get overlay() {
return covered;
},
get topHit() {
return once('top', () => {
const hit = pick();
@@ -546,7 +515,6 @@ 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);
@@ -567,7 +535,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 = covered ? null : query();
const q = query();
if (!q) return [];
// Only the default window is shared between layers; round that one up.
const depth =
@@ -600,5 +568,4 @@ function createClickEvent(viewer, queryOf, at, gesture) {
return native()?.native.pickWindow(width, height);
},
};
return { event, cover };
}
+1 -61
View File
@@ -145,8 +145,7 @@ test('a painted overlay can claim a click before its underlying owner', (t) => {
h.input.onPointer('click', () => clicks.push('ambient pointer'));
h.click();
// The click still reaches every subscriber, as one on the label.
assert.deepEqual(clicks, ['mission label', 'ambient pointer', null]);
assert.deepEqual(clicks, ['mission label']);
assert.equal(h.calls.pick, 0);
h.click(11, 10);
@@ -155,71 +154,12 @@ 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());
-15
View File
@@ -140,18 +140,3 @@ export function fakeInput(viewer, { now } = {}) {
destroy: () => input.destroy(),
};
}
/**
* `fakeInput` with a label painted over the map, as a Space Missions label
* is: while `label.over` is true the label takes each click, so every click
* subscriber hears it as an overlay click (`event.overlay`), and the
* geometry beneath it is not picked.
* @param {object} viewer
* @param {{now?: () => number}} [options]
*/
export function fakeInputUnderLabel(viewer, options) {
const fake = fakeInput(viewer, options);
const label = { over: false };
fake.input.onOverlayClick(() => label.over);
return { ...fake, label };
}
+1 -2
View File
@@ -582,10 +582,9 @@ export function createAlprPresentation({ state, services, source }) {
state.clickSubscription = inputFor(viewer).onClick((event) => {
if (!state.enabled) return;
// The painted overlay answers first; the scene is picked only if not.
// A click a label painted over both took is on neither.
const hit = event.drawHit;
const id =
(!event.overlay && overlay.pick(event.screenPosition)) ||
overlay.pick(event.screenPosition) ||
(hit && hit.set === markers.icons?.id ? hit.id : null);
if (
id &&
-122
View File
@@ -1,122 +0,0 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import * as Cesium from 'cesium';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { fakeDrawPort } from '../../testSupport/fakeDrawPort.mjs';
import { bindFakeCesiumScene } from '../../testSupport/fakeCesiumScene.mjs';
import { createAlprMarkerSet } from './markerState.js';
import { createAlprPresentation } from './presentation.js';
/** One camera drawn and painted at (100, 100), over a viewer whose clicks a
* label may take. */
function harness(t) {
const previousImage = globalThis.Image;
const project = Cesium.SceneTransforms.worldToWindowCoordinates;
globalThis.Image = class {
complete = true;
naturalWidth = 128;
};
Cesium.SceneTransforms.worldToWindowCoordinates = () => ({ x: 100, y: 100 });
const record = {
id: 'camera:0',
latitude: 30,
longitude: -97,
directionDeg: 90,
};
const drawPort = fakeDrawPort();
const markers = createAlprMarkerSet();
markers.attach(drawPort.icons({ id: 'alpr-cameras:test:markers' }));
const viewer = {
camera: {
positionWC: Cesium.Cartesian3.fromDegrees(-97, 30, 500),
pickEllipsoid: () => Cesium.Cartesian3.fromDegrees(-97, 30),
},
scene: {
canvas: { clientWidth: 800, clientHeight: 600 },
globe: { show: true, getHeight: () => 150 },
pick: () => null,
},
};
const { unbind } = bindFakeCesiumScene(viewer, { draw: drawPort });
const fake = fakeInputUnderLabel(viewer);
const state = {
viewer,
enabled: true,
selectedId: null,
markers,
records: [record],
recordById: new Map([[record.id, record]]),
renderRevision: 0,
lastAnchorSampleAt: 0,
};
let selected = null;
let paint;
const presentation = createAlprPresentation({
state,
source: { label: 'Test cameras' },
services: {
render: { governorRequestRender() {} },
context: {
clearSelectedEntityContextForLayer() {
selected = null;
},
getSelectedEntityContext: () => selected,
registerEntityContext() {},
removeEntityContextsForLayer() {},
selectEntityContext(carrier) {
selected = { id: carrier.id, layerId: 'alpr-cameras' };
},
},
groundFloor: { cachedGroundFloor: () => 150 },
overlays: {
registerPaintLane(_lane, painter) {
paint = painter;
return { setActive() {}, requestPaint() {}, unregister() {} };
},
keyholeAlpha: () => 1,
},
},
});
presentation.initOverlay();
presentation.installInteraction(viewer);
t.after(() => {
presentation.destroyOverlay();
fake.destroy();
unbind();
if (previousImage === undefined) delete globalThis.Image;
else globalThis.Image = previousImage;
Cesium.SceneTransforms.worldToWindowCoordinates = project;
});
presentation.renderRecords();
const ctx = {
globalAlpha: 1,
save() {},
restore() {},
beginPath() {},
moveTo() {},
lineTo() {},
closePath() {},
stroke() {},
fill() {},
createLinearGradient: () => ({ addColorStop() {} }),
drawImage() {},
};
paint({ ctx, width: 800, height: 600 });
return { state, fake, at: { x: 100, y: 100 } };
}
test('a click a label painted over a camera takes never selects it, and lets go of the selected camera', (t) => {
const h = harness(t);
h.fake.label.over = true;
h.fake.click(h.at);
assert.equal(h.state.selectedId, null, 'the camera under the label');
// Off the label, the same click selects the camera.
h.fake.label.over = false;
h.fake.click(h.at);
assert.equal(h.state.selectedId, 'camera:0');
h.fake.label.over = true;
h.fake.click(h.at);
assert.equal(h.state.selectedId, null, 'the selection is let go');
});
+6 -9
View File
@@ -411,15 +411,12 @@ export function createLifecycle({
// painted ambient cards. The cards canvas is pointer-events:none (this
// handler owns the events), so a click landing on a card's rect selects
// its camera exactly like a click on the icon. Click positions
// and the recorded rects are both CSS px — direct comparison. A
// click a label painted over the cards took is not on a card.
const cardId = event.overlay
? null
: layerState._cctvOverlayHost.hitTest(
event.screenPosition.x,
event.screenPosition.y,
{ sourceId: CCTV_OVERLAY_SOURCE_ID },
)?.entryId;
// and the recorded rects are both CSS px — direct comparison.
const cardId = layerState._cctvOverlayHost.hitTest(
event.screenPosition.x,
event.screenPosition.y,
{ sourceId: CCTV_OVERLAY_SOURCE_ID },
)?.entryId;
if (cardId && layerState._recordById.has(cardId)) {
activateCctvCameraFromWorldClick(
cardId,
-81
View File
@@ -3,9 +3,6 @@ import assert from 'node:assert/strict';
import { createLifecycle } from './lifecycle.js';
import { bindRenderer } from '../../render/rendererOf.js';
import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs';
import { CCTV_OVERLAY_SOURCE_ID } from '../../data/cctvCards.js';
import { resolvePickId } from '../../data/pickRegistry.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
function viewerWithCamera() {
const camera = fakeCameraPort();
@@ -75,81 +72,3 @@ test('the view listeners follow the camera port and let go on teardown', () => {
assert.deepEqual(counts(second.camera), [0, 0]);
assert.equal(state._viewListenerCamera, null);
});
/** A part whose members are `own`'s, and any other a function that does
* nothing. */
const inert = (own = {}) =>
new Proxy(own, {
get: (target, name) => (name in target ? target[name] : () => {}),
});
test("a click a label painted over a camera's card takes never turns that camera on, and lets go of the active one", async (t) => {
const { viewer } = viewerWithCamera();
viewer.scene = { canvas: {}, pick: () => null };
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const activated = [];
const deactivated = [];
const state = {};
const lifecycle = createLifecycle({
state,
services: {
activation: {
activateCctvCameraFromWorldClick: (id) => activated.push(id),
},
picking: { resolvePickId },
focus: {},
render: {},
},
parts: {
calibration: { loadCalibrationStore: () => new Map() },
catalog: {
loadCameraSources: async () => [],
buildCatalogFromSources: () => [],
seedCatalog: () => [],
},
ground: {
resolveGroundPriors: async () => [],
currentSurfaceRegime: () => null,
},
rendering: inert({ refreshHorizonCulling: () => false }),
health: { syncHealthState: async () => {} },
geometryQueue: inert(),
cards: inert(),
projection: inert(),
presentation: inert(),
navigation: inert(),
hover: inert(),
selection: {
// The camera's own gate takes only clean clicks; these are.
bindCctvWorldClickGesture: (input, onClick) => input.onClick(onClick),
extractPickedCameraId: () => null,
cctvEmptyClickDeselects: (picked, { activeCameraId }) =>
Boolean(activeCameraId) && resolvePickId(picked) === null,
deactivateActiveCamera: () => deactivated.push(state._activeCameraId),
},
},
});
// Init's bounded wait for ground heights never runs out here: they are in.
t.mock.timers.enable({ apis: ['setTimeout'] });
await lifecycle.methods.init(viewer);
t.after(() => state._clickSubscription?.());
state._enabled = true;
state._activeCameraId = 'cam-0';
state._recordById.set('cam-1', {});
// The card of camera `cam-1` lies under every click.
state._cctvOverlayHost = {
hitTest: (_x, _y, { sourceId }) =>
sourceId === CCTV_OVERLAY_SOURCE_ID ? { entryId: 'cam-1' } : null,
};
fake.label.over = true;
fake.click();
assert.deepEqual(activated, [], 'the camera under the label stays off');
assert.deepEqual(deactivated, ['cam-0'], 'the active camera is let go');
// Off the label, a click on the card turns its camera on.
fake.label.over = false;
fake.click();
assert.deepEqual(activated, ['cam-1']);
});
+5 -8
View File
@@ -130,14 +130,11 @@ export function createDroneAirspaceLayer({
// cards inert anywhere over a zone. Unowned, our picks read as
// "empty space" to siblings — the same contract as fire perimeters.
_clickSubscription = inputFor(_viewer).onClick((event) => {
// A click a label painted over the cards took is not on a card.
const cardHit = event.overlay
? null
: overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: DRONE_AIRSPACE_OVERLAY_SOURCE_ID },
);
const cardHit = overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: DRONE_AIRSPACE_OVERLAY_SOURCE_ID },
);
if (cardHit && cardHit.entryId === _selectedCardId) return;
const picked = event.topHit;
const zoneId = picked ? pickedZoneId(event.drawHit) : null;
+3 -35
View File
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
import test from 'node:test';
import { createDroneAirspaceLayer } from './index.js';
import { layerFeedState } from '../../data/feedState.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { fakeInput } 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,12 +19,11 @@ function harness(source, { pick = () => null, cardHit = () => null } = {}) {
const owners = new Map();
const viewer = { scene: { pick } };
const { draw } = bindFakeDraw(viewer);
const input = fakeInputUnderLabel(viewer);
const input = fakeInput(viewer);
const clicks = {
handler: (click) => input.click(click.position),
// Only the label's own overlay handler is left.
get destroyed() {
return input.input.subscriberCount() === 1 ? 1 : 0;
return input.input.subscriberCount() === 0 ? 1 : 0;
},
};
const layer = createDroneAirspaceLayer({
@@ -62,8 +61,6 @@ 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,35 +143,6 @@ test('clicking a zone publishes its card; empty space clears it', async () => {
assert.equal(h.overlay.entries.get('drone-airspace')?.length ?? 0, 0);
});
test('a click a label painted over the open zone card takes closes the card, as a click beside it does', async () => {
let pickResult = null;
let cardHitResult = null;
const h = harness(
{ getSnapshot: async () => [row] },
{ pick: () => pickResult, cardHit: () => cardHitResult },
);
await h.layer.update(h.viewer);
pickResult = zonePick('drone-airspace:310:0');
h.clicks.handler({ position: { x: 10, y: 10 } });
const [card] = h.overlay.entries.get('drone-airspace');
// Off the label, a click on the open card keeps it open.
pickResult = null;
cardHitResult = { entryId: card.id };
h.clicks.handler({ position: { x: 12, y: 12 } });
assert.equal(h.overlay.entries.get('drone-airspace')?.length, 1);
// The open card lies under the label: the click is not on the card.
h.label.over = true;
h.clicks.handler({ position: { x: 12, y: 12 } });
assert.equal(
h.overlay.entries.get('drone-airspace')?.length ?? 0,
0,
'the card is closed',
);
h.layer.destroy();
});
test('late refresh cannot publish after disable or destroy', async () => {
for (const action of ['disable', 'destroy']) {
let resolve, signal;
+4 -1
View File
@@ -76,7 +76,10 @@ export function createCards({
const height = canvas.clientHeight;
let ambientCount = 0;
for (const candidate of layerState._labelCandidates) {
// An application drawing the detections in place of the markers draws
// them unlabelled: only the selected fire's card shows then.
const candidates = layerState._standIn ? [] : layerState._labelCandidates;
for (const candidate of candidates) {
if (ambientCount >= MAX_AMBIENT_LABELS) break;
if (candidate.fire && candidate.fire === layerState._selectedFire)
continue;
+28 -2
View File
@@ -52,10 +52,12 @@ export function createLifecycle({
if (layerState._cells) layerState._cells.show = true;
// The GPU culls the far side each frame, so retained rows are right
// for wherever the camera went while the layer was off.
if (layerState._icons) layerState._icons.show = true;
if (layerState._icons) layerState._icons.show = !layerState._standIn;
overlayHost.setVisible(FIRMS_OVERLAY_SOURCE_ID, true);
// A filter can leave an old raster cached while the current set is empty.
layerState._heatImagery?.setShow(layerState._fires.length > 0);
layerState._heatImagery?.setShow(
layerState._fires.length > 0 && !layerState._standIn,
);
// The camera can have crossed the hand-off while the layer was off.
components.rendering.applyHandoffFade(true);
components.viewport.installLodWatcher();
@@ -68,6 +70,29 @@ export function createLifecycle({
await components.ingestion.loadHeatmap();
},
/**
* Let an application draw the detections in place of the layer's
* markers. While a stand-in is set, the glows, the heatmap and the
* ambient cards are hidden and everything else works as before: a click
* on a fire the stand-in draws (`standIn.hitTest(screenPosition)`, which
* answers a detection record from the same source, or null) selects it
* and moves the camera to it as a click on its marker does, the selected
* fire's card shows, and a click on empty space clears the selection.
* `null` brings the markers back. The selection is kept either way.
* @param {?{hitTest: (screenPosition: {x: number, y: number}) => ?Object}} standIn
*/
setMarkerStandIn(standIn) {
layerState._standIn =
typeof standIn?.hitTest === 'function' ? standIn : null;
layerState._heatImagery?.setShow(
layerState._enabled &&
layerState._fires.length > 0 &&
!layerState._standIn,
);
components.rendering.applyHandoffFade(true);
components.cards.rebuildAmbientLabels();
},
disable() {
layerState.request?.abort();
layerState.request = null;
@@ -129,6 +154,7 @@ export function createLifecycle({
layerState._currentLodIndex = -1;
layerState._lastViewRect = null;
layerState._selectedFire = null;
layerState._standIn = null;
layerState._labelCandidates = [];
layerState._labelLodDistance = 0;
layerState._pickIndexById.clear();
+6 -3
View File
@@ -122,7 +122,7 @@ export function createRendering({
glowAlpha = alpha;
const set = layerState._icons;
if (!set) return;
set.show = layerState._enabled && heat < 1;
set.show = layerState._enabled && !layerState._standIn && heat < 1;
if (!changed || !drawnGlows.size) return;
const faded = [];
for (const drawn of drawnGlows.values()) {
@@ -273,7 +273,7 @@ export function createRendering({
// The map stack may have changed since the last render.
imagery.rehome();
ensureHeatRaster(now);
imagery.setShow(layerState._enabled);
imagery.setShow(layerState._enabled && !layerState._standIn);
}
/**
@@ -469,7 +469,10 @@ export function createRendering({
// Blended as one translucent pass, as its billboards were.
blend: 'translucent',
horizonCull: true,
show: layerState._enabled && !(layerState._handoffHeat >= 1),
show:
layerState._enabled &&
!layerState._standIn &&
!(layerState._handoffHeat >= 1),
drawOrder: spriteDrawOrder?.('firms') ?? 0,
});
// Columns of no rows put the set's host in the scene now, rather than
+47 -17
View File
@@ -35,27 +35,30 @@ export function createSelection({
const input = inputFor(layerState._viewer);
layerState._clickSubscription = input.onClick((event) => {
const picked = event.topHit;
const fire = pickedFire(event.drawHit);
const pickedId = picked ? resolvePickId(picked) : null;
// A pick that belongs to a sibling layer (e.g. an aircraft) is not
// "empty space" — leave the selection alone and let that layer handle it.
const otherLayer = Boolean(pickedId && isOwnedByOtherLayer(id, pickedId));
// The stand-in is asked where markers are picked: the click corrected
// for the sensor style (`event.position`), and only when no sibling
// layer's item is on top, as a marker under that item would not be hit.
const fire = layerState._standIn
? otherLayer
? null
: standInFire(event.position ?? event.screenPosition)
: pickedFire(event.drawHit);
if (fire) {
selectAndFocusFire(fire);
return;
}
// A pick that belongs to a sibling layer (e.g. an aircraft) is not
// "empty space" — leave the selection alone and let that layer handle it.
if (picked) {
const pickedId = resolvePickId(picked);
if (pickedId && isOwnedByOtherLayer(id, pickedId)) return;
}
// A click a label painted over the cards took is not on a card.
const cardHit = event.overlay
? null
: overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
sourceId: FIRMS_OVERLAY_SOURCE_ID,
},
);
if (otherLayer) return;
const cardHit = overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
sourceId: FIRMS_OVERLAY_SOURCE_ID,
},
);
if (cardHit) {
const carded = layerState._fireByCardId.get(cardHit.entryId);
if (carded) selectAndFocusFire(carded);
@@ -96,6 +99,32 @@ export function createSelection({
return layerState._pickIndexById.get(hit.id) ?? null;
}
/** The shown detections by their key, for the shown set they were made from. */
let keyed = { fires: null, byKey: null };
/**
* Resolve a click to one of this layer's fire records through the
* application's stand-in for its markers (`setMarkerStandIn`), or null:
* the record its hit test answers, matched by its detection key to a fire
* the layer shows now (so one the filter hides is not selected).
* @param {?{x: number, y: number}} screenPosition - Where the user clicked.
* @returns {?Object} Fire record.
*/
function standInFire(screenPosition) {
if (!screenPosition) return null;
const record = layerState._standIn?.hitTest(screenPosition);
if (!record) return null;
if (keyed.fires !== layerState._fires)
keyed = {
fires: layerState._fires,
byKey: new Map(
layerState._fires.map((fire) => [fireDetectionKey(fire), fire]),
),
};
return keyed.byKey.get(fireDetectionKey(record)) ?? null;
}
/**
* Select a fire: show its detail label and mark it selected in the shared
* context store so voice "what's selected" resolves to it.
@@ -232,6 +261,7 @@ export function createSelection({
removeClickHandler,
selectAndFocusFire,
pickedFire,
standInFire,
selectFire,
clearFireSelection,
refreshContextRegistrations,
-80
View File
@@ -1,80 +0,0 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { FIRMS_OVERLAY_SOURCE_ID } from '../../data/firmsLabels.js';
import { resolvePickId } from '../../data/pickRegistry.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { createSelection } from './selection.js';
/** The fire selection over a viewer whose clicks a label may take, with a
* fire's card under every click. */
function selectionHarness(t) {
const viewer = { scene: { canvas: {}, pick: () => null } };
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const fire = { lat: 1, lon: 2, acqMs: 3, frp: 40, satellite: 'N' };
const focused = [];
const cleared = [];
const layerState = {
_viewer: viewer,
_icons: { id: 'firms:icons' },
_pickIndexById: new Map(),
_fireByCardId: new Map([['firms-card:1', fire]]),
_selectedFire: null,
_contextIds: new Set(),
};
const selection = createSelection({
layerState,
services: {
picking: { resolvePickId, isOwnedByOtherLayer: () => false },
focus: { requestWorldFocus: (request) => focused.push(request.kind) },
context: {
selectEntityContext() {},
clearSelectedEntityContextForLayer: (id) => cleared.push(id),
getContextStore() {},
registerEntityContext() {},
},
},
components: {
model: {
firePosition: () => ({ x: 0, y: 0, z: 0 }),
formatFrp: String,
confidenceBucket: String,
},
cards: { rebuildAmbientLabels() {} },
},
config: {
id: 'firms',
name: 'Fires',
overlayHost: {
hitTest: (_x, _y, { sourceId }) =>
sourceId === FIRMS_OVERLAY_SOURCE_ID
? { entryId: 'firms-card:1' }
: null,
},
},
});
selection.installClickHandler();
t.after(() => selection.removeClickHandler());
return { fake, layerState, fire, focused, cleared };
}
test("a click a label painted over a fire's card takes never selects or focuses the fire", (t) => {
const h = selectionHarness(t);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.layerState._selectedFire, null);
assert.deepEqual(h.focused, [], 'the camera is not sent to the fire');
});
test('a click a label painted over the map takes lets go of the selected fire', (t) => {
const h = selectionHarness(t);
// Off the label, a click on the card selects and focuses its fire.
h.fake.click();
assert.equal(h.layerState._selectedFire, h.fire);
assert.deepEqual(h.focused, ['fire']);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.layerState._selectedFire, null);
assert.deepEqual(h.cleared, ['firms']);
assert.deepEqual(h.focused, ['fire']);
});
+8
View File
@@ -98,6 +98,14 @@ export function createFirmsState({ services, config }) {
layerState._selectedFire = null;
/**
* What an application draws in place of the markers (`setMarkerStandIn`):
* while set, the glows, heatmap and ambient cards are hidden and clicks
* resolve through its `hitTest`.
*/
layerState._standIn = null;
/** Priority-ordered label candidates from the last rebuild (detections or cells). */
layerState._labelCandidates = [];
+5 -8
View File
@@ -707,14 +707,11 @@ export function createGhostMapsLayer({
typeof pickedId === 'string' && pickedId.startsWith(PICK_PREFIX),
);
_clickSubscription = inputFor(_viewer).onClick((event) => {
// A click a label painted over the cards took is not on a card.
const cardHit = event.overlay
? null
: overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: GHOSTMAPS_OVERLAY_SOURCE_ID },
);
const cardHit = overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: GHOSTMAPS_OVERLAY_SOURCE_ID },
);
if (cardHit && cardHit.entryId === _selectedCardId) {
if (_selectedLink && openExternal) openExternal(_selectedLink);
return;
-47
View File
@@ -3,7 +3,6 @@ import test from 'node:test';
import { setLocale } from '../../i18n/index.js';
import { createGhostMapsLayer } from './index.js';
import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
import { inputFor } from '../../input/dispatcher.js';
import { GHOSTMAPS_PRODUCTS, GHOSTMAPS_LATEST_DROP } from './catalog.js';
function element(localName, children = [], value = '', attributes = {}) {
@@ -673,49 +672,3 @@ test('narrowing to a window the loaded data covers clears a failed wider reload'
assert.equal(layer.getStats().error, null);
assert.equal(layer.getStats().count, 1);
});
test("a click a label painted over the open card takes never opens the card's link, and closes the card", async (t) => {
const cards = [];
const opened = [];
let cardUnder = null;
const { layer, viewer, click } = fixture(t, {
now: () => Date.UTC(2026, 10, 3, 12),
reports: [
{
name: 'Linked',
description:
'<table><tr><td>Date</td><td>11/2/2026</td></tr>' +
'<tr><td>Source</td><td><a href="https://example.com/report">report</a></td></tr></table>',
},
],
controls: {
overlayHost: {
setEntries: (_id, entries) => cards.push(entries),
hitTest: () => (cardUnder ? { entryId: cardUnder } : null),
},
picking: { resolvePickId: (picked) => picked?.id ?? null },
openExternal: (url) => opened.push(url),
},
});
// A label painted over the map, as a Space Missions label is: while it is
// over, it takes each click.
let labelOver = false;
inputFor(viewer).onOverlayClick(() => labelOver);
await layer.update(viewer);
click('ghostmaps:cip:0:0');
const [card] = cards.at(-1);
assert.equal(card.interactive, true);
// The open card lies under the label: the click opens nothing.
cardUnder = card.id;
labelOver = true;
click(null);
assert.deepEqual(opened, [], 'the link beneath the label is not opened');
assert.deepEqual(cards.at(-1), [], 'the card is closed');
// Off the label, a click on the open card opens its link.
labelOver = false;
click('ghostmaps:cip:0:0');
click(null);
assert.deepEqual(opened, ['https://example.com/report']);
});
-45
View File
@@ -623,51 +623,6 @@ test('a Satellites enable that never settles still lets mission disable complete
stuck.resolve();
}
await f.settle();
// The saved Satellites state was kept: turning Space Missions off again
// once Satellites settles gives back the Satellites it turned on.
assert.equal(f.manager.isEnabled('satellites'), true);
await f.manager.setEnabled('rocket-launches', false, { origin: 'user' });
await f.settle();
assert.equal(f.manager.isEnabled('rocket-launches'), false);
assert.equal(f.manager.isEnabled('satellites'), false);
});
test('Space Missions turned on again after a busy restore switches Satellites on', async (t) => {
const f = await fixture(t);
f.upstream.status = 200;
assert.equal(
await f.manager.setEnabled('rocket-launches', true, { origin: 'user' }),
true,
);
await f.settle();
f.state.satelliteSettleTimeoutMs = 50;
const satellites = f.manager.layers.get('satellites').module;
const enable = satellites.enable;
const stuck = Promise.withResolvers();
satellites.enable = () => stuck.promise;
try {
await f.manager.setEnabled('satellites', false);
void f.manager.setEnabled('satellites', true);
await f.manager.setEnabled('rocket-launches', false, { origin: 'user' });
} finally {
satellites.enable = enable;
stuck.resolve();
}
await f.settle();
// Something else switches Satellites off, then Space Missions comes back.
await f.manager.setEnabled('satellites', false);
await f.settle();
assert.equal(f.manager.isEnabled('satellites'), false);
assert.equal(
await f.manager.setEnabled('rocket-launches', true, { origin: 'user' }),
true,
);
await f.settle();
assert.equal(f.manager.isEnabled('satellites'), true);
// Its own off still gives back the Satellites from before the first start.
await f.manager.setEnabled('rocket-launches', false, { origin: 'user' });
await f.settle();
assert.equal(f.manager.isEnabled('satellites'), false);
});
test('a failed Satellites restore still clears the selected mission panel', async (t) => {
+13 -20
View File
@@ -108,7 +108,7 @@ export function createIngestion({
async function captureSatelliteDependency() {
const manager = layerState._dataManager;
if (!manager) return;
if (!manager || layerState._satelliteStateBeforeMission) 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,16 +127,12 @@ export function createIngestion({
!manager.isEffectivelyEnabled('rocket-launches'))
)
return;
// A saved state kept by a restore that could not finish (Satellites was
// busy) is still the one from before the mission: keep it, and switch
// Satellites on for the mission again.
if (!layerState._satelliteStateBeforeMission)
layerState._satelliteStateBeforeMission = {
enabled: manager.isEnabled('satellites'),
params: parts.policyHelpers.satelliteParamsAfterSpaceMissions(
manager.getLayerParams('satellites'),
),
};
layerState._satelliteStateBeforeMission = {
enabled: manager.isEnabled('satellites'),
params: parts.policyHelpers.satelliteParamsAfterSpaceMissions(
manager.getLayerParams('satellites'),
),
};
manager.setLayerParams(
'satellites',
parts.policyHelpers.satelliteParamsForSpaceMissions(
@@ -183,21 +179,18 @@ 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),
);
if (!restoreVisibility) return;
// 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',
);
const restored = await manager.setEnabled('satellites', snapshot.enabled);
if (
restored === false ||
+5 -10
View File
@@ -118,15 +118,11 @@ const label = (
entryId,
});
test('a mission label click focuses its launch and covers the geometry beneath', (t) => {
const r = rig(t, { overlayHit: label('launch:L2'), geometryLaunchId: 'L1' });
test('a mission label click focuses its launch and stops the click there', (t) => {
const r = rig(t, { overlayHit: label('launch:L2') });
r.click();
assert.deepEqual(r.focused, ['L2'], 'the mission beneath is not picked');
// Other layers still hear it, to close their cards or clear selection,
// as a click on the label rather than on the geometry beneath.
assert.equal(r.ambient.length, 1);
assert.equal(r.ambient[0].overlay, true);
assert.equal(r.ambient[0].drawHit, null);
assert.deepEqual(r.focused, ['L2']);
assert.equal(r.ambient.length, 0, 'the layers beneath do not see it');
r.setHit(label('launch:L1', ROCKET_MISSION_SELECTED_OVERLAY_SOURCE_ID));
r.click();
@@ -160,8 +156,7 @@ 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, 1);
assert.equal(r.ambient[0].overlay, true);
assert.equal(r.ambient.length, 0);
});
test('a mission label for an unknown launch falls through to other layers', (t) => {
@@ -177,36 +177,3 @@ 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);
});
+2 -8
View File
@@ -380,20 +380,14 @@ export function createPanel({ state: layerState, services, parts, source }) {
function scheduleMissionRosterPreview(index) {
const launch = layerState._launches[index];
// 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 (!launch || layerState._selectedLaunchId) 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 ||
!layerState._enabled
)
return;
if (layerState._hoveredRosterLaunchId !== launch.id) return;
const currentLaunch = resolveMissionRosterPreviewLaunch(
layerState._launches,
launch.id,
-24
View File
@@ -9,7 +9,6 @@ function fixture() {
const state = createState({
services: { overlays: {}, render: {} },
});
state._enabled = true;
const calls = [];
const parts = {
overlays: {
@@ -195,26 +194,3 @@ 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();
});
+10 -3
View File
@@ -8,7 +8,12 @@ import {
} from '../../data/screenRotation.js';
import { fromDegreesInto, toLonLatH } from '../../geo/ellipsoid.js';
import { hexColor } from '../../render/color.js';
import { drawOf, findCamera, findFrame } from '../../render/rendererOf.js';
import {
drawOf,
findCamera,
findFrame,
findQuery,
} from '../../render/rendererOf.js';
import { inputFor } from '../../input/dispatcher.js';
import { pickRenderAltitudeM } from '../../data/renderAltitude.js';
import { routePlausible } from '../../data/routePlausible.js';
@@ -677,8 +682,10 @@ export function createLocalAdsbLayer({
if (ownedElsewhere(topId) && !trail) return 'other';
let hits = [];
try {
// The click's own drill: none under a label painted over the map.
hits = event.drill(CLICK_DRILL_LIMIT);
hits =
findQuery(viewer)?.drillPick(event.position.x, event.position.y, {
limit: CLICK_DRILL_LIMIT,
}) ?? [];
} catch {
hits = [];
}
+1 -38
View File
@@ -17,7 +17,6 @@ import { createLocalAdsbModels } from './models.js';
import { entityRecord, readEntityRecord } from '../../data/entityRecords.js';
import { resolvePickId } from '../../data/pickRegistry.js';
import { fromDegrees, toLonLatH } from '../../geo/ellipsoid.js';
import { inputFor } from '../../input/dispatcher.js';
import { fakeInput } from '../../input/testDoubles.mjs';
import { hexColor } from '../../render/color.js';
import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs';
@@ -1175,8 +1174,7 @@ 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 click drills through the viewer's `drillHits`. */
/** A viewer with a canvas and scripted picks, plus the layer's click action. */
function clickHarness() {
const scene = {
canvas: {},
@@ -1184,8 +1182,6 @@ function clickHarness() {
pick() {
return scene.pickResult;
},
drillPick: () =>
(base.viewer.drillHits ?? []).map((hit) => ({ primitive: {}, id: hit })),
};
const base = fakeViewer({ scene });
return {
@@ -1269,39 +1265,6 @@ test('a click on a local aircraft under an unowned or trail pick still selects i
assert.equal(calls.selected.length, 2, 'the Flights contact is not taken');
});
test('a click a label painted over a local aircraft takes never selects the aircraft, and lets go of the selection', async (t) => {
const receiver = fakeReceiver({ mode: 'adsb', connected: true });
const clock = { now: 100_000 };
const harness = clickHarness();
const { layer, calls, draw } = await enabledLayer(receiver, clock, null, {
viewer: harness.viewer,
});
t.after(() => layer.destroy());
receiver.set({ aircraft: [record()] });
await layer.update();
const label = { over: true };
inputFor(harness.viewer.viewer).onOverlayClick(() => label.over);
const model = {
set: layerSet(draw, ':models').spec.id,
id: 'local-adsb:abc123',
surface: false,
};
// The aircraft is under the label, both exactly and in the drill.
harness.scene.pickResult = iconPick(draw, 'local-adsb:abc123');
harness.viewer.viewer.drillHits = [model];
harness.click();
assert.deepEqual(calls.selected, [], 'the aircraft beneath is not taken');
// Off the label the same click selects it; on the label it lets go.
label.over = false;
harness.click();
assert.deepEqual(calls.selected, ['local-adsb:abc123']);
label.over = true;
harness.click();
assert.deepEqual(calls.selected, ['local-adsb:abc123']);
assert.equal(calls.cleared.length, 1, 'the selection is released');
});
test('a grounded aircraft changing type keeps its drawn model on its own belly offset until the new one is ready', () => {
const { draw, viewer, camera } = modelViewer();
const models = createLocalAdsbModels({
+3 -6
View File
@@ -1348,12 +1348,9 @@ export function createNewsLayer({
clickOff = inputFor(viewer).onClick((event) => {
const at = event?.screenPosition;
if (!enabled || destroyed || !isPointerFree() || !at) return;
// A click a label painted over the cards took is not on a card.
const card = event.overlay
? null
: hitTestOverlay(at.x, at.y, {
sourceId: NEWS_OVERLAY_SOURCE_ID,
});
const card = hitTestOverlay(at.x, at.y, {
sourceId: NEWS_OVERLAY_SOURCE_ID,
});
if (card?.entry?.activate) {
card.entry.activate();
return;
+2 -43
View File
@@ -6,8 +6,6 @@ import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs';
import { NEWS_KEY_PROVIDERS, createNewsLayer } from './index.js';
import { getSelectedEntityContext } from '../../data/contextStore.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { NEWS_OVERLAY_SOURCE_ID } from './model.js';
const NOW = Date.parse('2026-10-28T10:00:00Z');
const hotspotsPayload = {
@@ -53,8 +51,6 @@ function fixture(
now = () => NOW,
quality,
pictureCards,
underLabel = false,
hitTestOverlay = () => null,
} = {},
) {
const calls = { feed: [], hotspots: 0, outline: 0 };
@@ -141,18 +137,11 @@ function fixture(
for (const fn of [...clickHandlers])
fn({ screenPosition: { x: 10, y: 10 }, topHit });
};
// Or the scene's own dispatcher, with a label that may be painted over
// the map (`fake.label.over`).
let fake = null;
if (underLabel) {
viewer.scene = { canvas: {}, pick: () => null };
fake = fakeInputUnderLabel(viewer);
}
const layer = createNewsLayer({
source,
overlayHost,
inputFor: () => fake?.input ?? input,
hitTestOverlay,
inputFor: () => input,
hitTestOverlay: () => null,
now,
matchMedia: () => ({ matches: reduced }),
getViewCentre: () => centre(),
@@ -169,7 +158,6 @@ function fixture(
layer.attachShellServices({ runNavigation: (navigate) => navigate() });
t.after(() => {
layer.destroy();
fake?.destroy();
unbind();
if (originalWindow === undefined) delete globalThis.window;
else globalThis.window = originalWindow;
@@ -184,7 +172,6 @@ function fixture(
items,
click,
clickHandlers,
fake,
};
}
@@ -1298,34 +1285,6 @@ test('a click on a marker selects its report, on a beacon chooses its hotspot, o
assert.equal(clickHandlers.size, 0);
});
test("a click a label painted over a report's card takes never opens the card, and lets go of the report", async (t) => {
let activated = 0;
const { layer, fake } = fixture(t, {
height: 500_000,
underLabel: true,
// A report's card lies under every click.
hitTestOverlay: (_x, _y, { sourceId }) =>
sourceId === NEWS_OVERLAY_SOURCE_ID
? { entry: { activate: () => activated++ } }
: null,
});
layer.enable();
await layer.update();
await flush();
layer.setParams({ reportId: 'major', pin: 0 });
assert.equal(layer.getRowControls().feed.selected.id, 'major');
fake.label.over = true;
fake.click();
assert.equal(activated, 0, 'the card beneath the label is not opened');
assert.equal(layer.getRowControls().feed.selected, null);
// Off the label, the same click opens the card.
fake.label.over = false;
fake.click();
assert.equal(activated, 1);
});
test('zoomed out, a hotspot is one beacon; off, nothing draws; destroyed, the sets go', async (t) => {
const { layer, items } = fixture(t);
assert.deepEqual(items('points'), []);
+5 -8
View File
@@ -218,14 +218,11 @@ export function createFirePerimetersLayer({
_clickSubscription = inputFor(_viewer).onClick((event) => {
// A click on the incident card itself opens its InciWeb page (when the
// incident has one) and never disturbs the selection.
// A click a label painted over the cards took is not on a card.
const cardHit = event.overlay
? null
: overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: PERIMETER_OVERLAY_SOURCE_ID },
);
const cardHit = overlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{ sourceId: PERIMETER_OVERLAY_SOURCE_ID },
);
if (cardHit && cardHit.entryId === _selectedCardId) {
if (_selectedLink && openExternal) openExternal(_selectedLink);
return;
+3 -53
View File
@@ -1,7 +1,7 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { createFirePerimetersLayer } from './index.js';
import { fakeInput, fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { fakeInput } 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,12 +30,11 @@ function harness(
const opened = [];
const viewer = { scene: { pick } };
const { draw } = bindFakeDraw(viewer);
const input = fakeInputUnderLabel(viewer);
const input = fakeInput(viewer);
const clicks = {
handler: (click) => input.click(click.position),
// Only the label's own overlay handler is left.
get destroyed() {
return input.input.subscriberCount() === 1 ? 1 : 0;
return input.input.subscriberCount() === 0 ? 1 : 0;
},
};
const layer = createFirePerimetersLayer({
@@ -79,8 +78,6 @@ function harness(
clicks,
owners,
opened,
/** A label painted over the map: while `over`, it takes each click. */
label: input.label,
};
}
@@ -314,53 +311,6 @@ test('a matched incident card carries the InciWeb line and click-through', async
);
});
test('a click a label painted over the incident card takes never opens its InciWeb page, and closes the card', async () => {
let cardHitResult = null;
const h = harness(
{ getSnapshot: async () => [row] },
{
pick: () => perimeterPick('fire-perimeter:2026-NMGNF-000123:0'),
inciwebIndex: [
{
incident_id: '329300',
tau: 'NMGNF Fixture Fire',
incident_title: 'Fixture Fire',
},
],
cardHit: () => cardHitResult,
},
);
await h.layer.update(h.viewer);
h.clicks.handler({ position: { x: 10, y: 10 } });
await new Promise((done) => setTimeout(done, 0));
const [card] = h.overlay.entries.get('fire-perimeters');
assert.equal(card.details.at(-1), 'InciWeb ↗ · click card to open');
// The open card lies under the label: the click opens nothing.
cardHitResult = { entryId: card.id };
h.viewer.scene.pick = () => null;
h.label.over = true;
h.clicks.handler({ position: { x: 12, y: 12 } });
assert.deepEqual(h.opened, [], 'the page beneath the label is not opened');
assert.equal(
h.overlay.entries.get('fire-perimeters')?.length ?? 0,
0,
'the card is closed',
);
// Off the label, a click on the open card opens its page.
h.label.over = false;
h.viewer.scene.pick = () =>
perimeterPick('fire-perimeter:2026-NMGNF-000123:0');
h.clicks.handler({ position: { x: 10, y: 10 } });
await new Promise((done) => setTimeout(done, 0));
cardHitResult = { entryId: h.overlay.entries.get('fire-perimeters')[0].id };
h.viewer.scene.pick = () => null;
h.clicks.handler({ position: { x: 12, y: 12 } });
assert.deepEqual(h.opened, ['https://inciweb.wildfire.gov/node/329300']);
h.layer.destroy();
});
test('an unmatched incident renders no InciWeb line and card clicks stay inert', async () => {
let cardHitResult = null;
const h = harness(
+3 -6
View File
@@ -278,12 +278,9 @@ export function createShipwrecksLayer({
_clickHandler = clicks.onClick((click) => {
if (pointer && !pointer.isPointerFree()) return;
const at = click.screenPosition;
// A click a label painted over the cards took is not on a card.
const cardHit = click.overlay
? null
: overlayHost.hitTest?.(at?.x, at?.y, {
sourceId: SHIPWRECKS_OVERLAY_SOURCE_ID,
});
const cardHit = overlayHost.hitTest?.(at?.x, at?.y, {
sourceId: SHIPWRECKS_OVERLAY_SOURCE_ID,
});
if (cardHit && cardHit.entryId === _selectedCardId) {
if (_selectedLink) openExternal(_selectedLink);
return;
-49
View File
@@ -2,7 +2,6 @@ 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,
@@ -394,51 +393,3 @@ test('the page deadline subtracts the newest available source age from the limit
);
assert.equal(snapshotDeadline({ sources: both }, 0), 7 * DAY, 'defaults');
});
test("a click a label painted over the open card takes never opens the card's link, and closes the card", async (t) => {
let picked = null;
const viewer = { scene: { canvas: {}, pick: () => picked } };
bindFakeDraw(viewer);
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const cards = [];
const opened = [];
let cardUnder = null;
const layer = createShipwrecksLayer({
source: { getSnapshot: () => Promise.resolve(snapshot([wreck('a')])) },
overlayHost: {
setEntries: (_source, entries) => cards.push(entries),
setVisible() {},
hitTest: () => (cardUnder ? { entryId: cardUnder } : null),
},
input: () => fake.input,
picking,
pointer: { isPointerFree: () => true },
openExternal: (url) => opened.push(url),
now: () => 1,
});
layer.init(viewer);
t.after(() => layer.destroy());
layer.enable();
await layer.update();
picked = { primitive: {}, id: { set: 'shipwrecks:', id: 'shipwreck:a' } };
fake.click();
const [card] = cards.at(-1);
assert.equal(card.id, 'shipwreck-card:a');
// The open card lies under the label: the click opens nothing.
picked = null;
cardUnder = card.id;
fake.label.over = true;
fake.click();
assert.deepEqual(opened, [], 'the link beneath the label is not opened');
assert.deepEqual(cards.at(-1), [], 'the card is closed');
// Off the label, a click on the open card opens its link.
fake.label.over = false;
picked = { primitive: {}, id: { set: 'shipwrecks:', id: 'shipwreck:a' } };
fake.click();
picked = null;
fake.click();
assert.equal(opened.length, 1);
});
+11 -13
View File
@@ -64,19 +64,17 @@ export function createSelection({
// Cards are painted on a pointer-events:none canvas, so the scene pick is
// usually terrain behind the card. Resolve against the host's current
// actionable hit rectangles before treating the click as empty space.
// A click a label painted over the cards took is not on a card.
const cardHit =
!record && !event.overlay
? vesselState._vesselOverlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
...(cycloneBackground
? {}
: { sourceId: VESSEL_OVERLAY_SOURCE_ID }),
},
)
: null;
const cardHit = !record
? vesselState._vesselOverlayHost.hitTest?.(
event.screenPosition?.x,
event.screenPosition?.y,
{
...(cycloneBackground
? {}
: { sourceId: VESSEL_OVERLAY_SOURCE_ID }),
},
)
: null;
if (cycloneBackground && cardHit?.sourceId !== VESSEL_OVERLAY_SOURCE_ID)
return;
if (!record && cardHit) {
-89
View File
@@ -1,89 +0,0 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { VESSEL_OVERLAY_SOURCE_ID } from '../../data/vesselLabels.js';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
import { createSelection } from './selection.js';
/** Calls on any member are recorded by name and do nothing else. */
function recorder(calls) {
return new Proxy(
{},
{
get:
(_target, name) =>
(...args) =>
calls.push([name, ...args]),
},
);
}
/** The vessel selection over a viewer whose clicks a label may take. */
function selectionHarness(t) {
const viewer = { scene: { canvas: {}, pick: () => null } };
const fake = fakeInputUnderLabel(viewer);
t.after(() => fake.destroy());
const vessel = { id: 'v1', name: 'NORTHERN STAR', lat: 0, lon: 0 };
const focused = [];
const calls = [];
const state = {
feed: { enabled: true },
records: { byId: new Map([[vessel.id, vessel]]) },
icons: { setId: 'vessels:icons', has: () => false },
selectedRecord: null,
interactionKeyTarget: new EventTarget(),
};
const vesselState = {
state,
// The vessel's card lies under the click.
_vesselOverlayHost: {
hitTest: (_x, _y, { sourceId } = {}) =>
sourceId === VESSEL_OVERLAY_SOURCE_ID
? { sourceId, entryId: `vessel:${vessel.id}` }
: null,
},
};
const selection = createSelection({
vesselState,
services: {
picking: { isOwnedByOtherLayer: () => false },
worldFocus: { requestWorldFocus: (request) => focused.push(request.id) },
context: recorder(calls),
},
parts: {
queries: {
reduceVesselSelection: ({ selectedId, pickedId }) =>
pickedId
? { action: pickedId === selectedId ? 'none' : 'select' }
: { action: selectedId ? 'deselect' : 'none' },
},
rendering: recorder(calls),
cards: recorder(calls),
photos: recorder(calls),
tracking: recorder(calls),
},
layer: { source: 'AIS' },
});
selection.installInteraction(viewer);
t.after(() => selection.removeVesselInteraction());
return { fake, state, vessel, focused };
}
test("a click a label painted over a vessel's card takes never selects or focuses the vessel", (t) => {
const h = selectionHarness(t);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.state.selectedRecord, null);
assert.deepEqual(h.focused, [], 'the camera is not sent to the vessel');
});
test('a click a label painted over the map takes lets go of the selected vessel', (t) => {
const h = selectionHarness(t);
// Off the label, a click on the card selects and focuses its vessel.
h.fake.click();
assert.equal(h.state.selectedRecord, h.vessel);
assert.deepEqual(h.focused, ['v1']);
h.fake.label.over = true;
h.fake.click();
assert.equal(h.state.selectedRecord, null);
assert.deepEqual(h.focused, ['v1']);
});
+7 -9
View File
@@ -483,18 +483,16 @@ export function createSelection({ state, services, parts }) {
if (!state.enabled || services.pointer?.isPointerFree?.() === false)
return;
const at = click.screenPosition;
// A click a label painted over the cards took is not on a card.
const hit =
!click.overlay &&
(overlay?.hitTest?.(at?.x, at?.y, {
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_SELECTED_SOURCE_ID,
}) ||
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_OVERLAY_SOURCE_ID,
}) ||
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_LABEL_SOURCE_ID,
}));
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_OVERLAY_SOURCE_ID,
}) ||
overlay?.hitTest?.(at?.x, at?.y, {
sourceId: WILDLIFE_LABEL_SOURCE_ID,
});
if (hit) {
hit.entry?.activate?.();
return;
@@ -2,7 +2,6 @@ import assert from 'node:assert/strict';
import test from 'node:test';
import { createSelection } from './selection.js';
import { bindWildlifeViewer } from '../../testSupport/wildlifeViewer.mjs';
import { fakeInputUnderLabel } from '../../input/testDoubles.mjs';
const row = {
stableId: 'inat:123',
@@ -305,35 +304,6 @@ test('empty clicks and layer removal release the selected row and its overlay',
assert.equal(f.entries.size, 0);
});
test("a click a label painted over a sighting's card takes never selects the sighting, and lets go of the selected one", (t) => {
let fake = null;
const f = fixture(row, {
input: (viewer) => {
fake ??= fakeInputUnderLabel(viewer);
return fake.input;
},
});
f.selection.install();
t.after(() => {
f.selection.remove();
fake.destroy();
});
f.selection.refreshAmbient();
// The sighting's name card lies under every click.
f.hit('wildlife-sightings-labels', 'wildlife-sightings-label:inat:123');
// Off the label, a click on the card selects and focuses the sighting.
fake.click();
assert.equal(f.state.selectedId, row.stableId);
assert.equal(f.flights.length, 1);
fake.label.over = true;
fake.click();
assert.equal(f.state.selectedId, null, 'the selected sighting is let go');
assert.equal(f.state.selectedRow, null);
assert.equal(f.flights.length, 1, 'the camera is not sent to the sighting');
});
test('a tap selects only a sighting exactly under it, not one the touch search found near it', () => {
const f = fixture();
f.selection.install();
+2 -4
View File
@@ -483,12 +483,10 @@ export class CockpitViewController {
* A click on the orbital picture: on a mapped point in reach it keeps the
* camera on that point; anywhere else it ends such a focus.
* @param {{x: number, y: number}|null|undefined} position
* @param {{overlay?: boolean}} [options] `overlay`: a label painted over
* the map took the click, which then only ends a focus.
* @returns {boolean} True when the click focused a point.
*/
onOrbitalClick(position, options) {
return onOrbitalClick.call(this, position, options);
onOrbitalClick(position) {
return onOrbitalClick.call(this, position);
}
/**
* A double-click on the orbital picture: on a mapped ground point it keeps
+3 -8
View File
@@ -256,16 +256,13 @@ export function onOrbitalDoubleClick(position) {
* focuses it; any other click ends a focus. A click a tool owns (drawing)
* is left alone, as is every click outside orbit.
* @param {{x: number, y: number}|null|undefined} position Canvas position.
* @param {{overlay?: boolean}} [options] `overlay`: a label painted over the
* map took the click, so it is on no site and only ends a focus.
* @returns {boolean} True when the click focused a point.
*/
export function onOrbitalClick(position, { overlay = false } = {}) {
export function onOrbitalClick(position) {
if (!inOrbit(this) || !isPointerFree()) return false;
if (!Number.isFinite(position?.x) || !Number.isFinite(position?.y))
return false;
// A click a label painted over the map took is on no site.
const site = overlay ? null : siteAt(this, position);
const site = siteAt(this, position);
const state = this.orbital;
if (site) {
if (state.focus?.key === String(site.id)) return true;
@@ -289,9 +286,7 @@ export function routeSceneClick() {
// A viewer with no input (headless tools, partial stubs) has no clicks.
return () => {};
}
return input.onClick((event) =>
this.onOrbitalClick(event?.position, { overlay: event?.overlay === true }),
);
return input.onClick((event) => this.onOrbitalClick(event?.position));
}
/**
+88 -3
View File
@@ -9,6 +9,7 @@
// entity comes last.
import { msg } from '../i18n/index.js';
import { parseCoordinateQuery } from '../search/coordinateParser.js';
/** Visual styles, by the words people use for them. */
const STYLES = [
@@ -286,6 +287,11 @@ export function normalizeLine(text, { isRequest = isPlainRequest } = {}) {
.trim();
const end = /(?<!(?:^|[\s.])\p{L})[.!。]+$/u;
line = line.replace(end, '');
// A verb typed twice ("hide hide everything") is one.
line = line.replace(
/^((?:turn|switch) (?:on|off)|show|hide|remove|enable|disable|clear|go to|fly to)\s+\1\b/i,
'$1',
);
// "please" is dropped only around a request: "Please Touch Museum",
// "Kindly Lane" and "Pretty Please" are names.
const polite = line
@@ -367,6 +373,66 @@ const GO_TAIL =
const SEPARATORS =
/(\s*(?:,|;(?!\s*[-+]?\d)|\+(?!\d)|&|\band then\b|\bthen\b|\band\b|\balso\b)\s*)/;
/**
* Places whose own name holds "and" (or "&"), kept whole after "near" or
* "in" instead of read as two places: "flights near Trinidad and Tobago".
*/
const COMPOUND_PLACES = new Set([
'trinidad and tobago',
'antigua and barbuda',
'bosnia and herzegovina',
'saint kitts and nevis',
'st kitts and nevis',
'st. kitts and nevis',
'saint vincent and the grenadines',
'st vincent and the grenadines',
'st. vincent and the grenadines',
'sao tome and principe',
'são tomé and príncipe',
'turks and caicos',
'turks and caicos islands',
'wallis and futuna',
'saint pierre and miquelon',
'heard island and mcdonald islands',
'svalbard and jan mayen',
'south georgia and the south sandwich islands',
'newfoundland and labrador',
'jammu and kashmir',
'andaman and nicobar islands',
'dadra and nagar haveli',
'brighton and hove',
]);
const isCompoundPlace = (first, second) =>
COMPOUND_PLACES.has(`${first} and ${second}`.toLowerCase());
/**
* Lower case one character at a time, so the line keeps its length and
* "İstanbul" reads "istanbul" (not "i̇stanbul" with a combining dot).
*/
function lowerEach(text) {
return Array.from(text, (char) =>
char === 'İ' ? 'i' : char.toLowerCase().normalize('NFC'),
).join('');
}
/**
* A place as it was typed: "İstanbul", "iPhone store", "McAllen" are kept,
* where the line read them in lower case. A place the line put together
* ("Trinidad and Tobago" from "Trinidad & Tobago") stays as read.
*/
export function asTypedIn(raw, place) {
const lowered = lowerEach(raw).replace(/\s+/g, ' ');
const spaced = raw.replace(/\s+/g, ' ');
if (lowered.length !== spaced.length) return place;
const at = lowered.indexOf(place);
if (at < 0) return place;
const before = lowered[at - 1];
const after = lowered[at + place.length];
if (/[\p{L}\p{N}]/u.test(before || '') || /[\p{L}\p{N}]/u.test(after || ''))
return place;
return spaced.slice(at, at + place.length);
}
function tidy(text) {
return text.replace(/\s+/g, ' ').trim();
}
@@ -415,7 +481,7 @@ export function parseOmnibar(
{ isEntity = () => false } = {},
) {
const raw = String(text || '').trim();
const line = tidy(raw.toLowerCase()).replace(
const line = tidy(lowerEach(raw)).replace(
/\b(black[- ]and[- ]white|b ?& ?w)\b/g,
'noir',
);
@@ -483,6 +549,7 @@ export function parseOmnibar(
for (let i = 0; i < clauses.length; i += 2) {
let clause = tidy(clauses[i]);
const separator = clauses[i - 1]?.trim();
const afterPlace = previousHadPlace;
const afterPlaceComma = previousHadPlace && separator === ',';
// "trinidad and tobago": a bare place joined to a bare place by "and".
const afterBarePlaceAnd = previousBarePlace && separator === 'and';
@@ -526,7 +593,14 @@ export function parseOmnibar(
const addPlace = (value, { bare = false, leftover = false } = {}) => {
if (!value) return;
if (leftover) placeClauses.add(i);
if (place && bare && afterBarePlaceAnd) place += ` and ${value}`;
// "near Trinidad and Tobago", "in Bosnia & Herzegovina": one place.
const joinsName =
place &&
afterPlace &&
(separator === 'and' || separator === '&') &&
isCompoundPlace(place.split(', ').at(-1), value);
if (joinsName) place += ` and ${value}`;
else if (place && bare && afterBarePlaceAnd) place += ` and ${value}`;
else if (place && !afterPlaceComma) {
if (separator === 'and') extraPlaces.push(value);
return;
@@ -834,7 +908,18 @@ export function parseOmnibar(
// Thermal"): no plan runs on Enter; the line may still be a name.
const unasked = steps.length > 0 && steps.every((step) => !asked.has(step));
if (place && !placeFrom) placeFrom = placeBare ? 'bare' : 'near';
if (place) steps.unshift({ kind: 'place', place });
if (place) {
// A grid reference is read only as typed ("14R PU 2090 4906"; in lower
// case it may be words), so the plan keeps it so.
const typed = asTypedIn(raw, place);
if (!parseCoordinateQuery(place) && parseCoordinateQuery(typed))
place = typed;
const step = { kind: 'place', place };
// How the place was typed, for its label only ("İstanbul", "iPhone
// store"); kept off the step's fields, which plans compare.
Object.defineProperty(step, 'shown', { value: asTypedIn(raw, place) });
steps.unshift(step);
}
steps.verb = LAYER_OFF.test(line) || LAYER_ON.test(line) || GO.test(line);
// Following happens once the camera has settled on the new view.
steps.sort((a, b) => (a.kind === 'follow') - (b.kind === 'follow'));
+84 -12
View File
@@ -22,6 +22,7 @@ import {
hasActionVerb,
isPanelText,
isRealQuestion,
asTypedIn,
isWholeMapClear,
magnitudeFloor,
normalizeLine,
@@ -152,6 +153,9 @@ const SETTINGS_FOR =
const SWITCH =
/^(turn on|switch on|enable|show|display|add|turn off|switch off|disable|hide|remove|toggle)(?:\s+(.*))?$/;
const SWITCH_OFF = /^(turn off|switch off|disable|hide|remove)\b/;
/** "hide everything except …", "turn off all layers but …". */
const EXCEPT =
/^(?:turn off|switch off|disable|hide|remove|clear)\s+(?:everything|all(?: the)?(?: other)?(?: layers?)?|every layer)\s+(?:except(?: for)?|but(?: for)?|other than|apart from|besides|save for)\s+(.+)$/;
// Layers people reach for first, so "turn on" offers these before the rest.
export const POPULAR_LAYERS = [
'flights',
@@ -393,12 +397,19 @@ const SMALL_WORDS = new Set([
'da',
'des',
]);
/**
* A place's name for a row: as typed when it has a capital ("iPhone store",
* "McAllen", "İstanbul"), else each word capitalised but the small joining
* ones ("santa fe de bogotá" reads "Santa Fe de Bogotá").
*/
export const titleCase = (text) =>
text.replace(/\S+/g, (word, at) =>
at > 0 && SMALL_WORDS.has(word)
? word
: word[0].toUpperCase() + word.slice(1),
);
/\p{Lu}/u.test(text)
? text
: text.replace(/\S+/g, (word, at) =>
at > 0 && SMALL_WORDS.has(word)
? word
: word[0].toUpperCase() + word.slice(1),
);
const STYLE_LABELS = {
noir: msg('Style: Noir'),
@@ -707,7 +718,7 @@ export function matchCommands(text) {
export function stepLabel(step) {
switch (step.kind) {
case 'place':
return titleCase(step.place);
return titleCase(step.shown ?? step.place);
case 'layer':
return step.enabled
? t('{layer} on', { layer: step.layer.shown })
@@ -819,12 +830,13 @@ const askRow = (text) => ({
label: t('Ask GEV: “{query}”', { query: text }),
hint: t('Opens chat'),
});
const placeRow = (place) => ({
/** `shown`: the place as typed, for the label ("İstanbul", "iPhone store"). */
const placeRow = (place, shown = place) => ({
key: `place:${place}`,
kind: 'place',
icon: 'location_on',
place,
label: t('Go to {place}', { place: titleCase(place) }),
label: t('Go to {place}', { place: titleCase(shown) }),
hint: t('Place or coordinates'),
});
/**
@@ -920,7 +932,55 @@ export function createOmnibar({ layers = [], isEntity = () => false } = {}) {
* line is not such a switch, or names nothing to switch and may be a place
* ("Show Low, AZ").
*/
/**
* "hide everything except flights", "turn off all but ships": a plan that
* switches off every layer that is on but the ones named. Null when the
* line is not that, or names no layer to keep.
*/
function exceptRows(line, ask) {
const match = EXCEPT.exec(line.toLowerCase());
if (!match) return null;
const kept = match[1]
.split(/\s*(?:,|\band\b|&)\s*/)
.map((term) => matchLayers(term)[0])
.filter(named);
if (!kept.length) return null;
const keptIds = new Set(kept.map((layer) => layer.id));
const steps = all()
.filter((layer) => layer.enabled && !keptIds.has(layer.id))
.map((layer) => ({ kind: 'layer', layer, enabled: false }));
if (!steps.length)
return [
{
key: 'none',
kind: 'none',
icon: 'layers',
label: t('No other layers are on'),
hint: '',
},
ask,
];
return [
{
key: `plan:${JSON.stringify(steps)}`,
kind: 'plan',
icon: 'bolt',
steps,
label: steps.map(stepLabel).join(' · '),
hint: t('Do all'),
},
ask,
];
}
function switchRows(line, ask) {
const excepted = exceptRows(line, ask);
if (excepted) return excepted;
// "remove flights from the map": the map is where every layer is.
line = line.replace(
/\s+(?:from|off) (?:the )?(?:map|globe|screen|view)$/i,
'',
);
const switching = line.toLowerCase().match(SWITCH);
if (
!switching ||
@@ -1049,7 +1109,7 @@ export function createOmnibar({ layers = [], isEntity = () => false } = {}) {
realPlaces.length
? realPlaces
: place.trim().length >= minPlaceChars(place)
? [placeRow(place)]
? [placeRow(place, asTypedIn(text, place))]
: [];
const titled = writtenAsName(text.split(/\s+/));
@@ -1260,7 +1320,7 @@ export function createOmnibar({ layers = [], isEntity = () => false } = {}) {
...(placeStep ? placeRows(placeStep.place).slice(0, 2) : []),
// "near New York and Paris": the plan goes to the first; the others
// are offered rather than dropped.
...extraPlaces.map((extra) => placeRow(extra)),
...extraPlaces.map((extra) => placeRow(extra, asTypedIn(text, extra))),
...steps
.filter((step) => step.kind === 'layer')
.map((step) => layerRow(step.layer, step.enabled)),
@@ -1269,11 +1329,23 @@ export function createOmnibar({ layers = [], isEntity = () => false } = {}) {
// without a verb may be part of the place's name, so the whole line as a
// place comes first and the plan second. After "go to …" with a request
// peeled off, the place is the one read ("go to London with flights").
// A keyword ahead of the rest of a name ("Fire Island", "Ship Bottom",
// "Radio City Music Hall") begins that name: the leftover is a fragment,
// not a place, so no plan goes there. "tokyo traffic" and "Thermal,
// California" (a comma parts them) keep their plans.
const lower = text.toLowerCase();
const fragment =
ambiguous &&
!peeled &&
placeStep &&
!/[,;]/.test(text) &&
lower.endsWith(placeStep.place.toLowerCase()) &&
!lower.startsWith(placeStep.place.toLowerCase());
if (ambiguous)
return withEntities(
[
placeRow(peeled ? placeStep.place : text),
plan,
peeled ? placeRow(placeStep.place, placeStep.shown) : placeRow(text),
...(fragment ? [] : [plan]),
...alternatives.filter((row) => row.kind !== 'place'),
ask,
],
+97
View File
@@ -646,3 +646,100 @@ test('several switches in one line are one plan', () => {
assert.equal(rows[defaultIndex].kind, 'plan', text);
}
});
test('a place named with "and" stays whole, and a place keeps how it was typed', () => {
const omnibar = createOmnibar({
layers: [{ id: 'flights', name: 'Live Flights', enabled: false }],
});
const first = (text) => omnibar.rows(text, { places: [] }).rows[0];
const plan = first('flights near Trinidad and Tobago');
assert.equal(plan.kind, 'plan');
assert.equal(plan.steps[0].place, 'trinidad and tobago');
assert.equal(
first('flights near Bosnia & Herzegovina').steps[0].place,
'bosnia and herzegovina',
);
// Two places joined by "and" are still two.
assert.equal(
first('flights near Austin and Dallas').steps[0].place,
'austin',
);
// "İstanbul" is searched without a stray combining dot, and labelled as typed.
const istanbul = first('show flights in İstanbul');
assert.equal(istanbul.steps[0].place, 'istanbul');
assert.match(istanbul.label, /^İstanbul /);
assert.equal(first('iPhone store').label, 'Go to iPhone store');
});
test('"everything except" keeps the layers named and switches off the rest', () => {
const omnibar = createOmnibar({
layers: layers(['flights', 'radio', 'cctv']),
});
const first = (text) => omnibar.rows(text, { places: [] }).rows[0];
for (const text of [
'hide everything except flights',
'turn off all but live flights',
'clear everything other than flights',
]) {
const plan = first(text);
assert.equal(plan.kind, 'plan', text);
assert.deepEqual(
plan.steps.map(stepOutcome),
['layer(radio,off)', 'layer(cctv,off)'],
text,
);
}
assert.deepEqual(
first('hide everything except flights and cctv').steps.map(stepOutcome),
['layer(radio,off)'],
);
const alone = createOmnibar({ layers: layers(['flights']) });
assert.equal(
alone.rows('hide everything except flights').rows[0].kind,
'none',
);
// Naming no layer to keep is not this reading.
assert.notEqual(first('hide everything except the coast').kind, 'plan');
});
test('"from the map" and a doubled verb do not change the request', () => {
assert.equal(
outcome('remove flights from the map', { on: ['flights'] }),
'layer(flights,off)',
);
assert.equal(
outcome('hide flights off the globe', { on: ['flights'] }),
'layer(flights,off)',
);
assert.equal(normalizeLine('show show flights'), 'show flights');
assert.equal(normalizeLine('turn off turn off flights'), 'turn off flights');
});
test('a grid reference after "near" is the place', () => {
const omnibar = createOmnibar({ layers: layers() });
const plan = omnibar.rows('flights near 14R PU 2090 4906', { places: [] })
.rows[0];
assert.equal(plan.kind, 'plan');
assert.equal(plan.steps[0].kind, 'place');
assert.match(plan.steps[0].place, /^14R PU 2090 4906$/i);
});
test('a keyword that begins a name offers no plan to the rest of it', () => {
const omnibar = createOmnibar({ layers: layers() });
for (const text of [
'Radio City Music Hall',
'Traffic Island',
'radio island',
]) {
const { rows } = omnibar.rows(text, { places: [] });
assert.equal(rows[0].kind, 'place', text);
assert.ok(!rows.some((row) => row.kind === 'plan'), text);
assert.ok(
rows.some((row) => row.kind === 'layer'),
text,
);
}
// A keyword after the place still offers its plan.
const { rows } = omnibar.rows('tokyo traffic', { places: [] });
assert.ok(rows.some((row) => row.kind === 'plan'));
});
+1 -5
View File
@@ -935,11 +935,7 @@ function onKeydown(event) {
if (!items.value.length && !chips.length) return;
event.preventDefault();
dismissed.value = false;
// When the list opens upward (read bottom-up) the keys follow the
// screen: Up moves away from the field.
const list = document.getElementById('gev-omnibar-list');
const upward = list && getComputedStyle(list).flexDirection === 'column-reverse';
const down = (event.key === 'ArrowDown') !== upward;
const down = event.key === 'ArrowDown';
if (inStrip.value) {
inStrip.value = false;
active.value = down ? 0 : items.value.length - 1;