mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 00:32:21 +00:00
Let a host application place live contacts
createApplicationCatalog takes an optional placement provider. Its layer(kind) hands Flights, Military Flights, AIS Vessels, Transit and Rail a place(id, wallMs), and optionally observe(id, fix) and forget(id). While live, each layer tells it every fix it accepts and draws a contact where it places it: position, height (the layer's own when none is given), course and speed. A null answer, a provider that throws, a kind it leaves out, or no provider at all keeps the layer's own motion unchanged, and following the world clock the layers never ask it. A transit vehicle or train it holds still lets the render loop idle and is asked again each second; vessels ask for frames only while it places one, and stop when the layer turns off. Tests show the layers draw and reconcile exactly as before without a provider and with one that places nothing, draw where a provider places them, and idle while it holds them still.
This commit is contained in:
1 parent
e53cfef1d1
commit
6f830a2e70
46 files changed
+1417
-34
No files matched your search
@@ -19,6 +19,7 @@ import { RAIL_SELECTED_OVERLAY_SOURCE_ID } from './policy.js';
|
||||
import { publicRailCatalog } from '../../data/railFeeds.js';
|
||||
import { pointAtS } from '../../data/railPaths.js';
|
||||
import { fleetModelFakes } from '../../testSupport/fleetModelFakes.mjs';
|
||||
import { PLACED_WAKE_MS } from '../transit/movement.js';
|
||||
|
||||
const M_PER_DEG = 111_320;
|
||||
const LAT = 42.36;
|
||||
@@ -502,3 +503,31 @@ test('turning the layer off ends the hold', async (t) => {
|
||||
assert.equal(app.state()._cockpitLostFeedId, null);
|
||||
assert.equal(app.layer.getCockpitSubject(), null);
|
||||
});
|
||||
|
||||
test('a train a placement holds still stops animating, and moves on when the placement does', async (t) => {
|
||||
let spot = { lat: LAT, lon: LON0 + 3000 / KX };
|
||||
const app = await onTheLine(t, {
|
||||
placement: {
|
||||
layer: () => ({
|
||||
place: (id) => (id === T1 ? { ...spot, speedMps: 0 } : null),
|
||||
}),
|
||||
},
|
||||
});
|
||||
app.run(1_000);
|
||||
const entry = app.entry(T1);
|
||||
assert.equal(entry.placed, true);
|
||||
assert.equal(app.state()._moving.has(entry), false, 'parked: not animating');
|
||||
assert.notEqual(entry.wakeTimer, null, 'a wake asks the placement again');
|
||||
assert.ok(app.state()._moving.has(app.entry(T2)), 'its own motion runs on');
|
||||
|
||||
spot = { lat: LAT, lon: spot.lon + 10 / KX };
|
||||
t.mock.timers.tick(PLACED_WAKE_MS);
|
||||
assert.ok(app.state()._moving.has(entry), 'moving again');
|
||||
for (let i = 0; i < 3; i += 1) {
|
||||
spot = { lat: LAT, lon: spot.lon + 1 / KX };
|
||||
app.run(250);
|
||||
assert.ok(app.state()._moving.has(entry), 'while it moves');
|
||||
}
|
||||
app.run(250);
|
||||
assert.equal(app.state()._moving.has(entry), false, 'stopped again');
|
||||
});
|
||||
@@ -82,6 +82,7 @@ export function createIngestion({ state, services, parts, source }) {
|
||||
state._moving.delete(entry);
|
||||
parts.rendering.cancelWake(entry);
|
||||
destroyTrack(entry.track);
|
||||
entry.placement?.forget(key);
|
||||
state._trains.delete(key);
|
||||
state._revision += 1;
|
||||
// A copy it hid may now be the one to draw.
|
||||
@@ -274,6 +275,8 @@ export function createIngestion({ state, services, parts, source }) {
|
||||
const entry = {
|
||||
key,
|
||||
feedId: feed.id,
|
||||
// A host-supplied placement, if any, draws it while live.
|
||||
placement: services.placement ?? null,
|
||||
marker: null,
|
||||
category: record.category,
|
||||
railMode: record.mode,
|
||||
|
||||
@@ -35,6 +35,7 @@ export function createLifecycle({ state, services, parts, timetable }) {
|
||||
for (const entry of state._trains.values()) {
|
||||
parts.rendering.cancelWake(entry);
|
||||
destroyTrack(entry.track);
|
||||
entry.placement?.forget(entry.key);
|
||||
}
|
||||
state._trains.clear();
|
||||
state._moving.clear();
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
import * as Cesium from 'cesium';
|
||||
import { applyDisplayCourse, updatePlayback } from '../transit/movement.js';
|
||||
import {
|
||||
PLACED_WAKE_MS,
|
||||
applyDisplayCourse,
|
||||
playbackMoving,
|
||||
updatePlayback,
|
||||
} from '../transit/movement.js';
|
||||
import { HEIGHT_SAMPLE_MAX_ALTITUDE_M } from '../transit/policy.js';
|
||||
import {
|
||||
COLD_CELL_FLUSH_MS,
|
||||
@@ -551,8 +556,11 @@ export function createRendering({ state, services, parts }) {
|
||||
*/
|
||||
function place(entry) {
|
||||
const sample = entry.sample;
|
||||
// Placed by a host-supplied placement, it is drawn where that puts it.
|
||||
const onPath =
|
||||
entry.path && placeOnPath(entry.path, sample, entry.segment, pathPoint);
|
||||
!entry.placed &&
|
||||
entry.path &&
|
||||
placeOnPath(entry.path, sample, entry.segment, pathPoint);
|
||||
const lat = onPath
|
||||
? pathPoint.lat
|
||||
: Number.isFinite(sample?.lat)
|
||||
@@ -629,16 +637,26 @@ export function createRendering({ state, services, parts }) {
|
||||
if (!entry.marker) return;
|
||||
place(entry);
|
||||
const sample = entry.sample;
|
||||
const moving =
|
||||
playing(entry) &&
|
||||
sample?.phase === 'playing' &&
|
||||
sample.segmentSpeedMps > 0;
|
||||
const moving = playing(entry) && playbackMoving(entry);
|
||||
if (moving) {
|
||||
state._moving.add(entry);
|
||||
return;
|
||||
}
|
||||
state._moving.delete(entry);
|
||||
if (playing(entry) && Number.isFinite(sample?.nextWakeMonoMs)) {
|
||||
if (!playing(entry)) return;
|
||||
// A train a host-supplied placement holds still is asked again every
|
||||
// PLACED_WAKE_MS: it moves on once the placement does.
|
||||
const monoNow = performance.now();
|
||||
const placedWake = entry.placed === true;
|
||||
const boundary = sample?.nextWakeMonoMs;
|
||||
const wakeMonoMs = placedWake
|
||||
? Math.min(
|
||||
Number.isFinite(boundary) ? boundary : Infinity,
|
||||
monoNow + PLACED_WAKE_MS,
|
||||
)
|
||||
: boundary;
|
||||
if (Number.isFinite(wakeMonoMs)) {
|
||||
const atBoundary = !placedWake || boundary <= wakeMonoMs;
|
||||
entry.wakeTimer = setTimeout(
|
||||
() => {
|
||||
entry.wakeTimer = null;
|
||||
@@ -646,9 +664,10 @@ export function createRendering({ state, services, parts }) {
|
||||
updatePlayback(entry, Date.now(), performance.now());
|
||||
schedulePlayback(entry);
|
||||
syncRenderHold();
|
||||
governorRequestRender('rail-motion-boundary');
|
||||
if (atBoundary || state._moving.has(entry))
|
||||
governorRequestRender('rail-motion-boundary');
|
||||
},
|
||||
Math.max(1, sample.nextWakeMonoMs - performance.now()),
|
||||
Math.max(1, wakeMonoMs - monoNow),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -851,7 +870,8 @@ export function createRendering({ state, services, parts }) {
|
||||
place(entry);
|
||||
if (
|
||||
entry.sample.phase !== 'playing' ||
|
||||
entry.sample.segmentSpeedMps === 0
|
||||
entry.sample.segmentSpeedMps === 0 ||
|
||||
(entry.placed === true && entry.placedMoving !== true)
|
||||
)
|
||||
schedulePlayback(entry);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user