feat(military): render on Navara

Task 11b. src/layers/military/render/navara.js: the shared Navara aircraft
renderer with the military's sprite slot (SPRITE_LAYER_ORDER 'military',
under flights) and jet.glb's nose offset; registered by
registerNavaraLayerRenderers (now a table of lazily imported factories,
flights and military), so the Navara catalog offers military and the main
chunk stays without three/Navara.

- The follow passes between aircraft layers on Navara as on Cesium: the
  follow-handle → tracked-handle map and the "follow being started" handle
  are shared by every aircraft renderer of the page, so a layer whose follow
  another layer took reads the new owner's tracked handle (and its
  gevSelectionOrigin) — before, it read a bare follow handle and reported
  'programmatic'.
- trackById on a selected-but-not-followed contact follows it again (as
  flights since 10b; on Navara any camera command ends a follow).
- qaDrawn (the probe's drawn()) for military, shared with flights
  (src/layers/aircraft/qaDrawn.js).
- ?qaFeed=military:synthetic[:count]: seeded readsb rows (1 000 by
  default, 150 near JFK, 12 on the ground, 8 types), the first 25 hexes
  shared with the synthetic civil flights.
- qa-w1-layers: sections 4–6 read the --layer's module (were 'flights');
  section 5 keeps the queries beside the voice answers (the voice block
  overwrote them, so --compare never compared queries); for military: the
  follow passes military → flights → military, and flights leaves the 25
  shared aircraft to military while it is on (9 975 / 10 000 / 9 975).

qa-w1-layers --layer=military: Cesium 25/25, Navara 26/26, --compare parity
(queries included; the known 2.3 px camera offset at the global pose only).
This commit is contained in:
German Khokhlov committed 2026-10-17 05:05:40 +04:00
1 parent 3a0a3b0551
commit 9dc446bd24
13 files changed
+423 -56

No files matched your search

+49
View File
@@ -0,0 +1,49 @@
// What an aircraft layer draws, as plain data (QA: the engine-neutral probe,
// window.__godsEyeView.layers.drawn): per contact its glyph (image, scale,
// shown, screen rotation, alpha, position) and its 3D model, read from the
// renderer's handles — the same on every engine. Shared by the aircraft
// layers (flights, military).
/**
* @param {object} state The layer's state: `_billboards` (id → sprite
* handle), `_models` (id → model handle), `_trackedIcao`, `_trackedModel`.
* @returns {Array<object>}
*/
export function aircraftQaDrawn(state) {
const out = [];
for (const [id, sprite] of state._billboards) {
const model = state._models.get(id);
out.push({
id,
tracked: id === state._trackedIcao,
image: sprite.image,
scale: sprite.scale,
width: sprite.width,
show: sprite.show,
rotation: sprite.rotation,
alpha: sprite.color?.alpha ?? null,
position: sprite.position
? {
x: sprite.position.x,
y: sprite.position.y,
z: sprite.position.z,
}
: null,
model: model
? { scale: model.scale, show: model.show, ready: model.ready }
: null,
});
}
const tracked = state._trackedModel;
if (state._trackedIcao && tracked)
out.push({
id: state._trackedIcao,
trackedModel: true,
model: {
scale: tracked.scale,
show: tracked.show,
ready: tracked.ready,
},
});
return out;
}
+15 -7
View File
@@ -189,6 +189,16 @@ const scalarKey = (scalar) =>
? `${scalar.near},${scalar.nearValue},${scalar.far},${scalar.farValue}`
: 'none';
// Follow handle → the tracked handle it follows, for every aircraft layer on
// the engine: a layer whose follow another aircraft layer took reads the
// new owner's tracked handle (its gevSelectionOrigin), as Cesium's
// viewer.trackedEntity gives it the other layer's entity.
const FOLLOWED_TRACKED = new WeakMap();
// The tracked handle whose follow is being started (any aircraft layer):
// the engine raises followChanged inside follow(), before the follow
// handle is known, and every layer's listener must see the new owner.
let followStarting = null;
// ---------------------------------------------------------------------------
// The renderer
// ---------------------------------------------------------------------------
@@ -849,7 +859,7 @@ export function createAircraftNavaraRenderer({
};
// --- follow ---------------------------------------------------------------
const ownFollows = new WeakMap(); // follow handle → tracked handle
const ownFollows = FOLLOWED_TRACKED; // follow handle → tracked handle
// The follow carries the tracked readout's card as plain data (the
// handle's annotation fields, read when the card paints).
const followOf = (handle) => {
@@ -864,17 +874,15 @@ export function createAircraftNavaraRenderer({
label: card,
});
};
// The tracked handle whose follow is being started: the engine raises
// followChanged inside follow(), before the handle is known here.
let starting = null;
const follow = {
start(handle) {
starting = handle;
const outer = followStarting;
followStarting = handle;
let followHandle;
try {
followHandle = followOf(handle);
} finally {
starting = null;
followStarting = outer;
}
handle.gevFollowHandle = followHandle;
ownFollows.set(followHandle, handle);
@@ -892,7 +900,7 @@ export function createAircraftNavaraRenderer({
Boolean(handle?.gevFollowHandle) &&
engine.camera.following() === handle.gevFollowHandle,
current() {
if (starting) return starting;
if (followStarting) return followStarting;
const handle = engine.camera.following();
return handle ? (ownFollows.get(handle) ?? handle) : undefined;
},
+2 -36
View File
@@ -1,4 +1,5 @@
import { approxDistanceKm as _approxDistanceKm } from './recordPolicy.js';
import { aircraftQaDrawn } from '../aircraft/qaDrawn.js';
import { displayedKinematics } from '../../data/motionModel.js';
import * as geo from '../../geo/index.js';
import { isExplicitLayerStateOrigin } from '../../data/layerState.js';
@@ -817,42 +818,7 @@ export function createQueries({
* @returns {Array<object>}
*/
qaDrawn() {
const out = [];
for (const [id, sprite] of flightState._billboards) {
const model = flightState._models.get(id);
out.push({
id,
tracked: id === flightState._trackedIcao,
image: sprite.image,
scale: sprite.scale,
width: sprite.width,
show: sprite.show,
rotation: sprite.rotation,
alpha: sprite.color?.alpha ?? null,
position: sprite.position
? {
x: sprite.position.x,
y: sprite.position.y,
z: sprite.position.z,
}
: null,
model: model
? { scale: model.scale, show: model.show, ready: model.ready }
: null,
});
}
const tracked = flightState._trackedModel;
if (flightState._trackedIcao && tracked)
out.push({
id: flightState._trackedIcao,
trackedModel: true,
model: {
scale: tracked.scale,
show: tracked.show,
ready: tracked.ready,
},
});
return out;
return aircraftQaDrawn(flightState);
},
/**
+22 -1
View File
@@ -1,4 +1,5 @@
import { displayedKinematics } from '../../data/motionModel.js';
import { aircraftQaDrawn } from '../aircraft/qaDrawn.js';
import * as geo from '../../geo/index.js';
import { isExplicitLayerStateOrigin } from '../../data/layerState.js';
import { aircraftIncludedInNearby } from '../../data/aircraftNearbyPolicy.js';
@@ -640,8 +641,18 @@ export function createQueries({
if (!flightState._billboards.has(id)) return false;
if (parts.tracking._isExplicitTrackingOrigin(origin))
parts.tracking._cancelPendingTrackingRestore();
if (flightState._trackedIcao === id)
if (flightState._trackedIcao === id) {
// Selected but no longer followed (a camera command took the camera:
// a search flight, the startup view; on Navara any command ends a
// follow): asking to track it again follows it again (as flights).
const entity = flightState._trackedEntity;
if (entity && !flightState._renderer?.follow.isFollowing(entity)) {
flightState._trackedCameraFrameStop?.();
flightState._trackedCameraFrameStop =
flightState._renderer.follow.refocus(entity);
}
return parts.tracking._publishTrackedSelection(id, origin);
}
parts.tracking._trackFlight(id, { origin });
return true;
},
@@ -720,6 +731,16 @@ export function createQueries({
return true;
},
/**
* What this layer draws, as plain data (QA: the engine-neutral probe,
* window.__godsEyeView.layers.drawn): per contact its glyph and its 3D
* model, read from the renderer's handles — the same on every engine.
* @returns {Array<object>}
*/
qaDrawn() {
return aircraftQaDrawn(flightState);
},
/**
* Stop tracking the currently followed aircraft (no-op if none).
* @returns {boolean} Always true.
+22
View File
@@ -0,0 +1,22 @@
// The military flights layer's renderer on the Navara engine: the shared
// aircraft renderer (src/layers/aircraft/render/navara.js) with the
// military's sprite slot (data/spriteOrder's order on Cesium) and jet.glb's
// nose offset. Registered for 'navara' by the Navara mode after its
// import() (src/app/navaraMode.js).
import { createAircraftNavaraRenderer } from '../../aircraft/render/navara.js';
import { SPRITE_LAYER_ORDER } from '../../../data/spriteOrder.js';
import { MODEL_HEADING_OFFSET_DEG } from '../policy.js';
/**
* Registry factory (src/app/layers/renderers.js): `(engine, options)`.
* @param {import('../../../globe/contract.js').GlobeEngine} engine
*/
export function createMilitaryNavaraRenderer(engine) {
return createAircraftNavaraRenderer({
engine,
layerId: 'military',
order: SPRITE_LAYER_ORDER.indexOf('military'),
headingOffsetDeg: MODEL_HEADING_OFFSET_DEG,
});
}
+152
View File
@@ -140,3 +140,155 @@ test('the military logic draws, selects and follows only through its renderer',
assert.ok(renderer.calls.some(([name]) => name === 'destroy'));
assert.equal(keyListeners.size, 0, 'the dispatcher left the keyboard');
});
test('the military logic draws and follows on the Navara renderer; the follow passes between flights and military', async () => {
const { createAircraftNavaraRenderer, aircraftAtlasLayout } =
await import('../aircraft/render/navara.js');
const { createApplicationFlights } =
await import('../../app/layers/flights.js');
const { openSkySnapshot } = await import('../../sources/live/aircraft.js');
const layout = aircraftAtlasLayout();
const drawAtlas = async () => ({
canvas: { width: layout.width, height: layout.height },
cells: layout.cells,
});
const engine = createFakeEngine();
const renderers = {};
const navara = (layerId, order) => ({
create: ({ engine: given }) =>
(renderers[layerId] = createAircraftNavaraRenderer({
engine: given,
layerId,
order,
headingOffsetDeg: 180,
drawAtlas,
})),
});
const military = createApplicationMilitary({
surface: defaultSurface,
source: {
label: 'Fixture military',
getSnapshot: async () => militarySnapshotOf(['ae0001', 'ae0002']),
},
militaryRegistry,
renderer: navara('military', 7),
});
const nowSec = Math.floor(Date.now() / 1000);
const flights = createApplicationFlights({
surface: defaultSurface,
source: {
label: 'Fixture aircraft',
getSnapshot: async () =>
openSkySnapshot({
time: nowSec,
states: [
[
'abc123',
'TST0 ',
'United States',
nowSec,
nowSec,
-97.9,
30.4,
10_668,
false,
250,
95,
5,
null,
10_700,
null,
null,
null,
5,
],
],
}),
},
militaryRegistry,
renderer: navara('flights', 8),
});
military.init(null, { engine });
flights.init(null, { engine });
military.enable();
flights.enable();
const awareness = [];
const listen = (event) => awareness.push([event.type, event.detail]);
const realDispatch = globalThis.window.dispatchEvent;
globalThis.window.dispatchEvent = (event) => {
listen(event);
return true;
};
try {
await renderers.military.whenReady();
await renderers.flights.whenReady();
await military.update(null);
await flights.update(null);
await Promise.resolve();
const sprites = engine.movers
.list()
.filter(({ id }) => id.startsWith('military-sprites'));
assert.equal(sprites.length, 1);
assert.equal(sprites[0].count, 2);
const drawn = military.qaDrawn();
assert.deepEqual(drawn.map((row) => row.id).sort(), ['ae0001', 'ae0002']);
// The fleet's colour reaches the engine as the layer's amber.
const { store } = engine.fake.moverSet(sprites[0].id);
assert.deepEqual([...store.pickIds.slice(0, 2)].sort(), [
'ae0001',
'ae0002',
]);
// A click on a military contact selects it; the engine follows.
engine.fake.script('pick', () => ({ id: 'ae0002' }));
engine.fake.script('drillPick', () => [{ id: 'ae0002' }]);
click(engine);
assert.equal(military.getTrackedInfo()?.icao24, 'ae0002');
assert.equal(engine.camera.following()?.label?.id, 'military:ae0002');
engine.fake.frame();
assert.equal(
engine.movers.list().find(({ id }) => id.startsWith('military-tracked'))
.count,
1,
);
// A click on a civil flight takes the follow: military lets go, with
// the new owner's origin (as Cesium's trackedEntityChanged gives it).
engine.fake.script('pick', () => ({ id: 'abc123' }));
engine.fake.script('drillPick', () => [{ id: 'abc123' }]);
click(engine);
assert.equal(flights.getTrackedInfo()?.icao24, 'abc123');
assert.equal(military.getTrackedInfo(), null);
assert.equal(engine.camera.following()?.label?.id, 'flights:abc123');
const cleared = awareness.find(
([type, detail]) =>
type === 'gev:awareness-subject-cleared' &&
detail.layerId === 'military',
);
assert.equal(cleared?.[1].origin, 'user');
// And back: tracking a military contact by voice releases flights.
assert.equal(military.trackById('ae0001', { origin: 'voice' }), true);
assert.equal(flights.getTrackedInfo(), null);
assert.equal(engine.camera.following()?.label?.id, 'military:ae0001');
// A camera command ends the follow; tracking it again follows it again.
engine.camera.setView({
destination: engine.camera.pose().position,
});
assert.equal(engine.camera.following(), null);
assert.equal(military.getTrackedInfo()?.icao24, 'ae0001');
assert.equal(military.trackById('ae0001', { origin: 'voice' }), true);
assert.equal(engine.camera.following()?.label?.id, 'military:ae0001');
assert.equal(military.stopTracking(), true);
assert.equal(engine.camera.following(), null);
} finally {
globalThis.window.dispatchEvent = realDispatch;
flights.disable();
military.disable();
flights.destroy(null);
military.destroy(null);
}
assert.equal(engine.movers.list().length, 0, 'no mover set left behind');
engine.destroy();
});