mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Merge main (d49d3d10) into the renderer branch
This commit is contained in:
commit
489c316556
134 files changed
+4980
-229
No files matched your search
@@ -202,3 +202,25 @@ test('a feed fleet-number mode outranks its route mode in the epoch context', (t
|
||||
assert.equal(h.get('ttc', '4507', 100000).epochs[0].mode, 'tram');
|
||||
assert.equal(h.get('ttc', 'x1', 100000).epochs[0].mode, 'tram');
|
||||
});
|
||||
test('the epoch mode is the live mode: a route type, else hints, else the default', (t) => {
|
||||
const h = history(t);
|
||||
const pid = {
|
||||
id: 'pid',
|
||||
historyRetention: true,
|
||||
defaultMode: 'bus',
|
||||
routeMode: (route) => (route === 'L22' ? 'tram' : 'unknown'),
|
||||
};
|
||||
h.ingest(
|
||||
pid,
|
||||
[
|
||||
row(100000, 'a', { routeId: 'L58', routeType: 11 }),
|
||||
row(100000, 'b', { routeId: 'L22' }),
|
||||
row(100000, 'c', { routeId: 'L9999' }),
|
||||
],
|
||||
100000,
|
||||
);
|
||||
assert.equal(h.get('pid', 'a', 100000).epochs[0].mode, 'trolleybus');
|
||||
assert.equal(h.get('pid', 'b', 100000).epochs[0].mode, 'tram');
|
||||
// A hint that knows nothing leaves the default, as the live layer does.
|
||||
assert.equal(h.get('pid', 'c', 100000).epochs[0].mode, 'bus');
|
||||
});
|
||||
@@ -27,6 +27,8 @@ const AISSTREAM_DEFAULT_MESSAGE_TYPES = [
|
||||
'ExtendedClassBPositionReport',
|
||||
'ShipStaticData',
|
||||
'StaticDataReport',
|
||||
// Buoys, beacons and other aids to navigation (AIS message 21).
|
||||
'AidsToNavigationReport',
|
||||
];
|
||||
// Watchdog budgets (policy lives in src/data/aisWatchdog.js). Silence is
|
||||
// REPORTED quickly and ACTED ON slowly: a dead feed must read as dead within
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
import { isRecognizedAisEnvelope } from '../../../src/data/aisStreamAdapter.js';
|
||||
import {
|
||||
aidToNavigationTypeName,
|
||||
isAidToNavigation,
|
||||
} from '../../../src/data/vesselTypes.js';
|
||||
export const AISSTREAM_CACHE_MAX = 50000;
|
||||
export const AISSTREAM_STALE_MS = 30 * 60 * 1000;
|
||||
// Per-MMSI recent-path ring buffers (PRD WS-F F3). Float32 lat/lon (~1m
|
||||
@@ -112,13 +116,21 @@ export function ingestAisStreamEnvelope(envelope) {
|
||||
if (!Number.isFinite(lat) || !Number.isFinite(lon)) return true;
|
||||
|
||||
const staticData = _aisStreamStatic.get(mmsi) || {};
|
||||
const aidReport = messageType === 'AidsToNavigationReport';
|
||||
_aisStreamVessels.set(mmsi, {
|
||||
lat,
|
||||
lon,
|
||||
name: vesselNameFromAis(metadata, message, staticData) || `MMSI ${mmsi}`,
|
||||
name:
|
||||
(aidReport && aidNameFromAis(message)) ||
|
||||
vesselNameFromAis(metadata, message, staticData) ||
|
||||
`MMSI ${mmsi}`,
|
||||
mmsi,
|
||||
imo: stringValue(message.ImoNumber ?? message.IMO ?? staticData.imo),
|
||||
type: vesselTypeFromAis(message, staticData),
|
||||
// An aid-to-navigation report's type is the kind of aid (0 to 31), not
|
||||
// a ship type: it is carried as the aid's name ("Cardinal Mark N").
|
||||
type: aidReport
|
||||
? aidToNavigationTypeName(message.Type)
|
||||
: vesselTypeFromAis(message, staticData),
|
||||
destination: stringValue(message.Destination ?? staticData.destination),
|
||||
length: staticData.length ?? null,
|
||||
beam: staticData.beam ?? null,
|
||||
@@ -131,6 +143,9 @@ export function ingestAisStreamEnvelope(envelope) {
|
||||
// Use the AIS message's own report time, not server ingest wall-clock —
|
||||
// trail spacing and dead reckoning depend on true fix epochs.
|
||||
last_position_epoch: aisEpochSeconds(metadata.time_utc ?? metadata.TimeUtc),
|
||||
// A virtual aid is broadcast where nothing physical stands. Only such a
|
||||
// row carries the field, so ship rows stay their size.
|
||||
...(aidReport && message.VirtualAtoN === true && { virtual: true }),
|
||||
_updatedAt: Date.now(),
|
||||
});
|
||||
|
||||
@@ -276,6 +291,15 @@ function vesselNameFromAis(metadata, message, staticData = {}) {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* An aid's whole name: an aid-to-navigation report carries the first 20
|
||||
* characters in `Name` and the rest, up to 14 more, in `NameExtension`.
|
||||
*/
|
||||
function aidNameFromAis(message) {
|
||||
const name = stringValue(message.Name);
|
||||
return name ? stringValue(name + stringValue(message.NameExtension)) : '';
|
||||
}
|
||||
|
||||
function vesselTypeFromAis(message, staticData = {}) {
|
||||
return stringValue(
|
||||
message.Type ??
|
||||
@@ -285,14 +309,25 @@ function vesselTypeFromAis(message, staticData = {}) {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The current rows, newest first, with every vessel ahead of every aid to
|
||||
* navigation: a capped request never gives up a ship for a buoy.
|
||||
*/
|
||||
export function aisStreamRows(maxRows) {
|
||||
const cutoff = Date.now() - AISSTREAM_STALE_MS;
|
||||
const rows = [];
|
||||
const vessels = [];
|
||||
const aids = [];
|
||||
for (const row of _aisStreamVessels.values()) {
|
||||
if (row._updatedAt >= cutoff) rows.push(row);
|
||||
if (row._updatedAt >= cutoff)
|
||||
(isAidToNavigation(row) ? aids : vessels).push(row);
|
||||
}
|
||||
rows.sort((a, b) => b._updatedAt - a._updatedAt);
|
||||
return rows.slice(0, maxRows).map(({ _updatedAt, ...row }) => row);
|
||||
const newestFirst = (a, b) => b._updatedAt - a._updatedAt;
|
||||
vessels.sort(newestFirst);
|
||||
if (vessels.length < maxRows) aids.sort(newestFirst);
|
||||
return vessels
|
||||
.concat(aids)
|
||||
.slice(0, maxRows)
|
||||
.map(({ _updatedAt, ...row }) => row);
|
||||
}
|
||||
|
||||
function pruneAisStreamCache() {
|
||||
|
||||
Reference in new issue
Block a user