Remove always-true layer availability and leftover viewer paths

Every layer draws on both engines, so the per-engine availability
machinery always answered yes. The renderer manifest is now the id to
display map plus the wind flow backend; the catalog filter, the voice and
QA-probe refusals and the engine-kind checks go with it. The Navara
notice lists the same layers in the same words.

Paths that read the Cesium viewer behind an engine that is always there
are gone: the Recent Imagery viewer fallbacks, the shell's imagery-host
service (one shared host module remains), the engineless map controller,
viewer gates in voice actions, world packets and camera verbs, the
orientation controls' tracked-entity fallback, and the Bhote Koshi and
FIRMS Cesium-shaped paths. setCameraInputs, which nothing called, leaves
the contract; suspensions remain.

Smaller duplicates go too: one tracker-release helper for navigation and
location, the no-op frame latch, missing-engine guards, one name for the
injected display, flat bikeshare and installations displays, one overlay
host and binder, one name per world-overlay method, and stub-viewer
guards in the Cesium engine. Layers that still read the viewer keep the
shared init(viewer, context) entry.

Behaviour is unchanged on both engines. Viewer lines fall from 849 to
750 and engine-name literals from 32 to 27.
This commit is contained in:
German Khokhlov committed 2026-11-08 17:06:01 +04:00
1 parent 371d848eec
commit 7f478e3815
279 files changed
+1570 -3104

No files matched your search

+24 -88
View File
@@ -4,12 +4,7 @@ import { waitForSignal } from '../sources/requestDeadline.js';
import * as Cesium from 'cesium';
import { cesiumSdkReady, loadCesiumSdk } from '../app/loadCesium.js';
import { isPointerFree } from './inputOwnership.js';
import {
clearOverlaySource,
hitTestWorldOverlay,
setOverlayEntries,
setOverlaySourceVisible,
} from '../overlays/worldOverlay.js';
import { WORLD_OVERLAY_STYLE } from '../overlays/worldOverlayTokens.js';
import {
governorRequestRender,
@@ -107,13 +102,7 @@ const PASSIVE_ENABLE_ORIGINS = new Set([
'dependency-restore',
]);
const DEFAULT_OVERLAY_HOST = Object.freeze({
forEngine: worldOverlayFor,
setEntries: setOverlayEntries,
setVisible: setOverlaySourceVisible,
clearSource: clearOverlaySource,
hitTest: hitTestWorldOverlay,
});
const DEFAULT_OVERLAY_HOST = worldOverlayFor;
const DEFAULT_RENDER_HOST = Object.freeze({
request: governorRequestRender,
hold: holdContinuousRender,
@@ -125,8 +114,6 @@ const DEFAULT_EVENT_LOADER = async () => {
throw new Error(`Bhote Koshi event pack unavailable (${response.status})`);
return response.json();
};
const DEFAULT_IMAGERY_PROVIDER_FACTORY = (url, options) =>
Cesium.SingleTileImageryProvider.fromUrl(url, options);
const DEFAULT_TERRAIN_SAMPLER = async (viewer, observations) => {
if (
!viewer?.terrainProvider ||
@@ -1010,7 +997,6 @@ export function createBhoteKoshiEventLayer({
overlayHost = DEFAULT_OVERLAY_HOST,
renderHost = DEFAULT_RENDER_HOST,
eventLoader = DEFAULT_EVENT_LOADER,
imageryProviderFactory = DEFAULT_IMAGERY_PROVIDER_FACTORY,
terrainSampler = DEFAULT_TERRAIN_SAMPLER,
mediaLoader = DEFAULT_MEDIA_LOADER,
imageLoader = DEFAULT_MEDIA_LOADER,
@@ -1026,7 +1012,6 @@ export function createBhoteKoshiEventLayer({
let _engine = null;
let _native = null;
let _nativeFlood = null;
let _providers = null;
// The before and after images, decoded once for every engine the event
// is drawn on (as Cesium's providers were kept across switches).
let _imageryImages = null;
@@ -1046,9 +1031,6 @@ export function createBhoteKoshiEventLayer({
let _panelFixed = null;
let _offPanelLocale = null;
let _splitControl = null;
let _beforeLayer = null;
let _afterLayer = null;
let _imageryLayerCollection = null;
let _floodDataSource = null;
let _floodSurfaceMode = null;
let _floodHalo = null;
@@ -1189,53 +1171,25 @@ export function createBhoteKoshiEventLayer({
}
async function createImagery(event, current = () => true) {
if (_native) {
// The engine's display draws the images through engine.imagery.
_imageryImages ??= Promise.all(
[event.imagery.before.path, event.imagery.after.path].map((path) =>
imageLoader(eventAsset(path)),
),
);
let images;
try {
images = await _imageryImages;
} catch {
_imageryImages = null;
throw new Error('Bhote Koshi imagery unavailable');
}
await _native.loadImages(
event.imagery.rectangle,
images,
'Vantor WorldView Open Data · CC BY-NC 4.0',
);
if (_enabled && current()) setSplit(_split);
return;
}
const rectangle = Cesium.Rectangle.fromDegrees(
event.imagery.rectangle.west,
event.imagery.rectangle.south,
event.imagery.rectangle.east,
event.imagery.rectangle.north,
// The engine's display draws the images through engine.imagery.
_imageryImages ??= Promise.all(
[event.imagery.before.path, event.imagery.after.path].map((path) =>
imageLoader(eventAsset(path)),
),
);
const [beforeProvider, afterProvider] = await (_providers ??= Promise.all([
imageryProviderFactory(eventAsset(event.imagery.before.path), {
rectangle,
credit: 'Vantor WorldView Open Data · CC BY-NC 4.0',
}),
imageryProviderFactory(eventAsset(event.imagery.after.path), {
rectangle,
credit: 'Vantor WorldView Open Data · CC BY-NC 4.0',
}),
]));
if (!_enabled || !current()) return;
_imageryLayerCollection = _viewer.imageryLayers;
_beforeLayer = _imageryLayerCollection.addImageryProvider(beforeProvider);
_afterLayer = _imageryLayerCollection.addImageryProvider(afterProvider);
_beforeLayer.splitDirection = Cesium.SplitDirection.LEFT;
_afterLayer.splitDirection = Cesium.SplitDirection.RIGHT;
_beforeLayer.alpha = 0.96;
_afterLayer.alpha = 0.96;
setSplit(_split);
let images;
try {
images = await _imageryImages;
} catch {
_imageryImages = null;
throw new Error('Bhote Koshi imagery unavailable');
}
await _native.loadImages(
event.imagery.rectangle,
images,
'Vantor WorldView Open Data · CC BY-NC 4.0',
);
if (_enabled && current()) setSplit(_split);
}
async function resolveEvidenceAnchors(event, signal) {
@@ -2654,9 +2608,8 @@ export function createBhoteKoshiEventLayer({
disableDepthTestDistance: tileSafe ? Number.POSITIVE_INFINITY : 0,
},
});
// The engine's story backend, or Cesium's data sources.
// The engine's story display.
_nativeFlood = _native?.draw(_floodDataSource) ?? null;
if (!_nativeFlood) _viewer.dataSources.add(_floodDataSource);
}
function syncFloodSurfaceMode() {
@@ -2669,7 +2622,6 @@ export function createBhoteKoshiEventLayer({
return;
_nativeFlood?.destroy();
_nativeFlood = null;
_viewer?.dataSources.remove(_floodDataSource, true);
_floodDataSource = null;
_floodHalo = null;
_floodCore = null;
@@ -3355,8 +3307,6 @@ export function createBhoteKoshiEventLayer({
_panelRefs.progressInput.hidden = !scrubberAvailable;
_splitControl?.setVisible(imageryAvailable);
_native?.setVisible(imageryAvailable);
if (_beforeLayer) _beforeLayer.show = imageryAvailable;
if (_afterLayer) _afterLayer.show = imageryAvailable;
if (_panelRefs?.caveat) {
_panelRefs.caveat.textContent = imageryAvailable
? bhoteEventText(_event?.reconstruction?.caveat || '')
@@ -3538,14 +3488,6 @@ export function createBhoteKoshiEventLayer({
focusView(_viewer, _event.viewpoints.corridor, _engine);
}
function removeImagery() {
if (_beforeLayer) _imageryLayerCollection?.remove(_beforeLayer, true);
if (_afterLayer) _imageryLayerCollection?.remove(_afterLayer, true);
_beforeLayer = null;
_afterLayer = null;
_imageryLayerCollection = null;
}
// Each attachment and release advances this. An attachment that resumes
// after a release, or after its scene signal aborted, stops right there;
// the release that follows it owns whatever it had already created.
@@ -3567,7 +3509,7 @@ export function createBhoteKoshiEventLayer({
_viewer = viewer;
_engine = engine;
// The engine's display (src/layers/bhoteKoshi/render/display.js).
if (_engine) _native = createNativeRenderer?.(engine) ?? null;
_native = createNativeRenderer(engine);
_embeddedMedia?.attachScene?.(viewer, engine);
if (!_enabled) return;
// Its enable has loaded the SDK; a restored attachment waits for it too.
@@ -3594,7 +3536,6 @@ export function createBhoteKoshiEventLayer({
if (!current()) return;
if (_floodDataSource) {
_nativeFlood = _native?.draw(_floodDataSource) ?? null;
if (!_nativeFlood) await _viewer.dataSources.add(_floodDataSource);
if (!current()) return;
}
registerDynamicCredit(engine, BHOTE_KOSHI_CREDIT);
@@ -3630,11 +3571,9 @@ export function createBhoteKoshiEventLayer({
_splitControl?.destroy();
_splitControl = null;
_embeddedMedia?.attachScene?.(null, null);
removeImagery();
_native?.clear();
_nativeFlood?.destroy();
_nativeFlood = null;
if (_floodDataSource && _viewer)
_viewer.dataSources.remove(_floodDataSource, false);
_native?.destroy();
_native = null;
_engine = _viewer = null;
@@ -3789,7 +3728,7 @@ export function createBhoteKoshiEventLayer({
_witnessEmbedActive = false;
overlayHost.clearSource(BHOTE_KOSHI_OVERLAY_SOURCE_ID);
overlayHost.setVisible(BHOTE_KOSHI_OVERLAY_SOURCE_ID, false);
removeImagery();
_native?.clear();
_terrainPositions = [];
_sourceShotPaths.clear();
_scenePathPositionCache.clear();
@@ -3809,10 +3748,7 @@ export function createBhoteKoshiEventLayer({
_nativeFlood?.destroy();
_nativeFlood = null;
_native?.clear();
_providers = null;
_imageryImages = null;
if (_floodDataSource && _viewer)
_viewer.dataSources.remove(_floodDataSource, true);
_floodDataSource = null;
_floodSurfaceMode = null;
_floodHalo = null;
+66 -30
View File
@@ -14,7 +14,7 @@ import {
buildCinematicKeyframes,
buildEvidenceTimeline,
clampUnit,
createBhoteKoshiEventLayer,
createBhoteKoshiEventLayer as buildEventLayer,
evidenceCardLayout,
createEvidenceFrame,
elapsedLabel,
@@ -231,6 +231,42 @@ function installEventDom() {
return { body, removedProperties };
}
function createBhoteKoshiEventLayer(options) {
let viewer;
const layer = buildEventLayer({
...options,
createNativeRenderer() {
let images = [];
const clear = () => {
for (const image of images) viewer._test?.removedImagery.push(image);
images = [];
};
return {
async loadImages(_box, providers) {
clear();
images = providers.map((provider, index) => ({ provider, splitDirection: index ? 'right' : 'left' }));
viewer._test?.imagery.push(...images);
},
draw(source) {
viewer._test?.dataSources.push(source);
let removed = false;
return { destroy() {
if (!removed) viewer._test?.removedDataSources.push(source);
removed = true;
} };
},
setVisible(show) { for (const image of images) image.show = show; },
setSplit() {}, clear, destroy: clear,
};
},
});
for (const name of ['init', 'attachRenderer', 'enable']) {
const method = layer[name];
layer[name] = (next, options) => { viewer = next; if (name === 'enable') layer.attachRenderer(next); return method.call(layer, next, options); };
}
return layer;
}
function eventViewer(splitPosition = 0.37) {
const imagery = [];
const removedImagery = [];
@@ -293,7 +329,7 @@ test('public lifecycle restores Nepal scene ownership without forwarding origin
const mapCalls = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => observations.map(() => ({ height: 800 })),
mediaLoader: async () => { const error = new Error('No bundled clip'); error.name = 'AbortError'; throw error; },
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
@@ -355,7 +391,7 @@ test('trimmed scene media holds through provider startup, playback and fade, the
const event = JSON.parse(await readFile(eventUrl, 'utf8'));
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => observations.map(() => ({ height: 800 })),
mediaLoader: async () => { const error = new Error('No bundled clip'); error.name = 'AbortError'; throw error; },
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
@@ -403,7 +439,7 @@ test('Pinokio source-card fallback selects authored Director dwell, not an impos
const event = JSON.parse(await readFile(eventUrl, 'utf8'));
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async url => ({ url }),
imageLoader: async url => ({ url }),
terrainSampler: async (_viewer, observations) => observations.map(() => ({ height: 800 })),
mediaLoader: async () => { throw Object.assign(new Error('No bundled clip'), { name: 'AbortError' }); },
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
@@ -448,7 +484,7 @@ test('saved autoplay controls cannot authorize media; live shot ownership is can
const event = JSON.parse(await readFile(eventUrl, 'utf8'));
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async url => ({ url }),
imageLoader: async url => ({ url }),
terrainSampler: async (_viewer, observations) => observations.map(() => ({ height: 800 })),
mediaLoader: async () => { throw Object.assign(new Error('No bundled clip'), { name: 'AbortError' }); },
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
@@ -843,7 +879,7 @@ test('Bhote Koshi failed direct enable restores the prior map and shared split',
};
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async () => { throw new Error('fixture image failure'); },
imageLoader: async () => { throw new Error('fixture image failure'); },
overlayHost: {
setEntries() {},
setVisible(id, visible) { overlayCalls.push(['visible', id, visible]); },
@@ -866,7 +902,7 @@ test('Bhote Koshi failed direct enable restores the prior map and shared split',
try {
await assert.rejects(
layer.enable(viewer, { origin: 'scene' }),
/fixture image failure/,
/Bhote Koshi imagery unavailable/,
);
assert.deepEqual(mapCalls, ['esri-imagery', 'photoreal']);
assert.equal(viewer.scene.splitPosition, 0.37);
@@ -946,7 +982,7 @@ test('Bhote Koshi disable preserves an operator-selected map and tears down ever
const renderCalls = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
overlayHost: {
setEntries() {},
setVisible(id, visible) { overlayCalls.push(['visible', id, visible]); },
@@ -1013,7 +1049,7 @@ test('Bhote Koshi disable stops active playback and releases its global render h
const viewer = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
renderHost: {
request() {},
@@ -1071,7 +1107,7 @@ test('Bhote Koshi passive restores do not start off-screen playback', async () =
const viewer = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
embeddedMediaFactory: () => ({ show() {}, hide() {}, pause() {}, destroy() {} }),
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
renderHost: { request() {}, hold() {}, release() {} },
@@ -1120,7 +1156,7 @@ test('Bhote Koshi standalone Scene keeps its Esri cinematic contract', async ()
const mapCalls = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -1195,7 +1231,7 @@ test('Bhote Koshi scene beats preserve photoreal and never take camera ownership
const overlayVisibility = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -1506,7 +1542,7 @@ test('Nepal hybrid comparison preserves native split and terrain-clamped flood t
const comparisonCalls = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -1540,8 +1576,8 @@ test('Nepal hybrid comparison preserves native split and terrain-clamped flood t
assert.equal(viewer._test.imagery.length, 2);
assert.ok(viewer._test.imagery.every((imageryLayer) => imageryLayer.show === true));
assert.equal(viewer.scene.splitPosition, 0.5);
assert.equal(viewer._test.imagery[0].splitDirection, Cesium.SplitDirection.LEFT);
assert.equal(viewer._test.imagery[1].splitDirection, Cesium.SplitDirection.RIGHT);
assert.equal(viewer._test.imagery[0].splitDirection, 'left');
assert.equal(viewer._test.imagery[1].splitDirection, 'right');
layer.setParams({ split: 0.25 });
assert.equal(viewer.scene.splitPosition, 0.25);
const flood = viewer._test.dataSources[0].entities.getById('bhote-koshi-flood-core');
@@ -1650,7 +1686,7 @@ test('Bhote Koshi publishes the evidence spine once and scrubs through cards and
const publications = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -1747,7 +1783,7 @@ test('Bhote Koshi keeps one local fallback video active and unloads it on beat c
};
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -1848,7 +1884,7 @@ test('Upper Valley Collapse autoplays its muted local fallback without starting
};
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -1924,7 +1960,7 @@ test('Debris-Dammed Lake card opens its source and is armed for approved local v
let activeCard = null;
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -2015,7 +2051,7 @@ test('Nepal evidence shots resume the standalone callout and flood sequence from
const releases = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -2186,7 +2222,7 @@ test('Bhote Koshi beat controls keep cards, flood, camera, and panel on the one
const publications = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -2306,7 +2342,7 @@ test('Bhote Koshi repeated event frames republish no panel and churn no camera',
const viewer = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -2389,7 +2425,7 @@ test('Bhote Koshi cinematic camera stays synchronized through pause and determin
const viewer = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -2470,7 +2506,7 @@ test('Bhote Koshi replay restores cinematic ownership unless the operator releas
const viewer = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async (_viewer, observations) => (
observations.map((observation) => ({ height: observation.fallbackElevationM }))
),
@@ -2552,7 +2588,7 @@ test('Bhote Koshi closes a poster that resolves after disable', async () => {
const poster = { closed: false, close() { this.closed = true; } };
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async () => [{ height: 2800 }],
mediaLoader: async (url) => {
assert.equal(url, '/events/bhote-koshi-2026/evidence-09.jpg');
@@ -2598,7 +2634,7 @@ test('every sourced shot grows its tail with its head, keeps its own card, and c
let entries = [];
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async () => null,
mediaLoader: async () => { throw Object.assign(new Error('fixture'), { name: 'AbortError' }); },
overlayHost: { setEntries(_id, value) { entries = value; }, setVisible() {}, clearSource() {} },
@@ -2700,7 +2736,7 @@ test('media-led upper-valley shots retain only their upstream prefix during came
const viewer = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async url => ({ url }),
imageLoader: async url => ({ url }),
terrainSampler: async () => null,
mediaLoader: async () => { throw Object.assign(new Error('fixture'), { name: 'AbortError' }); },
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
@@ -2798,7 +2834,7 @@ test('camera-led Nepal flood motion preserves its prefix and stays ahead of shot
const viewer = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
terrainSampler: async () => null,
mediaLoader: async () => { throw Object.assign(new Error('fixture'), { name: 'AbortError' }); },
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
@@ -3004,7 +3040,7 @@ for (const stop of ['detach', 'scene-abort']) {
const second = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
embeddedMediaFactory: () => ({ show() {}, hide() {}, pause() {}, destroy() {} }),
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
renderHost: { request() {}, hold() {}, release() {} },
@@ -3062,7 +3098,7 @@ test('Bhote Koshi stops waiting for a stalled map switch when its scene is relea
const second = eventViewer();
const layer = createBhoteKoshiEventLayer({
eventLoader: async () => event,
imageryProviderFactory: async (url) => ({ url }),
imageLoader: async (url) => ({ url }),
embeddedMediaFactory: () => ({ show() {}, hide() {}, pause() {}, destroy() {} }),
overlayHost: { setEntries() {}, setVisible() {}, clearSource() {} },
renderHost: { request() {}, hold() {}, release() {} },
+3 -15
View File
@@ -2,10 +2,7 @@ import { bindOverlayHost } from '../overlays/bindOverlayHost.js';
import { worldOverlayFor } from '../overlays/worldOverlay.js';
import * as Cesium from 'cesium';
import { cesiumSdkReady, loadCesiumSdk } from '../app/loadCesium.js';
import {
clearOverlaySource,
setOverlayEntries,
} from '../overlays/worldOverlay.js';
import { governorRequestRender } from '../renderGovernor.js';
import {
BHOTE_KOSHI_LOCATOR_CREDIT,
@@ -152,11 +149,7 @@ const BORDER_ACCENT = '#20e7f2';
const INCIDENT_ACCENT = '#ffad55';
const INCIDENT_COLOR = () => Cesium.Color.fromCssColorString(INCIDENT_ACCENT);
const DEFAULT_OVERLAY_HOST = Object.freeze({
forEngine: worldOverlayFor,
setEntries: setOverlayEntries,
clearSource: clearOverlaySource,
});
const DEFAULT_OVERLAY_HOST = worldOverlayFor;
// Applications supply their boundary resolver; the layer has no server-route dependency.
const DEFAULT_BOUNDARY_RESOLVER = async () => null;
@@ -362,8 +355,6 @@ export function createBhoteKoshiLocatorLayer({
overlayHost.clearSource(BHOTE_KOSHI_LOCATOR_OVERLAY_SOURCE_ID);
_native?.destroy();
_native = null;
if (_dataSource && _viewer?.dataSources)
_viewer.dataSources.remove(_dataSource, true);
_dataSource = null;
}
@@ -1047,9 +1038,7 @@ export function createBhoteKoshiLocatorLayer({
function connectDisplay() {
if (!_dataSource) return;
if (_engine && createNativeRenderer)
_native = createNativeRenderer(_engine, _dataSource);
else if (_viewer) _viewer.dataSources.add(_dataSource);
_native = createNativeRenderer(_engine, _dataSource);
registerDynamicCredit(_engine, BHOTE_KOSHI_LOCATOR_CREDIT);
showOsmCredit(_engine, BHOTE_KOSHI_LOCATOR_LAYER_ID);
}
@@ -1080,7 +1069,6 @@ export function createBhoteKoshiLocatorLayer({
}
_native?.destroy();
_native = null;
if (_viewer && _dataSource) _viewer.dataSources.remove(_dataSource, false);
hideOsmCredit(_engine, BHOTE_KOSHI_LOCATOR_LAYER_ID);
_engine = _viewer = null;
}
+16 -1
View File
@@ -21,12 +21,27 @@ import {
BHOTE_KOSHI_REGIONAL_PRESENTATION,
BHOTE_KOSHI_TRIGGER_RECORD_PRESENTATION,
closeRegionRing,
createBhoteKoshiLocatorLayer,
createBhoteKoshiLocatorLayer as buildLocatorLayer,
largestGeoJsonRing,
NEPAL_CONTEXT_PRESENTATION,
revealPolylinePositions,
} from './bhoteKoshiLocator.js';
function createBhoteKoshiLocatorLayer(options) {
let viewer;
const layer = buildLocatorLayer({ ...options,
createNativeRenderer(_engine, source) {
viewer._test.added.push(source);
return { destroy() { viewer._test.removed.push(source); } };
},
});
for (const name of ['init', 'attachRenderer', 'enable']) {
const method = layer[name];
layer[name] = (next, options) => { viewer = next; return method.call(layer, next, options); };
}
return layer;
}
function viewerFixture() {
const added = [];
const removed = [];
-12
View File
@@ -1,12 +0,0 @@
/** Resolve a retained layer's context calls against its current attachment. */
export function bindContextStore(context, getEngine) {
if (!context?.forEngine) return context;
return Object.fromEntries(
Object.entries(context)
.filter(([, value]) => typeof value === 'function')
.map(([name]) => [
name,
(...args) => context.forEngine(getEngine())?.[name]?.(...args),
]),
);
}
+2 -10
View File
@@ -1,3 +1,4 @@
import { installDomClasses } from '../testSupport/domClasses.mjs';
// Outline names are drawn by the DOM annotation overlay, never as Cesium
// text labels: the boundary data modules, the outline resolver and the
// annotation renderers must not import or construct Cesium label primitives,
@@ -95,16 +96,7 @@ test('the static check catches a Cesium label however it is written', () => {
test('drawing bundled place and neighborhood outlines creates no Cesium label', async (t) => {
// Cesium's material setup checks for these browser image types.
for (const name of [
'HTMLCanvasElement',
'HTMLImageElement',
'ImageBitmap',
'OffscreenCanvas',
]) {
if (name in globalThis) continue;
globalThis[name] = class {};
t.after(() => delete globalThis[name]);
}
installDomClasses(t);
const featureSource = {};
for (const method of FEATURE_SOURCE_METHODS)
featureSource[method] = async () => null;
+1
View File
@@ -387,6 +387,7 @@ export function forEngine(engine) {
export function isContextRecordActive(record, dataManager = null) {
if (!record) return false;
if (record.entity?.show === false) return false;
if (record.isVisible?.() === false) return false;
if (record.dataSource && record.dataSource.show === false) return false;
if (dataManager && record.layerId && !dataManager.isEnabled(record.layerId))
return false;
+4 -5
View File
@@ -1,3 +1,4 @@
import { worldOverlayFor } from '../overlays/worldOverlay.js';
import { paintTransitBracket } from './detectionDraw.js';
import * as geo from '../geo/index.js';
import { governorRequestRender } from '../renderGovernor.js';
@@ -21,7 +22,7 @@ import {
getKeyholeFadeTuning,
keyholeLabelAlphaFromGeometry,
} from '../celestialRing.js';
import { registerWorldOverlayPaintLane } from '../overlays/worldOverlay.js';
import {
DETECTION_STYLE,
DETECTION_THEME_MAP,
@@ -315,8 +316,7 @@ export function initDetection(engine, layers, onModeChange) {
);
_hostLayoutRevision = -1;
_calloutCount = 0;
_hostLane = registerWorldOverlayPaintLane(
engine,
_hostLane = worldOverlayFor(engine)?.registerPaintLane(
'detection',
_paintDetectionLane,
{
@@ -330,8 +330,7 @@ export function initDetection(engine, layers, onModeChange) {
// solved. Both sit in the 'detection' lane — the host's bottom slot — so
// callouts still paint under every ordinary overlay card and under the
// tracked readout, exactly where they sat before.
_calloutLane = registerWorldOverlayPaintLane(
engine,
_calloutLane = worldOverlayFor(engine)?.registerPaintLane(
'detection',
_paintCalloutLane,
{
+25 -27
View File
@@ -1,3 +1,4 @@
import { worldOverlayFor } from '../overlays/worldOverlay.js';
let overlayEngine;
import { readShellSource } from '../testSupport/readShellSource.mjs';
import test from 'node:test';
@@ -20,11 +21,7 @@ import {
setMode,
suspendDetection,
} from './detection.js';
import {
destroyWorldOverlay,
initWorldOverlay,
setOverlayEntries,
} from '../overlays/worldOverlay.js';
import { DETECTION_THEME_MAP } from '../overlays/worldOverlayTokens.js';
import {
clearAwarenessEchoField,
@@ -249,6 +246,7 @@ function installEnvironment({ width = 800, height = 600, dpr = 2, search = '' }
};
// Shell modules take the globe engine; the Cesium engine runs on the mock.
viewer.clock = { onTick: new Cesium.Event() };
const engine = createCesiumEngine(viewer);
overlayEngine = engine;
return {
@@ -263,7 +261,7 @@ function installEnvironment({ width = 800, height = 600, dpr = 2, search = '' }
setPerformanceStep(ms) { performanceStep = ms; },
cleanup() {
destroyDetection();
destroyWorldOverlay(overlayEngine);
worldOverlayFor(overlayEngine)?.destroy();
engine.destroy();
Date.now = originalDateNow;
if (originalPath2D === undefined) delete globalThis.Path2D;
@@ -359,7 +357,7 @@ test('detection lifecycle re-hosts unchanged painters behind the sole host liste
const env = installEnvironment({ search: '?detectDebug=1' });
const modes = [];
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [detectableLayer()], (mode) => modes.push(mode));
assert.equal(env.postRender.listeners.size, 1);
assert.equal(env.document.getElementById('detection-overlay'), null);
@@ -489,7 +487,7 @@ test('detection lifecycle re-hosts unchanged painters behind the sole host liste
setMode('DENSE');
env.postRender.raise();
assert.equal(env.document.getElementById('detection-overlay'), null);
destroyWorldOverlay(overlayEngine);
worldOverlayFor(overlayEngine)?.destroy();
assert.equal(env.postRender.listeners.size, 0);
assert.equal(env.document.getElementById('world-overlay-canvas'), null);
assert.equal(env.document.getElementById('world-overlay-detection-surface'), null);
@@ -513,7 +511,7 @@ test('callouts stop painting the moment the last detectable object goes away', (
type: 'AIR',
}];
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [{ id: 'flights', getDetectableObjects: () => objects }], () => {});
setMode('DENSE');
env.advance(250);
@@ -549,7 +547,7 @@ test('every style paints its OWN plate token through the production callout path
// path once per style and reads the fill style the shared canvas received.
const env = installEnvironment();
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [mixedTierLayer()], () => {});
setMode('DENSE');
settleFrame(env);
@@ -587,7 +585,7 @@ test('space-tier callouts take the heavier plate while air contacts keep the lig
// tiers at once can show it.
const env = installEnvironment();
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [mixedTierLayer()], () => {});
setDetectionStyle('surveillance');
setMode('DENSE');
@@ -615,7 +613,7 @@ test('space-tier callouts take the heavier plate while air contacts keep the lig
test('surveillance military tier reaches the dedicated render target as shipped red', () => {
const env = installEnvironment();
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [militaryLayer()], () => {});
setDetectionStyle('surveillance');
setMode('DENSE');
@@ -655,7 +653,7 @@ test('Global Context echo brackets reach the canvas in the detection style colou
pulse: { count: 1000, periodMs: 1000, startFraction: 0 },
echo,
});
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [militaryLayer()], () => {});
setMode('DENSE');
setDetectionStyle('normal');
@@ -701,7 +699,7 @@ test('a Global Context echo bracket is drawn outside its contact bracket and dim
echo,
level: () => 0.5,
});
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [militaryLayer()], () => {});
setMode('DENSE');
setDetectionStyle('normal');
@@ -773,7 +771,7 @@ test('under the Cyber sonar sweep an echo is never brighter than its own bracket
echo,
level: () => 1,
});
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [contact], () => {});
setMode('DENSE');
setDetectionStyle('normal');
@@ -835,7 +833,7 @@ test('resting Global Context pulses skip echo work for the whole frame, not per
return 0;
},
});
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [layer], () => {});
setMode('DENSE');
settleFrame(env);
@@ -862,9 +860,9 @@ test('pathological detection paint holds alternate frames without freezing share
// Opts into the telemetry banner: the held-frame assertions count banner paints.
const env = installEnvironment({ search: '?detectDebug=1' });
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [detectableLayer()], () => {});
setOverlayEntries(overlayEngine, 'valve-card', [{
worldOverlayFor(overlayEngine)?.setEntries('valve-card', [{
id: 'ambient-card',
position: new Cesium.Cartesian3(0, 0, 0),
variant: 'label',
@@ -925,7 +923,7 @@ test('detection cannot resurrect a private canvas, listener, matrix, resize, cle
assert.match(source, /const LABEL_SOLVE_INTERVAL_MS = 125;/);
assert.match(source, /const _labelArbiter = new LabelArbiter\(\);/);
assert.match(source, /const clipW = vp3 \* px \+ vp7 \* py \+ vp11 \* pz \+ vp15;/);
assert.match(source, /registerWorldOverlayPaintLane\(\s*engine,\s*'detection',\s*_paintDetectionLane/);
assert.match(source, /worldOverlayFor\(engine\)\?\.registerPaintLane\(\s*'detection',\s*_paintDetectionLane/);
assert.match(source, /target: 'detection'/);
assert.match(source, /shouldPaint: _shouldPaintDetectionLane/);
// The three military styles used to carry three copies of these numbers.
@@ -969,7 +967,7 @@ test('the mode banner is absent by default and present behind the flag', () => {
const painted = (search) => {
const env = installEnvironment({ search });
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [detectableLayer()], () => {});
setMode('DENSE');
env.advance(250);
@@ -982,7 +980,7 @@ test('the mode banner is absent by default and present behind the flag', () => {
return bannerPaints(env);
} finally {
destroyDetection();
destroyWorldOverlay(overlayEngine);
worldOverlayFor(overlayEngine)?.destroy();
env.cleanup();
}
};
@@ -996,7 +994,7 @@ test('detection telemetry stays reachable programmatically with the banner hidde
// is the supported way to read them, and is what the QA harnesses use.
const env = installEnvironment();
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [detectableLayer()], () => {});
setMode('DENSE');
env.advance(250);
@@ -1008,7 +1006,7 @@ test('detection telemetry stays reachable programmatically with the banner hidde
assert.equal(typeof diagnostics.densityPct, 'number');
} finally {
destroyDetection();
destroyWorldOverlay(overlayEngine);
worldOverlayFor(overlayEngine)?.destroy();
env.cleanup();
}
});
@@ -1024,7 +1022,7 @@ test('civilian and military AIR brackets cover front, left, and right at Sparse
metric: 'FL120',
type: 'AIR',
}));
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [{ id: layerId, getDetectableObjects: () => objects }], () => {});
setDetectionTuning({ densityPct: 25 });
setMode('SPARSE');
@@ -1042,7 +1040,7 @@ test('civilian and military AIR brackets cover front, left, and right at Sparse
'Sparse keeps its documented budget instead of silently becoming Dense');
} finally {
destroyDetection();
destroyWorldOverlay(overlayEngine);
worldOverlayFor(overlayEngine)?.destroy();
env.cleanup();
}
}
@@ -1082,7 +1080,7 @@ test('the backdrop feather reaches the canvas as a lighter plate against sky', (
// the shared canvas actually received for each plate.
const env = installEnvironment();
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(env.engine, [backdropLayer()], () => {});
setDetectionStyle('normal');
setMode('DENSE');
@@ -1140,7 +1138,7 @@ test('a transit vehicle is a contact: box, route, mode and operator on the share
},
];
try {
initWorldOverlay(overlayEngine = env.engine);
worldOverlayFor(overlayEngine = env.engine)?.init();
initDetection(
env.engine,
[{ id: 'transit', getDetectableObjects: () => objects }],
+1 -1
View File
@@ -15,7 +15,7 @@ import * as credits from './dataCredits.js';
import * as render from '../renderGovernor.js';
import * as picking from './pickRegistry.js';
import * as scenePick from './scenePick.js';
import * as overlays from '../overlays/worldOverlay.js';
import { worldOverlayFor as overlays } from '../overlays/worldOverlay.js';
import * as camera from '../cameraVerbs.js';
import * as ground from './groundFloor.js';
import * as input from './inputOwnership.js';
-2
View File
@@ -103,8 +103,6 @@ export async function drawImportedFile(
pixelRatio = Math.max(1, Math.min(2, globalThis.devicePixelRatio || 1)),
} = {},
) {
if (!engine?.ground || !engine?.movers || !engine?.lines)
throw new TypeError('The imported file display needs a globe engine');
const prefix = `geo-import-${++serial}`;
const request = () => engine.render.request('geo-import');
let shown = visible;
+28 -28
View File
@@ -3,24 +3,10 @@ import { readLayerSource } from '../testSupport/readLayerSource.mjs';
import { test } from 'node:test';
import assert from 'node:assert/strict';
import * as Cesium from 'cesium';
import militaryAwarenessLayer, {
_getAwarenessNavigationStateForTest,
_getAwarenessPanelRendersForTest,
awarenessClearMatchesSubject,
awarenessNeedsContinuousRender,
awarenessRefreshDecision,
awarenessRefreshIntervalMs,
awarenessRefreshRequired,
awarenessResultsAreLive,
buildAwarenessContextSnapshot,
canNavigateAwarenessNext,
contactsWindowFromSnapshot,
contextTargetFlyToAllowed,
summarizeInstallationViewport,
findCompatibleHistoryIndex,
AWARENESS_QUERY_LIMIT,
historySubjectSnapshot,
} from './militaryAwareness.js';
import { createAwarenessLayer, AWARENESS_QUERY_LIMIT } from '../layers/awareness/index.js';
import * as navigation from '../navigationPolicy.js';
import * as geometry from '../celestialRing.js';
import * as render from '../renderGovernor.js';
import flightsLayer, {
_setTrackedFlightRefreshStateForTest,
} from './flights.js';
@@ -46,14 +32,8 @@ import {
} from '../layers/awareness/panel.js';
import { NAVIGATION_AUTHORITY_EVENT } from '../navigationPolicy.js';
import { recordingAircraftRenderer } from '../testSupport/aircraftRecordingRenderer.mjs';
import { registerLayerRenderers } from '../app/layers/renderers.js';
// The layer's view of a stub viewer (render/display.js's interface), drawn
// by nothing: these tests drive the layer's logic, not the ring. It reaches
// the layer through the renderer registry, under an engine kind of its own.
const VIEWER_ENGINE = 'awareness-viewer-test';
registerLayerRenderers(VIEWER_ENGINE, {
'military-awareness': (engine) => {
const createTestDisplay = (engine) => {
const { viewer } = engine;
return {
engine,
@@ -73,12 +53,32 @@ registerLayerRenderers(VIEWER_ENGINE, {
createRim: () => ({ move() {}, setAlpha() {}, destroy() {} }),
createPulses: () => null,
};
},
});
};
const militaryAwarenessLayer = createAwarenessLayer({ services: {
flights: flightsLayer, military: militaryFlightsLayer, vessels: aisLiveVesselsLayer,
installations: militaryInstallationsLayer, navigation, geometry, render, renderer: createTestDisplay,
} });
const {
_getAwarenessNavigationStateForTest,
_getAwarenessPanelRendersForTest,
awarenessClearMatchesSubject,
awarenessNeedsContinuousRender,
awarenessRefreshDecision,
awarenessRefreshIntervalMs,
awarenessRefreshRequired,
awarenessResultsAreLive,
buildAwarenessContextSnapshot,
canNavigateAwarenessNext,
contactsWindowFromSnapshot,
contextTargetFlyToAllowed,
summarizeInstallationViewport,
findCompatibleHistoryIndex,
historySubjectSnapshot,
} = militaryAwarenessLayer;
const viewerEngines = new WeakMap();
const viewerEngine = (viewer) => {
if (!viewerEngines.has(viewer)) viewerEngines.set(viewer, {
kind: VIEWER_ENGINE, viewer,
kind: 'cesium', viewer,
render: {
request: () => viewer.scene.requestRender?.(),
setContinuous: (enabled) => { viewer.scene.requestRenderMode = !enabled; },
+2 -2
View File
@@ -38,14 +38,14 @@ test('wide-view counts report visible points rather than retained off-screen can
services: {},
source: {},
parts: {
namedMarkers: {
display: { namedMarkers: {
stats: () => ({
namedMarkers: 8,
pointsOnScreen: 3,
labelsOnScreen: 2,
labelCap: 24,
}),
},
} },
},
});
const stats = methods.getStats();
+1 -1
View File
@@ -1,4 +1,4 @@
import { NO_IMAGERY_HOST } from '../maps/imageryHost.js';
import { NO_IMAGERY_HOST } from '../layers/shared/imageryHost.js';
/**
* @file Open-data raster overlays: OpenSeaMap sea marks and OpenSnowMap ski
+1 -1
View File
@@ -6,7 +6,7 @@ import {
createOsmOverlayLayers,
osmOverlayHiddenReason,
} from './osmOverlays.js';
import { NO_IMAGERY_HOST } from '../maps/imageryHost.js';
import { NO_IMAGERY_HOST } from '../layers/shared/imageryHost.js';
import { createFakeEngine } from '../globe/testing/fakeEngine.js';
/** A layer on the fake engine, whose imagery drapes where `surface()` says. */
+8 -7
View File
@@ -1637,16 +1637,17 @@ test('Radio recovery preserves closer altitude and caps extreme full-globe zoom'
});
test('Radio camera navigation yields to every live tracked-entity owner', () => {
const viewer = { camera: {} };
assert.equal(radioCameraNavigationAllowed(viewer), true);
let following = null;
const engine = { camera: { following: () => following } };
assert.equal(radioCameraNavigationAllowed(engine), true);
for (const gevTrackedId of ['flights:abc123', 'military:def456']) {
const trackedEntity = { gevTrackedId };
viewer.trackedEntity = trackedEntity;
assert.equal(radioCameraNavigationAllowed(viewer), false, gevTrackedId);
assert.equal(viewer.trackedEntity, trackedEntity);
following = trackedEntity;
assert.equal(radioCameraNavigationAllowed(engine), false, gevTrackedId);
assert.equal(engine.camera.following(), trackedEntity);
}
viewer.trackedEntity = undefined;
assert.equal(radioCameraNavigationAllowed(viewer), true);
following = null;
assert.equal(radioCameraNavigationAllowed(engine), true);
assert.equal(radioCameraNavigationAllowed({ trackedEntity: {} }), false);
assert.equal(radioCameraNavigationAllowed(null), false);
});
+4 -7
View File
@@ -1,3 +1,4 @@
import { installDomClasses } from '../testSupport/domClasses.mjs';
import test from 'node:test';
import assert from 'node:assert/strict';
import * as C from 'cesium';
@@ -18,11 +19,7 @@ const noop = () => {};
const overlayHost = { setEntries: noop, setVisible: noop, clearSource: noop };
function viewer(t) {
t.mock.timers.enable({ apis: ['setTimeout'] });
for (const name of ['HTMLCanvasElement', 'HTMLImageElement', 'ImageBitmap', 'OffscreenCanvas']) {
const original = globalThis[name];
globalThis[name] = class {};
t.after(() => { if (original === undefined) delete globalThis[name]; else globalThis[name] = original; });
}
installDomClasses(t);
const before = globalThis.document;
globalThis.document = { addEventListener: noop, removeEventListener: noop };
t.after(() => { if (before === undefined) delete globalThis.document; else globalThis.document = before; });
@@ -60,7 +57,7 @@ for (const index of [0, 1]) test(`${index ? 'dams' : 'datacenters'} introduce th
test('Nepal locator introduces the shared OSM credit', async (t) => {
const v = viewer(t);
const layer = createBhoteKoshiLocatorLayer({ boundaryResolver: async () => ({ name: 'Nepal', ring: [[80, 26], [88, 26], [88, 30], [80, 30]] }), overlayHost, requestRender: noop, scheduleFrame: () => 1, cancelFrame: noop });
const layer = createBhoteKoshiLocatorLayer({ createNativeRenderer: () => ({ destroy: noop }), boundaryResolver: async () => ({ name: 'Nepal', ring: [[80, 26], [88, 26], [88, 30], [80, 30]] }), overlayHost, requestRender: noop, scheduleFrame: () => 1, cancelFrame: noop });
await layer.init(v, { engine: cesiumCredits(v) }); await layer.enable(v, { origin: 'scene' });
assertCredit(v); await layer.destroy(v);
assert.equal(v.credits.filter(c => c.showOnScreen).length, 0);
@@ -78,7 +75,7 @@ test('Directions introduces the shared OSM credit when the requested route draws
const engine = createFakeEngine();
const layer = createDirectionsLayer({ source: createDirectionsSource(), services: {
credits: { showOsmCredit, hideOsmCredit }, input, scenePick: {}, camera: {},
overlays: { setOverlayEntries: noop, setOverlaySourceVisible: noop, clearOverlaySource: noop },
overlays: { setEntries: noop, setVisible: noop, clearSource: noop },
render: { governorRequestRender: noop },
picking: { registerPickOwner: noop, unregisterPickOwner: noop },
ground: { warmGroundFloor: noop },
@@ -431,7 +431,7 @@ test('cables create no native labels, no per-frame callbacks and no engine impor
);
assert.match(
source,
/setOverlayEntries/,
/setEntries/,
'labels must flow through the shared world-overlay host',
);
});
+2 -2
View File
@@ -648,7 +648,7 @@ for (const makeHarness of GROUND_HARNESSES) {
overlays: { refreshReadout: refreshTrackedReadout },
},
});
display.init(null, { onMove() {} });
display.init({ onMove() {} });
display.setVisible(true);
display.renderRecords();
return display;
@@ -739,7 +739,7 @@ for (const makeHarness of GROUND_HARNESSES) {
h.destroy();
globalThis.window = original;
});
display.init(null, { onMove() {} });
display.init({ onMove() {} });
display.setVisible(true);
display.renderRecords();
display.selectRecord('alpr:0');
+1 -1
View File
@@ -2,7 +2,7 @@ import { createTransitLayer as createLayer } from '../layers/transit/index.js';
import { createTransitDisplay } from '../layers/transit/render/display.js';
import * as render from '../renderGovernor.js';
import * as picking from './pickRegistry.js';
import * as overlays from '../overlays/worldOverlay.js';
import { worldOverlayFor as overlays } from '../overlays/worldOverlay.js';
import { registerDynamicCredit, transitFeedCredit } from './dataCredits.js';
import {
GROUND_FLOOR_LIFT_M,