mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-18 01:02:23 +00:00
Course from fixes only moves forward in time, from an anchor fix, and not for a standing contact; military contacts too
A fix that is not a second newer (a repeat, or an older position from another feed) never gives a course, so a source switch cannot turn an aircraft around. The course runs from an anchor fix that moves only when a course is read, so frequent short steps add up, and a contact reported under 2 m/s reads none. The helper moves to src/data/courseFromFixes.js and the military records use it as well.
This commit is contained in:
1 parent
e08dcd0326
commit
fc4db81d0b
9 files changed
+217
-92
No files matched your search
@@ -1,5 +1,6 @@
|
||||
import { pickRenderAltitudeM } from '../../data/renderAltitude.js';
|
||||
import { stickyText, stickyNumber } from '../../data/aircraftMeta.js';
|
||||
import { courseFromFixes } from '../../data/courseFromFixes.js';
|
||||
import { classifyAircraft } from '../../data/aircraftClass.js';
|
||||
import { aircraftEmergency } from '../../data/aircraftEmergency.js';
|
||||
import {
|
||||
@@ -175,6 +176,12 @@ export class MilitaryFlightRecords {
|
||||
// last-known-good (bounded by the layer's eviction, which deletes the entry).
|
||||
const stickyType = stickyText(type, prevMeta?.type);
|
||||
const fixEpochMs = aircraft.positionTimeMs ?? observedAtMs;
|
||||
const course = courseFromFixes(prevMeta?.courseAnchor, {
|
||||
lat,
|
||||
lon,
|
||||
ms: fixEpochMs,
|
||||
speedMps: aircraft.speedMps,
|
||||
});
|
||||
const meta = {
|
||||
sourceReference: aircraft.reference,
|
||||
observedReceiptMs: this.now(),
|
||||
@@ -206,7 +213,14 @@ export class MilitaryFlightRecords {
|
||||
onGround ? 0 : prevMeta?.speedMps,
|
||||
0,
|
||||
),
|
||||
track: stickyNumber(aircraft.courseDeg, prevMeta?.track, 0),
|
||||
// With no reported track or true heading, a moving contact faces the
|
||||
// way its fixes went (src/data/courseFromFixes.js); else the last one.
|
||||
track: stickyNumber(
|
||||
aircraft.courseDeg,
|
||||
course.courseDeg ?? prevMeta?.track,
|
||||
0,
|
||||
),
|
||||
courseAnchor: course.anchor,
|
||||
// Analyst seam (additive): sticky like the other kinematics.
|
||||
verticalRateMps: stickyNumber(
|
||||
verticalRateMps,
|
||||
|
||||
@@ -269,3 +269,26 @@ test('a repeated military fix time marks the contact as not updated; removal is
|
||||
records.forget('aaa001');
|
||||
assert.equal(records.fixRepeated.has('aaa001'), false);
|
||||
});
|
||||
|
||||
test('a military contact reported with no course faces the way its newer fixes went', () => {
|
||||
const records = store();
|
||||
const T = 1700000000000;
|
||||
const taxi = (latitude, seconds) =>
|
||||
records.receive(
|
||||
observation({
|
||||
latitude,
|
||||
onGround: true,
|
||||
baroAltitudeM: null,
|
||||
courseDeg: null,
|
||||
speedMps: 8,
|
||||
positionTimeMs: T + seconds * 1000,
|
||||
}),
|
||||
context({ observedAtMs: T + seconds * 1000 + 500 }),
|
||||
);
|
||||
assert.equal(taxi(39, 0).meta.track, 0);
|
||||
assert.ok(Math.abs(taxi(38.9995, 5).meta.track - 180) < 0.1);
|
||||
assert.ok(
|
||||
Math.abs(taxi(39.002, 3).meta.track - 180) < 0.1,
|
||||
'an older fix gives no course',
|
||||
);
|
||||
});
|
||||
Reference in new issue
Block a user