mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 09:42:21 +00:00
fix(library): Norway's cadastre and sea depths draw to the far edge of a tilted view again
The two dense entries (cadastre from z14, sea depths from z11) were drawn by Cesium only on globe tiles as fine as their minimum zoom, with their minimum zoom tiles filling the coarsest of those. Through the globe port they dropped the minimum level and refused every tile below it, so the far band of a tilted view, one globe level coarser, was blank. The imagery contract gains hiddenBelowMinLevel: a layer drawn nowhere the surface is coarser than its minLevel. Cesium gives such a layer minimumTerrainLevel as the library set it before (minLevel - 1 for Web Mercator tiles on the geographic globe); the entries keep their minimum level and drop the admit hook.
This commit is contained in:
1 parent
91b080a45a
commit
ecf8b31756
5 files changed
+63
-41
No files matched your search
@@ -10,6 +10,7 @@ import {
|
||||
import { LIBRARY_ENTRIES, libraryEntry } from './catalog.js';
|
||||
import { libraryTileUrl } from './manifest.js';
|
||||
import { createLibrarySource } from './source.js';
|
||||
import { layerOptions } from '../render/cesium/imagery.js';
|
||||
import { fakeGlobePort } from '../testSupport/fakeGlobePort.mjs';
|
||||
import { bindFakeDraw } from '../testSupport/fakeDrawPort.mjs';
|
||||
|
||||
@@ -225,31 +226,23 @@ test('an entry too dense to draw zoomed out is hidden below its scale', async (t
|
||||
undefined,
|
||||
);
|
||||
|
||||
// It names no minimum level, so zoomed out the globe takes its tiles at
|
||||
// its own coarse levels, and every tile below z14 is held back unfetched.
|
||||
// It keeps its minimum level and is hidden where the view is coarser, as
|
||||
// Cesium's own layer was (minimumTerrainLevel z13 on the geographic globe).
|
||||
const { viewer, globe } = globeViewer(t);
|
||||
const layer = createLibraryTileLayer(cadastre, { source });
|
||||
await layer.init(viewer);
|
||||
await layer.enable(viewer);
|
||||
const [imagery] = globe.layers;
|
||||
assert.equal(imagery.spec.minLevel, undefined);
|
||||
let fetched = 0;
|
||||
const fetch = () => {
|
||||
fetched += 1;
|
||||
return Promise.resolve('tile');
|
||||
};
|
||||
for (const level of [0, 4, 12, 13])
|
||||
await assert.rejects(imagery.request({ x: 0, y: 0, level }, fetch));
|
||||
assert.equal(fetched, 0, 'no tile below z14 is requested');
|
||||
assert.equal(await imagery.request({ x: 0, y: 0, level: 14 }, fetch), 'tile');
|
||||
// The held-back tiles are not failures.
|
||||
for (let i = 0; i < 30; i++) imagery.fail({ tile: { x: i, y: 0, level: 4 } });
|
||||
assert.equal(layer.getStats().error, null);
|
||||
assert.equal(imagery.spec.minLevel, 14);
|
||||
assert.equal(imagery.spec.hiddenBelowMinLevel, true);
|
||||
assert.equal(imagery.spec.admit, undefined);
|
||||
assert.deepEqual(layerOptions(imagery.spec), { minimumTerrainLevel: 13 });
|
||||
// An entry that is not dense keeps its minimum level.
|
||||
const lee = libraryEntry('lee-county-fl');
|
||||
const spec = libraryImagerySpec(lee, lee.source.url);
|
||||
assert.equal(spec.minLevel, lee.source.minZoom ?? 0);
|
||||
assert.equal(spec.admit, undefined);
|
||||
assert.equal(spec.hiddenBelowMinLevel, undefined);
|
||||
assert.equal(layerOptions(spec), undefined);
|
||||
await layer.disable();
|
||||
assert.equal(globe.layers.length, 0);
|
||||
});
|
||||
Reference in new issue
Block a user