Draw the aircraft family, Wildlife Sightings and the Cockpit through the contract

The layers that still had one Cesium and one Navara implementation, or
drew on Cesium only, now draw through engine.movers, engine.lines and
engine.camera on both engines, and application code holds the engine
instead of guessing it from a viewer.

- Aircraft family: flights, military and local ADS-B share one display
  (src/layers/aircraft/render/display.js). The Cesium and Navara
  renderers are gone. Where they differed, the display follows Cesium:
  - attach and visibility tracking, live disableDepthTestDistance
    changes, the tracked glyph's distance scale, model ids that change,
    local ADS-B markers hidden until shown and its UAT ring as a point;
  - the trail head's hidden alpha is 0.45, the contract's
    depthFailAlpha scaled by the head's 0.9.
  The tracked glyph stays over the fleet, as on Navara. The movers
  contract reports readiness per model and reads model axes as the
  glTF's own on every engine. Cesium's follow takes any native target
  through a proxy entity in the ENU frame and mirrors its readout fields.
- Wildlife Sightings draws badges and the density glow as sprite sets
  and its privacy cells as line outlines (no fill yet). It takes clicks
  from engine.input and its card anchors to the engine's canvas and
  camera, so the layer is in both engines' catalogs again and a switch
  keeps the session's layer set.
- Cockpit: cockpitHost takes the engine only. The ridden aircraft is the
  engine follow's target, hidden through its sprite; only the Cesium
  Viewer's stock double-click is still routed around.
- About forty camera, navigation, share-link, HUD, voice, detection and
  layer-lifecycle callers take the engine. isGlobeEngine and
  engineFromViewer calls outside src/globe fall from 51 to 14.

The coupling baseline drops accordingly: layer renderer lines from
5239/12331 to 4546/11106 (Cesium/Navara), `viewer` lines from 2424 to
2209, Cesium-importing files from 69 to 66.
This commit is contained in:
German Khokhlov committed 2026-11-07 02:34:34 +04:00
1 parent 48988015f1
commit 35e70ec280
145 files changed
+4716 -4212

No files matched your search

+7 -14
View File
@@ -1,26 +1,19 @@
import { engineFromViewer } from '../globe/cesium/engineFromViewer.js';
/**
* Arrival corrections belong to one globe engine and yield to its next camera
* owner. Callers may name the engine or (layers that still hold one) the
* viewer it is registered for; both reach the same correction.
* owner.
*/
const arrivals = new WeakMap();
const ownerOf = (engineOrViewer) =>
engineFromViewer(engineOrViewer) ?? engineOrViewer;
/** Cancel an outstanding arrival correction before navigation or teardown. */
export function cancelCameraArrival(engineOrViewer) {
if (engineOrViewer) arrivals.get(ownerOf(engineOrViewer))?.();
export function cancelCameraArrival(engine) {
if (engine) arrivals.get(engine)?.();
}
/** Register a correction and return an idempotent ownership release. */
export function ownCameraArrival(engineOrViewer, cancel) {
const owner = ownerOf(engineOrViewer);
cancelCameraArrival(owner);
arrivals.set(owner, cancel);
export function ownCameraArrival(engine, cancel) {
cancelCameraArrival(engine);
arrivals.set(engine, cancel);
return () => {
if (arrivals.get(owner) === cancel) arrivals.delete(owner);
if (arrivals.get(engine) === cancel) arrivals.delete(engine);
};
}
+5 -9
View File
@@ -1,13 +1,10 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { createFakeEngine } from '../globe/testing/fakeEngine.js';
import { registerViewerEngine } from '../globe/cesium/engineFromViewer.js';
import { cancelCameraArrival, ownCameraArrival } from './cameraArrival.js';
test('an arrival owned on the engine yields to a cancel through its viewer', () => {
test('an arrival owned on the engine yields to a cancel on the engine', () => {
const engine = createFakeEngine();
const viewer = {};
const unregister = registerViewerEngine(viewer, engine);
const cancelled = [];
// A correction releases its ownership when it stops, as the ground guard does.
const own = (key, name) => {
@@ -17,12 +14,11 @@ test('an arrival owned on the engine yields to a cancel through its viewer', ()
release();
});
};
own(engine, 'engine-owned');
cancelCameraArrival(viewer);
own(viewer, 'viewer-owned');
own(engine, 'first');
cancelCameraArrival(engine);
assert.deepEqual(cancelled, ['engine-owned', 'viewer-owned']);
unregister();
own(engine, 'second');
cancelCameraArrival(engine);
assert.deepEqual(cancelled, ['first', 'second']);
});
test('a newer arrival replaces the older one and release is idempotent', () => {
+6 -11
View File
@@ -24,8 +24,6 @@
* for, only that nobody's answer is taken away while they still need it.
*/
import { engineFromViewer } from '../globe/cesium/engineFromViewer.js';
/** @type {WeakMap<object, {base: number, claims: Map<string, number>}>} */
const _cameras = new WeakMap();
@@ -33,13 +31,11 @@ const _cameras = new WeakMap();
const DEFAULT_PERCENTAGE_CHANGED = 0.5;
/**
* One key per camera: the engine's camera. A globe engine claims through its
* camera; a Cesium viewer or its camera through the engine registered for
* that viewer (engineFromViewer); anything else is the camera itself (a
* camera has no `camera` of its own).
* One key per camera: a globe engine claims through its camera, and so does
* a viewer; anything else is the camera itself (a camera has no `camera` of
* its own). Every layer on one globe claims through its engine.
*/
const cameraOf = (target) =>
engineFromViewer(target)?.camera ?? target?.camera ?? target;
const cameraOf = (target) => target?.camera ?? target;
function ledgerFor(camera) {
let ledger = _cameras.get(camera);
@@ -64,9 +60,8 @@ function applyLedger(camera, ledger) {
/**
* Ask for a camera-change sensitivity at least as fine as `value`.
* @param {object|null|undefined} target A globe engine, its camera, or a
* Cesium viewer or camera (anything with `percentageChanged`). A viewer
* with a registered engine, and its camera, claim on the engine camera.
* @param {object|null|undefined} target A globe engine or its camera, or a
* camera (anything with `percentageChanged`) where no engine is given.
* @param {string} owner Stable claim name, usually the layer id.
* @param {number} value Requested `percentageChanged`.
* @returns {number|null} The value now in force, or null when there is no camera.
+4 -8
View File
@@ -26,30 +26,26 @@ test('claims on a globe engine set its camera sensitivity and share one ledger',
assert.deepEqual(cameraSensitivityClaims(engine), []);
});
test("a Cesium viewer's camera claims on the same key as its engine's camera", async () => {
test("a Cesium engine's claims share one ledger and set its viewer's camera", async () => {
const { createFakeViewer } =
await import('../globe/cesium/testing/fakeViewer.mjs');
const { createCesiumEngine } =
await import('../globe/cesium/createCesiumEngine.js');
const { registerViewerEngine } =
await import('../globe/cesium/engineFromViewer.js');
const viewer = createFakeViewer();
const engine = createCesiumEngine(viewer, { requestRender: () => {} });
const unregister = registerViewerEngine(viewer, engine);
try {
claimCameraSensitivity(viewer.camera, 'traffic', 0.05);
claimCameraSensitivity(engine.camera, 'traffic', 0.05);
claimCameraSensitivity(engine, 'transit', 0.05);
// One ledger: both claims are on it, and releasing one keeps the other.
assert.deepEqual(cameraSensitivityClaims(viewer).sort(), [
assert.deepEqual(cameraSensitivityClaims(engine).sort(), [
'traffic',
'transit',
]);
releaseCameraSensitivity(engine, 'transit');
assert.equal(viewer.camera.percentageChanged, 0.05);
releaseCameraSensitivity(viewer.camera, 'traffic');
releaseCameraSensitivity(engine.camera, 'traffic');
assert.equal(viewer.camera.percentageChanged, 0.5);
} finally {
unregister();
engine.destroy();
}
});
@@ -11,6 +11,7 @@ import militaryFlightsLayer, {
_setCockpitDetectionSubjectForTest as setMilitaryCockpitSubject,
_setTrackedMilitaryRefreshStateForTest,
} from './militaryFlights.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
const SUBJECT = 'abc123';
const NEXT_SUBJECT = 'def456';
@@ -25,6 +26,7 @@ const LAYERS = [
setSubject: setFlightsCockpitSubject,
seed(icao24) {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard: candidateBillboard(icao24),
@@ -46,6 +48,7 @@ const LAYERS = [
setSubject: setMilitaryCockpitSubject,
seed(icao24) {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard: candidateBillboard(icao24),
+12 -9
View File
@@ -1,3 +1,4 @@
import { readFileSync } from 'node:fs';
import { readLayerSource } from '../testSupport/readLayerSource.mjs';
import test from 'node:test';
import assert from 'node:assert/strict';
@@ -28,15 +29,17 @@ for (const layer of LAYERS) {
const source = readLayerSource(layer.path);
test(`${layer.name}: every GLB creation bypasses the tile-contended frame-spread queue`, () => {
// The aircraft renderer loads through its `loadModel`, Cesium.Model.fromGltfAsync
// unless a test injects a loader.
assert.match(source, /loadModel = \(options\) => Cesium\.Model\.fromGltfAsync\(options\)/);
const calls = [...source.matchAll(/(?:Cesium\.Model\.fromGltfAsync|\bloadModel)\(\{([\s\S]*?)\}\)/g)];
assert.ok(calls.length >= 3, `expected fleet, tracked, and preload model calls; found ${calls.length}`);
for (const [index, call] of calls.entries()) {
assert.match(call[1], /\basynchronous:\s*false\b/,
`Model.fromGltfAsync call ${index + 1} must keep bounded GLB readiness independent of tile jobs`);
}
// The layer's models are the engine's model movers (the aircraft display);
// on Cesium each instance loads through Cesium.Model.fromGltfAsync there.
assert.doesNotMatch(source, /Cesium\.Model\.fromGltfAsync/);
const movers = readFileSync(
new URL('../globe/cesium/movers.js', import.meta.url),
'utf8',
);
const calls = [...movers.matchAll(/\.loadModel\(\{([\s\S]*?)\}\)/g)];
assert.equal(calls.length, 1, 'one model load in the Cesium movers');
assert.match(calls[0][1], /\basynchronous:\s*false\b/,
'Model.fromGltfAsync must keep bounded GLB readiness independent of tile jobs');
});
test(`${layer.name}: Cockpit 3D obeys the shared Display toggle`, () => {
+10 -14
View File
@@ -1,4 +1,3 @@
import { engineFromViewer } from '../globe/cesium/engineFromViewer.js';
import { paintTransitBracket } from './detectionDraw.js';
import * as geo from '../geo/index.js';
import { governorRequestRender } from '../renderGovernor.js';
@@ -198,18 +197,15 @@ export function countFadingRenderEntries(renderEntries) {
return count;
}
// ---------------------------------------------------------------------------
// Module-level state — singleton lifecycle tied to the Cesium viewer
// Module-level state — singleton lifecycle tied to the globe engine
// ---------------------------------------------------------------------------
/** @type {Cesium.Viewer|null} */
let _viewer = null;
/** @type {import('../globe/contract.js').GlobeEngine|null} */
let _engine = null;
/** The camera height (m): the engine's, else a bare viewer's (tests). */
/** The camera height (m), or undefined before init. */
function cameraHeight() {
const engine = engineFromViewer(_viewer);
return engine
? engine.camera.height()
: _viewer?.camera?.positionCartographic?.height;
return _engine?.camera.height();
}
/** @type {number} Current mode index into MODE_LABELS */
let _mode = MODE_OFF;
@@ -297,12 +293,12 @@ let _cockpitModeListener = null;
/**
* Initializes detection inside the shared world-overlay host and stores
* references to data layers. The host owns the canvas and render listener.
* @param {object} viewer - The globe engine (or a Cesium viewer; only the
* camera height is read, through the engine when one is registered).
* @param {import('../globe/contract.js').GlobeEngine} engine - The globe
* engine; only its camera height is read.
* @param {Array} layers - Data layer modules that may implement getDetectableObjects().
* @param {Function} onModeChange - Callback invoked with the new mode label string on mode changes.
*/
export function initDetection(viewer, layers, onModeChange) {
export function initDetection(engine, layers, onModeChange) {
if (_cockpitModeListener && typeof window !== 'undefined') {
window.removeEventListener(
'gev:cockpit-mode-changed',
@@ -311,7 +307,7 @@ export function initDetection(viewer, layers, onModeChange) {
}
_hostLane?.unregister?.();
_calloutLane?.unregister?.();
_viewer = viewer;
_engine = engine;
_layers = layers;
_onModeChange = onModeChange;
_debugBanner = detectionDebugRequested(
@@ -367,7 +363,7 @@ export function destroyDetection() {
_calloutLane = null;
_transitBracketPaths.clear();
_calloutCount = 0;
_viewer = null;
_engine = null;
_layers = [];
_onModeChange = null;
_hostCanvas = null;
+15 -15
View File
@@ -364,7 +364,7 @@ test('detection lifecycle re-hosts unchanged painters behind the sole host liste
const modes = [];
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [detectableLayer()], (mode) => modes.push(mode));
initDetection(env.engine, [detectableLayer()], (mode) => modes.push(mode));
assert.equal(env.postRender.listeners.size, 1);
assert.equal(env.document.getElementById('detection-overlay'), null);
assert.ok(env.document.getElementById('world-overlay-canvas'));
@@ -518,7 +518,7 @@ test('callouts stop painting the moment the last detectable object goes away', (
}];
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [{ id: 'flights', getDetectableObjects: () => objects }], () => {});
initDetection(env.engine, [{ id: 'flights', getDetectableObjects: () => objects }], () => {});
setMode('DENSE');
env.advance(250);
env.postRender.raise();
@@ -554,7 +554,7 @@ test('every style paints its OWN plate token through the production callout path
const env = installEnvironment();
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [mixedTierLayer()], () => {});
initDetection(env.engine, [mixedTierLayer()], () => {});
setMode('DENSE');
settleFrame(env);
settleFrame(env);
@@ -592,7 +592,7 @@ test('space-tier callouts take the heavier plate while air contacts keep the lig
const env = installEnvironment();
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [mixedTierLayer()], () => {});
initDetection(env.engine, [mixedTierLayer()], () => {});
setDetectionStyle('surveillance');
setMode('DENSE');
settleFrame(env);
@@ -620,7 +620,7 @@ test('surveillance military tier reaches the dedicated render target as shipped
const env = installEnvironment();
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [militaryLayer()], () => {});
initDetection(env.engine, [militaryLayer()], () => {});
setDetectionStyle('surveillance');
setMode('DENSE');
env.advance(250);
@@ -660,7 +660,7 @@ test('Global Context echo brackets reach the canvas in the detection style colou
echo,
});
initWorldOverlay(env.engine);
initDetection(env.viewer, [militaryLayer()], () => {});
initDetection(env.engine, [militaryLayer()], () => {});
setMode('DENSE');
setDetectionStyle('normal');
settleFrame(env);
@@ -706,7 +706,7 @@ test('a Global Context echo bracket is drawn outside its contact bracket and dim
level: () => 0.5,
});
initWorldOverlay(env.engine);
initDetection(env.viewer, [militaryLayer()], () => {});
initDetection(env.engine, [militaryLayer()], () => {});
setMode('DENSE');
setDetectionStyle('normal');
settleFrame(env);
@@ -778,7 +778,7 @@ test('under the Cyber sonar sweep an echo is never brighter than its own bracket
level: () => 1,
});
initWorldOverlay(env.engine);
initDetection(env.viewer, [contact], () => {});
initDetection(env.engine, [contact], () => {});
setMode('DENSE');
setDetectionStyle('normal');
settleFrame(env);
@@ -840,7 +840,7 @@ test('resting Global Context pulses skip echo work for the whole frame, not per
},
});
initWorldOverlay(env.engine);
initDetection(env.viewer, [layer], () => {});
initDetection(env.engine, [layer], () => {});
setMode('DENSE');
settleFrame(env);
levelCalls = 0;
@@ -867,7 +867,7 @@ test('pathological detection paint holds alternate frames without freezing share
const env = installEnvironment({ search: '?detectDebug=1' });
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [detectableLayer()], () => {});
initDetection(env.engine, [detectableLayer()], () => {});
setOverlayEntries('valve-card', [{
id: 'ambient-card',
position: new Cesium.Cartesian3(0, 0, 0),
@@ -974,7 +974,7 @@ test('the mode banner is absent by default and present behind the flag', () => {
const env = installEnvironment({ search });
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [detectableLayer()], () => {});
initDetection(env.engine, [detectableLayer()], () => {});
setMode('DENSE');
env.advance(250);
env.postRender.raise();
@@ -1001,7 +1001,7 @@ test('detection telemetry stays reachable programmatically with the banner hidde
const env = installEnvironment();
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [detectableLayer()], () => {});
initDetection(env.engine, [detectableLayer()], () => {});
setMode('DENSE');
env.advance(250);
env.postRender.raise();
@@ -1029,7 +1029,7 @@ test('civilian and military AIR brackets cover front, left, and right at Sparse
type: 'AIR',
}));
initWorldOverlay(env.engine);
initDetection(env.viewer, [{ id: layerId, getDetectableObjects: () => objects }], () => {});
initDetection(env.engine, [{ id: layerId, getDetectableObjects: () => objects }], () => {});
setDetectionTuning({ densityPct: 25 });
setMode('SPARSE');
settleFrame(env);
@@ -1087,7 +1087,7 @@ test('the backdrop feather reaches the canvas as a lighter plate against sky', (
const env = installEnvironment();
try {
initWorldOverlay(env.engine);
initDetection(env.viewer, [backdropLayer()], () => {});
initDetection(env.engine, [backdropLayer()], () => {});
setDetectionStyle('normal');
setMode('DENSE');
settleFrame(env);
@@ -1146,7 +1146,7 @@ test('a transit vehicle is a contact: box, route, mode and operator on the share
try {
initWorldOverlay(env.engine);
initDetection(
env.viewer,
env.engine,
[{ id: 'transit', getDetectableObjects: () => objects }],
() => {},
);
+10 -1
View File
@@ -28,6 +28,8 @@ import {
destroyTrackedReadout,
initTrackedReadout,
} from './trackedReadout.js';
import { trackingEngine } from '../testSupport/viewerEngine.mjs';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
test('share-Follow absence requires an accepted OpenSky snapshot', async () => {
_setFlightTrackingRefreshOutcomeForTest({ status: 'source-unavailable' });
@@ -183,6 +185,7 @@ test('flights first update forwards caller cancellation into the feed request',
test('nonempty OpenSky payload with zero usable rows cannot prove share target absence', async () => {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: 'abc123',
entity: { gevLabelModel: { title: 'WARM', details: [] } },
billboard: { show: false },
@@ -238,6 +241,7 @@ test('a newly seen aircraft appears at its delayed position, not ahead of it', a
};
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: 'seed00',
entity: null,
billboard: {
@@ -326,6 +330,7 @@ test('flights poll refreshes tracked callsign/FL/kts and marks a missed poll STA
const billboardCollection = { show: false, remove() {} };
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity,
billboard,
@@ -475,8 +480,9 @@ test('real civil track path creates no native label and publishes every cached h
globalThis.fetch = async () => ({ ok: false });
_setTrackedOverlayHostForTest(host);
try {
initTrackedReadout(viewer);
initTrackedReadout(trackingEngine(viewer));
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard,
@@ -736,6 +742,7 @@ function seedLabelContact({
meta: metaOverrides = {},
}) {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: LABEL_ICAO,
entity: null,
billboard: {
@@ -944,6 +951,7 @@ test('civil tracked readout: a callsign-less enriched contact reads as its regis
const entity = { gevLabelModel: { title: 'OLD', details: [] } };
seedLabelContact({ callsign: ' ', registration: ' N123AB ', tracked: true });
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: LABEL_ICAO,
entity,
billboard: {
@@ -1082,6 +1090,7 @@ test('a newly seen taxiing aircraft starts on the floor under its delayed positi
};
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: 'seed00',
entity: null,
billboard: {
+8 -7
View File
@@ -1,4 +1,3 @@
import { engineFromViewer } from '../globe/cesium/engineFromViewer.js';
import { cancelCameraArrival } from './cameraArrival.js';
function cloneLayerParams(value) {
@@ -84,8 +83,8 @@ export class LayerLifecycle {
* @param {object | null} viewer The Cesium viewer (null on Navara).
* @param {{ engine?: import('../globe/contract.js').GlobeEngine,
* allowQaRegistration?: boolean, getSourceAvailability?: Function }} [options]
* `engine` (default: the viewer's registered engine): every module call
* gets `{ signal, engine }` as its second argument.
* `engine`: every module call gets `{ signal, engine }` as its second
* argument.
* `attachSettleTimeoutMs`: how long a scene bind or detach waits for
* asynchronous layer attachments before it continues without them.
*/
@@ -102,7 +101,7 @@ export class LayerLifecycle {
this._catalogSourceAvailability = getSourceAvailability;
this._visibilityTarget = visibilityTarget;
this.viewer = viewer;
this.engine = engine ?? engineFromViewer(viewer) ?? null;
this.engine = engine ?? null;
this._activityListeners = new Set();
this.layers = new Map(); // id → { module, enabled, initialized, intervalId, lifecycleState, lifecycleUncertain }
this._listeners = new Set();
@@ -214,7 +213,7 @@ export class LayerLifecycle {
bindCatalog(viewer, engine, catalog, options = {}) {
if (this._registrationsFinalized) throw new Error('Scene already attached');
this.viewer = viewer;
this.engine = engine ?? engineFromViewer(viewer) ?? null;
this.engine = engine ?? null;
this._catalogSourceAvailability = catalog.getSourceAvailability;
const scene = new AbortController();
this._sceneController = scene;
@@ -1456,7 +1455,9 @@ export class LayerLifecycle {
const entry = this.layers.get(layerId);
if (!entry) return { intentEpoch: null, promise: Promise.resolve() };
const desiredState = Boolean(shouldEnable);
if (!desiredState) cancelCameraArrival(this.viewer);
// A layer leaving ends the camera arrival correction on a globe with a
// viewer (Cesium).
if (!desiredState && this.viewer) cancelCameraArrival(this.engine);
if (entry.destroying) {
return {
intentEpoch: null,
@@ -2487,7 +2488,7 @@ export class LayerLifecycle {
async destroyLayer(layerId) {
const entry = this.layers.get(layerId);
if (!entry || entry.destroying) return false;
cancelCameraArrival(this.viewer);
if (this.viewer) cancelCameraArrival(this.engine);
entry.destroying = true;
// Work parked for the next scene ends now; teardown waits for its queue.
this._settleSceneWaiters(false, entry);
+9
View File
@@ -46,6 +46,7 @@ import {
presentAwarenessDistance,
} from '../layers/awareness/panel.js';
import { NAVIGATION_AUTHORITY_EVENT } from '../navigationPolicy.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
const militaryAwarenessSource = readLayerSource(
new URL('./militaryAwareness.js', import.meta.url),
@@ -938,6 +939,7 @@ test('Contacts activation adopts the production military tracked-subject descrip
try {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1020,6 +1022,7 @@ test('Contacts activation adopts the production military tracked-subject descrip
} finally {
restores.reverse().forEach((restore) => restore());
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1047,6 +1050,7 @@ test('production military tracked-subject label falls back to registration befor
try {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1100,6 +1104,7 @@ test('production military tracked-subject label falls back to registration befor
} finally {
restores.reverse().forEach((restore) => restore());
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1146,6 +1151,7 @@ test('a cached Context subject re-reads its label when enrichment lands after se
try {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: id,
entity: null,
billboard: { position, color: Cesium.Color.WHITE, show: true },
@@ -1234,6 +1240,7 @@ test('a cached Context subject re-reads its label when enrichment lands after se
} finally {
restores.reverse().forEach((restore) => restore());
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1256,6 +1263,7 @@ test('Contacts activation adopts the production civilian tracked-subject descrip
try {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1345,6 +1353,7 @@ test('Contacts activation adopts the production civilian tracked-subject descrip
} finally {
restores.reverse().forEach((restore) => restore());
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -16,6 +16,7 @@ import {
registerMilitaryIcaos,
setMilitaryLayerActive,
} from './militaryRegistry.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
const SHARED_HEX = 'ae5e01';
const CIVIL_HEX = 'a0c1v1';
@@ -84,6 +85,7 @@ test('edge:military: an ICAO in both feeds draws one target and keeps the milita
const civilBillboards = collection();
_armFlightTrackingRestoreForTest(null);
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: 'seedm0',
entity: null,
billboard: { show: false, position: Cesium.Cartesian3.ZERO },
@@ -93,6 +95,7 @@ test('edge:military: an ICAO in both feeds draws one target and keeps the milita
tracked: false,
});
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: 'seedf0',
entity: null,
billboard: { show: false, position: Cesium.Cartesian3.ZERO },
@@ -171,6 +174,7 @@ test('edge:military: losing the tracked contact from the owning feed releases th
trackedEntity: entity,
};
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: SHARED_HEX,
entity,
billboard: {
+8 -1
View File
@@ -17,6 +17,8 @@ import {
destroyTrackedReadout,
initTrackedReadout,
} from './trackedReadout.js';
import { trackingEngine } from '../testSupport/viewerEngine.mjs';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
test('share-Follow absence requires an accepted adsb.lol snapshot', async () => {
_setMilitaryTrackingRefreshOutcomeForTest({ status: 'source-unavailable' });
@@ -146,6 +148,7 @@ test('military first update forwards caller cancellation into the feed request',
test('nonempty adsb.lol payload with zero usable rows cannot prove share target absence', async () => {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: 'ae1234',
entity: { gevLabelModel: { title: 'WARM', details: [] } },
billboard: { show: false },
@@ -192,6 +195,7 @@ test('military poll refreshes tracked callsign/altitude/kts and marks a missed p
const billboardCollection = { show: false, remove() {} };
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity,
billboard,
@@ -263,6 +267,7 @@ test('cached military snapshots retain their observation time and expose stale f
const history = [];
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: 'ae01ce',
entity: { gevLabelModel: { title: 'RCH451', details: [] } },
billboard: {
@@ -403,8 +408,9 @@ test('real military track path creates no native label and publishes every cache
globalThis.fetch = async () => ({ ok: false });
_setTrackedOverlayHostForTest(host);
try {
initTrackedReadout(viewer);
initTrackedReadout(trackingEngine(viewer));
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard,
@@ -844,6 +850,7 @@ test('the military tracked descriptor publishes the reported vertical rate', ()
// every military contact as level flight.
const seedRate = (verticalRateMps) =>
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: 'ae7f01',
entity: { gevLabelModel: { title: 'TEST', details: [] } },
billboard: {
+3
View File
@@ -12,6 +12,7 @@ import assert from 'node:assert/strict';
import * as Cesium from 'cesium';
import flightsLayer, { _setTrackedFlightRefreshStateForTest } from './flights.js';
import militaryFlightsLayer, { _setTrackedMilitaryRefreshStateForTest } from './militaryFlights.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
const ICAO = 'abc123';
const OTHER = 'def456';
@@ -41,6 +42,7 @@ const LAYERS = [
visualCenterM: Cesium.Cartesian3.ZERO,
seed({ billboardShow, models = [] }) {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: ICAO,
entity: null,
billboard: contactBillboard(billboardShow),
@@ -63,6 +65,7 @@ const LAYERS = [
visualCenterM: Cesium.Cartesian3.ZERO,
seed({ billboardShow, models = [] }) {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24: ICAO,
entity: null,
billboard: contactBillboard(billboardShow),
+7 -7
View File
@@ -109,17 +109,17 @@ test('flights, AIS, and FIRMS enable paths are wired through the shared sprite r
assert.deepEqual(calls, [viewer, viewer, viewer]);
const firmsLayer = createFirmsHeatmapLayer({ id: 'firms', name: 'FIRMS' });
// Flights draws through its renderer: enable asks the fleet to
// restore its order, which the Cesium aircraft renderer wires to the shared
// restorer under the flights' sprite slot.
// Flights draws through its display: enable asks the fleet to restore its
// order; the display's sprite sets take the flights' slot as their draw
// order on every engine (aircraftLayerDisplay).
assert.match(flightsLayer.enable.toString(), /fleet\.restoreOrderOnEnable\(\)/);
assert.match(
readFileSync(new URL('../layers/aircraft/render/cesium.js', import.meta.url), 'utf8'),
/restoreOrderOnEnable: \(\) => restoreSpriteOrderOnEnable\(spriteLayer, viewer\)/,
readFileSync(new URL('../layers/aircraft/render/display.js', import.meta.url), 'utf8'),
/order: SPRITE_LAYER_ORDER\.indexOf\(layerId\)/,
);
assert.match(
readFileSync(new URL('../layers/flights/render/cesium.js', import.meta.url), 'utf8'),
/spriteLayer: 'flights'/,
readFileSync(new URL('../layers/flights/render/display.js', import.meta.url), 'utf8'),
/aircraftLayerDisplay\(\s*'flights',/,
);
assert.match(
firmsLayer.enable.toString(),
+6 -1
View File
@@ -33,6 +33,7 @@ import militaryFlightsLayer, {
import { findCompatibleHistoryIndex } from './militaryAwareness.js';
import { createGevActionRunner } from '../voice/gevActions.js';
import { ANALYST_LAYERS, createAnalystEngine } from './analystEngine.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
/** Strip block and line comments so source pins scan CODE, not prose. */
function stripComments(source) {
@@ -161,6 +162,7 @@ test('a conversion survives a poll refresh, in both the billboard and the tracke
};
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity,
billboard,
@@ -260,7 +262,7 @@ test('both flight layers keep a converted contact 2D and visible (render invaria
// 4. Orientation contract is untouched: still a screen-projected rotation
// with alignedAxis ZERO, and no new per-frame CallbackProperty.
assert.match(source, /alignedAxis: Cesium\.Cartesian3\.ZERO/, `${name}: alignedAxis stays ZERO`);
assert.match(source, /alignedAxis: geo\.cartesian3\.ZERO/, `${name}: alignedAxis stays ZERO`);
assert.doesNotMatch(source, /isTr3b[\s\S]{0,200}new Cesium\.CallbackProperty/,
`${name}: the Easter egg adds no per-frame CallbackProperty`);
}
@@ -295,6 +297,7 @@ test('conversions are session-scoped and no lifecycle path clears them', async (
setTr3b(icao24, true);
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard: {
@@ -459,6 +462,7 @@ test('cockpit class filter matches a converted contact end to end', async () =>
// 2) Real getNearby record for a real (converted) contact in the layer.
const seed = () => _setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard: {
@@ -505,6 +509,7 @@ test('military records and detection cards agree with the conversion', () => {
const icao24 = 'ae01ce';
const center = Cesium.Cartesian3.fromDegrees(-97.7, 30.2, 200);
const seed = () => _setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard: {
+3
View File
@@ -46,6 +46,7 @@ import militaryFlightsLayer, {
} from './militaryFlights.js';
import { clearTr3bRegistry, setTr3b } from './tr3bRegistry.js';
import { reportMeshFloorCell, _clearMeshFloorCellsForTest } from './groundFloor.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
// Sample altitudes are expressed RELATIVE to the band rather than as absolute
// offsets. The thresholds have already been retuned once (1_000_000 → 150_000
@@ -219,6 +220,7 @@ const LAYERS = [
seed({ viewer, tracked = true, icao24 = ICAO, modelCollection = null, onGround = false, models = [] }) {
const billboard = contactBillboard();
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard,
@@ -244,6 +246,7 @@ const LAYERS = [
seed({ viewer, tracked = true, icao24 = ICAO, modelCollection = null, onGround = false, models = [] }) {
const billboard = contactBillboard();
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
icao24,
entity: null,
billboard,
+10 -20
View File
@@ -4,7 +4,6 @@ import {
setOverlaySourceVisible,
} from '../overlays/worldOverlay.js';
import { WORLD_OVERLAY_STYLE } from '../overlays/worldOverlayTokens.js';
import { engineFromViewer } from '../globe/cesium/engineFromViewer.js';
/**
* @module trackedReadout
@@ -34,9 +33,7 @@ const DEFAULT_TRACKED_OVERLAY_HOST = Object.freeze({
clearSource: clearOverlaySource,
});
let _viewer = null;
// The globe engine, when the readout was given one (or a viewer with a
// registered engine): the followed target is engine.camera.following().
// The globe engine: the followed target is engine.camera.following().
let _engine = null;
let _trackedEntityChangedRemove = null;
let _selectedContext = null;
@@ -149,8 +146,7 @@ function followSubject(handle) {
}
function trackedSubject() {
if (_engine) return followSubject(_engine.camera.following());
return _viewer?.trackedEntity || null;
return _engine ? followSubject(_engine.camera.following()) : null;
}
function activeEntity() {
@@ -262,22 +258,17 @@ const READOUT_CONTEXT_LAYERS = new Set(['alpr-cameras', 'local-adsb']);
/**
* Initialize the model bridge and selection listeners. No render listener is
* installed; the already-initialized world-overlay host owns the frame lane.
* @param {Object} target The globe engine (or a viewer whose engine is
* registered): the readout follows engine.camera.following(), its label
* (plain data) or its Cesium entity. A bare viewer (tests) is read for
* its trackedEntity.
* @param {import('../globe/contract.js').GlobeEngine} engine The readout
* follows engine.camera.following(), its label (plain data) or its Cesium
* entity.
*/
export function initTrackedReadout(target) {
if (!target || _viewer === target) return;
if (_viewer) destroyTrackedReadout();
_viewer = target;
_engine = engineFromViewer(target);
export function initTrackedReadout(engine) {
if (!engine || _engine === engine) return;
if (_engine) destroyTrackedReadout();
_engine = engine;
_overlayHost.setVisible(TRACKED_OVERLAY_SOURCE_ID, true);
const changed = _engine
? _engine.camera.followChanged
: target.trackedEntityChanged;
_trackedEntityChangedRemove =
changed?.addEventListener?.(() => {
engine.camera.followChanged?.addEventListener?.(() => {
if (trackedSubject()) _selectedContext = null;
syncActiveEntity();
}) || null;
@@ -343,7 +334,6 @@ export function destroyTrackedReadout() {
_selectedContext = null;
clearTrackedSource();
_overlayHost.setVisible(TRACKED_OVERLAY_SOURCE_ID, false);
_viewer = null;
_engine = null;
}
+3 -2
View File
@@ -1,4 +1,5 @@
import { readLayerSource } from '../testSupport/readLayerSource.mjs';
import { trackingEngine } from '../testSupport/viewerEngine.mjs';
import test from 'node:test';
import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
@@ -157,7 +158,7 @@ test('tracked entity publishes a protected host entry backed by the frame cache'
globalThis.window = fakeWindow;
_setTrackedOverlayHostForTest(recorder.host);
try {
initTrackedReadout(viewer);
initTrackedReadout(trackingEngine(viewer));
const publication = recorder.calls.find(({ op }) => op === 'set');
assert.ok(publication);
assert.equal(publication.sourceId, 'tracked');
@@ -205,7 +206,7 @@ test('selection lifecycle leaves installations to their own entry and retains AL
globalThis.window = fakeWindow;
_setTrackedOverlayHostForTest(recorder.host);
try {
initTrackedReadout(viewer);
initTrackedReadout(trackingEngine(viewer));
const setsBefore = recorder.calls.filter(({ op }) => op === 'set').length;
fakeWindow.dispatchEvent(new CustomEvent('gev:entity-selected', {
detail: { layerId: 'ais-live-vessels', entity: installation },