From 6386034add890280f0432ba9eda2568955422caa Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Sat, 7 Nov 2026 00:55:22 -0800 Subject: [PATCH] Run the submarine cables layer's sweep and render requests through the frame port The cables lifecycle and ingestion parts had left the Cesium allow-list but still hooked the scene's preRender event and asked the scene for renders directly. They now use the frame port. --- .../telegeographySubmarineCables.test.mjs | 6 +++- src/layers/submarineCables/ingestion.js | 3 +- src/layers/submarineCables/lifecycle.js | 34 +++++++++---------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/data/telegeographySubmarineCables.test.mjs b/src/data/telegeographySubmarineCables.test.mjs index 949d5a233..629942bde 100644 --- a/src/data/telegeographySubmarineCables.test.mjs +++ b/src/data/telegeographySubmarineCables.test.mjs @@ -6,6 +6,7 @@ import { MAP_STACKS } from '../mapStackController.js'; import { fromDegrees, toLonLatH } from '../geo/ellipsoid.js'; import { bindFakeDraw } from '../testSupport/fakeDrawPort.mjs'; import { fakeCameraPort } from '../testSupport/fakeCameraPort.mjs'; +import { fakeSceneFrame } from '../testSupport/fakeCesiumScene.mjs'; import { CABLE_LABEL_DEPTH_DECISION, CABLE_OVERLAY_COLLISION_CAPACITY, @@ -586,7 +587,10 @@ function createCableHarness({ camera.port.cancelFlight = () => flights.push('cancel'); camera.port.flyTo = (destination, options) => flights.push({ destination, options }); - const { draw } = bindFakeDraw(viewer, { camera: camera.port }); + const { draw } = bindFakeDraw(viewer, { + camera: camera.port, + frame: fakeSceneFrame(viewer), + }); layer.init(viewer); /** The layer's live set named `name` (`lines`, `pins`, …). */ const set = (name) => diff --git a/src/layers/submarineCables/ingestion.js b/src/layers/submarineCables/ingestion.js index 9cc1a090f..d17d7f4cd 100644 --- a/src/layers/submarineCables/ingestion.js +++ b/src/layers/submarineCables/ingestion.js @@ -1,4 +1,5 @@ import { msg, t } from '../../i18n/index.js'; +import { findFrame } from '../../render/rendererOf.js'; import { normalizeFeatures } from './geometry.js'; export function createIngestion({ state, parts, source }) { @@ -54,7 +55,7 @@ export function createIngestion({ state, parts, source }) { state._loadingLabel = ''; parts.rendering.updateVisibility(); state._referenceSweepGate.markDirty(); - viewer?.scene?.requestRender?.(); + findFrame(viewer)?.requestRender('submarine-cables'); } catch (error) { // A stale or aborted load reports nothing: its failure belongs to a // lifecycle the user already left. diff --git a/src/layers/submarineCables/lifecycle.js b/src/layers/submarineCables/lifecycle.js index edbad8d81..99c4d6fb5 100644 --- a/src/layers/submarineCables/lifecycle.js +++ b/src/layers/submarineCables/lifecycle.js @@ -1,4 +1,4 @@ -import { cameraOf } from '../../render/rendererOf.js'; +import { cameraOf, findFrame, frameOf } from '../../render/rendererOf.js'; import { cableClassificationTypeForScene, cableClassificationTypeForStack, @@ -38,27 +38,25 @@ export function createLifecycle({ state, parts, source, mapStackEventTarget }) { }, }; if (!state._preRenderRemover) { - state._preRenderRemover = viewer.scene.preRender.addEventListener( - () => { - // The camera is handed to the gate so tracked/orbit cameras — which - // never emit moveEnd — reach the motion fallback. No render is - // requested for a fallback sweep: it only fires while the camera is - // already moving, so frames are flowing by construction. - if ( - !state._enabled || - !state._loaded || - !state._referenceSweepGate.shouldRun(eye) - ) - return; - parts.rendering.updateReferenceVisibility(); - }, - ); + state._preRenderRemover = frameOf(viewer).on('preRender', () => { + // The camera is handed to the gate so tracked/orbit cameras — which + // never emit moveEnd — reach the motion fallback. No render is + // requested for a fallback sweep: it only fires while the camera is + // already moving, so frames are flowing by construction. + if ( + !state._enabled || + !state._loaded || + !state._referenceSweepGate.shouldRun(eye) + ) + return; + parts.rendering.updateReferenceVisibility(); + }); } if (!state._moveEndRemover) { state._moveEndRemover = cameraOf(viewer).on('moveEnd', () => { if (!state._enabled) return; state._referenceSweepGate.markDirty(); - viewer.scene.requestRender?.(); + findFrame(viewer)?.requestRender('submarine-cables'); }); } }, @@ -73,7 +71,7 @@ export function createLifecycle({ state, parts, source, mapStackEventTarget }) { state._referenceSweepGate.markDirty(); // The gate is dirty-only; ask for the frame its sweep needs in case the // camera is parked and nothing else is rendering. - (viewer || state._viewer)?.scene?.requestRender?.(); + findFrame(viewer || state._viewer)?.requestRender('submarine-cables'); void parts.ingestion.load(viewer || state._viewer); },