mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 00:32:21 +00:00
Vessel tracks end at the vessel
The selected vessel's track drew every fix it held. Following the world clock, it ran ahead of the icon to the vessel's newest fix; live, it stopped at the last fix while the icon moved on from it. A change of time restarted it from a single point until the track at the new time arrived, so it went blank at every step. - The track draws the fixes at or before the time the vessel is drawn at; live, every fix. - Each frame a head joins its last drawn fix to the icon where it is drawn, as flight tracks do; none past TRAIL_HEAD_MAX_M (20 km), where the clock has moved beyond the fixes the track holds. - A change of time keeps the track, drawn up to the new time, until the track at that time replaces it.
This commit is contained in:
1 parent
76d203c8f1
commit
26893ae37e
7 files changed
+280
-18
No files matched your search
@@ -5,10 +5,12 @@ import { createTracking } from './tracking.js';
|
||||
import { TRAIL_HEIGHT_M, TRAIL_MAX_POINTS } from './policy.js';
|
||||
|
||||
/** One tracking part over a fake trail and geoid; `geoidN` is N everywhere. */
|
||||
function setup({ geoidN = 40, track = null } = {}) {
|
||||
function setup({ geoidN = 40, track = null, clockAt = null } = {}) {
|
||||
const drawn = [];
|
||||
const heads = [];
|
||||
const trail = {
|
||||
setPositions: (positions) => drawn.push([...positions]),
|
||||
setHead: (positions) => heads.push(positions),
|
||||
clear() {},
|
||||
destroy() {},
|
||||
};
|
||||
@@ -16,7 +18,12 @@ function setup({ geoidN = 40, track = null } = {}) {
|
||||
const records = [];
|
||||
const vesselState = {
|
||||
_geoidReady: true,
|
||||
_source: { getTrack: async () => track },
|
||||
_source: {
|
||||
getTrack: async (reference, options) =>
|
||||
typeof track === 'function' ? track(options) : track,
|
||||
},
|
||||
timeline: { active: () => clockAt !== null },
|
||||
worldNow: () => clockAt,
|
||||
state: {
|
||||
viewer: {},
|
||||
trail: null,
|
||||
@@ -34,6 +41,17 @@ function setup({ geoidN = 40, track = null } = {}) {
|
||||
},
|
||||
rendering: {
|
||||
getVisual: (record) => visuals.get(record) ?? record,
|
||||
// Drawn where its visual says, at the trail's height in these tests.
|
||||
drawnPositionNow: (record) => {
|
||||
const visual = visuals.get(record);
|
||||
return visual
|
||||
? Cesium.Cartesian3.fromDegrees(
|
||||
visual.drawnLon,
|
||||
visual.drawnLat,
|
||||
geoidN + TRAIL_HEIGHT_M,
|
||||
)
|
||||
: null;
|
||||
},
|
||||
anchorPosition: (record) => ({ anchoredAt: [record.lon, record.lat] }),
|
||||
syncRecordIcon: (record) => synced.push(record),
|
||||
forgetClockStep: () => synced.push('forgetClockStep'),
|
||||
@@ -51,7 +69,16 @@ function setup({ geoidN = 40, track = null } = {}) {
|
||||
layer: {},
|
||||
options: {},
|
||||
});
|
||||
return { tracking, vesselState, drawn, synced, records, visuals, renders };
|
||||
return {
|
||||
tracking,
|
||||
vesselState,
|
||||
drawn,
|
||||
heads,
|
||||
synced,
|
||||
records,
|
||||
visuals,
|
||||
renders,
|
||||
};
|
||||
}
|
||||
|
||||
const near = (a, b) =>
|
||||
@@ -172,3 +199,107 @@ test('a long backfill keeps the newest TRAIL_MAX_POINTS vertices', async () => {
|
||||
'the live fix stays newest',
|
||||
);
|
||||
});
|
||||
|
||||
const settle = () => new Promise((resolve) => setTimeout(resolve, 0));
|
||||
const at = (lat, lon) =>
|
||||
Cesium.Cartesian3.fromDegrees(lon, lat, 40 + TRAIL_HEIGHT_M);
|
||||
|
||||
test('following the clock, the trail ends at the vessel: fixes after its time wait, and a head joins the last one to it', async () => {
|
||||
const T = 1_800_000_000_000;
|
||||
const track = {
|
||||
records: [
|
||||
{ latitude: 51.8, longitude: 4.0, observedAtMs: T - 120_000 },
|
||||
{ latitude: 51.81, longitude: 4.0, observedAtMs: T - 60_000 },
|
||||
],
|
||||
};
|
||||
const { tracking, vesselState, drawn, heads, visuals } = setup({
|
||||
track,
|
||||
clockAt: T,
|
||||
});
|
||||
const record = {
|
||||
id: 'v',
|
||||
reference: 'v',
|
||||
lat: 51.83,
|
||||
lon: 4.0,
|
||||
lastPositionEpoch: (T + 120_000) / 1000,
|
||||
};
|
||||
vesselState.state.selectedRecord = record;
|
||||
visuals.set(record, { drawnLat: 51.815, drawnLon: 4.0, drawnAtMs: T });
|
||||
tracking.startSelectedVesselTrail(record);
|
||||
await settle();
|
||||
assert.equal(drawn.at(-1).length, 2, 'the fixes before the time');
|
||||
assert.ok(near(drawn.at(-1)[1], at(51.81, 4.0)));
|
||||
tracking.drawSelectedVesselTrail();
|
||||
const head = heads.at(-1);
|
||||
assert.ok(near(head[0], at(51.81, 4.0)), 'from the last drawn fix');
|
||||
assert.ok(near(head[1], at(51.815, 4.0)), 'to the vessel as drawn');
|
||||
|
||||
// The clock passes the vessel's own fix: the body takes it on the next
|
||||
// frame, and the vessel holds there.
|
||||
vesselState.worldNow = () => T + 150_000;
|
||||
visuals.get(record).drawnLat = 51.83;
|
||||
tracking.drawSelectedVesselTrail();
|
||||
assert.equal(drawn.at(-1).length, 3);
|
||||
assert.equal(heads.at(-1), null, 'no head with the vessel on its fix');
|
||||
});
|
||||
|
||||
test('a clock jump keeps the trail drawn to the new time until the track at it arrives', async () => {
|
||||
const T = 1_800_000_000_000;
|
||||
let release;
|
||||
const later = new Promise((resolve) => (release = resolve));
|
||||
let asked = 0;
|
||||
const first = {
|
||||
records: [
|
||||
{ latitude: 51.8, longitude: 4.0, observedAtMs: T - 120_000 },
|
||||
{ latitude: 51.81, longitude: 4.0, observedAtMs: T - 60_000 },
|
||||
],
|
||||
};
|
||||
const { tracking, vesselState, drawn, visuals } = setup({
|
||||
track: () => (asked++ === 0 ? first : later),
|
||||
clockAt: T,
|
||||
});
|
||||
const record = {
|
||||
id: 'v',
|
||||
reference: 'v',
|
||||
lat: 51.815,
|
||||
lon: 4.0,
|
||||
lastPositionEpoch: T / 1000,
|
||||
};
|
||||
vesselState.state.selectedRecord = record;
|
||||
visuals.set(record, { drawnLat: 51.815, drawnLon: 4.0, drawnAtMs: T });
|
||||
tracking.startSelectedVesselTrail(record);
|
||||
await settle();
|
||||
const before = drawn.length;
|
||||
// Back a minute and a half: one fix is behind the vessel then.
|
||||
vesselState.worldNow = () => T - 90_000;
|
||||
tracking.retimeSelectedVesselTrail(record);
|
||||
assert.ok(
|
||||
drawn.slice(before).every((positions) => positions.length >= 1),
|
||||
'never blanked',
|
||||
);
|
||||
assert.equal(drawn.at(-1).length, 1, 'cut to the new time');
|
||||
release({
|
||||
records: [
|
||||
{ latitude: 51.79, longitude: 4.0, observedAtMs: T - 180_000 },
|
||||
{ latitude: 51.8, longitude: 4.0, observedAtMs: T - 120_000 },
|
||||
],
|
||||
});
|
||||
await settle();
|
||||
assert.equal(drawn.at(-1).length, 2, 'the track at the new time');
|
||||
assert.ok(near(drawn.at(-1)[0], at(51.79, 4.0)));
|
||||
});
|
||||
|
||||
test('live, the head joins the last fix to the vessel where it is placed, and not across a jump', () => {
|
||||
const { tracking, vesselState, heads, visuals } = setup();
|
||||
const record = { id: 'v', reference: 'v', lat: 51.8, lon: 4.0 };
|
||||
vesselState.state.selectedRecord = record;
|
||||
visuals.set(record, { drawnLat: 51.801, drawnLon: 4.0 });
|
||||
tracking.startSelectedVesselTrail(record);
|
||||
tracking.drawSelectedVesselTrail();
|
||||
assert.ok(near(heads.at(-1)[0], at(51.8, 4.0)));
|
||||
assert.ok(near(heads.at(-1)[1], at(51.801, 4.0)));
|
||||
// Drawn 100 km on: no head across that.
|
||||
visuals.get(record).drawnLat = 52.7;
|
||||
tracking.drawSelectedVesselTrail();
|
||||
assert.equal(heads.at(-1), null);
|
||||
});
|
||||
Reference in new issue
Block a user