Merge main (e4708a81, #1745) into the renderer branch

Main brings the reviewed one-time-control and timeline-mark changes. They
keep this branch's renderer work: earthquakes draw through the draw port and
register their strong quakes as marks; the weather clock keeps `follows` beside
`world`; the weather layer measures ages and delays from the timeline time;
the Visual panel keeps its sky and weather groups under Effects. Tests that
moved time through the weather clock now move it on the world clock.
This commit is contained in:
Sameh Khamis committed 2026-11-14 22:08:39 -08:00
commit 0ecbfbecd0
123 files changed
+5917 -1471

No files matched your search

+3 -1
View File
@@ -25,7 +25,9 @@ const items = computed(() =>
id: panel.id,
icon: item?.icon ?? PANEL_RAIL_FALLBACK_ICON,
// Static markup is translated at boot, so a host's title already is.
label: item ? t(item.label) : panel.title,
label: item
? t(item.label, item.context && { context: item.context })
: panel.title,
};
}),
);
+6
View File
@@ -232,6 +232,7 @@ export class StyleManager extends ShellFacade {
getDetectionTuning: services.getDetectionTuning,
getKeyholeFadeTuning: services.getKeyholeFadeTuning,
getScopeMaskFeather: services.getScopeMaskFeather,
getScopeMaskOpacity: services.getScopeMaskOpacity,
getScopeTerminusOverride: services.getScopeTerminusOverride,
governorRequestRender: services.governorRequestRender,
holdContinuousRender: services.holdContinuousRender,
@@ -245,6 +246,7 @@ export class StyleManager extends ShellFacade {
setKeyholeFadeTuning: services.setKeyholeFadeTuning,
setScopeMaskEnabled: services.setScopeMaskEnabled,
setScopeMaskFeather: services.setScopeMaskFeather,
setScopeMaskOpacity: services.setScopeMaskOpacity,
},
elements: {
_ppToggles: this._ppToggles,
@@ -609,6 +611,10 @@ export class StyleManager extends ShellFacade {
this._setDetectionAllocation(...args),
_setDetectionFade: (...args) => this._setDetectionFade(...args),
_setScope: (...args) => this._visualSettings._setScope(...args),
_applyGlobalPostDefaults: (...args) =>
this._applyGlobalPostDefaults(...args),
_adoptDetectionAsRestore: () =>
this._visualSettings.adoptDetectionAsRestore(),
setCelestialRingEnabled: (...args) =>
this.setCelestialRingEnabled(...args),
_setModels3dEnabled: (...args) => this._setModels3dEnabled(...args),
+3 -3
View File
@@ -280,7 +280,7 @@ test('a tracked flight’s photo shows under its name, credited and linked to it
test('no photo renders without one', async (t) => {
const { panel, publish } = fixture(t);
await publish({ ...results(), photo: null });
assert.equal(panel().querySelector('.military-awareness-photo'), null);
assert.equal(panel().querySelector('.military-awareness-photo') === null, true);
});
test('a photo whose image fails to load is hidden until another arrives', async (t) => {
@@ -290,10 +290,10 @@ test('a photo whose image fails to load is hidden until another arrives', async
.querySelector('.military-awareness-photo img')
.dispatchEvent(new Event('error'));
await nextTick();
assert.equal(panel().querySelector('.military-awareness-photo'), null);
assert.equal(panel().querySelector('.military-awareness-photo') === null, true);
// A repaint with the same photo keeps it hidden.
await publish({ ...results({ previousDisabled: false }), photo: photo() });
assert.equal(panel().querySelector('.military-awareness-photo'), null);
assert.equal(panel().querySelector('.military-awareness-photo') === null, true);
// Another plane's photo shows.
const next = photo({ src: 'https://t.plnspttrs.net/2/def456_280.jpg' });
await publish({ ...results(), photo: next });
+3 -3
View File
@@ -909,7 +909,7 @@ test('arrows do nothing new in an aircraft cockpit', async (t) => {
near(after.pitchDeg, before.pitchDeg, 'the aircraft pitch', 1e-6);
assert.deepEqual(cockpit.lookTarget, { yawDeg: 0, pitchDeg: -2 });
assert.equal(store.instruments.look.offset, false);
assert.equal(document.querySelector('.cockpit-look'), null);
assert.equal(document.querySelector('.cockpit-look') === null, true);
// The tape stays on the aircraft's heading, with no bow or stern marks.
const centre = store.instruments.compass.find(
(division) => division.slot === 0,
@@ -919,7 +919,7 @@ test('arrows do nothing new in an aircraft cockpit', async (t) => {
prograde: null,
retrograde: null,
});
assert.equal(document.querySelector('.cockpit-compass-marker'), null);
assert.equal(document.querySelector('.cockpit-compass-marker') === null, true);
assert.doesNotMatch(
document.querySelector('.cockpit-help').textContent,
/ARROWS LOOK/,
@@ -1323,7 +1323,7 @@ test('a ship with neither heading nor course makes up no direction', async (t) =
prograde: null,
retrograde: null,
});
assert.equal(document.querySelector('.cockpit-compass-marker'), null);
assert.equal(document.querySelector('.cockpit-compass-marker') === null, true);
assert.match(
$('.cockpit-visor-status-right').textContent,
/NO HEADING · AIS/,
+3
View File
@@ -310,6 +310,9 @@ export function onKeyDown(event) {
if (event.target?.closest?.('.cesium-credit-lightbox')) return;
// An open Display or Radio popover takes Escape itself.
if (this.isUtilityDisclosureOpen?.()) return;
// So do the Data Layers search field and filter menu.
if (event.target?.closest?.('.layer-finder__field, .layer-finder__menu'))
return;
if (this.context?.contains(event.target) && !this.contextCollapsed) {
event.preventDefault();
event.stopImmediatePropagation();
+8 -8
View File
@@ -45,7 +45,7 @@ function fixture(t) {
test('the orbital HUD is hidden until a satellite view is published', async (t) => {
const f = fixture(t);
assert.equal(f.section().hidden, true);
assert.equal(f.section().querySelector('#cockpit-orbital-zoom-in'), null);
assert.equal(f.section().querySelector('#cockpit-orbital-zoom-in') === null, true);
});
test('a published orbital view renders its readouts and zoom controls', async (t) => {
@@ -97,7 +97,7 @@ test('an unknown velocity leaves its row out', async (t) => {
const f = fixture(t);
f.store.publishOrbital({ ...VIEW, velocityMps: null });
await nextTick();
assert.equal(f.section().querySelector('.cockpit-orbital-velocity'), null);
assert.equal(f.section().querySelector('.cockpit-orbital-velocity') === null, true);
assert.equal(f.text('.cockpit-orbital-altitude'), '418 KM');
});
@@ -145,7 +145,7 @@ test('publishing null hides the orbital HUD again', async (t) => {
f.store.publishOrbital(null);
await nextTick();
assert.equal(f.section().hidden, true);
assert.equal(f.section().querySelector('.cockpit-orbital-name'), null);
assert.equal(f.section().querySelector('.cockpit-orbital-name') === null, true);
});
const ISS_TLE = Object.freeze({
@@ -160,7 +160,7 @@ test('the place below shows at the top once known', async (t) => {
const f = fixture(t);
f.store.publishOrbital({ ...VIEW, place: undefined });
await nextTick();
assert.equal(f.section().querySelector('#cockpit-orbital-over'), null);
assert.equal(f.section().querySelector('#cockpit-orbital-over') === null, true);
const over = () =>
f.section().querySelector('#cockpit-orbital-over strong')?.textContent;
f.store.publishOrbital({
@@ -195,7 +195,7 @@ test('the place below shows at the top once known', async (t) => {
// says nothing rather than call land open ocean.
f.store.publishOrbital({ ...VIEW, place: null });
await nextTick();
assert.equal(document.querySelector('#cockpit-orbital-over'), null);
assert.equal(document.querySelector('#cockpit-orbital-over') === null, true);
});
test('an owner country shows its flag from the sheet, or its code if the sheet will not load', async (t) => {
@@ -216,7 +216,7 @@ test('an owner country shows its flag from the sheet, or its code if the sheet w
owner: { countryCode: 'US', label: 'USA' },
});
await nextTick();
assert.equal(f.section().querySelector('.cockpit-orbital-flag'), null);
assert.equal(f.section().querySelector('.cockpit-orbital-flag') === null, true);
assert.equal(images.length, 1, 'the sheet is asked for');
images[0].onerror();
await settle();
@@ -244,7 +244,7 @@ test('an owner country shows its flag from the sheet, or its code if the sheet w
flag.style.backgroundPosition,
ownerFlagStyle('FR').backgroundPosition,
);
assert.equal(f.section().querySelector('.cockpit-orbital-owner-badge'), null);
assert.equal(f.section().querySelector('.cockpit-orbital-owner-badge') === null, true);
});
test('the readout names the owner, operator and element set', async (t) => {
@@ -327,7 +327,7 @@ test('unknown identity fields leave their rows out', async (t) => {
'.cockpit-orbital-ident',
'#cockpit-orbital-tle',
])
assert.equal(f.section().querySelector(selector), null, selector);
assert.equal(f.section().querySelector(selector) === null, true, selector);
// An element set with no NORAD id still dates itself.
f.store.publishOrbital({ ...VIEW, tle: ISS_TLE });
await nextTick();
+4 -2
View File
@@ -27,9 +27,11 @@ export const COCKPIT_UTILITY_REC_GAP_PX = 12;
export const COCKPIT_UTILITY_SIGNAL_GAP_PX = 8;
export const COCKPIT_UTILITY_MIN_TOP_PX = 96;
// Display and Radio start where the left rail does (max(206px, 22vh) in
// cockpit-panels.css), so the two rails' tops line up.
export const COCKPIT_UTILITY_MIN_TOP_PX = 206;
export const COCKPIT_UTILITY_MIN_TOP_RATIO = 0.12;
export const COCKPIT_UTILITY_MIN_TOP_RATIO = 0.22;
export const COCKPIT_UTILITY_LAUNCHER_MIN_HEIGHT_PX = 50;
+39
View File
@@ -450,3 +450,42 @@ test('the real layout pass drives the mounted controls: compact hides the collap
assert.equal(cockpit.utilityLayout.top, '120.00px');
assert.equal(strip.classList.contains('layout-primary-only'), false);
});
test('the rail opens one panel at a time and reads as a disclosure', async (t) => {
const { $, controls } = fixture(t);
const item = (kind) =>
document.querySelector(`[data-cockpit-rail-item="${kind}"]`);
item('display').click();
await nextTick();
assert.equal($('cockpit-display-panel').hidden, false);
assert.equal(item('display').getAttribute('aria-expanded'), 'true');
assert.equal(
item('display').getAttribute('aria-controls'),
'cockpit-display-panel',
);
item('radio').click();
await nextTick();
assert.equal($('cockpit-display-panel').hidden, true);
assert.equal($('cockpit-radio-panel').hidden, false);
assert.equal(item('display').getAttribute('aria-expanded'), 'false');
assert.equal(item('radio').getAttribute('aria-expanded'), 'true');
item('radio').click();
await nextTick();
assert.equal(controls._cockpitDisclosureOpen('radio'), false);
assert.equal(controls._cockpitDisclosureOpen('display'), false);
});
test('collapsing an open panel hands focus to the rail when its toggle is hidden', async (t) => {
const { $, controls } = fixture(t);
const railItem = document.querySelector('[data-cockpit-rail-item="radio"]');
// happy-dom lays nothing out: show the rail and hide the launcher's toggle
// as the desktop look does.
railItem.getClientRects = () => [{ width: 32, height: 32 }];
$('cockpit-radio-toggle-btn').getClientRects = () => [];
controls._setCockpitDisclosure('radio', true);
await nextTick();
document.querySelector('.cockpit-utility-collapse').click();
await nextTick();
assert.equal($('cockpit-radio-panel').hidden, true);
assert.equal(document.activeElement, railItem);
});
+1 -1
View File
@@ -142,7 +142,7 @@ test('the map source row renders the published chips and selects through the con
assert.equal(osm.classList.contains('active'), true);
assert.equal(osm.getAttribute('aria-pressed'), 'true');
assert.equal(osm.hasAttribute('aria-label'), false);
assert.equal(esri.querySelector('.map-stack-chip-req'), null);
assert.equal(esri.querySelector('.map-stack-chip-req') === null, true);
bing.click();
esri.click();
assert.deepEqual(selected, ['esri-imagery']);
+4
View File
@@ -56,6 +56,8 @@ import {
isScopeMaskEnabled,
setScopeMaskFeather,
getScopeMaskFeather,
setScopeMaskOpacity,
getScopeMaskOpacity,
setScopeTerminusOverride,
getScopeTerminusOverride,
clampScopeTerminusPct,
@@ -112,6 +114,8 @@ export class StyleManager extends ApplicationShell {
isScopeMaskEnabled,
setScopeMaskFeather,
getScopeMaskFeather,
setScopeMaskOpacity,
getScopeMaskOpacity,
setScopeTerminusOverride,
getScopeTerminusOverride,
clampScopeTerminusPct,
+45 -4
View File
@@ -1,4 +1,11 @@
import { getScopeMaskFeather, isScopeMaskEnabled, setScopeMaskEnabled, setScopeMaskFeather } from '../scopeMask.js';
import {
getScopeMaskFeather,
getScopeMaskOpacity,
isScopeMaskEnabled,
setScopeMaskEnabled,
setScopeMaskFeather,
setScopeMaskOpacity,
} from '../scopeMask.js';
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import test from 'node:test';
@@ -283,7 +290,7 @@ test('scope choice and expanded feather survive every HUD layout and both restor
let shown = null;
owner.store = { publish: (view) => (shown = view.scope) };
await owner.restoreShareState({ scopeEnabled: false, scopeFeatherPct: 200 });
assert.deepEqual(shown, { enabled: false, featherPct: 200 });
assert.deepEqual(shown, { enabled: false, featherPct: 200, opacityPct: 100 });
for (const layout of ['minimal', 'cyber', 'tactical']) {
owner._setHudVariant(layout, { applyVisualDefaults: true });
assert.equal(isScopeMaskEnabled(), false, layout);
@@ -293,10 +300,44 @@ test('scope choice and expanded feather survive every HUD layout and both restor
await owner.applyVisualState({ scope: { enabled: true, featherPct: 175 } });
assert.equal(isScopeMaskEnabled(), true);
assert.equal(getScopeMaskFeather(), 1.75);
assert.deepEqual(shown, { enabled: true, featherPct: 175 });
assert.deepEqual(shown, { enabled: true, featherPct: 175, opacityPct: 100 });
await owner.applyVisualState({ scope: { featherPct: 500 } });
assert.equal(getScopeMaskFeather(), 2);
assert.deepEqual(shown, { enabled: true, featherPct: 200 });
assert.deepEqual(shown, { enabled: true, featherPct: 200, opacityPct: 100 });
});
test('a shared scope opacity is restored and rides in the next share state', async (t) => {
const { owner } = styleOwner(t, 'tactical');
const previous = getScopeMaskOpacity();
t.after(() => setScopeMaskOpacity(previous));
Object.assign(owner.services, {
setScopeMaskEnabled() {},
setScopeMaskFeather() {},
setScopeMaskOpacity,
});
let shown = null;
owner.store = { publish: (view) => (shown = view.scope) };
await owner.restoreShareState({ scopeOpacityPct: 60 });
assert.equal(getScopeMaskOpacity(), 0.6);
assert.equal(shown.opacityPct, 60);
// A state without it leaves the opacity alone.
await owner.restoreShareState({ scopeFeatherPct: 80 });
assert.equal(getScopeMaskOpacity(), 0.6);
assert.equal(shown.opacityPct, 60);
Object.assign(owner.services, {
getDetectionTuning: () => ({ allocationStrategy: 'ELASTIC' }),
getDetectionMode: () => 'OFF',
isScopeMaskEnabled: () => true,
getScopeMaskFeather: () => 0.8,
getScopeMaskOpacity,
getScopeTerminusOverride: () => null,
});
owner.readCelestialRing = () => null;
assert.equal(owner._readShareState().options.scopeOpacityPct, 60);
// A link asking for less than the floor opens at the floor, and says so.
await owner.restoreShareState({ scopeOpacityPct: 20 });
assert.equal(getScopeMaskOpacity(), 0.5);
assert.equal(owner._readShareState().options.scopeOpacityPct, 50);
});
test('a scene shot saved with the retired Snow style plays on Normal', async (t) => {
+27
View File
@@ -105,6 +105,11 @@ export class DisplayBindings {
this._setScope({ featherPct: value });
this._syncShareState();
},
setScopeOpacity: (value) => {
this.shareLinkManager?.claimRestoreLane?.('visual');
this._setScope({ opacityPct: Number(value) });
this._syncShareState();
},
setSharpenIntensity: (pct) => {
this.shareLinkManager?.claimRestoreLane?.('visual');
this._setSharpenIntensity(pct);
@@ -168,6 +173,28 @@ export class DisplayBindings {
this._syncModels3dModeRow();
},
setModelsMode: (mode) => this._setModels3dMode(mode),
// Back to the out-of-the-box look: Normal style, the global post
// defaults (bloom, sharpen, HUD, labels, celestial), scope on at full
// feather and opacity, 3D aircraft on in Proximity.
resetVisual: () => {
this.shareLinkManager?.claimRestoreLane?.('visual');
this.setStyle('normal', { userInitiated: true });
// The HUD layout follows the Normal style, as choosing it does: the
// Cyber HUD stays Cyber.
this._applyGlobalPostDefaults({ keepHudVariant: true });
this._setDetectionAllocation('ELASTIC');
this._setScope({ enabled: true, featherPct: 100, opacityPct: 100 });
this._setModels3dEnabled(true);
this._setModels3dMode('proximity');
this._syncModels3dModeRow?.();
// Inside Contacts the detection shown is lent for the session, and
// leaving puts back the state from before. A reset there is the user's
// choice, so the defaults become what leaving puts back and what a
// share link carries.
this.claimDetection();
this._adoptDetectionAsRestore?.();
this._syncShareState();
},
});
this._detachDisplayControls = () => store.detach(token);
}
+105 -9
View File
@@ -108,7 +108,11 @@ test('bloom and sharpen render their state, slider and readout', async (t) => {
await nextTick();
assert.equal($('bloom-toggle').classList.contains('active'), false);
assert.equal($('bloom-slider-row').classList.contains('visible'), false);
assert.equal($('bloom-intensity-value').textContent, '140%', 'the amount stays');
assert.equal(
$('bloom-intensity-value').textContent,
'140%',
'the amount stays',
);
});
test('a publish never rewrites a slider the user is dragging', async (t) => {
@@ -314,6 +318,73 @@ test('Scope and Celestial render what VisualSettings shows', async (t) => {
assert.equal(celestial.title, 'Celestial ring — reveal the full globe');
});
test('scope opacity renders what VisualSettings shows and sets the mask', async (t) => {
const { store, $ } = fixture(t);
const { owner } = settings(store);
const mask = { opacity: 1 };
owner.services = {
...owner.services,
setScopeMaskEnabled() {},
setScopeMaskOpacity: (value) => (mask.opacity = value),
};
assert.equal($('scope-opacity-slider').value, '100');
assert.equal($('scope-opacity-value').textContent, '100%');
owner._setScope({ opacityPct: 62.4 });
await nextTick();
assert.equal(mask.opacity, 0.62);
assert.equal($('scope-opacity-slider').value, '62');
assert.equal($('scope-opacity-value').textContent, '62%');
assert.equal(store.view.scope.opacityPct, 62);
// No fainter than the floor, where the view would read as Scope off.
owner._setScope({ opacityPct: 10 });
await nextTick();
assert.equal(mask.opacity, 0.5, 'floored');
assert.equal($('scope-opacity-value').textContent, '50%');
assert.equal($('scope-opacity-slider').min, '50');
// A value that is not a number changes nothing.
owner._setScope({ opacityPct: Number.NaN });
await nextTick();
assert.equal($('scope-opacity-value').textContent, '50%');
owner._setScope({ opacityPct: 180 });
await nextTick();
assert.equal(mask.opacity, 1, 'clamped');
assert.equal($('scope-opacity-value').textContent, '100%');
owner._setScope({ opacityPct: 70 }, { apply: false });
await nextTick();
assert.equal(mask.opacity, 1, 'only shown');
assert.equal($('scope-opacity-value').textContent, '70%');
owner._setScope({ enabled: false });
await nextTick();
assert.equal($('scope-opacity-slider').disabled, true, 'off with the scope');
assert.equal(store.view.scope.opacityPct, 70, 'kept while off');
});
test('the Visual panel groups its controls and words its on/off pills', (t) => {
const { $ } = fixture(t);
const panel = $('pp-toggles');
assert.deepEqual(
[
...panel.querySelectorAll(
'.pp-section-heading, .visual-presets__heading',
),
].map((el) => el.textContent.trim()),
['Look', 'MAP SOURCE 3D', 'Overlay', 'Effects'],
);
assert.equal(panel.querySelector('.pp-header-label').textContent, 'VISUAL');
const body = panel.querySelector('.pp-panel-body');
assert.equal(body.style.getPropertyValue('--pp-pill-on'), '"ON"');
assert.equal(body.style.getPropertyValue('--pp-pill-off'), '"OFF"');
const reset = panel.querySelector('.pp-reset-btn');
assert.equal(reset, body.lastElementChild, 'the reset closes the panel');
assert.equal(reset.textContent.trim(), 'restart_altReset to default');
});
test('the 3D aircraft group renders what AircraftDisplay shows', async (t) => {
const { store, $ } = fixture(t);
const params = [];
@@ -331,7 +402,10 @@ test('the 3D aircraft group renders what AircraftDisplay shows', async (t) => {
assert.equal(coreClasses(button), 'pp-toggle-btn active');
assert.equal(button.getAttribute('aria-pressed'), 'true');
assert.equal(row.classList.contains('visible'), true);
assert.equal($('models3d-mode-proximity').getAttribute('aria-checked'), 'true');
assert.equal(
$('models3d-mode-proximity').getAttribute('aria-checked'),
'true',
);
// The button leaves the row to its own sync.
owner._setModels3dEnabled(false);
@@ -347,7 +421,10 @@ test('the 3D aircraft group renders what AircraftDisplay shows', async (t) => {
await nextTick();
assert.equal(all.classList.contains('active'), true);
assert.equal(all.getAttribute('aria-checked'), 'true');
assert.equal($('models3d-mode-proximity').classList.contains('active'), false);
assert.equal(
$('models3d-mode-proximity').classList.contains('active'),
false,
);
assert.deepEqual(params.at(-1), ['military', { models3dMode: 'all' }]);
owner._syncModels3dFromLayerState({
@@ -376,12 +453,18 @@ test('the Draw controls render what the draw tool publishes', async (t) => {
assert.equal(segment('area').getAttribute('aria-label'), 'Area');
assert.equal(segment('area').title, 'Area');
assert.equal(segment('area').textContent, 'pentagon');
const swatch = (color) => document.querySelector(`#draw-colors [data-color="${color}"]`);
const swatch = (color) =>
document.querySelector(`#draw-colors [data-color="${color}"]`);
assert.equal(swatch('primary').getAttribute('aria-checked'), 'true');
assert.equal(swatch('amber').getAttribute('aria-label'), 'Amber');
assert.equal($('draw-hint').textContent, '');
store.publishDraw({ active: true, shape: 'line', color: 'amber', hint: 'Click to add points.' });
store.publishDraw({
active: true,
shape: 'line',
color: 'amber',
hint: 'Click to add points.',
});
await nextTick();
assert.equal(swatch('amber').getAttribute('aria-checked'), 'true');
assert.equal(swatch('primary').classList.contains('active'), false);
@@ -476,7 +559,10 @@ test('the imported files render what the file import publishes and keep focus',
assert.equal(document.activeElement === button(first, 'toggle'), true);
assert.equal(button(first, 'toggle').getAttribute('aria-pressed'), 'true');
assert.equal(button(first, 'fly').title, 'Fly to <b>a</b>.geojson');
assert.equal(button(first, 'remove').getAttribute('aria-label'), 'Remove <b>a</b>.geojson');
assert.equal(
button(first, 'remove').getAttribute('aria-label'),
'Remove <b>a</b>.geojson',
);
await press(button(first, 'remove'));
assert.equal(rowsNow().length, 1);
@@ -592,7 +678,11 @@ test('VisualSettings publishes a style’s parameters and writes a moved slider
assert.equal(store.parameters, null, 'the sliders go with their owner');
assert.equal($('param-slider-panel').classList.contains('active'), false);
assert.equal(store.act('setStyleParameter', 'grainAmt', 0.2), undefined);
assert.equal(owner.stages.noir.uniforms.grainAmt, 0.3, 'a stopped owner no longer answers');
assert.equal(
owner.stages.noir.uniforms.grainAmt,
0.3,
'a stopped owner no longer answers',
);
// An older owner's stop leaves a newer owner's rows.
const newer = { style: 'noir', rows: [] };
owner._parameters = { style: 'noir', rows: [] };
@@ -604,10 +694,16 @@ test('VisualSettings publishes a style’s parameters and writes a moved slider
test('the four Cockpit groups teleport to the published slots and back to their places', async (t) => {
const { store, $ } = fixture(t);
const groupOf = (id) => $(id).closest('.pp-toggle-group') ?? $(id);
const ids = ['hud-toggle', 'detection-toggle', 'param-slider-panel', 'models3d-toggle'];
const ids = [
'hud-toggle',
'detection-toggle',
'param-slider-panel',
'models3d-toggle',
];
const body = $('pp-toggles').querySelector('.pp-panel-body');
const order = () =>
[...body.children].filter((el) => el.matches('.pp-toggle-group, #param-slider-panel'))
[...body.children]
.filter((el) => el.matches('.pp-toggle-group, #param-slider-panel'))
.map((el) => el.id || el.querySelector('[id]')?.id);
const home = order();
const popover = document.body.appendChild(document.createElement('div'));
+123
View File
@@ -8,6 +8,7 @@ import { createApp, h, nextTick } from 'vue';
import { createPinia } from 'pinia';
import { useDisplayStore } from './stores/display.js';
import { DisplayBindings } from './displayBindings.js';
import { VisualSettings } from './visualSettings.js';
import CommandDockView from './views/CommandDockView.vue';
import DisplayControlsView from './views/DisplayControlsView.vue';
import DrawControls from './views/panels/DrawControls.vue';
@@ -231,3 +232,125 @@ test('several owners answer their own actions, the newest first', (t) => {
['display', 'toggleBloom'],
]);
});
test('the Visual panel’s scope opacity, reset and presets call their actions', async (t) => {
const store = mount(t);
const { calls } = recorder(store);
const selected = [];
store.connectMapSource({ select: async (id) => selected.push(id) });
store.publishMapSource({
status: { text: 'OSM', warn: false },
chips: [
{ id: 'photoreal', label: 'Google 3D', available: false },
{ id: 'osm', label: 'OSM', available: true, active: true },
],
});
await nextTick();
input($('scope-opacity-slider'), 60);
document.querySelector('#pp-toggles .pp-reset-btn').click();
const presets = document.querySelector('#pp-toggles .visual-presets');
presets.querySelector('[data-style="noir"]').click();
const chips = presets.querySelectorAll('.visual-presets__chip');
chips[0].click();
chips[1].click();
assert.deepEqual(calls, [
['setScopeOpacity', 60],
['resetVisual'],
['setStyle', 'noir'],
]);
assert.deepEqual(selected, ['osm'], 'an unavailable source is not selected');
// The presets follow the published style, as the dock's do.
assert.equal(
presets.querySelector('[data-style="normal"]').getAttribute('aria-pressed'),
'true',
);
store.publishStyle({ name: 'noir', label: 'NOIR' });
await nextTick();
assert.equal(
presets.querySelector('[data-style="noir"]').getAttribute('aria-pressed'),
'true',
);
assert.equal(
presets.querySelector('[data-style="normal"]').getAttribute('aria-pressed'),
'false',
);
// The dock keeps its own presets and map source beside them.
assert.ok(
document.querySelector('#control-panel .style-btn[data-style="noir"]'),
);
assert.ok($('map-stack-chips'));
});
test('DisplayBindings sets the scope opacity and resets Visual to its defaults', (t) => {
const store = mount(t);
const calls = [];
const bindings = new DisplayBindings({
viewer: null,
services: { isScopeMaskEnabled: () => true, cycleDetectionMode: () => {} },
elements: { _locationSearch: document.createElement('input') },
operations: {
setStyle: (style, options) => calls.push(['style', style, options]),
_applyGlobalPostDefaults: (options) =>
calls.push(['postDefaults', options]),
_setDetectionAllocation: (value) => calls.push(['allocation', value]),
_setScope: (scope) => calls.push(['scope', scope]),
_setModels3dEnabled: (on) => calls.push(['models3d', on]),
_setModels3dMode: (mode) => calls.push(['models3dMode', mode]),
_syncModels3dModeRow: () => calls.push(['models3dRow']),
_syncShareState: () => calls.push(['share']),
_adoptDetectionAsRestore: () => calls.push(['adoptDetection']),
},
readState: () => ({
shareLinkManager: {
claimRestoreLane: (lane) => calls.push(['claim', lane]),
},
}),
claimDetection: () => calls.push(['claimDetection']),
displayStore: store,
});
bindings._initUI();
t.after(() => bindings.destroy());
calls.length = 0;
input($('scope-opacity-slider'), 65);
assert.deepEqual(calls, [
['claim', 'visual'],
['scope', { opacityPct: 65 }],
['share'],
]);
calls.length = 0;
document.querySelector('#pp-toggles .pp-reset-btn').click();
assert.deepEqual(calls, [
['claim', 'visual'],
['style', 'normal', { userInitiated: true }],
['postDefaults', { keepHudVariant: true }],
['allocation', 'ELASTIC'],
['scope', { enabled: true, featherPct: 100, opacityPct: 100 }],
['models3d', true],
['models3dMode', 'proximity'],
['models3dRow'],
['claimDetection'],
['adoptDetection'],
['share'],
]);
});
test('a reset inside Contacts makes the shown detection what leaving puts back', () => {
const adopt = VisualSettings.prototype.adoptDetectionAsRestore;
const live = { detectionMode: 'DENSE', densityPct: 75 };
const inContacts = {
_contactsDetectionRestore: { mode: 'OFF', densityPct: 50 },
getDetectionState: () => live,
};
adopt.call(inContacts);
assert.deepEqual(inContacts._contactsDetectionRestore, {
mode: 'DENSE',
densityPct: 75,
});
// Outside Contacts there is no saved state to change.
const outside = {
_contactsDetectionRestore: null,
getDetectionState: () => live,
};
adopt.call(outside);
assert.equal(outside._contactsDetectionRestore, null);
});
+200
View File
@@ -0,0 +1,200 @@
// src/ui/layerFinder.test.mjs — the Data Layers finder and section index work
// on the rows LayerRows renders: search, the On/Off and category filter,
// Escape, the clear request voice sends, and the group ticks.
import '../testSupport/registerDom.mjs';
import test from 'node:test';
import assert from 'node:assert/strict';
import { createApp, h, nextTick } from 'vue';
import LayerFinder, {
LAYER_FINDER_CLEAR_EVENT,
} from './views/panels/LayerFinder.vue';
import LayerSectionIndex from './views/panels/LayerSectionIndex.vue';
const ROWS = [
{ group: 'movement', heading: 'Movement' },
{ id: 'flights', name: 'Live Flights', english: 'Live Flights', on: true },
{ id: 'ships', name: 'Ships', english: 'Ships', on: false },
{ group: 'weather', heading: 'Weather' },
{ id: 'radar', name: 'Radar météo', english: 'Weather Radar', on: false },
];
const flush = async () => {
await nextTick();
await new Promise((resolve) => setTimeout(resolve, 0));
await nextTick();
};
function fixture(t) {
document.body.replaceChildren();
// Frames run at once, so the observers' batching does not hold a test up.
globalThis.requestAnimationFrame = (fn) => setTimeout(fn, 0);
globalThis.cancelAnimationFrame = (id) => clearTimeout(id);
const panel = document.body.appendChild(document.createElement('section'));
panel.id = 'data-panel';
const header = panel.appendChild(document.createElement('div'));
const bar = panel.appendChild(document.createElement('div'));
const list = panel.appendChild(document.createElement('div'));
list.id = 'data-toggles';
for (const row of ROWS) {
if (row.heading) {
const heading = list.appendChild(document.createElement('h3'));
heading.className = 'data-layer-group-heading';
heading.dataset.group = row.group;
heading.textContent = row.heading;
continue;
}
const el = list.appendChild(document.createElement('div'));
el.className = 'data-toggle-row';
el.dataset.layerId = row.id;
el.dataset.layerName = row.english;
el.innerHTML = `<span class="data-name">${row.name}</span><button class="data-toggle-btn${row.on ? ' active' : ''}"></button>`;
}
const index = panel.appendChild(document.createElement('div'));
const apps = [
createApp(() => h(LayerFinder, { part: 'buttons' })),
createApp(() => h(LayerFinder, { part: 'bar' })),
createApp(LayerSectionIndex),
];
apps[0].mount(header);
apps[1].mount(bar);
apps[2].mount(index);
t.after(async () => {
document.dispatchEvent(new CustomEvent(LAYER_FINDER_CLEAR_EVENT));
for (const app of apps) app.unmount();
});
const shown = () =>
[...list.querySelectorAll('.data-toggle-row:not(.is-filtered)')].map(
(row) => row.dataset.layerId,
);
const search = async (text) => {
if (!document.getElementById('layer-finder-input')) {
document.getElementById('layer-finder-search-btn').click();
await flush();
}
const input = document.getElementById('layer-finder-input');
input.value = text;
input.dispatchEvent(new Event('input', { bubbles: true }));
await flush();
};
const openFilter = async () => {
document.querySelector('[aria-controls="layer-finder-menu"]').click();
await flush();
return document.getElementById('layer-finder-menu');
};
return { list, panel, shown, search, openFilter };
}
test('search finds a layer by the name on screen or its English name', async (t) => {
const { shown, search, list } = fixture(t);
await search('météo');
assert.deepEqual(shown(), ['radar']);
await search('weather radar');
assert.deepEqual(shown(), ['radar']);
// The Movement heading has no rows left, so it is hidden too.
assert.equal(
list
.querySelector('[data-group="movement"]')
.classList.contains('is-filtered'),
true,
);
await search('nothing like it');
assert.deepEqual(shown(), []);
assert.match(
document.querySelector('.layer-finder__empty')?.textContent || '',
/No layers match/,
);
});
test('On and Off follow whether the layer is enabled', async (t) => {
const { shown, openFilter } = fixture(t);
const menu = await openFilter();
const on = [...menu.querySelectorAll('button')].find((b) =>
b.textContent.trim().endsWith('On'),
);
on.click();
await flush();
assert.deepEqual(shown(), ['flights']);
assert.equal(on.getAttribute('aria-pressed'), 'true');
});
test('a chosen category survives its heading being translated', async (t) => {
const { shown, openFilter, list } = fixture(t);
const menu = await openFilter();
[...menu.querySelectorAll('button')]
.find((b) => b.textContent.trim().endsWith('Weather'))
.click();
await flush();
assert.deepEqual(shown(), ['radar']);
list.querySelector('[data-group="weather"]').textContent = 'Météo';
await flush();
assert.deepEqual(shown(), ['radar']);
assert.match(
document.querySelector('.layer-finder__chip').textContent,
/Météo/,
);
});
test('Escape in the search field closes it without reaching the panel', async (t) => {
const { search, panel } = fixture(t);
let reached = false;
panel.addEventListener('keydown', () => (reached = true));
await search('ships');
document
.getElementById('layer-finder-input')
.dispatchEvent(
new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }),
);
await flush();
assert.equal(reached, false);
assert.equal(document.getElementById('layer-finder-input') === null, true);
assert.equal(document.activeElement?.id, 'layer-finder-search-btn');
});
test('the filter menu takes focus, moves with the arrows and closes on Escape', async (t) => {
const { openFilter } = fixture(t);
const menu = await openFilter();
const buttons = [...menu.querySelectorAll('button')];
assert.equal(document.activeElement, buttons[0]);
menu.dispatchEvent(
new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }),
);
assert.equal(document.activeElement, buttons[1]);
menu.dispatchEvent(
new KeyboardEvent('keydown', { key: 'End', bubbles: true }),
);
assert.equal(document.activeElement, buttons.at(-1));
menu.dispatchEvent(
new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }),
);
await flush();
assert.equal(document.getElementById('layer-finder-menu') === null, true);
assert.equal(
document.activeElement,
document.querySelector('[aria-controls="layer-finder-menu"]'),
);
});
test('a clear request shows every row again', async (t) => {
const { shown, search } = fixture(t);
await search('ships');
assert.deepEqual(shown(), ['ships']);
document.dispatchEvent(new CustomEvent(LAYER_FINDER_CLEAR_EVENT));
await flush();
assert.deepEqual(shown(), ['flights', 'ships', 'radar']);
});
test('the section index has a tick per group and drops filtered groups', async (t) => {
const { search } = fixture(t);
await flush();
assert.equal(
document.querySelectorAll('.layer-section-index__tick').length,
2,
);
await search('ships');
await flush();
// One group left: no index.
assert.equal(
document.querySelectorAll('.layer-section-index__tick').length,
0,
);
});
+5 -3
View File
@@ -22,9 +22,11 @@ defineProps({
<template>
<template v-for="item in items" :key="item.key"
><h3 v-if="item.heading" class="data-layer-group-heading">{{
item.heading
}}</h3
><h3
v-if="item.heading"
class="data-layer-group-heading"
:data-group="item.key"
>{{ item.heading }}</h3
><div
v-else
class="data-toggle-row"
+2 -2
View File
@@ -340,12 +340,12 @@ test('the provider settings corner shows the picker only while the shell publish
app.mount(host);
t.after(() => app.unmount());
const store = useLocaleStore(pinia);
assert.equal(document.getElementById('locale-picker'), null);
assert.equal(document.getElementById('locale-picker') === null, true);
store.publishPicker({ current: 'de', onSelect() {} });
await nextTick();
const code = document.querySelector('#corner-actions .locale-picker-code');
assert.equal(code?.textContent, 'DE');
store.publishPicker(null);
await nextTick();
assert.equal(document.getElementById('locale-picker'), null);
assert.equal(document.getElementById('locale-picker') === null, true);
});
+11 -11
View File
@@ -156,7 +156,7 @@ test('the panel shows the last 24 h as event cards and opens once', () => {
assert.equal(img.getAttribute('referrerpolicy'), 'no-referrer');
assert.equal(first.querySelector('.news-card__credit').textContent, 'A');
// A lone report has no picture.
assert.equal(second.querySelector('.news-card__thumb'), null);
assert.equal(second.querySelector('.news-card__thumb') === null, true);
// A later update does not reopen a panel the reader collapsed.
panel.classList.add('collapsed');
news.update(view());
@@ -192,8 +192,8 @@ test('a card click flies there; open, it links the source and closes', () => {
test('filters, the Local section and empty or failed reads', () => {
const { news, panel, calls } = fixture();
news.update(view());
assert.equal(panel.querySelector('[aria-label="Local"]'), null);
assert.equal(panel.querySelector('.news-toggle'), null);
assert.equal(panel.querySelector('[aria-label="Local"]') === null, true);
assert.equal(panel.querySelector('.news-toggle') === null, true);
const severity = panel.querySelector('select[aria-label="Severity"]');
assert.equal(severity.value, '2');
severity.value = '3';
@@ -214,7 +214,7 @@ test('filters, the Local section and empty or failed reads', () => {
panel.textContent,
/No news matches these filters in the last 24 h/,
);
assert.equal(panel.querySelector('.news-readout__footer button'), null);
assert.equal(panel.querySelector('.news-readout__footer button') === null, true);
// Local: no hotspot chips or severity floor, and its own empty states.
const localView = (inView) =>
@@ -225,9 +225,9 @@ test('filters, the Local section and empty or failed reads', () => {
news.update(localView({ active: false }));
const section = panel.querySelector('[aria-label="Local"]');
assert.match(section.textContent, /Zoom in to see local news/);
assert.equal(panel.querySelector('[data-chip-id="ua-ru-war"]'), null);
assert.equal(panel.querySelector('select[aria-label="Severity"]'), null);
assert.equal(panel.querySelector('[aria-label="Latest news"]'), null);
assert.equal(panel.querySelector('[data-chip-id="ua-ru-war"]') === null, true);
assert.equal(panel.querySelector('select[aria-label="Severity"]') === null, true);
assert.equal(panel.querySelector('[aria-label="Latest news"]') === null, true);
assert.equal(document.getElementById('news-panel-count').textContent, '0');
news.update(
localView({ active: true, items: [feedCardView(report('near'), NOW)] }),
@@ -320,7 +320,7 @@ test('a card credits the service its report came through', () => {
credited.querySelector('.news-card__via').textContent,
'via GDELT Project',
);
assert.equal(own.querySelector('.news-card__via'), null);
assert.equal(own.querySelector('.news-card__via') === null, true);
news.destroy();
});
@@ -370,7 +370,7 @@ test('scrolling to the end asks once per page, again after a filter change or a
test('the window choice offers shorter windows; the longest is the server window', () => {
const { news, panel, calls } = fixture();
news.update(view({ windowHours: 12, windowChoices: [12, 6, 3, 1] }));
assert.equal(panel.querySelector('.news-readout__window'), null);
assert.equal(panel.querySelector('.news-readout__window') === null, true);
const choice = panel.querySelector('select[aria-label="Time window"]');
assert.deepEqual(
[...choice.options].map((option) => option.textContent),
@@ -410,7 +410,7 @@ test('a clip waits behind its picture and plays, on request, in the open card',
news.update(view({ items: [feedCardView(clipped, NOW)] }));
const card = panel.querySelector('.news-card');
assert.equal(card.querySelector('.news-card__play').textContent, '▶');
assert.equal(card.querySelector('video'), null);
assert.equal(card.querySelector('video') === null, true);
news.update(
view({
items: [feedCardView(clipped, NOW)],
@@ -436,6 +436,6 @@ test('a clip waits behind its picture and plays, on request, in the open card',
selected: feedCardView(clipped, NOW),
}),
);
assert.equal(panel.querySelector('.news-card.is-open video'), null);
assert.equal(panel.querySelector('.news-card.is-open video') === null, true);
news.destroy();
});
+2 -2
View File
@@ -166,8 +166,8 @@ test('UiPanel without collapsible has no button, and glow is optional', (t) => {
});
const panel = document.getElementById('plain-panel');
assert.equal(panel.tagName, 'SECTION');
assert.equal(panel.querySelector('.panel-glow'), null);
assert.equal(panel.querySelector('.panel-collapse-btn'), null);
assert.equal(panel.querySelector('.panel-glow') === null, true);
assert.equal(panel.querySelector('.panel-collapse-btn') === null, true);
});
test('RailPanel follows the store, forwards clicks, and never restores a class its owner removed', async (t) => {
+4 -2
View File
@@ -9,7 +9,7 @@ export const PANEL_RAIL_FALLBACK_ICON = 'more_horiz';
/**
* How each side panel appears on its rail. Labels are the panels' own titles.
* `shownBy` names a class the panel needs to be shown at all (`f` toggles
* Data Layers' `active`).
* Data Layers' `active`). `context` is the label's translation context.
*/
export const PANEL_RAIL_ITEMS = Object.freeze({
'data-panel': {
@@ -19,7 +19,9 @@ export const PANEL_RAIL_ITEMS = Object.freeze({
},
'utilities-panel': { icon: 'handyman', label: msg('UTILITIES') },
'scene-panel': { icon: 'movie', label: msg('AUTHORING') },
'pp-toggles': { icon: 'palette', label: msg('VISUAL') },
// `context` keeps the panel's name apart from the satellite class of the
// same English word.
'pp-toggles': { icon: 'palette', label: msg('VISUAL'), context: 'panel' },
'cctv-panel': { icon: 'videocam', label: msg('CCTV') },
'weather-panel': { icon: 'partly_cloudy_day', label: msg('WEATHER') },
'news-panel': { icon: 'public', label: msg('NEWS') },
+5 -5
View File
@@ -135,8 +135,8 @@ test('the chip counts what is missing and the rows render from the status', asyn
);
assert.equal(field.type, 'password');
assert.equal(field.placeholder, 'paste GOOGLE_MAPS_API_KEY');
assert.equal(google.querySelector('.key-setup-remove'), null);
assert.equal(google.querySelector('.key-setup-cloud-auth'), null);
assert.equal(google.querySelector('.key-setup-remove') === null, true);
assert.equal(google.querySelector('.key-setup-cloud-auth') === null, true);
const openai = $('[data-key-id="openai"]');
assert.equal(openai.dataset.managed, 'file');
@@ -159,7 +159,7 @@ test('the chip counts what is missing and the rows render from the status', asyn
firms.querySelector('.key-setup-external').textContent,
'configured externally',
);
assert.equal(firms.querySelector('.key-setup-fields'), null);
assert.equal(firms.querySelector('.key-setup-fields') === null, true);
});
test('the chip opens the dialog onto its first field; closing fades it and restores the status line', async (t) => {
@@ -337,12 +337,12 @@ test('Cyber moves the chip into the top toolbar and other themes return it to th
await wait();
await nextTick();
assert.equal(toolbar.lastElementChild?.id, 'key-setup-chip');
assert.equal(corner.querySelector('#key-setup-chip'), null);
assert.equal(corner.querySelector('#key-setup-chip') === null, true);
document.documentElement.dataset.uiTheme = 'tactical';
await wait();
await nextTick();
assert.equal(corner.firstElementChild?.id, 'key-setup-chip');
assert.equal(toolbar.querySelector('#key-setup-chip'), null);
assert.equal(toolbar.querySelector('#key-setup-chip') === null, true);
delete document.documentElement.dataset.uiTheme;
});
+1 -1
View File
@@ -201,5 +201,5 @@ test('the refresh timer reloads with a cache-buster, skips hidden tabs, and stop
ui.overlay.dispose();
assert.equal(ui.intervals.size, 0);
assert.equal(ui.renderListeners.size, 0);
assert.equal(ui.window.document.querySelector('.qci-panel'), null);
assert.equal(ui.window.document.querySelector('.qci-panel') === null, true);
});
+22 -4
View File
@@ -27,10 +27,18 @@ export function bindRadioControls() {
this.store?.publishUtility({ ...this._cockpitDisclosure });
if (displayOpen) this.actions.revealStyleParameters();
if (!expanded && returnFocus) {
(kind === 'display'
? this._cockpitDisplayToggleBtn
: this._cockpitRadioToggleBtn
)?.focus({ preventScroll: true });
// The desktop cockpit hides the launchers' toggles behind its rail, so
// focus goes to whichever of the two is shown.
const toggle =
kind === 'display'
? this._cockpitDisplayToggleBtn
: this._cockpitRadioToggleBtn;
const railItem = toggle?.ownerDocument?.querySelector?.(
`[data-cockpit-rail-item="${kind}"]`,
);
(toggle?.getClientRects?.().length ? toggle : railItem || toggle)?.focus({
preventScroll: true,
});
}
if (
!displayOpen &&
@@ -444,6 +452,16 @@ export function bindRadioControls() {
),
toggleCockpitRadio: () =>
setCockpitDisclosure('radio', !this._cockpitDisclosureOpen('radio')),
/**
* Open or close the cockpit's Display or Radio panel; opening one closes
* the other.
* @param {'display'|'radio'} kind
* @param {{ returnFocus?: boolean }} [options]
*/
toggleCockpitUtility: (kind, { returnFocus = false } = {}) => {
const open = !this._cockpitDisclosureOpen(kind);
setCockpitDisclosure(kind, open, { returnFocus: !open && returnFocus });
},
/**
* @param {string} filter
* @returns {string} The station tag the filter shows afterwards.
-178
View File
@@ -1,178 +0,0 @@
<script setup>
import { computed, onBeforeUnmount, shallowRef, watch } from 'vue';
import { formatUtcDayMonth, t } from '../../i18n/index.js';
import { utcClock } from './utcClock.js';
import UiSlider from '../kit/UiSlider.js';
// Stable native transport with local preview and a coalesced 150 ms drag
// commit. While the handle is dragged the slider keeps the ticks it was
// dragged over; the owner's updates apply once the drag ends.
const props = defineProps({
state: { type: Object, required: true },
sliderClassName: { type: String, default: '' },
heading: { type: Boolean, default: true },
onCommit: { type: Function, default: () => {} },
onPreview: { type: Function, default: () => {} },
onStep: { type: Function, default: () => {} },
onLatest: { type: Function, default: () => {} },
onPlay: { type: Function, default: () => {} },
});
const utc = (tick) =>
Number.isFinite(Date.parse(tick))
? `${formatUtcDayMonth(tick)} ${utcClock(tick)}`
: '';
// What the slider shows: the owner's ticks, index and readout, frozen while
// dragging.
const shown = shallowRef({ ticks: [], index: 0, readout: '' });
let dragging = false;
let timer = null;
let pending = null;
let live = true;
const cancel = () => {
if (timer !== null) clearTimeout(timer);
timer = null;
};
const sync = () => {
if (dragging) return;
const ticks = [...props.state.ticks];
shown.value = {
ticks,
index: Math.max(0, Math.min(props.state.index, ticks.length - 1)),
readout: props.state.readout || '',
};
};
watch(
() => props.state,
(state) => {
if (state.disabled) {
cancel();
pending = null;
dragging = false;
}
sync();
},
{ immediate: true, flush: 'sync' },
);
onBeforeUnmount(() => {
live = false;
cancel();
});
const disabled = computed(() => Boolean(props.state.disabled));
const latestActive = computed(() => props.state.mode === 'latest');
const playing = computed(() => Boolean(props.state.playing));
function commit() {
cancel();
const value = pending;
pending = null;
if (live && value && !props.state.disabled)
props.onCommit(value.tick, value.index);
}
function preview(event) {
if (props.state.disabled) return;
dragging = true;
const index = Number(event.target.value);
const tick = shown.value.ticks[index];
if (!tick) return;
pending = { tick, index };
// Shown before the owner hears of it: an update from inside onPreview
// must not move the handle back.
shown.value = { ...shown.value, index };
const readout = props.onPreview(tick, index);
// The owner may have ended the drag (disabled) from inside onPreview.
if (!dragging) return;
if (typeof readout === 'string') shown.value = { ...shown.value, readout };
if (timer === null) timer = setTimeout(commit, 150);
}
// The handle shows the shown index again. A drag that ends where it began
// (an input and a cancel, or a refused commit, before the next render)
// leaves the slider's model unchanged, so it would not render.
const place = (input) => {
const index = String(shown.value.index);
if (input && input.value !== index) input.value = index;
};
function change(event) {
if (props.state.disabled) return;
const index = Number(event.target.value);
pending = { tick: shown.value.ticks[index], index };
dragging = false;
commit();
sync();
place(event.target);
}
function reset(event) {
cancel();
pending = null;
dragging = false;
sync();
place(event?.target);
}
function blur(event) {
if (dragging) change(event);
}
const act = (fn) => {
reset();
if (live && !props.state.disabled) fn();
};
</script>
<template>
<section class="rail-timeline"
><div v-if="heading" class="panel-title">{{ t('Observed history') }}</div
><div class="rail-timeline-track"
><button
type="button"
class="data-toggle-chip"
:title="t('Earlier observation')"
:disabled="disabled || state.index <= 0"
@click="act(() => onStep(-1))"
>‹</button
><UiSlider
:class="sliderClassName || undefined"
min="0"
:max="String(Math.max(0, shown.ticks.length - 1))"
step="1"
:model-value="String(shown.index)"
:disabled="disabled"
:aria-label="t('Observed history')"
:aria-valuetext="utc(shown.ticks[shown.index])"
@input="preview"
@change="change"
@pointercancel="reset"
@blur="blur"
/><button
type="button"
class="data-toggle-chip"
:title="t('Later observation')"
:disabled="disabled || state.index >= state.ticks.length - 1"
@click="act(() => onStep(1))"
>›</button
><div class="rail-timeline-endpoints"
><span>{{ utcClock(shown.ticks[0]) }}</span
><span>{{ utcClock(shown.ticks.at(-1)) }}</span></div
></div
><div class="rail-timeline-controls"
><button
type="button"
:class="`data-toggle-chip${latestActive ? ' active' : ''}`"
:title="t('Newest frame per product')"
:disabled="disabled"
:aria-pressed="String(latestActive)"
@click="act(onLatest)"
>{{ t('Latest') }}</button
><button
type="button"
:class="`data-toggle-chip${playing ? ' active' : ''}`"
:title="t('Replay observed history')"
:disabled="disabled"
:aria-pressed="String(playing)"
@click="act(onPlay)"
>{{ playing ? t('Pause') : t('Play') }}</button
><span class="rail-timeline-readout">{{ shown.readout }}</span></div
></section
>
</template>
-56
View File
@@ -1,56 +0,0 @@
import { h, render } from 'vue';
import RailTimeline from './rail/RailTimeline.vue';
export { utcClock } from './rail/utcClock.js';
/**
* Stable native transport with local preview and a coalesced 150 ms drag
* commit. Renders the RailTimeline component into `container` and patches it
* synchronously on every update.
*/
export function createRailTimeline({
container,
document = container?.ownerDocument,
sliderClassName = '',
heading = true,
onCommit = () => {},
onPreview = () => {},
onStep = () => {},
onLatest = () => {},
onPlay = () => {},
} = {}) {
if (!document?.createElement || !container) return null;
let destroyed = false;
const paint = (state) =>
render(
h(RailTimeline, {
state,
sliderClassName,
heading,
onCommit,
onPreview,
onStep,
onLatest,
onPlay,
}),
container,
);
paint({
ticks: [],
index: 0,
mode: 'latest',
playing: false,
readout: '',
disabled: true,
});
return {
update(state) {
if (!destroyed) paint(state);
},
destroy() {
if (destroyed) return;
destroyed = true;
render(null, container);
},
};
}
-178
View File
@@ -1,178 +0,0 @@
import '../testSupport/registerDom.mjs';
import test from 'node:test';
import assert from 'node:assert/strict';
import { assertSameNode } from '../testSupport/domAssert.mjs';
import { nextTick } from 'vue';
import { createRailTimeline } from './railTimeline.js';
import { railDocumentFixture as railFixture } from './railTestFixture.mjs';
const ticks = [
'2026-09-22T01:00:00Z',
'2026-09-22T01:05:00Z',
'2026-09-22T01:10:00Z',
];
const props = {
ticks,
index: 2,
mode: 'latest',
playing: false,
readout: 'Latest',
disabled: false,
};
test('preview is immediate, commits are coalesced and the drag DOM and tick mapping stay stable', async (t) => {
t.mock.timers.enable({ apis: ['setTimeout'] });
const f = railFixture();
const previews = [];
const commits = [];
const view = createRailTimeline({
...f,
onPreview: (tick) => {
previews.push(tick);
return tick;
},
onCommit: (tick) => commits.push(tick),
});
view.update(props);
const slider = f.find((n) => n.tagName === 'INPUT');
const row = slider.parentElement;
assert.equal(slider.getAttribute('aria-label'), 'Observed history');
slider.value = '0';
slider.dispatchEvent(new Event('input'));
assert.deepEqual(commits, []);
assert.deepEqual(previews, [ticks[0]]);
await nextTick();
assert.equal(slider.getAttribute('aria-valuetext'), '09-22 01:00 UTC');
view.update({
...props,
ticks: ticks.slice(1),
index: 1,
readout: 'Refresh',
});
assertSameNode(slider.parentElement, row);
assertSameNode(row.children[1], slider);
assert.equal(slider.value, '0');
assert.equal(slider.max, '2');
assert.equal(
f.find((n) => n.className === 'rail-timeline-readout').textContent,
ticks[0],
);
t.mock.timers.tick(149);
assert.equal(commits.length, 0);
slider.value = '1';
slider.dispatchEvent(new Event('input'));
t.mock.timers.tick(1);
assert.deepEqual(commits, [ticks[1]]);
slider.value = '2';
slider.dispatchEvent(new Event('input'));
slider.dispatchEvent(new Event('change'));
assert.deepEqual(commits, [ticks[1], ticks[2]]);
t.mock.timers.tick(150);
assert.equal(commits.length, 2);
await nextTick();
assert.equal(slider.max, '1', 'release applies the latest update');
view.destroy();
});
test('identical updates write nothing; controls call actions and destruction cancels commits', (t) => {
t.mock.timers.enable({ apis: ['setTimeout'] });
const f = railFixture();
const calls = [];
const view = createRailTimeline({
...f,
onCommit: () => calls.push('commit'),
onStep: (n) => calls.push(n),
onLatest: () => calls.push('latest'),
onPlay: () => calls.push('play'),
});
view.update({ ...props, index: 1 });
f.writes();
view.update({ ...props, index: 1 });
assert.equal(f.writes(), 0);
for (const label of ['‹', '›', 'Latest', 'Play'])
f.find((n) => n.textContent === label).click();
assert.deepEqual(calls, [-1, 1, 'latest', 'play']);
view.update({ ...props, playing: true });
assert.ok(f.find((n) => n.textContent === 'Pause'));
const slider = f.find((n) => n.tagName === 'INPUT');
slider.value = '0';
slider.dispatchEvent(new Event('change'));
assert.equal(calls.at(-1), 'commit');
slider.dispatchEvent(new Event('input'));
view.destroy();
t.mock.timers.tick(150);
assert.equal(calls.length, 5);
assert.equal(f.container.children.length, 0);
});
test('observed history label and endpoint times track the advertised tick range', () => {
const f = railFixture();
const view = createRailTimeline(f);
view.update(props);
assert.equal(
f.find((n) => n.className === 'panel-title').textContent,
'Observed history',
);
const endpoints = f.find((n) => n.className === 'rail-timeline-endpoints');
assert.equal(endpoints.parentElement.className, 'rail-timeline-track');
assert.deepEqual(
[...endpoints.children].map((n) => n.textContent),
['01:00 UTC', '01:10 UTC'],
);
view.update({ ...props, ticks: ticks.slice(1) });
assert.equal(endpoints.children[0].textContent, '01:05 UTC');
view.destroy();
});
test('an update from inside the preview neither moves the handle back nor survives a disable', async () => {
const f = railFixture();
let view;
let next = null;
const commits = [];
view = createRailTimeline({
...f,
onPreview: () => {
if (next) view.update(next);
return 'preview';
},
onCommit: (tick, index) => commits.push(index),
});
view.update(props);
const slider = f.find((n) => n.tagName === 'INPUT');
next = { ...props, readout: 'Refresh' };
slider.value = '0';
slider.dispatchEvent(new Event('input'));
assert.equal(slider.value, '0');
slider.dispatchEvent(new Event('change'));
assert.deepEqual(commits, [0]);
next = { ...props, disabled: true };
slider.value = '1';
slider.dispatchEvent(new Event('input'));
await nextTick();
assert.equal(slider.value, '2', 'the disabled owner keeps its position');
assert.equal(slider.getAttribute('aria-valuetext'), '09-22 01:10 UTC');
view.destroy();
});
test('a drag that ends where it began puts the handle back on the shown index', async (t) => {
t.mock.timers.enable({ apis: ['setTimeout'] });
const f = railFixture();
const commits = [];
const view = createRailTimeline({
...f,
onCommit: (tick) => commits.push(tick),
});
view.update(props);
await nextTick();
const slider = f.find((n) => n.tagName === 'INPUT');
slider.value = '0';
slider.dispatchEvent(new Event('input'));
slider.dispatchEvent(new Event('pointercancel'));
await nextTick();
assert.equal(slider.value, '2', 'a cancelled drag');
assert.deepEqual(commits, []);
// A refused commit: the owner keeps its index.
slider.value = '1';
slider.dispatchEvent(new Event('input'));
slider.dispatchEvent(new Event('change'));
await nextTick();
assert.deepEqual(commits, [ticks[1]]);
assert.equal(slider.value, '2', 'a refused commit');
view.destroy();
});
+2 -2
View File
@@ -72,7 +72,7 @@ test('a lost context offers Reload, and a panel that cannot reload offers nothin
document.getElementById('render-failure-message').textContent,
/3D graphics/,
);
assert.equal(notice().querySelector('.render-failure-detail'), null);
assert.equal(notice().querySelector('.render-failure-detail') === null, true);
assert.deepEqual(buttons(), ['Reload', 'Reset view']);
store.publishRenderFailure({
reason: 'context-lost',
@@ -82,7 +82,7 @@ test('a lost context offers Reload, and a panel that cannot reload offers nothin
});
await nextTick();
assert.deepEqual(buttons(), []);
assert.equal(notice().querySelector('.render-failure-hint'), null);
assert.equal(notice().querySelector('.render-failure-hint') === null, true);
});
const failure = () => ({
+33 -12
View File
@@ -27,7 +27,8 @@ export const WORLD_TIME_SPEEDS = Object.freeze({
* buffering, timeMs, supported, span}`, where `supported` says a layer that moves with the clock
* has time to show and `span` is the stretch the timeline runs over: the
* time those layers cover, reaching to now and to the world time, with their
* marks. It follows the page's world clock, which tells it of every move, and
* marks (`marks`, their times; `markDetails`, each `{time, label?, id?,
* kind?}`, as the world clock's coverage gives them). It follows the page's world clock, which tells it of every move, and
* of the time a few times a second while it plays on its own. While a
* timeline shows, it reads the clock each second itself, so live and the
* track's end keep up with now.
@@ -42,6 +43,7 @@ export const useWorldTimeStore = defineStore('gev-world-time', () => {
start: Math.min(coverage.start, now),
end: Math.max(coverage.end, now),
marks: coverage.marks,
markDetails: coverage.markDetails,
};
};
const spanOf = (state) => {
@@ -52,6 +54,7 @@ export const useWorldTimeStore = defineStore('gev-world-time', () => {
start: Math.min(covered.start, state.timeMs),
end: Math.max(covered.end, state.timeMs),
marks: covered.marks,
markDetails: covered.markDetails,
});
};
const nearNow = (ms, length) =>
@@ -93,8 +96,20 @@ export const useWorldTimeStore = defineStore('gev-world-time', () => {
span: spanOf(state),
});
const time = shallowRef(read());
const speed = shallowRef('real');
const rate = () => WORLD_TIME_SPEEDS[speed.value];
// The speed shown follows the world clock's rate, whoever set it: a rate
// not among those offered shows as the nearest that is (by ratio), while
// play still runs at the clock's own rate.
const speedFor = (clockRate) => {
let best = 'real';
for (const key of Object.keys(WORLD_TIME_SPEEDS))
if (
Math.abs(Math.log(WORLD_TIME_SPEEDS[key] / clockRate)) <
Math.abs(Math.log(WORLD_TIME_SPEEDS[best] / clockRate))
)
best = key;
return best;
};
const speed = shallowRef(speedFor(worldClock.getRate()));
let ticker = null;
const syncTicker = () => {
// Playing, the clock tells of the time itself.
@@ -109,6 +124,8 @@ export const useWorldTimeStore = defineStore('gev-world-time', () => {
}
};
const unsubscribe = worldClock.subscribe((state) => {
if (speed.value !== speedFor(state.rate))
speed.value = speedFor(state.rate);
if (stopAtEnd(state)) return;
time.value = read(state);
syncTicker();
@@ -123,10 +140,11 @@ export const useWorldTimeStore = defineStore('gev-world-time', () => {
return {
time,
/**
* Play runs the track at the speed chosen, from the start when it is at
* Play runs the track at the world clock's rate (the speed chosen, which
* sets it), from the start when it is at
* its end (at live, say), as a video plays again from the top. It runs
* the clock itself, past weather's own replay: weather follows the time
* frame by frame like every other layer the track covers.
* the clock itself: weather follows the time frame by frame like every
* other layer the track covers.
*/
togglePlay() {
const { playing, live, timeMs, span } = time.value;
@@ -134,22 +152,25 @@ export const useWorldTimeStore = defineStore('gev-world-time', () => {
const covered = reach();
if (span && covered && (live || timeMs >= covered.end))
worldClock.seek(span.start);
worldClock.play({ rate: rate(), continuous: true });
// At the clock's rate: the speed chosen, or a host's own.
worldClock.play({ continuous: true });
},
speed,
/**
* Choose how fast play runs; playing, it changes at once. Weather's own
* replay steps at its own pace, so a speed chosen while it plays takes
* Choose how fast play runs: the world clock keeps it, so any play runs
* at it (a layer's own Play too), and playing, it changes at once. A
* driver steps at its own pace, so a speed chosen while one plays takes
* playback over from where it is.
*/
setSpeed(next) {
if (!Object.hasOwn(WORLD_TIME_SPEEDS, next)) return;
speed.value = next;
// The clock's rate first: the speed shown follows it from here on.
worldClock.setRate(WORLD_TIME_SPEEDS[next]);
const { playing, stepping } = worldClock.getState();
if (!playing) return;
if (!stepping) return worldClock.setRate(rate());
if (!playing || !stepping) return;
worldClock.pause();
worldClock.play({ rate: rate(), continuous: true });
worldClock.play({ continuous: true });
},
goLive: () => worldClock.goLive(),
/**
+693
View File
@@ -0,0 +1,693 @@
/* ── Cockpit side windows in the app's panel look ───────────────────────
Contact (left), the briefing carousel (right) and the Display / Radio
controls get the same smoked glass, 16px corners and card rows as the
main panels. They keep cockpit.css's slight 3D slant toward the centre,
and stand the same height. The text glow goes; the state colours on the
top edge (uncertain, lost) stay. */
.cockpit-context-window,
.cockpit-signal-window {
border: 1px solid rgba(255, 255, 255, 0.08);
border-top-color: rgba(255, 255, 255, 0.14);
border-radius: 16px;
background: rgba(12, 12, 20, 0.72);
box-shadow:
0 8px 32px rgba(0, 0, 0, 0.42),
inset 0 1px 0 rgba(255, 255, 255, 0.04);
backdrop-filter: blur(24px) saturate(1.4);
-webkit-backdrop-filter: blur(24px) saturate(1.4);
text-shadow: none;
scrollbar-color: rgba(255, 255, 255, 0.18) transparent;
}
/* Open, both windows share one compact size; their lists scroll. */
.cockpit-context-window:not([data-collapsed='true']),
.cockpit-signal-window:not([data-collapsed='true']) {
width: min(280px, 23vw);
height: min(27vh, 260px);
}
/* Contact's header: the buttons share the kicker's row, so the subject runs
the full width on at most two lines instead of wrapping beside them. */
.cockpit-context-window:not([data-collapsed='true'])
.cockpit-context-header
> div {
display: contents;
}
.cockpit-context-window:not([data-collapsed='true']) .cockpit-context-kicker {
grid-column: 1;
grid-row: 1;
}
.cockpit-context-window:not([data-collapsed='true']) .cockpit-context-actions {
grid-column: 2;
grid-row: 1;
}
.cockpit-context-window:not([data-collapsed='true']) #cockpit-context-subject {
display: -webkit-box;
grid-column: 1 / -1;
grid-row: 2;
overflow: hidden;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
line-clamp: 2;
}
/* Their foot sits just above the bottom HUD readouts (MGRS / GSD), which
stand at clamp(84px, 11vh, 118px) and are about 38px tall. */
.cockpit-context-window,
.cockpit-signal-window {
bottom: calc(clamp(84px, 11vh, 118px) + 54px);
}
.cockpit-context-window[data-state='uncertain'] {
border-top-color: rgba(116, 219, 255, 0.72);
}
.cockpit-context-window[data-state='lost'] {
border-top-color: rgba(213, 168, 99, 0.72);
}
.cockpit-context-window[data-collapsed='true'],
.cockpit-signal-window[data-collapsed='true'] {
border-radius: 12px;
background: rgba(12, 12, 20, 0.66);
}
/* Headers: a quiet hairline like the panel headers. */
.cockpit-card-header {
border-bottom-color: rgba(255, 255, 255, 0.08);
}
.cockpit-card-actions button {
border-color: rgba(255, 255, 255, 0.1);
border-radius: 6px;
background: rgba(255, 255, 255, 0.04);
color: rgba(224, 236, 242, 0.82);
}
.cockpit-card-actions button:hover,
.cockpit-card-actions button:focus-visible {
border-color: rgba(0, 212, 255, 0.45);
background: rgba(0, 212, 255, 0.1);
color: #fff;
}
/* Rows and tiles inside: the card style used in Context and Visual. */
.cockpit-context-cohorts > div,
.cockpit-signal-list li,
.cockpit-news-list li,
.cockpit-local-grid > div {
border: 1px solid rgba(255, 255, 255, 0.06);
border-radius: 10px;
background: rgba(255, 255, 255, 0.035);
}
/* The weather tiles stand apart as cards, with no lit grid behind them,
and are short enough to fit the shorter window. */
.cockpit-local-grid {
gap: 5px;
background: none;
}
.cockpit-local-grid > div {
min-height: 0;
gap: 2px;
padding: 6px 9px;
}
.cockpit-route-card {
border-bottom-color: rgba(255, 255, 255, 0.08);
}
/* Display / Radio: the closed launchers and the open panels match too. */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-control.is-expanded {
border-color: rgba(255, 255, 255, 0.08);
border-radius: 16px;
background: rgba(12, 12, 20, 0.72);
box-shadow:
0 8px 32px rgba(0, 0, 0, 0.42),
inset 0 1px 0 rgba(255, 255, 255, 0.04);
}
/* ── Cockpit uses the main page's rails ───────────────────────────────
The left rail shows Data Layers only (Authoring has no place in first
person, Utilities has nothing to do there, and the cockpit's own Display
panel stands in for Visual), one panel opens beside it, and the collapsed
header strips the cockpit used instead are hidden. */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> .gev-panel-rail--left {
display: block;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> .gev-panel-rail--left
:is(
[data-rail-item='scene-panel'],
[data-rail-item='utilities-panel'],
[data-rail-item='pp-toggles']
),
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> .gev-panel-rail--left
.ui-tooltip:has(
> :is(
[data-rail-item='scene-panel'],
[data-rail-item='utilities-panel'],
[data-rail-item='pp-toggles']
)
) {
display: none;
}
/* With some icons hidden, the runs between them break up: with a panel
open, each icon left is its own island. */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> .gev-panel-rail--left
.ui-rail--collapsible:not(.ui-rail--expanded):has(.ui-rail__item--on)
> .ui-tooltip::before {
inset: -4px -5px;
border-width: 1px;
border-radius: 14px;
}
/* Authoring, Utilities or Visual may still be open underneath; its hidden icon must
not split the rail into islands. */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> .gev-panel-rail--left
.ui-rail:has(
:is(
[data-rail-item='scene-panel'],
[data-rail-item='utilities-panel'],
[data-rail-item='pp-toggles']
)[aria-pressed='true']
)
> .ui-tooltip::before,
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> .gev-panel-rail--left
.ui-rail:has(
:is(
[data-rail-item='scene-panel'],
[data-rail-item='utilities-panel'],
[data-rail-item='pp-toggles']
)[aria-pressed='true']
)::before {
/* Nor may the sliding highlight stay where the hidden icon was. */
display: none;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> .gev-panel-rail--left
.ui-rail:has(
:is(
[data-rail-item='scene-panel'],
[data-rail-item='utilities-panel'],
[data-rail-item='pp-toggles']
)[aria-pressed='true']
) {
background: rgba(16, 20, 28, 0.82) !important;
border-color: rgba(255, 255, 255, 0.14) !important;
box-shadow: 0 6px 20px rgba(0, 0, 0, 0.45) !important;
backdrop-filter: blur(20px);
-webkit-backdrop-filter: blur(20px);
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> [data-panel-id].collapsed,
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack
> :is(
[data-panel-id='scene-panel'],
[data-panel-id='utilities-panel'],
[data-panel-id='pp-toggles']
) {
display: none;
}
/* Both rails start at one height, just under the top HUD text, so their top
edges line up; the cockpit layout pass places Display and Radio at the
same height (COCKPIT_UTILITY_MIN_TOP_PX / _RATIO in cockpitPresentation.js). */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
#left-panel-stack {
top: max(206px, 22vh) !important;
}
/* Bottom HUD readouts: scale from their foot, and drop the three-line right
block (GSD / ALT / AIS) by one scaled line so both start level, as on the
main page. */
body.cockpit-mode #intel-hud .hud-bottom-left {
transform-origin: left bottom;
}
body.cockpit-mode #intel-hud .hud-bottom-right {
bottom: calc(clamp(84px, 11vh, 118px) - 20px);
transform-origin: right bottom;
}
/* ── Live signals rows ──────────────────────────────────────────────────
Callsign on the left, time small at the top right, the detail under it.
The status colour is a slim inset bar (cyan for the aircraft you ride,
white for nearby, amber for military / warnings), not a bent border. */
.cockpit-signal-list {
gap: 4px;
}
.cockpit-signal-list li {
position: relative;
display: block;
padding: 5px 10px 5px 12px;
border: 1px solid rgba(255, 255, 255, 0.06);
box-shadow: inset 2px 0 0 rgba(244, 251, 255, 0.22);
}
.cockpit-signal-list li:is(.track, .current) {
border-color: rgba(0, 212, 255, 0.22);
background: rgba(0, 212, 255, 0.06);
box-shadow: inset 2px 0 0 var(--cockpit-accent, #00d4ff);
}
.cockpit-signal-list li:is(.nearby) {
border-color: rgba(255, 255, 255, 0.06);
box-shadow: inset 2px 0 0 rgba(244, 251, 255, 0.55);
}
.cockpit-signal-list li:is(.military, .warning) {
border-color: rgba(255, 255, 255, 0.06);
box-shadow: inset 2px 0 0 #d5a863;
}
.cockpit-signal-list li.actionable:is(:hover, :focus-within) {
border-color: rgba(0, 212, 255, 0.3);
background: rgba(0, 212, 255, 0.08);
}
.cockpit-signal-list time {
position: absolute;
top: 6px;
inset-inline-end: 28px;
color: rgba(224, 236, 242, 0.4);
font: 7px/1 var(--font-mono);
letter-spacing: 0.06em;
font-variant-numeric: tabular-nums;
}
.cockpit-signal-list li > div {
gap: 1px;
}
.cockpit-signal-target {
grid-template-columns: minmax(0, 1fr) 14px;
gap: 8px;
font-size: 10.5px;
letter-spacing: 0.1em;
}
.cockpit-signal-target-rule {
display: none;
}
.cockpit-signal-target-chevron {
justify-self: end;
color: rgba(224, 236, 242, 0.5) !important;
}
.cockpit-signal-list
li.actionable:is(:hover, :focus-within)
.cockpit-signal-target-chevron {
color: #fff !important;
}
.cockpit-signal-list span:not([class]) {
color: rgba(224, 236, 242, 0.62);
font-size: 8px;
letter-spacing: 0.08em;
}
/* Keep a long callsign clear of the time at the row's end. */
.cockpit-signal-list .cockpit-signal-target-label {
margin-inline-end: 50px;
}
/* ── Briefing content fits the narrower window ────────────────────────── */
.cockpit-signal-window {
grid-template-columns: minmax(0, 1fr);
}
.cockpit-signal-window > *,
.cockpit-brief-stage,
.cockpit-brief-stage > section,
.cockpit-signal-list,
.cockpit-signal-list li {
min-width: 0;
max-width: 100%;
box-sizing: border-box;
}
/* Route: a quiet heading, endpoints that truncate. */
.cockpit-route-card {
padding-inline: 4px;
}
.cockpit-route-heading {
display: flex;
justify-content: space-between;
gap: 8px;
min-width: 0;
}
#cockpit-route-status {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.cockpit-route-airport strong {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* Header: the title on one line, the controls on the row under it. */
.cockpit-signal-window:not([data-collapsed='true']) .cockpit-signal-header {
grid-template-columns: minmax(0, 1fr);
gap: 6px;
padding-inline: 4px;
}
.cockpit-signal-window:not([data-collapsed='true']) .cockpit-brief-heading {
display: flex;
flex-wrap: wrap;
align-items: baseline;
gap: 2px 8px;
}
.cockpit-signal-window:not([data-collapsed='true']) .cockpit-signal-kicker {
white-space: nowrap;
}
.cockpit-signal-window:not([data-collapsed='true']) .cockpit-brief-actions {
justify-content: flex-start;
}
.cockpit-signal-window:not([data-collapsed='true']) #cockpit-signal-toggle {
margin-inline-start: auto;
}
/* ── Open Display / Radio panels: the main panels' header and size ───── */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-control.is-expanded {
min-width: 295px;
box-sizing: border-box;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-control.is-expanded
.cockpit-utility-launcher {
display: flex;
align-items: center;
gap: 8px;
padding: 4px 4px 10px 8px;
color: rgba(224, 236, 242, 0.78);
font: 9px/1 var(--font-mono);
letter-spacing: 0.22em;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-control.is-expanded
.cockpit-utility-divider {
flex: 0 1 22px;
height: 1px;
margin-right: auto;
background: rgba(255, 255, 255, 0.18);
box-shadow: none;
}
/* The launcher's own toggle steps aside: the rail and "−" open and close
the panel instead. */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-control.is-expanded
.cockpit-utility-glyph {
display: none;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-collapse {
display: grid;
flex: none;
place-items: center;
width: 22px;
height: 22px;
padding: 0;
border: 1px solid rgba(255, 255, 255, 0.12);
border-radius: 6px;
background: rgba(255, 255, 255, 0.03);
color: rgba(206, 232, 239, 0.75);
font: 13px/1 var(--font-mono);
cursor: pointer;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-collapse:hover,
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-collapse:focus-visible {
border-color: rgba(0, 212, 255, 0.45);
color: #fff;
outline: none;
}
/* ── Right rail as on the left: an icon column that stays, labels beside it
while nothing is open, and the open panel to its left. The launchers'
own strips give way to it. ─────────────────────────────────────────── */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-controls {
display: grid;
grid-template-columns: auto auto;
align-items: start;
justify-content: end;
column-gap: 6px;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-control:not(.is-expanded) {
display: none;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-control.is-expanded {
grid-column: 1;
grid-row: 1;
margin-top: 0 !important;
}
/* Cyber and the phone keep the launchers' own toggles, so the rail and "−"
are for the desktop look only. */
.cockpit-utility-rail,
.cockpit-utility-collapse {
display: none;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail {
grid-column: 2;
grid-row: 1;
display: flex;
gap: 4px;
align-items: stretch;
pointer-events: auto;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
:is(.cockpit-utility-rail__labels, .cockpit-utility-rail__icons) {
display: flex;
flex-direction: column;
gap: 12px;
padding: 4px;
border: 1px solid rgba(255, 255, 255, 0.14);
border-radius: 14px;
background: rgba(16, 20, 28, 0.82);
box-shadow:
0 6px 20px rgba(0, 0, 0, 0.45),
inset 0 1px 0 rgba(255, 255, 255, 0.05);
backdrop-filter: blur(20px);
-webkit-backdrop-filter: blur(20px);
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail__labels {
box-sizing: border-box;
width: 170px;
padding-inline: 14px;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail__labels
> span {
display: flex;
align-items: center;
height: 32px;
color: rgba(225, 236, 242, 0.82);
font:
500 9.28px/1 Inter,
-apple-system,
system-ui,
sans-serif;
letter-spacing: 2.08px;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail.is-open
.cockpit-utility-rail__labels {
display: none;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail__item {
display: grid;
place-items: center;
width: 32px;
height: 32px;
padding: 0;
border: 1px solid transparent;
border-radius: 10px;
background: transparent;
color: var(--text-secondary, rgba(206, 232, 239, 0.75));
cursor: pointer;
transition:
color var(--transition-fast, 120ms),
background var(--transition-fast, 120ms),
border-color var(--transition-fast, 120ms);
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail__item
.material-symbols-outlined {
font-size: 18px;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail__item:hover {
background: rgba(255, 255, 255, 0.05);
color: var(--text-primary, #fff);
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail__item.is-on,
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail__item.is-on:hover {
border-color: rgba(0, 212, 255, 0.15);
background: rgba(0, 212, 255, 0.15);
color: #00d4ff;
}
/* With a panel open, each icon is its own island, as on the main rails. */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail.is-open
.cockpit-utility-rail__icons {
border-color: transparent;
background: none;
box-shadow: none;
backdrop-filter: none;
-webkit-backdrop-filter: none;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail.is-open
.cockpit-utility-rail__item {
position: relative;
}
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail.is-open
.cockpit-utility-rail__item::before {
position: absolute;
inset: -5px;
z-index: -1;
border: 1px solid rgba(255, 255, 255, 0.14);
border-radius: 14px;
background: rgba(16, 20, 28, 0.82);
box-shadow: 0 6px 20px rgba(0, 0, 0, 0.45);
backdrop-filter: blur(20px);
-webkit-backdrop-filter: blur(20px);
content: '';
pointer-events: none;
}
/* Hovering an icon lights its label too, as on the left. */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail:has(.cockpit-utility-rail__item:nth-child(1):hover)
.cockpit-utility-rail__labels
> span:nth-child(1),
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-rail:has(.cockpit-utility-rail__item:nth-child(2):hover)
.cockpit-utility-rail__labels
> span:nth-child(2) {
color: var(--text-primary, #fff);
}
/* Mirror the left rail's 52px inset, clear of the HUD's vertical readouts. */
:root:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-controls {
right: 52px;
}
/* Like the cockpit's other windows (rtl.css), the rail keeps its physical
side in a right-to-left language: icons at the screen edge, the open panel
inside them. Only the text reads right to left. */
html[dir='rtl']:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
.cockpit-utility-controls {
direction: ltr;
}
html[dir='rtl']:not([data-ui-theme='cyber'])
body.cockpit-mode:not(.mobile-shell)
:is(.cockpit-utility-control.is-expanded, .cockpit-utility-rail__labels) {
direction: rtl;
}
+4 -1
View File
@@ -599,7 +599,10 @@ html:not([lang='en']):not(:lang(zh)):not(:lang(ja))
#pp-toggles.collapsed .pp-toggle-group,
#pp-toggles.collapsed #clean-view-toggle,
#pp-toggles.collapsed #param-slider-panel {
#pp-toggles.collapsed #param-slider-panel,
#pp-toggles.collapsed .visual-presets,
#pp-toggles.collapsed .pp-section-heading,
#pp-toggles.collapsed .pp-reset-btn {
display: none;
}
+206
View File
@@ -0,0 +1,206 @@
/* ── Data Layers search and filter ── */
.layer-finder__btn {
display: grid;
flex: none;
place-items: center;
width: 22px;
height: 22px;
padding: 0;
color: rgba(206, 232, 239, 0.65);
background: rgba(255, 255, 255, 0.03);
border: 1px solid rgba(255, 255, 255, 0.12);
border-radius: 6px;
cursor: pointer;
}
.layer-finder__btn .material-symbols-outlined {
font-size: 14px;
}
.layer-finder__btn:hover,
.layer-finder__btn:focus-visible {
color: #fff;
border-color: rgba(255, 255, 255, 0.24);
}
.layer-finder__btn.active {
color: #36dcff;
background: rgba(54, 220, 255, 0.12);
border-color: rgba(54, 220, 255, 0.45);
}
.layer-finder__filter {
position: relative;
display: inline-flex;
}
.layer-finder__menu {
position: absolute;
top: calc(100% + 6px);
right: 0;
z-index: 20;
display: grid;
min-width: 140px;
padding: 4px;
background: rgba(16, 20, 28, 0.96);
border: 1px solid rgba(255, 255, 255, 0.12);
border-radius: 10px;
box-shadow: 0 10px 28px rgba(0, 0, 0, 0.5);
}
.layer-finder__menu button {
display: flex;
align-items: center;
gap: 0.45rem;
padding: 0.4rem 0.55rem;
color: rgba(225, 236, 242, 0.85);
font-size: 0.72rem;
text-align: start;
background: none;
border: 0;
border-radius: 7px;
cursor: pointer;
}
.layer-finder__menu button .material-symbols-outlined {
font-size: 14px;
color: rgba(199, 214, 222, 0.6);
}
.layer-finder__menu button:hover {
background: rgba(255, 255, 255, 0.06);
}
.layer-finder__menu button.active,
.layer-finder__menu button.active .material-symbols-outlined {
color: #7af0ff;
}
.layer-finder__bar {
display: flex;
flex: none;
align-items: center;
gap: 0.4rem;
margin: 0.2rem 0 0.5rem;
}
.layer-finder__field {
display: flex;
flex: 1 1 auto;
align-items: center;
gap: 0.35rem;
padding: 0 0.55rem;
height: 30px;
background: rgba(255, 255, 255, 0.04);
border: 1px solid rgba(54, 220, 255, 0.3);
border-radius: 8px;
}
.layer-finder__field .material-symbols-outlined {
color: rgba(199, 214, 222, 0.6);
font-size: 15px;
}
.layer-finder__field input {
flex: 1 1 auto;
min-width: 0;
color: rgba(236, 244, 248, 0.95);
font-size: 0.75rem;
background: none;
border: 0;
outline: none;
}
/* Focus shows on the field's frame, as a soft ring, in place of the hard
keyboard outline round the bare input. */
.layer-finder__field input:focus,
.layer-finder__field input:focus-visible {
outline: none !important;
box-shadow: none;
}
.layer-finder__field:focus-within {
border-color: rgba(54, 220, 255, 0.7);
box-shadow: 0 0 0 3px rgba(54, 220, 255, 0.1);
}
.layer-finder__chip {
display: inline-flex;
flex: none;
align-items: center;
gap: 0.25rem;
height: 26px;
padding: 0 0.5rem;
color: #7af0ff;
font-family: var(--font-mono);
font-size: 0.56rem;
letter-spacing: 0.1rem;
text-transform: uppercase;
background: rgba(54, 220, 255, 0.12);
border: 1px solid rgba(54, 220, 255, 0.45);
border-radius: 999px;
cursor: pointer;
}
.layer-finder__chip .material-symbols-outlined {
font-size: 12px;
}
/* Rows and group headings the search or filter leaves out. */
#data-toggles .is-filtered {
display: none !important;
}
.layer-finder__empty {
flex-basis: 100%;
margin: 0;
padding: 0.6rem 0.5rem;
color: rgba(199, 214, 222, 0.5);
font-size: 0.72rem;
text-align: center;
}
.layer-finder__menu {
max-height: 60vh;
box-sizing: border-box;
overflow-y: auto;
min-width: 170px;
}
.layer-finder__menu-head {
padding: 0.45rem 0.55rem 0.2rem;
color: rgba(199, 214, 222, 0.5);
font-family: var(--font-mono);
font-size: 0.52rem;
letter-spacing: 0.14rem;
text-transform: uppercase;
}
/* Each group of options lays out as part of the menu's grid. */
.layer-finder__menu > span {
display: contents;
}
.layer-finder__menu > span + span > .layer-finder__menu-head {
margin-top: 0.2rem;
border-top: 1px solid rgba(255, 255, 255, 0.08);
}
/* Several chips can show at once. */
.layer-finder__bar {
flex-wrap: wrap;
}
/* Chips sized like the rows' ON/OFF switches: small and square. */
.layer-finder__chip {
height: 20px;
gap: 0.2rem;
padding: 0 6px 0 8px;
font-size: 9px;
letter-spacing: 0.08rem;
border-radius: 4px;
}
.layer-finder__chip .material-symbols-outlined {
font-size: 11px;
}
+107
View File
@@ -0,0 +1,107 @@
/* ── Data Layers group index: ticks along the panel's right edge ─────── */
#data-panel {
position: relative;
}
.layer-section-index {
position: absolute;
top: 64px;
inset-inline-end: 2px;
bottom: 24px;
z-index: 2;
display: flex;
flex-direction: column;
justify-content: center;
gap: 6px;
width: 10px;
}
#data-panel.collapsed .layer-section-index {
display: none;
}
.layer-section-index__tick {
position: relative;
width: 10px;
height: 16px;
padding: 0;
background: none;
border: 0;
cursor: pointer;
}
.layer-section-index__tick::before {
content: '';
position: absolute;
top: 2px;
bottom: 2px;
left: 4px;
width: 2px;
border-radius: 2px;
background: rgba(199, 214, 222, 0.32);
transition:
background 140ms ease,
box-shadow 140ms ease,
transform 140ms ease;
}
.layer-section-index__tick:hover::before,
.layer-section-index__tick:focus-visible::before {
background: rgba(236, 244, 248, 0.85);
transform: scaleX(1.5);
}
.layer-section-index__tick.is-current::before {
background: #36dcff;
box-shadow: 0 0 6px rgba(54, 220, 255, 0.6);
}
.layer-section-index__tick:focus-visible {
outline: none;
}
/* The group's name, drawn on the page just outside the panel's edge while a
tick is pointed at or focused, so it covers none of the rows. */
.layer-section-index__label {
position: fixed;
z-index: 30;
padding: 0.25rem 0.5rem;
color: rgba(236, 244, 248, 0.92);
font-family: var(--font-mono);
font-size: 0.56rem;
letter-spacing: 0.12rem;
text-transform: uppercase;
white-space: nowrap;
background: rgba(12, 12, 20, 0.88);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 6px;
transform: translateY(-50%);
pointer-events: none;
animation: layer-section-index-label 120ms ease both;
}
/* Drawn before the tick when there is no room after it. */
.layer-section-index__label--before {
transform: translate(-100%, -50%);
}
@keyframes layer-section-index-label {
from {
opacity: 0;
translate: -4px 0;
}
to {
opacity: 1;
translate: 0 0;
}
}
@media (prefers-reduced-motion: reduce) {
.layer-section-index__label {
animation: none;
}
}
body.mobile-shell .layer-section-index {
display: none;
}
+26
View File
@@ -0,0 +1,26 @@
/* With Scope off the map fills the whole screen. The HUD keeps its black
plates (overlays.css); the glass chrome lifts off the map with a soft
drop shadow. */
:root[data-scope-mask='off'] {
--scope-off-panel-shadow:
0 10px 30px rgba(0, 0, 0, 0.55), 0 2px 8px rgba(0, 0, 0, 0.45);
}
/* Glass surfaces (rails, the rails' name panels, open panels and
the dock) get a lift so their edges hold against bright imagery. */
:root[data-scope-mask='off'] .ui-rail,
:root[data-scope-mask='off'] .gev-panel-rail .ui-rail--expanded::after,
:root[data-scope-mask='off']
:is(.data-panel-inner, .utilities-panel-inner, .ui-panel__inner),
:root[data-scope-mask='off'] #left-panel-stack > #pp-toggles,
:root[data-scope-mask='off']
#right-context-rail
> [data-panel-id]:not(.collapsed),
:root[data-scope-mask='off'] #command-dock > * {
box-shadow: var(--scope-off-panel-shadow);
}
:root[data-scope-mask='off'] .ui-rail__label,
:root[data-scope-mask='off'] .ui-rail__item .ui-icon {
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.8);
}
+349
View File
@@ -0,0 +1,349 @@
/* ── Visual panel: sections and one card style for every control ───────
Look · Map source · Overlay (HUD, detection, 3D, Scope, Clean UI) ·
Effects (Celestial, Bloom, Sharpen) · Reset. Each control is a card: a
header row with its icon, name and an on/off pill, and its settings
underneath. */
/* ── Presets and map source at the top of the panel ─────────────────── */
.visual-presets {
display: grid;
gap: 8px;
padding: 2px 0 12px;
margin-bottom: 10px;
border-bottom: 1px solid var(--glass-border);
}
.visual-presets__heading {
margin: 4px 0 0;
color: var(--text-secondary);
font: 600 10px/1.2 var(--font-mono);
letter-spacing: 0.14em;
text-transform: uppercase;
}
.visual-presets__heading--row {
display: flex;
justify-content: space-between;
gap: 8px;
}
.visual-presets__status {
color: var(--accent);
}
.visual-presets__status.warn {
color: #ff9f43;
}
.visual-presets__grid {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
gap: 6px;
}
.visual-presets__style {
position: relative;
display: grid;
justify-items: center;
gap: 4px;
padding: 9px 4px 7px;
color: var(--text-secondary);
background: rgba(255, 255, 255, 0.03);
border: 1px solid var(--glass-border);
border-radius: var(--btn-radius);
cursor: pointer;
}
.visual-presets__style:hover {
color: var(--text-primary);
background: rgba(255, 255, 255, 0.06);
}
.visual-presets__style.active {
color: var(--accent);
background: var(--accent-dim);
border-color: var(--accent-dim);
}
.visual-presets__icon {
font-size: 15px;
line-height: 1;
}
.visual-presets__label {
font: 500 11px/1 var(--font-sans);
}
.visual-presets__key {
position: absolute;
top: 4px;
inset-inline-end: 5px;
color: var(--text-secondary);
font: 9px/1 var(--font-mono);
opacity: 0.6;
}
.visual-presets__chips {
display: flex;
flex-wrap: wrap;
gap: 5px;
}
.visual-presets__chip {
display: inline-flex;
align-items: center;
gap: 5px;
padding: 5px 9px;
color: var(--text-secondary);
font: 500 11px/1.2 var(--font-sans);
background: rgba(255, 255, 255, 0.03);
border: 1px solid var(--glass-border);
border-radius: 999px;
cursor: pointer;
}
.visual-presets__chip small {
font-size: 9px;
opacity: 0.6;
}
.visual-presets__chip:hover {
color: var(--text-primary);
background: rgba(255, 255, 255, 0.06);
}
.visual-presets__chip.active {
color: var(--accent);
background: var(--accent-dim);
border-color: var(--accent-dim);
}
.visual-presets__chip.unavailable {
opacity: 0.45;
cursor: default;
}
/* The phone's More sheet shows the dock's Visual Presets tray right above
Visual, so the panel leaves out its own copy there. */
body.mobile-shell #pp-toggles .visual-presets {
display: none;
}
/* The body is display: contents, so its children are the panel's own flex
items: keep them full width and unshrunk. */
#pp-toggles .pp-panel-body > * {
flex: none !important;
align-self: stretch !important;
box-sizing: border-box;
}
#pp-toggles .pp-panel-body > .pp-toggle-group,
#pp-toggles .pp-panel-body > .pp-toggle-btn {
margin-bottom: 0.4rem !important;
}
#pp-toggles .pp-section-heading,
#pp-toggles .visual-presets__heading {
margin: 0.7rem 2px 0.35rem;
text-align: start;
color: rgba(199, 214, 222, 0.55);
font-family: var(--font-mono);
font-size: 0.56rem;
font-weight: 500;
letter-spacing: 0.14rem;
text-transform: uppercase;
}
#pp-toggles .visual-presets__heading:first-child {
margin-top: 0.2rem;
}
/* The card skin below is the default look; the Cyber HUD keeps its own red
skin for these controls (cyber.css), so the skin stands aside there. */
:root:not([data-ui-theme='cyber']) #pp-toggles .pp-toggle-group {
width: 100%;
overflow: hidden;
background: rgba(255, 255, 255, 0.03);
border: 1px solid rgba(255, 255, 255, 0.07);
border-radius: 10px;
}
/* The header row of a card, and the lone Clean UI button. */
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
> .pp-toggle-btn,
:root:not([data-ui-theme='cyber']) #pp-toggles .pp-panel-body > .pp-toggle-btn {
position: relative;
box-sizing: border-box;
width: 100%;
min-height: 38px;
padding: 0 12px;
gap: 10px;
background: transparent !important;
border: 0 !important;
border-radius: 0 !important;
box-shadow: none !important;
backdrop-filter: none;
-webkit-backdrop-filter: none;
}
:root:not([data-ui-theme='cyber']) #pp-toggles .pp-panel-body > .pp-toggle-btn {
background: rgba(255, 255, 255, 0.03) !important;
border: 1px solid rgba(255, 255, 255, 0.07) !important;
border-radius: 10px !important;
}
:root:not([data-ui-theme='cyber']) #pp-toggles .pp-toggle-btn .pp-icon {
width: 18px;
font-size: 15px;
text-align: center;
color: rgba(199, 214, 222, 0.75);
}
:root:not([data-ui-theme='cyber']) #pp-toggles .pp-toggle-btn .pp-label {
color: rgba(236, 244, 248, 0.9);
font-family: var(--font-mono);
font-size: 0.62rem;
letter-spacing: 0.12rem;
text-transform: uppercase;
}
/* An on/off pill at the right of every button header (Scope keeps its
checkbox, which already says it). */
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
> button.pp-toggle-btn::after,
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-panel-body
> button.pp-toggle-btn::after {
/* The state is the button's own (aria-pressed); the pill only shows it. */
content: var(--pp-pill-off, 'OFF') / '';
margin-inline-start: auto;
padding: 2px 8px;
color: rgba(199, 214, 222, 0.5);
font-family: var(--font-mono);
font-size: 0.5rem;
letter-spacing: 0.12rem;
border: 1px solid rgba(255, 255, 255, 0.14);
border-radius: 999px;
}
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
> button.pp-toggle-btn.active::after,
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
> button.pp-toggle-btn[aria-pressed='true']::after,
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-panel-body
> button.pp-toggle-btn.active::after {
content: var(--pp-pill-on, 'ON') / '';
color: #7af0ff;
border-color: rgba(54, 220, 255, 0.5);
background: rgba(54, 220, 255, 0.1);
}
:root:not([data-ui-theme='cyber']) #pp-toggles .pp-toggle-btn.active .pp-icon,
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-btn[aria-pressed='true']
.pp-icon,
:root:not([data-ui-theme='cyber']) #pp-toggles .pp-toggle-btn.active .pp-label,
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-btn[aria-pressed='true']
.pp-label {
color: #7af0ff;
}
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
> .pp-toggle-btn:hover,
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-panel-body
> .pp-toggle-btn:hover {
background: rgba(255, 255, 255, 0.04) !important;
}
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-scope-toggle
input[type='checkbox'] {
margin-inline-start: auto;
}
/* Settings inside a card: separated by hairlines, no boxes of their own. */
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
.pp-slider-row.visible,
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
.pp-slider-row:not([class*='cyber-sonar']):is(
.visible,
#scope-slider-row,
#scope-opacity-row
) {
margin: 0;
padding: 7px 12px;
background: transparent;
border: 0;
border-top: 1px solid rgba(255, 255, 255, 0.05);
border-radius: 0;
}
/* The Dense button lights green elsewhere; in a card it uses the shared pill. */
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
> .pp-toggle-btn.panoptic,
:root:not([data-ui-theme='cyber'])
#pp-toggles
.pp-toggle-group
> .pp-toggle-btn.active {
color: inherit;
}
/* Reset to default, at the foot of the Visual panel. */
#pp-toggles .pp-reset-btn {
display: flex;
align-items: center;
justify-content: center;
gap: 0.4rem;
margin: 0.6rem 0 0.2rem !important;
padding: 0.55rem;
color: rgba(225, 236, 242, 0.85);
font-family: var(--font-mono);
font-size: 0.6rem;
letter-spacing: 0.12rem;
text-transform: uppercase;
background: transparent;
border: 1px dashed rgba(255, 255, 255, 0.18);
border-radius: 10px;
cursor: pointer;
}
#pp-toggles .pp-reset-btn .material-symbols-outlined {
font-size: 15px;
}
#pp-toggles .pp-reset-btn:hover,
#pp-toggles .pp-reset-btn:focus-visible {
color: #fff;
border-color: rgba(54, 220, 255, 0.5);
background: rgba(54, 220, 255, 0.06);
}
/* Clean UI is an action, not a setting, so it has no on/off pill. */
#pp-toggles #clean-view-toggle::after {
content: none;
}
+4 -46
View File
@@ -56,8 +56,7 @@
}
/* Card typography follows the layer rows and app tokens. */
.weather-readout,
.rail-card,
.rail-timeline {
.rail-card {
min-width: 0;
color: var(--text-dim);
font: 9px/1.45 var(--font-mono);
@@ -128,7 +127,7 @@
text-align: right;
}
.rail-card-line,
.rail-timeline-readout {
.weather-frame-time {
font-family: var(--font-mono);
font-size: 9px;
letter-spacing: 0.5px;
@@ -188,54 +187,13 @@ html:not([lang='en']) .weather-card [data-line-id='status'] {
letter-spacing: 0.5px;
}
.rail-card [hidden],
.weather-timeline-block[hidden],
.weather-frame-time[hidden],
.weather-observed-group[hidden] {
display: none !important;
}
.rail-timeline {
.weather-frame-time {
padding: 5px;
border-bottom: 1px solid var(--weather-card-border);
}
.rail-timeline-track {
display: grid;
grid-template-columns: auto minmax(0, 1fr) auto;
align-items: center;
gap: 3px 8px;
margin-top: 6px;
}
.rail-timeline-track input {
min-width: 0;
width: 100%;
margin: 0;
}
.rail-timeline-endpoints {
display: flex;
grid-column: 2;
justify-content: space-between;
flex-wrap: wrap;
gap: 3px 8px;
font: 8px/1.45 var(--font-mono);
font-variant-numeric: tabular-nums;
}
.rail-timeline-endpoints span {
white-space: nowrap;
}
.rail-timeline-endpoints span:last-child {
margin-left: auto;
}
.rail-timeline-controls .data-toggle-chip {
flex: 0 0 auto;
}
.rail-timeline-controls {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 6px;
margin-top: 6px;
}
.rail-timeline-readout {
flex: 1 1 auto;
min-width: 0;
overflow-wrap: anywhere;
font-variant-numeric: tabular-nums;
color: var(--text-secondary);
+26 -1
View File
@@ -135,7 +135,7 @@ body.cockpit-mode #world-timeline {
}
}
/* The track: ticks for each launch or frame, the elapsed fill, and a native
/* The track: ticks for each launch or strong earthquake, the elapsed fill, and a native
range input on top for dragging and the keyboard. */
#world-timeline .world-timeline-track {
position: relative;
@@ -194,6 +194,31 @@ body.cockpit-mode #world-timeline {
pointer-events: none;
}
/* A tick's label, shown over the time's bubble while the pointer is on the
tick (or the handle rests on its mark). It slides across itself as the
bubble does, so it stays within the track, and is never wider than the
track: a long label ends in an ellipsis. */
#world-timeline .world-timeline-mark-label {
position: absolute;
box-sizing: border-box;
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
bottom: calc(100% + 30px);
left: calc(100% * var(--at));
z-index: 1;
padding: 2px 8px;
border: 1px solid rgba(0, 212, 255, 0.4);
border-radius: 6px;
background: var(--glass-bg);
color: var(--text-primary);
font-size: 11px;
line-height: 1.4;
white-space: pre;
transform: translateX(calc(var(--at) * -100%));
pointer-events: none;
}
/* Zoomed, the track drags along. */
#world-timeline .world-timeline-track.is-zoomed {
cursor: grab;
+5
View File
@@ -14,6 +14,8 @@ import StreetLevelPanel from './panels/StreetLevelPanel.vue';
import DrawControls from './panels/DrawControls.vue';
import GeoImport from './panels/GeoImport.vue';
import UiSelect from '../kit/UiSelect.js';
import LayerSectionIndex from './panels/LayerSectionIndex.vue';
import LayerFinder from './panels/LayerFinder.vue';
import DataLibraryBrowse from './panels/DataLibraryBrowse.vue';
// Scene sharing (src/scenes/sharing.js) offers its authoring bar and presents
@@ -43,7 +45,10 @@ async function importChosen(event) {
<div id="left-panel-stack" class="ui-scroll">
<!-- Data Layer Toggle Panel -->
<RailPanel id="data-panel" start-collapsed class="active" :title="t('DATA LAYERS')">
<template #actions><LayerFinder part="buttons" /></template>
<LayerFinder part="bar" />
<div id="data-toggles" class="data-toggle-list ui-scroll"></div>
<LayerSectionIndex />
<!-- Data Library: Browse and its dialog (src/ui/libraryBrowser.js). -->
<DataLibraryBrowse />
</RailPanel>
+2 -2
View File
@@ -25,7 +25,7 @@ test('omitted views lose their hosts and the rest render', () => {
page(['welcome', 'provider-settings']);
mountApplicationViews(document, { omit: ['provider-settings'] });
assert.deepEqual(hostNames(), ['welcome']);
assert.equal(document.getElementById('key-setup-chip'), null);
assert.equal(document.getElementById('key-setup-chip') === null, true);
assert.ok(
document.querySelector('[data-gev-view="welcome"]').children.length,
);
@@ -37,7 +37,7 @@ test('a view an earlier call rendered is unmounted when a later call omits it',
assert.ok(document.getElementById('key-setup-chip'));
mountApplicationViews(document, { omit: ['provider-settings'] });
assert.deepEqual(hostNames(), ['welcome']);
assert.equal(document.getElementById('key-setup-chip'), null);
assert.equal(document.getElementById('key-setup-chip') === null, true);
});
test('unknown view names are refused, in the page or in the omit list', () => {
+18 -4
View File
@@ -9,10 +9,12 @@ import { useCockpitStore } from '../../stores/cockpit.js';
import { useDisplayStore } from '../../stores/display.js';
import UiButton from '../../kit/UiButton.vue';
// The Cockpit's Display and Radio launchers and their popovers. RadioControls
// presents which popover is open and the compact Radio controls; until it
// does, both are closed and the controls show their initial state. The
// controls call RadioControls through the store. The Display popover's slots
// The Cockpit's Display and Radio launchers and their popovers, and the
// desktop look's rail, whose icons stay at the edge and open one panel at a
// time as the main page's rails do. RadioControls presents which popover is
// open and the compact Radio controls; until it does, both are closed and the
// controls show their initial state. The controls call RadioControls through
// the store. The Display popover's slots
// are static: the Display panel teleports its real controls into them while
// the Cockpit display portal publishes them.
const store = useRadioStore();
@@ -52,6 +54,7 @@ const radioLabel = computed(() =>
<div class="cockpit-utility-launcher" data-cockpit-launcher="display">
<span>{{ t('DISPLAY') }}</span>
<span class="cockpit-utility-divider" aria-hidden="true"></span>
<button v-if="open.display" type="button" class="cockpit-utility-collapse" :aria-label="t('Collapse panel')" :title="t('Collapse panel')" @click="act('toggleCockpitUtility', 'display', { returnFocus: true })">−</button>
<button id="cockpit-display-toggle-btn" class="cockpit-utility-glyph" type="button" :aria-expanded="String(open.display)" aria-controls="cockpit-display-panel" :aria-label="displayLabel" :title="displayLabel">{{ open.display ? '▶' : '◀' }}</button>
</div>
<div id="cockpit-display-panel" class="cockpit-utility-popover ui-scroll" v-class-toggle="{ 'uses-shared-display-controls': !!cockpitPortal }" role="group" :aria-label="t('Cockpit display options')" :hidden="!open.display">
@@ -65,6 +68,7 @@ const radioLabel = computed(() =>
<div class="cockpit-utility-launcher" data-cockpit-launcher="radio">
<span>{{ t('RADIO') }}</span>
<span class="cockpit-utility-divider" aria-hidden="true"></span>
<button v-if="open.radio" type="button" class="cockpit-utility-collapse" :aria-label="t('Collapse panel')" :title="t('Collapse panel')" @click="act('toggleCockpitUtility', 'radio', { returnFocus: true })">−</button>
<button id="cockpit-radio-toggle-btn" @click="act('toggleCockpitRadio')" class="cockpit-utility-glyph" type="button" :aria-expanded="String(open.radio)" aria-controls="cockpit-radio-panel" :aria-label="radioLabel" :title="radioLabel">{{ open.radio ? '▶' : '◀' }}</button>
</div>
<div id="cockpit-radio-panel" class="cockpit-utility-popover cockpit-radio-compact" role="group" :aria-label="t('Cockpit compact Radio controls')" :hidden="!open.radio">
@@ -82,5 +86,15 @@ const radioLabel = computed(() =>
</label>
</div>
</div>
<div class="cockpit-utility-rail" :class="{ 'is-open': open.display || open.radio }">
<span class="cockpit-utility-rail__labels" aria-hidden="true">
<span>{{ t('DISPLAY') }}</span>
<span>{{ t('RADIO') }}</span>
</span>
<span class="cockpit-utility-rail__icons">
<button type="button" class="cockpit-utility-rail__item" data-cockpit-rail-item="display" :class="{ 'is-on': open.display }" :aria-expanded="String(open.display)" aria-controls="cockpit-display-panel" :aria-label="displayLabel" :title="displayLabel" @click="act('toggleCockpitUtility', 'display')"><span class="material-symbols-outlined" aria-hidden="true">tune</span></button>
<button type="button" class="cockpit-utility-rail__item" data-cockpit-rail-item="radio" :class="{ 'is-on': open.radio }" :aria-expanded="String(open.radio)" aria-controls="cockpit-radio-panel" :aria-label="radioLabel" :title="radioLabel" @click="act('toggleCockpitUtility', 'radio')"><span class="material-symbols-outlined" aria-hidden="true">radio</span></button>
</span>
</div>
</aside>
</template>
+31 -10
View File
@@ -5,12 +5,14 @@ import { t } from '../../../i18n/index.js';
import { vPanelState } from '../../rail/panelState.js';
import { vClassToggle } from '../../rail/classToggle.js';
import PanelCollapseButton from '../../rail/PanelCollapseButton.vue';
import UiPanelEdge from '../../kit/UiPanelEdge.vue';
import UiSegmented from '../../kit/UiSegmented.vue';
import UiSlider from '../../kit/UiSlider.js';
import { useDisplayStore } from '../../stores/display.js';
import UiButton from '../../kit/UiButton.vue';
import UiSelect from '../../kit/UiSelect.js';
import { StyleParameterRows } from '../../styleParameters.js';
import VisualPresets from './VisualPresets.vue';
// The Display panel. VisualSettings presents the HUD, Sonar, Scope,
// Celestial, detection, bloom and sharpen and AircraftDisplay the 3D group,
@@ -21,6 +23,12 @@ const { view, models3d, parameters, cockpitPortal, weather, sky } = storeToRefs(
// A control's change goes to its owner (DisplayBindings).
const act = (name, ...args) => display.act(name, ...args);
const pct = (value) => `${value}%`;
// The words of the on/off pill each card header draws (visual-panel.css), as
// CSS strings.
const pillWords = computed(() => ({
'--pp-pill-on': JSON.stringify(t('ON')),
'--pp-pill-off': JSON.stringify(t('OFF')),
}));
const hud = computed(() => view.value?.hud ?? null);
const sonar = computed(() => view.value?.sonar ?? null);
const sonarOn = computed(() => sonar.value?.enabled ?? true);
@@ -29,6 +37,7 @@ const detectButton = computed(() => detection.value?.button ?? null);
const allocation = computed(() => detection.value?.allocation ?? 'ELASTIC');
const scopeOn = computed(() => view.value?.scope.enabled ?? true);
const scopeFeather = computed(() => view.value?.scope.featherPct ?? 100);
const scopeOpacity = computed(() => view.value?.scope.opacityPct ?? 100);
const celestial = computed(() => view.value?.celestial ?? null);
const celestialTitle = computed(() =>
celestial.value && !celestial.value.supported
@@ -64,15 +73,18 @@ const allocationOptions = computed(() => [
<!-- Post-processing toggles (top-right) -->
<div id="pp-toggles" v-panel-state="'pp-toggles'" class="panel-collapsible collapsed ui-scroll" data-panel-id="pp-toggles">
<div class="compact pp-header-row">
<span class="pp-header-label">{{ t('DISPLAY') }}</span>
<span class="pp-header-label">{{ t('VISUAL', { context: 'panel' }) }}</span>
<span class="panel-divider" aria-hidden="true"></span>
<PanelCollapseButton class="pp-collapse-btn" target="pp-toggles" :name="t('DISPLAY')" sideways start-collapsed />
<UiPanelEdge />
<PanelCollapseButton class="pp-collapse-btn" target="pp-toggles" :name="t('VISUAL', { context: 'panel' })" sideways start-collapsed />
</div>
<div class="pp-panel-body ui-scroll" data-rail-scroller>
<div class="pp-panel-body ui-scroll" data-rail-scroller :style="pillWords">
<VisualPresets />
<!-- Cockpit shows these four groups in its Display popover: each teleports to the slot the Cockpit display portal publishes. While disabled a Teleport stays in place; its 'body' target only keeps server rendering from dropping it. -->
<p class="pp-section-heading">{{ t('Overlay') }}</p>
<Teleport :to="cockpitPortal?.hud ?? 'body'" :disabled="!cockpitPortal?.hud">
<div class="pp-toggle-group">
<button class="pp-toggle-btn" :class="{ active: hud?.visible }" id="hud-toggle" @click="act('toggleHud')" :title="t('Intelligence HUD (H)')">
<button class="pp-toggle-btn" :class="{ active: hud?.visible }" :aria-pressed="String(Boolean(hud?.visible))" id="hud-toggle" @click="act('toggleHud')" :title="t('Intelligence HUD (H)')">
<span class="pp-icon">&#x25CE;</span>
<span class="pp-label" translate="no">HUD</span>
</button>
@@ -181,7 +193,17 @@ const allocationOptions = computed(() => [
<UiSlider class="pp-slider" id="scope-feather-slider" @update:model-value="act('setScopeFeather', $event)" min="0" max="200" :model-value="scopeFeather" :disabled="!scopeOn" :aria-label="t('Scope edge feather')" :title="t('Scope edge feather as a percentage of the keyhole radius')" />
<span class="pp-slider-value" id="scope-feather-value">{{ pct(scopeFeather) }}</span>
</div>
<div class="pp-slider-row visible" id="scope-opacity-row">
<span class="pp-slider-mini-label">{{ t('Opacity') }}</span>
<UiSlider class="pp-slider" id="scope-opacity-slider" @update:model-value="act('setScopeOpacity', $event)" min="50" max="100" :model-value="scopeOpacity" :disabled="!scopeOn" :aria-label="t('Scope opacity')" :title="t('How dark the scope shades the view outside the keyhole')" />
<span class="pp-slider-value" id="scope-opacity-value">{{ pct(scopeOpacity) }}</span>
</div>
</div>
<button class="pp-toggle-btn" id="clean-view-toggle" @click="act('toggleCleanView')" :title="t('Hide UI chrome')">
<span class="pp-icon">&#x25A1;</span>
<span class="pp-label">{{ t('Clean UI') }}</span>
</button>
<p class="pp-section-heading">{{ t('Effects') }}</p>
<div class="pp-toggle-group">
<UiButton class="pp-toggle-btn" :pressed="celestial?.active ?? false" pressed-class="active" id="celestial-toggle" @click="act('toggleCelestial')" :title="celestialTitle" :disabled="celestial ? !celestial.supported : undefined" :aria-disabled="celestial ? String(!celestial.supported) : undefined">
<span class="pp-icon material-symbols-outlined" aria-hidden="true">flare</span>
@@ -217,12 +239,8 @@ const allocationOptions = computed(() => [
<span class="pp-slider-value">{{ pct(weather.values[row.key] ?? 0) }}</span>
</div>
</div>
<button class="pp-toggle-btn" id="clean-view-toggle" @click="act('toggleCleanView')" :title="t('Hide UI chrome')">
<span class="pp-icon">&#x25A1;</span>
<span class="pp-label">{{ t('Clean UI') }}</span>
</button>
<div class="pp-toggle-group">
<button class="pp-toggle-btn" :class="{ active: view?.bloom.active }" id="bloom-toggle" @click="act('toggleBloom')" :title="t('Bloom / Glow')">
<button class="pp-toggle-btn" :class="{ active: view?.bloom.active }" :aria-pressed="String(Boolean(view?.bloom.active))" id="bloom-toggle" @click="act('toggleBloom')" :title="t('Bloom / Glow')">
<span class="pp-icon">&#x2728;</span>
<span class="pp-label">{{ t('Bloom') }}</span>
</button>
@@ -232,7 +250,7 @@ const allocationOptions = computed(() => [
</div>
</div>
<div class="pp-toggle-group">
<button class="pp-toggle-btn" :class="{ active: view?.sharpen.active }" id="sharpen-toggle" @click="act('toggleSharpen')" :title="t('Sharpening')">
<button class="pp-toggle-btn" :class="{ active: view?.sharpen.active }" :aria-pressed="String(Boolean(view?.sharpen.active))" id="sharpen-toggle" @click="act('toggleSharpen')" :title="t('Sharpening')">
<span class="pp-icon">&#x1F50D;</span>
<span class="pp-label">{{ t('Sharpen') }}</span>
</button>
@@ -241,6 +259,9 @@ const allocationOptions = computed(() => [
<span class="pp-slider-value" id="sharpen-intensity-value">{{ pct(view?.sharpen.intensity ?? 49) }}</span>
</div>
</div>
<button type="button" class="pp-reset-btn" :title="t('Reset Visual to its defaults: Normal look, HUD, scope, labels and effects')" @click="act('resetVisual')">
<span class="material-symbols-outlined" aria-hidden="true">restart_alt</span>{{ t('Reset to default') }}
</button>
</div>
</div>
</template>
+1 -1
View File
@@ -77,7 +77,7 @@ test('an application\'s row actions sit before fly to, labelled, and act on thei
const note = row('a1').querySelector('.draw-mark-note');
assert.equal(note.getAttribute('role'), 'status');
assert.equal(note.textContent, '');
assert.equal(row('a2').querySelector('.draw-mark-note'), null, 'a row without actions has no note');
assert.equal(row('a2').querySelector('.draw-mark-note') === null, true, 'a row without actions has no note');
const line = { ...LINE, path: [[0, 0], [1, 0]] };
store.publishDraw({ active: true, shape: 'area', color: 'primary', hint: '', marks: presentDrawMarks([line], drawMarkActions([tag]), new Map([['a1', { busy: true, text: '' }]])) });
await nextTick();
+261
View File
@@ -0,0 +1,261 @@
<script>
import { ref as moduleRef } from 'vue';
/** Voice and other callers ask for this event to show every row again. */
export const LAYER_FINDER_CLEAR_EVENT = 'gev:layer-finder-clear';
// The header buttons and the bar under the header are two instances that
// share one finder.
const finder = {
query: moduleRef(''),
show: moduleRef('all'),
searching: moduleRef(false),
filtering: moduleRef(false),
// A group's stable key (LayerRows' `data-group`), not its translated name,
// so a language change keeps the choice.
category: moduleRef(''),
categories: moduleRef([]),
shown: moduleRef(0),
};
</script>
<script setup>
import { nextTick, onBeforeUnmount, onMounted, ref, watch, computed } from 'vue';
import { msg, t } from '../../../i18n/index.js';
// Search and filter for the Data Layers list. The rows are rendered elsewhere
// (LayerRows), so this works on the list as it stands: it marks rows that
// don't match as filtered out, hides a group heading when none of its rows
// are left, and keeps doing so as rows update.
const props = defineProps({
/** 'buttons' for the header, 'bar' for the row under it. */
part: { type: String, default: 'buttons' },
});
const { query, show, searching, filtering, category, categories, shown } =
finder;
const SHOWS = [
{ id: 'all', label: msg('All layers') },
{ id: 'on', label: msg('On') },
{ id: 'off', label: msg('Off') },
];
const narrowed = computed(
() =>
Boolean(query.value.trim()) || show.value !== 'all' || Boolean(category.value),
);
const categoryLabel = computed(
() => categories.value.find((c) => c.key === category.value)?.label || '',
);
function apply() {
const list = document.getElementById('data-toggles');
if (!list) return;
const q = query.value.trim().toLocaleLowerCase();
let heading = null;
let headingHasRows = false;
let count = 0;
let group = '';
const groups = [];
const close = () =>
heading?.classList.toggle('is-filtered', !headingHasRows);
for (const el of list.children) {
if (el.classList.contains('data-layer-group-heading')) {
close();
heading = el;
headingHasRows = false;
group = el.dataset.group || el.textContent.trim();
groups.push({ key: group, label: el.textContent.trim() });
continue;
}
if (!el.classList.contains('data-toggle-row')) continue;
// The name on screen, in the UI language, and the English name too.
const name = [el.querySelector('.data-name')?.textContent, el.dataset.layerName]
.filter(Boolean)
.join(' ')
.toLocaleLowerCase();
// On means the layer is enabled, whatever its feed is doing.
const on = Boolean(
el.querySelector('.data-toggle-btn')?.classList.contains('active'),
);
const match =
(!q || name.includes(q)) &&
(show.value === 'all' || (show.value === 'on') === on) &&
(!category.value || group === category.value);
el.classList.toggle('is-filtered', !match);
if (match) {
headingHasRows = true;
count++;
}
}
close();
list.classList.toggle('is-filtering', narrowed.value);
const same =
groups.length === categories.value.length &&
groups.every(
(g, i) =>
g.key === categories.value[i].key && g.label === categories.value[i].label,
);
if (!same) categories.value = groups;
// A group that went away takes its filter with it.
if (category.value && !groups.some((g) => g.key === category.value))
category.value = '';
shown.value = count;
}
function clearAll() {
query.value = '';
show.value = 'all';
category.value = '';
searching.value = false;
filtering.value = false;
apply();
}
let observer = null;
let frame = 0;
if (props.part === 'bar') {
onMounted(() => {
const list = document.getElementById('data-toggles');
if (!list) return;
// Rows repaint many times a second; filter once per frame at most.
observer = new MutationObserver(() => {
if (frame) return;
frame = requestAnimationFrame(() => {
frame = 0;
apply();
});
});
observer.observe(list, {
childList: true,
subtree: true,
characterData: true,
attributes: true,
attributeFilter: ['class', 'data-feed-state'],
});
apply();
document.addEventListener(LAYER_FINDER_CLEAR_EVENT, clearAll);
});
onBeforeUnmount(() => {
observer?.disconnect();
cancelAnimationFrame(frame);
document.removeEventListener(LAYER_FINDER_CLEAR_EVENT, clearAll);
});
watch([query, show, category], apply);
}
const searchBtn = () => document.getElementById('layer-finder-search-btn');
async function toggleSearch() {
searching.value = !searching.value;
if (!searching.value) query.value = '';
await nextTick();
if (searching.value) document.getElementById('layer-finder-input')?.focus();
}
// Escape in the field closes the search and stays there: it must not also
// fold the panel or leave the cockpit.
async function closeSearch() {
searching.value = false;
query.value = '';
await nextTick();
searchBtn()?.focus();
}
// The filter is a disclosure of two groups of toggle buttons. Opening it moves
// focus to the chosen option; Escape, or a press outside, closes it and gives
// focus back to its button.
const filterEl = ref(null);
const menuEl = ref(null);
const triggerEl = ref(null);
const options = () => [...(menuEl.value?.querySelectorAll('button') || [])];
async function toggleFilter() {
filtering.value = !filtering.value;
if (!filtering.value) return;
await nextTick();
const menu = menuEl.value;
if (!menu) return;
// Keep the menu inside the panel, which clips what leaves it.
const panel = menu.closest('.ui-panel, [data-panel-id]');
const room = panel
? panel.getBoundingClientRect().bottom - menu.getBoundingClientRect().top - 8
: 0;
menu.style.maxHeight = room > 80 ? `${Math.floor(room)}px` : '';
(menu.querySelector('[aria-pressed="true"]') || options()[0])?.focus();
}
function closeFilter({ refocus = false } = {}) {
filtering.value = false;
if (refocus) triggerEl.value?.focus();
}
function onMenuKey(event) {
if (event.key === 'Escape') {
event.preventDefault();
event.stopPropagation();
closeFilter({ refocus: true });
return;
}
const step = { ArrowDown: 1, ArrowUp: -1 }[event.key];
const edge = { Home: 0, End: -1 }[event.key];
if (step === undefined && edge === undefined) return;
event.preventDefault();
const all = options();
const at = all.indexOf(document.activeElement);
const next =
step !== undefined
? all[(at + step + all.length) % all.length]
: all.at(edge);
next?.focus();
}
function onOutside(e) {
if (filtering.value && filterEl.value && !filterEl.value.contains(e.target))
closeFilter();
}
function pickCategory(key) {
category.value = category.value === key ? '' : key;
}
if (props.part === 'buttons') {
onMounted(() => document.addEventListener('pointerdown', onOutside, true));
onBeforeUnmount(() =>
document.removeEventListener('pointerdown', onOutside, true),
);
}
</script>
<template>
<template v-if="part === 'buttons'">
<button id="layer-finder-search-btn" type="button" class="layer-finder__btn" :class="{ active: searching || query }" :aria-pressed="String(searching)" :aria-label="t('Search layers')" :title="t('Search layers')" @click="toggleSearch">
<span class="material-symbols-outlined" aria-hidden="true">search</span>
</button>
<span ref="filterEl" class="layer-finder__filter">
<button ref="triggerEl" type="button" class="layer-finder__btn" :class="{ active: show !== 'all' || category }" :aria-expanded="String(filtering)" aria-controls="layer-finder-menu" :aria-label="t('Filter layers')" :title="t('Filter layers')" @click="toggleFilter">
<span class="material-symbols-outlined" aria-hidden="true">filter_list</span>
</button>
<span v-if="filtering" id="layer-finder-menu" ref="menuEl" class="layer-finder__menu" role="group" :aria-label="t('Filter layers')" @keydown="onMenuKey">
<span role="group" :aria-label="t('Status')">
<span class="layer-finder__menu-head" aria-hidden="true">{{ t('Status') }}</span>
<button v-for="s in SHOWS" :key="s.id" type="button" :aria-pressed="String(show === s.id)" :class="{ active: show === s.id }" @click="show = s.id">
<span class="material-symbols-outlined" aria-hidden="true">{{ show === s.id ? 'radio_button_checked' : 'radio_button_unchecked' }}</span>{{ t(s.label) }}
</button>
</span>
<span v-if="categories.length" role="group" :aria-label="t('Category')">
<span class="layer-finder__menu-head" aria-hidden="true">{{ t('Category') }}</span>
<button v-for="c in categories" :key="c.key" type="button" :aria-pressed="String(category === c.key)" :class="{ active: category === c.key }" @click="pickCategory(c.key)">
<span class="material-symbols-outlined" aria-hidden="true">{{ category === c.key ? 'radio_button_checked' : 'radio_button_unchecked' }}</span>{{ c.label }}
</button>
</span>
</span>
</span>
</template>
<div v-else-if="searching || narrowed" class="layer-finder__bar">
<label v-if="searching" class="layer-finder__field">
<span class="material-symbols-outlined" aria-hidden="true">search</span>
<input id="layer-finder-input" v-model="query" type="search" :placeholder="t('Search layers…')" :aria-label="t('Search layers')" @keydown.esc.stop.prevent="closeSearch" />
</label>
<button v-if="show !== 'all'" type="button" class="layer-finder__chip" @click="show = 'all'">
{{ show === 'on' ? t('On') : t('Off') }}<span class="material-symbols-outlined" aria-hidden="true">close</span>
</button>
<button v-if="category" type="button" class="layer-finder__chip" @click="category = ''">
{{ categoryLabel }}<span class="material-symbols-outlined" aria-hidden="true">close</span>
</button>
<p v-if="narrowed && shown === 0" class="layer-finder__empty" role="status">{{ t('No layers match') }}</p>
</div>
</template>
+124
View File
@@ -0,0 +1,124 @@
<script setup>
import { onBeforeUnmount, onMounted, ref } from 'vue';
import { t } from '../../../i18n/index.js';
// A slim index beside the Data Layers list: one tick per group (Movement,
// Cameras, Infrastructure…). Hovering a tick names its group, clicking it
// scrolls the list there, and the tick for the group in view is lit. It reads
// the list's group headings, which LayerRows renders, so it follows whatever
// groups the layers bring.
const sections = ref([]);
const current = ref(0);
let list = null;
let observer = null;
let resize = null;
function headings() {
return list ? [...list.querySelectorAll('.data-layer-group-heading:not(.is-filtered)')] : [];
}
function readSections() {
const next = headings().map((h, i) => ({ i, label: h.textContent.trim() }));
// Live counts repaint the rows all the time; keep the ticks unless the
// groups themselves changed.
const same =
next.length === sections.value.length &&
next.every((s, i) => s.label === sections.value[i].label);
if (!same) sections.value = next;
syncCurrent();
}
// Only headings matter: a heading added, removed, renamed (a language change)
// or filtered out. Rows' counts and states change many times a second.
const isHeading = (node) =>
node?.classList?.contains('data-layer-group-heading') ||
node?.parentElement?.classList?.contains('data-layer-group-heading');
let frame = 0;
function onMutations(mutations) {
if (frame) return;
const relevant = mutations.some(
(m) =>
(m.type === 'childList' && m.target === list) || isHeading(m.target),
);
if (!relevant) return;
frame = requestAnimationFrame(() => {
frame = 0;
readSections();
});
}
function syncCurrent() {
if (!list) return;
const top = list.getBoundingClientRect().top + 8;
let index = 0;
headings().forEach((h, i) => {
if (h.getBoundingClientRect().top <= top + 4) index = i;
});
// At the very end of the list the last group is the one in view.
const scrolls = list.clientHeight > 0 && list.scrollHeight > list.clientHeight + 2;
if (scrolls && list.scrollTop + list.clientHeight >= list.scrollHeight - 2) index = sections.value.length - 1;
current.value = Math.max(0, index);
}
// The name of the tick being pointed at or focused. It is drawn on the page
// itself, just outside the panel's edge: the panel clips what leaves it, and a
// label inside would cover the rows.
const tip = ref(null);
function showTip(event, section) {
const box = event.currentTarget.getBoundingClientRect();
// Beside the tick on whichever side has room: the stack sits on the right
// in a right-to-left language.
const before = window.innerWidth - box.right < 180;
tip.value = {
label: section.label,
before,
left: `${Math.round(before ? box.left - 10 : box.right + 10)}px`,
top: `${Math.round(box.top + box.height / 2)}px`,
};
}
const hideTip = () => {
tip.value = null;
};
function jump(i) {
const h = headings()[i];
if (!h || !list) return;
list.scrollTo({ top: h.offsetTop - list.offsetTop - 4, behavior: 'smooth' });
}
onMounted(() => {
list = document.getElementById('data-toggles');
if (!list) return;
observer = new MutationObserver(onMutations);
observer.observe(list, { childList: true, subtree: true, characterData: true, attributes: true, attributeFilter: ['class'] });
list.addEventListener('scroll', syncCurrent, { passive: true });
// The list is hidden while the panel is shut; read again when it opens.
resize = new ResizeObserver(syncCurrent);
resize.observe(list);
readSections();
});
onBeforeUnmount(() => {
observer?.disconnect();
resize?.disconnect();
cancelAnimationFrame(frame);
list?.removeEventListener('scroll', syncCurrent);
});
</script>
<template>
<nav v-if="sections.length > 1" class="layer-section-index" :aria-label="t('Layer groups')">
<button
v-for="section in sections"
:key="section.i"
type="button"
class="layer-section-index__tick"
:class="{ 'is-current': section.i === current }"
:aria-label="t('Jump to {name}', { name: section.label })"
:aria-current="section.i === current ? 'true' : undefined"
@click="jump(section.i)"
@mouseenter="showTip($event, section)"
@mouseleave="hideTip"
@focus="showTip($event, section)"
@blur="hideTip"
></button>
<Teleport to="body">
<span v-if="tip" class="layer-section-index__label"
:class="{ 'layer-section-index__label--before': tip.before }" :style="{ left: tip.left, top: tip.top }" aria-hidden="true">{{ tip.label }}</span>
</Teleport>
</nav>
</template>
+103
View File
@@ -0,0 +1,103 @@
<script setup>
import { storeToRefs } from 'pinia';
import { msg, t } from '../../../i18n/index.js';
import UiButton from '../../kit/UiButton.vue';
import { useDisplayStore } from '../../stores/display.js';
// The visual presets and map source at the top of the Visual panel. The same
// choices the command dock's tray offers, through the same Display store
// actions, so either surface stays in step with the other.
const display = useDisplayStore();
const { style, mapSource, mapSourceControls } = storeToRefs(display);
const STYLES = [
{
name: 'normal',
icon: '◯',
label: msg('Normal'),
key: '1',
title: msg('Show the globe without a visual filter.'),
},
{
name: 'retro',
icon: '▦',
label: msg('CRT'),
key: '2',
title: msg('Emulate a green phosphor CRT with scanlines and screen curvature.'),
},
{
name: 'surveillance',
icon: '🌙',
label: msg('NVG'),
key: '3',
title: msg('Simulate night-vision goggles with green intensification and a tube vignette.'),
},
{
name: 'thermal',
icon: '🌡️',
label: msg('FLIR'),
key: '4',
title: msg('Simulate FLIR-style thermal contrast. Turn up Ironbow for color.'),
},
{
name: 'anime',
icon: '✦',
label: msg('Anime'),
key: '5',
title: msg('Apply bright cel-shaded color and illustrated outlines.'),
},
{
name: 'noir',
icon: '◐',
label: msg('Noir'),
key: '6',
title: msg('Apply high-contrast monochrome film-noir grading.'),
},
];
function selectMapSource(chip) {
if (!chip.available) return;
void mapSourceControls.value?.select(chip.id).catch(() => {});
}
</script>
<template>
<section class="visual-presets" :aria-label="t('VISUAL PRESETS')">
<p class="visual-presets__heading">{{ t('Look') }}</p>
<div class="visual-presets__grid">
<UiButton
v-for="preset in STYLES"
:key="preset.name"
class="visual-presets__style"
:pressed="(style?.name ?? 'normal') === preset.name"
pressed-class="active"
:data-style="preset.name"
:title="t(preset.title)"
@click="display.act('setStyle', preset.name)"
>
<span class="visual-presets__icon" aria-hidden="true">{{ preset.icon }}</span>
<span class="visual-presets__label">{{ t(preset.label) }}</span>
<kbd class="visual-presets__key">{{ preset.key }}</kbd>
</UiButton>
</div>
<div class="visual-presets__heading visual-presets__heading--row">
<span>{{ t('MAP SOURCE') }}</span>
<span class="visual-presets__status" :class="{ warn: !!mapSource?.status.warn }">{{ mapSource ? mapSource.status.text : '3D' }}</span>
</div>
<div class="visual-presets__chips" role="group" :aria-label="t('Map source')">
<UiButton
v-for="chip in mapSource?.chips"
:key="chip.id"
class="visual-presets__chip"
:class="{ unavailable: !chip.available }"
:pressed="Boolean(chip.active)"
pressed-class="active"
:title="chip.title"
:aria-disabled="String(!chip.available)"
:aria-label="chip.ariaLabel"
@click="selectMapSource(chip)"
>{{ chip.label }}<small v-if="chip.requirement">{{ chip.requirement }}</small></UiButton
>
</div>
</section>
</template>
+197 -4
View File
@@ -19,6 +19,8 @@ function mount(t) {
// The store outlives the view; dispose it with its clock subscription.
useWorldTimeStore(pinia).$dispose();
worldClock.goLive();
// The clock keeps its rate; the next test starts at real time.
worldClock.setRate(1);
});
return () => document.getElementById('world-timeline');
}
@@ -79,16 +81,16 @@ test('the timeline hides while no layer with time to show is on', async (t) => {
const bar = mount(t);
const at = Date.UTC(2026, 9, 30, 6, 15, 42);
await nextTick();
assert.equal(bar(), null, 'live, nothing to play');
assert.equal(bar() === null, true, 'live, nothing to play');
worldClock.seek(at);
await nextTick();
assert.equal(bar(), null, 'away from live, but nothing to play');
assert.equal(bar() === null, true, 'away from live, but nothing to play');
const remove = supportingLayer(t, at);
await nextTick();
assert.ok(bar());
remove();
await nextTick();
assert.equal(bar(), null, 'the layer went off');
assert.equal(bar() === null, true, 'the layer went off');
});
test('the track runs over the time the layers show, to now, and scrubs', async (t) => {
@@ -465,7 +467,7 @@ test('play held for a layer to load shows a spinner once the hold lasts', async
// A clock tick (a quarter second) tells of the hold; the spinner waits on.
await new Promise((resolve) => setTimeout(resolve, 250));
await nextTick();
assert.equal(bubble().querySelector('.world-timeline-spinner'), null, 'not for a quick frame');
assert.equal(bubble().querySelector('.world-timeline-spinner') === null, true, 'not for a quick frame');
// The clock tells of the hold on its next tick, and the bar shows it after.
const until = async (shown) => {
for (let waited = 0; waited < 3_000; waited += 50) {
@@ -581,3 +583,194 @@ test('a pinch measures from where the fingers are, and a lifted finger ends it',
assert.ok(Math.abs(length() - zoomedTo) < 1_000);
on(input, 'pointercancel', 100, 1);
});
test('a tick shows its label on hover, and a tap by it goes to its mark', async (t) => {
const bar = mount(t);
const now = Date.now();
const start = now - 10 * 86_400_000;
// Ticks a fifth and seven tenths along a 1000 px track.
const launch = start + (now - start) * 0.2;
const quake = start + (now - start) * 0.7;
const release = worldClock.hold('test-launches');
const unregister = worldClock.register({
id: 'test-launches',
coverage: () => ({
start,
end: now,
marks: [
start,
{ time: launch, label: 'GAUNTLET PAYLOAD', id: 'l1', kind: 'launch' },
{ time: quake, label: 'M6.4 · Fiji', kind: 'earthquake' },
],
}),
});
t.after(() => {
unregister();
release();
});
await nextTick();
const track = bar().querySelector('.world-timeline-track');
const input = bar().querySelector('input[type=range]');
Object.defineProperty(track, 'clientWidth', { value: 1_000 });
track.getBoundingClientRect = () => ({ left: 0, width: 1_000, top: 0, height: 24 });
const press = (type, clientX, pointerId = 1) =>
track.dispatchEvent(new PointerEvent(type, { bubbles: true, clientX, pointerId }));
const tip = () => bar().querySelector('.world-timeline-mark-label');
assert.equal(bar().querySelectorAll('.world-timeline-tick').length, 3, 'ticks stay ticks');
assert.equal(tip()?.textContent ?? null, null);
// Hovering within 6 px of a tick shows its label, in place of the track's hint.
press('pointermove', 205);
await nextTick();
assert.equal(tip()?.textContent, 'GAUNTLET PAYLOAD');
assert.equal(track.hasAttribute('title'), false);
press('pointermove', 698);
await nextTick();
assert.equal(tip()?.textContent, 'M6.4 · Fiji');
// Further off, or on a tick with no label, nothing shows.
press('pointermove', 690);
await nextTick();
assert.equal(tip()?.textContent ?? null, null);
assert.equal(track.hasAttribute('title'), true);
press('pointermove', 2);
await nextTick();
assert.equal(tip()?.textContent ?? null, null, 'an unlabelled mark has no label');
press('pointermove', 205);
track.dispatchEvent(new PointerEvent('pointerleave', { clientX: 1_100, pointerId: 1 }));
await nextTick();
assert.equal(tip()?.textContent ?? null, null, 'leaving the track hides it');
// A tap by a tick goes to its mark exactly; elsewhere, to the time there.
press('pointerdown', 704);
press('pointerup', 704);
await nextTick();
assert.equal(worldClock.now(), quake);
assert.match(input.getAttribute('aria-valuetext'), / · M6\.4 · Fiji$/);
press('pointerdown', 500);
press('pointerup', 500);
await nextTick();
const middle = start + (now - start) / 2;
assert.ok(Math.abs(worldClock.now() - middle) < 60_000, 'went to the middle');
assert.notEqual(worldClock.now(), quake);
assert.match(input.getAttribute('aria-valuetext'), /UTC$/, 'off a mark, the time alone');
// A drag from a tick still scrubs.
press('pointerdown', 200);
press('pointermove', 300);
press('pointerup', 300);
await nextTick();
assert.ok(Math.abs(worldClock.now() - (start + (now - start) * 0.3)) < 60_000);
// The arrows go to the marks and tell their labels; focused, the label shows.
input.dispatchEvent(new Event('focus'));
input.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowLeft' }));
await nextTick();
assert.equal(worldClock.now(), launch);
assert.match(input.getAttribute('aria-valuetext'), / · GAUNTLET PAYLOAD$/);
assert.equal(tip()?.textContent, 'GAUNTLET PAYLOAD');
input.dispatchEvent(new Event('blur'));
await nextTick();
assert.equal(tip()?.textContent ?? null, null);
});
test('the pointer shows the nearer of two ticks within 6 px, and a zoom or a pan clears it', async (t) => {
const bar = mount(t);
const now = Date.now();
const start = now - 10 * 86_400_000;
// Two ticks 8 px apart on a 1000 px track, at 200 and 208 px.
const first = start + (now - start) * 0.2;
const second = start + (now - start) * 0.208;
const release = worldClock.hold('test-launches');
const unregister = worldClock.register({
id: 'test-launches',
coverage: () => ({
start,
end: now,
marks: [
{ time: first, label: 'FIRST', kind: 'launch' },
{ time: second, label: 'SECOND', kind: 'launch' },
],
}),
});
t.after(() => {
unregister();
release();
});
await nextTick();
const track = bar().querySelector('.world-timeline-track');
Object.defineProperty(track, 'clientWidth', { value: 1_000 });
track.getBoundingClientRect = () => ({ left: 0, width: 1_000, top: 0, height: 24 });
const pointer = (type, clientX) =>
track.dispatchEvent(new PointerEvent(type, { bubbles: true, clientX, pointerId: 1 }));
const tip = () => bar().querySelector('.world-timeline-mark-label');
// Where the first tick sits now, in px along the track.
const firstAt = () =>
Number.parseFloat(bar().querySelector('.world-timeline-tick').style.left) * 10;
// The handle between them, so a zoom keeps both in view.
worldClock.seek((first + second) / 2);
await nextTick();
pointer('pointermove', 203);
await nextTick();
assert.equal(tip()?.textContent, 'FIRST');
pointer('pointermove', 205);
await nextTick();
assert.equal(tip()?.textContent, 'SECOND', 'the nearer of the two');
// A wheel zoom moves the ticks from under the pointer: the label goes.
track.dispatchEvent(new WheelEvent('wheel', { deltaY: -200, cancelable: true }));
await nextTick();
assert.equal(track.classList.contains('is-zoomed'), true);
assert.equal(tip()?.textContent ?? null, null, 'a zoom clears the label');
// So does a pan, by wheel or by drag.
pointer('pointermove', firstAt());
await nextTick();
assert.equal(tip()?.textContent, 'FIRST');
track.dispatchEvent(
new WheelEvent('wheel', { deltaY: 40, shiftKey: true, cancelable: true }),
);
await nextTick();
assert.equal(tip()?.textContent ?? null, null, 'a pan clears the label');
// A tap between them goes to the nearer mark.
track.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }));
await nextTick();
assert.equal(track.classList.contains('is-zoomed'), false);
pointer('pointerdown', 205);
pointer('pointerup', 205);
await nextTick();
assert.equal(worldClock.now(), second, 'a tap goes to the nearer mark');
});
test('the speed shown follows the world clock, and Play runs at its rate', async (t) => {
const bar = mount(t);
const now = Date.now();
const release = worldClock.hold('test-launches');
const unregister = worldClock.register({
id: 'test-launches',
coverage: () => ({ start: now - 10 * 86_400_000, end: now - 86_400_000 }),
});
t.after(() => {
unregister();
release();
});
await nextTick();
const select = () => bar().querySelector('select.world-timeline-speed');
assert.equal(select().value, 'real');
// A host sets the rate: the selector shows it.
worldClock.setRate(86_400);
await nextTick();
assert.equal(select().value, 'day');
// A rate not offered shows as the nearest offered speed, and Play keeps it.
worldClock.setRate(5_000);
await nextTick();
assert.equal(select().value, 'hour');
bar().querySelector('.world-timeline-play').click();
assert.equal(worldClock.isPlaying(), true);
assert.equal(worldClock.getRate(), 5_000, 'Play runs at the clock\'s own rate');
worldClock.pause();
// Chosen on the selector while paused, the clock takes it at once.
select().value = 'week';
select().dispatchEvent(new Event('change'));
await nextTick();
assert.equal(worldClock.getRate(), 604_800);
assert.equal(select().value, 'week');
});
+91 -15
View File
@@ -8,11 +8,12 @@ import UiIcon from '../../kit/UiIcon.vue';
import UiSelect from '../../kit/UiSelect.js';
// The world timeline: play and pause and the speed on the left, a track
// across the stretch the layers on can show (each launch or frame a tick)
// with a handle to scrub and the time in a bubble over it, and the way back
// to live on the right, lit while live. Scrolling or pinching the track
// zooms it around the handle, dragging it moves along it, and a double-click
// shows it all again. It shows
// across the stretch the layers on can show (each mark, a launch or a strong
// earthquake, a tick, its label shown over it on hover) with a handle to
// scrub and the time in a bubble over it, and the way back to live on the
// right, lit while live. Scrolling or pinching the track zooms it around the
// handle, dragging it moves along it, a tap on or by a tick goes to its
// mark's time exactly, and a double-click shows it all again. It shows
// while a layer with a time of its own (weather, satellites, launches,
// or one a host follows) is on with time to show; with only live feeds such
// as flights on, the bar stays hidden.
@@ -53,6 +54,8 @@ const ZOOM_STEP = 1.5;
const WHEEL_ZOOM = 0.0025;
// Two presses this close are a double-click.
const DOUBLE_PRESS_MS = 500;
// A tap or a hover this near a tick, in pixels, is on its mark.
const MARK_HIT_PX = 6;
const readout = computed(() =>
Number.isFinite(time.value.timeMs)
@@ -109,8 +112,10 @@ const view = computed(() => {
});
const zoomed = computed(() => zoom.value !== null);
const viewLength = () => view.value.end - view.value.start;
// Show `length` of the span ending at `viewEnd`, held to the span.
// Show `length` of the span ending at `viewEnd`, held to the span. A zoom
// or a pan moves the ticks from under the pointer, so its label goes.
function showView(length, viewEnd) {
hovered.value = null;
const { start, end } = span.value;
if (length >= end - start) {
showWhole();
@@ -138,6 +143,7 @@ const follow = (ms) => {
};
const offView = (ms) => ms < view.value.start || ms > view.value.end;
const showWhole = () => {
hovered.value = null;
zoom.value = null;
panned = false;
};
@@ -212,6 +218,7 @@ let movedTime = false;
const onPointerDown = (event) => {
// Only the main button: a right-click is for the menu.
if (event.button > 0) return;
hovered.value = null;
const onHandle = event.target instanceof HTMLInputElement;
pointers.set(event.pointerId, { x: event.clientX, onHandle });
if (pointers.size === 1) {
@@ -241,6 +248,10 @@ const onPointerDown = (event) => {
gesture = { kind: 'press', x: event.clientX, end: view.value.end };
};
const onPointerMove = (event) => {
// A pointer hovering, none pressed, shows the label of the tick under it.
hovered.value = pointers.size
? null
: (markNear(event.clientX, event.currentTarget)?.time ?? null);
const pointer = pointers.get(event.pointerId);
if (!pointer) return;
pointer.x = event.clientX;
@@ -266,8 +277,14 @@ const onPointerMove = (event) => {
};
const onPointerUp = (event) => {
if (!pointers.delete(event.pointerId)) return;
// A tap on or by a tick goes to its mark exactly; elsewhere, to the time
// under it.
if (gesture?.kind === 'press' && event.type === 'pointerup')
store.scrub(timeAt(event.clientX, event.currentTarget), viewLength());
store.scrub(
markNear(event.clientX, event.currentTarget)?.time ??
timeAt(event.clientX, event.currentTarget),
viewLength(),
);
// A finger lifted from a pinch ends it; the other one moves nothing.
gesture = null;
};
@@ -276,11 +293,66 @@ const place = (ms) => {
const { start, end } = view.value;
return end > start ? ((ms - start) / (end - start)) * 100 : 100;
};
// The labels of the marks at each time marked; a time may have none.
const markLabels = computed(() => {
const labels = new Map();
for (const mark of span.value?.markDetails ?? []) {
if (!labels.has(mark.time)) labels.set(mark.time, []);
if (mark.label) labels.get(mark.time).push(mark.label);
}
return labels;
});
// A tick for each time marked in view: where it sits, as a share of the
// track, and its marks' labels.
const ticks = computed(() => {
const { start, end } = view.value;
return span.value.marks
.filter((mark) => mark >= start && mark <= end)
.map((mark) => `${place(mark)}%`);
.map((mark) => ({
time: mark,
share: place(mark) / 100,
labels: markLabels.value.get(mark) ?? [],
}));
});
// The tick nearest `clientX` within MARK_HIT_PX of it, or null.
function markNear(clientX, track) {
if (!view.value) return null;
const { left, width } = track.getBoundingClientRect();
if (!(width > 0)) return null;
let near = null;
let nearest = MARK_HIT_PX;
for (const tick of ticks.value) {
const off = Math.abs(left + tick.share * width - clientX);
if (off <= nearest) {
near = tick;
nearest = off;
}
}
return near;
}
// The time of the tick the pointer hovers, and whether the handle has focus.
const hovered = shallowRef(null);
const focused = shallowRef(false);
// The labels shown over the track: the hovered tick's, or with the handle
// focused and paused on a mark (an arrow key or a tap took it there), that
// mark's. Nothing for a mark with no label.
const markTip = computed(() => {
if (!view.value) return null;
const onMark = !time.value.live && focused.value ? time.value.timeMs : null;
const over = ticks.value.find((each) => each.time === hovered.value);
const tick = over ?? ticks.value.find((each) => each.time === onMark);
return tick?.labels.length
? { share: tick.share, text: tick.labels.join('\n'), hover: Boolean(over) }
: null;
});
// The time as the handle tells it, with the labels of the mark it is on.
const valueText = computed(() => {
const labels = time.value.live
? null
: markLabels.value.get(time.value.timeMs);
return labels?.length
? `${readout.value} · ${labels.join('; ')}`
: readout.value;
});
const shown = computed(() =>
Math.min(view.value.end, Math.max(view.value.start, at.value)),
@@ -294,10 +366,11 @@ const scrub = (event) => {
}
store.scrub(Number(event.target.value), viewLength());
};
// Arrows go to the previous or next mark (a launch, a frame), or a step along
// the track as shown; Page keys take a tenth of it; Home and End go to the
// ends of all of it. Plus and minus zoom, and zero shows it all; with a
// modifier they are the browser's own zoom.
// Arrows go to the previous or next mark (a launch, a strong earthquake),
// whose label the handle then tells with the time, or a step along the track
// as shown where there is none; Page keys take a tenth
// of it; Home and End go to the ends of all of it. Plus and minus zoom, and
// zero shows it all; with a modifier they are the browser's own zoom.
const ZOOM_KEYS = ['+', '=', '-', '0'];
const onKey = (event) => {
if (ZOOM_KEYS.includes(event.key)) {
@@ -331,17 +404,18 @@ const onKey = (event) => {
><UiButton class="world-timeline-play" :label="time.playing ? t('Pause') : t('Play')" @click="store.togglePlay()"
><UiIcon :name="time.playing ? 'pause' : 'play_arrow'" :size="20" /></UiButton
><UiSelect class="gev-field gev-field--compact world-timeline-speed" :aria-label="t('Play speed')" :title="t('Play speed')" :options="speeds" :model-value="speed" @update:model-value="store.setSpeed($event)"
/><div class="world-timeline-track" :class="{ 'is-zoomed': zoomed }" :title="t('Scroll or pinch to zoom, drag to move along · double-click to see it all')" @wheel="onWheel" @dblclick="showAll" @pointerdown="onPointerDown" @pointermove="onPointerMove" @pointerup="onPointerUp" @pointercancel="onPointerUp"
/><div class="world-timeline-track" :class="{ 'is-zoomed': zoomed }" :title="markTip?.hover ? undefined : t('Scroll or pinch to zoom, drag to move along · double-click to see it all')" @wheel="onWheel" @dblclick="showAll" @pointerdown="onPointerDown" @pointermove="onPointerMove" @pointerup="onPointerUp" @pointercancel="onPointerUp" @pointerleave="hovered = null"
><time class="world-timeline-time" :class="{ 'is-waiting': waiting }" :style="{ '--at': place(shown) / 100 }" :datetime="new Date(time.timeMs).toISOString()" aria-live="off"
><span v-if="waiting" class="world-timeline-spinner" aria-hidden="true"></span>{{ bubble }}</time
><span v-for="(left, index) in ticks" :key="index" class="world-timeline-tick" :style="{ left }" aria-hidden="true"></span
><span v-if="markTip" class="world-timeline-mark-label" :style="{ '--at': markTip.share }" aria-hidden="true">{{ markTip.text }}</span
><span v-for="tick in ticks" :key="tick.time" class="world-timeline-tick" :style="{ left: `${tick.share * 100}%` }" aria-hidden="true"></span
><span class="world-timeline-fill" :style="{ width: `${place(shown)}%` }" aria-hidden="true"></span
><input
class="world-timeline-scrub"
:class="{ 'is-off-view': handleOff }"
type="range"
:aria-label="t('World time')"
:aria-valuetext="readout"
:aria-valuetext="valueText"
:min="view.start"
:max="view.end"
step="any"
@@ -349,6 +423,8 @@ const onKey = (event) => {
@input="scrub"
aria-keyshortcuts="+ - 0"
@keydown="onKey"
@focus="focused = true"
@blur="focused = false"
/></div
><UiButton class="world-timeline-live" :label="time.live ? t('Live') : t('Back to live')" :pressed="time.live" pressed-class="is-live" :disabled="time.live" @click="store.goLive()">{{ t('Live') }}</UiButton
></div>
+47 -4
View File
@@ -52,6 +52,13 @@ import { cyberVisualDefaultsForHudTransition } from '../hudLayouts.js';
const DETECTION_ALLOCATION_STORAGE_KEY = 'gev:detection-allocation:v1';
/** Own visual preferences, detection overrides and display-control state. */
/**
* The faintest the Scope mask goes. Below about half, the view reads as if
* Scope were off while labels still fade outside the keyhole and the HUD gets
* no backplates, so the slider stops here.
*/
export const SCOPE_OPACITY_MIN_PCT = 50;
export class VisualSettings {
async restoreShareState(state) {
const { setScopeTerminusOverride, clampScopeTerminusPct } = this.services;
@@ -72,6 +79,7 @@ export class VisualSettings {
celestialRing,
scopeEnabled,
scopeFeatherPct,
scopeOpacityPct,
scopeTerminusPct,
mapStack,
panelState,
@@ -139,7 +147,12 @@ export class VisualSettings {
focus: false,
});
}
this._setScope({ enabled: scopeEnabled, featherPct: scopeFeatherPct });
this._setScope({
enabled: scopeEnabled,
featherPct: scopeFeatherPct,
opacityPct:
typeof scopeOpacityPct === 'number' ? scopeOpacityPct : undefined,
});
// null restores the altitude-adaptive ramp; a number pins the terminus
// (clamped to the supported 94..100 band, same as the `sce` hash key).
if (scopeTerminusPct === null) setScopeTerminusOverride(null);
@@ -227,6 +240,7 @@ export class VisualSettings {
// What the Scope and Celestial controls show; null until first set.
this._scopeEnabledShown = null;
this._scopeFeatherShown = null;
this._scopeOpacityShown = null;
this._celestialShown = null;
this.activeStyle = 'normal';
this._preCyberStyle = null;
@@ -356,6 +370,20 @@ export class VisualSettings {
this._syncShareState();
}
/**
* While Contacts holds detection, make the detection shown now the state
* leaving Contacts puts back (and a share link carries): the user chose it,
* as with Reset in Visual. Nothing changes outside Contacts.
*/
adoptDetectionAsRestore() {
if (!this._contactsDetectionRestore) return;
const state = this.getDetectionState();
this._contactsDetectionRestore = {
mode: state.detectionMode,
densityPct: state.densityPct,
};
}
_setCockpitVision(mode, active, { revealParameters = false } = {}) {
const next = active ? normalizeCockpitVisionMode(mode) : 'optical';
if (!this.stages) return;
@@ -487,6 +515,7 @@ export class VisualSettings {
scope: {
enabled: this._scopeEnabledShown,
featherPct: this._scopeFeatherShown,
opacityPct: this._scopeOpacityShown ?? 100,
},
celestial: this._celestialShown,
};
@@ -496,7 +525,15 @@ export class VisualSettings {
* Apply the Scope mask and show it on its controls; a field that is not
* given stays as it is. `apply: false` only shows the mask's state.
*/
_setScope({ enabled, featherPct } = {}, { apply = true } = {}) {
_setScope({ enabled, featherPct, opacityPct } = {}, { apply = true } = {}) {
if (Number.isFinite(opacityPct)) {
const pct = Math.max(
SCOPE_OPACITY_MIN_PCT,
Math.min(100, Math.round(opacityPct)),
);
if (apply) this.services.setScopeMaskOpacity?.(pct / 100);
this._scopeOpacityShown = pct;
}
if (typeof enabled === 'boolean') {
if (apply) this.services.setScopeMaskEnabled(enabled);
this._scopeEnabledShown = enabled;
@@ -827,7 +864,11 @@ export class VisualSettings {
if (det.mode) this._setDetectionMode(String(det.mode).toUpperCase());
}
_applyGlobalPostDefaults() {
/**
* @param {{keepHudVariant?: boolean}} [options] `keepHudVariant` leaves the
* HUD layout to the style, as choosing a style does (Visual's reset).
*/
_applyGlobalPostDefaults({ keepHudVariant = false } = {}) {
const defaults = GLOBAL_POST_DEFAULTS;
if (typeof defaults.bloom?.intensity === 'number') {
this._setBloomIntensity(clampBloomIntensity(defaults.bloom.intensity), {
@@ -846,7 +887,7 @@ export class VisualSettings {
this._setSharpenEnabled(defaults.sharpen.enabled);
}
if (defaults.hudVariant) {
if (defaults.hudVariant && !keepHudVariant) {
this._setHudVariant(defaults.hudVariant);
}
if (typeof defaults.hudVisible === 'boolean') {
@@ -891,6 +932,7 @@ export class VisualSettings {
getDetectionTuning,
isScopeMaskEnabled,
getScopeMaskFeather,
getScopeMaskOpacity,
getScopeTerminusOverride,
} = this.services;
const detection = this._shareableDetectionState();
@@ -911,6 +953,7 @@ export class VisualSettings {
celestialRingEnabled: this.celestialRingEnabled,
scopeEnabled: isScopeMaskEnabled(),
scopeFeatherPct: Math.round(getScopeMaskFeather() * 100),
scopeOpacityPct: Math.round((getScopeMaskOpacity?.() ?? 1) * 100),
// null when adaptive — the share layer omits `sce` entirely in that case.
scopeTerminusPct:
getScopeTerminusOverride() == null
+5 -13
View File
@@ -1,15 +1,14 @@
<script setup>
import { t } from '../../i18n/index.js';
import RailCards from '../rail/RailCards.vue';
import RailTimeline from '../rail/RailTimeline.vue';
// Active weather: forecast and event cards, then the observed products with
// their shared history timeline. The owner computes every value shown.
// the time of the frame they show. The world timeline moves time; the owner
// computes every value shown.
defineProps({
view: { type: Object, required: true },
onParams: { type: Function, default: () => {} },
onOpen: { type: Function, default: () => {} },
transport: { type: Object, required: true },
});
</script>
@@ -31,16 +30,9 @@ defineProps({
:aria-label="t('Observed history')"
><h3 class="panel-title">{{ t('Observed history') }}</h3
><div class="weather-observed-scope">{{ view.scope }}</div
><div class="weather-timeline-block" :hidden="!view.observed"
><RailTimeline
:state="view.timeline"
slider-class-name="weather-timeline"
:heading="false"
:on-commit="transport.onCommit"
:on-preview="transport.onPreview"
:on-step="transport.onStep"
:on-latest="transport.onLatest"
:on-play="transport.onPlay" /></div
><div class="weather-frame-time" :hidden="!view.frameTime">{{
view.frameTime
}}</div
><div class="weather-cards"
><RailCards
:cards="view.observedCards"
+21 -37
View File
@@ -98,13 +98,6 @@ export function createWeatherPanel({
openPanels.set(page, id);
render();
},
transport: {
onCommit: (tick) => clock?.setTarget(tick),
onPreview: (time) => historyTime(time, clock?.getState()),
onStep: (direction) => clock?.step(direction),
onLatest: () => clock?.latest(),
onPlay: () => clock?.togglePlay(),
},
};
// The readout patches synchronously, so a newly opened card can be measured.
const paint = (view) =>
@@ -113,14 +106,7 @@ export function createWeatherPanel({
hidden: true,
observed: false,
scope: '',
timeline: {
ticks: [],
index: 0,
mode: 'latest',
playing: false,
readout: '',
disabled: true,
},
frameTime: '',
cards: [],
observedCards: [],
});
@@ -135,32 +121,30 @@ export function createWeatherPanel({
.filter(({ summary }) => summary)
.sort((a, b) => ORDER.indexOf(a.id) - ORDER.indexOf(b.id));
const observed = active.filter(({ id }) => OBSERVED.has(id));
const showTimeline = observed.length > 0;
const showObserved = observed.length > 0;
const names = {
'weather-radar': t('Rain radar'),
'weather-satellite': t('Satellite clouds'),
'weather-lightning': t('Lightning density'),
};
const index =
state.mode === 'latest'
? state.timeline.length - 1
: Math.max(
0,
state.timeline.findLastIndex(
(tick) => Date.parse(tick) <= Date.parse(state.target),
),
);
const timeline = {
ticks: state.timeline,
index,
mode: state.mode,
playing: Boolean(state.playing),
disabled: !showTimeline || state.timeline.length < 2,
readout:
state.mode === 'latest'
? t('LATEST · newest per product')
: historyTime(state.target, state),
// While live, the newest frame and its age; at a past time, the timeline
// time alone. The world timeline moves the time. Live, each product's
// newest frame counts, suspended or not (reduced motion, a hidden page),
// as the timeline leaves those out.
const newest = () => {
const times = (state.products ?? [])
.map(({ selected }) => selected)
.filter((time) => Number.isFinite(Date.parse(time)))
.sort((a, b) => Date.parse(a) - Date.parse(b));
return times.at(-1) ?? state.timeline.at(-1);
};
const shownTime = state.mode === 'latest' ? newest() : state.target;
const frameTime =
showObserved && shownTime
? state.mode === 'history'
? clockTime(shownTime)
: historyTime(shownTime)
: '';
const models = active.map((entry) => {
const { id, icon, summary, legend = [], list } = entry;
// Discrete classes (storm geometry, AQHI bands) list swatches, not a ramp.
@@ -245,9 +229,9 @@ export function createWeatherPanel({
const hidden = active.length === 0;
paint({
hidden,
observed: showTimeline,
observed: showObserved,
scope: observed.map(({ id }) => names[id]).join(' · '),
timeline,
frameTime,
cards: models.filter(({ id }) => !OBSERVED.has(id)),
observedCards: models.filter(({ id }) => OBSERVED.has(id)),
});
+48 -42
View File
@@ -55,10 +55,6 @@ function fixture() {
listeners.add(fn);
return () => listeners.delete(fn);
},
setTarget: (tick) => calls.push(['target', tick]),
latest: () => calls.push(['latest']),
togglePlay: () => calls.push(['play']),
step: (n) => calls.push(['step', n]),
};
return {
...f,
@@ -75,39 +71,55 @@ function fixture() {
},
};
}
const timelineHost = (f) =>
f.find((n) => n.className === 'weather-timeline-block');
const frameTime = (f) => f.find((n) => n.className === 'weather-frame-time');
const card = (f, id) => f.find((n) => n.dataset.cardId === id);
const line = (f, id, name) =>
f.find((n) => n.dataset.lineId === name, card(f, id));
test('timeline stays visible with any observed product; native preview and transport use the clock', (t) => {
t.mock.timers.enable({ apis: ['setTimeout'] });
test('the frame time shows with any observed product; the panel has no time controls of its own', (t) => {
t.mock.timers.enable({
apis: ['Date'],
now: Date.parse('2026-09-22T01:17:00Z'),
});
const f = fixture();
const view = createWeatherPanel(f);
view.update([wind]);
assert.equal(timelineHost(f).hidden, true);
assert.equal(frameTime(f).hidden, true);
view.update([wind, radar]);
assert.equal(timelineHost(f).hidden, false);
f.state({ timeline: [ticks[0]] });
assert.equal(timelineHost(f).hidden, false);
assert.equal(f.find((n) => n.tagName === 'INPUT').disabled, true);
f.state({ timeline: [] });
assert.equal(timelineHost(f).hidden, false);
f.state({ timeline: ticks });
assert.equal(timelineHost(f).hidden, false);
const slider = f.find((n) => n.tagName === 'INPUT');
slider.value = '0';
slider.dispatchEvent(new Event('input'));
assert.deepEqual(f.calls, []);
slider.dispatchEvent(new Event('change'));
assert.deepEqual(f.calls, [['target', ticks[0]]]);
f.find((n) => n.textContent === 'Latest' && n.tagName === 'BUTTON').click();
f.find((n) => n.textContent === 'Play').click();
assert.deepEqual(f.calls.slice(1), [['latest'], ['play']]);
slider.dispatchEvent(new Event('input'));
view.update([wind]);
t.mock.timers.tick(150);
assert.equal(f.calls.length, 3, 'hiding cancels pending drag');
assert.equal(frameTime(f).hidden, false);
assert.equal(frameTime(f).textContent, '01:05 UTC · 12 min ago');
f.state({
timeline: [ticks[0]],
products: [{ id: radar.id, shown: ticks[0], selected: ticks[0] }],
});
assert.equal(frameTime(f).textContent, '01:00 UTC · 17 min ago');
f.state({ timeline: [], products: [] });
assert.equal(frameTime(f).hidden, true);
// Suspended products (reduced motion, a hidden page) leave the timeline;
// live, their newest frame still shows.
f.state({
timeline: [],
products: [
{ id: radar.id, shown: ticks[1], selected: ticks[1], suspended: true },
{
id: 'weather-lightning',
shown: null,
selected: ticks[0],
suspended: true,
},
],
});
assert.equal(frameTime(f).hidden, false);
assert.equal(frameTime(f).textContent, '01:05 UTC · 12 min ago');
f.state({ timeline: ticks, mode: 'history', target: ticks[0] });
assert.equal(frameTime(f).textContent, '01:00 UTC');
assert.equal(
f.find((n) => n.tagName === 'INPUT'),
null,
);
assert.equal(
f.find((n) => ['Play', 'Latest'].includes(n.textContent)),
null,
);
view.destroy();
assert.equal(f.listeners.size, 0);
});
@@ -180,7 +192,7 @@ test('cyclone readout retains advisory, position, intensity, geometry, coverage,
],
};
view.update([cyclone]);
assert.equal(timelineHost(f).hidden, true);
assert.equal(frameTime(f).hidden, true);
assert.match(
line(f, cyclone.id, 'time').textContent,
/JULIO.*Hurricane.*Advisory 10.*UTC/,
@@ -411,7 +423,7 @@ test('cyclones lead, and observed history owns one bordered group with only acti
group.children[1].textContent,
'Rain radar · Satellite clouds · Lightning density',
);
assertSameNode(group.children[2], timelineHost(f));
assertSameNode(group.children[2], frameTime(f));
assert.deepEqual(
[...group.children[3].children].map((n) => n.dataset.cardId),
['weather-radar', 'weather-satellite', 'weather-lightning'],
@@ -674,13 +686,8 @@ test('history time keeps the hour whatever the length of the localized date', ()
const f = fixture();
const view = createWeatherPanel(f);
view.update([wind, radar]);
const ends = f.find((n) => n.className === 'rail-timeline-endpoints');
assert.deepEqual(
[...ends.children].map((n) => n.textContent),
['01:00 UTC', '01:05 UTC'],
locale,
);
f.state({ mode: 'history', target: ticks[1] });
assert.equal(frameTime(f).textContent, '01:05 UTC', locale);
assert.match(
line(f, radar.id, 'time').textContent,
/(^|[^\d:])01:05 UTC/,
@@ -789,7 +796,7 @@ test('source-supplied legend units are shown as given; catalog units are transla
}
});
test('at a past time, frame ages and the timeline readout count from the timeline time, not now', (t) => {
test('at a past time, frame ages count from the timeline time, not now, and the frame time is that time', (t) => {
t.mock.timers.enable({
apis: ['Date'],
now: Date.parse('2032-01-01T00:00:00Z'),
@@ -806,9 +813,8 @@ test('at a past time, frame ages and the timeline readout count from the timelin
line(f, radar.id, 'time').textContent,
'09-22 01:05 UTC · 15m ago · nearest',
);
const readout = f.find((n) => n.textContent === '01:20 UTC');
assert.ok(readout, 'the readout names the timeline time');
assert.doesNotMatch(timelineHost(f).textContent, /min ago/);
// The panel's frame time is the timeline time alone, with no age.
assert.equal(frameTime(f).textContent, '01:20 UTC');
view.destroy();
});
+5 -5
View File
@@ -314,7 +314,7 @@ test('dot, icon and ambient photo clicks open one contained medium-photo card at
true,
'the loaded medium photo is painted inside the card',
);
assert.equal(card.querySelector('[role=status]'), null);
assert.equal(card.querySelector('[role=status]') === null, true);
const style = readFileSync(
new URL('./views/panels/WildlifeSightingCard.vue', import.meta.url),
'utf8',
@@ -348,11 +348,11 @@ test('missing, restricted, obscured and Acartia photos all use the same compact
const f = fixture(context, { ...row, ...extra });
await f.click();
const card = f.cardElement();
assert.equal(card.querySelector('img'), null);
assert.equal(card.querySelector('[role=status]'), null);
assert.equal(card.querySelector('img') === null, true);
assert.equal(card.querySelector('[role=status]') === null, true);
assert.equal(card.querySelector('h2').textContent, row.commonName);
assert.equal(card.querySelector('i').textContent, row.scientificName);
assert.equal(document.querySelector('dialog'), null);
assert.equal(document.querySelector('dialog') === null, true);
if (extra.obscured) {
assert.doesNotMatch(card.textContent, /ago|Photographer/);
assert.ok(
@@ -683,7 +683,7 @@ test('date-only and unsafe-link rows remain readable, and no sighting rail or li
link: 'javascript:alert(1)',
});
await f.click();
assert.equal(f.cardElement().querySelector('a'), null);
assert.equal(f.cardElement().querySelector('a') === null, true);
assert.equal(
f.cardElement().querySelector('time').getAttribute('datetime'),
row.observedOn,