refactor(credits): use the globe engine

Map credits (maps/credits.js) are shown through a credits capability
(engine.credits.addStatic) instead of the scene's credit display; the
shared map scene takes the engine's credits, so the Cesium engine's maps
and its credits part share one owner. Data credits (registerDataCredits,
registerDynamicCredit, show/hideOsmCredit) take the globe engine and keep
accepting a viewer from layers that still hold one; the scene registers
the data credits on its engine. The Cesium credits part reads
Viewer.creditDisplay, else the scene frame state display it aliases.
This commit is contained in:
German Khokhlov committed 2026-10-15 18:37:02 +04:00
1 parent be56144d75
commit 83c13f330d
11 files changed
+169 -59

No files matched your search

+3 -1
View File
@@ -34,6 +34,7 @@ export function createCesiumEngine(viewer, options = {}) {
// Viewer.canvas is scene.canvas; the engine reads the public alias.
const canvas = viewer.canvas ?? viewer.scene.canvas;
const render = createCesiumRender(viewer, options);
const credits = createCesiumCredits(viewer);
const parts = {
camera: createCesiumCamera(viewer),
picker: createCesiumPicker(viewer),
@@ -42,9 +43,10 @@ export function createCesiumEngine(viewer, options = {}) {
render,
surface: createCesiumSurface(viewer),
input: createCesiumInput(viewer, options),
credits: createCesiumCredits(viewer),
credits,
maps: createCesiumMaps(viewer, {
...options,
credits: credits.credits,
requestRender: (reason) => render.render.request(reason),
}),
};
+3 -1
View File
@@ -8,7 +8,9 @@ import * as Cesium from 'cesium';
*/
export function createCesiumCredits(viewer) {
const added = new Set();
const display = () => viewer.creditDisplay;
// Viewer.creditDisplay is the scene frame state's display.
const display = () =>
viewer.creditDisplay ?? viewer.scene?.frameState?.creditDisplay;
const remove = (credit) => {
if (!added.delete(credit)) return;
display()?.removeStaticCredit(credit);
+15
View File
@@ -31,3 +31,18 @@ test('destroy removes the credits the engine added', () => {
assert.equal(viewer.staticCredits.length, 0);
assert.equal(viewer.callsOf('creditDisplay.removeStaticCredit').length, 2);
});
test('the display is Viewer.creditDisplay, else the scene frame state one it aliases', () => {
const added = [];
const display = {
addStaticCredit: (credit) => added.push(credit),
removeStaticCredit: (credit) => added.splice(added.indexOf(credit), 1),
};
const { credits } = createCesiumCredits({
scene: { frameState: { creditDisplay: display } },
});
const remove = credits.addStatic('frame state');
assert.equal(added[0].html, 'frame state');
remove();
assert.deepEqual(added, []);
});
+6 -1
View File
@@ -63,6 +63,7 @@ const dispose = (value) => {
* tilesetRef?: { current: object | null } | (() => object | null),
* requestRender?: (reason: string) => void,
* createImageryLayer?: (provider: object) => object,
* credits?: object,
* loadPhotorealTileset?: (credentials: object) => Promise<{ tileset: object | null, errors: Error[] }>,
* }} [options] `tilesetRef` names the startup Google tileset the app added.
* @returns {{ maps: object, destroy: () => void }}
@@ -73,12 +74,16 @@ export function createCesiumMaps(
tilesetRef = null,
requestRender = () => viewer.scene.requestRender?.(),
createImageryLayer = (provider) => new Cesium.ImageryLayer(provider),
credits,
loadPhotorealTileset = (credentials) =>
loadPhotorealisticTileset(Cesium, credentials),
} = {},
) {
const abort = new AbortController();
const mapScene = createMapScene(viewer, { createImageryLayer });
const mapScene = createMapScene(viewer, {
createImageryLayer,
...(credits && { credits }),
});
const providers = new Map();
let ownedTileset = null;
let shownTileset = null;