Format military-flight and classification components

src/data/militaryFlights.js

@@ -17,18 +17,51 @@ import * as render from '../renderGovernor.js';
 import * as groundSnap from './groundSnap.js';
 import * as recession from './aircraftRecession.js';
 
-const militaryFlightsLayer = createMilitaryFlightLayer({ source: createAdsbLolSource(), resolveAsset: (url) => `${import.meta.env?.BASE_URL || '/'}${url.replace(/^\//, '')}`, services: { picking, sprites, trails, aircraftPresentation, camera, militaryRegistry, labels, groundFloor, meshFloor, geoid, focus, readout, context, render, groundSnap, recession } });
+const militaryFlightsLayer = createMilitaryFlightLayer({
+  source: createAdsbLolSource(),
+  resolveAsset: (url) =>
+    `${import.meta.env?.BASE_URL || '/'}${url.replace(/^\//, '')}`,
+  services: {
+    picking,
+    sprites,
+    trails,
+    aircraftPresentation,
+    camera,
+    militaryRegistry,
+    labels,
+    groundFloor,
+    meshFloor,
+    geoid,
+    focus,
+    readout,
+    context,
+    render,
+    groundSnap,
+    recession,
+  },
+});
 export { TRACKED_MODEL_MAX_PX } from '../layers/military/policy.js';
-export const _setTrackedMilitaryRefreshStateForTest = militaryFlightsLayer.testing._setTrackedMilitaryRefreshStateForTest;
+export const _setTrackedMilitaryRefreshStateForTest =
-export const _setMilitaryTrackingRefreshOutcomeForTest = militaryFlightsLayer.testing._setMilitaryTrackingRefreshOutcomeForTest;
+  militaryFlightsLayer.testing._setTrackedMilitaryRefreshStateForTest;
-export const _addMilitaryTrackingCandidateForTest = militaryFlightsLayer.testing._addMilitaryTrackingCandidateForTest;
+export const _setMilitaryTrackingRefreshOutcomeForTest =
-export const _pendingMilitaryTrackingRestoreForTest = militaryFlightsLayer.testing._pendingMilitaryTrackingRestoreForTest;
+  militaryFlightsLayer.testing._setMilitaryTrackingRefreshOutcomeForTest;
-export const _applyPendingMilitaryTrackingRestoreForTest = militaryFlightsLayer.testing._applyPendingMilitaryTrackingRestoreForTest;
+export const _addMilitaryTrackingCandidateForTest =
-export const _setCockpitDetectionSubjectForTest = militaryFlightsLayer.testing._setCockpitDetectionSubjectForTest;
+  militaryFlightsLayer.testing._addMilitaryTrackingCandidateForTest;
-export const _trackedModelRegimeActiveForTest = militaryFlightsLayer.testing._trackedModelRegimeActiveForTest;
+export const _pendingMilitaryTrackingRestoreForTest =
-export const _updateTrackedModelForTest = militaryFlightsLayer.testing._updateTrackedModelForTest;
+  militaryFlightsLayer.testing._pendingMilitaryTrackingRestoreForTest;
-export const _trackedBillboardColorForTest = militaryFlightsLayer.testing._trackedBillboardColorForTest;
+export const _applyPendingMilitaryTrackingRestoreForTest =
-export const _driveFleetModelHandoffForTest = militaryFlightsLayer.testing._driveFleetModelHandoffForTest;
+  militaryFlightsLayer.testing._applyPendingMilitaryTrackingRestoreForTest;
-export const _ensureFleetModelForTest = militaryFlightsLayer.testing._ensureFleetModelForTest;
+export const _setCockpitDetectionSubjectForTest =
+  militaryFlightsLayer.testing._setCockpitDetectionSubjectForTest;
+export const _trackedModelRegimeActiveForTest =
+  militaryFlightsLayer.testing._trackedModelRegimeActiveForTest;
+export const _updateTrackedModelForTest =
+  militaryFlightsLayer.testing._updateTrackedModelForTest;
+export const _trackedBillboardColorForTest =
+  militaryFlightsLayer.testing._trackedBillboardColorForTest;
+export const _driveFleetModelHandoffForTest =
+  militaryFlightsLayer.testing._driveFleetModelHandoffForTest;
+export const _ensureFleetModelForTest =
+  militaryFlightsLayer.testing._ensureFleetModelForTest;
 export const mapAnalystRecord = militaryFlightsLayer.mapAnalystRecord;
 export default militaryFlightsLayer;

src/data/militaryRegistry.js

@@ -7,4 +7,5 @@ export const setMilitaryLayerActive = registry.setMilitaryLayerActive;
 export const onMilitaryLayerActiveChange = registry.onMilitaryLayerActiveChange;
 export const registerMilitaryIcaos = registry.registerMilitaryIcaos;
 export const isMilitaryIcao = registry.isMilitaryIcao;
-export const refreshMilitaryRegistryIfStale = registry.refreshMilitaryRegistryIfStale;
+export const refreshMilitaryRegistryIfStale =
+  registry.refreshMilitaryRegistryIfStale;

src/layers/aircraft/classification.js

@@ -1,25 +1,26 @@
 /** Instance-owned military identity and active-layer classification.
  * Both aircraft layers share the same application-supplied registry. */
 export function createMilitaryRegistry({ source, now = Date.now } = {}) {
-const MIL_POLL_INTERVAL_MS = 60000;
+  const MIL_POLL_INTERVAL_MS = 60000;
 
-/** @type {Set<string>} Lowercase ICAO24 hexes known to be military. */
+  /** @type {Set<string>} Lowercase ICAO24 hexes known to be military. */
-const _milIcaos = new Set();
+  const _milIcaos = new Set();
-/** @type {boolean} True while the dedicated military layer is enabled. */
+  /** @type {boolean} True while the dedicated military layer is enabled. */
-let _militaryLayerActive = false;
+  let _militaryLayerActive = false;
-/** @type {Set<(active: boolean) => void>} Fired on active-state TRANSITIONS. */
+  /** @type {Set<(active: boolean) => void>} Fired on active-state TRANSITIONS. */
-const _activeChangeListeners = new Set();
+  const _activeChangeListeners = new Set();
-/** @type {number} Epoch ms of the last registry refresh (any source). */
+  /** @type {number} Epoch ms of the last registry refresh (any source). */
-let _lastRefreshMs = 0;
+  let _lastRefreshMs = 0;
-/** @type {boolean} A self-poll fetch is in flight. */
+  /** @type {boolean} A self-poll fetch is in flight. */
-let _polling = false;
+  let _polling = false;
-let currentSource = null;
+  let currentSource = null;
-let lifetime = null;
+  let lifetime = null;
-let releaseSource = null;
+  let releaseSource = null;
 
-/** Replace the classification source and cancel its outstanding work. */
+  /** Replace the classification source and cancel its outstanding work. */
-function configureSource(nextSource, { signal } = {}) {
+  function configureSource(nextSource, { signal } = {}) {
-  if (typeof nextSource?.getSnapshot !== 'function') throw new TypeError('A snapshot source is required');
+    if (typeof nextSource?.getSnapshot !== 'function')
+      throw new TypeError('A snapshot source is required');
     releaseSource?.();
     const controller = new AbortController();
     lifetime = controller;
@@ -42,18 +43,18 @@ function configureSource(nextSource, { signal } = {}) {
     if (signal?.aborted) release();
     else signal?.addEventListener('abort', release, { once: true });
     return release;
-}
+  }
 
-/**
+  /**
    * True when the dedicated military layer currently renders these aircraft
    * (the flights layer should suppress duplicates rather than restyle them).
    * @returns {boolean}
    */
-function isMilitaryLayerActive() {
+  function isMilitaryLayerActive() {
     return _militaryLayerActive;
-}
+  }
 
-/**
+  /**
    * Marks the dedicated military layer enabled/disabled. On a TRANSITION
    * (value actually changed) the registered change listeners fire so the
    * flights layer can reconcile its duplicates immediately instead of waiting
@@ -61,7 +62,7 @@ function isMilitaryLayerActive() {
    * @param {boolean} active - Whether the military layer renders.
    * @returns {void}
    */
-function setMilitaryLayerActive(active) {
+  function setMilitaryLayerActive(active) {
     const next = !!active;
     if (next === _militaryLayerActive) return;
     _militaryLayerActive = next;
@@ -72,48 +73,56 @@ function setMilitaryLayerActive(active) {
         // a broken listener must never break the layer toggle
       }
     }
-}
+  }
 
-/**
+  /**
    * Subscribes to military-layer active-state transitions (fired only when the
    * value changes, AFTER the new state is committed).
    * @param {(active: boolean) => void} listener - Change callback.
    * @returns {() => void} Unsubscribe function.
    */
-function onMilitaryLayerActiveChange(listener) {
+  function onMilitaryLayerActiveChange(listener) {
     if (typeof listener !== 'function') return () => {};
     _activeChangeListeners.add(listener);
     return () => _activeChangeListeners.delete(listener);
-}
+  }
 
-/**
+  /**
    * Replaces/extends the known-military set from a fresh poll.
    * Adds only — transient dropouts from one poll must not declassify an
    * aircraft mid-session (the set stays small: a few hundred hexes).
    * @param {Iterable<string>} icaos - ICAO24 hexes from a /v2/mil response.
    * @returns {void}
    */
-function registerMilitaryIcaos(icaos) {
+  function registerMilitaryIcaos(icaos) {
     for (const icao of icaos || []) {
-    const hex = String(icao || '').trim().toLowerCase();
+      const hex = String(icao || '')
+        .trim()
+        .toLowerCase();
       if (hex) _milIcaos.add(hex);
     }
     _lastRefreshMs = now();
-}
+  }
 
-/**
+  /**
    * Whether an aircraft is known military.
    * @param {string} icao24 - ICAO24 hex (any case).
    * @returns {boolean}
    */
-function isMilitaryIcao(icao24) {
+  function isMilitaryIcao(icao24) {
     return _milIcaos.has(String(icao24 || '').toLowerCase());
-}
+  }
 
-/** Refresh known identities while the dedicated layer is disabled.
+  /** Refresh known identities while the dedicated layer is disabled.
    * A failed or cancelled request retains the current set and never swaps sources. */
-async function refreshMilitaryRegistryIfStale() {
+  async function refreshMilitaryRegistryIfStale() {
-  if (!currentSource || !lifetime || lifetime.signal.aborted || _militaryLayerActive) return;
+    if (
+      !currentSource ||
+      !lifetime ||
+      lifetime.signal.aborted ||
+      _militaryLayerActive
+    )
+      return;
     if (_polling || now() - _lastRefreshMs < MIL_POLL_INTERVAL_MS) return;
     const owner = lifetime;
     const requestSource = currentSource;
@@ -129,15 +138,23 @@ async function refreshMilitaryRegistryIfStale() {
     } finally {
       if (lifetime === owner) _polling = false;
     }
-}
+  }
-function dispose() {
+  function dispose() {
     releaseSource?.();
     _milIcaos.clear();
     _lastRefreshMs = 0;
     _activeChangeListeners.clear();
     _militaryLayerActive = false;
-}
+  }
-if (source) configureSource(source);
+  if (source) configureSource(source);
-return { configureSource, dispose, isMilitaryLayerActive, setMilitaryLayerActive,
+  return {
-  onMilitaryLayerActiveChange, registerMilitaryIcaos, isMilitaryIcao, refreshMilitaryRegistryIfStale };
+    configureSource,
+    dispose,
+    isMilitaryLayerActive,
+    setMilitaryLayerActive,
+    onMilitaryLayerActiveChange,
+    registerMilitaryIcaos,
+    isMilitaryIcao,
+    refreshMilitaryRegistryIfStale,
+  };
 }

src/layers/aircraft/classification.test.mjs

@@ -4,7 +4,11 @@ import { createMilitaryRegistry } from './classification.js';
 
 test('classification instances have independent identities, listeners and active states', () => {
   let requests = 0;
-  const source = { getSnapshot() { requests++; } };
+  const source = {
+    getSnapshot() {
+      requests++;
+    },
+  };
   const first = createMilitaryRegistry({ source });
   const second = createMilitaryRegistry({ source });
   let firstEvents = 0;
@@ -26,9 +30,15 @@ test('classification instances have independent identities, listeners and active
 test('classification uses normalized identities and respects its polling interval and active layer', async () => {
   let time = 120000;
   let calls = 0;
-  const registry = createMilitaryRegistry({ now: () => time, source: {
+  const registry = createMilitaryRegistry({
-    async getSnapshot() { calls++; return { records: [{ id: 'abc123' }] }; },
+    now: () => time,
-  } });
+    source: {
+      async getSnapshot() {
+        calls++;
+        return { records: [{ id: 'abc123' }] };
+      },
+    },
+  });
   await registry.refreshMilitaryRegistryIfStale();
   await registry.refreshMilitaryRegistryIfStale();
   assert.equal(calls, 1);
@@ -48,15 +58,29 @@ test('source replacement rejects an old response and disposal cancels the curren
   let resolveNew;
   let oldSignal;
   let newSignal;
-  const registry = createMilitaryRegistry({ source: {
+  const registry = createMilitaryRegistry({
-    getSnapshot(query, { signal }) { oldSignal = signal; return new Promise((resolve) => { resolveOld = resolve; }); },
+    source: {
-  } });
+      getSnapshot(query, { signal }) {
+        oldSignal = signal;
+        return new Promise((resolve) => {
+          resolveOld = resolve;
+        });
+      },
+    },
+  });
   const old = registry.refreshMilitaryRegistryIfStale();
   const application = new AbortController();
-  registry.configureSource({ getSnapshot(query, { signal }) {
+  registry.configureSource(
+    {
+      getSnapshot(query, { signal }) {
         newSignal = signal;
-    return new Promise((resolve) => { resolveNew = resolve; });
+        return new Promise((resolve) => {
-  } }, { signal: application.signal });
+          resolveNew = resolve;
+        });
+      },
+    },
+    { signal: application.signal },
+  );
   const current = registry.refreshMilitaryRegistryIfStale();
   resolveOld({ records: [{ id: 'abc123' }] });
   await old;
@@ -73,9 +97,15 @@ test('source replacement rejects an old response and disposal cancels the curren
 test('a failed classification source preserves known identities and makes no fallback request', async () => {
   let time = 120000;
   let calls = 0;
-  const registry = createMilitaryRegistry({ now: () => time, source: {
+  const registry = createMilitaryRegistry({
-    async getSnapshot() { calls++; throw new Error('fixture source unavailable'); },
+    now: () => time,
-  } });
+    source: {
+      async getSnapshot() {
+        calls++;
+        throw new Error('fixture source unavailable');
+      },
+    },
+  });
   registry.registerMilitaryIcaos(['abc123']);
   time += 60000;
   await assert.doesNotReject(registry.refreshMilitaryRegistryIfStale());

src/layers/military/controller.js

@@ -1,11 +1,14 @@
-
+export function createController({
-export function createController({ flightState, services, parts, layer, resolveAsset }) {
+  flightState,
-
+  services,
-
+  parts,
-
+  layer,
-function _abortActiveUpdates() {
+  resolveAsset,
-  for (const controller of flightState._activeUpdateControllers) controller.abort();
+}) {
+  function _abortActiveUpdates() {
+    for (const controller of flightState._activeUpdateControllers)
+      controller.abort();
     flightState._activeUpdateControllers.clear();
-}
+  }
-return { _abortActiveUpdates };
+  return { _abortActiveUpdates };
 }

src/layers/military/index.js

@@ -8,21 +8,30 @@ import { createLifecycle } from './lifecycle.js';
 import { createTesting } from './testing.js';
 import { createQueries } from './queries.js';
 /** Compose one military-flight layer with application-owned scene services. */
-export function createMilitaryFlightLayer({ source, services, resolveAsset = (url) => url } = {}) {
+export function createMilitaryFlightLayer({
-const flightState = createFlightState({ source, services });
+  source,
-const parts = {};
+  services,
-const layer = {};
+  resolveAsset = (url) => url,
-const context = { flightState, services, parts, layer, resolveAsset };
+} = {}) {
-parts.rendering = createRendering(context);
+  const flightState = createFlightState({ source, services });
-parts.motion = createMotion(context);
+  const parts = {};
-parts.tracking = createTracking(context);
+  const layer = {};
-parts.controller = createController(context);
+  const context = { flightState, services, parts, layer, resolveAsset };
-parts.ingestion = createIngestion(context);
+  parts.rendering = createRendering(context);
-parts.lifecycle = createLifecycle(context);
+  parts.motion = createMotion(context);
-parts.testing = createTesting(context);
+  parts.tracking = createTracking(context);
-parts.queries = createQueries(context);
+  parts.controller = createController(context);
-Object.assign(layer, parts.queries.methods, parts.lifecycle.methods, parts.ingestion.methods);
+  parts.ingestion = createIngestion(context);
-Object.defineProperty(layer, 'testing', { value: parts.testing });
+  parts.lifecycle = createLifecycle(context);
-return layer;
+  parts.testing = createTesting(context);
+  parts.queries = createQueries(context);
+  Object.assign(
+    layer,
+    parts.queries.methods,
+    parts.lifecycle.methods,
+    parts.ingestion.methods,
+  );
+  Object.defineProperty(layer, 'testing', { value: parts.testing });
+  return layer;
 }
 export { TRACKED_MODEL_MAX_PX } from './policy.js';

src/layers/military/ingestion.js

@@ -2,20 +2,43 @@ import { pickRenderAltitudeM } from '../../data/renderAltitude.js';
 import * as Cesium from 'cesium';
 import { stickyText, stickyNumber } from '../../data/aircraftMeta.js';
 import { classifyAircraft, CLASS_SCALE_2D } from '../../data/aircraftClass.js';
-import { turnRateFromFixHistory, liftRepeatedGroundFix, synthesizeForwardKinematicsFix } from '../../data/motionModel.js';
+import {
+  turnRateFromFixHistory,
+  liftRepeatedGroundFix,
+  synthesizeForwardKinematicsFix,
+} from '../../data/motionModel.js';
 import { aircraftIcon } from '../../data/aircraftIcons.js';
-import { GROUND_FLOOR_WARM_MAX_ALT_M, POSITION_HISTORY_LIMIT, BILLBOARD_SCALE, GROUND_SCALE, TRACKED_ICON_COLOR, MIL_ICON_COLOR, LANDED_MISSING_POLL_LIMIT, MISSING_POLL_LIMIT, ERROR_BACKOFF_INTERVAL } from './policy.js';
+import {
-
+  GROUND_FLOOR_WARM_MAX_ALT_M,
-export function createIngestion({ flightState, services, parts, layer, resolveAsset }) {
+  POSITION_HISTORY_LIMIT,
-const { geoidHeight } = services.geoid;
+  BILLBOARD_SCALE,
-const { floorAltitudeM, cachedGroundFloor, warmGroundFloor, GROUND_FLOOR_LIFT_M } = services.groundFloor;
+  GROUND_SCALE,
-const { sampleMeshFloorCells } = services.meshFloor;
+  TRACKED_ICON_COLOR,
-const { registerMilitaryIcaos } = services.militaryRegistry;
+  MIL_ICON_COLOR,
-const militaryFlightsLayer = layer;
+  LANDED_MISSING_POLL_LIMIT,
-
+  MISSING_POLL_LIMIT,
-const methods = {
+  ERROR_BACKOFF_INTERVAL,
+} from './policy.js';
 
+export function createIngestion({
+  flightState,
+  services,
+  parts,
+  layer,
+  resolveAsset,
+}) {
+  const { geoidHeight } = services.geoid;
+  const {
+    floorAltitudeM,
+    cachedGroundFloor,
+    warmGroundFloor,
+    GROUND_FLOOR_LIFT_M,
+  } = services.groundFloor;
+  const { sampleMeshFloorCells } = services.meshFloor;
+  const { registerMilitaryIcaos } = services.militaryRegistry;
+  const militaryFlightsLayer = layer;
 
+  const methods = {
     /**
      * Fetch the latest military aircraft positions from adsb.lol and reconcile
      * with the billboard collection. Handles error backoff, feed-time-stamped
@@ -44,15 +67,23 @@ const methods = {
         : resourceController.signal;
       try {
         updateSignal.throwIfAborted();
-      const snapshot = await flightState._source.getSnapshot({}, { signal: updateSignal });
+        const snapshot = await flightState._source.getSnapshot(
+          {},
+          { signal: updateSignal },
+        );
         updateSignal.throwIfAborted();
         flightState._lastStatus = snapshot.status ?? 200;
         flightState._lastSource = snapshot.source;
         militaryFlightsLayer.source = flightState._lastSource;
         const usableAircraft = snapshot.records;
-      flightState._backoff = snapshot.stale || snapshot.freshness === 'unknown';
+        flightState._backoff =
+          snapshot.stale || snapshot.freshness === 'unknown';
         flightState._retryAt = 0;
-      flightState._lastError = snapshot.reason || (snapshot.freshness === 'unknown' ? 'Source snapshot time unavailable' : null);
+        flightState._lastError =
+          snapshot.reason ||
+          (snapshot.freshness === 'unknown'
+            ? 'Source snapshot time unavailable'
+            : null);
         const currentIcaos = new Set();
         const receiptNowMs = snapshot.observedAtMs;
         // Field-test fix (RS46): coarse floor cells to warm for the below-ground
@@ -72,9 +103,17 @@ const methods = {
           // altitude (field elevation is unknowable here), else 0 m — never the
           // 3 km airborne default (a parked plane must not float).
           const onGround = aircraft.onGround;
-        const altitudeFt = aircraft.baroAltitudeM == null ? null : aircraft.baroAltitudeM / 0.3048;
+          const altitudeFt =
-        const altitudeM = aircraft.baroAltitudeM
+            aircraft.baroAltitudeM == null
-          ?? (onGround ? (Number.isFinite(prevMeta?.altitudeFt) ? prevMeta.altitudeFt * 0.3048 : 0) : 3048);
+              ? null
+              : aircraft.baroAltitudeM / 0.3048;
+          const altitudeM =
+            aircraft.baroAltitudeM ??
+            (onGround
+              ? Number.isFinite(prevMeta?.altitudeFt)
+                ? prevMeta.altitudeFt * 0.3048
+                : 0
+              : 3048);
           const track = aircraft.courseDeg || 0;
           const speedMps = aircraft.speedMps ?? 0;
           const verticalRateMps = aircraft.verticalRateMps;
@@ -136,7 +175,10 @@ const methods = {
           // their billboard is depth-test-free (see the surfaceM:null block
           // above — same one-shot-invariant reasoning).
           if (!onGround && renderAltitudeM < GROUND_FLOOR_WARM_MAX_ALT_M) {
-          renderAltitudeM = floorAltitudeM(renderAltitudeM, cachedGroundFloor(lat, lon));
+            renderAltitudeM = floorAltitudeM(
+              renderAltitudeM,
+              cachedGroundFloor(lat, lon),
+            );
             _floorWarmPoints.push({ lat, lon });
           } else if (onGround) {
             // Grounded contacts: warm the floor cell, and — round 4 — when NO
@@ -157,9 +199,14 @@ const methods = {
             }
           }
 
-        const position = Cesium.Cartesian3.fromDegrees(lon, lat, renderAltitudeM);
+          const position = Cesium.Cartesian3.fromDegrees(
+            lon,
+            lat,
+            renderAltitudeM,
+          );
           // Landing/takeoff transition: the ground flip restyles IN PLACE.
-        const groundFlipped = !!prevMeta && (prevMeta.onGround === true) !== onGround;
+          const groundFlipped =
+            !!prevMeta && (prevMeta.onGround === true) !== onGround;
           // Either flip direction retires the model's ground snap: a departing plane
           // flies free of it, a landing plane earns a fresh sample where it rolls out.
           if (groundFlipped) flightState._groundSnap.forget(icao24);
@@ -173,7 +220,10 @@ const methods = {
             callsign: stickyText(callsign, prevMeta?.callsign),
             type: stickyType,
             // Type outranks category automatically inside classifyAircraft.
-          klass: classifyAircraft({ typeCode: stickyType, category: aircraft?.category }),
+            klass: classifyAircraft({
+              typeCode: stickyType,
+              category: aircraft?.category,
+            }),
             registration: stickyText(registration, prevMeta?.registration),
             operator: stickyText(operator, prevMeta?.operator),
             altitudeFt: stickyNumber(altitudeFt, prevMeta?.altitudeFt, null),
@@ -186,7 +236,11 @@ const methods = {
             speedMps: stickyNumber(speedMps, prevMeta?.speedMps, null),
             track: stickyNumber(track, prevMeta?.track, null),
             // Analyst seam (additive): sticky like the other kinematics.
-          verticalRateMps: stickyNumber(verticalRateMps, prevMeta?.verticalRateMps, null),
+            verticalRateMps: stickyNumber(
+              verticalRateMps,
+              prevMeta?.verticalRateMps,
+              null,
+            ),
             lastContactEpochMs: stickyNumber(
               aircraft.contactTimeMs,
               prevMeta?.lastContactEpochMs,
@@ -198,7 +252,10 @@ const methods = {
             wasAirborne: prevMeta?.wasAirborne === true || !onGround,
             // Round 6: lifted occlusion-test point for at/below-ellipsoid
             // renders (mirror of flights.js).
-          cullPosition: renderAltitudeM < 10 ? Cesium.Cartesian3.fromDegrees(lon, lat, 12) : null,
+            cullPosition:
+              renderAltitudeM < 10
+                ? Cesium.Cartesian3.fromDegrees(lon, lat, 12)
+                : null,
             // Raw poll-fix coords (pre-dead-reckon) — the stale-grounded
             // re-floor sweep keys floors off these (mirror of flights.js).
             rawLat: lat,
@@ -244,12 +301,13 @@ const methods = {
             // the surface so the ground leg drapes instead of diving.
             if (isTracked) parts.tracking._appendTrailFix(position.clone());
           } else {
-          const modelOwnsGroundVisual = parts.rendering._modelOwnsVisual(icao24);
+            const modelOwnsGroundVisual =
+              parts.rendering._modelOwnsVisual(icao24);
             if (!modelOwnsGroundVisual) {
               liftRepeatedGroundFix(newest, position, meta.onGround);
             }
-          const kinematicsChanged = newest.velocity !== meta.speedMps
+            const kinematicsChanged =
-            || newest.track !== meta.track;
+              newest.velocity !== meta.speedMps || newest.track !== meta.track;
             if (kinematicsChanged) {
               const synthetic = synthesizeForwardKinematicsFix(newest, {
                 epochMs: Date.now(),
@@ -261,7 +319,8 @@ const methods = {
                 history.push(synthetic);
                 if (history.length > POSITION_HISTORY_LIMIT) history.shift();
                 meta.turnRateDps = turnRateFromFixHistory(history);
-              if (isTracked) parts.tracking._appendTrailFix(synthetic.position.clone());
+                if (isTracked)
+                  parts.tracking._appendTrailFix(synthetic.position.clone());
               }
             }
           }
@@ -272,28 +331,39 @@ const methods = {
             // course changes land on the next rotation pass (forced below).
             // Ground flips (landing/takeoff) restyle this SAME billboard in
             // place — the transition is never a removal.
-          if (prevMeta?.klass !== meta.klass || groundFlipped || flightState._cockpitContactMode) {
+            if (
+              prevMeta?.klass !== meta.klass ||
+              groundFlipped ||
+              flightState._cockpitContactMode
+            ) {
               parts.rendering._applyFleetBillboardPresentation(icao24, bb);
             }
             // Per-class GLBs: a class change can mean a different asset OR scale —
             // resync the live model, any in-flight load, and the tracked
             // standalone (mirror of flights.js).
-          if (prevMeta?.klass !== meta.klass) parts.rendering._syncModelToClass(icao24);
+            if (prevMeta?.klass !== meta.klass)
+              parts.rendering._syncModelToClass(icao24);
             // Round 5: depth policy is uniform (always depth-test-free, see
             // _groundDepthDistance) — nothing to flip on landing/takeoff.
           } else {
             const bb = flightState._billboardCollection.add({
               position,
-            image: aircraftIcon(parts.rendering._iconKind(icao24, meta.klass)),
+              image: aircraftIcon(
+                parts.rendering._iconKind(icao24, meta.klass),
+              ),
               width: isTracked ? 24 : 20,
               height: isTracked ? 24 : 20,
-            scale: BILLBOARD_SCALE * (CLASS_SCALE_2D[meta.klass] || 1) * (meta.onGround ? GROUND_SCALE : 1),
+              scale:
+                BILLBOARD_SCALE *
+                (CLASS_SCALE_2D[meta.klass] || 1) *
+                (meta.onGround ? GROUND_SCALE : 1),
               // Screen-projected rotation lands on the next fleet tick.
               rotation: 0,
               alignedAxis: Cesium.Cartesian3.ZERO,
               color: isTracked ? TRACKED_ICON_COLOR : MIL_ICON_COLOR,
               sizeInMeters: false,
-            scaleByDistance: parts.rendering._normalBillboardScaleByDistance(),
+              scaleByDistance:
+                parts.rendering._normalBillboardScaleByDistance(),
               // Grounded/near-surface planes sit at/below the photoreal tile
               // surface — render them depth-test-free so they never vanish up
               // close (_groundDepthDistance).
@@ -308,7 +378,8 @@ const methods = {
           // Takeoff while TRACKED: ground traffic drew no trail, so start one
           // from the fresh airborne history (touchdown needs no action — the
           // append gate above simply freezes the existing trail).
-        if (isTracked && groundFlipped && !meta.onGround) parts.tracking._startTrail(icao24);
+          if (isTracked && groundFlipped && !meta.onGround)
+            parts.tracking._startTrail(icao24);
 
           // If this is the tracked aircraft, update label text
           // (position updates automatically via dead-reckoning CallbackProperty)
@@ -331,17 +402,30 @@ const methods = {
         for (const [icao24, info] of flightState._flightData) {
           if (!info?.onGround || currentIcaos.has(icao24)) continue;
           if (parts.rendering._modelOwnsVisual(icao24)) continue;
-        if (!Number.isFinite(info.rawLat) || !Number.isFinite(info.rawLon)) continue;
+          if (!Number.isFinite(info.rawLat) || !Number.isFinite(info.rawLon))
+            continue;
           const floor = cachedGroundFloor(info.rawLat, info.rawLon);
           if (!Number.isFinite(floor)) continue;
           const lifted = floor + GROUND_FLOOR_LIFT_M;
-        if (Number.isFinite(info.renderAltitudeM) && info.renderAltitudeM >= floor - 1) continue;
+          if (
+            Number.isFinite(info.renderAltitudeM) &&
+            info.renderAltitudeM >= floor - 1
+          )
+            continue;
           info.renderAltitudeM = lifted;
           info.cullPosition = null;
-        const liftedPos = Cesium.Cartesian3.fromDegrees(info.rawLon, info.rawLat, lifted);
+          const liftedPos = Cesium.Cartesian3.fromDegrees(
+            info.rawLon,
+            info.rawLat,
+            lifted,
+          );
           const hist = flightState._positionHistory.get(icao24);
           const newest = hist?.[hist.length - 1];
-        if (newest) newest.position = Cesium.Cartesian3.clone(liftedPos, newest.position);
+          if (newest)
+            newest.position = Cesium.Cartesian3.clone(
+              liftedPos,
+              newest.position,
+            );
           const bbStale = flightState._billboards.get(icao24);
           if (bbStale) bbStale.position = liftedPos;
         }
@@ -349,11 +433,20 @@ const methods = {
         // budget-capped, viewer-proximate, google-3d regime only), excluding
         // this layer's own billboards/models from the probe.
         {
-        const viewerCarto = flightState._viewer?.camera?.positionCartographic || null;
+          const viewerCarto =
+            flightState._viewer?.camera?.positionCartographic || null;
           sampleMeshFloorCells(flightState._viewer?.scene, _floorWarmPoints, {
-          excludeObjects: [...flightState._billboards.values(), ...flightState._models.values(), flightState._trackedModel].filter(Boolean),
+            excludeObjects: [
-          viewerLat: viewerCarto ? Cesium.Math.toDegrees(viewerCarto.latitude) : undefined,
+              ...flightState._billboards.values(),
-          viewerLon: viewerCarto ? Cesium.Math.toDegrees(viewerCarto.longitude) : undefined,
+              ...flightState._models.values(),
+              flightState._trackedModel,
+            ].filter(Boolean),
+            viewerLat: viewerCarto
+              ? Cesium.Math.toDegrees(viewerCarto.latitude)
+              : undefined,
+            viewerLon: viewerCarto
+              ? Cesium.Math.toDegrees(viewerCarto.longitude)
+              : undefined,
           });
         }
 
@@ -366,12 +459,23 @@ const methods = {
         for (const [icao24, bb] of flightState._billboards) {
           if (currentIcaos.has(icao24)) continue;
           // Partial admissions do not prove absence, but stale retention is bounded.
-        if (!snapshot.complete && Date.now() - (flightState._flightData.get(icao24)?.observedReceiptMs ?? 0) < 300000) continue;
+          if (
+            !snapshot.complete &&
+            Date.now() -
+              (flightState._flightData.get(icao24)?.observedReceiptMs ?? 0) <
+              300000
+          )
+            continue;
           const misses = (flightState._missingPolls.get(icao24) || 0) + 1;
-        const limit = parts.queries._likelyLanded(icao24) ? LANDED_MISSING_POLL_LIMIT : MISSING_POLL_LIMIT;
+          const limit = parts.queries._likelyLanded(icao24)
+            ? LANDED_MISSING_POLL_LIMIT
+            : MISSING_POLL_LIMIT;
           if (misses < limit) {
             flightState._missingPolls.set(icao24, misses);
-          if (icao24 === flightState._trackedIcao && flightState._trackedEntity) {
+            if (
+              icao24 === flightState._trackedIcao &&
+              flightState._trackedEntity
+            ) {
               // Honest readout: the tracked plane has no faded billboard (its
               // entity owns the visual), so refresh the label — with icao24 now
               // in _missingPolls, _buildTrackedLabel appends the STALE cue so
@@ -418,22 +522,26 @@ const methods = {
         };
         console.log(`[Data:Military] Updated: ${flightState._count} aircraft`);
         parts.tracking._applyPendingTrackingRestore();
-
       } catch (e) {
         if (updateSignal.aborted || e?.name === 'AbortError') {
           throw new DOMException('Military update aborted', 'AbortError');
         }
         console.warn('[Data:Military] Fetch error:', e);
         flightState._backoff = true;
-      flightState._retryAt = Date.now() + (e?.retryAfterMs ?? ERROR_BACKOFF_INTERVAL);
+        flightState._retryAt =
+          Date.now() + (e?.retryAfterMs ?? ERROR_BACKOFF_INTERVAL);
         flightState._lastStatus = e?.status ?? null;
-      if (e?.source) { flightState._lastSource = e.source; this.source = flightState._lastSource; }
+        if (e?.source) {
-      flightState._lastError = e?.name === 'LiveSourceError' ? e.message : 'Live data unavailable';
+          flightState._lastSource = e.source;
+          this.source = flightState._lastSource;
+        }
+        flightState._lastError =
+          e?.name === 'LiveSourceError' ? e.message : 'Live data unavailable';
       } finally {
         flightState._activeUpdateControllers.delete(resourceController);
       }
-  }
+    },
-};
+  };
 
-return { methods };
+  return { methods };
 }

src/layers/military/lifecycle.js

@@ -1,36 +1,44 @@
 import * as Cesium from 'cesium';
 import { JET_MODEL_URL } from './policy.js';
 
-export function createLifecycle({ flightState, services, parts, layer, resolveAsset }) {
+export function createLifecycle({
-const { clearFocusTarget } = services.focus;
+  flightState,
-const { registerSpriteCollection, restoreSpriteOrder } = services.sprites;
+  services,
-const { holdContinuousRender, releaseContinuousRender } = services.render;
+  parts,
-const { ensureGeoidReady } = services.geoid;
+  layer,
-const { registerPickOwner, unregisterPickOwner } = services.picking;
+  resolveAsset,
-const { setMilitaryLayerActive } = services.militaryRegistry;
+}) {
-
+  const { clearFocusTarget } = services.focus;
-const methods = {
+  const { registerSpriteCollection, restoreSpriteOrder } = services.sprites;
-
+  const { holdContinuousRender, releaseContinuousRender } = services.render;
+  const { ensureGeoidReady } = services.geoid;
+  const { registerPickOwner, unregisterPickOwner } = services.picking;
+  const { setMilitaryLayerActive } = services.militaryRegistry;
 
+  const methods = {
     /** Configure the source before initialization; an active layer keeps its owner. */
     setSource(source) {
-    if (flightState._viewer) throw new Error('Configure the source before layer initialization');
+      if (flightState._viewer)
-    if (typeof source?.getSnapshot !== 'function') throw new TypeError('A snapshot source is required');
+        throw new Error('Configure the source before layer initialization');
+      if (typeof source?.getSnapshot !== 'function')
+        throw new TypeError('A snapshot source is required');
       flightState._source = source;
       flightState._lastSource = source.label || flightState._lastSource;
       this.source = flightState._lastSource;
     },
 
-
     /**
      * Initialize the layer: create the billboard collection, reset all state,
      * and install the click-to-track handler.
      * @param {Cesium.Viewer} viewer - The Cesium viewer instance
      */
     init(viewer) {
-    if (flightState._viewer) throw new Error('Flight layer is already initialized');
+      if (flightState._viewer)
-    if (typeof flightState._source?.getSnapshot !== 'function') throw new TypeError('A snapshot source is required');
+        throw new Error('Flight layer is already initialized');
-    if (flightState.lifetime.signal.aborted) flightState.lifetime = new AbortController();
+      if (typeof flightState._source?.getSnapshot !== 'function')
+        throw new TypeError('A snapshot source is required');
+      if (flightState.lifetime.signal.aborted)
+        flightState.lifetime = new AbortController();
       clearFocusTarget('militaryFlights');
       flightState._viewer = viewer;
       flightState._billboardCollection = new Cesium.BillboardCollection();
@@ -43,12 +51,25 @@ const methods = {
       // destroy/re-init mid-load doesn't flip the flag for a torn-down lifecycle.
       if (!flightState._preloadModel) {
         const epoch = flightState._modelEpoch;
-      Cesium.Model.fromGltfAsync({ url: resolveAsset(JET_MODEL_URL), asynchronous: false })
+        Cesium.Model.fromGltfAsync({
-        .then((m) => {
+          url: resolveAsset(JET_MODEL_URL),
-          if (epoch === flightState._modelEpoch) { flightState._preloadModel = m; flightState._planeModelLoaded = true; }
+          asynchronous: false,
-          else { try { m.destroy(); } catch { /* gone */ } }
         })
-        .catch(() => { /* tracked plane just stays a billboard a beat longer */ });
+          .then((m) => {
+            if (epoch === flightState._modelEpoch) {
+              flightState._preloadModel = m;
+              flightState._planeModelLoaded = true;
+            } else {
+              try {
+                m.destroy();
+              } catch {
+                /* gone */
+              }
+            }
+          })
+          .catch(() => {
+            /* tracked plane just stays a billboard a beat longer */
+          });
       }
       flightState._billboards = new Map();
       flightState._detectionObjects = new Map();
@@ -66,11 +87,16 @@ const methods = {
       parts.tracking._resetTrackedSelectionState();
       flightState._trackedEntity = null;
       flightState._cockpitSubjectId = null;
-    flightState._cockpitContactMode = document.body.classList.contains('cockpit-mode');
+      flightState._cockpitContactMode =
+        document.body.classList.contains('cockpit-mode');
       flightState._cockpitNearContacts = new Set();
       if (!flightState._cockpitModeListener) {
-      flightState._cockpitModeListener = (event) => parts.tracking._applyCockpitState(event?.detail);
+        flightState._cockpitModeListener = (event) =>
-      window.addEventListener('gev:cockpit-mode-changed', flightState._cockpitModeListener);
+          parts.tracking._applyCockpitState(event?.detail);
+        window.addEventListener(
+          'gev:cockpit-mode-changed',
+          flightState._cockpitModeListener,
+        );
       }
 
       parts.tracking._installClickHandler(viewer);
@@ -80,36 +106,50 @@ const methods = {
       console.log('[Data:Military] Initialized with billboard icons');
     },
 
-
     /**
      * Show the layer and re-install the click handler.
      * @param {Cesium.Viewer} viewer - The Cesium viewer instance
      */
     enable(viewer) {
-    if (flightState._billboardCollection) flightState._billboardCollection.show = true;
+      if (flightState._billboardCollection)
+        flightState._billboardCollection.show = true;
       holdContinuousRender('military'); // per-frame animator (perf wave 2)
-    if (flightState._modelCollection) flightState._modelCollection.show = true;
+      if (flightState._modelCollection)
-    parts.tracking._setCockpitContactMode(document.body.classList.contains('cockpit-mode'));
+        flightState._modelCollection.show = true;
+      parts.tracking._setCockpitContactMode(
+        document.body.classList.contains('cockpit-mode'),
+      );
       // Height-datum fix: warm the geoid grid once per layer-enable. The poll loop
       // only reads geoidHeight() synchronously after this resolves (guarded by
       // _geoidReady) — never awaited per-aircraft, never blocking a poll tick.
       if (!flightState._geoidReady) {
         const lifetime = flightState.lifetime;
         ensureGeoidReady()
-        .then(() => { if (!lifetime.signal.aborted) flightState._geoidReady = true; })
+          .then(() => {
-        .catch(() => { /* geoid grid failed to load — baro path stays un-geoid-corrected until retried */ });
+            if (!lifetime.signal.aborted) flightState._geoidReady = true;
+          })
+          .catch(() => {
+            /* geoid grid failed to load — baro path stays un-geoid-corrected until retried */
+          });
       }
       parts.tracking._installClickHandler(viewer);
-    registerPickOwner('military', (pickedId) => flightState._billboards.has(pickedId));
+      registerPickOwner('military', (pickedId) =>
+        flightState._billboards.has(pickedId),
+      );
       // The flights layer suppresses its military duplicates while we render them
       setMilitaryLayerActive(true);
       // Force a fresh rotation pass on the first tick after re-enable
       flightState._lastCamPoseSig = '';
       if (!flightState._preRenderRemove && viewer?.scene) {
-      flightState._preRenderRemove = viewer.scene.preRender.addEventListener(parts.rendering._fleetTick);
+        flightState._preRenderRemove = viewer.scene.preRender.addEventListener(
+          parts.rendering._fleetTick,
+        );
       }
       if (!flightState._trackedModelPreUpdateRemove && viewer?.scene) {
-      flightState._trackedModelPreUpdateRemove = viewer.scene.preUpdate.addEventListener(parts.rendering._updateTrackedModel);
+        flightState._trackedModelPreUpdateRemove =
+          viewer.scene.preUpdate.addEventListener(
+            parts.rendering._updateTrackedModel,
+          );
       }
       if (!flightState._moveEndRemove && viewer?.camera) {
         // Arrival polish (mirror of flights.js — see the comment there): a settled
@@ -117,15 +157,16 @@ const methods = {
         // the pose-signature gate can eat the settle (final easing frames land
         // inside one quantization bucket) and leave stale noses for up to
         // ROTATION_REFRESH_MS. One extra pass per gesture — nothing per-frame.
-      flightState._moveEndRemove = viewer.camera.moveEnd.addEventListener(() => {
+        flightState._moveEndRemove = viewer.camera.moveEnd.addEventListener(
+          () => {
             flightState._lastCamPoseSig = '';
             flightState._lastFleetTickMs = 0;
-      });
+          },
+        );
       }
       restoreSpriteOrder(viewer);
     },
 
-
     /**
      * Hide the layer, clear any active tracking, and remove input handlers
      * so clicks do not get intercepted while the layer is off.
@@ -134,10 +175,12 @@ const methods = {
     disable(viewer) {
       parts.controller._abortActiveUpdates();
       parts.tracking._cancelPendingTrackingRestore();
-    if (flightState._billboardCollection) flightState._billboardCollection.show = false;
+      if (flightState._billboardCollection)
+        flightState._billboardCollection.show = false;
       releaseContinuousRender('military');
       parts.rendering._releaseModels();
-    if (flightState._modelCollection) flightState._modelCollection.show = false;
+      if (flightState._modelCollection)
+        flightState._modelCollection.show = false;
       parts.tracking._clearTracking();
       parts.tracking._destroyTrail();
       // Remove click handler + keydown listener while disabled to avoid
@@ -168,7 +211,6 @@ const methods = {
       }
     },
 
-
     /**
      * Tear down the layer: clear tracking, remove handlers, remove the billboard
      * collection from the scene, and release all state.
@@ -191,7 +233,10 @@ const methods = {
       }
       document.removeEventListener('keydown', parts.tracking._onKeyDown);
       if (flightState._cockpitModeListener) {
-      window.removeEventListener('gev:cockpit-mode-changed', flightState._cockpitModeListener);
+        window.removeEventListener(
+          'gev:cockpit-mode-changed',
+          flightState._cockpitModeListener,
+        );
         flightState._cockpitModeListener = null;
       }
       unregisterPickOwner('military');
@@ -219,7 +264,14 @@ const methods = {
       flightState._modelEpoch += 1; // invalidate any in-flight load from this lifecycle (settles post-destroy)
       flightState._modelPending.clear();
       flightState._modelGen.clear();
-    if (flightState._preloadModel) { try { flightState._preloadModel.destroy(); } catch { /* gone */ } flightState._preloadModel = null; }
+      if (flightState._preloadModel) {
+        try {
+          flightState._preloadModel.destroy();
+        } catch {
+          /* gone */
+        }
+        flightState._preloadModel = null;
+      }
       flightState._planeModelLoaded = false;
       flightState._billboards.clear();
       flightState._detectionObjects.clear();
@@ -242,8 +294,8 @@ const methods = {
       };
       parts.tracking._resetTrackedSelectionState(); // next lifecycle re-evaluates against the ENTER ceiling
       flightState._viewer = null;
-  }
+    },
-};
+  };
 
-return { methods };
+  return { methods };
 }

src/layers/military/motion.js

@@ -1,15 +1,45 @@
 import * as Cesium from 'cesium';
-import { lerpAngleDeg, speedRamp, courseBetweenCartesians, COURSE_HOLD_SPEED_MPS, staleCoastLimitSeconds, arcOffsetEnu, courseSlewCapDps, limitCourseStep } from '../../data/motionModel.js';
+import {
+  lerpAngleDeg,
+  speedRamp,
+  courseBetweenCartesians,
+  COURSE_HOLD_SPEED_MPS,
+  staleCoastLimitSeconds,
+  arcOffsetEnu,
+  courseSlewCapDps,
+  limitCourseStep,
+} from '../../data/motionModel.js';
 import { CLASS_SCALE_2D } from '../../data/aircraftClass.js';
-import { modelVisualAnchor, modelAnchorWorld } from '../../data/modelVisualAnchor.js';
+import {
-import { RENDER_DELAY_SEC, TRACKED_MODEL_MAX_PX, TRACKED_MODEL_MIN_PX, BILLBOARD_SCALE, TRACKED_BILLBOARD_SCALE_BY_DISTANCE, DR_CORRECTION_MS, COURSE_SLEW_DT_MAX_SEC, COURSE_MAX_DPS } from './policy.js';
+  modelVisualAnchor,
+  modelAnchorWorld,
+} from '../../data/modelVisualAnchor.js';
+import {
+  RENDER_DELAY_SEC,
+  TRACKED_MODEL_MAX_PX,
+  TRACKED_MODEL_MIN_PX,
+  BILLBOARD_SCALE,
+  TRACKED_BILLBOARD_SCALE_BY_DISTANCE,
+  DR_CORRECTION_MS,
+  COURSE_SLEW_DT_MAX_SEC,
+  COURSE_MAX_DPS,
+} from './policy.js';
 
-export function createMotion({ flightState, services, parts, layer, resolveAsset }) {
+export function createMotion({
-const { trackedModelScaleForPixelCap } = services.camera;
+  flightState,
-const { nearFarScalarValueAtDistance, clearFocusTarget, publishFocusTargetFromCachedPosition } = services.focus;
+  services,
+  parts,
+  layer,
+  resolveAsset,
+}) {
+  const { trackedModelScaleForPixelCap } = services.camera;
+  const {
+    nearFarScalarValueAtDistance,
+    clearFocusTarget,
+    publishFocusTargetFromCachedPosition,
+  } = services.focus;
 
-
+  /**
-/**
    * Dead-reckon an aircraft's current position using ENU (East-North-Up) frame math.
    *
    * Renders one poll interval behind real time so positions interpolate between
@@ -23,11 +53,13 @@ const { nearFarScalarValueAtDistance, clearFocusTarget, publishFocusTargetFromCa
    * @returns {Cesium.Cartesian3|null} Estimated current ECEF position, or null if no history
    */
 
-function _deadReckon(icao24, result) {
+  function _deadReckon(icao24, result) {
     const history = flightState._positionHistory.get(icao24);
     const info = flightState._flightData.get(icao24);
     if (!history || history.length === 0) {
-    flightState._drCourseDeg = null; flightState._drSpeedMps = null; flightState._drCourseHold = false;
+      flightState._drCourseDeg = null;
+      flightState._drSpeedMps = null;
+      flightState._drCourseHold = false;
       return null;
     }
 
@@ -35,7 +67,9 @@ function _deadReckon(icao24, result) {
     // Render one poll interval behind real time so we interpolate between
     // two KNOWN fixes whenever possible (see RENDER_DELAY_SEC rationale).
     const renderTime = Cesium.JulianDate.addSeconds(
-    Cesium.JulianDate.now(), -RENDER_DELAY_SEC, flightState._scratchRenderTime
+      Cesium.JulianDate.now(),
+      -RENDER_DELAY_SEC,
+      flightState._scratchRenderTime,
     );
 
     // Bracketing pair: interpolate — no extrapolation error, no snap-back.
@@ -47,7 +81,8 @@ function _deadReckon(icao24, result) {
         Cesium.JulianDate.lessThanOrEquals(renderTime, b.time)
       ) {
         const span = Cesium.JulianDate.secondsDifference(b.time, a.time);
-      const t = span > 0
+        const t =
+          span > 0
             ? Cesium.JulianDate.secondsDifference(renderTime, a.time) / span
             : 1.0;
         // Course of the DISPLAYED motion. The chord is only trustworthy when the
@@ -59,14 +94,19 @@ function _deadReckon(icao24, result) {
         // of snapping once per poll. Helicopters always use the reported track
         // (rotorcraft chords are noise-dominated at their typical speeds).
         const chordLenM = Cesium.Cartesian3.distance(a.position, b.position);
-      const segSpeed = span > 0 ? chordLenM / span : ((info && info.speedMps) || 0);
+        const segSpeed =
+          span > 0 ? chordLenM / span : (info && info.speedMps) || 0;
         const fallbackTrack = (info && info.track) || 0;
         const trackFrom = Number.isFinite(a.track) ? a.track : fallbackTrack;
         const trackTo = Number.isFinite(b.track) ? b.track : trackFrom;
         const trackCourse = lerpAngleDeg(trackFrom, trackTo, t);
-      const w = (info && info.klass === 'helicopter') ? 0 : speedRamp(segSpeed);
+        const w = info && info.klass === 'helicopter' ? 0 : speedRamp(segSpeed);
-      const chordCourse = w > 0 ? courseBetweenCartesians(a.position, b.position) : null;
+        const chordCourse =
-      flightState._drCourseDeg = chordCourse != null ? lerpAngleDeg(trackCourse, chordCourse, w) : trackCourse;
+          w > 0 ? courseBetweenCartesians(a.position, b.position) : null;
+        flightState._drCourseDeg =
+          chordCourse != null
+            ? lerpAngleDeg(trackCourse, chordCourse, w)
+            : trackCourse;
         flightState._drSpeedMps = segSpeed;
         flightState._drCourseHold = segSpeed < COURSE_HOLD_SPEED_MPS;
         return Cesium.Cartesian3.lerp(a.position, b.position, t, out);
@@ -74,7 +114,10 @@ function _deadReckon(icao24, result) {
     }
 
     const newest = history[history.length - 1];
-  const elapsedSec = Cesium.JulianDate.secondsDifference(renderTime, newest.time);
+    const elapsedSec = Cesium.JulianDate.secondsDifference(
+      renderTime,
+      newest.time,
+    );
     if (elapsedSec <= 0) {
       // Warm-up: renderTime predates ALL history (freshly seen / just-started-tracking
       // aircraft, before RENDER_DELAY_SEC of history has accumulated, so no bracketing
@@ -84,8 +127,17 @@ function _deadReckon(icao24, result) {
       // the bracketing interpolation above with NO freeze and NO backward snap. (Holding
       // the oldest fix froze the icon until enough history accrued, then jumped.)
       const oldest = history[0];
-    const lookbackSec = Cesium.JulianDate.secondsDifference(oldest.time, renderTime); // ≥ 0
+      const lookbackSec = Cesium.JulianDate.secondsDifference(
-    return _extrapolateFix(oldest, info, -Math.min(lookbackSec, 60), out, (info && info.turnRateDps) || 0);
+        oldest.time,
+        renderTime,
+      ); // ≥ 0
+      return _extrapolateFix(
+        oldest,
+        info,
+        -Math.min(lookbackSec, 60),
+        out,
+        (info && info.turnRateDps) || 0,
+      );
     }
 
     // Continue through fresh adsb.lol contacts even when the position epoch has
@@ -105,10 +157,9 @@ function _deadReckon(icao24, result) {
       out,
       (info && info.turnRateDps) || 0,
     );
-}
+  }
 
-
+  /**
-/**
    * Dead-reckon a fix along its own velocity/track by `dt` seconds, integrating a
    * constant-rate-turn arc when `turnRateDps` is significant (straight line
    * otherwise). Positive `dt` projects FORWARD (after the fix); negative `dt`
@@ -119,9 +170,13 @@ function _deadReckon(icao24, result) {
    * Arc math adapted from skylight (https://github.com/cpaczek/skylight, MIT).
    */
 
-function _extrapolateFix(fix, info, dt, out, turnRateDps = 0) {
+  function _extrapolateFix(fix, info, dt, out, turnRateDps = 0) {
-  const speed = Number.isFinite(fix.velocity) ? fix.velocity : ((info && info.speedMps) || 0);
+    const speed = Number.isFinite(fix.velocity)
-  const heading = Number.isFinite(fix.track) ? fix.track : ((info && info.track) || 0);
+      ? fix.velocity
+      : (info && info.speedMps) || 0;
+    const heading = Number.isFinite(fix.track)
+      ? fix.track
+      : (info && info.track) || 0;
     flightState._drSpeedMps = speed;
     flightState._drCourseHold = speed < COURSE_HOLD_SPEED_MPS;
     if (speed === 0 || dt === 0) {
@@ -132,39 +187,50 @@ function _extrapolateFix(fix, info, dt, out, turnRateDps = 0) {
     // standard-rate turn is ~90° of arc wrong per 30 s if extrapolated straight.
     arcOffsetEnu(speed, heading, turnRateDps, dt, flightState._scratchArc);
     flightState._drCourseDeg = flightState._scratchArc.endCourseDeg;
-  Cesium.Cartesian3.fromElements(flightState._scratchArc.east, flightState._scratchArc.north, 0, flightState._scratchOffset);
+    Cesium.Cartesian3.fromElements(
-  const enu = Cesium.Transforms.eastNorthUpToFixedFrame(fix.position, Cesium.Ellipsoid.WGS84, flightState._scratchEnu);
+      flightState._scratchArc.east,
+      flightState._scratchArc.north,
+      0,
+      flightState._scratchOffset,
+    );
+    const enu = Cesium.Transforms.eastNorthUpToFixedFrame(
+      fix.position,
+      Cesium.Ellipsoid.WGS84,
+      flightState._scratchEnu,
+    );
     return Cesium.Matrix4.multiplyByPoint(enu, flightState._scratchOffset, out);
-}
+  }
 
-
+  /**
-/**
    * True while the tracked aircraft's delayed display time (now − RENDER_DELAY_SEC)
    * predates its oldest real fix — _deadReckon is extrapolating backward with no real
    * history yet behind the displayed icon, so the trail must draw nothing.
    * @returns {boolean}
    */
 
-function _isTrackWarmingUp() {
+  function _isTrackWarmingUp() {
     if (!flightState._trackedIcao) return false;
     const history = flightState._positionHistory.get(flightState._trackedIcao);
     if (!history || history.length === 0) return true;
     const renderTime = Cesium.JulianDate.addSeconds(
-    Cesium.JulianDate.now(), -RENDER_DELAY_SEC, flightState._scratchWarmupTime
+      Cesium.JulianDate.now(),
+      -RENDER_DELAY_SEC,
+      flightState._scratchWarmupTime,
     );
     return Cesium.JulianDate.lessThan(renderTime, history[0].time);
-}
+  }
 
+  /** Resolve the selected aircraft's actual rendered square extent this frame. */
 
-/** Resolve the selected aircraft's actual rendered square extent this frame. */
+  function _trackedFocusSizePx(icao24, position) {
-
-function _trackedFocusSizePx(icao24, position) {
     const camera = flightState._viewer?.camera;
     const scene = flightState._viewer?.scene;
     if (!camera?.positionWC || !position || !scene) return 28;
     const rangeM = Cesium.Cartesian3.distance(camera.positionWC, position);
     if (parts.rendering._modelOwnsVisual(icao24)) {
-    const spec = parts.rendering._modelSpec(flightState._flightData.get(icao24)?.klass);
+      const spec = parts.rendering._modelSpec(
+        flightState._flightData.get(icao24)?.klass,
+      );
       const scale = trackedModelScaleForPixelCap({
         baseScale: spec.scale,
         nativeRadiusM: spec.nativeRadiusM,
@@ -173,25 +239,32 @@ function _trackedFocusSizePx(icao24, position) {
         fovyRad: camera.frustum.fovy,
         maximumPixelSize: TRACKED_MODEL_MAX_PX,
       });
-    const focalLengthPx = scene.canvas.clientHeight / (2 * Math.tan(camera.frustum.fovy / 2));
+      const focalLengthPx =
-    const projectedDiameterPx = (2 * spec.nativeRadiusM * scale * focalLengthPx) / rangeM;
+        scene.canvas.clientHeight / (2 * Math.tan(camera.frustum.fovy / 2));
-    return Math.max(TRACKED_MODEL_MIN_PX, Math.min(TRACKED_MODEL_MAX_PX, projectedDiameterPx));
+      const projectedDiameterPx =
+        (2 * spec.nativeRadiusM * scale * focalLengthPx) / rangeM;
+      return Math.max(
+        TRACKED_MODEL_MIN_PX,
+        Math.min(TRACKED_MODEL_MAX_PX, projectedDiameterPx),
+      );
     }
 
     const billboard = flightState._trackedEntity?.billboard;
     const time = flightState._viewer.clock.currentTime;
     const width = billboard?.width?.getValue(time) ?? 28;
     const height = billboard?.height?.getValue(time) ?? 28;
-  const scale = billboard?.scale?.getValue(time)
+    const scale =
-    ?? (BILLBOARD_SCALE * (CLASS_SCALE_2D[flightState._flightData.get(icao24)?.klass] || 1));
+      billboard?.scale?.getValue(time) ??
-  const scaleByDistance = billboard?.scaleByDistance?.getValue(time)
+      BILLBOARD_SCALE *
-    ?? TRACKED_BILLBOARD_SCALE_BY_DISTANCE;
+        (CLASS_SCALE_2D[flightState._flightData.get(icao24)?.klass] || 1);
+    const scaleByDistance =
+      billboard?.scaleByDistance?.getValue(time) ??
+      TRACKED_BILLBOARD_SCALE_BY_DISTANCE;
     const distanceScale = nearFarScalarValueAtDistance(scaleByDistance, rangeM);
     return Math.max(width, height) * scale * distanceScale;
-}
+  }
 
-
+  /**
-/**
    * Per-frame-cached, discontinuity-smoothed tracked DISPLAY position. Cached by Cesium
    * frame number so the position / rotation / trail-head callbacks share ONE computation
    * (and one reconciliation-state update) per frame. Returns a stable module holder, or
@@ -200,13 +273,18 @@ function _trackedFocusSizePx(icao24, position) {
    * @returns {Cesium.Cartesian3|null}
    */
 
-function _trackedDisplayPosition(icao24) {
+  function _trackedDisplayPosition(icao24) {
     const frame = flightState._viewer?.scene?.frameState?.frameNumber ?? -1;
-  if (frame === flightState._cachedDRFrame && icao24 === flightState._drReconcileIcao) return flightState._cachedDRPosition;
+    if (
+      frame === flightState._cachedDRFrame &&
+      icao24 === flightState._drReconcileIcao
+    )
+      return flightState._cachedDRPosition;
 
     // Does the reconciliation state belong to THIS aircraft? (Capture before overwriting
     // _drReconcileIcao, so a track switch doesn't inherit the old plane's _drPrevRaw.)
-  const sameTrack = flightState._drReconcileValid && flightState._drReconcileIcao === icao24;
+    const sameTrack =
+      flightState._drReconcileValid && flightState._drReconcileIcao === icao24;
     const raw = _deadReckon(icao24, flightState._scratchDrRaw);
     flightState._cachedDRCourse = flightState._drCourseDeg;
     flightState._cachedDRSpeedMps = flightState._drSpeedMps;
@@ -229,7 +307,11 @@ function _trackedDisplayPosition(icao24) {
       const plausible = speed * dtSec * 4 + 25;
       if (Cesium.Cartesian3.distance(raw, flightState._drPrevRaw) > plausible) {
         // Discontinuity — re-anchor so the DISPLAYED position stays continuous, then decay.
-      Cesium.Cartesian3.subtract(flightState._drPrevDisplay, raw, flightState._drCorrection);
+        Cesium.Cartesian3.subtract(
+          flightState._drPrevDisplay,
+          raw,
+          flightState._drCorrection,
+        );
         flightState._drCorrectionStartMs = nowMs;
       }
     } else {
@@ -238,8 +320,13 @@ function _trackedDisplayPosition(icao24) {
     }
 
     const elapsed = nowMs - flightState._drCorrectionStartMs;
-  const factor = elapsed >= DR_CORRECTION_MS ? 0 : 1 - elapsed / DR_CORRECTION_MS;
+    const factor =
-  const display = Cesium.Cartesian3.multiplyByScalar(flightState._drCorrection, factor, flightState._trackedPosHolder);
+      elapsed >= DR_CORRECTION_MS ? 0 : 1 - elapsed / DR_CORRECTION_MS;
+    const display = Cesium.Cartesian3.multiplyByScalar(
+      flightState._drCorrection,
+      factor,
+      flightState._trackedPosHolder,
+    );
     Cesium.Cartesian3.add(raw, display, display);
 
     Cesium.Cartesian3.clone(raw, flightState._drPrevRaw);
@@ -247,7 +334,10 @@ function _trackedDisplayPosition(icao24) {
     flightState._drPrevMs = nowMs;
     flightState._drReconcileValid = true;
     flightState._cachedDRPosition = display;
-  const focusSizePx = _trackedFocusSizePx(icao24, flightState._cachedDRPosition);
+    const focusSizePx = _trackedFocusSizePx(
+      icao24,
+      flightState._cachedDRPosition,
+    );
     // Publish the exact frame cache shared by entity + follow camera. A second
     // DR sample here would advance reconciliation in a different frame phase
     // and visibly jitter the focus rectangle against the tracked aircraft.
@@ -261,20 +351,21 @@ function _trackedDisplayPosition(icao24) {
       heightPx: focusSizePx,
     });
     return display;
-}
+  }
 
-
+  /** The tracked plane's display position WITHOUT recomputing — the value the follow-camera already
-/** The tracked plane's display position WITHOUT recomputing — the value the follow-camera already
    *  settled on this frame. Mirror of flights.js: getDetectableObjects + the readout run in postRender at
    *  a later frameNumber, so recomputing _trackedDisplayPosition there jitters the label against the
    *  now-stable plane. Null when no valid fix (callers fall back to the billboard position). */
 
-function _trackedDisplayCached() {
+  function _trackedDisplayCached() {
-  return (flightState._drReconcileValid && flightState._drReconcileIcao === flightState._trackedIcao) ? flightState._cachedDRPosition : null;
+    return flightState._drReconcileValid &&
-}
+      flightState._drReconcileIcao === flightState._trackedIcao
+      ? flightState._cachedDRPosition
+      : null;
+  }
 
-
+  /**
-/**
    * The position the tracked aircraft is VISUALLY at this frame — the translation its 3D
    * model is actually rendering with when the model owns the visual, otherwise the cached
    * dead-reckoned position. Mirror of flights.js; see that copy for the full rationale.
@@ -283,61 +374,87 @@ function _trackedDisplayCached() {
    * follow-camera anti-jitter contract untouched.
    */
 
-function _trackedVisualCached() {
+  function _trackedVisualCached() {
-  if (flightState._trackedIcao && parts.rendering._modelOwnsVisual(flightState._trackedIcao)) {
+    if (
-    const spec = parts.rendering._modelSpec(flightState._flightData.get(flightState._trackedIcao)?.klass);
+      flightState._trackedIcao &&
+      parts.rendering._modelOwnsVisual(flightState._trackedIcao)
+    ) {
+      const spec = parts.rendering._modelSpec(
+        flightState._flightData.get(flightState._trackedIcao)?.klass,
+      );
       return modelVisualAnchor(
         flightState._trackedModel.modelMatrix,
         spec.visualCenterNative,
-      Number.isFinite(flightState._trackedModel.computedScale) ? flightState._trackedModel.computedScale : spec.scale,
+        Number.isFinite(flightState._trackedModel.computedScale)
+          ? flightState._trackedModel.computedScale
+          : spec.scale,
         flightState._trackedVisualPos,
       );
     }
     return _trackedDisplayCached();
-}
+  }
 
-
+  /** The tracked model's rendered bounding radius (m), or 0 when no model of this
-/** The tracked model's rendered bounding radius (m), or 0 when no model of this
    *  contact is drawing. Carries Cesium's effective `computedScale`, which may be
    *  above `scale` to satisfy minimumPixelSize — the trail head has to be judged
    *  against the size the operator SEES, not the nominal one. */
-/** World-space origin of the tracked model, or null when no model of this
+  /** World-space origin of the tracked model, or null when no model of this
    *  contact is drawing. This is the centre the rendered bounding sphere is
    *  measured from, so the trail clip and the envelope agree on one frame. */
 
-function _trackedModelCenterWorld() {
+  function _trackedModelCenterWorld() {
-  if (!flightState._trackedIcao || !flightState._trackedModel || !parts.rendering._modelOwnsVisual(flightState._trackedIcao)) return null;
+    if (
-  return Cesium.Matrix4.getTranslation(flightState._trackedModel.modelMatrix, flightState._scratchTrailClip);
+      !flightState._trackedIcao ||
-}
+      !flightState._trackedModel ||
+      !parts.rendering._modelOwnsVisual(flightState._trackedIcao)
+    )
+      return null;
+    return Cesium.Matrix4.getTranslation(
+      flightState._trackedModel.modelMatrix,
+      flightState._scratchTrailClip,
+    );
+  }
 
-
+  function _trackedModelEnvelopeM() {
-
+    if (
-function _trackedModelEnvelopeM() {
+      !flightState._trackedIcao ||
-  if (!flightState._trackedIcao || !flightState._trackedModel || !parts.rendering._modelOwnsVisual(flightState._trackedIcao)) return 0;
+      !flightState._trackedModel ||
-  const spec = parts.rendering._modelSpec(flightState._flightData.get(flightState._trackedIcao)?.klass);
+      !parts.rendering._modelOwnsVisual(flightState._trackedIcao)
+    )
+      return 0;
+    const spec = parts.rendering._modelSpec(
+      flightState._flightData.get(flightState._trackedIcao)?.klass,
+    );
     const scale = Number.isFinite(flightState._trackedModel.computedScale)
       ? flightState._trackedModel.computedScale
       : spec.scale;
     return spec.nativeRadiusM * scale;
-}
+  }
 
-
+  /** Trail endpoint for the rendered tracked owner. Brackets/readouts stay on
-/** Trail endpoint for the rendered tracked owner. Brackets/readouts stay on
    * the visual centre; only the trail moves to the model's aft-belly hardpoint. */
 
-function _trackedTrailCached() {
+  function _trackedTrailCached() {
-  if (flightState._trackedIcao && parts.rendering._modelOwnsVisual(flightState._trackedIcao)) {
+    if (
-    const spec = parts.rendering._modelSpec(flightState._flightData.get(flightState._trackedIcao)?.klass);
+      flightState._trackedIcao &&
+      parts.rendering._modelOwnsVisual(flightState._trackedIcao)
+    ) {
+      const spec = parts.rendering._modelSpec(
+        flightState._flightData.get(flightState._trackedIcao)?.klass,
+      );
       // Through the model's OWN render chain (modelVisualAnchor's hand-rolled
       // half-correction put this offset on the lateral axis — see
       // modelAnchorWorld).
-    return modelAnchorWorld(flightState._trackedModel, spec.trailAnchorNative, flightState._trackedTrailPos);
+      return modelAnchorWorld(
+        flightState._trackedModel,
+        spec.trailAnchorNative,
+        flightState._trackedTrailPos,
+      );
     }
     return _trackedDisplayCached();
-}
+  }
 
-
+  /** Smoothed world course for the tracked aircraft this frame. Reads the
-/** Smoothed world course for the tracked aircraft this frame. Reads the
    *  frame-cached course (set by _trackedDisplayPosition — the follow-camera's
    *  own computation), NEVER re-runs _deadReckon. Safe to call more than once
    *  per frame: the second call sees dt≈0 and the limiter is a no-op.
@@ -348,33 +465,43 @@ function _trackedTrailCached() {
    *  whatever nose this path last wrote — tracked and fleet consumers of the
    *  same aircraft can never disagree across the handoff (mirror of flights.js). */
 
-function _trackedDisplayCourse() {
+  function _trackedDisplayCourse() {
     const info = flightState._flightData.get(flightState._trackedIcao);
     const fallback = (info && info.track) || 0;
-  const cacheValid = flightState._drReconcileValid && flightState._drReconcileIcao === flightState._trackedIcao && flightState._cachedDRCourse != null;
+    const cacheValid =
+      flightState._drReconcileValid &&
+      flightState._drReconcileIcao === flightState._trackedIcao &&
+      flightState._cachedDRCourse != null;
     const raw = cacheValid ? flightState._cachedDRCourse : fallback;
     const nowMs = Date.now();
     const dt = flightState._trackedCourseMs
-    ? Math.min(COURSE_SLEW_DT_MAX_SEC, (nowMs - flightState._trackedCourseMs) / 1000)
+      ? Math.min(
+          COURSE_SLEW_DT_MAX_SEC,
+          (nowMs - flightState._trackedCourseMs) / 1000,
+        )
       : 0;
     flightState._trackedCourseMs = nowMs;
     const prev = flightState._displayCourse.get(flightState._trackedIcao);
     // Hover hold: at near-zero displayed speed both the chord and the reported
     // track are noise — keep the last stable nose direction instead of chasing.
     if (cacheValid && flightState._cachedDRHold && prev != null) return prev;
-  const cap = courseSlewCapDps(cacheValid ? flightState._cachedDRSpeedMps : ((info && info.speedMps) ?? NaN), COURSE_MAX_DPS);
+    const cap = courseSlewCapDps(
+      cacheValid
+        ? flightState._cachedDRSpeedMps
+        : ((info && info.speedMps) ?? NaN),
+      COURSE_MAX_DPS,
+    );
     const course = limitCourseStep(prev, raw, cap, dt);
     flightState._displayCourse.set(flightState._trackedIcao, course);
     return course;
-}
+  }
 
-
+  /** Reset reconciliation + per-frame cache when tracking stops or switches
-/** Reset reconciliation + per-frame cache when tracking stops or switches
    *  target. Deliberately does NOT touch _displayCourse: the smoothed course
    *  entry belongs to the AIRCRAFT (not to the tracked session) and must
    *  survive the handoff back to the fleet pass. */
 
-function _resetTrackedDisplay() {
+  function _resetTrackedDisplay() {
     flightState._drReconcileValid = false;
     flightState._drReconcileIcao = null;
     flightState._cachedDRFrame = -1;
@@ -383,6 +510,19 @@ function _resetTrackedDisplay() {
     flightState._cachedDRSpeedMps = null;
     flightState._cachedDRHold = false;
     flightState._trackedCourseMs = 0;
-}
+  }
-return { _deadReckon, _extrapolateFix, _isTrackWarmingUp, _trackedFocusSizePx, _trackedDisplayPosition, _trackedDisplayCached, _trackedVisualCached, _trackedModelCenterWorld, _trackedModelEnvelopeM, _trackedTrailCached, _trackedDisplayCourse, _resetTrackedDisplay };
+  return {
+    _deadReckon,
+    _extrapolateFix,
+    _isTrackWarmingUp,
+    _trackedFocusSizePx,
+    _trackedDisplayPosition,
+    _trackedDisplayCached,
+    _trackedVisualCached,
+    _trackedModelCenterWorld,
+    _trackedModelEnvelopeM,
+    _trackedTrailCached,
+    _trackedDisplayCourse,
+    _resetTrackedDisplay,
+  };
 }

src/layers/military/ownership.test.mjs

@@ -4,24 +4,51 @@ import { createMilitaryFlightLayer } from './index.js';
 import { createFlightState } from './state.js';
 
 function services() {
-  const names = ['picking', 'sprites', 'trails', 'aircraftPresentation', 'camera',
+  const names = [
-    'militaryRegistry', 'labels', 'groundFloor', 'meshFloor', 'geoid', 'focus',
+    'picking',
-    'readout', 'context', 'render', 'recession'];
+    'sprites',
-  return { ...Object.fromEntries(names.map((name) => [name, {}])),
+    'trails',
-    groundSnap: { createGroundSnap: () => ({ clear() {} }) } };
+    'aircraftPresentation',
+    'camera',
+    'militaryRegistry',
+    'labels',
+    'groundFloor',
+    'meshFloor',
+    'geoid',
+    'focus',
+    'readout',
+    'context',
+    'render',
+    'recession',
+  ];
+  return {
+    ...Object.fromEntries(names.map((name) => [name, {}])),
+    groundSnap: { createGroundSnap: () => ({ clear() {} }) },
+  };
 }
 
 test('military layer instances isolate policy and restoration state without requesting a source', async () => {
   let requests = 0;
-  const source = { label: 'Fixture aircraft', getSnapshot() { requests++; } };
+  const source = {
+    label: 'Fixture aircraft',
+    getSnapshot() {
+      requests++;
+    },
+  };
   const first = createMilitaryFlightLayer({ source, services: services() });
   const second = createMilitaryFlightLayer({ source, services: services() });
   first.setParams({ models3dMode: 'all' });
   assert.equal(first.getParams().models3dMode, 'all');
   assert.equal(second.getParams().models3dMode, 'proximity');
   first.testing._setMilitaryTrackingRefreshOutcomeForTest({ ids: [] });
-  assert.equal((await first.resolveTrackingRestoreTarget('abc123')).status, 'missing');
+  assert.equal(
-  assert.equal((await second.resolveTrackingRestoreTarget('abc123')).status, 'source-unavailable');
+    (await first.resolveTrackingRestoreTarget('abc123')).status,
+    'missing',
+  );
+  assert.equal(
+    (await second.resolveTrackingRestoreTarget('abc123')).status,
+    'source-unavailable',
+  );
   assert.equal(requests, 0);
 });
 
@@ -33,8 +60,16 @@ test('military source omission fails before viewer initialization', () => {
 test('military state owns separate contact maps, motion scratch and ground sampling', () => {
   const first = createFlightState({ services: services() });
   const second = createFlightState({ services: services() });
-  for (const key of ['_flightData', '_billboards', '_positionHistory', '_groundSnap',
+  for (const key of [
-    '_scratchCarto', '_models', '_activeUpdateControllers', 'lifetime']) {
+    '_flightData',
+    '_billboards',
+    '_positionHistory',
+    '_groundSnap',
+    '_scratchCarto',
+    '_models',
+    '_activeUpdateControllers',
+    'lifetime',
+  ]) {
     assert.notEqual(first[key], second[key], key);
   }
 });
@@ -45,12 +80,23 @@ test('a normalized source can retain its stale reason without changing standalon
   supplied.groundFloor.warmGroundFloor = async () => {};
   supplied.meshFloor.sampleMeshFloorCells = () => {};
   supplied.militaryRegistry.registerMilitaryIcaos = () => {};
-  const layer = createMilitaryFlightLayer({ services: supplied, source: {
+  const layer = createMilitaryFlightLayer({
-    label: 'Fixture aircraft', async getSnapshot() { return {
+    services: supplied,
-      source: 'Fixture aircraft', records: [], complete: true,
+    source: {
-      observedAtMs: 123000, stale: true, freshness: 'stale', reason,
+      label: 'Fixture aircraft',
-    }; },
+      async getSnapshot() {
-  } });
+        return {
+          source: 'Fixture aircraft',
+          records: [],
+          complete: true,
+          observedAtMs: 123000,
+          stale: true,
+          freshness: 'stale',
+          reason,
+        };
+      },
+    },
+  });
   await layer.update({});
   assert.equal(layer.getStats().error, reason);
   assert.equal(layer.getStats().lastUpdate, 123000);

src/layers/military/policy.js

@@ -1,6 +1,5 @@
 import * as Cesium from 'cesium';
 
-
 /**
  * @module militaryFlights
  * @description Real-time military flight tracking layer powered by the adsb.lol API.
@@ -30,7 +29,6 @@ export const POSITION_HISTORY_LIMIT = 5;
 
 export const BILLBOARD_SCALE = 0.7;
 
-
 /** @constant {Cesium.Color} Default amber tint for untracked military billboards */
 
 export const MIL_ICON_COLOR = Cesium.Color.fromCssColorString('#FFB800');
@@ -39,7 +37,6 @@ export const MIL_ICON_COLOR = Cesium.Color.fromCssColorString('#FFB800');
 
 export const TRACKED_ICON_COLOR = Cesium.Color.fromCssColorString('#FFD166');
 
-
 // --- Ground traffic (owner reversal 2026-07-03; mirror of flights.js) ---------------
 // adsb.lol/readsb flags ground traffic with alt_baro === "ground" (no separate
 // boolean). Such aircraft are RENDERED instead of floating at the 3 km altitude
@@ -58,7 +55,6 @@ export const TRACKED_ICON_COLOR = Cesium.Color.fromCssColorString('#FFD166');
 
 export const GROUND_SCALE = 0.8;
 
-
 // --- 3D model rendering (mirrors flights.js) -----------------------------------------
 // When enabled, military aircraft render as 3D glTF jet models once the camera is below
 // MODEL_ALT_CEIL_M (zoomed in); higher up they stay flat billboards. Eligibility is
@@ -69,18 +65,17 @@ export const GROUND_SCALE = 0.8;
 
 export const JET_MODEL_URL = '/models/jet.glb';
 
-
 export const MODEL_ALT_CEIL_M = 800000;
- // m: below this camera altitude, draw 3D models (raised so it's easy to trigger)
+// m: below this camera altitude, draw 3D models (raised so it's easy to trigger)
 
 export const MODEL_MIN_PX = 24;
-        // floor so distant models stay visible without ballooning into a min-pixel blob (mirror of flights.js, whose models now share this layer's ~30 m world size)
+// floor so distant models stay visible without ballooning into a min-pixel blob (mirror of flights.js, whose models now share this layer's ~30 m world size)
 
 export const TRACKED_MODEL_MIN_PX = 40;
- // keep the glTF silhouette comparable to the selected 2D glyph at handoff
+// keep the glTF silhouette comparable to the selected 2D glyph at handoff
 
 export const TRACKED_MODEL_MAX_PX = 200;
- // owner-selected close-range tracked-target feel
+// owner-selected close-range tracked-target feel
 
 export const MODEL_NATIVE_RADIUS_M = 29.83;
 
@@ -97,32 +92,32 @@ export const MODEL_SCALE = 1;
 // and All aren't identical when few planes are in range; on-screen planes win the cap (see flights.js).
 
 export const MODEL_MAX = 150;
-          // 'proximity' cap
+// 'proximity' cap
 
 export const MODEL_MAX_ALL = 350;
-      // 'all' cap
+// 'all' cap
 
 export const MODEL_PROX_ADD_M = 150000;
-  // proximity: model NEW planes within 150 km
+// proximity: model NEW planes within 150 km
 
 export const MODEL_PROX_KEEP_M = 185000;
-  // proximity: KEEP modeled planes out to 185 km
+// proximity: KEEP modeled planes out to 185 km
 
 // Cockpit keeps the standard Display radii but lowers the GLB budget. Contacts
 // inside the selected band remain AIR silhouettes when they cannot own a model;
 // contacts outside the band use compact dots.
 
 export const COCKPIT_MODEL_MAX = 60;
-         // max concurrent GLBs in cockpit (never raises the map cap)
+// max concurrent GLBs in cockpit (never raises the map cap)
 
 export const MODEL_ALL_ADD_M = 400000;
-  // all: model NEW planes within 400 km (~to the horizon)
+// all: model NEW planes within 400 km (~to the horizon)
 
 export const MODEL_ALL_KEEP_M = 450000;
-  // all: KEEP modeled planes out to 450 km
+// all: KEEP modeled planes out to 450 km
 
 export const MODEL_HEADING_OFFSET_DEG = 180;
- // every aircraft GLB is exported nose -X in the shared transform-applied convention
+// every aircraft GLB is exported nose -X in the shared transform-applied convention
 // Preserve the layer's amber identity while reducing approved texture/livery
 // contribution to a weak diffuse hint, matching civilian launch presentation.
 
@@ -134,13 +129,10 @@ export const MODEL_COLOR_BLEND_AMOUNT = 0.94;
 
 export const PLANE_MODEL_URL = '/models/airplane.glb';
 
-
 export const PLANE_MODEL_SCALE = 1;
 
-
 export const PLANE_NATIVE_RADIUS_M = 34.41;
 
-
 export const PLANE_BELLY_OFFSET_NATIVE = 6.719;
 
 // Grounded-model belly offset: jet.glb's centred origin sits 5.631 native units (= meters — this
@@ -156,16 +148,15 @@ export const MODEL_BELLY_OFFSET_NATIVE = 5.631;
 
 export const AMBER_TRANSPARENT = MIL_ICON_COLOR.withAlpha(0);
 
-
-
 export const COCKPIT_CONTACT_SIZE_PX = 6;
 
-
 export const TRACKED_BILLBOARD_SCALE_BY_DISTANCE = new Cesium.NearFarScalar(
-  1000, 3.0, 8000000, 0.5,
+  1000,
+  3.0,
+  8000000,
+  0.5,
 );
 
-
 // ---------------------------------------------------------------------------
 // Track-history trail state (PRD WS-F F2/F4): a fading polyline behind the
 // tracked aircraft. The accumulation array is intentionally SEPARATE from
@@ -181,7 +172,6 @@ export const TRAIL_COLOR = '#FFB800';
 
 export const TRAIL_MAX_POINTS = 400;
 
-
 // ---------------------------------------------------------------------------
 // Render-behind smoothing (mirrors flights.js): the fleet renders at
 // now - RENDER_DELAY_SEC so positions interpolate BETWEEN two known fixes
@@ -229,7 +219,6 @@ export const LANDED_MISSING_POLL_LIMIT = 1;
 
 export const GROUND_FLOOR_WARM_MAX_ALT_M = 4500;
 
-
 // ---------------------------------------------------------------------------
 // Nadir-stable icon orientation (mirrors flights.js): surface-normal alignment
 // degenerates when the camera looks straight down (the normal is parallel to
@@ -258,7 +247,6 @@ export const COURSE_MAX_DPS = 60;
 
 export const COURSE_SLEW_DT_MAX_SEC = 0.25;
 
-
 // -- Tracked-display reconciliation (see flights.js for the rationale): absorb a raw
 // position step (warm-up→interpolation handoff, feed glitch, backfill splice) into a
 // correction offset that decays to zero over DR_CORRECTION_MS, so the tracked icon,
@@ -266,7 +254,6 @@ export const COURSE_SLEW_DT_MAX_SEC = 0.25;
 
 export const DR_CORRECTION_MS = 900;
 
-
 /** Bounded on-demand loading for the tracked model (mirror of flights.js). The
  *  tracked regime is DEFAULT-ON and its driver runs every `scene.preUpdate`, so
  *  a missing or corrupt GLB — or a dead network — would otherwise spin
@@ -279,7 +266,6 @@ export const DR_CORRECTION_MS = 900;
 
 export const TRACKED_MODEL_MAX_LOAD_FAILS = 3;
 
-
 export const TRACKED_MODEL_RETRY_BACKOFF_MS = 1500;
 
 /** Boost flip = BATCHED release through the fleet tick (mirror of flights.js —

src/layers/military/queries.js

@@ -3,56 +3,62 @@ import * as Cesium from 'cesium';
 import { isExplicitLayerStateOrigin } from '../../data/layerState.js';
 import { aircraftIncludedInNearby } from '../../data/aircraftNearbyPolicy.js';
 import { modelVisualAnchor } from '../../data/modelVisualAnchor.js';
-import { rankContactMatch, contactMatchWins, CONTACT_MATCH_TIER } from '../../data/contactMatch.js';
+import {
+  rankContactMatch,
+  contactMatchWins,
+  CONTACT_MATCH_TIER,
+} from '../../data/contactMatch.js';
 import { LANDED_ALT_MAX_FT, LANDED_SPEED_MAX_MPS } from './policy.js';
 
-export function createQueries({ flightState, services, parts, layer, resolveAsset }) {
+export function createQueries({
-const { tr3bAircraftClass, tr3bTypeLabel } = services.aircraftPresentation;
+  flightState,
-const { formatFlightLevel } = services.labels;
+  services,
-const { applyTrackedCameraFrame } = services.camera;
+  parts,
+  layer,
+  resolveAsset,
+}) {
+  const { tr3bAircraftClass, tr3bTypeLabel } = services.aircraftPresentation;
+  const { formatFlightLevel } = services.labels;
+  const { applyTrackedCameraFrame } = services.camera;
 
-
+  /**
-/**
    * Coerce a value to a finite number, returning null if not possible.
    * Handles both numeric and string inputs (e.g. API fields that may arrive as strings).
    * @param {*} value - Raw value from the API response
    * @returns {number|null} Finite number or null
    */
 
-function _toFiniteNumber(value) {
+  function _toFiniteNumber(value) {
     if (typeof value === 'number' && Number.isFinite(value)) return value;
     if (typeof value === 'string') {
       const n = Number.parseFloat(value.trim());
       return Number.isFinite(n) ? n : null;
     }
     return null;
-}
+  }
 
-
+  /**
-/**
    * Safely convert a value to a trimmed string, defaulting to '' for falsy inputs.
    * @param {*} value - Raw value to stringify
    * @returns {string} Trimmed string
    */
 
-function _toCleanText(value) {
+  function _toCleanText(value) {
     return String(value || '').trim();
-}
+  }
 
-
+  /**
-/**
    * Format an altitude value in feet for display, with fallback text.
    * @param {number|null|undefined} altitudeFt - Barometric altitude in feet
    * @returns {string} Formatted altitude string (e.g. "35000 ft" or "Alt unknown")
    */
 
-function _formatAltitude(altitudeFt) {
+  function _formatAltitude(altitudeFt) {
     if (!Number.isFinite(altitudeFt)) return 'Alt unknown';
     return `${Math.round(altitudeFt)} ft`;
-}
+  }
 
-
+  /**
-/**
    * True when the aircraft's latest metadata reads "on or about the runway"
    * (low + slow) — see the landed fast-cull rationale above. Both gates must
    * hold, so a plane missing either datum keeps the normal grace.
@@ -60,7 +66,7 @@ function _formatAltitude(altitudeFt) {
    * @returns {boolean}
    */
 
-function _likelyLanded(icao24) {
+  function _likelyLanded(icao24) {
     const info = flightState._flightData.get(icao24);
     if (!info) return false;
     // Round 7 (mirror of flights.js): fast cull only for contacts seen
@@ -68,12 +74,15 @@ function _likelyLanded(icao24) {
     // flaps don't churn their identity/floor state.
     if (info.wasAirborne !== true) return false;
     if (info.onGround) return true;
-  return Number.isFinite(info.altitudeFt) && info.altitudeFt < LANDED_ALT_MAX_FT
+    return (
-    && Number.isFinite(info.speedMps) && info.speedMps < LANDED_SPEED_MAX_MPS;
+      Number.isFinite(info.altitudeFt) &&
-}
+      info.altitudeFt < LANDED_ALT_MAX_FT &&
+      Number.isFinite(info.speedMps) &&
+      info.speedMps < LANDED_SPEED_MAX_MPS
+    );
+  }
 
-
+  /**
-/**
    * Build a public descriptor for one aircraft using its best current position
    * (dead-reckoned when history exists, billboard position otherwise).
    * @param {string} icao24 - ICAO hex identifier of the aircraft.
@@ -81,10 +90,11 @@ function _likelyLanded(icao24) {
    *   Descriptor with a cloned position, or null if the aircraft is unknown.
    */
 
-function _describeFlight(icao24) {
+  function _describeFlight(icao24) {
     const info = flightState._flightData.get(icao24);
     const bb = flightState._billboards.get(icao24);
-  const basePos = parts.motion._deadReckon(icao24) || (bb ? bb.position : null);
+    const basePos =
+      parts.motion._deadReckon(icao24) || (bb ? bb.position : null);
     if (!basePos) return null;
     const displayed = displayedKinematics({
       derivedSpeedMps: flightState._drSpeedMps,
@@ -92,7 +102,11 @@ function _describeFlight(icao24) {
       reportedSpeedMps: info?.speedMps,
       reportedTrackDeg: info?.track,
     });
-  const carto = Cesium.Cartographic.fromCartesian(basePos, Cesium.Ellipsoid.WGS84, flightState._scratchCarto);
+    const carto = Cesium.Cartographic.fromCartesian(
+      basePos,
+      Cesium.Ellipsoid.WGS84,
+      flightState._scratchCarto,
+    );
     if (!carto) return null;
     return {
       icao24,
@@ -106,24 +120,29 @@ function _describeFlight(icao24) {
       longitude: Cesium.Math.toDegrees(carto.longitude),
       // Keep the cockpit readout on the reported aviation altitude. Render
       // terrain height is a separate visual datum and may be below zero.
-    altitudeM: Number.isFinite(info?.altitudeM) ? info.altitudeM : carto.height,
+      altitudeM: Number.isFinite(info?.altitudeM)
-    renderAltitudeM: Number.isFinite(info?.renderAltitudeM) ? info.renderAltitudeM : carto.height,
+        ? info.altitudeM
+        : carto.height,
+      renderAltitudeM: Number.isFinite(info?.renderAltitudeM)
+        ? info.renderAltitudeM
+        : carto.height,
       onGround: info?.onGround === true,
       velocityMps: displayed.speedMps,
       track: displayed.trackDeg,
-    stale: Boolean(flightState._missingPolls.get(icao24) || flightState._backoff),
+      stale: Boolean(
+        flightState._missingPolls.get(icao24) || flightState._backoff,
+      ),
     };
-}
+  }
 
-
+  function _normalizeTrackedIcao(candidate) {
-
+    const normalized = String(candidate ?? '')
-function _normalizeTrackedIcao(candidate) {
+      .trim()
-  const normalized = String(candidate ?? '').trim().toLowerCase();
+      .toLowerCase();
     return normalized || null;
-}
+  }
 
-
+  /**
-/**
    * Map one military aircraft's internal poll record to a plain JSON-safe
    * analyst record (analyst query engine seam) — same shape as the flights
    * layer's mapAnalystRecord, with `military` always true. Pure — no Cesium
@@ -139,9 +158,12 @@ function _normalizeTrackedIcao(candidate) {
    *   operator: string|null, routeOrigin: null, routeDestination: null}}
    */
 
-function mapAnalystRecord(icao24, info) {
+  function mapAnalystRecord(icao24, info) {
     const num = (v) => (Number.isFinite(v) ? v : null);
-  const text = (v) => { const t = String(v ?? '').trim(); return t || null; };
+    const text = (v) => {
+      const t = String(v ?? '').trim();
+      return t || null;
+    };
     const callsign = text(info?.callsign);
     return {
       id: callsign || text(info?.registration) || icao24,
@@ -151,7 +173,9 @@ function mapAnalystRecord(icao24, info) {
       lon: num(info?.rawLon),
       // altitudeFt is the sticky barometric/MSL aviation field — converted to
       // meters here for shape parity with the flights layer.
-    altitudeM: Number.isFinite(info?.altitudeFt) ? info.altitudeFt * 0.3048 : null,
+      altitudeM: Number.isFinite(info?.altitudeFt)
+        ? info.altitudeFt * 0.3048
+        : null,
       speedMps: num(info?.speedMps),
       heading: num(info?.track),
       verticalRateMps: num(info?.verticalRateMps),
@@ -165,8 +189,9 @@ function mapAnalystRecord(icao24, info) {
       routeOrigin: null,
       routeDestination: null,
     };
-}
+  }
-const methods = { mapAnalystRecord, 
+  const methods = {
+    mapAnalystRecord,
 
     id: 'military',
 
@@ -179,19 +204,16 @@ const methods = { mapAnalystRecord,
     /** @type {number} Polling interval in ms between API fetches */
     updateInterval: 15000,
 
-
     /** @deprecated Compatibility alias for {@link enable}. */
     show(viewer) {
       this.enable(viewer);
     },
 
-
     /** @deprecated Compatibility alias for {@link disable}. */
     hide(viewer) {
       this.disable(viewer);
     },
 
-
     /**
      * Live layer params.
      * `models3d` toggles 3D glTF jet-model rendering for the FLEET (altitude-gated): when on,
@@ -202,21 +224,33 @@ const methods = { mapAnalystRecord,
      * @param {{models3d?: boolean, models3dMode?: 'proximity'|'all', selectedMilitaryTrackingId?: string|null}} params
      */
     setParams(params = {}, { origin = 'programmatic' } = {}) {
-    if (isExplicitLayerStateOrigin(origin)
+      if (
-        && !Object.hasOwn(params, 'selectedMilitaryTrackingId')) {
+        isExplicitLayerStateOrigin(origin) &&
+        !Object.hasOwn(params, 'selectedMilitaryTrackingId')
+      ) {
         parts.tracking._cancelPendingTrackingRestore();
       }
-    if (typeof params.models3d === 'boolean' && params.models3d !== flightState._models3dEnabled) {
+      if (
+        typeof params.models3d === 'boolean' &&
+        params.models3d !== flightState._models3dEnabled
+      ) {
         flightState._models3dEnabled = params.models3d;
         if (!flightState._models3dEnabled) {
           parts.rendering._releaseModels();
           parts.tracking._syncTracked2dRotation();
           // Restore fleet billboards (horizon-cull re-asserts next tick), but NEVER the tracked
           // plane's own fleet billboard — its tracked entity is the visual (avoids a double-image).
-        if (flightState._billboardCollection) for (const [icao, bb] of flightState._billboards) { if (icao !== flightState._trackedIcao) bb.show = true; }
+          if (flightState._billboardCollection)
+            for (const [icao, bb] of flightState._billboards) {
+              if (icao !== flightState._trackedIcao) bb.show = true;
             }
         }
-    if ((params.models3dMode === 'proximity' || params.models3dMode === 'all') && params.models3dMode !== flightState._models3dMode) {
+      }
+      if (
+        (params.models3dMode === 'proximity' ||
+          params.models3dMode === 'all') &&
+        params.models3dMode !== flightState._models3dMode
+      ) {
         // The next fleet tick re-derives the eligible set under the new cap and releases the overflow.
         flightState._models3dMode = params.models3dMode;
         if (flightState._cockpitContactMode) {
@@ -224,7 +258,10 @@ const methods = { mapAnalystRecord,
           flightState._lastFleetTickMs = 0;
         }
       }
-    if (typeof params.irBoost === 'boolean' && params.irBoost !== flightState._irBoost) {
+      if (
+        typeof params.irBoost === 'boolean' &&
+        params.irBoost !== flightState._irBoost
+      ) {
         flightState._irBoost = params.irBoost;
         parts.rendering._reloadModelsForIrBoost();
         // Sprites don't reload with the models — swap the TR-3B glyph between its
@@ -232,16 +269,24 @@ const methods = { mapAnalystRecord,
         parts.tracking._refreshTr3bForStyle();
       }
       if (Object.hasOwn(params, 'selectedMilitaryTrackingId')) {
-      const requested = _normalizeTrackedIcao(params.selectedMilitaryTrackingId);
+        const requested = _normalizeTrackedIcao(
+          params.selectedMilitaryTrackingId,
+        );
         if (requested === flightState._trackedIcao) {
           flightState._pendingTrackingRestore = null;
         } else if (requested === null) {
           parts.tracking._cancelPendingTrackingRestore();
-        if (flightState._trackedIcao) parts.tracking._clearTracking(false, { origin });
+          if (flightState._trackedIcao)
+            parts.tracking._clearTracking(false, { origin });
         } else {
           const generation = ++flightState._trackingIntentGeneration;
-        flightState._pendingTrackingRestore = { id: requested, generation, origin };
+          flightState._pendingTrackingRestore = {
-        if (flightState._trackedIcao) parts.tracking._clearTracking(false, { origin });
+            id: requested,
+            generation,
+            origin,
+          };
+          if (flightState._trackedIcao)
+            parts.tracking._clearTracking(false, { origin });
           parts.tracking._applyPendingTrackingRestore();
         }
       }
@@ -257,15 +302,15 @@ const methods = { mapAnalystRecord,
       };
     },
 
-
     /**
      * Re-render a contact whose TR-3B conversion just flipped (Easter egg).
      * Callers own the registry write; this only re-derives what renders.
      * @param {string} icao24 - ICAO 24-bit address.
      * @returns {boolean} True when this layer owns the contact.
      */
-  refreshTr3b(icao24) { return parts.tracking._refreshTr3bContact(icao24); },
+    refreshTr3b(icao24) {
-
+      return parts.tracking._refreshTr3bContact(icao24);
+    },
 
     /**
      * Find military aircraft near a given ECEF position, sorted by distance.
@@ -278,12 +323,18 @@ const methods = { mapAnalystRecord,
      * @returns {Array<Object>} Sorted array of nearby aircraft descriptors
      */
     getNearby(center, range, maxCount = 50, { includeHidden = false } = {}) {
-    if (!center || !flightState._billboardCollection || !flightState._billboardCollection.show) return [];
+      if (
+        !center ||
+        !flightState._billboardCollection ||
+        !flightState._billboardCollection.show
+      )
+        return [];
 
       const limit = Number.isFinite(maxCount)
         ? Math.max(1, Math.floor(maxCount))
         : 50;
-    const maxRange = Number.isFinite(range) && range > 0 ? range : Number.POSITIVE_INFINITY;
+      const maxRange =
+        Number.isFinite(range) && range > 0 ? range : Number.POSITIVE_INFINITY;
 
       const now = Cesium.JulianDate.now();
       const nearby = [];
@@ -292,14 +343,19 @@ const methods = { mapAnalystRecord,
         const isTracked = icao24 === flightState._trackedIcao;
         // Keep planes rendered as a 3D model (billboard hidden) so proximity counts
         // don't drop to zero on the 2D→3D handoff; bb.position stays current while hidden.
-      if (!aircraftIncludedInNearby({
+        if (
+          !aircraftIncludedInNearby({
             isTracked,
             billboardShown: bb.show,
             modelRendering: parts.rendering._modelOwnsVisual(icao24),
             includeHidden,
-      })) continue;
+          })
+        )
+          continue;
 
-      const trackedPos = isTracked ? parts.motion._trackedDisplayCached() : null; // cached, no recompute (anti-jitter)
+        const trackedPos = isTracked
+          ? parts.motion._trackedDisplayCached()
+          : null; // cached, no recompute (anti-jitter)
         const pos = trackedPos || bb.position;
         if (!pos) continue;
 
@@ -314,7 +370,12 @@ const methods = { mapAnalystRecord,
           distance,
           // Filter surface (mirror of flights.js): the cockpit next/previous path
           // matches on this field, so it follows the conversion.
-        aircraftClass: tr3bAircraftClass(icao24, String(info?.klass || info?.type || '').trim().toLowerCase() || null),
+          aircraftClass: tr3bAircraftClass(
+            icao24,
+            String(info?.klass || info?.type || '')
+              .trim()
+              .toLowerCase() || null,
+          ),
           track: info?.track ?? null,
           // Display type — converted too, so a Contacts row can't still name the
           // airframe the triangle replaced (the filter matcher reads this as a
@@ -330,7 +391,6 @@ const methods = { mapAnalystRecord,
       return nearby.slice(0, limit);
     },
 
-
     /**
      * Return a subset of aircraft suitable for the detection overlay system.
      * Uses a deterministic stride-based sampling to keep the count manageable
@@ -341,22 +401,33 @@ const methods = { mapAnalystRecord,
      * @returns {Array<{position: Cesium.Cartesian3, id: string, type: string, skipLabel: boolean}>}
      */
     getDetectableObjects(options = {}) {
-    if (!flightState._billboardCollection || !flightState._billboardCollection.show) return [];
+      if (
+        !flightState._billboardCollection ||
+        !flightState._billboardCollection.show
+      )
+        return [];
       const maxCount = Number.isFinite(options.maxCount)
         ? Math.max(1, Math.floor(options.maxCount))
         : flightState._billboards.size;
       const seed = Number.isFinite(options.seed) ? Math.floor(options.seed) : 0;
       // Deterministic stride: evenly space selections across the billboard map
-    const stride = Math.max(1, Math.ceil(flightState._billboards.size / maxCount));
+      const stride = Math.max(
+        1,
+        Math.ceil(flightState._billboards.size / maxCount),
+      );
       const start = seed % stride;
 
       const result = [];
       let idx = 0;
       for (const [icao24, bb] of flightState._billboards) {
-      const shouldTake = ((idx - start) % stride) === 0;
+        const shouldTake = (idx - start) % stride === 0;
         idx++;
         if (!shouldTake) continue;
-      if (flightState._cockpitContactMode && icao24.toLowerCase() === flightState._cockpitSubjectId) continue;
+        if (
+          flightState._cockpitContactMode &&
+          icao24.toLowerCase() === flightState._cockpitSubjectId
+        )
+          continue;
         const isTracked = icao24 === flightState._trackedIcao;
         // Keep planes rendered as a 3D model (billboard hidden) so the detection box
         // doesn't vanish on the 2D→3D handoff; bb.position stays current while hidden.
@@ -369,7 +440,10 @@ const methods = { mapAnalystRecord,
         let object = flightState._detectionObjects.get(icao24);
         if (!object) {
           object = {
-          sourceId: icao24, type: 'AIR', tier: 'military', _weldPos: new Cesium.Cartesian3(),
+            sourceId: icao24,
+            type: 'AIR',
+            tier: 'military',
+            _weldPos: new Cesium.Cartesian3(),
           };
           flightState._detectionObjects.set(icao24, object);
         }
@@ -377,17 +451,21 @@ const methods = { mapAnalystRecord,
         // contacts read the translation the fleet tick already wrote into their
         // modelMatrix; sprite-owned contacts keep `bb.position`, where sprite and bracket
         // are co-located anyway.
-      const spec = modelOwnsVisual ? parts.rendering._modelSpec(info?.klass) : null;
+        const spec = modelOwnsVisual
+          ? parts.rendering._modelSpec(info?.klass)
+          : null;
         const pos = isTracked
-        ? (parts.motion._trackedVisualCached() || bb.position)
+          ? parts.motion._trackedVisualCached() || bb.position
-        : (modelOwnsVisual
+          : modelOwnsVisual
             ? modelVisualAnchor(
                 model.modelMatrix,
                 spec.visualCenterNative,
-            Number.isFinite(model.computedScale) ? model.computedScale : spec.scale,
+                Number.isFinite(model.computedScale)
+                  ? model.computedScale
+                  : spec.scale,
                 object._weldPos || (object._weldPos = new Cesium.Cartesian3()),
               )
-          : bb.position);
+            : bb.position;
         if (!pos) continue;
         object.position = pos;
         object.skipLabel = isTracked;
@@ -407,15 +485,18 @@ const methods = { mapAnalystRecord,
         result.push(object);
         if (result.length >= maxCount) break;
       }
-    if (flightState._detectionObjects.size > flightState._billboards.size + 512) {
+      if (
+        flightState._detectionObjects.size >
+        flightState._billboards.size + 512
+      ) {
         for (const icao24 of flightState._detectionObjects.keys()) {
-        if (!flightState._billboards.has(icao24)) flightState._detectionObjects.delete(icao24);
+          if (!flightState._billboards.has(icao24))
+            flightState._detectionObjects.delete(icao24);
         }
       }
       return result;
     },
 
-
     /**
      * Find a single aircraft by free-text query.
      * Match priority: exact icao24 hex, exact callsign, callsign prefix,
@@ -425,8 +506,11 @@ const methods = { mapAnalystRecord,
      *   Best match with a cloned, dead-reckoned position, or null if none.
      */
     findByQuery(query) {
-    if (!flightState._flightData || flightState._flightData.size === 0) return null;
+      if (!flightState._flightData || flightState._flightData.size === 0)
-    const q = String(query || '').trim().toLowerCase();
+        return null;
+      const q = String(query || '')
+        .trim()
+        .toLowerCase();
       if (!q) return null;
 
       // Registration is searched alongside callsign because it is what the
@@ -457,7 +541,6 @@ const methods = { mapAnalystRecord,
       return best ? _describeFlight(best.id) : null;
     },
 
-
     /**
      * Return id/label/position for up to maxCount currently rendered aircraft.
      * Cheap snapshot for voice-tool framing — billboard positions only, no
@@ -478,29 +561,49 @@ const methods = { mapAnalystRecord,
      *   holds no data and therefore cannot answer.
      */
     hasContact(icao24) {
-    if (!flightState._billboardCollection || !flightState._billboardCollection.show || flightState._billboards.size === 0) return null;
+      if (
+        !flightState._billboardCollection ||
+        !flightState._billboardCollection.show ||
+        flightState._billboards.size === 0
+      )
+        return null;
       if (!icao24) return false;
       const id = String(icao24).trim();
-    return flightState._billboards.has(id) || flightState._billboards.has(id.toLowerCase());
+      return (
+        flightState._billboards.has(id) ||
+        flightState._billboards.has(id.toLowerCase())
+      );
     },
 
-
     getAllPositions(maxCount = 500) {
-    if (!flightState._billboardCollection || flightState._billboards.size === 0) return [];
+      if (
-    const limit = Number.isFinite(maxCount) ? Math.max(1, Math.floor(maxCount)) : 500;
+        !flightState._billboardCollection ||
+        flightState._billboards.size === 0
+      )
+        return [];
+      const limit = Number.isFinite(maxCount)
+        ? Math.max(1, Math.floor(maxCount))
+        : 500;
 
       const result = [];
       for (const [icao24, bb] of flightState._billboards) {
         const pos = bb.position;
         if (!pos) continue;
-      const carto = Cesium.Cartographic.fromCartesian(pos, Cesium.Ellipsoid.WGS84, flightState._scratchCarto);
+        const carto = Cesium.Cartographic.fromCartesian(
+          pos,
+          Cesium.Ellipsoid.WGS84,
+          flightState._scratchCarto,
+        );
         if (!carto) continue;
         const info = flightState._flightData.get(icao24);
         result.push({
           id: icao24, // identity (trackById/Context resolve this)
           // Last surface still reading as the raw hex for a callsign-less
           // contact — same chain as getNearby/getDetectableObjects/getTrackedSubject.
-        label: _toCleanText(info?.callsign) || _toCleanText(info?.registration) || icao24,
+          label:
+            _toCleanText(info?.callsign) ||
+            _toCleanText(info?.registration) ||
+            icao24,
           position: pos,
           latitude: Cesium.Math.toDegrees(carto.latitude),
           longitude: Cesium.Math.toDegrees(carto.longitude),
@@ -511,7 +614,6 @@ const methods = { mapAnalystRecord,
       return result;
     },
 
-
     /**
      * Snapshot the layer's in-memory records as plain JSON-safe objects for
      * the analyst query engine. On-demand only (called at most once per
@@ -521,8 +623,15 @@ const methods = { mapAnalystRecord,
      * @returns {Array<Object>} See mapAnalystRecord for the record shape.
      */
     getAnalystRecords(maxCount = 2000) {
-    if (!flightState._billboardCollection || !flightState._billboardCollection.show || flightState._flightData.size === 0) return [];
+      if (
-    const limit = Number.isFinite(maxCount) ? Math.max(1, Math.floor(maxCount)) : 2000;
+        !flightState._billboardCollection ||
+        !flightState._billboardCollection.show ||
+        flightState._flightData.size === 0
+      )
+        return [];
+      const limit = Number.isFinite(maxCount)
+        ? Math.max(1, Math.floor(maxCount))
+        : 2000;
       const result = [];
       for (const [icao24, info] of flightState._flightData) {
         result.push(mapAnalystRecord(icao24, info));
@@ -531,7 +640,6 @@ const methods = { mapAnalystRecord,
       return result;
     },
 
-
     /**
      * Start camera-tracking an aircraft by ICAO hex identifier.
      * @param {string} icao24 - ICAO hex identifier of the aircraft.
@@ -542,17 +650,27 @@ const methods = { mapAnalystRecord,
       let id = String(icao24).trim();
       if (!flightState._billboards.has(id)) id = id.toLowerCase();
       if (!flightState._billboards.has(id)) return false;
-    if (parts.tracking._isExplicitTrackingOrigin(origin)) parts.tracking._cancelPendingTrackingRestore();
+      if (parts.tracking._isExplicitTrackingOrigin(origin))
-    if (flightState._trackedIcao === id) return parts.tracking._publishTrackedSelection(id, origin);
+        parts.tracking._cancelPendingTrackingRestore();
+      if (flightState._trackedIcao === id)
+        return parts.tracking._publishTrackedSelection(id, origin);
       parts.tracking._trackFlight(id, { origin });
       return true;
     },
 
-
     /** Resolve a shared Follow target only against the latest accepted refresh. */
-  async resolveTrackingRestoreTarget(icao24, { signal = null, origin = 'share-restore' } = {}) {
+    async resolveTrackingRestoreTarget(
-    if (signal?.aborted) return { status: 'cancelled', reason: String(signal.reason || 'aborted') };
+      icao24,
-    const id = String(icao24 ?? '').trim().toLowerCase();
+      { signal = null, origin = 'share-restore' } = {},
+    ) {
+      if (signal?.aborted)
+        return {
+          status: 'cancelled',
+          reason: String(signal.reason || 'aborted'),
+        };
+      const id = String(icao24 ?? '')
+        .trim()
+        .toLowerCase();
       if (!id) return { status: 'missing', reason: 'invalid-target' };
       const outcome = flightState._lastTrackingRefreshOutcome;
       if (outcome.status !== 'accepted') {
@@ -571,28 +689,47 @@ const methods = { mapAnalystRecord,
           source: outcome.source,
         };
       }
-    if (signal?.aborted) return { status: 'cancelled', reason: String(signal.reason || 'aborted') };
+      if (signal?.aborted)
+        return {
+          status: 'cancelled',
+          reason: String(signal.reason || 'aborted'),
+        };
       const followed = this.trackById(id, { origin });
       return followed
-      ? { status: 'found', refreshEpoch: outcome.epoch, source: outcome.source }
+        ? {
-      : { status: 'source-unavailable', reason: 'target-not-renderable', refreshEpoch: outcome.epoch };
+            status: 'found',
+            refreshEpoch: outcome.epoch,
+            source: outcome.source,
+          }
+        : {
+            status: 'source-unavailable',
+            reason: 'target-not-renderable',
+            refreshEpoch: outcome.epoch,
+          };
     },
 
-
     /** Reapply the canonical follow frame without recreating the selected flight. */
     refocusTrackedById(icao24, { origin = 'programmatic' } = {}) {
-    if (!icao24 || flightState._cockpitContactMode || !flightState._viewer || !flightState._trackedEntity) return false;
+      if (
+        !icao24 ||
+        flightState._cockpitContactMode ||
+        !flightState._viewer ||
+        !flightState._trackedEntity
+      )
+        return false;
       let id = String(icao24).trim();
       if (!flightState._billboards.has(id)) id = id.toLowerCase();
       if (
-      id !== flightState._trackedIcao
+        id !== flightState._trackedIcao ||
-      || !flightState._viewer.entities?.contains?.(flightState._trackedEntity)
+        !flightState._viewer.entities?.contains?.(flightState._trackedEntity) ||
-      || flightState._viewer.trackedEntity !== flightState._trackedEntity
+        flightState._viewer.trackedEntity !== flightState._trackedEntity
-    ) return false;
+      )
+        return false;
       flightState._trackedCameraFrameStop?.();
       flightState._viewer.camera.cancelFlight();
       flightState._viewer.trackedEntity = flightState._trackedEntity;
-    flightState._trackedCameraFrameStop = applyTrackedCameraFrame(
+      flightState._trackedCameraFrameStop =
+        applyTrackedCameraFrame(
           flightState._viewer,
           flightState._trackedEntity,
           flightState._trackedEntity.viewFrom,
@@ -601,7 +738,6 @@ const methods = { mapAnalystRecord,
       return true;
     },
 
-
     /**
      * Stop tracking the currently followed aircraft (no-op if none).
      * @returns {boolean} Always true.
@@ -612,12 +748,10 @@ const methods = { mapAnalystRecord,
       return true;
     },
 
-
     cancelPendingTrackingRestore() {
       parts.tracking._cancelPendingTrackingRestore();
     },
 
-
     /**
      * Describe the currently tracked aircraft at its dead-reckoned position.
      * @returns {{icao24: string, callsign: string|null, latitude: number, longitude: number, altitudeM: number, velocityMps: number|null, track: number|null}|null}
@@ -631,7 +765,6 @@ const methods = { mapAnalystRecord,
       return rest;
     },
 
-
     /**
      * Return the current aircraft as a Context subject without changing
      * tracking or camera ownership.
@@ -652,13 +785,14 @@ const methods = { mapAnalystRecord,
       };
     },
 
-
     /**
      * Return current layer health/status for the HUD status chip.
      * @returns {{count: number, lastUpdate: number|null, stale: boolean, error: string|null, status: number|null, retryInSec: number}}
      */
     getStats() {
-    const retryInSec = flightState._retryAt ? Math.max(0, Math.ceil((flightState._retryAt - Date.now()) / 1000)) : 0;
+      const retryInSec = flightState._retryAt
+        ? Math.max(0, Math.ceil((flightState._retryAt - Date.now()) / 1000))
+        : 0;
       return {
         count: flightState._count,
         lastUpdate: flightState._lastUpdate,
@@ -669,8 +803,17 @@ const methods = { mapAnalystRecord,
         source: flightState._lastSource,
         fallback: false,
       };
-  }
+    },
-};
+  };
 
-return { _toFiniteNumber, _toCleanText, _formatAltitude, _likelyLanded, _describeFlight, _normalizeTrackedIcao, mapAnalystRecord, methods };
+  return {
+    _toFiniteNumber,
+    _toCleanText,
+    _formatAltitude,
+    _likelyLanded,
+    _describeFlight,
+    _normalizeTrackedIcao,
+    mapAnalystRecord,
+    methods,
+  };
 }

src/layers/military/state.js

@@ -1,14 +1,12 @@
 import * as Cesium from 'cesium';
 
 export function createFlightState({ source, services }) {
-const { createGroundSnap } = services.groundSnap;
+  const { createGroundSnap } = services.groundSnap;
-const flightState = { lifetime: new AbortController() };
+  const flightState = { lifetime: new AbortController() };
 
+  flightState._source = source;
 
-
+  /** Per-class model spec for THIS layer (2026-08-16, owner playtest ask:
-flightState._source = source;
-
-/** Per-class model spec for THIS layer (2026-08-16, owner playtest ask:
    *  military contacts should read as their WEIGHT CLASS, always in this layer's
    *  amber). Real Hangar GLBs serve the classes they cover (meters, nose −X →
    *  180° offset); airliner/quadjet/glider get the shared 747 silhouette
@@ -18,337 +16,310 @@ flightState._source = source;
    *  and the tint must dominate any livery (owner: "stays yellow"). Specs are
    *  static per class — memoized (the fleet pass asks at 12 Hz per model). */
 
-flightState._specCache = new Map();
+  flightState._specCache = new Map();
 
-/** One-shot cached tile-skin heights for MODELED grounded planes (see groundSnap.js). */
+  /** One-shot cached tile-skin heights for MODELED grounded planes (see groundSnap.js). */
 
-flightState._groundSnap = createGroundSnap();
+  flightState._groundSnap = createGroundSnap();
 
+  flightState._scratchGroundCarto = new Cesium.Cartographic();
 
-flightState._scratchGroundCarto = new Cesium.Cartographic();
+  flightState._scratchGroundPos = new Cesium.Cartesian3();
 
+  /** @type {Cesium.PrimitiveCollection|null} */
 
-flightState._scratchGroundPos = new Cesium.Cartesian3();
+  flightState._modelCollection = null;
 
-/** @type {Cesium.PrimitiveCollection|null} */
+  /** @type {Map<string, Cesium.Model>} icao24 → model */
 
-flightState._modelCollection = null;
+  flightState._models = new Map();
 
-/** @type {Map<string, Cesium.Model>} icao24 → model */
+  /** @type {Set<string>} icao24 currently loading (async) */
 
-flightState._models = new Map();
+  flightState._modelPending = new Set();
 
-/** @type {Set<string>} icao24 currently loading (async) */
+  /** @type {Map<string, number>} icao24 → load generation; bumped on release to invalidate
-
-flightState._modelPending = new Set();
-
-/** @type {Map<string, number>} icao24 → load generation; bumped on release to invalidate
    *  an in-flight load (so a track/untrack/remove during fromGltfAsync can't add a stale model). */
 
-flightState._modelGen = new Map();
+  flightState._modelGen = new Map();
 
-/** Lifecycle epoch; bumped on destroy so an in-flight load from a PREVIOUS init can't settle
+  /** Lifecycle epoch; bumped on destroy so an in-flight load from a PREVIOUS init can't settle
    *  against a new lifecycle's globals (which destroy cleared). Captured by _ensureModel. */
 
-flightState._modelEpoch = 0;
+  flightState._modelEpoch = 0;
 
-/** DEFAULT-ON in PROXIMITY (owner directive 2026-08-22). A fresh boot never runs
+  /** DEFAULT-ON in PROXIMITY (owner directive 2026-08-22). A fresh boot never runs
    *  layer-state restoration, so this initializer — not the codec — is what the app
    *  actually starts with; it must stay in lockstep with the `models3d` default in
    *  `layerState.js` and `this._models3dEnabled` in ui.js, or the DISPLAY rail would
    *  light a button the layer has not armed. */
 
-flightState._models3dEnabled = true;
+  flightState._models3dEnabled = true;
 
-
+  flightState._models3dMode = 'proximity';
-flightState._models3dMode = 'proximity';
   // 'proximity' = nearest MODEL_MAX in view; 'all' = every in-view plane (≤ MODEL_MAX_ALL)
 
-flightState._lastModelCapWarnMs = 0;
+  flightState._lastModelCapWarnMs = 0;
   // throttle the "more planes in view than the cap" console notice
-// The tracked entity's billboard goes transparent (rather than hidden) once the model takes
+  // The tracked entity's billboard goes transparent (rather than hidden) once the model takes
-// over, so it keeps supplying a bounding sphere for follow-camera framing. We only drop its
+  // over, so it keeps supplying a bounding sphere for follow-camera framing. We only drop its
-// alpha after the GLB is preloaded so the model is ready to render the instant the billboard
+  // alpha after the GLB is preloaded so the model is ready to render the instant the billboard
-// fades — no gap, no double-image. Preloaded once at init; the instance is retained (not
+  // fades — no gap, no double-image. Preloaded once at init; the instance is retained (not
-// destroyed) purely to keep Cesium's glTF cache warm for fast tracked-model instantiation.
+  // destroyed) purely to keep Cesium's glTF cache warm for fast tracked-model instantiation.
 
-flightState._planeModelLoaded = false;
+  flightState._planeModelLoaded = false;
 
-/** @type {Cesium.Model|null} retained preload that keeps the glTF cache warm */
+  /** @type {Cesium.Model|null} retained preload that keeps the glTF cache warm */
 
-flightState._preloadModel = null;
+  flightState._preloadModel = null;
 
+  flightState._scratchModelHpr = new Cesium.HeadingPitchRoll(0, 0, 0);
 
-flightState._scratchModelHpr = new Cesium.HeadingPitchRoll(0, 0, 0);
+  flightState._scratchModelMtx = new Cesium.Matrix4();
 
-
+  flightState._scratchModelBS = new Cesium.BoundingSphere(
-flightState._scratchModelMtx = new Cesium.Matrix4();
+    new Cesium.Cartesian3(),
-
+    1.0,
-
+  );
-flightState._scratchModelBS = new Cesium.BoundingSphere(new Cesium.Cartesian3(), 1.0);
   // frustum-visibility test
-/** Last limb taper per billboard, retained across class/ground/cockpit repaints. */
+  /** Last limb taper per billboard, retained across class/ground/cockpit repaints. */
 
-flightState._billboardLimbScale = new WeakMap();
+  flightState._billboardLimbScale = new WeakMap();
 
+  // ---------------------------------------------------------------------------
+  // Module-level state
+  // ---------------------------------------------------------------------------
 
-// ---------------------------------------------------------------------------
+  /** @type {Cesium.BillboardCollection|null} Single GPU-batched collection for all aircraft */
-// Module-level state
-// ---------------------------------------------------------------------------
 
-/** @type {Cesium.BillboardCollection|null} Single GPU-batched collection for all aircraft */
+  flightState._billboardCollection = null;
 
-flightState._billboardCollection = null;
+  /** @type {Map<string, Cesium.Billboard>} ICAO hex -> billboard primitive */
 
-/** @type {Map<string, Cesium.Billboard>} ICAO hex -> billboard primitive */
+  flightState._billboards = new Map();
 
-flightState._billboards = new Map();
+  /** Stable lightweight records reused by the detection overlay between polls. */
 
-/** Stable lightweight records reused by the detection overlay between polls. */
+  flightState._detectionObjects = new Map();
 
-flightState._detectionObjects = new Map();
+  /** @type {Map<string, Object>} ICAO hex -> flight metadata (callsign, type, registration, operator, altitudeFt, speedMps, track) */
 
-/** @type {Map<string, Object>} ICAO hex -> flight metadata (callsign, type, registration, operator, altitudeFt, speedMps, track) */
+  flightState._flightData = new Map();
 
-flightState._flightData = new Map();
+  /** @type {Map<string, Array<{time: Cesium.JulianDate, position: Cesium.Cartesian3}>>} ICAO hex -> recent position samples for dead reckoning */
 
-/** @type {Map<string, Array<{time: Cesium.JulianDate, position: Cesium.Cartesian3}>>} ICAO hex -> recent position samples for dead reckoning */
+  flightState._positionHistory = new Map();
 
-flightState._positionHistory = new Map();
+  /** @type {number} Current number of visible aircraft */
 
-/** @type {number} Current number of visible aircraft */
+  flightState._count = 0;
 
-flightState._count = 0;
+  /** @type {number|null} Epoch ms of last successful API update */
 
-/** @type {number|null} Epoch ms of last successful API update */
+  flightState._lastUpdate = null;
 
-flightState._lastUpdate = null;
+  /** @type {boolean} True when in error-backoff mode */
 
-/** @type {boolean} True when in error-backoff mode */
+  flightState._backoff = false;
 
-flightState._backoff = false;
+  /** @type {number} Epoch ms after which the next retry is allowed */
 
-/** @type {number} Epoch ms after which the next retry is allowed */
+  flightState._retryAt = 0;
 
-flightState._retryAt = 0;
+  /** @type {string|null} Human-readable description of the last error */
 
-/** @type {string|null} Human-readable description of the last error */
+  flightState._lastError = null;
 
-flightState._lastError = null;
+  flightState._activeUpdateControllers = new Set();
 
+  /** @type {number|null} HTTP status code from the last API response */
 
-flightState._activeUpdateControllers = new Set();
+  flightState._lastStatus = null;
 
-/** @type {number|null} HTTP status code from the last API response */
+  flightState._lastSource = source?.label || 'Aircraft';
 
-flightState._lastStatus = null;
+  /** @type {boolean} True once ensureGeoidReady() has resolved (awaited once at enable()). Mirror of flights.js. */
 
+  flightState._geoidReady = false;
 
-flightState._lastSource = source?.label || 'Aircraft';
+  /** @type {Map<string, number>} icao24 -> geoid undulation N (m), cached (negligible drift per-aircraft). */
 
-/** @type {boolean} True once ensureGeoidReady() has resolved (awaited once at enable()). Mirror of flights.js. */
+  flightState._geoidNCache = new Map();
 
-flightState._geoidReady = false;
+  // -- Click-to-track state --
+  /** @type {string|null} ICAO hex of the currently tracked aircraft */
 
-/** @type {Map<string, number>} icao24 -> geoid undulation N (m), cached (negligible drift per-aircraft). */
+  flightState._trackedIcao = null;
 
-flightState._geoidNCache = new Map();
+  flightState._pendingTrackingRestore = null;
 
+  flightState._trackingIntentGeneration = 0;
 
-// -- Click-to-track state --
+  flightState._trackingRefreshEpoch = 0;
-/** @type {string|null} ICAO hex of the currently tracked aircraft */
 
-flightState._trackedIcao = null;
+  flightState._lastTrackingRefreshOutcome = {
-
-
-flightState._pendingTrackingRestore = null;
-
-
-flightState._trackingIntentGeneration = 0;
-
-
-flightState._trackingRefreshEpoch = 0;
-
-
-flightState._lastTrackingRefreshOutcome = {
     epoch: 0,
     status: 'unavailable',
     ids: new Set(),
     source: flightState._lastSource,
-};
+  };
 
-/** @type {Cesium.Entity|null} Entity created for the tracked aircraft (camera follows this) */
+  /** @type {Cesium.Entity|null} Entity created for the tracked aircraft (camera follows this) */
 
-flightState._trackedEntity = null;
+  flightState._trackedEntity = null;
 
-/** Disposes the single active tracked-camera framing owner. */
+  /** Disposes the single active tracked-camera framing owner. */
 
-flightState._trackedCameraFrameStop = null;
+  flightState._trackedCameraFrameStop = null;
 
-/** @type {Cesium.Model|null} Standalone 3D model for the tracked aircraft — NOT a graphic on
+  /** @type {Cesium.Model|null} Standalone 3D model for the tracked aircraft — NOT a graphic on
    *  _trackedEntity, so viewer.trackedEntity's follow-camera always has a ready bounding sphere
    *  (a model graphic reports PENDING until loaded, which freezes the centering on 3D-toggle). */
 
-flightState._trackedModel = null;
+  flightState._trackedModel = null;
 
+  flightState._trackedModelGen = 0;
 
-flightState._trackedModelGen = 0;
+  flightState._trackedModelLoading = false;
 
+  /** @type {Cesium.ScreenSpaceEventHandler|null} Click handler for selecting aircraft */
 
-flightState._trackedModelLoading = false;
+  flightState._clickHandler = null;
 
-/** @type {Cesium.ScreenSpaceEventHandler|null} Click handler for selecting aircraft */
+  /** @type {Cesium.Viewer|null} Cached viewer reference */
 
-flightState._clickHandler = null;
+  flightState._viewer = null;
 
-/** @type {Cesium.Viewer|null} Cached viewer reference */
+  /** Cockpit presentation switches ambient AIR contacts between near aircraft and far dots. */
 
-flightState._viewer = null;
+  flightState._cockpitContactMode = false;
 
-/** Cockpit presentation switches ambient AIR contacts between near aircraft and far dots. */
+  /** AIR contacts inside the selected Display range; independent from model admission/load/cap. */
 
-flightState._cockpitContactMode = false;
+  flightState._cockpitNearContacts = new Set();
 
-/** AIR contacts inside the selected Display range; independent from model admission/load/cap. */
+  /** Normalized ICAO24 of the active Cockpit subject, omitted from detection candidates. */
 
-flightState._cockpitNearContacts = new Set();
+  flightState._cockpitSubjectId = null;
 
-/** Normalized ICAO24 of the active Cockpit subject, omitted from detection candidates. */
+  /** @type {((event: CustomEvent) => void)|null} */
 
-flightState._cockpitSubjectId = null;
+  flightState._cockpitModeListener = null;
 
-/** @type {((event: CustomEvent) => void)|null} */
+  /** @type {{setPositions: Function, clear: Function, destroy: Function}|null} Shared fading-trail renderer */
 
-flightState._cockpitModeListener = null;
+  flightState._trail = null;
 
-/** @type {{setPositions: Function, clear: Function, destroy: Function}|null} Shared fading-trail renderer */
+  /** @type {Cesium.Entity|null} Per-frame head segment: last body point → live icon */
 
-flightState._trail = null;
+  flightState._trailHeadEntity = null;
 
-/** @type {Cesium.Entity|null} Per-frame head segment: last body point → live icon */
+  /** @type {number} Uniquifier for head-segment entity ids (Cesium requires unique ids). */
 
-flightState._trailHeadEntity = null;
+  flightState._trailHeadSeq = 0;
 
-/** @type {number} Uniquifier for head-segment entity ids (Cesium requires unique ids). */
+  /** @type {Cesium.Cartesian3[]} Chronological tracked-aircraft fixes (oldest first) */
 
-flightState._trailHeadSeq = 0;
+  flightState._trailPositions = [];
 
-/** @type {Cesium.Cartesian3[]} Chronological tracked-aircraft fixes (oldest first) */
+  /** @type {number} Monotonic token — invalidates in-flight backfill responses */
 
-flightState._trailPositions = [];
+  flightState._trailBackfillToken = 0;
 
-/** @type {number} Monotonic token — invalidates in-flight backfill responses */
+  /** @type {Map<string, number>} icao24 -> consecutive missed polls */
 
-flightState._trailBackfillToken = 0;
+  flightState._missingPolls = new Map();
 
-/** @type {Map<string, number>} icao24 -> consecutive missed polls */
+  /** @type {number} Epoch ms of the last fleet dead-reckoning pass */
 
-flightState._missingPolls = new Map();
+  flightState._lastFleetTickMs = 0;
 
-/** @type {number} Epoch ms of the last fleet dead-reckoning pass */
+  /** @type {string} Camera pose signature at the last rotation pass */
 
-flightState._lastFleetTickMs = 0;
+  flightState._lastCamPoseSig = '';
 
-/** @type {string} Camera pose signature at the last rotation pass */
+  /** @type {number} Epoch ms of the last full rotation pass */
 
-flightState._lastCamPoseSig = '';
+  flightState._lastRotPassMs = 0;
 
-/** @type {number} Epoch ms of the last full rotation pass */
+  /** @type {number} Last computed rotation for the tracked entity (radians) */
 
-flightState._lastRotPassMs = 0;
+  flightState._lastTrackedRotation = 0;
 
-/** @type {number} Last computed rotation for the tracked entity (radians) */
+  /** @type {Cesium.Event.RemoveCallback|null} preRender listener disposer */
 
-flightState._lastTrackedRotation = 0;
+  flightState._preRenderRemove = null;
 
-/** @type {Cesium.Event.RemoveCallback|null} preRender listener disposer */
+  flightState._trackedModelPreUpdateRemove = null;
 
-flightState._preRenderRemove = null;
+  /** @type {Cesium.Event.RemoveCallback|null} camera.moveEnd listener disposer (arrival rotation pass) */
 
+  flightState._moveEndRemove = null;
 
-flightState._trackedModelPreUpdateRemove = null;
+  /** @type {Cesium.Event.RemoveCallback|null} trackedEntityChanged listener disposer (cross-layer untrack) */
 
-/** @type {Cesium.Event.RemoveCallback|null} camera.moveEnd listener disposer (arrival rotation pass) */
+  flightState._trackedEntityChangedRemove = null;
 
-flightState._moveEndRemove = null;
+  // -- Scratch variables (reused each frame to avoid GC pressure) --
 
-/** @type {Cesium.Event.RemoveCallback|null} trackedEntityChanged listener disposer (cross-layer untrack) */
+  flightState._scratchOffset = new Cesium.Cartesian3();
 
-flightState._trackedEntityChangedRemove = null;
+  flightState._scratchCarto = new Cesium.Cartographic();
 
+  flightState._scratchEnu = new Cesium.Matrix4();
 
-// -- Scratch variables (reused each frame to avoid GC pressure) --
+  flightState._scratchArc = { east: 0, north: 0, endCourseDeg: 0 };
 
-flightState._scratchOffset = new Cesium.Cartesian3();
+  flightState._scratchRenderTime = new Cesium.JulianDate();
 
+  flightState._scratchFleetPos = new Cesium.Cartesian3();
 
-flightState._scratchCarto = new Cesium.Cartographic();
+  flightState._scratchDrRaw = new Cesium.Cartesian3();
 
+  flightState._scratchWarmupTime = new Cesium.JulianDate();
 
-flightState._scratchEnu = new Cesium.Matrix4();
+  flightState._trackedPosHolder = new Cesium.Cartesian3();
 
+  // -- Per-frame dead-reckoning cache for the tracked entity --
+  /** @type {Cesium.Cartesian3|null} Cached DR position for the current render frame */
 
-flightState._scratchArc = { east: 0, north: 0, endCourseDeg: 0 };
+  flightState._cachedDRPosition = null;
 
+  /** @type {number} Frame number the cache was last populated for */
 
-flightState._scratchRenderTime = new Cesium.JulianDate();
+  flightState._cachedDRFrame = -1;
 
-
+  /** Course (deg) of the position `_deadReckon` most recently returned — set on
-flightState._scratchFleetPos = new Cesium.Cartesian3();
-
-
-flightState._scratchDrRaw = new Cesium.Cartesian3();
-
-
-flightState._scratchWarmupTime = new Cesium.JulianDate();
-
-
-flightState._trackedPosHolder = new Cesium.Cartesian3();
-
-
-// -- Per-frame dead-reckoning cache for the tracked entity --
-/** @type {Cesium.Cartesian3|null} Cached DR position for the current render frame */
-
-flightState._cachedDRPosition = null;
-
-/** @type {number} Frame number the cache was last populated for */
-
-flightState._cachedDRFrame = -1;
-
-
-/** Course (deg) of the position `_deadReckon` most recently returned — set on
    *  every branch of `_deadReckon`, read IMMEDIATELY by the caller (same
    *  synchronous flow; module-scratch idiom, like the Cartesian scratches). */
 
-flightState._drCourseDeg = null;
+  flightState._drCourseDeg = null;
 
-/** Sibling scratches of _drCourseDeg: the displayed ground speed of the motion
+  /** Sibling scratches of _drCourseDeg: the displayed ground speed of the motion
    *  `_deadReckon` just returned, and whether that motion is too slow for ANY
    *  course source to be trusted (hover/GPS drift — consumers HOLD their
    *  previous display course instead of chasing noise). */
 
-flightState._drSpeedMps = null;
+  flightState._drSpeedMps = null;
 
+  flightState._drCourseHold = false;
 
-flightState._drCourseHold = false;
+  /** Frame-cached course for the tracked aircraft (sibling of _cachedDRPosition). */
 
-/** Frame-cached course for the tracked aircraft (sibling of _cachedDRPosition). */
+  flightState._cachedDRCourse = null;
 
-flightState._cachedDRCourse = null;
+  /** Frame-cached siblings of _cachedDRCourse (same discipline). */
 
-/** Frame-cached siblings of _cachedDRCourse (same discipline). */
+  flightState._cachedDRSpeedMps = null;
 
-flightState._cachedDRSpeedMps = null;
+  flightState._cachedDRHold = false;
 
-
+  /** Wall-clock of the tracked course limiter's last advance (dt source only —
-flightState._cachedDRHold = false;
-
-/** Wall-clock of the tracked course limiter's last advance (dt source only —
    *  the course VALUE lives in the shared per-icao _displayCourse map below). */
 
-flightState._trackedCourseMs = 0;
+  flightState._trackedCourseMs = 0;
 
-/** Per-aircraft smoothed display course — the SINGLE source of truth for the
+  /** Per-aircraft smoothed display course — the SINGLE source of truth for the
    *  nose direction an aircraft displays (mirror of flights.js, 2026-07-03
    *  field fix). The fleet pass reads/writes it at tick cadence for untracked
    *  planes; _trackedDisplayCourse reads/writes the SAME entry per frame for
@@ -357,87 +328,73 @@ flightState._trackedCourseMs = 0;
    *  state — keeps the tracked↔fleet handoff seamless (separate states froze
    *  the fleet entry while tracked → nose flip on click / click-away). */
 
-flightState._displayCourse = new Map();
+  flightState._displayCourse = new Map();
 
+  flightState._drCorrection = new Cesium.Cartesian3(0, 0, 0);
 
-flightState._drCorrection = new Cesium.Cartesian3(0, 0, 0);
+  flightState._drCorrectionStartMs = 0;
 
+  flightState._drPrevRaw = new Cesium.Cartesian3();
 
-flightState._drCorrectionStartMs = 0;
+  flightState._drPrevDisplay = new Cesium.Cartesian3();
 
+  flightState._drPrevMs = 0;
 
-flightState._drPrevRaw = new Cesium.Cartesian3();
+  flightState._drReconcileValid = false;
 
+  /** @type {string|null} icao the reconciliation state currently belongs to */
 
-flightState._drPrevDisplay = new Cesium.Cartesian3();
+  flightState._drReconcileIcao = null;
 
+  /** @type {Cesium.Cartesian3} Scratch for the tracked model's rendered translation. */
 
-flightState._drPrevMs = 0;
+  flightState._trackedVisualPos = new Cesium.Cartesian3();
 
+  flightState._trackedTrailPos = new Cesium.Cartesian3();
 
-flightState._drReconcileValid = false;
+  /** Scratch for the tracked model's world-space origin (the envelope centre). */
 
-/** @type {string|null} icao the reconciliation state currently belongs to */
+  flightState._scratchTrailClip = new Cesium.Cartesian3();
 
-flightState._drReconcileIcao = null;
+  /** Scratch for the shortened trail-head start. Owned by the head-segment
-
-
-/** @type {Cesium.Cartesian3} Scratch for the tracked model's rendered translation. */
-
-flightState._trackedVisualPos = new Cesium.Cartesian3();
-
-
-flightState._trackedTrailPos = new Cesium.Cartesian3();
-
-/** Scratch for the tracked model's world-space origin (the envelope centre). */
-
-flightState._scratchTrailClip = new Cesium.Cartesian3();
-
-/** Scratch for the shortened trail-head start. Owned by the head-segment
    *  callback alone, so nothing else can overwrite it mid-frame. */
 
-flightState._scratchTrailHead = new Cesium.Cartesian3();
+  flightState._scratchTrailHead = new Cesium.Cartesian3();
 
-
+  /** Hysteresis latch for the tracked contact's zoom regime, plus the selection it
-/** Hysteresis latch for the tracked contact's zoom regime, plus the selection it
    *  belongs to. Scoped per selection so a NEW target re-evaluates against the ENTER
    *  ceiling instead of inheriting the previous target's looser EXIT band. */
 
-flightState._trackedZoomLatched = false;
+  flightState._trackedZoomLatched = false;
 
+  flightState._trackedZoomLatchIcao = null;
 
-flightState._trackedZoomLatchIcao = null;
+  flightState._trackedModelFailIcao = null;
 
+  flightState._trackedModelFailCount = 0;
 
-flightState._trackedModelFailIcao = null;
+  flightState._trackedModelRetryAtMs = 0;
 
-
+  /** IR hot-target mode — mirror of flights.js: under the luminance-mapped
-flightState._trackedModelFailCount = 0;
-
-
-flightState._trackedModelRetryAtMs = 0;
-
-
-/** IR hot-target mode — mirror of flights.js: under the luminance-mapped
    *  NVG/FLIR post-styles every model renders flat white (hottest); the dominant
    *  amber/tracked tint restores on style exit. */
 
-flightState._irBoost = false;
+  flightState._irBoost = false;
 
-/** Boosted models render UNLIT — mirror of flights.js (owner cockpit-FLIR
+  /** Boosted models render UNLIT — mirror of flights.js (owner cockpit-FLIR
    *  field rounds): material-stage tint still sun-shades, so side-on planes
    *  read near-black under a high sun; UNLIT emits flat white regardless.
    *  customShader on a READY model is a silent no-op (field-verified), so the
    *  boost flips by release-and-reload — creation-time options carry it. */
 
-flightState._IR_UNLIT_SHADER = new Cesium.CustomShader({ lightingModel: Cesium.LightingModel.UNLIT });
+  flightState._IR_UNLIT_SHADER = new Cesium.CustomShader({
+    lightingModel: Cesium.LightingModel.UNLIT,
+  });
 
+  flightState._irReloadQueue = null;
 
-flightState._irReloadQueue = null;
+  /** @type {Cesium.Cartographic} Scratch for _trailFloorPosition (per-frame safe). */
 
-
+  flightState._scratchTrailCarto = new Cesium.Cartographic();
-/** @type {Cesium.Cartographic} Scratch for _trailFloorPosition (per-frame safe). */
+  return flightState;
-
-flightState._scratchTrailCarto = new Cesium.Cartographic();
-return flightState;
 }

src/layers/military/testing.js

@@ -1,9 +1,13 @@
 import { AMBER_TRANSPARENT, TRACKED_ICON_COLOR } from './policy.js';
 
-export function createTesting({ flightState, services, parts, layer, resolveAsset }) {
+export function createTesting({
-
+  flightState,
-
+  services,
-/**
+  parts,
+  layer,
+  resolveAsset,
+}) {
+  /**
    * Seed only the mutable state needed to exercise tracked-card refreshes through
    * the production military poll reconciler. Tests still call
    * `militaryFlightsLayer.update()` rather than invoking the writer directly.
@@ -20,7 +24,7 @@ export function createTesting({ flightState, services, parts, layer, resolveAsse
    *   by icao24, for the billboard-hidden/model-shown handoff state.
    */
 
-function _setTrackedMilitaryRefreshStateForTest({
+  function _setTrackedMilitaryRefreshStateForTest({
     icao24,
     entity,
     meta,
@@ -31,7 +35,7 @@ function _setTrackedMilitaryRefreshStateForTest({
     tracked = true,
     models = [],
     modelCollection = null,
-}) {
+  }) {
     flightState._viewer = viewer;
     flightState._modelCollection = modelCollection;
     flightState._billboardCollection = billboardCollection;
@@ -55,16 +59,15 @@ function _setTrackedMilitaryRefreshStateForTest({
     // seam is used to test.
     flightState._backoff = false;
     flightState._retryAt = 0;
-}
+  }
 
+  /** Seed the authoritative snapshot outcome used by share-Follow tests. */
 
-/** Seed the authoritative snapshot outcome used by share-Follow tests. */
+  function _setMilitaryTrackingRefreshOutcomeForTest({
-
-function _setMilitaryTrackingRefreshOutcomeForTest({
     status = 'accepted',
     ids = [],
     source = flightState._lastSource,
-} = {}) {
+  } = {}) {
     const epoch = ++flightState._trackingRefreshEpoch;
     flightState._lastTrackingRefreshOutcome = {
       epoch,
@@ -72,66 +75,65 @@ function _setMilitaryTrackingRefreshOutcomeForTest({
       ids: new Set(ids.map((id) => String(id).trim().toLowerCase())),
       source,
     };
-}
+  }
 
+  /** Add a cached contact so tests can model a target arriving on a later feed. */
 
-/** Add a cached contact so tests can model a target arriving on a later feed. */
+  function _addMilitaryTrackingCandidateForTest({
-
+    icao24,
-function _addMilitaryTrackingCandidateForTest({ icao24, meta, billboard, history = [] }) {
+    meta,
+    billboard,
+    history = [],
+  }) {
     flightState._billboards.set(icao24, billboard);
     flightState._flightData.set(icao24, meta);
     flightState._positionHistory.set(icao24, history);
-}
+  }
 
+  /** Return the deferred restore target held by the production tracker. */
 
-/** Return the deferred restore target held by the production tracker. */
+  function _pendingMilitaryTrackingRestoreForTest() {
-
-function _pendingMilitaryTrackingRestoreForTest() {
     return flightState._pendingTrackingRestore?.id ?? null;
-}
+  }
 
+  /** Exercise the production deferred-restore retry after a simulated feed refresh. */
 
-/** Exercise the production deferred-restore retry after a simulated feed refresh. */
+  function _applyPendingMilitaryTrackingRestoreForTest() {
-
-function _applyPendingMilitaryTrackingRestoreForTest() {
     return parts.tracking._applyPendingTrackingRestore();
-}
+  }
 
+  /** Set the exact Cockpit subject through the production state transition for focused tests. */
 
-/** Set the exact Cockpit subject through the production state transition for focused tests. */
+  function _setCockpitDetectionSubjectForTest(active, subjectId = null) {
-
-function _setCockpitDetectionSubjectForTest(active, subjectId = null) {
     parts.tracking._applyCockpitState({ active, subjectId });
-}
+  }
 
-
+  /** Evaluate the TRACKED contact's zoom regime through the production predicate.
-/** Evaluate the TRACKED contact's zoom regime through the production predicate.
    *  The decision is latch-bearing (default-on, hysteretic, cockpit/TR-3B-suppressed)
    *  and otherwise only observable through a live scene, so tests drive it here. */
 
-function _trackedModelRegimeActiveForTest() {
+  function _trackedModelRegimeActiveForTest() {
     return parts.tracking._trackedModelRegimeActive();
-}
+  }
 
-
+  /** Run one frame of the production tracked-model driver (normally a
-/** Run one frame of the production tracked-model driver (normally a
    *  `scene.preUpdate` listener) so tests can pin its bounded load retries. */
 
-function _updateTrackedModelForTest() {
+  function _updateTrackedModelForTest() {
     return parts.rendering._updateTrackedModel();
-}
+  }
 
+  /** Evaluate the production tracked-billboard handoff colour for focused tests. */
 
-/** Evaluate the production tracked-billboard handoff colour for focused tests. */
+  function _trackedBillboardColorForTest() {
+    return parts.rendering._modelOwnsVisual(flightState._trackedIcao)
+      ? AMBER_TRANSPARENT
+      : TRACKED_ICON_COLOR;
+  }
 
-function _trackedBillboardColorForTest() {
+  /** Drive the exact fleet billboard-to-model handoff used by `_fleetTick`. */
-  return parts.rendering._modelOwnsVisual(flightState._trackedIcao) ? AMBER_TRANSPARENT : TRACKED_ICON_COLOR;
-}
 
-
+  function _driveFleetModelHandoffForTest({ icao24, position, course = 0 }) {
-/** Drive the exact fleet billboard-to-model handoff used by `_fleetTick`. */
-
-function _driveFleetModelHandoffForTest({ icao24, position, course = 0 }) {
     return parts.rendering._driveFleetModelHandoff(
       icao24,
       flightState._models.get(icao24),
@@ -139,14 +141,25 @@ function _driveFleetModelHandoffForTest({ icao24, position, course = 0 }) {
       position,
       course,
     );
-}
+  }
 
+  /** Exercise the exact asynchronous fleet loader and return its admitted model. */
 
-/** Exercise the exact asynchronous fleet loader and return its admitted model. */
+  async function _ensureFleetModelForTest(icao24) {
-
-async function _ensureFleetModelForTest(icao24) {
     await parts.rendering._ensureModel(icao24);
     return flightState._models.get(icao24) || null;
-}
+  }
-return { _setTrackedMilitaryRefreshStateForTest, _setMilitaryTrackingRefreshOutcomeForTest, _addMilitaryTrackingCandidateForTest, _pendingMilitaryTrackingRestoreForTest, _applyPendingMilitaryTrackingRestoreForTest, _setCockpitDetectionSubjectForTest, _trackedModelRegimeActiveForTest, _updateTrackedModelForTest, _trackedBillboardColorForTest, _driveFleetModelHandoffForTest, _ensureFleetModelForTest };
+  return {
+    _setTrackedMilitaryRefreshStateForTest,
+    _setMilitaryTrackingRefreshOutcomeForTest,
+    _addMilitaryTrackingCandidateForTest,
+    _pendingMilitaryTrackingRestoreForTest,
+    _applyPendingMilitaryTrackingRestoreForTest,
+    _setCockpitDetectionSubjectForTest,
+    _trackedModelRegimeActiveForTest,
+    _updateTrackedModelForTest,
+    _trackedBillboardColorForTest,
+    _driveFleetModelHandoffForTest,
+    _ensureFleetModelForTest,
+  };
 }

src/testSupport/readLayerSource.mjs

@@ -5,8 +5,14 @@ import { fileURLToPath } from 'node:url';
 /** Read actual component owners for structural regression assertions. */
 export function readLayerSource(file) {
   const path = file instanceof URL ? fileURLToPath(file) : file;
-  if (!['flights.js', 'militaryFlights.js'].includes(basename(path))) return readFileSync(path, 'utf8');
+  if (!['flights.js', 'militaryFlights.js'].includes(basename(path)))
-  const directory = join(dirname(path), basename(path) === 'flights.js' ? '../layers/flights' : '../layers/military');
+    return readFileSync(path, 'utf8');
+  const directory = join(
+    dirname(path),
+    basename(path) === 'flights.js'
+      ? '../layers/flights'
+      : '../layers/military',
+  );
   return readdirSync(directory)
     .filter((name) => name.endsWith('.js'))
     .sort()