mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
fix(globe): tighten the Cesium engine after review
Map sources are applied through one src/maps/sceneApply.js helper shared by MapSourceController and engine.maps (live layer kept for an unchanged provider, providers cached per source). The contract gains flyTo endTransform and rectangle destinations, flyToSphere easing, drillPick width/height and pick content, with Cesium's own flyToSphere range. Input skips listeners removed during dispatch and stays inert after destroy.
This commit is contained in:
1 parent
d831cbd23a
commit
ab2368f3f3
18 files changed
+658
-117
No files matched your search
+16
-28
@@ -1,6 +1,6 @@
|
||||
import { indexMapSources } from './registry.js';
|
||||
import * as Cesium from 'cesium';
|
||||
import { createMapCredits } from './credits.js';
|
||||
import { createMapScene } from './sceneApply.js';
|
||||
import { applyTerrain } from './terrain.js';
|
||||
import { acquireImageryComparison } from './imageryComparison.js';
|
||||
|
||||
@@ -32,8 +32,7 @@ export class MapSourceController {
|
||||
this._onChange = onChange;
|
||||
this._onError = onError;
|
||||
this._requestRender = requestRender;
|
||||
this._createImageryLayer = createImageryLayer;
|
||||
this._credits = createMapCredits(viewer);
|
||||
this._scene = createMapScene(viewer, { createImageryLayer });
|
||||
this._abort = new AbortController();
|
||||
this._imageryProviders = new Map();
|
||||
this._terrainProviders = new Map();
|
||||
@@ -45,8 +44,6 @@ export class MapSourceController {
|
||||
this._switchOrigin = 'manual';
|
||||
this._isSwitching = false;
|
||||
this._lastError = null;
|
||||
this._imageryLayer = null;
|
||||
this._activeImageryProvider = null;
|
||||
this._removeImageryErrorListener = null;
|
||||
this._terrainMode = null;
|
||||
this._subscribers = new Set();
|
||||
@@ -245,43 +242,37 @@ export class MapSourceController {
|
||||
this._ownedTilesets.add(tileset);
|
||||
}
|
||||
this._removeImageryLayer();
|
||||
this._credits.show(source.credit || null);
|
||||
this._scene.showCredit(source.credit);
|
||||
this._showTileset(tileset);
|
||||
this.viewer.scene.globe.show = false;
|
||||
this._scene.showGlobe(false);
|
||||
// Terrain is intentionally untouched while the globe is hidden.
|
||||
}
|
||||
|
||||
_showTileset(active) {
|
||||
const tilesets = [];
|
||||
for (const source of this._sources.values())
|
||||
if (source.tileset) source.tileset.show = source.tileset === active;
|
||||
for (const tileset of this._ownedTilesets)
|
||||
tileset.show = tileset === active;
|
||||
if (source.tileset) tilesets.push(source.tileset);
|
||||
this._scene.showTileset(active, [...tilesets, ...this._ownedTilesets]);
|
||||
}
|
||||
|
||||
async _activateGlobeStack(stack, gen) {
|
||||
const resolution = await this._getImageryProvider(stack);
|
||||
if (gen !== this._switchGen) return;
|
||||
// Scene shots reapply their map stack at every handoff. Keep the live
|
||||
// layer (and its loaded tiles) when the resolved provider is unchanged;
|
||||
// rebuilding it exposes the bare globe while imagery loads again.
|
||||
if (
|
||||
!this._imageryLayer ||
|
||||
this._activeImageryProvider !== resolution.provider
|
||||
) {
|
||||
// Scene shots reapply their map stack at every handoff; the map scene
|
||||
// keeps the live layer when the resolved provider is unchanged.
|
||||
if (this._scene.baseProvider !== resolution.provider) {
|
||||
this._removeImageryLayer();
|
||||
this._imageryLayer = this._createImageryLayer(resolution.provider);
|
||||
this._activeImageryProvider = resolution.provider;
|
||||
this.viewer.imageryLayers.add(this._imageryLayer, 0);
|
||||
this._scene.showBaseImagery(resolution.provider);
|
||||
}
|
||||
const source = this._sources.get(resolution.effectiveStackId);
|
||||
this._credits.show(source?.credit || null);
|
||||
this._scene.showCredit(source?.credit);
|
||||
// A repeated request still owns a new switch generation. Rebind its
|
||||
// failure listener so fallback remains live without accumulating listeners.
|
||||
this._removeImageryErrorListener?.();
|
||||
this._removeImageryErrorListener = null;
|
||||
this._watchProvider(resolution, gen);
|
||||
this._showTileset(null);
|
||||
this.viewer.scene.globe.show = true;
|
||||
this._scene.showGlobe(true);
|
||||
this._activeId = resolution.effectiveStackId;
|
||||
if (source?.terrain && source.terrain.id !== this._terrainMode) {
|
||||
const terrain = source.terrain;
|
||||
@@ -346,7 +337,7 @@ export class MapSourceController {
|
||||
this._removeImageryErrorListener = errorEvent.addEventListener((error) => {
|
||||
if (
|
||||
gen !== this._switchGen ||
|
||||
this._activeImageryProvider !== resolution.provider
|
||||
this._scene.baseProvider !== resolution.provider
|
||||
)
|
||||
return;
|
||||
const retryCount = Number(error?.timesRetried);
|
||||
@@ -381,10 +372,7 @@ export class MapSourceController {
|
||||
_removeImageryLayer() {
|
||||
this._removeImageryErrorListener?.();
|
||||
this._removeImageryErrorListener = null;
|
||||
if (this._imageryLayer)
|
||||
this.viewer.imageryLayers.remove(this._imageryLayer, true);
|
||||
this._imageryLayer = null;
|
||||
this._activeImageryProvider = null;
|
||||
this._scene.removeBaseImagery();
|
||||
}
|
||||
_dispose(value) {
|
||||
if (!value || this._disposed.has(value)) return;
|
||||
@@ -400,7 +388,7 @@ export class MapSourceController {
|
||||
this._abort.abort();
|
||||
this._isSwitching = false;
|
||||
this._removeImageryLayer();
|
||||
this._credits.destroy();
|
||||
this._scene.destroy();
|
||||
for (const promise of this._imageryProviders.values())
|
||||
void Promise.resolve(promise).then(
|
||||
(value) => this._dispose(value.provider),
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
import * as Cesium from 'cesium';
|
||||
import { createMapCredits } from './credits.js';
|
||||
|
||||
/**
|
||||
* The scene changes a map source makes on a Cesium viewer: the base imagery
|
||||
* layer, which 3D tileset shows, the globe, and the source's static credit.
|
||||
* Shared by MapSourceController and the Cesium globe engine's `maps`, so
|
||||
* both apply sources the same way. Creating it touches nothing.
|
||||
* @param {Cesium.Viewer} viewer
|
||||
* @param {{ createImageryLayer?: (provider: object) => object }} [options]
|
||||
*/
|
||||
export function createMapScene(
|
||||
viewer,
|
||||
{ createImageryLayer = (provider) => new Cesium.ImageryLayer(provider) } = {},
|
||||
) {
|
||||
const credits = createMapCredits(viewer);
|
||||
let layer = null;
|
||||
let provider = null;
|
||||
const scene = {
|
||||
/** The provider of the live base layer, or null. */
|
||||
get baseProvider() {
|
||||
return provider;
|
||||
},
|
||||
/**
|
||||
* Show `next` as the bottom imagery layer. The live layer (and its loaded
|
||||
* tiles) stays when its provider is unchanged: rebuilding it exposes the
|
||||
* bare globe while imagery loads again. Returns whether it was replaced.
|
||||
*/
|
||||
showBaseImagery(next) {
|
||||
if (layer && provider === next) return false;
|
||||
scene.removeBaseImagery();
|
||||
layer = createImageryLayer(next);
|
||||
provider = next;
|
||||
viewer.imageryLayers.add(layer, 0);
|
||||
return true;
|
||||
},
|
||||
removeBaseImagery() {
|
||||
if (layer) viewer.imageryLayers.remove(layer, true);
|
||||
layer = null;
|
||||
provider = null;
|
||||
},
|
||||
/** Show `active` (or none) among `tilesets`. */
|
||||
showTileset(active, tilesets) {
|
||||
for (const tileset of tilesets) tileset.show = tileset === active;
|
||||
},
|
||||
showGlobe(visible) {
|
||||
viewer.scene.globe.show = visible;
|
||||
},
|
||||
showCredit(html) {
|
||||
credits.show(html || null);
|
||||
},
|
||||
destroy() {
|
||||
scene.removeBaseImagery();
|
||||
credits.destroy();
|
||||
},
|
||||
};
|
||||
return scene;
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { createMapScene } from './sceneApply.js';
|
||||
|
||||
function fixture() {
|
||||
const layers = [];
|
||||
const removed = [];
|
||||
const credits = [];
|
||||
const viewer = {
|
||||
scene: {
|
||||
globe: { show: true },
|
||||
frameState: {
|
||||
creditDisplay: {
|
||||
addStaticCredit: (credit) => credits.push(credit),
|
||||
removeStaticCredit: (credit) =>
|
||||
credits.splice(credits.indexOf(credit), 1),
|
||||
},
|
||||
},
|
||||
},
|
||||
imageryLayers: {
|
||||
add: (layer, index) => layers.splice(index ?? layers.length, 0, layer),
|
||||
remove(layer, destroy) {
|
||||
layers.splice(layers.indexOf(layer), 1);
|
||||
removed.push({ layer, destroy });
|
||||
},
|
||||
},
|
||||
};
|
||||
const scene = createMapScene(viewer, {
|
||||
createImageryLayer: (provider) => ({ provider }),
|
||||
});
|
||||
return { viewer, scene, layers, removed, credits };
|
||||
}
|
||||
|
||||
test('creating the map scene touches nothing', () => {
|
||||
const { viewer, layers, credits } = fixture();
|
||||
assert.deepEqual(layers, []);
|
||||
assert.deepEqual(credits, []);
|
||||
assert.equal(viewer.scene.globe.show, true);
|
||||
});
|
||||
|
||||
test('showBaseImagery puts a new layer at the bottom and replaces the old one', () => {
|
||||
const { scene, layers, removed } = fixture();
|
||||
layers.push({ name: 'overlay' });
|
||||
const first = { name: 'esri' };
|
||||
assert.equal(scene.showBaseImagery(first), true);
|
||||
assert.deepEqual(layers[0], { provider: first });
|
||||
assert.equal(scene.baseProvider, first);
|
||||
const second = { name: 'osm' };
|
||||
assert.equal(scene.showBaseImagery(second), true);
|
||||
assert.deepEqual(
|
||||
layers.map((layer) => layer.provider?.name ?? layer.name),
|
||||
['osm', 'overlay'],
|
||||
);
|
||||
assert.deepEqual(removed, [{ layer: { provider: first }, destroy: true }]);
|
||||
});
|
||||
|
||||
test('re-applying the same provider keeps the live layer', () => {
|
||||
const { scene, layers, removed } = fixture();
|
||||
const provider = { name: 'esri' };
|
||||
scene.showBaseImagery(provider);
|
||||
const live = layers[0];
|
||||
assert.equal(scene.showBaseImagery(provider), false);
|
||||
assert.equal(layers[0], live);
|
||||
assert.deepEqual(removed, []);
|
||||
});
|
||||
|
||||
test('removeBaseImagery, tilesets, globe and credits', () => {
|
||||
const { viewer, scene, layers, credits } = fixture();
|
||||
scene.showBaseImagery({ name: 'esri' });
|
||||
scene.removeBaseImagery();
|
||||
scene.removeBaseImagery();
|
||||
assert.deepEqual(layers, []);
|
||||
assert.equal(scene.baseProvider, null);
|
||||
const a = { show: true };
|
||||
const b = { show: false };
|
||||
scene.showTileset(b, [a, b]);
|
||||
assert.deepEqual([a.show, b.show], [false, true]);
|
||||
scene.showTileset(null, [a, b]);
|
||||
assert.deepEqual([a.show, b.show], [false, false]);
|
||||
scene.showGlobe(false);
|
||||
assert.equal(viewer.scene.globe.show, false);
|
||||
scene.showCredit('<b>Esri</b>');
|
||||
assert.equal(credits.length, 1);
|
||||
scene.showCredit(null);
|
||||
assert.equal(credits.length, 0);
|
||||
scene.showCredit('<b>Esri</b>');
|
||||
scene.showBaseImagery({ name: 'osm' });
|
||||
scene.destroy();
|
||||
assert.deepEqual(layers, []);
|
||||
assert.deepEqual(credits, []);
|
||||
});
|
||||
Reference in new issue
Block a user