From 3a5b10a1f6a29729cbfd213c06668d441686e7c5 Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Wed, 18 Nov 2026 20:07:18 -0800 Subject: [PATCH] Take "from the map" off after "clear" only for the whole map "clear flights from the map" no longer offers to turn Flights on. Co-authored-by: Manjunath Paparaju --- docs/CURRENT-STATE.md | 5 +++-- src/ui/omnibarIntent.js | 7 ++++--- src/ui/omnibarRows.test.mjs | 9 +++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 50958b0bca..bc5ba14fe7 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -7976,8 +7976,9 @@ the ones named, on Enter, or says no other layers are on; with a layer to keep that is not read, nothing is switched off and only Ask GEV is offered. While Space Missions is on, keeping either it or Satellites keeps both, since Space Missions draws through Satellites. "remove flights from the -map" is "remove flights", after hide, remove, turn off or clear ("clear -everything except flights from the map", "hide everything from the map"; +map" is "remove flights", after hide, remove or turn off, and after clear for the whole map +("clear everything except flights from the map", "hide everything from the +map"; "show me the view from the map" is a question), 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 diff --git a/src/ui/omnibarIntent.js b/src/ui/omnibarIntent.js index 041650c0d3..b70a3034f7 100644 --- a/src/ui/omnibarIntent.js +++ b/src/ui/omnibarIntent.js @@ -302,10 +302,11 @@ export function normalizeLine(text, { isRequest = isPlainRequest } = {}) { const read = polite !== line && polite && isRequest(polite) ? polite : line; // "remove flights from the map", "clear everything except ships from the // map": the map is where every layer is taken from. Not the verb's own - // "off" ("turn off the screen" is no layer switch), and not after "show" - // ("show me the view from the map" is a question). + // "off" ("turn off the screen" is no layer switch), not after "show" + // ("show me the view from the map" is a question), and after "clear" + // only for the whole map. return read.replace( - /^((?:turn|switch) off|hide|remove|disable|clear)\s+(\S.*?)\s+(?:from|off) (?:the )?(?:map|globe|screen|view)$/i, + /^((?:turn|switch) off|hide|remove|disable|clear(?= (?:everything|all|every)\b))\s+(\S.*?)\s+(?:from|off) (?:the )?(?:map|globe|screen|view)$/i, '$1 $2', ); } diff --git a/src/ui/omnibarRows.test.mjs b/src/ui/omnibarRows.test.mjs index 542c1975b5..dfd62bec65 100644 --- a/src/ui/omnibarRows.test.mjs +++ b/src/ui/omnibarRows.test.mjs @@ -816,6 +816,15 @@ test('"except" leaves Satellites to switch off with Space Missions off', () => { ['layer(satellites,off)'], text, ); + // "clear" takes the ending off only for the whole map: "clear flights + // from the map" never offers to turn Flights on. + assert.ok( + !omnibar + .rows('clear flights from the map', { places: [] }) + .rows.some((row) => + (row.steps || []).some((step) => step.kind === 'layer' && step.enabled), + ), + ); // After "show" the ending is part of what is asked. assert.equal( omnibar.rows('show me the view from the map', { places: [] }).defaultIndex,