mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-21 18:52:18 +00:00
Hand features the engine instead of guessing it from a viewer
No code outside src/globe calls isGlobeEngine or engineFromViewer any more (14 calls left before this). The features that still sniffed take the engine from their caller: - Projection and surface helpers (focus de-emphasis, icon orientation, ground snap, the mesh floor sampler, ground picks) take the engine; the engine view's scene carries its projector instead of registering itself as a viewer. - Credits go only through engine.credits, so annotations and layers share one OSM credit state on Cesium too (it could show twice). - The annotation board and the resolver work on the engine: camera assists, visibility and picks go through engine.camera, engine.projector and src/geo, without Cesium. - The Recent Imagery box tool has one implementation for both engines, on capture-phase canvas pointer events with the layer's engine.ground preview; the Navara copy goes. On Cesium the preview outline is solid now, as on Navara. - Scene interactions take the engine, and the render governor has an engine variant beside the Cesium one. Remaining engine-specific features stay behind explicit seams until the contract covers them: the draw tool's Cesium surface (stock click actions cannot be suspended), the annotation drapes (animated materials), share follow, Cesium post effects and cyber sonar, and data packs (meshes). Coupling: Cesium-importing files fall from 31 to 27, `viewer` lines from 1367 to 1234, engine sniffing calls from 14 to 0.
This commit is contained in:
1 parent
406dd9122e
commit
f1ec9d4a22
61 files changed
+823
-1230
No files matched your search
+13
-27
@@ -1,8 +1,5 @@
|
||||
import { isGlobeEngine } from '../globe/contract.js';
|
||||
import { createCesiumCredits } from '../globe/cesium/credits.js';
|
||||
|
||||
/**
|
||||
* Per-layer data attribution registered into Cesium's credit display.
|
||||
* Per-layer data attribution registered into the globe engine's credits.
|
||||
*
|
||||
* Legal requirement (see DATA_SOURCES.md, findings H10/H11 in
|
||||
* docs/pre-ship-audit-2026-07-01.md): every third-party data layer this app can
|
||||
@@ -13,7 +10,7 @@ import { createCesiumCredits } from '../globe/cesium/credits.js';
|
||||
*
|
||||
* These credits are registered ONCE at init as STATIC credits with
|
||||
* showOnScreen=false, so they live in the expandable bottom-left "Data
|
||||
* attribution" lightbox (Cesium's credit popover) rather than cluttering the
|
||||
* attribution" lightbox (the engine's credit popover) rather than cluttering the
|
||||
* on-globe line. Always-present is intentional and reversible: the lightbox is
|
||||
* the app's canonical attribution surface and DATA_SOURCES.md is the
|
||||
* machine-readable index. Strings are copied verbatim from DATA_SOURCES.md — if
|
||||
@@ -49,29 +46,18 @@ export const ACARTIA_CREDIT = Object.freeze({
|
||||
|
||||
const osmDisplays = new WeakMap();
|
||||
const googlePlacesDisplays = new WeakMap();
|
||||
const viewerCredits = new WeakMap();
|
||||
|
||||
/**
|
||||
* Credits of a globe engine, or of a Cesium viewer's credit display for
|
||||
* callers that still hold a viewer (Cesium layers); null without one.
|
||||
* Credits of a globe engine (engine.credits, shown on its next frame); null
|
||||
* without one.
|
||||
* @returns {{ addStatic: Function, request: () => void } | null}
|
||||
*/
|
||||
function creditsOf(target) {
|
||||
if (isGlobeEngine(target))
|
||||
return {
|
||||
addStatic: (html, options) => target.credits.addStatic(html, options),
|
||||
request: () => target.render.request('credits'),
|
||||
};
|
||||
if (typeof target?.creditDisplay?.addStaticCredit !== 'function') return null;
|
||||
let credits = viewerCredits.get(target);
|
||||
if (!credits) {
|
||||
credits = {
|
||||
addStatic: createCesiumCredits(target).credits.addStatic,
|
||||
request: () => target.scene?.requestRender?.(),
|
||||
};
|
||||
viewerCredits.set(target, credits);
|
||||
}
|
||||
return credits;
|
||||
function creditsOf(engine) {
|
||||
if (typeof engine?.credits?.addStatic !== 'function') return null;
|
||||
return {
|
||||
addStatic: (html, options) => engine.credits.addStatic(html, options),
|
||||
request: () => engine.render?.request('credits'),
|
||||
};
|
||||
}
|
||||
|
||||
function updateOsmDisplay(credits, state) {
|
||||
@@ -713,7 +699,7 @@ const dynamicCreditKeys = new WeakMap();
|
||||
* Register a conditional credit at the moment its data source activates.
|
||||
* Idempotent per `credit.key`; lands in the same "Data attribution" popover
|
||||
* as the static credits (showOnScreen=false).
|
||||
* @param {object} target — the globe engine, or the initialized Cesium viewer
|
||||
* @param {object} target — the globe engine
|
||||
* @param {{ key: string, html: string }} credit — e.g. `TOMTOM_CREDIT`
|
||||
* @returns {boolean} True when the credit is (now) registered.
|
||||
*/
|
||||
@@ -730,10 +716,10 @@ export function registerDynamicCredit(target, credit) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Register every per-layer data credit into the viewer's credit display.
|
||||
* Register every per-layer data credit into the engine's credit display.
|
||||
* Idempotent: safe to call once at init. Credits are static and always
|
||||
* present in the "Data attribution" popover.
|
||||
* @param {object} target — the globe engine, or the initialized Cesium viewer
|
||||
* @param {object} target — the globe engine
|
||||
*/
|
||||
export function registerDataCredits(target, credits = DATA_CREDITS) {
|
||||
const display = creditsOf(target);
|
||||
|
||||
Reference in new issue
Block a user