From b19fa565653f810497425f62e3bf68aced2db8da Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Sat, 7 Nov 2026 17:27:47 -0800 Subject: [PATCH] Read the canvas from the renderer in the layers, voice and tools Files off the Cesium list sized themselves by, listened on and set the cursor of `viewer.scene.canvas`. They now read `canvasOf(viewer)` from src/render/rendererOf.js: the bound renderer's canvas, else the viewer's own, the same element. Recent Imagery's divider moves the split through the globe port (`globeSplitTarget`, moved from the flood event into src/ui/imagerySplit.js), and traffic flow passes the viewer to the listed surface module (`viewerRoadSurface`) instead of reaching for its scene. The test fakes give their viewers a canvas, and the fake renderers report it, as the Cesium renderer reports the viewer's. --- src/cameraGroundGuard.js | 6 +-- src/data/aisLiveVessels.test.mjs | 10 ++++- src/data/bhoteKoshiEvent.js | 23 +++-------- src/data/trafficTiming.test.mjs | 3 ++ src/layers/alpr/presentation.js | 11 ++++-- .../awareness/directionOverlay.test.mjs | 3 ++ src/layers/awareness/rendering.js | 4 +- src/layers/cctv/lifecycle.js | 4 +- src/layers/cyclones/index.js | 6 +-- src/layers/cyclones/index.test.mjs | 6 +++ src/layers/firms/cards.js | 7 ++-- src/layers/firms/cells.test.mjs | 3 ++ src/layers/installations/namedMarkers.js | 12 +++--- src/layers/launches/hover.test.mjs | 7 +++- src/layers/launches/lifecycle.js | 13 ++++--- src/layers/launches/overlays.js | 4 +- src/layers/launches/replayOverlay.test.mjs | 7 +++- src/layers/launches/selection.js | 6 +-- src/layers/radio/navigation.js | 4 +- src/layers/recentImagery/testDoubles.mjs | 3 ++ src/layers/submarineCables/rendering.js | 4 +- src/layers/traffic/deadline.test.mjs | 5 ++- src/layers/traffic/flow.js | 39 +++++++++---------- src/layers/traffic/ingestion.js | 5 +-- src/layers/traffic/motion.test.mjs | 15 ++++++- src/layers/traffic/retention.js | 10 ++--- src/layers/traffic/surface.js | 16 ++++++++ src/layers/traffic/viewport.js | 4 +- src/layers/vessels/cameraArea.js | 4 +- src/layers/vessels/cameraArea.test.mjs | 3 ++ src/layers/vessels/rendering.js | 3 +- src/layers/weather/index.js | 9 ++++- src/layers/wind/index.js | 4 +- src/layers/wind/index.test.mjs | 3 ++ src/layers/wind/inspectionMarker.js | 4 +- src/layers/wind/inspectionMarker.test.mjs | 3 ++ src/render/rendererOf.js | 10 +++++ src/render/rendererOf.test.mjs | 14 +++++++ src/scenes/director.js | 4 +- src/testSupport/fakeCesiumScene.mjs | 12 +++++- src/testSupport/fakeDrawPort.mjs | 9 ++++- src/ui/cameraOrientationControls.js | 11 ++++-- src/ui/imageryBoxTool.js | 5 ++- src/ui/imagerySplit.js | 20 ++++++++++ src/ui/recentImagery.js | 7 ++-- src/ui/recentImagery.test.mjs | 8 +++- src/voice/gevRealtime.js | 3 +- src/voice/pointerPick.js | 7 ++-- src/voice/realtimeViewport.js | 5 ++- 49 files changed, 269 insertions(+), 119 deletions(-) diff --git a/src/cameraGroundGuard.js b/src/cameraGroundGuard.js index 9ba67be47..07c5431ea 100644 --- a/src/cameraGroundGuard.js +++ b/src/cameraGroundGuard.js @@ -18,7 +18,7 @@ import { onFollowChanged } from './data/followed.js'; import { ownCameraArrival } from './data/cameraArrival.js'; import { distance, dot, fromDegrees, toLonLatH } from './geo/index.js'; import { heightsOf } from './queries/heights.js'; -import { findCamera } from './render/rendererOf.js'; +import { canvasOf, findCamera } from './render/rendererOf.js'; /** Minimum eye height above the rendered surface for a usable view. */ export const MIN_EYE_CLEARANCE_M = 120; @@ -141,7 +141,7 @@ export function guardCameraAboveGround(viewer, at, options = {}) { isStale = () => false, onLift = null, } = options; - if (!viewer?.scene || !Number.isFinite(at?.lat) || !Number.isFinite(at?.lon)) + if (!viewer || !Number.isFinite(at?.lat) || !Number.isFinite(at?.lon)) return () => {}; // Without a readable pose the guard could not tell a later owner's move. @@ -150,7 +150,7 @@ export function guardCameraAboveGround(viewer, at, options = {}) { let timer = null; let done = false; - const canvas = viewer.scene.canvas; + const canvas = canvasOf(viewer); const documentRef = canvas?.ownerDocument; const removers = []; let release = () => {}; diff --git a/src/data/aisLiveVessels.test.mjs b/src/data/aisLiveVessels.test.mjs index 26c0a175a..aea87059a 100644 --- a/src/data/aisLiveVessels.test.mjs +++ b/src/data/aisLiveVessels.test.mjs @@ -1590,6 +1590,9 @@ test('vessel host publication preserves the shipped grid winner and separation s const winner = makeCandidate('200', 'NAMED WINNER', 40, 30, 16); const separated = makeCandidate('300', 'SEPARATED', 400, 300, 3); const viewer = { + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: 1600, clientHeight: 900 } }, }; const unbind = bindRenderer(viewer, { @@ -1657,7 +1660,12 @@ test('vessel real layer lifecycle publishes protected selection and leaves no st }); _setVesselOverlayHostForTest(host); _setVesselStateForTest({ - viewer: { scene: { canvas: { clientWidth: 1600, clientHeight: 900 } } }, + viewer: { + get canvas() { + return this.scene?.canvas; + }, + scene: { canvas: { clientWidth: 1600, clientHeight: 900 } }, + }, records: [record], selectedRecord: record, }); diff --git a/src/data/bhoteKoshiEvent.js b/src/data/bhoteKoshiEvent.js index 48a715294..bc922b56e 100644 --- a/src/data/bhoteKoshiEvent.js +++ b/src/data/bhoteKoshiEvent.js @@ -23,17 +23,17 @@ import { resolveEmbeddedMediaSource, } from './bhoteKoshiEmbeddedMedia.js'; import { acquireImageryComparison } from '../maps/imageryComparison.js'; -import { createImagerySplit } from '../ui/imagerySplit.js'; +import { createImagerySplit, globeSplitTarget } from '../ui/imagerySplit.js'; import { formatDate, t, tn, msg, onLocaleChange } from '../i18n/index.js'; import { useBhoteKoshiPanelStore } from '../ui/stores/bhoteKoshiPanel.js'; import { applicationPinia } from '../ui/vueRuntime.js'; import { heightsOf } from '../queries/heights.js'; import { cameraOf, + canvasOf, drawOf, findCamera, findGlobe, - rendererOf, } from '../render/rendererOf.js'; import { hexColor } from '../render/color.js'; import { fromDegrees } from '../geo/ellipsoid.js'; @@ -2704,26 +2704,13 @@ export function createBhoteKoshiEventLayer({ /** The canvas the scene is drawn on, for its pointer events. */ function sceneCanvas() { if (!_viewer) return null; - return rendererOf(_viewer)?.canvas ?? _viewer.scene?.canvas ?? null; - } - - /** The split as the divider moves it: the globe's, through its port. */ - function splitScene() { - const imagery = findGlobe(_viewer)?.imagery; - if (!imagery?.setSplit) return null; - return { - get splitPosition() { - return imagery.getSplit(); - }, - set splitPosition(value) { - imagery.setSplit(value); - }, - }; + return canvasOf(_viewer); } function createSplitControl(event) { _splitControl = createImagerySplit({ - scene: splitScene(), + // The split as the divider moves it: the globe's, through its port. + scene: globeSplitTarget(findGlobe(_viewer)), initialValue: _split, id: 'bhote-koshi-split-line', handleClass: 'bhote-koshi-split-handle', diff --git a/src/data/trafficTiming.test.mjs b/src/data/trafficTiming.test.mjs index 2fcfd2940..bb4c4dadc 100644 --- a/src/data/trafficTiming.test.mjs +++ b/src/data/trafficTiming.test.mjs @@ -231,6 +231,9 @@ test('traffic timing pairs real ordering to the scheduling change and guards re- setLongitude(longitude); viewer = { camera, + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: 0, clientHeight: 0, width: 0, height: 0 }, preRender, diff --git a/src/layers/alpr/presentation.js b/src/layers/alpr/presentation.js index a0ed50649..72aa334c5 100644 --- a/src/layers/alpr/presentation.js +++ b/src/layers/alpr/presentation.js @@ -23,7 +23,12 @@ import { import { entityRecord, readEntityRecord } from '../../data/entityRecords.js'; import { alprIconPosition, alprMarkers } from './markerState.js'; import { horizonFrom } from '../../geo/horizon.js'; -import { cameraOf, findCredits, findQuery } from '../../render/rendererOf.js'; +import { + cameraOf, + canvasOf, + findCredits, + findQuery, +} from '../../render/rendererOf.js'; /** A `#rrggbb` colour as `rgb(r,g,b)`, the form the readout card has always had. */ function cssRgb(hex) { @@ -162,7 +167,7 @@ export function createAlprPresentation({ state, services, source }) { * @returns {number|null} Count, or null without a scene to project into. */ function countOnScreen() { - const canvas = state.viewer?.scene?.canvas; + const canvas = canvasOf(state.viewer); const width = canvas?.clientWidth || canvas?.width; const height = canvas?.clientHeight || canvas?.height; const query = findQuery(state.viewer); @@ -266,7 +271,7 @@ export function createAlprPresentation({ state, services, source }) { // that point instead; the camera-to-ground range keeps zoom-out queries capped. function viewportBox(viewer) { const query = findQuery(viewer); - const canvas = viewer?.scene?.canvas; + const canvas = canvasOf(viewer); if (typeof query?.pickEllipsoid === 'function' && canvas) { const width = canvas.clientWidth || canvas.width; const height = canvas.clientHeight || canvas.height; diff --git a/src/layers/awareness/directionOverlay.test.mjs b/src/layers/awareness/directionOverlay.test.mjs index 49989ad1c..310e64485 100644 --- a/src/layers/awareness/directionOverlay.test.mjs +++ b/src/layers/awareness/directionOverlay.test.mjs @@ -24,6 +24,9 @@ function overlay(screenAngle) { }); const viewer = { container, + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: 800, clientHeight: 600 } }, }; bindRenderer(viewer, { camera: camera.port }); diff --git a/src/layers/awareness/rendering.js b/src/layers/awareness/rendering.js index 7e7d0751b..688c91d78 100644 --- a/src/layers/awareness/rendering.js +++ b/src/layers/awareness/rendering.js @@ -11,7 +11,7 @@ import { import { bearingBetweenCoordinates } from '../../cockpitMath.js'; import { AWARENESS_PAGE_SIZE, CONTEXT_RIM_HEIGHT_M } from './policy.js'; import { formatAwarenessDirection } from './presentation.js'; -import { drawOf, findCamera } from '../../render/rendererOf.js'; +import { canvasOf, drawOf, findCamera } from '../../render/rendererOf.js'; import { PI_OVER_TWO, distance, @@ -145,7 +145,7 @@ export function createRendering({ return; } - const canvas = layerState.viewer.scene.canvas; + const canvas = canvasOf(layerState.viewer); const width = canvas.clientWidth || canvas.width; const height = canvas.clientHeight || canvas.height; const sonar = isCyberSonarActive() diff --git a/src/layers/cctv/lifecycle.js b/src/layers/cctv/lifecycle.js index 8089dc7cd..e8e0d7ae6 100644 --- a/src/layers/cctv/lifecycle.js +++ b/src/layers/cctv/lifecycle.js @@ -1,6 +1,6 @@ import { fromDegrees } from '../../geo/ellipsoid.js'; import { distance, dot } from '../../geo/vector.js'; -import { findCamera } from '../../render/rendererOf.js'; +import { canvasOf, findCamera } from '../../render/rendererOf.js'; import { viewshedColors, cameraHue } from '../../data/cctvViewshed.js'; import { CCTV_OVERLAY_SOURCE_ID } from '../../data/cctvCards.js'; import { GIZMO_ID_PREFIX } from '../../data/cctvGizmo.js'; @@ -365,7 +365,7 @@ export function createLifecycle({ attachViewListeners(); // A resize or rotation changes what is on screen without moving the // camera. - const canvas = layerState._viewer.scene?.canvas; + const canvas = canvasOf(layerState._viewer); if (layerState._viewResizeCanvas !== canvas) { // A re-init against a new viewer observes its canvas instead. layerState._viewResizeObserver?.disconnect(); diff --git a/src/layers/cyclones/index.js b/src/layers/cyclones/index.js index ddb2577a7..851221082 100644 --- a/src/layers/cyclones/index.js +++ b/src/layers/cyclones/index.js @@ -23,7 +23,7 @@ import { translateKnown, } from '../../i18n/index.js'; import { formatQuantity } from '../../ui/unitLabels.js'; -import { cameraOf } from '../../render/rendererOf.js'; +import { cameraOf, canvasOf } from '../../render/rendererOf.js'; // "10-12 15:00 UTC" never breaks across lines: no-break spaces, and a word // joiner after the hyphen (JetBrains Mono has no U+2011 non-breaking hyphen). @@ -98,12 +98,12 @@ export function createCyclonesLayer({ rendering?.setSelection(id); } function installSelection() { - if (selectionOwner || !viewer?.scene?.canvas) return; + const canvas = canvasOf(viewer); + if (selectionOwner || !canvas) return; const owner = {}; selectionOwner = owner; // Snapshot before sibling bubble listeners can rebuild the overlay hit // rectangles. A vessel selection does that synchronously in the same click. - const canvas = viewer.scene.canvas; let capturedHit = null; const overlayHit = (x, y) => { const hit = hitTestOverlay(x, y); diff --git a/src/layers/cyclones/index.test.mjs b/src/layers/cyclones/index.test.mjs index 5f07ed330..b097e2b42 100644 --- a/src/layers/cyclones/index.test.mjs +++ b/src/layers/cyclones/index.test.mjs @@ -114,6 +114,9 @@ test('map selection yields to pointer owners and owns only its enabled handler', const canvas = new EventTarget(); canvas.getBoundingClientRect = () => ({ left: 100, top: 200 }); const viewer = { + get canvas() { + return this.scene?.canvas; + }, scene: { canvas, pick() { @@ -308,6 +311,9 @@ test('a click on a storm card or lead-hour label selects that storm without pick const canvas = new EventTarget(); canvas.getBoundingClientRect = () => ({ left: 0, top: 0 }); const viewer = { + get canvas() { + return this.scene?.canvas; + }, scene: { canvas, pick() { diff --git a/src/layers/firms/cards.js b/src/layers/firms/cards.js index d29ca7644..2698f024a 100644 --- a/src/layers/firms/cards.js +++ b/src/layers/firms/cards.js @@ -4,6 +4,7 @@ import { FIRMS_AMBIENT_COHORT_LIMIT, } from '../../data/firmsLabels.js'; import { MAX_AMBIENT_LABELS, LABEL_VIEW_MARGIN_PX } from './policy.js'; +import { canvasOf } from '../../render/rendererOf.js'; export function createCards({ layerState, @@ -29,7 +30,6 @@ export function createCards({ function rebuildAmbientLabels() { if (!layerState._viewer) return; - const scene = layerState._viewer.scene; const { query } = components.rendering.scenePorts(); const project = (position) => query?.project(position) ?? null; const now = Date.now(); @@ -70,8 +70,9 @@ export function createCards({ } } - const width = scene.canvas.clientWidth; - const height = scene.canvas.clientHeight; + const canvas = canvasOf(layerState._viewer); + const width = canvas.clientWidth; + const height = canvas.clientHeight; let ambientCount = 0; for (const candidate of layerState._labelCandidates) { diff --git a/src/layers/firms/cells.test.mjs b/src/layers/firms/cells.test.mjs index 5b653cac8..2e97026c4 100644 --- a/src/layers/firms/cells.test.mjs +++ b/src/layers/firms/cells.test.mjs @@ -53,6 +53,9 @@ function harness(fires, heightM, { sceneFromViewer = false } = {}) { heightM, ), }, + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: 800, clientHeight: 600 }, preRender: new Cesium.Event(), diff --git a/src/layers/installations/namedMarkers.js b/src/layers/installations/namedMarkers.js index 7e1ada64c..26e108ece 100644 --- a/src/layers/installations/namedMarkers.js +++ b/src/layers/installations/namedMarkers.js @@ -7,6 +7,7 @@ import { fromDegrees } from '../../geo/index.js'; import { horizonFrom } from '../../geo/horizon.js'; import { cameraOf, + canvasOf, drawOf, findFrame, findQuery, @@ -57,8 +58,8 @@ export function createNamedMarkers({ state, services, parts, overlayHost }) { !same(pose.position, lastPose.position) || !same(pose.direction, lastPose.direction) || !same(pose.up, lastPose.up) || - width !== viewer.scene.canvas.clientWidth || - height !== viewer.scene.canvas.clientHeight + width !== canvasOf(viewer).clientWidth || + height !== canvasOf(viewer).clientHeight ); } @@ -69,8 +70,9 @@ export function createNamedMarkers({ state, services, parts, overlayHost }) { function refresh(pose = null) { const viewer = state.viewer; if (!state.enabled || !points) return; - width = viewer.scene.canvas.clientWidth; - height = viewer.scene.canvas.clientHeight; + const canvas = canvasOf(viewer); + width = canvas.clientWidth; + height = canvas.clientHeight; pose ??= cameraOf(viewer).pose(); lastPose = { position: { ...pose.position }, @@ -175,7 +177,7 @@ export function createNamedMarkers({ state, services, parts, overlayHost }) { function sync(records) { const viewer = state.viewer; - if (!viewer?.scene) return; + if (!viewer) return; points ??= drawOf(viewer).points({ id: setId, horizonCull: true }); points.show = state.enabled; const named = records diff --git a/src/layers/launches/hover.test.mjs b/src/layers/launches/hover.test.mjs index 40097209d..6cfe42b2d 100644 --- a/src/layers/launches/hover.test.mjs +++ b/src/layers/launches/hover.test.mjs @@ -156,7 +156,12 @@ test('mission hover throttles, clears on motion/hidden, and releases listeners', removeEventListener: (_n, fn) => listeners.delete(fn), }; const camera = fakeCameraPort(); - const viewer = { scene: { canvas: { style: {} } } }; + const viewer = { + get canvas() { + return this.scene?.canvas; + }, + scene: { canvas: { style: {} } }, + }; bindRenderer(viewer, { camera: camera.port }); const hover = createLaunchHover({ viewer, diff --git a/src/layers/launches/lifecycle.js b/src/layers/launches/lifecycle.js index 1255d790e..ad1ecde76 100644 --- a/src/layers/launches/lifecycle.js +++ b/src/layers/launches/lifecycle.js @@ -1,6 +1,6 @@ import { isPointerFree } from '../../data/inputOwnership.js'; import { inputFor } from '../../input/dispatcher.js'; -import { findCamera, findFrame } from '../../render/rendererOf.js'; +import { canvasOf, findCamera, findFrame } from '../../render/rendererOf.js'; const HOVER_PICK_INTERVAL_MS = 120; @@ -25,8 +25,9 @@ export function createLaunchHover({ let pendingPosition = null; let trailingTimer = null; const clearCursor = () => { - if (ownsCursor && viewer.scene.canvas.style.cursor === 'pointer') - viewer.scene.canvas.style.cursor = ''; + const canvas = canvasOf(viewer); + if (ownsCursor && canvas.style.cursor === 'pointer') + canvas.style.cursor = ''; ownsCursor = false; }; const cancelTrailing = () => { @@ -60,7 +61,7 @@ export function createLaunchHover({ const pick = (position, at) => { lastPick = at; if (launchAt(position)) { - viewer.scene.canvas.style.cursor = 'pointer'; + canvasOf(viewer).style.cursor = 'pointer'; ownsCursor = true; } else clearCursor(); }; @@ -215,8 +216,8 @@ export function createLifecycle({ parts.selection.stopMissionZoomAnchor(); parts.rendering.showMissions(false); parts.orbitRendering.syncMissionOrbitPrimitiveVisibility(); - if (layerState._viewer?.scene?.canvas) - layerState._viewer.scene.canvas.style.cursor = ''; + const canvas = canvasOf(layerState._viewer); + if (canvas) canvas.style.cursor = ''; parts.launchPad.hideLaunchPadZone(); parts.overlays.hideReplayVehicleOverlay(); layerState._selectedLaunchId = null; diff --git a/src/layers/launches/overlays.js b/src/layers/launches/overlays.js index 1e66c467d..8a262acb2 100644 --- a/src/layers/launches/overlays.js +++ b/src/layers/launches/overlays.js @@ -1,6 +1,6 @@ import { WGS84 } from '../../geo/ellipsoid.js'; import { dot, magnitude, normalize, toDegrees } from '../../geo/vector.js'; -import { findQuery } from '../../render/rendererOf.js'; +import { canvasOf, findQuery } from '../../render/rendererOf.js'; import { t, msg } from '../../i18n/index.js'; import { createCyberSonarSampler, @@ -489,7 +489,7 @@ export function createOverlays({ state: layerState, services, parts, source }) { hideReplayVehicleOverlay(); return null; } - const canvas = layerState._viewer.scene.canvas; + const canvas = canvasOf(layerState._viewer); if ( windowPosition.x < -80 || windowPosition.y < -100 || diff --git a/src/layers/launches/replayOverlay.test.mjs b/src/layers/launches/replayOverlay.test.mjs index 21fede06c..bcb6d0e4b 100644 --- a/src/layers/launches/replayOverlay.test.mjs +++ b/src/layers/launches/replayOverlay.test.mjs @@ -122,7 +122,12 @@ test('the scene chrome renders the overlay in the globe container', async (t) => test('the replay overlay sits where the query port projects the vehicle, facing along its path', async () => { const { bindRenderer } = await import('../../render/rendererOf.js'); - const viewer = { scene: { canvas: { clientWidth: 800, clientHeight: 600 } } }; + const viewer = { + get canvas() { + return this.scene?.canvas; + }, + scene: { canvas: { clientWidth: 800, clientHeight: 600 } }, + }; const projected = []; let behindEye = false; // The path runs along x; the port puts x metres at x pixels, y = 300. diff --git a/src/layers/launches/selection.js b/src/layers/launches/selection.js index ae4267c62..24afd6463 100644 --- a/src/layers/launches/selection.js +++ b/src/layers/launches/selection.js @@ -12,7 +12,7 @@ import { vec, } from '../../geo/vector.js'; import { MISSION_GLOBE_VIEW_RANGE_M, MISSION_FOCUS_RANGE_M } from './policy.js'; -import { cameraOf, findCamera } from '../../render/rendererOf.js'; +import { cameraOf, canvasOf, findCamera } from '../../render/rendererOf.js'; export function createSelection({ state: layerState, @@ -23,7 +23,7 @@ export function createSelection({ const { getKeyholeGeometry } = services.geometry; function focusFullGlobe(viewer, duration = 2.4) { - const canvas = viewer?.scene?.canvas; + const canvas = canvasOf(viewer); const height = canvas?.clientHeight || canvas?.height; const width = canvas?.clientWidth || canvas?.width; if (!(width > 0) || !(height > 0)) return; @@ -121,7 +121,7 @@ export function createSelection({ const launchPosition = fromDegrees(launch.lon, launch.lat); let range = 18000000; if (orbitPositions?.length > 1) { - const canvas = layerState._viewer.scene.canvas; + const canvas = canvasOf(layerState._viewer); const fovy = camera.pose().fovy || toRadians(60); const aspect = Math.max( 0.1, diff --git a/src/layers/radio/navigation.js b/src/layers/radio/navigation.js index 7015cf6ab..ad29c543a 100644 --- a/src/layers/radio/navigation.js +++ b/src/layers/radio/navigation.js @@ -6,7 +6,7 @@ import { GLOBAL_RADIO_ALTITUDE_M, RADIO_GLOBE_RECENTER_MAX_HEIGHT_M, } from './policy.js'; -import { cameraOf, findCamera } from '../../render/rendererOf.js'; +import { cameraOf, canvasOf, findCamera } from '../../render/rendererOf.js'; export function createNavigation({ state: layerState, @@ -157,7 +157,7 @@ export function createNavigation({ function radioGlobeRecenterPlan(viewer = layerState._viewer) { const pose = findCamera(viewer)?.pose() ?? null; - const canvas = viewer?.scene?.canvas; + const canvas = canvasOf(viewer); const width = canvas?.clientWidth || canvas?.width; const height = canvas?.clientHeight || canvas?.height; // The eye at the earth's centre has no geodetic position. diff --git a/src/layers/recentImagery/testDoubles.mjs b/src/layers/recentImagery/testDoubles.mjs index 81784af4f..8997e9f1e 100644 --- a/src/layers/recentImagery/testDoubles.mjs +++ b/src/layers/recentImagery/testDoubles.mjs @@ -100,6 +100,9 @@ export function boxToolFakes() { const sources = []; const viewer = { renders: 0, + get canvas() { + return this.scene.canvas; + }, scene: { canvas: { clientWidth: 1000, clientHeight: 500 }, screenSpaceCameraController: { enableInputs: true }, diff --git a/src/layers/submarineCables/rendering.js b/src/layers/submarineCables/rendering.js index 95e14ee5a..026ade8c8 100644 --- a/src/layers/submarineCables/rendering.js +++ b/src/layers/submarineCables/rendering.js @@ -3,7 +3,7 @@ import { horizonFrom } from '../../geo/horizon.js'; import { densifyRhumb } from '../../geo/rhumb.js'; import { distance, toRadians } from '../../geo/vector.js'; import { cssColor } from '../../render/color.js'; -import { cameraOf, drawOf } from '../../render/rendererOf.js'; +import { cameraOf, canvasOf, drawOf } from '../../render/rendererOf.js'; import { clampLabel, createCableOverlayEntry, @@ -418,7 +418,7 @@ export function createRendering({ state }) { const pose = cameraOf(viewer).pose(); const cameraPos = pose?.position; if (!cameraPos) return false; - const canvasHeight = viewer.scene?.canvas?.clientHeight || 1080; + const canvasHeight = canvasOf(viewer)?.clientHeight || 1080; // The field of view along the canvas's longer side. const fov = pose.aspectRatio > 1 diff --git a/src/layers/traffic/deadline.test.mjs b/src/layers/traffic/deadline.test.mjs index 1fe5a5a23..5fba1c76f 100644 --- a/src/layers/traffic/deadline.test.mjs +++ b/src/layers/traffic/deadline.test.mjs @@ -80,7 +80,7 @@ test('superseding a stalled pass aborts promptly without clearing newer loading' // and the near plane, and window positions from the scene itself. const ANGLE = 35 * Math.PI / 180; function portView(scene) { - const viewer = { scene }; + const viewer = { scene, canvas: scene.canvas }; const position = { x: 0, y: 0, z: 450 }; const direction = { x: 0, y: Math.cos(ANGLE), z: -Math.sin(ANGLE) }; bindRenderer(viewer, { @@ -213,6 +213,9 @@ function flowFixture(source) { _roadMode: 'osm', _parseRoads: (data) => data.roads, _viewer: { + get canvas() { + return this.scene?.canvas; + }, scene: { globe: { show: true, diff --git a/src/layers/traffic/flow.js b/src/layers/traffic/flow.js index 009a2b3be..534cf15cb 100644 --- a/src/layers/traffic/flow.js +++ b/src/layers/traffic/flow.js @@ -1,13 +1,13 @@ import { roadIdentity } from './retention.js'; import { fromDegrees, toCartographicRadians } from '../../geo/ellipsoid.js'; import { copyInto, distance, distanceSquared } from '../../geo/vector.js'; -import { findCamera, findFrame, findQuery } from '../../render/rendererOf.js'; import { - drawnSurfaceReady, - prepareRoadSurfaces, - roadHeightStations, - trafficSurfaceReady, -} from './surface.js'; + canvasOf, + findCamera, + findFrame, + findQuery, +} from '../../render/rendererOf.js'; +import { roadHeightStations, viewerRoadSurface } from './surface.js'; import { matchFlowToRoads } from '../../data/flowMatch.js'; import { DOT_HEIGHT_OFFSET, @@ -260,7 +260,8 @@ export function createFlow({ state: layerState, services, parts, source }) { // Separate whole-graph preparation from tile completion and publication. await nextTask(); if (!current()) return false; - const scene = layerState._viewer.scene; + const surface = viewerRoadSurface(layerState._viewer); + const canvas = canvasOf(layerState._viewer); // The enable-time estimate can predate the first local mesh (especially // after an intercontinental jump). Once previews have measured roads, use // that local evidence to select the detail view at its real elevation. @@ -283,11 +284,11 @@ export function createFlow({ state: layerState, services, parts, source }) { // its camera port says where the eye is. const query = findQuery(layerState._viewer); let depthHeight; - if (query && scene.canvas?.clientWidth) { + if (query && canvas?.clientWidth) { try { const hit = query.pickPosition( - scene.canvas.clientWidth / 2, - scene.canvas.clientHeight * 0.6, + canvas.clientWidth / 2, + canvas.clientHeight * 0.6, ); const height = hit && toCartographicRadians(hit)?.height; if (Number.isFinite(height) && Math.abs(height) <= 9000) @@ -344,7 +345,7 @@ export function createFlow({ state: layerState, services, parts, source }) { ) return false; // Spend surface work on roads crossing the canvas, with a small pan margin. - if (!scene.canvas?.clientWidth) return true; + if (!canvas?.clientWidth) return true; let minX = Infinity, minY = Infinity, maxX = -Infinity, @@ -357,7 +358,7 @@ export function createFlow({ state: layerState, services, parts, source }) { minY = Math.min(minY, screen.y); maxY = Math.max(maxY, screen.y); } - road.coverageBand = maxY < scene.canvas.clientHeight / 2 ? 1 : 0; + road.coverageBand = maxY < canvas.clientHeight / 2 ? 1 : 0; if (clamped.coverage && camera) { road.baseDensityWeight ??= road.densityWeight || 1; road.densityWeight = @@ -368,9 +369,9 @@ export function createFlow({ state: layerState, services, parts, source }) { if (!query) return true; return ( maxX >= -100 && - minX <= scene.canvas.clientWidth + 100 && + minX <= canvas.clientWidth + 100 && maxY >= -100 && - minY <= scene.canvas.clientHeight + 100 + minY <= canvas.clientHeight + 100 ); }); const budgets = parts.model.allocateRoadDotBudgets( @@ -475,9 +476,8 @@ export function createFlow({ state: layerState, services, parts, source }) { // The first bounded surface slice needs its own task, not the prefix's tail. await nextTask(); if (!current()) return false; - let prepared = await prepareRoadSurfaces( + let prepared = await viewerRoadSurface(layerState._viewer).prepare( unresolved, - layerState._viewer.scene, services.ground, [layerState._pointCollection], signal, @@ -497,9 +497,8 @@ export function createFlow({ state: layerState, services, parts, source }) { ) { await new Promise((resolve) => setTimeout(resolve, 100)); if (!current()) return false; - prepared = await prepareRoadSurfaces( + prepared = await viewerRoadSurface(layerState._viewer).prepare( prepared.pending, - layerState._viewer.scene, services.ground, [layerState._pointCollection], signal, @@ -517,7 +516,7 @@ export function createFlow({ state: layerState, services, parts, source }) { !preview && !label.includes('refined') && frame && - (!trafficSurfaceReady(scene) || + (!surface.ready() || prepared.pending.length || ready.some((road) => road.surfaceSettled === false)) ) { @@ -533,7 +532,7 @@ export function createFlow({ state: layerState, services, parts, source }) { stop(); return; } - if (!drawnSurfaceReady(scene)) return; + if (!surface.drawnReady()) return; stop(); // Revalidate only local samples taken at a coarser rendered LOD. This // background upgrade never holds road acquisition or first paint. diff --git a/src/layers/traffic/ingestion.js b/src/layers/traffic/ingestion.js index e6e699246..32a92e032 100644 --- a/src/layers/traffic/ingestion.js +++ b/src/layers/traffic/ingestion.js @@ -2,7 +2,7 @@ import { requestWithDeadline } from '../../sources/requestDeadline.js'; import { resolveRoadMode, ROAD_SOURCE_LABELS } from './roadModes.js'; import { phaseTiming } from '../../sources/phaseTiming.js'; import { RoadRequestError, roadRequestError } from './source.js'; -import { loadedSurfaceHeight } from './surface.js'; +import { viewerRoadSurface } from './surface.js'; import { isUnavailableCapability, sourceResponseError, @@ -273,8 +273,7 @@ export function createIngestion({ let estimated = services.ground?.cachedGroundFloor?.(centerLat, centerLon); // A miss is the local mesh still loading. if (!Number.isFinite(estimated)) - estimated = loadedSurfaceHeight( - layerState._viewer?.scene, + estimated = viewerRoadSurface(layerState._viewer).loadedHeight( { lon: centerLon, lat: centerLat }, [layerState._pointCollection], ); diff --git a/src/layers/traffic/motion.test.mjs b/src/layers/traffic/motion.test.mjs index b7c163d08..5a8a1f78b 100644 --- a/src/layers/traffic/motion.test.mjs +++ b/src/layers/traffic/motion.test.mjs @@ -32,7 +32,12 @@ function setup(t) { state._enabled = true; state._liveMode = true; state._pointCollection = new C.PointPrimitiveCollection(); - state._viewer = { scene: {} }; + state._viewer = { + scene: {}, + get canvas() { + return this.scene?.canvas; + }, + }; const parts = { rendering: { removeHeatLines() {}, @@ -735,6 +740,9 @@ test('selection asks the query port for depth and screen positions, and the came segmentDist: [11], }); const viewer = { + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: 1000, clientHeight: 800 }, globe: { show: true, tilesLoaded: true, getHeight: () => 0 }, @@ -813,6 +821,9 @@ test('selection asks the query port for depth and screen positions, and the came test('height easing stops visible waypoints at the camera near plane', () => { const viewer = { + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: 1000, clientHeight: 800 }, camera: {}, @@ -879,7 +890,7 @@ test('height easing through the Cesium ports stops at the near plane of a looked const centre = C.Cartesian3.fromDegrees(0, 0, 0); // A transformed camera: lookAt leaves the camera in the target's frame. scene.camera.lookAt(centre, new C.HeadingPitchRange(0, -0.5, 600)); - const viewer = { scene, camera: scene.camera }; + const viewer = { scene, camera: scene.camera, canvas: scene.canvas }; const eyeDepth = (p) => -C.Matrix4.multiplyByPoint(scene.camera.viewMatrix, p, new C.Cartesian3()) .z; diff --git a/src/layers/traffic/retention.js b/src/layers/traffic/retention.js index 76d15a1d6..1485e041c 100644 --- a/src/layers/traffic/retention.js +++ b/src/layers/traffic/retention.js @@ -4,7 +4,7 @@ import { equalsEpsilon, lerpInto, } from '../../geo/vector.js'; -import { findCamera, findQuery } from '../../render/rendererOf.js'; +import { canvasOf, findCamera, findQuery } from '../../render/rendererOf.js'; import { MAX_DOTS, roadDotBudget } from './policy.js'; export const DOT_CHANGE_BUDGET = 768; @@ -207,15 +207,15 @@ export function createRetention({ state, parts }) { */ function frameView() { const viewer = state._viewer; - const scene = viewer?.scene; - if (!scene?.canvas?.clientHeight) return null; + const canvas = canvasOf(viewer); + if (!canvas?.clientHeight) return null; const query = findQuery(viewer); if (!query) return null; return { query, pose: findCamera(viewer)?.pose() ?? null, - width: scene.canvas.clientWidth, - height: scene.canvas.clientHeight, + width: canvas.clientWidth, + height: canvas.clientHeight, }; } function easeHeights(dt) { diff --git a/src/layers/traffic/surface.js b/src/layers/traffic/surface.js index 468cdfe07..c832257af 100644 --- a/src/layers/traffic/surface.js +++ b/src/layers/traffic/surface.js @@ -80,6 +80,22 @@ export function trafficSurfaceReady(scene) { return currentRenderedFrame(scene)?.ready === true; } +/** + * The surface reads here over the scene `viewer` draws, for code that holds + * the viewer: the scene is read once, as this is called. + * @param {object|undefined} viewer + */ +export function viewerRoadSurface(viewer) { + const scene = viewer?.scene; + return { + drawnReady: () => drawnSurfaceReady(scene), + ready: () => trafficSurfaceReady(scene), + prepare: (roads, ...rest) => prepareRoadSurfaces(roads, scene, ...rest), + loadedHeight: (location, exclude) => + loadedSurfaceHeight(scene, location, exclude), + }; +} + /** Preserve bends and insert height samples at most 150 m apart, splitting long roads. */ export function roadSurfaceChunks(coordinates) { const chunks = []; diff --git a/src/layers/traffic/viewport.js b/src/layers/traffic/viewport.js index e3d709e78..f122a5ed0 100644 --- a/src/layers/traffic/viewport.js +++ b/src/layers/traffic/viewport.js @@ -1,6 +1,6 @@ import { createReticleFootprint } from './footprint.js'; import { toLonLatH } from '../../geo/ellipsoid.js'; -import { findCamera, findQuery } from '../../render/rendererOf.js'; +import { canvasOf, findCamera, findQuery } from '../../render/rendererOf.js'; import { deriveFetchCenter, clampBoundsAroundCenter, @@ -27,7 +27,7 @@ export function createViewport({ state: layerState, services, parts, source }) { /** The canvas size in CSS pixels, as the layer has always read it. */ function canvasSize() { - const canvas = layerState._viewer.scene.canvas; + const canvas = canvasOf(layerState._viewer); return { width: canvas.clientWidth || canvas.width, height: canvas.clientHeight || canvas.height, diff --git a/src/layers/vessels/cameraArea.js b/src/layers/vessels/cameraArea.js index 3d9ed06d5..5ab0399b5 100644 --- a/src/layers/vessels/cameraArea.js +++ b/src/layers/vessels/cameraArea.js @@ -1,5 +1,5 @@ import { toLonLatH } from '../../geo/ellipsoid.js'; -import { findCamera, findQuery } from '../../render/rendererOf.js'; +import { canvasOf, findCamera, findQuery } from '../../render/rendererOf.js'; import { viewAreaRadiusKm } from './viewArea.js'; /** @@ -13,7 +13,7 @@ export function vesselViewArea(viewer) { const radiusKm = viewAreaRadiusKm(pose?.height); if (radiusKm == null) return null; let { lat, lon } = pose; - const canvas = viewer?.scene?.canvas; + const canvas = canvasOf(viewer); if (canvas?.clientWidth && canvas?.clientHeight) { try { const hit = findQuery(viewer)?.pickEllipsoid( diff --git a/src/layers/vessels/cameraArea.test.mjs b/src/layers/vessels/cameraArea.test.mjs index cdeaa9445..26456c4a7 100644 --- a/src/layers/vessels/cameraArea.test.mjs +++ b/src/layers/vessels/cameraArea.test.mjs @@ -7,6 +7,9 @@ import { vesselViewArea } from './cameraArea.js'; /** A viewer whose camera and query ports answer as given. */ function viewerWith({ height, lon = 4, lat = 52, hit, size = [1600, 900] }) { const viewer = { + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: size[0], clientHeight: size[1] } }, }; const picks = []; diff --git a/src/layers/vessels/rendering.js b/src/layers/vessels/rendering.js index 3e0fbdfd0..63349c04d 100644 --- a/src/layers/vessels/rendering.js +++ b/src/layers/vessels/rendering.js @@ -10,6 +10,7 @@ import { fromDegrees } from '../../geo/ellipsoid.js'; import { horizonFrom, liftedForHorizon } from '../../geo/horizon.js'; import { distance } from '../../geo/vector.js'; import { + canvasOf, drawOf, findCamera, findFrame, @@ -552,7 +553,7 @@ export function createRendering({ */ function publishVesselOverlayEntries(entries) { - const canvas = state.viewer?.scene?.canvas || state.viewer?.canvas; + const canvas = canvasOf(state.viewer); const width = Number(canvas?.clientWidth) || 0; const height = Number(canvas?.clientHeight) || 0; const ambientLimit = vesselOverlayCohortLimit( diff --git a/src/layers/weather/index.js b/src/layers/weather/index.js index 1c046141d..616dd0c5a 100644 --- a/src/layers/weather/index.js +++ b/src/layers/weather/index.js @@ -11,7 +11,12 @@ import { import { formatUtcDayMonth, t, msg } from '../../i18n/index.js'; import { formatScaleLabel } from '../../ui/unitLabels.js'; import { toLonLatH } from '../../geo/ellipsoid.js'; -import { cameraOf, findCamera, findQuery } from '../../render/rendererOf.js'; +import { + cameraOf, + canvasOf, + findCamera, + findQuery, +} from '../../render/rendererOf.js'; /** * A stored (English) failure in the language. HTTP failures from source.js @@ -580,7 +585,7 @@ export function createWeatherLayer({ const shownProblem = problem ? presentWeatherProblem(problem) : null; const shownHost = hostStatus ? t(hostStatus) : null; const b = manifest?.bounds; - const canvas = viewer?.scene?.canvas; + const canvas = canvasOf(viewer); const point = canvas && findQuery(viewer)?.pickEllipsoid( diff --git a/src/layers/wind/index.js b/src/layers/wind/index.js index 49da8e834..567aaa91b 100644 --- a/src/layers/wind/index.js +++ b/src/layers/wind/index.js @@ -7,7 +7,7 @@ import { } from './presentation.js'; import { inspectWindAtCenter, WIND_UNITS } from './inspection.js'; import { createWindInspectionMarker } from './inspectionMarker.js'; -import { findQuery } from '../../render/rendererOf.js'; +import { canvasOf, findQuery } from '../../render/rendererOf.js'; import { t, msg, translateKnown } from '../../i18n/index.js'; import { unitLabel } from '../../ui/unitLabels.js'; @@ -81,7 +81,7 @@ export function createWindLayer({ }; const sample = (position) => { const view = viewer - ? { query: findQuery(viewer), canvas: viewer.scene?.canvas } + ? { query: findQuery(viewer), canvas: canvasOf(viewer) } : {}; reading = inspectWindAtCenter(manifest, view, { position, diff --git a/src/layers/wind/index.test.mjs b/src/layers/wind/index.test.mjs index 05b8c275b..223867392 100644 --- a/src/layers/wind/index.test.mjs +++ b/src/layers/wind/index.test.mjs @@ -317,6 +317,9 @@ test('sample stays fixed across model, field and unit changes; dismissal and dis let center = fromDegrees(0, 0); const viewer = { container, + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: 800, clientHeight: 600, getBoundingClientRect: () => ({ left: 0, top: 0 }) }, }, diff --git a/src/layers/wind/inspectionMarker.js b/src/layers/wind/inspectionMarker.js index f23a27715..6fdb917df 100644 --- a/src/layers/wind/inspectionMarker.js +++ b/src/layers/wind/inspectionMarker.js @@ -1,6 +1,6 @@ import { useWindInspectionStore } from '../../ui/stores/windInspection.js'; import { applicationPinia } from '../../ui/vueRuntime.js'; -import { findFrame, findQuery } from '../../render/rendererOf.js'; +import { canvasOf, findFrame, findQuery } from '../../render/rendererOf.js'; /** * One passive marker for the captured location; it never samples on camera @@ -33,7 +33,7 @@ export function createWindInspectionMarker({ return { show(position) { clear(); - const canvas = viewer?.scene?.canvas; + const canvas = canvasOf(viewer); const query = viewer ? findQuery(viewer) : null; const frame = viewer ? findFrame(viewer) : null; if (!position || !container?.ownerDocument || !canvas || !query || !frame) diff --git a/src/layers/wind/inspectionMarker.test.mjs b/src/layers/wind/inspectionMarker.test.mjs index 9d808ae77..9bde59eac 100644 --- a/src/layers/wind/inspectionMarker.test.mjs +++ b/src/layers/wind/inspectionMarker.test.mjs @@ -26,6 +26,9 @@ function fixture(t) { const projected = []; const requests = []; const viewer = { + get canvas() { + return this.scene?.canvas; + }, scene: { canvas: { clientWidth: 800, diff --git a/src/render/rendererOf.js b/src/render/rendererOf.js index 89010376c..c669a4e1b 100644 --- a/src/render/rendererOf.js +++ b/src/render/rendererOf.js @@ -186,6 +186,16 @@ export function bindRenderer(host, renderer) { */ export const rendererOf = (host) => (host && renderers.get(host)) || null; +/** + * The canvas the renderer bound to `host` draws in; with none bound, the + * scene object's own `canvas` (a viewer's), the same element the default + * renderer reports. For sizing by it and listening on it as DOM. + * @param {object|null|undefined} host + * @returns {HTMLCanvasElement|null} + */ +export const canvasOf = (host) => + rendererOf(host)?.canvas ?? host?.canvas ?? null; + /** * The camera port of the renderer bound to `host`; with no renderer bound, * one built over `host` by the provided factory and kept with it while diff --git a/src/render/rendererOf.test.mjs b/src/render/rendererOf.test.mjs index 139d553f6..b51ca1eda 100644 --- a/src/render/rendererOf.test.mjs +++ b/src/render/rendererOf.test.mjs @@ -3,6 +3,7 @@ import test from 'node:test'; import { bindRenderer, cameraOf, + canvasOf, drawOf, findCamera, findCredits, @@ -27,6 +28,19 @@ test('a scene finds its renderer until it is unbound', () => { assert.equal(rendererOf(scene), null); }); +test("canvasOf answers with the renderer's canvas, else the host's own", () => { + const own = { id: 'own' }; + const drawn = { id: 'drawn' }; + const scene = { canvas: own }; + assert.equal(canvasOf(scene), own); + assert.equal(canvasOf({}), null); + assert.equal(canvasOf(null), null); + const unbind = bindRenderer(scene, { canvas: drawn }); + assert.equal(canvasOf(scene), drawn); + unbind(); + assert.equal(canvasOf(scene), own); +}); + test('a stale unbind leaves a later binding alone', () => { const scene = {}; const unbindFirst = bindRenderer(scene, { id: 'first' }); diff --git a/src/scenes/director.js b/src/scenes/director.js index 9e867d594..5268d186c 100644 --- a/src/scenes/director.js +++ b/src/scenes/director.js @@ -22,7 +22,7 @@ import { createToast } from '../ui/toast.js'; import { buildPlaybackQueue, playSceneQueue } from '../director/playback.js'; import { createScenePlaybackAdapter } from './playbackAdapter.js'; import { toRadians } from '../geo/vector.js'; -import { cameraOf, findCamera, rendererOf } from '../render/rendererOf.js'; +import { cameraOf, canvasOf, findCamera } from '../render/rendererOf.js'; import { SCENE_APPEND_RECIPES, SCENE_RECIPES, @@ -137,7 +137,7 @@ export class SceneDirector { this._cameraHandoffUnsubscribe = styleManager.subscribeCameraHandoff?.(yieldCamera); // A viewer of the caller's own, with no renderer bound, has its canvas. - const canvas = rendererOf(viewer)?.canvas ?? viewer.scene?.canvas; + const canvas = canvasOf(viewer); for (const event of ['pointerdown', 'wheel']) canvas?.addEventListener(event, yieldCamera, { passive: true }); this._removeCameraInput = () => { diff --git a/src/testSupport/fakeCesiumScene.mjs b/src/testSupport/fakeCesiumScene.mjs index 2b587e6de..1e45d1869 100644 --- a/src/testSupport/fakeCesiumScene.mjs +++ b/src/testSupport/fakeCesiumScene.mjs @@ -20,6 +20,7 @@ * - frame: phases from the scene's own `preUpdate`, `preRender` and * `postRender` events. * - draw: a fake draw port (`fakeDrawPort.mjs`) unless one is given. + * - canvas: the double's `canvas`, else its scene's. */ import * as Cesium from 'cesium'; import { bindRenderer } from '../render/rendererOf.js'; @@ -209,6 +210,15 @@ export function bindFakeCesiumScene(viewer, { draw = fakeDrawPort() } = {}) { }; const query = fakeSceneQuery(viewer); const frame = fakeSceneFrame(viewer); - const unbind = bindRenderer(viewer, { draw, camera, query, frame }); + const unbind = bindRenderer(viewer, { + // The double's canvas, as `bindFakeCesiumCamera`'s renderer reports it. + get canvas() { + return viewer.canvas ?? viewer.scene?.canvas; + }, + draw, + camera, + query, + frame, + }); return { draw, camera, query, frame, unbind }; } diff --git a/src/testSupport/fakeDrawPort.mjs b/src/testSupport/fakeDrawPort.mjs index 615809ecd..4ada5de4d 100644 --- a/src/testSupport/fakeDrawPort.mjs +++ b/src/testSupport/fakeDrawPort.mjs @@ -94,6 +94,13 @@ export function fakeDrawPort() { */ export function bindFakeDraw(viewer, renderer = {}) { const draw = fakeDrawPort(); - const unbind = bindRenderer(viewer, { ...renderer, draw }); + const unbind = bindRenderer(viewer, { + // The double's canvas, as `bindFakeCesiumCamera`'s renderer reports it. + get canvas() { + return viewer.canvas ?? viewer.scene?.canvas; + }, + ...renderer, + draw, + }); return { draw, unbind }; } diff --git a/src/ui/cameraOrientationControls.js b/src/ui/cameraOrientationControls.js index a69621d87..e163aa6f4 100644 --- a/src/ui/cameraOrientationControls.js +++ b/src/ui/cameraOrientationControls.js @@ -17,7 +17,12 @@ import { TWO_PI, zeroToTwoPi, } from '../geo/index.js'; -import { findCamera, findFrame, findQuery } from '../render/rendererOf.js'; +import { + canvasOf, + findCamera, + findFrame, + findQuery, +} from '../render/rendererOf.js'; import { placeFollowEye } from './shareFollow.js'; function trackedTarget(viewer) { @@ -55,7 +60,7 @@ function cubicInOut(k) { /** Return the world position under the center of the canvas, when available. */ export function pickViewTarget(viewer) { const query = findQuery(viewer); - const canvas = viewer?.scene?.canvas; + const canvas = canvasOf(viewer); if (!query || !canvas) return null; const width = canvas.clientWidth || canvas.width || 0; const height = canvas.clientHeight || canvas.height || 0; @@ -329,7 +334,7 @@ export function bindCameraOrientationControls({ subscribe(findCamera(viewer)?.on('moveEnd', refreshTilt)); if (viewer) removers.push(onFollowChanged(viewer, animator.cancel)); for (const type of ['pointerdown', 'wheel']) { - const canvas = viewer?.scene?.canvas; + const canvas = canvasOf(viewer); canvas?.addEventListener?.(type, animator.cancel, { passive: true }); removers.push(() => canvas?.removeEventListener?.(type, animator.cancel)); } diff --git a/src/ui/imageryBoxTool.js b/src/ui/imageryBoxTool.js index 8bae8a04a..d44a7a29d 100644 --- a/src/ui/imageryBoxTool.js +++ b/src/ui/imageryBoxTool.js @@ -15,6 +15,7 @@ import { inputFor as defaultInputFor } from '../input/dispatcher.js'; import { validateBox } from '../layers/recentImagery/model.js'; import { createImageryBoxPreview } from '../layers/recentImagery/rendering.js'; import { msg } from '../i18n/index.js'; +import { canvasOf } from '../render/rendererOf.js'; /** The id this tool claims the pointer under. */ export const IMAGERY_BOX_POINTER_OWNER = 'recent-imagery-box'; @@ -39,7 +40,7 @@ export function initImageryBoxTool({ pickWorld = pickWorldFromScreen, documentRef = globalThis.document, } = {}) { - if (!viewer?.scene || typeof onBox !== 'function') return null; + if (!viewer || typeof onBox !== 'function') return null; let active = false; let destroyed = false; @@ -62,7 +63,7 @@ export function initImageryBoxTool({ const setPreview = (visible) => preview.setVisible(visible); const worldAt = (position) => { if (!position) return null; - const canvas = viewer.scene.canvas; + const canvas = canvasOf(viewer); const w = canvas?.clientWidth || canvas?.width || 1; const h = canvas?.clientHeight || canvas?.height || 1; const point = pickWorld(viewer, position.x / w, position.y / h); diff --git a/src/ui/imagerySplit.js b/src/ui/imagerySplit.js index ee19a3f6f..176da9a49 100644 --- a/src/ui/imagerySplit.js +++ b/src/ui/imagerySplit.js @@ -24,6 +24,26 @@ function defaultValueText(beforePercent, afterPercent) { return `A ${beforePercent} percent, B ${afterPercent} percent`; } +/** + * A globe port's split as `createImagerySplit` writes it (its `scene`): the + * divider moves the globe's split through the port. Null when the globe + * has no split. + * @param {import('../render/contract/globe').GlobePort|null|undefined} globe + * @returns {{splitPosition: number}|null} + */ +export function globeSplitTarget(globe) { + const imagery = globe?.imagery; + if (!imagery?.setSplit) return null; + return { + get splitPosition() { + return imagery.getSplit(); + }, + set splitPosition(value) { + imagery.setSplit(value); + }, + }; +} + /** * Split divider for before/after imagery comparison. * diff --git a/src/ui/recentImagery.js b/src/ui/recentImagery.js index b79fc14a4..dc21a5b2a 100644 --- a/src/ui/recentImagery.js +++ b/src/ui/recentImagery.js @@ -17,7 +17,7 @@ import { tn, translateKnown, } from '../i18n/index.js'; -import { createImagerySplit } from './imagerySplit.js'; +import { createImagerySplit, globeSplitTarget } from './imagerySplit.js'; import RecentImageryReadout from './recentImagery/RecentImageryReadout.vue'; import { PRODUCTS, @@ -27,6 +27,7 @@ import { import { displayDay, displayMetres } from '../layers/recentImagery/display.js'; import { formatQuantity } from './unitLabels.js'; import { pointerOwnerName } from '../data/pointerOwnerNames.js'; +import { canvasOf, findGlobe } from '../render/rendererOf.js'; const PANEL_ID = 'recent-imagery-panel'; const OVERVIEW_MIN_BOX_KM = 25; @@ -701,7 +702,7 @@ export function createRecentImageryPanel({ } if (!live || split || destroyed) return; split = createSplit({ - scene: viewer?.scene, + scene: globeSplitTarget(findGlobe(viewer)), initialValue: snapshot.split, id: 'recent-imagery-split-line', handleClass: 'recent-imagery-split-handle', @@ -722,7 +723,7 @@ export function createRecentImageryPanel({ right: rightPercent, }), getViewportWidth: () => - Number(viewer?.scene?.canvas?.clientWidth) || + Number(canvasOf(viewer)?.clientWidth) || Number(document.documentElement?.clientWidth) || 0, onChange: (value) => layer.setSplit(value), diff --git a/src/ui/recentImagery.test.mjs b/src/ui/recentImagery.test.mjs index 57127fe93..b1336940f 100644 --- a/src/ui/recentImagery.test.mjs +++ b/src/ui/recentImagery.test.mjs @@ -17,6 +17,7 @@ import { settle, } from '../layers/recentImagery/testDoubles.mjs'; import { bindFakeCesiumCamera } from '../testSupport/fakeCameraPort.mjs'; +import { fakeGlobePort } from '../testSupport/fakeGlobePort.mjs'; const S18 = 'S30:2026-09-18'; const L16 = 'L30:2026-09-16'; @@ -130,7 +131,8 @@ function fixture({ fetchImpl, controller = fakeController() } = {}) { camera: {}, scene: { canvas: { clientWidth: 1000 }, requestRender() {} }, }; - bindFakeCesiumCamera(viewer); + const globe = fakeGlobePort(); + bindFakeCesiumCamera(viewer, { globe }); layer.init(viewer); layer.attachMapStackController(controller); let active = false; @@ -213,6 +215,7 @@ function fixture({ fetchImpl, controller = fakeController() } = {}) { ...dom, layer, viewer, + globe, renderer, thumbnails, catalog, @@ -879,6 +882,9 @@ test('the divider exists only while a swipe is live, labelled A / B or IMAGE / B assert.equal(f.splits.length, 1); assert.deepEqual(labels(), ['IMAGE', 'BASEMAP']); assert.equal(f.splits[0].options.id, 'recent-imagery-split-line'); + // The divider moves the globe's split, through the renderer's globe port. + f.splits[0].options.scene.splitPosition = 0.3; + assert.equal(f.globe.imagery.getSplit(), 0.3); assert.deepEqual(swapState(), [false, false, 'false', 'false']); assert.deepEqual(directions(), ['left', undefined]); // VS BASEMAP: SWAP puts the image right of the basemap, and back. diff --git a/src/voice/gevRealtime.js b/src/voice/gevRealtime.js index 6d060b9c0..0b012f90a 100644 --- a/src/voice/gevRealtime.js +++ b/src/voice/gevRealtime.js @@ -5,6 +5,7 @@ import { createVoiceCommands } from './commands.js'; import { cameraPoseKey, createPointerTracker } from './pointerContext.js'; import { createPointerPicker } from './pointerPick.js'; import { createReferentRegistry } from './referents.js'; +import { canvasOf } from '../render/rendererOf.js'; export * from './realtimeController.js'; const ACTION_NAMES = new Set(GEV_ACTION_SCHEMAS.map((schema) => schema.name)); @@ -32,7 +33,7 @@ export function withToolCatalog(runner, loadCatalog) { /** Compose the standalone action runner with the voice controls. */ export function initGevVoiceCommands(options) { - const canvas = options.viewer?.scene?.canvas || null; + const canvas = canvasOf(options.viewer); const cameraKey = () => cameraPoseKey(options.viewer); // Point-and-ask: the tracker and referents are shared by the runner (which // resolves 'pointer' and referent:n) and the controls (which snapshot the diff --git a/src/voice/pointerPick.js b/src/voice/pointerPick.js index 76eb59817..96aa5c8df 100644 --- a/src/voice/pointerPick.js +++ b/src/voice/pointerPick.js @@ -1,5 +1,5 @@ import { pickAt as defaultPickAt } from '../input/dispatcher.js'; -import { findCamera } from '../render/rendererOf.js'; +import { canvasOf, findCamera } from '../render/rendererOf.js'; import { resolvePickedContext } from '../data/pickedContext.js'; import { cameraPoseKey } from './pointerContext.js'; import * as defaultAnnotationResolver from '../annotations/annotationResolver.js'; @@ -37,9 +37,8 @@ export function createPointerPicker({ pickAt = defaultPickAt, }) { return function pickPointer(x, y) { - const scene = viewer?.scene; - const canvas = scene?.canvas; - if (!scene || !canvas) return null; + const canvas = canvasOf(viewer); + if (!canvas) return null; const width = canvas.clientWidth || canvas.width || 0; const height = canvas.clientHeight || canvas.height || 0; if (!width || !height) return null; diff --git a/src/voice/realtimeViewport.js b/src/voice/realtimeViewport.js index e229b6cc2..d6aca4ed4 100644 --- a/src/voice/realtimeViewport.js +++ b/src/voice/realtimeViewport.js @@ -3,6 +3,7 @@ import { hasStructuredViewIdentity, } from './realtimeProtocol.js'; import { cameraPoseKey } from './pointerContext.js'; +import { canvasOf } from '../render/rendererOf.js'; /** The live viewer's camera pose identity (Cesium-free read). */ function readViewerCameraKey() { @@ -20,7 +21,7 @@ const VIEWPORT_MAX_ENCODED_BYTES = 200 * 1024; export async function captureViewportImage() { const viewer = window.__godsEyeView?.viewer; const source = - viewer?.scene?.canvas || + canvasOf(viewer) || document.querySelector('#cesiumContainer .cesium-widget canvas'); if (!source || !source.width || !source.height) return null; // No fresh frame (hidden, or the bounded render wait timed out) → no @@ -130,7 +131,7 @@ export function pointerCropRect({ */ async function capturePointerCrop(screenPx) { const viewer = window.__godsEyeView?.viewer; - const source = viewer?.scene?.canvas; + const source = canvasOf(viewer); if (!source?.width || !source?.height || !screenPx) return null; const fresh = await renderFreshPointerFrame(viewer); if (!fresh) return null;