Merge main (663b56f62, #1755) into the renderer branch

This commit is contained in:
Sameh Khamis committed 2026-11-15 16:34:05 -08:00
commit a0d299523d
91 files changed
+1793 -396

No files matched your search

+24 -9
View File
@@ -1552,7 +1552,8 @@
"src/render/vectorBase/index.js",
"src/render/vectorBase/style.js",
"src/render/vectorBase/paint.js",
"src/render/vectorBase/expressions.js"
"src/render/vectorBase/expressions.js",
"src/time/frameWait.js"
],
"external": [
"cesium",
@@ -1910,7 +1911,8 @@
"src/render/cesium/sceneOcclusionProbe.js",
"src/render/occlusion/depthProbe.js",
"src/data/detectionOcclusion.js",
"src/layers/flights/placed.js"
"src/layers/flights/placed.js",
"src/data/courseFromFixes.js"
],
"external": ["cesium", "kdbush"]
},
@@ -2048,7 +2050,9 @@
"src/render/cesium/sceneOcclusionProbe.js",
"src/render/occlusion/depthProbe.js",
"src/data/detectionOcclusion.js",
"src/layers/flights/placed.js"
"src/layers/flights/placed.js",
"src/data/courseFromFixes.js",
"src/data/approxDistance.js"
],
"external": ["cesium", "kdbush"]
},
@@ -2277,6 +2281,7 @@
"src/maps/keylessTerrain.js",
"src/render/stub/viewRectangle.js",
"src/render/cesium/follow.js",
"src/time/frameWait.js",
"src/render/cesium/cameraControls.js",
"src/render/camera/events.js",
"src/render/camera/followTransition.js",
@@ -2420,7 +2425,8 @@
"src/render/vectorBase/index.js",
"src/render/vectorBase/style.js",
"src/render/vectorBase/paint.js",
"src/render/vectorBase/expressions.js"
"src/render/vectorBase/expressions.js",
"src/time/frameWait.js"
],
"external": ["cesium", "pbf", "@mapbox/vector-tile", "kdbush"]
},
@@ -5310,7 +5316,9 @@
"src/viewWeather.js",
"src/render/weather.js",
"src/layers/flights/placed.js",
"src/data/placementProvider.js"
"src/data/placementProvider.js",
"src/data/courseFromFixes.js",
"src/time/frameWait.js"
],
"external": [
"hls.js",
@@ -5324,6 +5332,7 @@
"@jtarrio/webrtlsdr",
"hyparquet",
"fzstd",
"h3-js",
"vue",
"pinia",
"vue-i18n",
@@ -6135,7 +6144,9 @@
"src/layers/vessels/photos.js",
"src/data/openVesselPhoto.js",
"src/layers/flights/placed.js",
"src/data/placementProvider.js"
"src/data/placementProvider.js",
"src/data/courseFromFixes.js",
"src/time/frameWait.js"
],
"external": [
"hls.js",
@@ -6147,6 +6158,7 @@
"mgrs",
"mapillary-js",
"@jtarrio/webrtlsdr",
"h3-js",
"vue",
"pinia",
"vue-i18n",
@@ -6551,7 +6563,8 @@
"src/data/aircraftEmergency.js",
"src/data/fleetModels.js",
"src/data/vesselTypes.js",
"src/data/fleetTrailAnchors.js"
"src/data/fleetTrailAnchors.js",
"src/data/courseFromFixes.js"
],
"external": []
},
@@ -6573,7 +6586,9 @@
"src/data/aircraftMeta.js",
"src/data/renderAltitude.js",
"src/data/aircraftClass.js",
"src/data/aircraftEmergency.js"
"src/data/aircraftEmergency.js",
"src/data/courseFromFixes.js",
"src/data/approxDistance.js"
],
"external": []
},
@@ -7411,7 +7426,7 @@
"src/ui/statusText.js",
"src/ui/layerNames.js"
],
"external": ["cesium"]
"external": ["cesium", "h3-js"]
},
"gnss-source": {
"exports": ["./layers/gnss/source"],
+32 -27
View File
@@ -11,15 +11,17 @@
* (i) LIVE — over Poland and the southern Baltic the layer settles with no error,
* its cells drawn and legend band counts that sum to the cell
* count; cells are required only when the returned rows, binned
* with the layer's own rules, reach the per-cell minimum (live
* traffic varies by hour). Requires a non-stale response no older than 60 s.
* into H3 cells with the layer's own rules, give at least one cell
* (live traffic varies by hour). Requires a non-stale response no older than 60 s.
* (ii) BANDS (synthetic) — a 10-aircraft cell with 5 degraded is high,
* a 30-aircraft cell with 2 degraded is medium, a 3-aircraft cell
* with 1 degraded is low (first bad discounted), a clean cell at sea
* is low, a 2-aircraft cell is withheld; `stale: true` reaches
* is low, a 2-aircraft cell with 2 degraded is shown high (no
* minimum aircraft count, as on gpsjam.org); `stale: true` reaches
* getStats. Every band is drawn and low is shown over land and sea.
* The row reads as low navigation accuracy, and stats carry the
* machine-readable provenance (GEV classifier, gpsjam bands, window).
* machine-readable provenance (GEV classifier, gpsjam bands and H3
* grid, window).
* PICK verifies actual perimeter and empty-ground clicks under GNSS.
* CAMERA/GLOBE verify automatic sampling and the screen-centre anchor.
* (iii) FAILURE — the route stubbed to 502: stats.error is set and the
@@ -210,7 +212,7 @@ async function shoot(page, name) {
/** Build state of every GNSS ground primitive: DONE = 0, PENDING = 1. */
const cellStates = `() => (${gnssGround})().map(({ primitive }) => (primitive.ready ? 0 : 1))`;
/** Wait until every GNSS cell's ground rectangle has finished building. */
/** Wait until every GNSS cell's ground polygon has finished building. */
async function waitForBuiltCells(page, timeoutMs = 60000) {
const built = await page
.waitForFunction(`(${cellStates})().every((state) => state === 0)`, {
@@ -236,22 +238,23 @@ const fixtureRow = (hex, lat, lon, degraded) => ({
});
/**
* Synthetic 0.5° cells: high at sea (5/10 bad), medium on land (2/30 bad),
* low on land (1/3 bad), low at sea (0/4 bad), withheld (2 aircraft).
* Synthetic H3 res-4 cells, each group inside one hexagon: high at sea
* (5/10 bad), medium on land (2/30 bad), low on land (1/3 bad), low at sea
* (0/4 bad), and high from only 2 aircraft (2/2 bad; no minimum count).
*/
function fixturePayload() {
const rows = [];
const hex = (prefix, i) => `${prefix}${i.toString(16).padStart(2, '0')}`;
for (let i = 0; i < 10; i++)
rows.push(fixtureRow(hex('a000', i), 55.1 + i * 0.01, 19.1, i < 5));
rows.push(fixtureRow(hex('a000', i), 55.1 + i * 0.001, 19.1, i < 5));
for (let i = 0; i < 30; i++)
rows.push(fixtureRow(hex('d000', i), 54.1 + i * 0.01, 19.6, i < 2));
rows.push(fixtureRow(hex('d000', i), 54.1 + i * 0.001, 19.6, i < 2));
for (let i = 0; i < 3; i++)
rows.push(fixtureRow(hex('b000', i), 54.1 + i * 0.01, 18.1, i === 0));
rows.push(fixtureRow(hex('b000', i), 54.1 + i * 0.001, 18.1, i === 0));
for (let i = 0; i < 4; i++)
rows.push(fixtureRow(hex('e000', i), 55.1 + i * 0.01, 18.1, false));
rows.push(fixtureRow(hex('e000', i), 55.1 + i * 0.001, 18.1, false));
for (let i = 0; i < 2; i++)
rows.push(fixtureRow(hex('c000', i), 53.1 + i * 0.01, 17.1, true));
rows.push(fixtureRow(hex('c000', i), 53.1 + i * 0.001, 17.1, true));
return {
fetchedAt: Date.now(),
anchor: { lat: 55, lon: 19 },
@@ -398,8 +401,8 @@ async function main() {
const l = await enableAndSettle(live);
const legendTotal = l.legend.reduce((sum, { count }) => sum + count, 0);
// Bin what adsb.lol actually returned with the layer's own rules: live
// traffic varies by hour, so cells are required only when some cell
// really reached the minimum aircraft count.
// traffic varies by hour, so cells are required only when the rows
// really bin into some cell.
const liveSnapshots = (await Promise.allSettled(liveBodies))
.filter((r) => r.status === 'fulfilled')
.map((r) => r.value);
@@ -442,7 +445,7 @@ async function main() {
);
} else {
console.log(
` [info] ${liveRows} live rows, no cell reaches the minimum — cell count not asserted`,
` [info] ${liveRows} live rows bin into no cell — cell count not asserted`,
);
}
record(
@@ -452,7 +455,7 @@ async function main() {
);
const liveBuilt = await waitForBuiltCells(live);
record(
'LIVE: every cell rectangle is built on a parked camera',
'LIVE: every cell polygon is built on a parked camera',
liveBuilt.built,
liveBuilt.detail,
);
@@ -467,7 +470,7 @@ async function main() {
await page.setViewport({ width: 1440, height: 900 });
page.on('pageerror', (e) => errors.push(e.message));
// Stub the route in-page rather than with request interception: an
// intercepted page stalls Cesium's geometry workers, so ground rectangles
// intercepted page stalls Cesium's geometry workers, so ground polygons
// never finish building and the screenshot would not show real behaviour.
await stubRoute(page);
await boot(page, { lon: 18.6, lat: 54.6, height: 450_000 });
@@ -475,25 +478,27 @@ async function main() {
const band = (prefix) =>
f.legend.find(({ label }) => label.startsWith(prefix))?.count;
record(
'BANDS: 4 cells shown, the 2-aircraft cell withheld',
f.stats.count === 4 && f.drawn,
'BANDS: 5 cells shown, the 2-aircraft cell included',
f.stats.count === 5 && f.drawn,
`cells=${f.stats.count} drawn=${f.drawn}`,
);
record(
'BANDS: 5/10 is high, 2/30 is medium, 1/3 and 0/4 are low',
band('Low-accuracy score >') === 1 &&
'BANDS: 5/10 and 2/2 are high, 2/30 is medium, 1/3 and 0/4 are low',
band('Low-accuracy score >') === 2 &&
band('Low-accuracy score 2') === 1 &&
band('Low-accuracy score <') === 2,
JSON.stringify(f.legend),
);
const prov = f.stats.provenance;
record(
'PROVENANCE: GEV classifier, gpsjam bands and visited-view window are machine-readable',
'PROVENANCE: GEV classifier, gpsjam bands and H3 grid, and visited-view window are machine-readable',
prov?.classifier?.id === 'gev-nic-nacp-v2' &&
prov.classifier.definedBy === 'GEV' &&
prov.classifier.validated === false &&
prov.aggregation?.source === 'https://gpsjam.org/faq' &&
JSON.stringify(prov.aggregation.bands) === '[2,10]' &&
prov.aggregation.grid === 'h3' &&
prov.aggregation.h3Resolution === 4 &&
prov.window?.minutes === 30 &&
prov.window.scope === 'visited-view' &&
prov.interpretation?.validated === false,
@@ -516,7 +521,7 @@ async function main() {
);
const bandsBuilt = await waitForBuiltCells(page);
record(
'BANDS: every cell rectangle is built on a parked camera',
'BANDS: every cell polygon is built on a parked camera',
bandsBuilt.built,
bandsBuilt.detail,
);
@@ -782,7 +787,7 @@ async function main() {
const e = await enableAndSettle(page, { refresh: true });
record(
'FAILURE: error surfaced, cells kept',
Boolean(e.stats.error) && e.stats.count === 4 && e.drawn,
Boolean(e.stats.error) && e.stats.count === 5 && e.drawn,
`error=${JSON.stringify(e.stats.error)} cells=${e.stats.count}`,
);
await shoot(page, 'failure');
@@ -812,7 +817,7 @@ async function main() {
'KEYBOARD: Enter on the focused toggle enables the layer and keeps focus',
on.enabled &&
on.focused &&
on.count === 4 &&
on.count === 5 &&
/^GNSS Integrity: /.test(on.label) &&
!/OFF$/.test(on.label),
JSON.stringify(on),
@@ -921,7 +926,7 @@ async function main() {
return (
layer.enabled &&
layer.module.getStats().error === null &&
layer.module.getStats().count === 4
layer.module.getStats().count === 5
);
},
{ timeout: 20000 },
@@ -972,7 +977,7 @@ async function main() {
const recent = await enableAndSettle(aged, { refresh: true });
record(
'AGE: the same snapshot observed 29 min ago is still inside the window',
recent.stats.count === 4 && recent.drawn,
recent.stats.count === 5 && recent.drawn,
`cells=${recent.stats.count} drawn=${recent.drawn}`,
);
await aged.close();