diff --git a/src/layers/flights/index.js b/src/layers/flights/index.js index c42a0f9fb..32f7f7198 100644 --- a/src/layers/flights/index.js +++ b/src/layers/flights/index.js @@ -36,7 +36,6 @@ export function createCivilFlightLayer({ records: flightState.records, militaryRegistry: services.militaryRegistry, groundFloor: services.groundFloor, - meshFloor: services.meshFloor, rendering: parts.rendering, tracking: parts.tracking, motion: parts.motion, diff --git a/src/layers/flights/motion.js b/src/layers/flights/motion.js index db1161312..b78469f41 100644 --- a/src/layers/flights/motion.js +++ b/src/layers/flights/motion.js @@ -1064,11 +1064,35 @@ export function createMotion({ /** The display instant `epochMs` as a JulianDate, for `_motionRegime`. */ const _displayTimeAt = (epochMs, result) => julianAt(epochMs, result); + /** A feed fix's ECEF position, from its degrees and render altitude. */ + const _fixPosition = (lonDeg, latDeg, heightM) => + Cesium.Cartesian3.fromDegrees(lonDeg, latDeg, heightM); + + /** A copy of a fix position, for a trail that keeps it. */ + const _copyPosition = (position) => Cesium.Cartesian3.clone(position); + + /** + * A position-history entry for a feed fix at `epochMs`, carrying the fix's + * own velocity and track; it keeps a copy of `position`. + */ + function _historyFix(epochMs, position, velocity, track) { + return { + time: julianAt(epochMs), + epochMs, + position: Cesium.Cartesian3.clone(position), + velocity, + track, + }; + } + return { _refloorStaleGroundedContacts, _deadReckon, _displayTimeAt, _fixEpochMs: fixEpochMs, + _fixPosition, + _copyPosition, + _historyFix, _motionRegime, _extrapolateFix, _isTrackWarmingUp, diff --git a/src/layers/flights/rendering.js b/src/layers/flights/rendering.js index 51594911b..283110cdc 100644 --- a/src/layers/flights/rendering.js +++ b/src/layers/flights/rendering.js @@ -98,7 +98,29 @@ export function createRendering({ parts.icons._floorGroundedIcons(renderTime, t, nowMs, camera.positionWC), }); + /** + * Sample the rendered mesh under the collected floor cells (see + * meshFloorSampler.js), leaving this layer's own icons and models out of + * the probe so it cannot land on an aircraft instead of the pavement. + */ + function _sampleMeshFloor(points, viewerLat, viewerLon) { + services.meshFloor.sampleMeshFloorCells( + flightState._viewer?.scene, + points, + { + excludeObjects: [ + ...parts.icons._iconIds(), + ...[...flightState._models.values()].map((record) => record.model), + flightState._trackedModel?.model, + ].filter(Boolean), + viewerLat, + viewerLon, + }, + ); + } + return { + _sampleMeshFloor, _fleetBillboardColor, _fleetBillboardScale, _cockpitContactColor, diff --git a/src/layers/flights/snapshotRenderer.js b/src/layers/flights/snapshotRenderer.js index b65ff93f4..a0a0c91bd 100644 --- a/src/layers/flights/snapshotRenderer.js +++ b/src/layers/flights/snapshotRenderer.js @@ -1,4 +1,4 @@ -import * as Cesium from 'cesium'; +import { findCamera } from '../../render/rendererOf.js'; import { turnRateFromFixHistory, liftRepeatedGroundFix, @@ -6,13 +6,12 @@ import { } from '../../data/motionModel.js'; import { POSITION_HISTORY_LIMIT } from './recordPolicy.js'; -/** Apply reconciled aircraft records to Cesium resources and follow state. */ +/** Apply reconciled aircraft records to the layer's drawing and follow state. */ export function createFlightSnapshotRenderer({ flightState, records, militaryRegistry, groundFloor, - meshFloor, rendering, tracking, motion, @@ -22,7 +21,6 @@ export function createFlightSnapshotRenderer({ }) { const { refreshMilitaryRegistryIfStale, isMilitaryIcao } = militaryRegistry; const { warmGroundFloor } = groundFloor; - const { sampleMeshFloorCells } = meshFloor; return function applySnapshot(snapshot, viewer) { // Before init (or after destroy) there is no icon set to draw into. if (!flightState._icons) return { count: 0, ids: new Set() }; @@ -31,14 +29,11 @@ export function createFlightSnapshotRenderer({ // Field-test round 3 (2026-07-06, Austin fleet-underground): viewer // subpoint + collected floor cells for the viewer-proximate low-contact // clamp below — one carto read per poll, one batch warm after the loop. - const viewerCarto = - (viewer || flightState._viewer)?.camera?.positionCartographic || null; - const viewerLatDeg = viewerCarto - ? Cesium.Math.toDegrees(viewerCarto.latitude) - : null; - const viewerLonDeg = viewerCarto - ? Cesium.Math.toDegrees(viewerCarto.longitude) - : null; + const pose = findCamera(viewer || flightState._viewer)?.pose() ?? null; + const hasSubpoint = + Number.isFinite(pose?.lat) && Number.isFinite(pose?.lon); + const viewerLatDeg = hasSubpoint ? pose.lat : null; + const viewerLonDeg = hasSubpoint ? pose.lon : null; const floorWarmPoints = []; // Classification and display policy consume source-independent observations. @@ -68,7 +63,7 @@ export function createFlightSnapshotRenderer({ floorWarmPoints, }, ); - const position = Cesium.Cartesian3.fromDegrees( + const position = motion._fixPosition( meta.rawLon, meta.rawLat, meta.renderAltitudeM, @@ -88,23 +83,27 @@ export function createFlightSnapshotRenderer({ // 5-15s stale and receipt-time stamping is what caused the // back/forward oscillation. Only append when the fix actually // advances, so stale repeats don't create zero-dt segments. - const fixTime = Cesium.JulianDate.fromDate(new Date(fixEpochMs)); if (!flightState._positionHistory.has(icao24)) { flightState._positionHistory.set(icao24, []); } const history = flightState._positionHistory.get(icao24); const newest = history[history.length - 1]; - if (!newest || Cesium.JulianDate.greaterThan(fixTime, newest.time)) { + // Whole milliseconds, as the fix times are kept. + if ( + !newest || + Math.trunc(fixEpochMs) > Math.trunc(motion._fixEpochMs(newest)) + ) { // Per-fix kinematics: the fix's own velocity/track ride along so the // extrapolation paths use the values that BELONG to the fix they // extend, not whatever the latest poll reported. - history.push({ - time: fixTime, - epochMs: fixEpochMs, - position: position.clone(), - velocity: meta.velocity, - track: meta.true_track, - }); + history.push( + motion._historyFix( + fixEpochMs, + position, + meta.velocity, + meta.true_track, + ), + ); if (history.length > POSITION_HISTORY_LIMIT) { history.shift(); } @@ -117,7 +116,7 @@ export function createFlightSnapshotRenderer({ // Round 2 (owner): ground traffic appends too — taxi history stays // live after touchdown (grounded flights positions are already // surface-clamped via the surfaceM chain, so the ground leg drapes). - if (isTracked) tracking._appendTrailFix(position.clone()); + if (isTracked) tracking._appendTrailFix(motion._copyPosition(position)); } else { const modelOwnsGroundVisual = rendering._modelOwnsVisual(icao24); if (!modelOwnsGroundVisual) { @@ -139,7 +138,10 @@ export function createFlightSnapshotRenderer({ history.push(synthetic); if (history.length > POSITION_HISTORY_LIMIT) history.shift(); meta.turnRateDps = turnRateFromFixHistory(history); - if (isTracked) tracking._appendTrailFix(synthetic.position.clone()); + if (isTracked) + tracking._appendTrailFix( + motion._copyPosition(synthetic.position), + ); } } } @@ -235,15 +237,7 @@ export function createFlightSnapshotRenderer({ // cell, budget-capped, viewer-proximate, google-3d regime only). Own // billboards/models are excluded so a vertical probe can't land on an // aircraft instead of the pavement. - sampleMeshFloorCells(flightState._viewer?.scene, floorWarmPoints, { - excludeObjects: [ - ...icons._iconIds(), - ...[...flightState._models.values()].map((record) => record.model), - flightState._trackedModel?.model, - ].filter(Boolean), - viewerLat: viewerLatDeg, - viewerLon: viewerLonDeg, - }); + rendering._sampleMeshFloor(floorWarmPoints, viewerLatDeg, viewerLonDeg); // Round 5: the grounded exact-key warm that used to live here is gone — // see the note where _warmGroundedAircraftSurfaceCache was removed. The diff --git a/src/render/cesiumAllowList.json b/src/render/cesiumAllowList.json index aa4d57446..23e3696a1 100644 --- a/src/render/cesiumAllowList.json +++ b/src/render/cesiumAllowList.json @@ -43,7 +43,6 @@ "src/layers/flights/policy.js", "src/layers/flights/queries.js", "src/layers/flights/rendering.js", - "src/layers/flights/snapshotRenderer.js", "src/layers/flights/state.js", "src/layers/flights/testing.js", "src/layers/flights/tracking.js",