Move aircraft motion's Julian-date math off Cesium

src/geo/julian.js ports the parts of Cesium's JulianDate that dead
reckoning uses (arithmetic, comparison, the leap-second table and the
conversions to and from epoch milliseconds) onto plain
{dayNumber, secondsOfDay} objects, step for step, so the numbers match
and either module's functions take either date. celestial.js now shares
it instead of keeping its own copy.

motionModel.js and aircraftMotionRegime.js use it with the src/geo
ellipsoid, frame and vector helpers and leave the Cesium allow-list.
This commit is contained in:
Sameh Khamis committed 2026-11-07 18:49:23 -08:00
1 parent 1f1d08f34e
commit 00a0a0dbc7
9 files changed
+481 -250

No files matched your search

+22 -16
View File
@@ -1,4 +1,12 @@
import * as Cesium from 'cesium';
import { fromDegrees } from '../geo/ellipsoid.js';
import {
julianFromEpochMs,
julianLessThan,
julianLessThanOrEquals,
julianToEpochMs,
secondsDifference,
} from '../geo/julian.js';
import { clone, distance } from '../geo/vector.js';
import {
courseBetweenCartesians,
speedRamp,
@@ -26,28 +34,26 @@ export function fixTrackDeg(fix, info, fields) {
}
/**
* The instant `epochMs` as a JulianDate (into `result` when given), for
* The instant `epochMs` as a Julian date (into `result` when given), for
* `aircraftMotionRegime`'s `renderTime`.
*/
export function julianAt(epochMs, result) {
return Cesium.JulianDate.fromDate(new Date(epochMs), result);
return julianFromEpochMs(epochMs, result);
}
/** A history fix's time in epoch ms: its `epochMs`, else its `time`'s. */
export function fixEpochMs(fix) {
return Number.isFinite(fix.epochMs)
? fix.epochMs
: Cesium.JulianDate.toDate(fix.time).getTime();
return Number.isFinite(fix.epochMs) ? fix.epochMs : julianToEpochMs(fix.time);
}
/** A feed fix's ECEF position, from its degrees and render altitude. */
export function fixPosition(lonDeg, latDeg, heightM) {
return Cesium.Cartesian3.fromDegrees(lonDeg, latDeg, heightM);
return fromDegrees(lonDeg, latDeg, heightM);
}
/** A copy of a fix position, for a trail that keeps it. */
export function copyPosition(position) {
return Cesium.Cartesian3.clone(position);
return clone(position);
}
/**
@@ -58,7 +64,7 @@ export function historyFix(epochMs, position, velocity, track) {
return {
time: julianAt(epochMs),
epochMs,
position: Cesium.Cartesian3.clone(position),
position: clone(position),
velocity,
track,
};
@@ -110,7 +116,7 @@ export function createMotionRegime() {
*
* @param {Array<object>} history Non-empty, oldest first.
* @param {object|undefined} info The contact's record.
* @param {Cesium.JulianDate} renderTime
* @param {{dayNumber: number, secondsOfDay: number}} renderTime A Julian date (geo/julian).
* @param {AircraftRecordFields} fields
* @param {object} result From `createMotionRegime`; returned filled in.
*/
@@ -125,12 +131,12 @@ export function aircraftMotionRegime(
const a = history[i - 1];
const b = history[i];
if (
!Cesium.JulianDate.lessThanOrEquals(a.time, renderTime) ||
!Cesium.JulianDate.lessThanOrEquals(renderTime, b.time)
!julianLessThanOrEquals(a.time, renderTime) ||
!julianLessThanOrEquals(renderTime, b.time)
)
continue;
const span = Cesium.JulianDate.secondsDifference(b.time, a.time);
const chordLenM = Cesium.Cartesian3.distance(a.position, b.position);
const span = secondsDifference(b.time, a.time);
const chordLenM = distance(a.position, b.position);
const speed =
span > 0 ? chordLenM / span : (info && info[fields.speed]) || 0;
const fallbackTrack = (info && info[fields.track]) || 0;
@@ -149,7 +155,7 @@ export function aircraftMotionRegime(
return result;
}
const newest = history[history.length - 1];
const warming = Cesium.JulianDate.lessThan(renderTime, history[0].time);
const warming = julianLessThan(renderTime, history[0].time);
result.kind = 'fix';
result.fix = warming ? history[0] : newest;
result.speed = fixSpeedMps(result.fix, info, fields);
@@ -166,7 +172,7 @@ export function aircraftMotionRegime(
// allocating a Date per aircraft on every 12 Hz fleet tick.
fixEpochMs: Number.isFinite(newest.epochMs)
? newest.epochMs
: Cesium.JulianDate.toDate(newest.time).getTime(),
: julianToEpochMs(newest.time),
lastContactEpochMs: info?.lastContactEpochMs,
// Permit one minute of contact grace but cap any cached-feed drift
// at five minutes. Source backoff is exposed separately as a STALE cue.
+1 -1
View File
@@ -216,9 +216,9 @@ test('consumer build includes only infrastructure code and resolves assets under
'input.js',
'inputOwnership.js',
'internals.js',
'julian.js',
'localGeojsonCore.js',
'localGeojsonLod.js',
'motionModel.js',
'pickRegistry.js',
'polyline.js',
'query.js',
+27 -52
View File
@@ -6,41 +6,34 @@
* Turn-rate estimation + constant-rate-turn arc integration are adapted from
* skylight (https://github.com/cpaczek/skylight, MIT) shared/src/aim.ts.
*/
import * as Cesium from 'cesium';
import { norm180, norm360 } from '../geo/vector.js';
import { fromRadians, toCartographicRadians } from '../geo/ellipsoid.js';
import { eastNorthUp, framePoint } from '../geo/frames.js';
import {
julianFromEpochMs,
julianToEpochMs,
secondsDifference,
} from '../geo/julian.js';
import { copyInto, norm180, norm360, vec } from '../geo/vector.js';
const DEG = Math.PI / 180;
const _mmCarto = new Cesium.Cartographic();
const _mmCandidateCarto = new Cesium.Cartographic();
/**
* Lift a repeated grounded fix to a newly resolved render floor without
* manufacturing a new source timestamp or changing its reported lat/lon.
* Airborne fixes and downward candidates are deliberately left untouched.
*
* @param {{position: Cesium.Cartesian3}|null} newest
* @param {Cesium.Cartesian3|null} candidatePosition
* @param {{position: {x: number, y: number, z: number}}|null} newest
* @param {{x: number, y: number, z: number}|null} candidatePosition ECEF.
* @param {boolean} onGround
* @returns {boolean} True when the stored position was lifted.
*/
export function liftRepeatedGroundFix(newest, candidatePosition, onGround) {
if (!onGround || !newest?.position || !candidatePosition) return false;
const stored = Cesium.Cartographic.fromCartesian(
newest.position,
Cesium.Ellipsoid.WGS84,
_mmCarto,
);
const candidate = Cesium.Cartographic.fromCartesian(
candidatePosition,
Cesium.Ellipsoid.WGS84,
_mmCandidateCarto,
);
const stored = toCartographicRadians(newest.position);
const candidate = toCartographicRadians(candidatePosition);
if (!stored || !candidate || candidate.height <= stored.height) return false;
Cesium.Cartesian3.fromRadians(
stored.longitude,
stored.latitude,
candidate.height,
Cesium.Ellipsoid.WGS84,
copyInto(
fromRadians(stored.lon, stored.lat, candidate.height),
newest.position,
);
return true;
@@ -60,16 +53,12 @@ export function courseBetweenCartesians(from, to, minChordM = 25) {
const dy = to.y - from.y;
const dz = to.z - from.z;
if (dx * dx + dy * dy + dz * dz < minChordM * minChordM) return null;
const carto = Cesium.Cartographic.fromCartesian(
from,
Cesium.Ellipsoid.WGS84,
_mmCarto,
);
const carto = toCartographicRadians(from);
if (!carto) return null;
const sLat = Math.sin(carto.latitude);
const cLat = Math.cos(carto.latitude);
const sLon = Math.sin(carto.longitude);
const cLon = Math.cos(carto.longitude);
const sLat = Math.sin(carto.lat);
const cLat = Math.cos(carto.lat);
const sLon = Math.sin(carto.lon);
const cLon = Math.cos(carto.lon);
const e = -sLon * dx + cLon * dy;
const n = -sLat * cLon * dx - sLat * sLon * dy + cLat * dz;
if (e * e + n * n < 1) return null; // < 1 m horizontal — vertical-only motion
@@ -260,7 +249,7 @@ export function turnRateFromFixHistory(history) {
for (const s of history) {
if (!Number.isFinite(s.track)) continue;
samples.push({
tSec: Cesium.JulianDate.secondsDifference(s.time, t0),
tSec: secondsDifference(s.time, t0),
trackDeg: s.track,
speedMps: s.velocity,
});
@@ -430,8 +419,6 @@ export function arcOffsetEnu(speedMps, trackDeg, turnRateDps, dtSec, result) {
}
const _forwardFixArc = { east: 0, north: 0, endCourseDeg: 0 };
const _forwardFixEnu = new Cesium.Matrix4();
const _forwardFixOffset = new Cesium.Cartesian3();
/**
* Create a forward-only synthetic fix when a repeated position epoch carries
@@ -440,11 +427,11 @@ const _forwardFixOffset = new Cesium.Cartesian3();
* kinematics. This prevents a late course change from reprojecting the entire
* stale interval and snapping the rendered contact by kilometres.
*
* @param {{time: Cesium.JulianDate, epochMs?: number, position: Cesium.Cartesian3,
* @param {{time: object, epochMs?: number, position: {x: number, y: number, z: number},
* velocity?: number, track?: number}} newest Existing immutable history fix.
* @param {{epochMs: number, velocity: number, track: number, turnRateDps?: number}} next
* New kinematics and the wall/source epoch at which they become authoritative.
* @returns {{time: Cesium.JulianDate, epochMs: number, position: Cesium.Cartesian3,
* @returns {{time: object, epochMs: number, position: {x: number, y: number, z: number},
* velocity: number, track: number}|null} Forward synthetic fix, or null.
*/
export function synthesizeForwardKinematicsFix(newest, next = {}) {
@@ -452,7 +439,7 @@ export function synthesizeForwardKinematicsFix(newest, next = {}) {
return null;
const startEpochMs = Number.isFinite(newest.epochMs)
? newest.epochMs
: Cesium.JulianDate.toDate(newest.time).getTime();
: julianToEpochMs(newest.time);
if (!Number.isFinite(startEpochMs) || next.epochMs <= startEpochMs)
return null;
@@ -468,24 +455,12 @@ export function synthesizeForwardKinematicsFix(newest, next = {}) {
dtSec,
_forwardFixArc,
);
Cesium.Cartesian3.fromElements(
_forwardFixArc.east,
_forwardFixArc.north,
0,
_forwardFixOffset,
);
const enu = Cesium.Transforms.eastNorthUpToFixedFrame(
newest.position,
Cesium.Ellipsoid.WGS84,
_forwardFixEnu,
);
const position = Cesium.Matrix4.multiplyByPoint(
enu,
_forwardFixOffset,
new Cesium.Cartesian3(),
const position = framePoint(
eastNorthUp(newest.position),
vec(_forwardFixArc.east, _forwardFixArc.north, 0),
);
return {
time: Cesium.JulianDate.fromDate(new Date(next.epochMs)),
time: julianFromEpochMs(next.epochMs),
epochMs: next.epochMs,
position,
velocity: Number.isFinite(next.velocity)