Delete dead render code and consolidate QA helpers

Remove code that nothing in the app, the runners or CI uses:
- the one-off migration compare, look and bench scripts and the vector
  ground prototype they measured, with the bench tables in the docs;
- the unused Navara-named shared render modules (polygons, ground picks,
  mover bank, ground ring);
- the Cesium-shaped aircraft and vessel test renderers, and the trail,
  engineFromViewer and horizon-occluder helpers only they kept alive.
  Their tests now run on the production displays over the fake engine;
- Navara's unread diagnostics, fallback ports, dead exports and
  parameters, stale effect-chain anchors and the unread capability flags.

The QA scripts share one keyless guard and readiness wait, the session
harness reuses the strict harness's browser flags and block list, and the
harness honours QA_ANGLE and QA_RESERVED_PORTS. The bikeshare fixture
keeps only what its scenario reads. The docs name the engine picker where
it is (VISUAL PRESETS) and drop dated run results.

No behaviour changes on either engine. Navara layer renderer lines fall
from 189 to 0 and viewer lines from 891 to 849.
This commit is contained in:
German Khokhlov committed 2026-11-08 17:05:38 +04:00
1 parent 18f69c2699
commit 371d848eec
130 files changed
+633 -4542

No files matched your search

+27 -17
View File
@@ -34,7 +34,7 @@ import { registerEntityContext, selectEntityContext } from './contextStore.js';
import { WORLD_FOCUS_REQUEST_EVENT } from '../worldFocus.js';
import { ensureGeoidReady, geoidHeight } from './geoid.js';
import { pickRegistryFor } from './pickRegistry.js';
const wireEngine = {};
const wireEngine = createFakeEngine({ width: 1600, height: 900 });
const { registerPickOwner, unregisterPickOwner } = pickRegistryFor(wireEngine);
import { applyVesselOverlayPolicy } from './vesselLabels.js';
import { layerFeedState } from './manager.js';
@@ -42,12 +42,20 @@ import {
presentSelectedVessel,
subscribeSelectedVessel,
} from '../hudReadouts.js';
import { vesselViewerRenderer } from '../testSupport/vesselViewerRenderer.mjs';
import { createFakeEngine } from '../globe/testing/fakeEngine.js';
import { createVesselsDisplay, vesselAtlasLayout } from '../layers/vessels/render/display.js';
function vesselDisplay(engine = createFakeEngine({ width: 1600, height: 900 })) {
const layout = vesselAtlasLayout();
const renderer = createVesselsDisplay(engine, {
drawAtlas: async () => ({ canvas: { width: layout.width, height: layout.height }, cells: layout.cells }),
});
renderer.fleet.attach({ show: true });
return renderer;
}
// The layer's state over the test's viewer, drawn by the Cesium-shaped test
// renderer (its billboard collection, projection and trackedEntityChanged).
const _setVesselStateForTest = (options = {}) =>
setVesselStateForTest({ renderer: vesselViewerRenderer, ...options });
setVesselStateForTest({ renderer: () => options.enabled === false ? null : vesselDisplay(options.engine), ...options });
test('open feed with vessels is healthy (null)', () => {
assert.equal(deriveAisFeedError({ status: 'open', lastMessageAt: 1, error: null }, 42), null);
@@ -953,16 +961,17 @@ function installWireHarness(picked, stateOverrides = {}) {
globalThis.document = {
getElementById: () => null,
};
// The test renderer draws in no scene; the harness viewer's
// trackedEntityChanged is its follow signal.
const followViewer = {
get trackedEntity() {
return viewer.trackedEntity;
},
trackedEntityChanged,
Object.defineProperty(wireEngine.camera, 'followChanged', { configurable: true, value: trackedEntityChanged });
wireEngine.camera.following = () => viewer.trackedEntity ?? null;
const pickedRecord = picked?.id && typeof picked.id === 'object' && Object.hasOwn(picked.id, 'mmsi') ? picked.id : null;
const renderer = () => {
const display = vesselDisplay(wireEngine);
if (pickedRecord) {
const handle = display.fleet.add({ id: pickedRecord, position: pickedRecord.position });
picked = { id: handle.pickId };
}
return display;
};
const renderer = ({ billboardCollection }) =>
({ ...vesselViewerRenderer({ viewer: followViewer, billboardCollection }), engine: wireEngine });
_setVesselStateForTest({
records: [record],
selectedRecord: record,
@@ -1413,7 +1422,8 @@ test('buildSelectedVesselCard: full detail card with MMSI + position time', () =
test('vessel host publication preserves the shipped grid winner and separation selector', () => {
const publications = [];
const originalProjection = Cesium.SceneTransforms.worldToWindowCoordinates;
const engine = createFakeEngine({ width: 1600, height: 900 });
engine.projector.worldToWindow = (position) => position.screen;
const makeCandidate = (mmsi, name, x, y, speed = 1) => makeRecord({
mmsi,
name,
@@ -1423,7 +1433,6 @@ test('vessel host publication preserves the shipped grid winner and separation s
const low = makeCandidate('100', 'VESSEL', 20, 20, 1);
const winner = makeCandidate('200', 'NAMED WINNER', 40, 30, 16);
const separated = makeCandidate('300', 'SEPARATED', 400, 300, 3);
Cesium.SceneTransforms.worldToWindowCoordinates = (_scene, position) => position.screen;
_setVesselOverlayHostForTest({
setEntries(sourceId, entries, options) { publications.push({ sourceId, entries, options }); },
setVisible() {},
@@ -1432,6 +1441,7 @@ test('vessel host publication preserves the shipped grid winner and separation s
_setVesselStateForTest({
viewer: { scene: { canvas: { clientWidth: 1600, clientHeight: 900 } } },
records: [low, winner, separated],
engine,
});
try {
_updateVesselCardsForTest([low, winner, separated]);
@@ -1444,7 +1454,7 @@ test('vessel host publication preserves the shipped grid winner and separation s
assert.equal(publications[0].options.cohortLimit, 112);
assert.equal(publications[0].options.collisionCapacity, 112);
} finally {
Cesium.SceneTransforms.worldToWindowCoordinates = originalProjection;
engine.destroy();
_setVesselStateForTest({ enabled: false });
_setVesselOverlayHostForTest();
}
+7 -3
View File
@@ -11,7 +11,7 @@ import militaryFlightsLayer, {
_setCockpitDetectionSubjectForTest as setMilitaryCockpitSubject,
_setTrackedMilitaryRefreshStateForTest,
} from './militaryFlights.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.mjs';
const SUBJECT = 'abc123';
const NEXT_SUBJECT = 'def456';
@@ -26,7 +26,9 @@ const LAYERS = [
setSubject: setFlightsCockpitSubject,
seed(icao24) {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24,
entity: null,
billboard: candidateBillboard(icao24),
@@ -48,7 +50,9 @@ const LAYERS = [
setSubject: setMilitaryCockpitSubject,
seed(icao24) {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24,
entity: null,
billboard: candidateBillboard(icao24),
+47 -75
View File
@@ -28,8 +28,9 @@ import {
destroyTrackedReadout,
initTrackedReadout,
} from './trackedReadout.js';
import { trackingEngine } from '../testSupport/viewerEngine.mjs';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
import { createFakeEngine } from '../globe/testing/fakeEngine.js';
import { createAircraftDisplay, aircraftAtlasLayout } from '../layers/aircraft/render/display.js';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.mjs';
test('share-Follow absence requires an accepted OpenSky snapshot', async () => {
_setFlightTrackingRefreshOutcomeForTest({ status: 'source-unavailable' });
@@ -185,7 +186,9 @@ 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,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: 'abc123',
entity: { gevLabelModel: { title: 'WARM', details: [] } },
billboard: { show: false },
@@ -241,7 +244,9 @@ test('a newly seen aircraft appears at its delayed position, not ahead of it', a
};
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: 'seed00',
entity: null,
billboard: {
@@ -330,7 +335,9 @@ 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,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24,
entity,
billboard,
@@ -411,45 +418,17 @@ test('real civil track path creates no native label and publishes every cached h
const icao24 = 'civ001';
const position = Cesium.Cartesian3.fromDegrees(-97.6699, 30.1945, 10_668);
const now = Cesium.JulianDate.now();
const entities = new Cesium.EntityCollection();
const trackedEntityChanged = new Cesium.Event();
let trackedEntity;
let cancelledFlights = 0;
let appliedFrames = 0;
const viewer = {
entities,
trackedEntityChanged,
clock: { currentTime: now },
camera: {
cancelFlight() {
cancelledFlights += 1;
},
position: new Cesium.Cartesian3(0, -10_000, 7_000),
positionWC: new Cesium.Cartesian3(0, -10_000, 7_000),
direction: Cesium.Cartesian3.UNIT_Y,
transform: Cesium.Matrix4.IDENTITY,
viewMatrix: Cesium.Matrix4.IDENTITY,
frustum: { projectionMatrix: Cesium.Matrix4.IDENTITY },
lookAtTransform() {
appliedFrames += 1;
},
},
scene: {
canvas: { clientWidth: 1600, clientHeight: 900 },
frameState: { frameNumber: 41, mode: Cesium.SceneMode.SCENE3D },
preUpdate: new Cesium.Event(),
screenSpaceCameraController: null,
},
isDestroyed: () => false,
};
Object.defineProperty(viewer, 'trackedEntity', {
get: () => trackedEntity,
set(value) {
trackedEntity = value;
trackedEntityChanged.raiseEvent(value);
},
const engine = createFakeEngine();
let followCalls = 0;
const follow = engine.camera.follow;
engine.camera.follow = (options) => { followCalls++; return follow(options); };
const layout = aircraftAtlasLayout();
const renderer = createAircraftDisplay(engine, {
layerId: 'flights',
drawAtlas: async () => ({ canvas: { width: layout.width, height: layout.height }, cells: layout.cells }),
});
viewer.scene.camera = viewer.camera;
renderer.fleet.attach();
renderer.fleet.setVisible(true);
const billboard = {
position,
rotation: 0.3,
@@ -478,17 +457,15 @@ test('real civil track path creates no native label and publishes every cached h
},
);
globalThis.fetch = async () => ({ ok: false });
const engine = trackingEngine(viewer);
const readoutServices = createSceneServices(engine, { trackedOverlay: host });
try {
initTrackedReadout(engine);
_setTrackedFlightRefreshStateForTest({
renderer: (options) => aircraftViewerRenderer({ ...options, engine }),
renderer: () => renderer,
icao24,
entity: null,
billboard,
billboardCollection: { show: true, remove() {} },
viewer,
tracked: false,
history: [
{
@@ -525,27 +502,19 @@ test('real civil track path creates no native label and publishes every cached h
flightsLayer.trackById(icao24, { origin: 'programmatic' }),
true,
);
const entity = viewer.trackedEntity;
assert.ok(
entity instanceof Cesium.Entity,
'trackById must create the real Cesium entity',
);
assert.equal(entity.label, undefined);
assert.ok(
entities.values.every((candidate) => candidate.label === undefined),
);
const entity = renderer.follow.current();
assert.ok(entity, 'tracking creates a display handle');
assert.deepEqual(entity.gevLabelModel, {
title: 'N12345 · FL350 · 486 kts',
details: ['TEST AIR · A320', 'AUS → LAX'],
accent: '#39d0ff',
});
viewer.scene.preUpdate.raiseEvent();
const initialAppliedFrames = appliedFrames;
const initialCancelledFlights = cancelledFlights;
engine.fake.frame();
const initialFollowCalls = followCalls;
assert.equal(flightsLayer.trackById(icao24, { origin: 'user' }), true);
assert.equal(
cancelledFlights,
initialCancelledFlights,
followCalls,
initialFollowCalls,
'ordinary repeated tracking stays camera-idempotent',
);
assert.equal(
@@ -565,21 +534,16 @@ test('real civil track path creates no native label and publishes every cached h
'same-target refocus forwards explicit authority',
);
assert.equal(flightsLayer.refocusTrackedById(icao24), true);
viewer.scene.preUpdate.raiseEvent();
engine.fake.frame();
assert.equal(
viewer.trackedEntity,
renderer.follow.current(),
entity,
'refocus must retain the exact tracked entity',
);
assert.equal(
appliedFrames,
initialAppliedFrames + 1,
'repeated refocus keeps one camera-frame owner',
);
assert.equal(
cancelledFlights,
initialCancelledFlights + 2,
'only explicit refocus requests cancel camera flights',
followCalls,
initialFollowCalls + 2,
'only explicit refocus requests restart following',
);
const publication = publications.at(-1);
assert.equal(publication.sourceId, 'tracked');
@@ -589,7 +553,7 @@ test('real civil track path creates no native label and publishes every cached h
assert.equal(entry.title, entity.gevLabelModel.title);
assert.deepEqual(entry.details, entity.gevLabelModel.details);
const display = entity.position.getValue(now);
const display = entity.spec.position();
assert.ok(display, 'tracked position callback must seed its frame cache');
assert.equal(
entry.position(),
@@ -710,9 +674,11 @@ test('real civil track path creates no native label and publishes every cached h
assert.equal(flightsLayer.getParams().selectedFlightsTrackingId, 'late005');
} finally {
flightsLayer.stopTracking();
viewer.scene.preUpdate.raiseEvent();
engine.fake.frame();
destroyTrackedReadout(engine);
readoutServices.destroy();
renderer.destroy();
engine.destroy();
globalThis.fetch = realFetch;
globalThis.window = realWindow;
}
@@ -743,7 +709,9 @@ function seedLabelContact({
meta: metaOverrides = {},
}) {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: LABEL_ICAO,
entity: null,
billboard: {
@@ -952,7 +920,9 @@ 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,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: LABEL_ICAO,
entity,
billboard: {
@@ -1091,7 +1061,9 @@ test('a newly seen taxiing aircraft starts on the floor under its delayed positi
};
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: 'seed00',
entity: null,
billboard: {
+2 -6
View File
@@ -21,10 +21,7 @@
* keeps rotation continuous through tracked orbits; field evidence, not an
* unverified math swap, decides whether exact projection becomes preferred.
*/
import {
worldToWindowCoordinates,
horizonOccluder,
} from '../globe/cesium/sceneProjection.js';
import { worldToWindowCoordinates } from '../globe/cesium/sceneProjection.js';
import * as geo from '../geo/index.js';
// A window position through the engine projector the scene carries (the
@@ -148,7 +145,7 @@ const _wgs84OneOverRadii = geo.ellipsoid.WGS84.oneOverRadii;
* ABOVE the ellipsoid the horizon is the tangent silhouette and the test is a
* genuine ray/ellipsoid hit test: 1 means the view ray through the point misses
* the planet entirely. Here the function is the exact complement of
* {@link horizonOccluder} — the occluder asks whether the planet is in FRONT of
* the horizon visibility test — the occluder asks whether the planet is in FRONT of
* a point (cull it), this asks whether it is BEHIND (what a screen-space label
* anchored there is read against). For any point the occluder keeps, a ray that
* hits the ellipsoid must hit it beyond the point, so the hit/miss test alone
@@ -252,7 +249,6 @@ export function skyBackdropFactor(
* @param {Cesium.Camera} camera - The scene camera.
* @returns {Cesium.EllipsoidalOccluder}
*/
export { horizonOccluder };
/**
* Cheap camera pose signature for "did the camera move" gating of rotation
+1 -2
View File
@@ -3,7 +3,6 @@ import assert from 'node:assert/strict';
import * as Cesium from 'cesium';
import {
HORIZON_FEATHER_RAD,
horizonOccluder,
screenProjectedRotation,
skyBackdropFactor,
stabilizeScreenRotation,
@@ -483,7 +482,7 @@ test('below the surface the backdrop test agrees with the occluder beside it', (
// halves use that plane. The old fail-closed broke exactly this: the occluder
// kept a contact against sky and the backdrop test called it ground.
const camera = Cesium.Cartesian3.fromDegrees(JFK_LON, JFK_LAT, -18);
const occluder = horizonOccluder({ positionWC: camera });
const occluder = new Cesium.EllipsoidalOccluder(Cesium.Ellipsoid.WGS84, camera);
const enu = Cesium.Transforms.eastNorthUpToFixedFrame(camera);
const offsetBy = (up) =>
Cesium.Cartesian3.add(
+25 -9
View File
@@ -45,7 +45,7 @@ import {
presentAwarenessDistance,
} from '../layers/awareness/panel.js';
import { NAVIGATION_AUTHORITY_EVENT } from '../navigationPolicy.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.mjs';
import { registerLayerRenderers } from '../app/layers/renderers.js';
// The layer's view of a stub viewer (render/display.js's interface), drawn
@@ -979,7 +979,9 @@ test('Contacts activation adopts the production military tracked-subject descrip
try {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1062,7 +1064,9 @@ test('Contacts activation adopts the production military tracked-subject descrip
} finally {
restores.reverse().forEach((restore) => restore());
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1090,7 +1094,9 @@ test('production military tracked-subject label falls back to registration befor
try {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1144,7 +1150,9 @@ test('production military tracked-subject label falls back to registration befor
} finally {
restores.reverse().forEach((restore) => restore());
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1191,7 +1199,9 @@ test('a cached Context subject re-reads its label when enrichment lands after se
try {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: id,
entity: null,
billboard: { position, color: Cesium.Color.WHITE, show: true },
@@ -1280,7 +1290,9 @@ test('a cached Context subject re-reads its label when enrichment lands after se
} finally {
restores.reverse().forEach((restore) => restore());
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1303,7 +1315,9 @@ test('Contacts activation adopts the production civilian tracked-subject descrip
try {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: id,
entity: null,
billboard: { position, show: true },
@@ -1393,7 +1407,9 @@ test('Contacts activation adopts the production civilian tracked-subject descrip
} finally {
restores.reverse().forEach((restore) => restore());
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: id,
entity: null,
billboard: { position, show: true },
+11 -5
View File
@@ -16,7 +16,7 @@ import {
registerMilitaryIcaos,
setMilitaryLayerActive,
} from './militaryRegistry.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.mjs';
const SHARED_HEX = 'ae5e01';
const CIVIL_HEX = 'a0c1v1';
@@ -85,7 +85,9 @@ test('edge:military: an ICAO in both feeds draws one target and keeps the milita
const civilBillboards = collection();
_armFlightTrackingRestoreForTest(null);
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: 'seedm0',
entity: null,
billboard: { show: false, position: Cesium.Cartesian3.ZERO },
@@ -95,7 +97,9 @@ test('edge:military: an ICAO in both feeds draws one target and keeps the milita
tracked: false,
});
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: 'seedf0',
entity: null,
billboard: { show: false, position: Cesium.Cartesian3.ZERO },
@@ -173,8 +177,10 @@ test('edge:military: losing the tracked contact from the owning feed releases th
entities: { add: (value) => value, remove: () => true },
trackedEntity: entity,
};
const renderer = recordingAircraftRenderer(null, { fleet: { shown: true } });
renderer.follow.start(entity);
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: () => renderer,
icao24: SHARED_HEX,
entity,
billboard: {
@@ -214,7 +220,7 @@ test('edge:military: losing the tracked contact from the owning feed releases th
}
assert.equal(militaryFlightsLayer.hasContact(SHARED_HEX), false);
assert.equal(
viewer.trackedEntity,
renderer.follow.current(),
undefined,
'the follow camera is released',
);
+41 -73
View File
@@ -17,8 +17,9 @@ import {
destroyTrackedReadout,
initTrackedReadout,
} from './trackedReadout.js';
import { trackingEngine } from '../testSupport/viewerEngine.mjs';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
import { createFakeEngine } from '../globe/testing/fakeEngine.js';
import { createAircraftDisplay, aircraftAtlasLayout } from '../layers/aircraft/render/display.js';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.mjs';
test('share-Follow absence requires an accepted adsb.lol snapshot', async () => {
_setMilitaryTrackingRefreshOutcomeForTest({ status: 'source-unavailable' });
@@ -148,7 +149,9 @@ 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,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: 'ae1234',
entity: { gevLabelModel: { title: 'WARM', details: [] } },
billboard: { show: false },
@@ -195,7 +198,9 @@ 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,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24,
entity,
billboard,
@@ -267,7 +272,9 @@ test('cached military snapshots retain their observation time and expose stale f
const history = [];
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: 'ae01ce',
entity: { gevLabelModel: { title: 'RCH451', details: [] } },
billboard: {
@@ -339,45 +346,17 @@ test('real military track path creates no native label and publishes every cache
const icao24 = 'ae01ce';
const position = Cesium.Cartesian3.fromDegrees(-97.03, 31.05, 8_534.4);
const now = Cesium.JulianDate.now();
const entities = new Cesium.EntityCollection();
const trackedEntityChanged = new Cesium.Event();
let trackedEntity;
let cancelledFlights = 0;
let appliedFrames = 0;
const viewer = {
entities,
trackedEntityChanged,
clock: { currentTime: now },
camera: {
cancelFlight() {
cancelledFlights += 1;
},
position: new Cesium.Cartesian3(0, -10_000, 7_000),
positionWC: new Cesium.Cartesian3(0, -10_000, 7_000),
direction: Cesium.Cartesian3.UNIT_Y,
transform: Cesium.Matrix4.IDENTITY,
viewMatrix: Cesium.Matrix4.IDENTITY,
frustum: { projectionMatrix: Cesium.Matrix4.IDENTITY },
lookAtTransform() {
appliedFrames += 1;
},
},
scene: {
canvas: { clientWidth: 1600, clientHeight: 900 },
frameState: { frameNumber: 61, mode: Cesium.SceneMode.SCENE3D },
preUpdate: new Cesium.Event(),
screenSpaceCameraController: null,
},
isDestroyed: () => false,
};
viewer.scene.camera = viewer.camera;
Object.defineProperty(viewer, 'trackedEntity', {
get: () => trackedEntity,
set(value) {
trackedEntity = value;
trackedEntityChanged.raiseEvent(value);
},
const engine = createFakeEngine();
let followCalls = 0;
const follow = engine.camera.follow;
engine.camera.follow = (options) => { followCalls++; return follow(options); };
const layout = aircraftAtlasLayout();
const renderer = createAircraftDisplay(engine, {
layerId: 'military',
drawAtlas: async () => ({ canvas: { width: layout.width, height: layout.height }, cells: layout.cells }),
});
renderer.fleet.attach();
renderer.fleet.setVisible(true);
const billboard = {
position,
rotation: 0.4,
@@ -406,17 +385,15 @@ test('real military track path creates no native label and publishes every cache
},
);
globalThis.fetch = async () => ({ ok: false });
const engine = trackingEngine(viewer);
const readoutServices = createSceneServices(engine, { trackedOverlay: host });
try {
initTrackedReadout(engine);
_setTrackedMilitaryRefreshStateForTest({
renderer: (options) => aircraftViewerRenderer({ ...options, engine }),
renderer: () => renderer,
icao24,
entity: null,
billboard,
billboardCollection: { show: true, remove() {} },
viewer,
tracked: false,
history: [
{
@@ -440,30 +417,22 @@ test('real military track path creates no native label and publishes every cache
militaryFlightsLayer.trackById(icao24, { origin: 'programmatic' }),
true,
);
const entity = viewer.trackedEntity;
assert.ok(
entity instanceof Cesium.Entity,
'trackById must create the real Cesium entity',
);
assert.equal(entity.label, undefined);
assert.ok(
entities.values.every((candidate) => candidate.label === undefined),
);
const entity = renderer.follow.current();
assert.ok(entity, 'tracking creates a display handle');
assert.deepEqual(entity.gevLabelModel, {
title: 'RCH451',
details: ['C17 · 05-8152', 'United States Air Force · 28000 ft · 450 kt'],
accent: '#ffd166',
});
viewer.scene.preUpdate.raiseEvent();
const initialAppliedFrames = appliedFrames;
const initialCancelledFlights = cancelledFlights;
engine.fake.frame();
const initialFollowCalls = followCalls;
assert.equal(
militaryFlightsLayer.trackById(icao24, { origin: 'user' }),
true,
);
assert.equal(
cancelledFlights,
initialCancelledFlights,
followCalls,
initialFollowCalls,
'ordinary repeated tracking stays camera-idempotent',
);
assert.equal(
@@ -486,21 +455,16 @@ test('real military track path creates no native label and publishes every cache
'same-target refocus forwards explicit authority',
);
assert.equal(militaryFlightsLayer.refocusTrackedById(icao24), true);
viewer.scene.preUpdate.raiseEvent();
engine.fake.frame();
assert.equal(
viewer.trackedEntity,
renderer.follow.current(),
entity,
'refocus must retain the exact tracked entity',
);
assert.equal(
appliedFrames,
initialAppliedFrames + 1,
'repeated refocus keeps one camera-frame owner',
);
assert.equal(
cancelledFlights,
initialCancelledFlights + 2,
'only explicit refocus requests cancel camera flights',
followCalls,
initialFollowCalls + 2,
'only explicit refocus requests restart following',
);
const publication = publications.at(-1);
assert.equal(publication.sourceId, 'tracked');
@@ -510,7 +474,7 @@ test('real military track path creates no native label and publishes every cache
assert.equal(entry.title, entity.gevLabelModel.title);
assert.deepEqual(entry.details, entity.gevLabelModel.details);
const display = entity.position.getValue(now);
const display = entity.spec.position();
assert.ok(display, 'tracked position callback must seed its frame cache');
assert.equal(
entry.position(),
@@ -649,9 +613,11 @@ test('real military track path creates no native label and publishes every cache
);
} finally {
militaryFlightsLayer.stopTracking();
viewer.scene.preUpdate.raiseEvent();
engine.fake.frame();
destroyTrackedReadout(engine);
readoutServices.destroy();
renderer.destroy();
engine.destroy();
globalThis.fetch = realFetch;
globalThis.window = realWindow;
}
@@ -851,7 +817,9 @@ test('the military tracked descriptor publishes the reported vertical rate', ()
// every military contact as level flight.
const seedRate = (verticalRateMps) =>
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: 'ae7f01',
entity: { gevLabelModel: { title: 'TEST', details: [] } },
billboard: {
+7 -3
View File
@@ -12,7 +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';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.mjs';
const ICAO = 'abc123';
const OTHER = 'def456';
@@ -42,7 +42,9 @@ const LAYERS = [
visualCenterM: Cesium.Cartesian3.ZERO,
seed({ billboardShow, models = [] }) {
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: ICAO,
entity: null,
billboard: contactBillboard(billboardShow),
@@ -65,7 +67,9 @@ const LAYERS = [
visualCenterM: Cesium.Cartesian3.ZERO,
seed({ billboardShow, models = [] }) {
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24: ICAO,
entity: null,
billboard: contactBillboard(billboardShow),
+13 -5
View File
@@ -33,7 +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';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.mjs';
/** Strip block and line comments so source pins scan CODE, not prose. */
function stripComments(source) {
@@ -162,7 +162,9 @@ test('a conversion survives a poll refresh, in both the billboard and the tracke
};
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24,
entity,
billboard,
@@ -297,7 +299,9 @@ test('conversions are session-scoped and no lifecycle path clears them', async (
setTr3b(icao24, true);
const viewer = { camera: { positionCartographic: null }, scene: {} };
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24,
entity: null,
billboard: {
@@ -462,7 +466,9 @@ 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,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24,
entity: null,
billboard: {
@@ -509,7 +515,9 @@ 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,
renderer: ({ billboardCollection }) => recordingAircraftRenderer(null, {
fleet: { ...billboardCollection, shown: billboardCollection?.show !== false },
}),
icao24,
entity: null,
billboard: {
+40 -21
View File
@@ -26,7 +26,6 @@ import {
FLEET_MODEL_ALT_CEIL_M,
TRACKED_MODEL_EXIT_RATIO,
} from './trackedModelRegime.js';
import { registerViewerEngine } from '../globe/cesium/engineFromViewer.js';
import * as Cesium from 'cesium';
import flightsLayer, {
_setTrackedFlightRefreshStateForTest,
@@ -46,7 +45,7 @@ import militaryFlightsLayer, {
} from './militaryFlights.js';
import { clearTr3bRegistry, setTr3b } from './tr3bRegistry.js';
import { reportMeshFloorCell, _clearMeshFloorCellsForTest } from './groundFloor.js';
import { aircraftViewerRenderer } from '../testSupport/aircraftViewerRenderer.mjs';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.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
@@ -173,9 +172,7 @@ function viewerAtHeight(height, { tilesLoaded = true, sampleHeight = () => undef
trackedEntity: undefined,
entities: { remove() {} },
};
// The ground snap samples through the viewer's engine (the test
// renderer's surfaceOwner, engineFromViewer): the engine surface over this stub's tileset and scene.sampleHeight.
registerViewerEngine(viewer, {
viewer.engine = {
isDestroyed: () => false,
surface: {
tilesLoaded: () => viewer.tileset.tilesLoaded === true,
@@ -184,7 +181,7 @@ function viewerAtHeight(height, { tilesLoaded = true, sampleHeight = () => undef
return Number.isFinite(h) ? { height: h, source: 'tiles' } : undefined;
},
},
});
};
return viewer;
}
@@ -207,6 +204,28 @@ function recordingModelCollection() {
return { added, add(m) { added.push(m); }, remove() {}, isDestroyed() { return false; } };
}
let loadModel = () => Promise.reject(new Error('No model fixture'));
function rendererFor(viewer, collection) {
return recordingAircraftRenderer(viewer.engine, {
view: { camera: viewer.camera, scene: viewer.scene },
fleet: { shown: true },
models: {
live: () => Boolean(collection) && !collection.isDestroyed(),
loadFleet: (spec) => loadModel(spec),
loadTracked: (spec) => loadModel(spec),
preload: (url) => loadModel({ url }),
add: (model) => collection.add(model),
remove: (model) => collection?.remove(model),
destroy: (model) => model.destroy(),
setPose(model, position, headingDeg, offsetDeg = 180) {
return Cesium.Transforms.headingPitchRollToFixedFrame(position,
new Cesium.HeadingPitchRoll(Cesium.Math.toRadians((headingDeg || 0) + offsetDeg), 0, 0),
Cesium.Ellipsoid.WGS84, undefined, model.modelMatrix);
},
},
});
}
const LAYERS = [
{
name: 'flights',
@@ -220,7 +239,7 @@ const LAYERS = [
seed({ viewer, tracked = true, icao24 = ICAO, modelCollection = null, onGround = false, models = [] }) {
const billboard = contactBillboard();
_setTrackedFlightRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: () => rendererFor(viewer, modelCollection),
icao24,
entity: null,
billboard,
@@ -246,7 +265,7 @@ const LAYERS = [
seed({ viewer, tracked = true, icao24 = ICAO, modelCollection = null, onGround = false, models = [] }) {
const billboard = contactBillboard();
_setTrackedMilitaryRefreshStateForTest({
renderer: aircraftViewerRenderer,
renderer: () => rendererFor(viewer, modelCollection),
icao24,
entity: null,
billboard,
@@ -268,7 +287,7 @@ for (const fixture of LAYERS) {
fixture.layer.stopTracking();
fixture.layer.setParams({ models3d: true });
const realFrom = Cesium.Model.fromGltfAsync;
const realFrom = loadModel;
const viewer = viewerAtHeight(30_000, { tilesLoaded: false });
const position = Cesium.Cartesian3.fromDegrees(-97.71, 30.21, 10_668);
const loadedCollection = recordingModelCollection();
@@ -282,7 +301,7 @@ for (const fixture of LAYERS) {
try {
const loadingIcao = fixture.name === 'flights' ? 'a0f201' : 'b0f201';
Cesium.Model.fromGltfAsync = () => Promise.resolve(loadingModel);
loadModel = () => Promise.resolve(loadingModel);
const billboard = fixture.seed({
viewer,
tracked: false,
@@ -316,7 +335,7 @@ for (const fixture of LAYERS) {
const failedIcao = fixture.name === 'flights' ? 'a0f202' : 'b0f202';
const failedCollection = recordingModelCollection();
Cesium.Model.fromGltfAsync = () => Promise.reject(new Error('simulated fleet GLB failure'));
loadModel = () => Promise.reject(new Error('simulated fleet GLB failure'));
const failedBillboard = fixture.seed({
viewer,
tracked: false,
@@ -333,7 +352,7 @@ for (const fixture of LAYERS) {
.some((object) => object.icao24 === failedIcao),
'fleet load rejection leaves the contact in the billboard proximity cohort');
} finally {
Cesium.Model.fromGltfAsync = realFrom;
loadModel = realFrom;
fixture.layer.setParams({ models3d: false });
fixture.layer.stopTracking();
}
@@ -593,7 +612,7 @@ for (const fixture of LAYERS) {
fixture.layer.stopTracking();
fixture.layer.setParams({ models3d: false });
const realFrom = Cesium.Model.fromGltfAsync;
const realFrom = loadModel;
const realNow = Date.now;
let now = 3_000_000;
Date.now = () => now;
@@ -611,7 +630,7 @@ for (const fixture of LAYERS) {
scale: 1,
destroy() {},
};
Cesium.Model.fromGltfAsync = () => Promise.resolve(model);
loadModel = () => Promise.resolve(model);
try {
const billboard = fixture.seed({
@@ -704,7 +723,7 @@ for (const fixture of LAYERS) {
assert.equal(fixture.trackedBillboardColor().alpha, 1,
'there is no invisible-owner gap while the replacement snap is unavailable');
} finally {
Cesium.Model.fromGltfAsync = realFrom;
loadModel = realFrom;
Date.now = realNow;
fixture.layer.stopTracking();
}
@@ -851,14 +870,14 @@ for (const fixture of LAYERS) {
clearTr3bRegistry();
fixture.layer.setParams({ models3d: false });
const realFrom = Cesium.Model.fromGltfAsync;
const realFrom = loadModel;
const realNow = Date.now;
let now = 1_000_000;
const clock = { advance(ms) { now += ms; } };
Date.now = () => now;
let attempts = 0;
const requested = [];
Cesium.Model.fromGltfAsync = ({ url }) => {
loadModel = ({ url }) => {
attempts++; requested.push(url);
return Promise.reject(new Error('simulated missing GLB'));
};
@@ -901,7 +920,7 @@ for (const fixture of LAYERS) {
await driveFrames(fixture, 3, clock);
assert.ok(attempts > settled, 'selecting another contact restores the retry budget');
} finally {
Cesium.Model.fromGltfAsync = realFrom;
loadModel = realFrom;
Date.now = realNow;
console.warn = realWarn;
fixture.layer.stopTracking();
@@ -912,14 +931,14 @@ for (const fixture of LAYERS) {
clearTr3bRegistry();
fixture.layer.setParams({ models3d: false });
const realFrom = Cesium.Model.fromGltfAsync;
const realFrom = loadModel;
const realNow = Date.now;
const realWarn = console.warn;
let now = 2_000_000;
const clock = { advance(ms) { now += ms; } };
Date.now = () => now;
let attempts = 0;
Cesium.Model.fromGltfAsync = () => { attempts++; return Promise.reject(new Error('simulated missing GLB')); };
loadModel = () => { attempts++; return Promise.reject(new Error('simulated missing GLB')); };
console.warn = () => {};
try {
@@ -938,7 +957,7 @@ for (const fixture of LAYERS) {
assert.ok(attempts > latched,
're-tracking the same contact is a new selection and gets its retries back');
} finally {
Cesium.Model.fromGltfAsync = realFrom;
loadModel = realFrom;
Date.now = realNow;
console.warn = realWarn;
fixture.layer.stopTracking();
-1
View File
@@ -1 +0,0 @@
export { createTrail } from '../globe/cesium/trail.js';
-39
View File
@@ -1,39 +0,0 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import * as Cesium from 'cesium';
import { createTrail } from './trailRenderer.js';
test('trail visibility can change without discarding its accumulated geometry', () => {
const added = [];
const removed = [];
const viewer = {
isDestroyed: () => false,
entities: {
add(definition) {
added.push(definition);
return definition;
},
remove(entity) {
removed.push(entity);
},
},
};
const trail = createTrail(viewer, { color: '#ffffff' });
const positions = [
new Cesium.Cartesian3(1, 2, 3),
new Cesium.Cartesian3(4, 5, 6),
];
trail.setVisible(false);
trail.setPositions(positions);
assert.equal(added.length, 1);
assert.equal(added[0].show, false);
assert.deepEqual(added[0].polyline.positions.getValue(), positions);
trail.setVisible(true);
assert.equal(added[0].show, true);
assert.deepEqual(added[0].polyline.positions.getValue(), positions);
trail.destroy();
assert.deepEqual(removed, [added[0]]);
});