Draw Radio stations and their clusters through the draw port and take the Radio renderer off the Cesium list

The stations, the cluster dots and the selected station's dot and bracket
are draw-port point and icon sets. Stations drawn too close together on
screen are grouped by geo/screenCluster.js as the default renderer's
entity clustering grouped them: the same boxes and screen coordinates, the
same reuse of the last pass's clusters when the eye comes lower, a pass
whenever the camera moves enough or a station is shown or hidden, and
stations a pass passes over hidden until the next. A cluster dot names its
seed station, so a click plays it as before. The Radio QA script reads the
drawn sets; the unused cluster-collection internals helper is gone.
This commit is contained in:
Sameh Khamis committed 2026-11-08 11:11:50 -08:00
1 parent b2502d6f37
commit a59f9b10b2
17 files changed
+1134 -352

No files matched your search

+28 -19
View File
@@ -5,6 +5,7 @@ import {
fakeCameraPort,
} from '../testSupport/fakeCameraPort.mjs';
import { bindRenderer } from '../render/rendererOf.js';
import { fakeDrawPort } from '../testSupport/fakeDrawPort.mjs';
import {
buildRadioTunerBand,
buildRadioTunerTicks,
@@ -405,7 +406,7 @@ test('destroy and re-init reset Radio audio ownership, volume, filter, and telem
radioLayer.destroy();
try {
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
radioLayer.enable();
radioLayer.setLifecyclePresentation({
lifecycleState: 'enabled', enabled: true, uncertain: false,
@@ -430,7 +431,7 @@ test('destroy and re-init reset Radio audio ownership, volume, filter, and telem
assert.equal(getRadioUIState().volume, 0.8);
assert.equal(getRadioUIState().effectiveVolume, 0.8);
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
assert.equal(audioInstances.length, 2, 're-init creates a clean Audio session');
const nextState = getRadioUIState();
for (const eventName of ['playing', 'pause', 'waiting', 'error']) {
@@ -524,7 +525,7 @@ test('late media errors after replacement or Pause cannot mutate the active stat
radioLayer.destroy();
try {
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
radioLayer.enable();
await radioLayer.update();
radioLayer.setLifecyclePresentation({
@@ -654,7 +655,7 @@ test('unusable directory responses preserve warm client state atomically', async
};
radioLayer.destroy();
try {
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
globalThis.fetch = async () => new Response(JSON.stringify({
stations: [station],
stale: false,
@@ -768,7 +769,7 @@ test('unusable directory responses preserve warm client state atomically', async
assert.equal(getRadioUIState().stale, true);
assert.equal(getRadioUIState().rejectedStationCount, 10_000);
radioLayer.destroy();
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
assert.equal(getRadioUIState().rejectedStationCount, 0);
assert.equal(getRadioUIState().degraded, false);
} finally {
@@ -826,7 +827,7 @@ test('tuner drag keeps one immutable catalog resolution through refresh and rele
radioLayer.destroy();
try {
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
radioLayer.enable();
await publish(stationA, 1);
assert.equal(radioLayer.beginTuning(), true);
@@ -933,7 +934,20 @@ test('failed exact tuner release cannot consume a stale playback fallback', asyn
test('tuner cancellation restores the frozen start marker after catalog removal', async () => {
const originalFetch = globalThis.fetch;
const originalAudio = globalThis.Audio;
const selectedEntities = new Map();
const draw = fakeDrawPort();
// The selected station's dot, from the layer's selected-marker set.
const selectedEntities = {
record: () =>
[...draw.sets.values()].find(
(set) => !set.disposed && set.spec.id.endsWith(':selected'),
),
get(id) {
return this.record()?.items.get(id);
},
has(id) {
return Boolean(this.get(id));
},
};
let playCalls = 0;
let flyToCalls = 0;
globalThis.Audio = class FakeAudio {
@@ -956,11 +970,6 @@ test('tuner cancellation restores the frozen start marker after catalog removal'
canvas: { disableRootEvents: true, onwheel: null, addEventListener() {}, removeEventListener() {} },
requestRender() {},
},
dataSources: { add() {}, remove() {} },
entities: {
add(entity) { selectedEntities.set(entity.id, entity); return entity; },
remove(entity) { return selectedEntities.delete(entity?.id); },
},
};
const stationA = {
id: '00000000-0000-4000-8000-000000000051',
@@ -1000,7 +1009,7 @@ test('tuner cancellation restores the frozen start marker after catalog removal'
radioLayer.destroy();
try {
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw }));
radioLayer.enable();
radioLayer.setLifecyclePresentation({
lifecycleState: 'enabled', enabled: true, uncertain: false,
@@ -1020,7 +1029,7 @@ test('tuner cancellation restores the frozen start marker after catalog removal'
assert.equal(radioLayer.cancelTuning(), true);
const restoredMarker = selectedEntities.get(`radio:selected:${stationA.id}`);
assert.ok(restoredMarker, 'the frozen start marker remains visible after cancellation');
assert.deepEqual(restoredMarker.position, startMarker.position);
assert.deepEqual(restoredMarker.pos, startMarker.pos);
assert.equal(getRadioUIState().tuningRestoredStationId, stationA.id);
assert.equal(getRadioUIState().tuningActive, false);
assert.equal(getRadioUIState().selected, null, 'stale marker never becomes playback authority');
@@ -1109,7 +1118,7 @@ test('Radio public tuner, filter, and resume mutations require certain enabled l
radioLayer.destroy();
try {
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
radioLayer.enable();
await radioLayer.update();
radioLayer.setLifecyclePresentation({
@@ -1184,7 +1193,7 @@ test('tuner refuses a degraded fallback that has no accepted catalog generation'
acceptedGeneration: null,
updatedAt: new Date().toISOString(),
}), { status: 200, headers: { 'Content-Type': 'application/json' } });
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
radioLayer.enable();
await radioLayer.update();
@@ -1239,7 +1248,7 @@ test('accepted snapshots allowlist station fields and never regress generation i
radioLayer.destroy();
try {
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
serve([station], 1);
radioLayer.enable();
await radioLayer.update();
@@ -1350,7 +1359,7 @@ test('update abort, destroy, and re-init invalidate the prior session and reset
requestSignal = options.signal;
return new Promise((resolve) => { resolveFetch = resolve; });
};
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
radioLayer.enable();
const pending = radioLayer.update();
assert.equal(getRadioUIState().loading, true);
@@ -1359,7 +1368,7 @@ test('update abort, destroy, and re-init invalidate the prior session and reset
assert.equal(getRadioUIState().loading, false);
radioLayer.destroy();
radioLayer.init(bindFakeCesiumCamera(viewer));
radioLayer.init(bindFakeCesiumCamera(viewer, { draw: fakeDrawPort() }));
const cleanState = getRadioUIState();
assert.deepEqual({
enabled: cleanState.enabled,
+4 -2
View File
@@ -3,6 +3,7 @@ import { EventEmitter } from 'node:events';
import https from 'node:https';
import { Readable } from 'node:stream';
import test from 'node:test';
import { bindFakeDraw } from '../testSupport/fakeDrawPort.mjs';
import { fetchPinnedRadioResponse } from '../../server/providers/radio/transport.js';
import {
createRadioProxyMiddleware,
@@ -575,9 +576,9 @@ test('server structural rejections reach the client diagnostic without discardin
const viewer = {
camera: { positionWC: { x: 7_000_000, y: 0, z: 0 } },
scene: { canvas: { disableRootEvents: true, onwheel: null, addEventListener() {}, removeEventListener() {} } },
dataSources: { add() {}, remove() {} },
entities: { add(entity) { return entity; }, remove() {} },
};
// The stations draw through the renderer's draw port.
const { unbind } = bindFakeDraw(viewer);
radioLayer.destroy();
try {
globalThis.fetch = async () => new Response(response.body, {
@@ -597,5 +598,6 @@ test('server structural rejections reach the client diagnostic without discardin
} finally {
globalThis.fetch = originalFetch;
radioLayer.destroy();
unbind();
}
});