diff --git a/scripts/package-boundaries.json b/scripts/package-boundaries.json index ae89208fa..86e21ccad 100644 --- a/scripts/package-boundaries.json +++ b/scripts/package-boundaries.json @@ -5203,6 +5203,7 @@ "src/layers/transit/testing.js", "src/layers/transit/trails.js", "src/layers/transit/viewport.js", + "src/geo/rectangle.js", "src/overlays/worldOverlay.js", "src/overlays/worldOverlayDraw.js", "src/overlays/worldOverlayTokens.js", @@ -5265,9 +5266,20 @@ "src/layers/transit/queries.js", "src/layers/transit/rendering.js", "src/layers/transit/selection.js", + "src/geo/index.js", "src/layers/transit/state.js", "src/layers/transit/testing.js", "src/layers/transit/viewport.js", + "src/geo/rectangle.js", + "src/render/rendererOf.js", + "src/render/cesium/camera.js", + "src/render/camera/events.js", + "src/geo/celestial.js", + "src/geo/quaternion.js", + "src/geo/frames.js", + "src/render/cesium/credits.js", + "src/render/creditMarkup.js", + "src/render/cesium/draw.js", "src/data/cameraSensitivity.js", "src/data/contactPlayback.js", "src/data/contactTrailRenderer.js", diff --git a/src/layers/transit/lifecycle.js b/src/layers/transit/lifecycle.js index 90210063a..6711eacd2 100644 --- a/src/layers/transit/lifecycle.js +++ b/src/layers/transit/lifecycle.js @@ -1,5 +1,8 @@ import { destroyTrack } from '../../data/contactPlayback.js'; import * as Cesium from 'cesium'; +// The Cesium camera factory: given a viewer of a caller's own, with no +// renderer bound, the layer's camera reads find a camera port. +import '../../render/cesium/camera.js'; import { claimCameraSensitivity, releaseCameraSensitivity, diff --git a/src/layers/transit/lifecycle.test.mjs b/src/layers/transit/lifecycle.test.mjs index e84bbef7b..069c5c4d9 100644 --- a/src/layers/transit/lifecycle.test.mjs +++ b/src/layers/transit/lifecycle.test.mjs @@ -306,6 +306,34 @@ function harness( }, }); + // The layer reads the camera through its port; this one reads the fake + // camera above as the Cesium port reads a real one, so a test can still + // move it by changing the fake. + const unbindCamera = bindRenderer(viewer, { + camera: { + pose() { + const carto = viewer.camera.positionCartographic; + return { + lon: carto ? Cesium.Math.toDegrees(carto.longitude) : NaN, + lat: carto ? Cesium.Math.toDegrees(carto.latitude) : NaN, + height: carto ? carto.height : NaN, + }; + }, + viewRectangle() { + const rect = viewer.camera.computeViewRectangle?.( + Cesium.Ellipsoid.WGS84, + ); + if (!rect) return null; + const deg = Cesium.Math.toDegrees; + return { + west: deg(rect.west), + south: deg(rect.south), + east: deg(rect.east), + north: deg(rect.north), + }; + }, + }, + }); installRenderGovernor(framePortFor(viewer.scene)); layer.init(viewer); @@ -316,6 +344,7 @@ function harness( /* a test may already have destroyed it */ } uninstallRenderGovernor(framePortFor(viewer.scene)); + unbindCamera(); _resetRenderGovernorForTest(); globalThis.fetch = originalFetch; if (originalDocument === undefined) delete globalThis.document; diff --git a/src/layers/transit/viewport.js b/src/layers/transit/viewport.js index 730126f10..01b724779 100644 --- a/src/layers/transit/viewport.js +++ b/src/layers/transit/viewport.js @@ -1,4 +1,6 @@ -import * as Cesium from 'cesium'; +import { rectangleCenter } from '../../geo/rectangle.js'; +import { toDegrees, toRadians } from '../../geo/vector.js'; +import { findCamera } from '../../render/rendererOf.js'; import { ACTIVATION_ENTER_ALTITUDE_M, ACTIVATION_EXIT_ALTITUDE_M, @@ -18,28 +20,26 @@ export function createViewport({ state, services, parts }) { const { governorRequestRender } = services.render; function getCameraAltitude(viewer = state._viewer) { - const carto = viewer?.camera?.positionCartographic; - return carto && Number.isFinite(carto.height) ? carto.height : Infinity; + const height = findCamera(viewer)?.pose().height; + return Number.isFinite(height) ? height : Infinity; } + /** Where the camera looks: its view rectangle's middle, else under the eye. */ function getCameraCenterLatLon(viewer = state._viewer) { - const rect = viewer?.camera?.computeViewRectangle?.( - viewer.scene.globe?.ellipsoid, - ); + const camera = findCamera(viewer); + const rect = camera?.viewRectangle(); if (rect) { - const center = Cesium.Rectangle.center(rect); - return { - lat: Cesium.Math.toDegrees(center.latitude), - lon: Cesium.Math.toDegrees(center.longitude), - }; - } - const carto = viewer?.camera?.positionCartographic; - if (carto) { - return { - lat: Cesium.Math.toDegrees(carto.latitude), - lon: Cesium.Math.toDegrees(carto.longitude), - }; + const center = rectangleCenter({ + west: toRadians(rect.west), + south: toRadians(rect.south), + east: toRadians(rect.east), + north: toRadians(rect.north), + }); + return { lat: toDegrees(center.lat), lon: toDegrees(center.lon) }; } + const pose = camera?.pose(); + if (pose && Number.isFinite(pose.lat) && Number.isFinite(pose.lon)) + return { lat: pose.lat, lon: pose.lon }; return null; } @@ -53,18 +53,8 @@ export function createViewport({ state, services, parts }) { * animating. Cheap, and only on a settled camera — never per frame. */ function refreshViewBounds() { - const viewer = state._viewer; - const rect = viewer?.camera?.computeViewRectangle?.( - viewer.scene.globe?.ellipsoid, - ); - state._viewBounds = rect - ? inflateViewBounds({ - south: Cesium.Math.toDegrees(rect.south), - north: Cesium.Math.toDegrees(rect.north), - west: Cesium.Math.toDegrees(rect.west), - east: Cesium.Math.toDegrees(rect.east), - }) - : null; + const rect = findCamera(state._viewer)?.viewRectangle(); + state._viewBounds = rect ? inflateViewBounds(rect) : null; // The sweep itself is deferred: `marker.show` is a dirty flag, and a drag // fires this on every frame, so re-deciding visibility inline would put the // whole fleet back into the vertex buffer once a frame — the exact cost diff --git a/src/render/cesiumAllowList.json b/src/render/cesiumAllowList.json index 5e2ca787e..4e0957343 100644 --- a/src/render/cesiumAllowList.json +++ b/src/render/cesiumAllowList.json @@ -151,7 +151,6 @@ "src/layers/transit/lifecycle.js", "src/layers/transit/rendering.js", "src/layers/transit/testing.js", - "src/layers/transit/viewport.js", "src/layers/vessels/cameraArea.js", "src/layers/vessels/evidence.js", "src/layers/vessels/queries.js",