Draw the aircraft fleet icons through the draw port

The civil flights and military layers now draw their contacts as one GPU
icon set each from the renderer's draw port instead of a custom primitive.
Each contact is an icon item whose motion is the dead reckoning the layer
plans (interpolation between fixes, warm-up and coast arcs, or a hold),
with its nose gliding onto a new course at the fleet's slew cap. A
contact's item is replanned when its motion runs out, grounded contacts
are pinned with held motion, and focus de-emphasis is written per item.
The near/far image switch follows the renderer's pixel ratio, and writes
made during a fleet tick reach the set before that frame draws.

The aircraft icon layer and the flights icon part no longer touch Cesium
and leave the allow-list. Clicks resolve the draw port's pick ids as well
as the ones the tracked model and entities still carry, so selection,
follow and share-follow work as before.
This commit is contained in:
Sameh Khamis committed 2026-11-07 04:25:24 -08:00
1 parent e94b7ffb01
commit dbd6363e43
30 files changed
+977 -551

No files matched your search

+4 -5
View File
@@ -193,15 +193,14 @@ export function createEnrichment({
);
const cand = [];
const icons = flightState._icons;
const tau = parts.icons._displayTau();
for (let row = 0; row < icons.count; row++) {
const icao24 = icons.idAt(row);
const t = parts.icons._displayMs();
for (const icao24 of icons.ids()) {
if (flightState._enrichSeen.has(`t:${icao24}`)) continue; // answered / queued / negative this session
if (!/^[0-9a-f]{6}$/i.test(icao24)) continue; // adsbdb keys are 6-char hex only
if (flightState.records.data.get(icao24)?.onGround) continue; // ground traffic never spends ambient budget (click-to-enrich still works)
const position = icons.position(
row,
tau,
icao24,
t,
flightState._scratchModelBS.center,
);
if (!occluder.isPointVisible(position)) continue; // beyond the limb
+26 -22
View File
@@ -1,11 +1,9 @@
import * as Cesium from 'cesium';
import { FOCUS_EVIDENCE_DEV } from './policy.js';
import { writeHoldSegment } from '../../data/iconSegment.js';
import {
aircraftRecessionFactors,
aircraftTreatmentAlpha,
} from '../../data/aircraftRecession.js';
import { horizonOccluder } from '../../data/iconOrientation.js';
export function createEvidence({
flightState,
@@ -41,6 +39,16 @@ export function createEvidence({
);
}
/** An icon item's motion held at `position` on `courseDeg`. */
function _heldAt(position, courseDeg) {
return {
pos: { x: position.x, y: position.y, z: position.z },
course: courseDeg,
motion: { kind: 'hold', courseDeg },
courseGlide: undefined,
};
}
/** Replace the real fleet with deterministic explicit-position contacts. */
function _setFocusEvidenceAircraft(records = []) {
@@ -85,9 +93,9 @@ export function createEvidence({
flightState.records.data.set(id, meta);
flightState._focusEvidenceIds.add(id);
parts.icons._addIcon(id);
const row = icons.row(id);
writeHoldSegment(icons.segments, row, position, meta.true_track);
icons.segmentWritten(row);
icons.update(id, _heldAt(position, meta.true_track), {
expiresAt: Infinity,
});
}
flightState.feed._count = icons.count;
flightState._lastFleetTickMs = 0;
@@ -106,21 +114,16 @@ export function createEvidence({
.toLowerCase();
if (!flightState._focusEvidenceIds.has(id)) continue;
const position = _focusEvidencePosition(record);
const row = flightState._icons?.row(id) ?? -1;
if (!position || row < 0) continue;
if (!position || !flightState._icons?.has(id)) continue;
const meta = flightState.records.data.get(id);
if (meta) {
if (Number.isFinite(record.trackDeg)) meta.true_track = record.trackDeg;
if (Number.isFinite(record.velocityMps))
meta.velocity = record.velocityMps;
}
writeHoldSegment(
flightState._icons.segments,
row,
position,
meta?.true_track ?? 0,
);
flightState._icons.segmentWritten(row);
flightState._icons.update(id, _heldAt(position, meta?.true_track ?? 0), {
expiresAt: Infinity,
});
moved += 1;
}
flightState._lastFleetTickMs = 0;
@@ -134,11 +137,12 @@ export function createEvidence({
if (!FOCUS_EVIDENCE_DEV || !flightState._viewer) return [];
const icons = flightState._icons;
const { scene, camera } = flightState._viewer;
const occluder = horizonOccluder(camera);
const occluder = parts.icons._occluder();
const cameraHeightM = camera.positionCartographic?.height;
return [...flightState._focusEvidenceIds].map((id) => {
const row = icons?.row(id) ?? -1;
const position = row < 0 ? null : parts.icons._iconPosition(id);
const position = icons?.has(id)
? parts.icons._iconPosition(id, new Cesium.Cartesian3())
: null;
const cameraDistanceM = position
? Cesium.Cartesian3.distance(camera.positionWC, position)
: null;
@@ -154,13 +158,13 @@ export function createEvidence({
id,
show:
!!position &&
icons.shown(row) &&
parts.icons._aboveHorizon(row, position, occluder),
scale: factors ? icons.scale(row) * factors.scale : null,
icons.shown(id) &&
parts.icons._aboveHorizon(position, occluder),
scale: factors ? icons.scale(id) * factors.scale : null,
alpha: position
? aircraftTreatmentAlpha({
baseAlpha: icons.alpha(row),
focusFactor: icons.focus(row),
baseAlpha: icons.alpha(id),
focusFactor: icons.focus(id),
cameraDistanceM,
cameraHeightM,
})
+47 -50
View File
@@ -1,11 +1,7 @@
import * as Cesium from 'cesium';
import { courseSlewCapDps, norm180 } from '../../data/motionModel.js';
import {
segmentTargetCourse,
writeCourseGlide,
writeHoldSegment,
} from '../../data/iconSegment.js';
import { courseSlewCapDps } from '../../data/motionModel.js';
import { createAircraftIcons } from '../../data/aircraftIconLayer.js';
import { motionCourse } from '../../render/motion/iconMotion.js';
import { distanceSquared, norm180 } from '../../geo/vector.js';
import {
COCKPIT_CONTACT_SIZE_PX,
COURSE_MAX_DPS,
@@ -24,7 +20,6 @@ const PIN_TURN_DEG = 0.1;
* planned, and settling a grounded contact puts it straight onto the floor.
*/
export function createIcons({ flightState, services, parts }) {
const scratchPosition = new Cesium.Cartesian3();
const icons = createAircraftIcons({
state: flightState,
services,
@@ -42,13 +37,8 @@ export function createIcons({ flightState, services, parts }) {
// until the next fleet tick raises it.
afterSettle(icao24) {
if (!flightState._grounded.has(icao24)) return;
const renderTime = icons._displayTime();
_floorIcon(
icao24,
renderTime,
flightState._icons.seconds(renderTime),
Date.now(),
);
const t = icons._displayMs();
_floorIcon(icao24, parts.motion._displayTimeAt(t), t, Date.now());
},
onForget(icao24) {
flightState._displayFloorState.delete(icao24);
@@ -59,11 +49,16 @@ export function createIcons({ flightState, services, parts }) {
/**
* Grounded contacts stand on the floor under where they are DRAWN, which the
* GPU cannot sample. While the floor lifts one, the CPU pins its row to a
* hold at the floored dead-reckoned position each tick (rewritten only when
* it moved); once nothing lifts it the row goes back to its planned segment.
* renderer cannot sample. While the floor lifts one, the CPU pins its item
* to a hold at the floored dead-reckoned position each tick (rewritten only
* when it moved); once nothing lifts it the item goes back to its planned
* motion.
* @param {object} renderTime The display instant (the motion part's `_displayTimeAt`).
* @param {number} t The same instant, epoch ms.
* @param {number} nowMs
* @param {{x: number, y: number, z: number}|null} cameraPosition The eye.
*/
function _floorGroundedIcons(renderTime, tau, nowMs, cameraPosition) {
function _floorGroundedIcons(renderTime, t, nowMs, cameraPosition) {
const set = flightState._icons;
// Past FLOOR_NEAR_M a taxiing contact moves well under a pixel per tick,
// so far rows take turns: each refreshes every FLOOR_FAR_EVERY_TICKS. Their
@@ -71,28 +66,25 @@ export function createIcons({ flightState, services, parts }) {
// out there too — sub-pixel at that range, and full rate once near.
const turn = flightState._floorTick++ % FLOOR_FAR_EVERY_TICKS;
const nearSq = FLOOR_NEAR_M * FLOOR_NEAR_M;
let index = -1;
for (const icao24 of flightState._grounded) {
if (icao24 === flightState._trackedIcao) continue;
const row = set.row(icao24);
if (row < 0) continue;
if (!set.has(icao24)) continue;
index += 1;
if (
row % FLOOR_FAR_EVERY_TICKS !== turn &&
index % FLOOR_FAR_EVERY_TICKS !== turn &&
cameraPosition &&
Cesium.Cartesian3.distanceSquared(
cameraPosition,
set.position(row, tau, scratchPosition),
) > nearSq
distanceSquared(cameraPosition, set.position(icao24, t)) > nearSq
)
continue;
_floorIcon(icao24, renderTime, tau, nowMs);
_floorIcon(icao24, renderTime, t, nowMs);
}
}
/** One grounded contact's floor pass (see `_floorGroundedIcons`). */
function _floorIcon(icao24, renderTime, tau, nowMs) {
function _floorIcon(icao24, renderTime, t, nowMs) {
const set = flightState._icons;
const row = set.row(icao24);
if (row < 0) return;
if (!set?.has(icao24)) return;
const info = flightState.records.data.get(icao24);
const raw = parts.motion._deadReckon(
icao24,
@@ -112,35 +104,40 @@ export function createIcons({ flightState, services, parts }) {
);
if (!display || display === raw) {
if (flightState._floorPinned.delete(icao24))
icons._planIcon(icao24, { fromCourseDeg: set.course(row, tau) });
icons._planIcon(icao24, { fromCourseDeg: set.course(icao24, t) });
return;
}
const planned = set.expires(row) !== -Infinity;
const prev = planned ? set.course(row, tau) : null;
// The pin holds the position; the GPU glides the course onto the target,
// so the rate stays exact however seldom the pin is rewritten.
const planned = set.expires(icao24) !== -Infinity;
const prev = planned ? set.course(icao24, t) : null;
// The pin holds the position; the renderer glides the course onto the
// target, so the rate stays exact however seldom the pin is rewritten.
const target = hold && prev != null ? prev : rawCourse;
const item = set.item(icao24);
if (
flightState._floorPinned.has(icao24) &&
Cesium.Cartesian3.distanceSquared(
display,
set.position(row, tau, scratchPosition),
) <= PIN_MOVE_SQ_M &&
Math.abs(norm180(target - segmentTargetCourse(set.segments, row, tau))) <=
distanceSquared(display, set.position(icao24, t)) <= PIN_MOVE_SQ_M &&
Math.abs(norm180(target - motionCourse(item.motion, item.course, t))) <=
PIN_TURN_DEG
)
return;
flightState._floorPinned.add(icao24);
writeHoldSegment(set.segments, row, display, target);
if (prev != null)
writeCourseGlide(
set.segments,
row,
prev,
tau,
courseSlewCapDps(speed, COURSE_MAX_DPS),
);
set.segmentWritten(row);
set.update(
icao24,
{
pos: { x: display.x, y: display.y, z: display.z },
course: target,
motion: { kind: 'hold', courseDeg: target },
courseGlide:
prev == null
? undefined
: {
fromCourseDeg: prev,
t0: t,
rateDps: courseSlewCapDps(speed, COURSE_MAX_DPS),
},
},
{ expiresAt: Infinity },
);
}
return { ...icons, _floorGroundedIcons };
+37 -18
View File
@@ -3,12 +3,16 @@ import assert from 'node:assert/strict';
import * as Cesium from 'cesium';
import { createFlightState } from './state.js';
import { createIcons } from './icons.js';
import { createIconSet } from '../../data/iconSet.js';
import { writeHoldSegment } from '../../data/iconSegment.js';
import { createContactIcons } from '../../data/aircraftIconLayer.js';
function services(focus = {}) {
return {
focus: { focusPassIsNeeded: () => true, ...focus },
focus: {
focusPassIsNeeded: () => true,
focusAlphaNeedsWrite: (a, b) => Math.abs(a - b) > 1e-3,
spriteFocusAtRest: () => false,
...focus,
},
groundSnap: { createGroundSnap: () => ({ clear() {}, forget() {} }) },
};
}
@@ -16,20 +20,35 @@ function services(focus = {}) {
function setup({ focus, motion = {}, rendering = {} } = {}) {
const svc = services(focus);
const flightState = createFlightState({ services: svc });
flightState._icons = createIconSet();
flightState._icons = createContactIcons();
const parts = {
motion,
motion: {
_displayTimeAt: (ms) => Cesium.JulianDate.fromDate(new Date(ms)),
_fixEpochMs: (fix) => Cesium.JulianDate.toDate(fix.time).getTime(),
...motion,
},
rendering: { _modelOwnsVisual: () => false, ...rendering },
};
const icons = createIcons({ flightState, services: svc, parts });
return { flightState, icons, set: flightState._icons };
}
function hold(set, id, position, course = 0) {
const row = set.add(id, { layer: 'flights', id });
writeHoldSegment(set.segments, row, position, course);
set.segmentWritten(row);
return row;
function hold(set, id, position, course = 0, show = false) {
set.put(
{
id,
pos: { x: position.x, y: position.y, z: position.z },
motion: { kind: 'hold', courseDeg: course },
course,
size: [20, 20],
scale: 1,
show,
focus: 1,
meta: { layer: 'flights', id },
},
{ expiresAt: Infinity },
);
return id;
}
const at = (lon, h = 1000) => Cesium.Cartesian3.fromDegrees(lon, 30, h);
@@ -39,18 +58,18 @@ test('focus advances for drawn rows and for rows a fleet model draws for', () =>
const { flightState, icons, set } = setup({
focus: {
nearFarScalarValueAtDistance: () => 1,
advanceProjectedSpriteFocus(meta) {
advanceSpriteFocus(meta) {
advanced.push(meta.id);
return { factor: 0.4, active: true };
},
},
});
set.setShown(hold(set, 'drawn', at(0)), true);
hold(set, 'drawn', at(0), 0, true);
const modeled = hold(set, 'modeled', at(0.1));
hold(set, 'hidden', at(0.2));
flightState._models.set('modeled', {});
icons._focusIcons(0, {}, { positionWC: at(0, 50_000) }, 0, {});
icons._focusIcons(0, 0, {});
assert.deepEqual(advanced, ['drawn', 'modeled']);
assert.ok(
Math.abs(set.focus(modeled) - 0.4) < 1e-6,
@@ -90,9 +109,9 @@ test('settling a pinned grounded contact re-floors it where it is now, nose kept
flightState._positionHistory.set('g', [{}]);
icons._settleIcon('g', { fromCourseDeg: 123 });
const tau = icons._displayTau();
assert.ok(Cesium.Cartesian3.distance(set.position(row, tau), floored) < 0.01);
assert.ok(Math.abs(set.course(row, tau) - 123) < 1e-3, 'tracked nose kept');
const t = icons._displayMs();
assert.ok(Cesium.Cartesian3.distance(set.position(row, t), floored) < 0.01);
assert.ok(Math.abs(set.course(row, t) - 123) < 1e-3, 'tracked nose kept');
assert.ok(flightState._floorPinned.has('g'), 'pinned on the new floor');
});
@@ -102,7 +121,7 @@ test('a contact that comes back dimmed re-arms the idle focus pass', () => {
focus: {
focusPassIsNeeded: (target, active) => target != null || active > 0,
nearFarScalarValueAtDistance: () => 1,
advanceProjectedSpriteFocus(meta) {
advanceSpriteFocus(meta) {
advanced.push(meta.id);
return { factor: 1, active: false, transitioning: false };
},
@@ -114,7 +133,7 @@ test('a contact that comes back dimmed re-arms the idle focus pass', () => {
flightState._iconFocusActive = 0;
icons._settleIcon('was-tracked');
set.setShown(row, true);
icons._focusIcons(0, {}, { positionWC: at(0, 50_000) }, 0, null);
icons._focusIcons(0, 0, null);
assert.deepEqual(advanced, ['was-tracked']);
assert.equal(set.focus(row), 1);
});
+4 -12
View File
@@ -9,11 +9,8 @@ export function createLifecycle({
resolveAsset,
}) {
const { clearFocusTarget } = services.focus;
const {
registerSpriteCollection,
restoreSpriteOrder,
restoreSpriteOrderOnEnable,
} = services.sprites;
const { registerSpriteSet, restoreSpriteOrder, restoreSpriteOrderOnEnable } =
services.sprites;
const { onMilitaryLayerActiveChange } = services.militaryRegistry;
const { holdContinuousRender, releaseContinuousRender } = services.render;
const { ensureGeoidReady } = services.geoid;
@@ -48,7 +45,7 @@ export function createLifecycle({
clearFocusTarget('flights');
flightState._focusEvidenceIds.clear();
flightState._viewer = viewer;
registerSpriteCollection('flights', parts.icons._createIcons(viewer));
registerSpriteSet('flights', parts.icons._createIcons(viewer));
flightState._modelCollection = new Cesium.PrimitiveCollection();
viewer.scene.primitives.add(flightState._modelCollection);
// Warm the glTF cache so the tracked plane's model instantiates instantly when first needed
@@ -267,12 +264,7 @@ export function createLifecycle({
flightState._moveEndRemove = null;
}
parts.rendering._releaseModels();
if (flightState._iconPrimitive) {
viewer.scene.primitives.remove(flightState._iconPrimitive); // removing destroys it
flightState._iconPrimitive = null;
}
flightState._icons?.clear();
flightState._icons = null;
parts.icons._disposeIcons();
if (flightState._modelCollection) {
viewer.scene.primitives.remove(flightState._modelCollection); // removing destroys it + its models
flightState._modelCollection = null;
+11 -1
View File
@@ -36,6 +36,8 @@ import { readEntityRecord } from '../../data/entityRecords.js';
import {
aircraftMotionRegime,
createMotionRegime,
fixEpochMs,
julianAt,
fixSpeedMps,
fixTrackDeg,
} from '../../data/aircraftMotionRegime.js';
@@ -140,7 +142,10 @@ export function createMotion({
function _deadReckon(icao24, result, sampledRenderTime) {
const info = flightState.records.data.get(icao24);
if (FOCUS_EVIDENCE_DEV && flightState._focusEvidenceIds.has(icao24)) {
const position = parts.icons._iconPosition(icao24);
const position = parts.icons._iconPosition(
icao24,
new Cesium.Cartesian3(),
);
flightState._drCourseDeg = info?.true_track || 0;
flightState._drSpeedMps = info?.velocity || 0;
flightState._drCourseHold =
@@ -1056,9 +1061,14 @@ export function createMotion({
out.push(cell);
}
}
/** The display instant `epochMs` as a JulianDate, for `_motionRegime`. */
const _displayTimeAt = (epochMs, result) => julianAt(epochMs, result);
return {
_refloorStaleGroundedContacts,
_deadReckon,
_displayTimeAt,
_fixEpochMs: fixEpochMs,
_motionRegime,
_extrapolateFix,
_isTrackWarmingUp,
+17 -18
View File
@@ -135,7 +135,8 @@ export function createQueries({
// `_trackedDisplayPosition`). If that ever changes, floor this path too.
const info = flightState.records.data.get(icao24);
const basePos =
parts.motion._deadReckon(icao24) || parts.icons._iconPosition(icao24);
parts.motion._deadReckon(icao24) ||
parts.icons._iconPosition(icao24, new Cesium.Cartesian3());
if (!basePos) return null;
const displayed = displayedKinematics({
derivedSpeedMps: flightState._drSpeedMps,
@@ -428,11 +429,12 @@ export function createQueries({
const stride = Math.max(1, Math.ceil(icons.count / maxCount));
const start = seed % stride;
const occluder = parts.icons._occluder();
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const result = [];
for (let row = start; row < icons.count; row += stride) {
const icao24 = icons.idAt(row);
const ids = icons.ids();
for (let i = start; i < ids.length; i += stride) {
const icao24 = ids[i];
if (
flightState._cockpitContactMode &&
icao24.toLowerCase() === flightState._cockpitSubjectId
@@ -446,7 +448,7 @@ export function createQueries({
icao24,
record,
);
if (!isTracked && !icons.shown(row) && !modelOwnsVisual) continue;
if (!isTracked && !icons.shown(icao24) && !modelOwnsVisual) continue;
const info = flightState.records.data.get(icao24);
let object = flightState._detectionObjects.get(icao24);
if (!object) {
@@ -471,7 +473,7 @@ export function createQueries({
: null;
const pos = isTracked
? parts.motion._trackedVisualCached() ||
icons.position(row, tau, object._iconPos)
icons.position(icao24, t, object._iconPos)
: modelOwnsVisual
? modelVisualAnchor(
record.matrix,
@@ -481,13 +483,13 @@ export function createQueries({
: spec.scale,
object._weldPos || (object._weldPos = new Cesium.Cartesian3()),
)
: icons.position(row, tau, object._iconPos);
: icons.position(icao24, t, object._iconPos);
// An icon past the horizon is not drawn, so it is not detectable.
if (
!pos ||
(!isTracked &&
!modelOwnsVisual &&
!parts.icons._aboveHorizon(row, pos, occluder))
!parts.icons._aboveHorizon(pos, occluder))
)
continue;
object.position = pos;
@@ -579,7 +581,7 @@ export function createQueries({
const icons = flightState._icons;
if (!center || !icons || !icons.show) return [];
const occluder = parts.icons._occluder();
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const scratch = flightState._scratchNearbyPos;
const limit = Number.isFinite(maxCount)
@@ -590,21 +592,19 @@ export function createQueries({
const nearby = [];
for (let row = 0; row < icons.count; row++) {
const icao24 = icons.idAt(row);
for (const icao24 of icons.ids()) {
const isTracked = icao24 === flightState._trackedIcao;
const trackedPos = isTracked
? parts.motion._trackedDisplayCached()
: null; // cached, no recompute (anti-jitter)
const drawn = trackedPos || icons.position(row, tau, scratch);
const drawn = trackedPos || icons.position(icao24, t, scratch);
// Keep planes rendered as a 3D model (icon hidden) so proximity counts
// don't drop to zero on the 2D→3D handoff.
if (
!aircraftIncludedInNearby({
isTracked,
billboardShown:
icons.shown(row) &&
parts.icons._aboveHorizon(row, drawn, occluder),
icons.shown(icao24) && parts.icons._aboveHorizon(drawn, occluder),
modelRendering: parts.rendering._modelOwnsVisual(icao24),
includeHidden,
})
@@ -678,12 +678,11 @@ export function createQueries({
const limit = Number.isFinite(maxCount)
? Math.max(1, Math.floor(maxCount))
: 500;
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const result = [];
for (let row = 0; row < icons.count; row++) {
const icao24 = icons.idAt(row);
const pos = icons.position(row, tau);
for (const icao24 of icons.ids()) {
const pos = icons.position(icao24, t, new Cesium.Cartesian3());
const carto = Cesium.Cartographic.fromCartesian(
pos,
Cesium.Ellipsoid.WGS84,
+15 -13
View File
@@ -4,8 +4,7 @@ import * as Cesium from 'cesium';
import { createQueries } from './queries.js';
import { createRendering } from './rendering.js';
import { createIcons } from './icons.js';
import { createIconSet } from '../../data/iconSet.js';
import { writeHoldSegment } from '../../data/iconSegment.js';
import { createContactIcons } from '../../data/aircraftIconLayer.js';
import {
createModelRecord,
placeModel,
@@ -18,11 +17,10 @@ function fixture() {
registration: ' N123 ',
altitude: 1000,
};
const icons = createIconSet();
const icons = createContactIcons();
const flightState = {
feed: {},
_icons: icons,
_scratchIconRenderTime: new Cesium.JulianDate(),
_models: new Map(),
_detectionObjects: new Map(),
records: { data: new Map([['abc123', info]]) },
@@ -49,15 +47,18 @@ function fixture() {
parts.rendering = createRendering({ flightState, services, parts });
parts.icons = createIcons({ flightState, services, parts });
const queries = createQueries({ flightState, services, parts }).methods;
const row = () => icons.row('abc123');
/** Hold the contact's icon at `position`. */
const place = (position) => {
writeHoldSegment(icons.segments, row(), position, 0);
icons.segmentWritten(row());
};
icons.add('abc123', { id: 'abc123' });
const place = (position) =>
icons.update(
'abc123',
{
pos: { x: position.x, y: position.y, z: position.z },
motion: { kind: 'hold', courseDeg: 0 },
},
{ expiresAt: Infinity },
);
icons.put({ id: 'abc123', pos: { x: 0, y: 0, z: 0 }, show: true });
place(new Cesium.Cartesian3(1, 2, 3));
icons.setShown(row(), true);
return {
flightState,
info,
@@ -65,8 +66,9 @@ function fixture() {
queries,
formats: () => formats,
place,
show: (shown) => icons.setShown(row(), shown),
drawn: () => parts.icons._iconPosition('abc123'),
show: (shown) => icons.setShown('abc123', shown),
drawn: () =>
parts.icons._iconPosition('abc123', new Cesium.Cartesian3()),
};
}
+2 -7
View File
@@ -94,13 +94,8 @@ export function createRendering({
// About to render in 3D: jump the ambient type-enrichment backlog.
onModelEligible: (icao24) =>
parts.enrichment._requestTypeEnrichment(icao24, true),
afterReplan: (renderTime, tau, nowMs, camera) =>
parts.icons._floorGroundedIcons(
renderTime,
tau,
nowMs,
camera.positionWC,
),
afterReplan: (renderTime, t, nowMs, camera) =>
parts.icons._floorGroundedIcons(renderTime, t, nowMs, camera.positionWC),
});
return {
+1 -2
View File
@@ -178,8 +178,7 @@ export function createFlightSnapshotRenderer({
// LANDED_MISSING_POLL_LIMIT — their disappearance means "landed", not a
// feed gap, and the full grace left phantom planes parked at airports.
const absentIds = [];
for (let row = 0; row < flightState._icons.count; row++) {
const icao24 = flightState._icons.idAt(row);
for (const icao24 of flightState._icons.ids()) {
if (!currentIcaos.has(icao24)) absentIds.push(icao24);
}
for (const icao24 of absentIds) {
+2 -7
View File
@@ -96,16 +96,11 @@ export function createFlightState({ source, services }) {
// Module-level state: billboard collection and per-aircraft lookup maps
// ---------------------------------------------------------------------------
/** Every contact's icon row (see icons.js); null outside a layer lifetime. */
/** Every contact's icon item as drawn (`createContactIcons`, see icons.js);
* null outside a layer lifetime. */
flightState._icons = null;
/** The primitive drawing `_icons`. */
flightState._iconPrimitive = null;
flightState._scratchIconRenderTime = new Cesium.JulianDate();
/** Contacts whose latest poll put them on the ground. */
flightState._grounded = new Set();
+6 -8
View File
@@ -1,8 +1,10 @@
import * as Cesium from 'cesium';
import { CYAN_TRANSPARENT } from './policy.js';
import { createModelRecord } from '../../data/modelRecord.js';
import { createIconSet } from '../../data/iconSet.js';
import { aircraftIconTestSeams } from '../../data/aircraftIconLayer.js';
import {
aircraftIconTestSeams,
createContactIcons,
} from '../../data/aircraftIconLayer.js';
export function createTesting({
flightState,
@@ -73,9 +75,7 @@ export function createTesting({
}) {
flightState._viewer = viewer;
flightState._modelCollection = modelCollection;
flightState._icons = createIconSet({
epoch: parts.icons._displayTime(new Cesium.JulianDate()),
});
flightState._icons = createContactIcons();
flightState._icons.show = iconLayer?.show ?? true;
flightState._grounded.clear();
flightState._floorPinned.clear();
@@ -195,7 +195,6 @@ export function createTesting({
return parts.rendering._driveFleetModelHandoff(
icao24,
flightState._models.get(icao24),
flightState._icons.row(icao24),
position,
course,
);
@@ -210,10 +209,9 @@ export function createTesting({
/** Run the fleet tick's grounded floor pass once, at `renderTime`. */
function _floorGroundedIconsForTest(renderTime, cameraPosition) {
const icons = flightState._icons;
parts.icons._floorGroundedIcons(
renderTime,
icons.seconds(renderTime),
Cesium.JulianDate.toDate(renderTime).getTime(),
Date.now(),
cameraPosition,
);
+41 -29
View File
@@ -34,6 +34,18 @@ import {
import { roundHeadingDegrees } from '../../data/headingDegrees.js';
import { entityRecord } from '../../data/entityRecords.js';
/**
* The icao a pick carries: a draw-set item's id (the icon sets' rows), a
* string pick id, or a model primitive's id.
*/
function aircraftPickId(picked) {
const id = picked?.id;
if (typeof id === 'string') return id;
if (id && typeof id.set === 'string' && typeof id.id === 'string')
return id.id;
return picked?.primitive?.id;
}
export function createTracking({
flightState,
services,
@@ -70,7 +82,7 @@ export function createTracking({
}
function _publishTrackedSelection(icao24, origin = 'programmatic') {
const position = parts.icons._iconPosition(icao24);
const position = parts.icons._iconPosition(icao24, new Cesium.Cartesian3());
const info = flightState.records.data.get(icao24);
if (!position || !info) return false;
if (flightState._trackedEntity)
@@ -169,11 +181,14 @@ export function createTracking({
const previous = flightState._cockpitNearContacts;
const distancesSquared = [];
const icons = flightState._icons;
const tau = parts.icons._displayTau();
for (let row = 0; row < (icons?.count ?? 0); row++) {
const icao24 = icons.idAt(row);
const t = parts.icons._displayMs();
for (const icao24 of icons?.ids() ?? []) {
if (icao24 === flightState._trackedIcao) continue;
const position = icons.position(row, tau, flightState._scratchCockpitPos);
const position = icons.position(
icao24,
t,
flightState._scratchCockpitPos,
);
distancesSquared.push([
icao24,
Cesium.Cartesian3.distanceSquared(
@@ -210,9 +225,8 @@ export function createTracking({
if (flightState._modelCollection) flightState._modelCollection.show = true;
flightState._trail?.setVisible(!next);
if (flightState._trailHeadEntity) flightState._trailHeadEntity.show = !next;
const icons = flightState._icons;
for (let row = 0; row < (icons?.count ?? 0); row++)
parts.icons._applyIconPresentation(icons.idAt(row));
for (const icao24 of flightState._icons?.ids() ?? [])
parts.icons._applyIconPresentation(icao24);
flightState._lastFleetTickMs = 0;
}
@@ -324,7 +338,10 @@ export function createTracking({
if (!flightState._trackedIcao || !flightState._viewer) return;
const pos =
parts.motion._trackedDisplayCached() ||
parts.icons._iconPosition(flightState._trackedIcao);
parts.icons._iconPosition(
flightState._trackedIcao,
new Cesium.Cartesian3(),
);
if (!pos) return;
const projected = screenProjectedRotation(
flightState._viewer.scene,
@@ -665,7 +682,7 @@ export function createTracking({
// contact, and while it still read as tracked its tracked model owned the
// visual, so the floor would have stepped aside.
if (flightState._icons?.has(clearedIcao)) {
flightState._icons.setShown(flightState._icons.row(clearedIcao), true);
flightState._icons.setShown(clearedIcao, true);
parts.icons._settleIcon(clearedIcao, { fromCourseDeg: trackedCourseDeg });
}
parts.icons._applyIconPresentation(clearedIcao);
@@ -820,9 +837,8 @@ export function createTracking({
// an already-loaded model would otherwise linger with the billboard hidden.
if (flightState._models.has(id) || flightState._modelPending.has(id))
parts.rendering._releaseModel(id);
const row = flightState._icons?.row(id) ?? -1;
if (row >= 0 && id !== flightState._trackedIcao)
flightState._icons.setShown(row, true);
if (flightState._icons?.has(id) && id !== flightState._trackedIcao)
flightState._icons.setShown(id, true);
if (id === flightState._trackedIcao) {
parts.rendering._releaseTrackedModel();
_syncTracked2dRotation();
@@ -852,7 +868,7 @@ export function createTracking({
function _routeIsPlausible(icao24, route) {
const info = flightState.records.data.get(icao24);
const position = parts.icons._iconPosition(icao24);
const position = parts.icons._iconPosition(icao24, new Cesium.Cartesian3());
if (!info || !position) return true;
const carto = Cesium.Cartographic.fromCartesian(
position,
@@ -891,15 +907,15 @@ export function createTracking({
_clearTracking(false, { origin }); // switching planes — the new follow-camera takes over
const icons = flightState._icons;
const row = icons?.row(icao24) ?? -1;
const info = flightState.records.data.get(icao24);
if (row < 0 || !info) return;
if (!icons?.has(icao24) || !info) return;
// The tracked limiter continues from the nose the icon was drawn with, and
// the entity starts with the rotation the icon had on screen.
const tau = parts.icons._displayTau();
const iconPosition = icons.position(row, tau);
flightState._displayCourse.set(icao24, icons.course(row, tau));
const t = parts.icons._displayMs();
const iconPosition = icons.position(icao24, t, new Cesium.Cartesian3());
const iconCourse = icons.course(icao24, t);
flightState._displayCourse.set(icao24, iconCourse);
flightState._trackedIcao = icao24;
_resetTrackedSelectionState(); // fresh selection: enter at the ENTER ceiling, full load-retry budget
flightState._cachedDRFrame = -1;
@@ -907,7 +923,7 @@ export function createTracking({
screenProjectedRotation(
flightState._viewer.scene,
iconPosition,
icons.course(row, tau),
iconCourse,
0,
) ?? 0;
// Drop any fleet 3D model for this aircraft — the tracked entity now owns its visual (its
@@ -916,7 +932,7 @@ export function createTracking({
parts.rendering._releaseModel(icao24);
// Hide the icon — the tracked entity replaces it visually
icons.setShown(row, false);
icons.setShown(icao24, false);
// Helper: smoothed, per-frame-cached tracked position (see _trackedDisplayPosition —
// one computation shared by the position/alignedAxis/rotation/trail-head callbacks,
@@ -924,7 +940,7 @@ export function createTracking({
// the aircraft has no fix.
const getTrackedPosition = () =>
parts.motion._trackedDisplayPosition(icao24) ||
parts.icons._iconPosition(icao24) ||
parts.icons._iconPosition(icao24, new Cesium.Cartesian3()) ||
iconPosition;
// Dead-reckoning position property — smooth continuous motion between API updates.
@@ -1100,8 +1116,7 @@ export function createTracking({
if (!flightState._viewer || !icons) return;
if (active) {
const suppressed = [];
for (let row = 0; row < icons.count; row++) {
const icao24 = icons.idAt(row);
for (const icao24 of icons.ids()) {
if (isMilitaryIcao(icao24) && icao24 !== flightState._trackedIcao)
suppressed.push(icao24);
}
@@ -1185,8 +1200,7 @@ export function createTracking({
// above. H1: the model used to have no pick id, so this fell through to
// "empty space" and deselected the very plane being tracked.
if (flightState._trackedIcao) {
const rawPick =
typeof picked.id === 'string' ? picked.id : picked.primitive?.id;
const rawPick = aircraftPickId(picked);
if (
(flightState._trackedModel &&
picked.primitive === flightState._trackedModel.model) ||
@@ -1195,9 +1209,7 @@ export function createTracking({
return;
}
// Icon picks carry the icao on picked.id; models carry it on the primitive.
const pickedIcao =
typeof picked.id === 'string' ? picked.id : picked.primitive?.id;
const pickedIcao = aircraftPickId(picked);
if (pickedIcao && flightState._icons?.has(pickedIcao)) {
_cancelPendingTrackingRestore();
_trackFlight(pickedIcao, { origin: 'user' });
+3 -8
View File
@@ -9,7 +9,7 @@ export function createLifecycle({
resolveAsset,
}) {
const { clearFocusTarget } = services.focus;
const { registerSpriteCollection, restoreSpriteOrder } = services.sprites;
const { registerSpriteSet, restoreSpriteOrder } = services.sprites;
const { holdContinuousRender, releaseContinuousRender } = services.render;
const { ensureGeoidReady } = services.geoid;
const { registerPickOwner, unregisterPickOwner } = services.picking;
@@ -42,7 +42,7 @@ export function createLifecycle({
flightState.lifetime = new AbortController();
clearFocusTarget('militaryFlights');
flightState._viewer = viewer;
registerSpriteCollection('military', parts.icons._createIcons(viewer));
registerSpriteSet('military', parts.icons._createIcons(viewer));
flightState._modelCollection = new Cesium.PrimitiveCollection();
viewer.scene.primitives.add(flightState._modelCollection);
// Warm the glTF cache so the tracked plane's model instantiates instantly when first needed
@@ -242,12 +242,7 @@ export function createLifecycle({
flightState._moveEndRemove = null;
}
parts.rendering._releaseModels();
if (flightState._iconPrimitive) {
viewer.scene.primitives.remove(flightState._iconPrimitive); // removing destroys it
flightState._iconPrimitive = null;
}
flightState._icons?.clear();
flightState._icons = null;
parts.icons._disposeIcons();
if (flightState._modelCollection) {
viewer.scene.primitives.remove(flightState._modelCollection); // removing destroys it + its models
flightState._modelCollection = null;
+7
View File
@@ -25,6 +25,8 @@ import { readEntityRecord } from '../../data/entityRecords.js';
import {
aircraftMotionRegime,
createMotionRegime,
fixEpochMs,
julianAt,
fixSpeedMps,
fixTrackDeg,
} from '../../data/aircraftMotionRegime.js';
@@ -467,9 +469,14 @@ export function createMotion({
flightState._cachedDRHold = false;
flightState._trackedCourseMs = 0;
}
/** The display instant `epochMs` as a JulianDate, for `_motionRegime`. */
const _displayTimeAt = (epochMs, result) => julianAt(epochMs, result);
return {
_deadReckon,
_motionRegime,
_displayTimeAt,
_fixEpochMs: fixEpochMs,
_extrapolateFix,
_isTrackWarmingUp,
_trackedFocusSizePx,
+17 -18
View File
@@ -96,7 +96,8 @@ export function createQueries({
function _describeFlight(icao24) {
const info = flightState.records.data.get(icao24);
const basePos =
parts.motion._deadReckon(icao24) || parts.icons._iconPosition(icao24);
parts.motion._deadReckon(icao24) ||
parts.icons._iconPosition(icao24, new Cesium.Cartesian3());
if (!basePos) return null;
const displayed = displayedKinematics({
derivedSpeedMps: flightState._drSpeedMps,
@@ -352,7 +353,7 @@ export function createQueries({
const icons = flightState._icons;
if (!center || !icons || !icons.show) return [];
const occluder = parts.icons._occluder();
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const scratch = flightState._scratchNearbyPos;
const limit = Number.isFinite(maxCount)
@@ -363,21 +364,19 @@ export function createQueries({
const nearby = [];
for (let row = 0; row < icons.count; row++) {
const icao24 = icons.idAt(row);
for (const icao24 of icons.ids()) {
const isTracked = icao24 === flightState._trackedIcao;
const trackedPos = isTracked
? parts.motion._trackedDisplayCached()
: null; // cached, no recompute (anti-jitter)
const drawn = trackedPos || icons.position(row, tau, scratch);
const drawn = trackedPos || icons.position(icao24, t, scratch);
// Keep planes rendered as a 3D model (icon hidden) so proximity counts
// don't drop to zero on the 2D→3D handoff.
if (
!aircraftIncludedInNearby({
isTracked,
billboardShown:
icons.shown(row) &&
parts.icons._aboveHorizon(row, drawn, occluder),
icons.shown(icao24) && parts.icons._aboveHorizon(drawn, occluder),
modelRendering: parts.rendering._modelOwnsVisual(icao24),
includeHidden,
})
@@ -437,11 +436,12 @@ export function createQueries({
const stride = Math.max(1, Math.ceil(icons.count / maxCount));
const start = seed % stride;
const occluder = parts.icons._occluder();
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const result = [];
for (let row = start; row < icons.count; row += stride) {
const icao24 = icons.idAt(row);
const ids = icons.ids();
for (let i = start; i < ids.length; i += stride) {
const icao24 = ids[i];
if (
flightState._cockpitContactMode &&
icao24.toLowerCase() === flightState._cockpitSubjectId
@@ -452,7 +452,7 @@ export function createQueries({
// doesn't vanish on the 2D→3D handoff.
const record = flightState._models.get(icao24);
const modelOwnsVisual = parts.rendering._modelOwnsVisual(icao24);
if (!isTracked && !icons.shown(row) && !modelOwnsVisual) continue;
if (!isTracked && !icons.shown(icao24) && !modelOwnsVisual) continue;
const info = flightState.records.data.get(icao24);
const callsign = info?.callsign?.trim();
const registration = info?.registration?.trim();
@@ -476,7 +476,7 @@ export function createQueries({
: null;
const pos = isTracked
? parts.motion._trackedVisualCached() ||
icons.position(row, tau, object._iconPos)
icons.position(icao24, t, object._iconPos)
: modelOwnsVisual
? modelVisualAnchor(
record.matrix,
@@ -486,13 +486,13 @@ export function createQueries({
: spec.scale,
object._weldPos || (object._weldPos = new Cesium.Cartesian3()),
)
: icons.position(row, tau, object._iconPos);
: icons.position(icao24, t, object._iconPos);
// An icon past the horizon is not drawn, so it is not detectable.
if (
!pos ||
(!isTracked &&
!modelOwnsVisual &&
!parts.icons._aboveHorizon(row, pos, occluder))
!parts.icons._aboveHorizon(pos, occluder))
)
continue;
object.position = pos;
@@ -598,12 +598,11 @@ export function createQueries({
const limit = Number.isFinite(maxCount)
? Math.max(1, Math.floor(maxCount))
: 500;
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const result = [];
for (let row = 0; row < icons.count; row++) {
const icao24 = icons.idAt(row);
const pos = icons.position(row, tau);
for (const icao24 of icons.ids()) {
const pos = icons.position(icao24, t, new Cesium.Cartesian3());
const carto = Cesium.Cartographic.fromCartesian(
pos,
Cesium.Ellipsoid.WGS84,
+1 -2
View File
@@ -205,8 +205,7 @@ export function createMilitarySnapshotRenderer({
// LANDED_MISSING_POLL_LIMIT — their disappearance means "landed", not a
// feed gap, and the full grace left phantom planes parked at airports.
const absentIds = [];
for (let row = 0; row < flightState._icons.count; row++) {
const icao24 = flightState._icons.idAt(row);
for (const icao24 of flightState._icons.ids()) {
if (!currentIcaos.has(icao24)) absentIds.push(icao24);
}
for (const icao24 of absentIds) {
+2 -7
View File
@@ -91,16 +91,11 @@ export function createFlightState({ source, services }) {
// Module-level state
// ---------------------------------------------------------------------------
/** Every contact's icon row (see icons.js); null outside a layer lifetime. */
/** Every contact's icon item as drawn (`createContactIcons`, see icons.js);
* null outside a layer lifetime. */
flightState._icons = null;
/** The primitive drawing `_icons`. */
flightState._iconPrimitive = null;
flightState._scratchIconRenderTime = new Cesium.JulianDate();
/** Rows still away from full focus emphasis after the last focus pass. */
flightState._iconFocusActive = 0;
+5 -6
View File
@@ -1,8 +1,10 @@
import * as Cesium from 'cesium';
import { AMBER_TRANSPARENT, TRACKED_ICON_COLOR } from './policy.js';
import { createModelRecord } from '../../data/modelRecord.js';
import { createIconSet } from '../../data/iconSet.js';
import { aircraftIconTestSeams } from '../../data/aircraftIconLayer.js';
import {
aircraftIconTestSeams,
createContactIcons,
} from '../../data/aircraftIconLayer.js';
export function createTesting({
flightState,
@@ -45,9 +47,7 @@ export function createTesting({
}) {
flightState._viewer = viewer;
flightState._modelCollection = modelCollection;
flightState._icons = createIconSet({
epoch: parts.icons._displayTime(new Cesium.JulianDate()),
});
flightState._icons = createContactIcons();
flightState._icons.show = iconLayer?.show ?? true;
_seedIconForTest(icao24, icon, tracked);
flightState._models.clear();
@@ -148,7 +148,6 @@ export function createTesting({
return parts.rendering._driveFleetModelHandoff(
icao24,
flightState._models.get(icao24),
flightState._icons.row(icao24),
position,
course,
);
+39 -25
View File
@@ -34,6 +34,18 @@ import {
import { roundHeadingDegrees } from '../../data/headingDegrees.js';
import { entityRecord } from '../../data/entityRecords.js';
/**
* The icao a pick carries: a draw-set item's id (the icon sets' rows), a
* string pick id, or a model primitive's id.
*/
function aircraftPickId(picked) {
const id = picked?.id;
if (typeof id === 'string') return id;
if (id && typeof id.set === 'string' && typeof id.id === 'string')
return id.id;
return picked?.primitive?.id;
}
export function createTracking({
flightState,
services,
@@ -68,7 +80,7 @@ export function createTracking({
}
function _publishTrackedSelection(icao24, origin = 'programmatic') {
const position = parts.icons._iconPosition(icao24);
const position = parts.icons._iconPosition(icao24, new Cesium.Cartesian3());
const info = flightState.records.data.get(icao24);
if (!position || !info) return false;
if (flightState._trackedEntity)
@@ -157,11 +169,14 @@ export function createTracking({
const previous = flightState._cockpitNearContacts;
const distancesSquared = [];
const icons = flightState._icons;
const tau = parts.icons._displayTau();
for (let row = 0; row < (icons?.count ?? 0); row++) {
const icao24 = icons.idAt(row);
const t = parts.icons._displayMs();
for (const icao24 of icons?.ids() ?? []) {
if (icao24 === flightState._trackedIcao) continue;
const position = icons.position(row, tau, flightState._scratchCockpitPos);
const position = icons.position(
icao24,
t,
flightState._scratchCockpitPos,
);
distancesSquared.push([
icao24,
Cesium.Cartesian3.distanceSquared(
@@ -198,8 +213,8 @@ export function createTracking({
flightState._trail?.setVisible(!next);
if (flightState._trailHeadEntity) flightState._trailHeadEntity.show = !next;
const icons = flightState._icons;
for (let row = 0; row < (icons?.count ?? 0); row++)
parts.icons._applyIconPresentation(icons.idAt(row));
for (const icao24 of icons?.ids() ?? [])
parts.icons._applyIconPresentation(icao24);
flightState._lastFleetTickMs = 0;
}
@@ -301,9 +316,8 @@ export function createTracking({
if (isTr3b(id)) {
if (flightState._models.has(id) || flightState._modelPending.has(id))
parts.rendering._releaseModel(id);
const row = flightState._icons?.row(id) ?? -1;
if (row >= 0 && id !== flightState._trackedIcao)
flightState._icons.setShown(row, true);
if (flightState._icons?.has(id) && id !== flightState._trackedIcao)
flightState._icons.setShown(id, true);
if (id === flightState._trackedIcao) {
parts.rendering._releaseTrackedModel();
_syncTracked2dRotation();
@@ -418,7 +432,10 @@ export function createTracking({
if (!flightState._trackedIcao || !flightState._viewer) return;
const pos =
parts.motion._trackedDisplayCached() ||
parts.icons._iconPosition(flightState._trackedIcao);
parts.icons._iconPosition(
flightState._trackedIcao,
new Cesium.Cartesian3(),
);
if (!pos) return;
const projected = screenProjectedRotation(
flightState._viewer.scene,
@@ -799,7 +816,7 @@ export function createTracking({
// Hand the contact back to its icon only now, once it no longer reads as
// tracked (the settle plans it as a fleet contact).
if (flightState._icons?.has(clearedIcao)) {
flightState._icons.setShown(flightState._icons.row(clearedIcao), true);
flightState._icons.setShown(clearedIcao, true);
parts.icons._settleIcon(clearedIcao, { fromCourseDeg: trackedCourseDeg });
}
parts.icons._applyIconPresentation(clearedIcao);
@@ -847,15 +864,15 @@ export function createTracking({
_clearTracking(false, { origin }); // switching planes — the new follow-camera takes over
const icons = flightState._icons;
const row = icons?.row(icao24) ?? -1;
const info = flightState.records.data.get(icao24);
if (row < 0 || !info) return;
if (!icons?.has(icao24) || !info) return;
// The tracked limiter continues from the nose the icon was drawn with, and
// the entity starts with the rotation the icon had on screen.
const tau = parts.icons._displayTau();
const iconPosition = icons.position(row, tau);
flightState._displayCourse.set(icao24, icons.course(row, tau));
const t = parts.icons._displayMs();
const iconPosition = icons.position(icao24, t, new Cesium.Cartesian3());
const iconCourse = icons.course(icao24, t);
flightState._displayCourse.set(icao24, iconCourse);
flightState._trackedIcao = icao24;
_resetTrackedSelectionState(); // fresh selection: enter at the ENTER ceiling, full load-retry budget
flightState._cachedDRFrame = -1;
@@ -863,7 +880,7 @@ export function createTracking({
screenProjectedRotation(
flightState._viewer.scene,
iconPosition,
icons.course(row, tau),
iconCourse,
0,
) ?? 0;
// Drop any fleet 3D model for this aircraft — the tracked entity now owns its visual (its
@@ -872,7 +889,7 @@ export function createTracking({
parts.rendering._releaseModel(icao24);
// Hide the icon -- the tracked entity replaces it visually
icons.setShown(row, false);
icons.setShown(icao24, false);
// Helper: smoothed, per-frame-cached tracked position (see _trackedDisplayPosition —
// one computation shared by the position/rotation/trail-head callbacks, with
@@ -880,7 +897,7 @@ export function createTracking({
// aircraft has no fix.
const getTrackedPosition = () =>
parts.motion._trackedDisplayPosition(icao24) ||
parts.icons._iconPosition(icao24) ||
parts.icons._iconPosition(icao24, new Cesium.Cartesian3()) ||
iconPosition;
// Dead-reckoning position property evaluated every render frame.
@@ -1092,8 +1109,7 @@ export function createTracking({
// above. H1: the model used to have no pick id, so this fell through to
// "empty space" and deselected the very plane being tracked.
if (flightState._trackedIcao) {
const rawPick =
typeof picked.id === 'string' ? picked.id : picked.primitive?.id;
const rawPick = aircraftPickId(picked);
if (
(flightState._trackedModel &&
picked.primitive === flightState._trackedModel.model) ||
@@ -1102,9 +1118,7 @@ export function createTracking({
return;
}
// Icon picks carry the icao on picked.id; models carry it on the primitive.
const pickedIcao =
typeof picked.id === 'string' ? picked.id : picked.primitive?.id;
const pickedIcao = aircraftPickId(picked);
if (pickedIcao && flightState._icons?.has(pickedIcao)) {
_cancelPendingTrackingRestore();
_trackFlight(pickedIcao, { origin: 'user' });