mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 01:32:19 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
84d79f5c76 | ||
|
|
dc31774109 | ||
|
|
91700f89f8 | ||
|
|
0421813e26 |
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).
|
||||
@@ -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).
|
||||
+10
-2
@@ -7970,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
|
||||
@@ -7998,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
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
});
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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}",
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -35,17 +35,23 @@ 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;
|
||||
}
|
||||
if (otherLayer) return;
|
||||
const cardHit = overlayHost.hitTest?.(
|
||||
event.screenPosition?.x,
|
||||
event.screenPosition?.y,
|
||||
@@ -93,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.
|
||||
@@ -229,6 +261,7 @@ export function createSelection({
|
||||
removeClickHandler,
|
||||
selectAndFocusFire,
|
||||
pickedFire,
|
||||
standInFire,
|
||||
selectFire,
|
||||
clearFireSelection,
|
||||
refreshContextRegistrations,
|
||||
|
||||
@@ -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 = [];
|
||||
|
||||
+88
-3
@@ -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
@@ -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,
|
||||
],
|
||||
|
||||
@@ -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'));
|
||||
});
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user