mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
refactor(maps): separate source factories and scene coordination
This commit is contained in:
1 parent
561a781099
commit
e59282dc9c
22 files changed
+1807
-798
No files matched your search
@@ -0,0 +1,300 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { MapSourceController } from './controller.js';
|
||||
import { createDefaultMapSources } from './defaultSources.js';
|
||||
|
||||
function event() {
|
||||
const listeners = new Set();
|
||||
return {
|
||||
addEventListener(fn) {
|
||||
listeners.add(fn);
|
||||
return () => listeners.delete(fn);
|
||||
},
|
||||
raise(value = {}) {
|
||||
for (const fn of [...listeners]) fn(value);
|
||||
},
|
||||
get size() {
|
||||
return listeners.size;
|
||||
},
|
||||
};
|
||||
}
|
||||
function fixture(registry, options = {}) {
|
||||
const imagery = [],
|
||||
credits = new Set(),
|
||||
primitives = [],
|
||||
removed = [],
|
||||
changes = [];
|
||||
const viewer = {
|
||||
scene: {
|
||||
globe: { show: true },
|
||||
requestRender() {},
|
||||
frameState: {
|
||||
creditDisplay: {
|
||||
addStaticCredit(value) {
|
||||
credits.add(value);
|
||||
},
|
||||
removeStaticCredit(value) {
|
||||
credits.delete(value);
|
||||
},
|
||||
},
|
||||
},
|
||||
primitives: {
|
||||
add(value) {
|
||||
primitives.push(value);
|
||||
},
|
||||
remove(value) {
|
||||
primitives.splice(primitives.indexOf(value), 1);
|
||||
value.destroy?.();
|
||||
},
|
||||
},
|
||||
},
|
||||
imageryLayers: {
|
||||
add(value) {
|
||||
imagery.push(value);
|
||||
},
|
||||
remove(value, destroy) {
|
||||
imagery.splice(imagery.indexOf(value), 1);
|
||||
removed.push({ value, destroy });
|
||||
},
|
||||
},
|
||||
};
|
||||
const controller = new MapSourceController(viewer, {
|
||||
registry,
|
||||
createImageryLayer: (provider) => ({ provider }),
|
||||
onChange: (state) => changes.push(state),
|
||||
...options,
|
||||
});
|
||||
return { viewer, controller, imagery, credits, primitives, removed, changes };
|
||||
}
|
||||
const settle = async () => {
|
||||
for (let i = 0; i < 20; i++) await Promise.resolve();
|
||||
};
|
||||
const descriptor = (id) => ({ id, label: id, kind: 'imagery' });
|
||||
function publicFixture() {
|
||||
const tileset = { show: true };
|
||||
const registry = createDefaultMapSources({ googleTileset: tileset });
|
||||
const providers = new Map();
|
||||
for (const source of registry.sources) {
|
||||
if (!source.imagery) continue;
|
||||
const provider = { id: source.descriptor.id, errorEvent: event() };
|
||||
providers.set(source.descriptor.id, provider);
|
||||
source.imagery = async () => provider;
|
||||
source.terrain = {
|
||||
id: 'keyless',
|
||||
create: async () => ({ provider: { id: 'terrain' } }),
|
||||
};
|
||||
}
|
||||
return { ...fixture(registry), registry, providers, tileset };
|
||||
}
|
||||
|
||||
test('an additional imagery source needs no controller branch and owns its cached resources', async () => {
|
||||
let reads = 0,
|
||||
destroys = 0,
|
||||
terrainReads = 0;
|
||||
const provider = {
|
||||
destroy() {
|
||||
destroys++;
|
||||
},
|
||||
};
|
||||
const terrain = {
|
||||
id: 'custom-floor',
|
||||
create: async () => {
|
||||
terrainReads++;
|
||||
return { provider: { id: 'terrain' } };
|
||||
},
|
||||
};
|
||||
const registry = {
|
||||
defaultId: 'custom',
|
||||
sources: [
|
||||
{
|
||||
descriptor: descriptor('custom'),
|
||||
imagery: async () => {
|
||||
reads++;
|
||||
return provider;
|
||||
},
|
||||
terrain,
|
||||
},
|
||||
],
|
||||
};
|
||||
const env = fixture(registry);
|
||||
await env.controller.setStack('custom');
|
||||
await env.controller.setStack('custom');
|
||||
assert.equal(env.controller.getActiveId(), 'custom');
|
||||
assert.equal(env.viewer.terrainProvider.id, 'terrain');
|
||||
assert.equal(reads, 1);
|
||||
assert.equal(terrainReads, 1);
|
||||
assert.equal(env.imagery.length, 1);
|
||||
assert.equal(env.removed[0].destroy, true);
|
||||
env.controller.destroy();
|
||||
env.controller.destroy();
|
||||
await settle();
|
||||
assert.equal(env.imagery.length, 0);
|
||||
assert.equal(destroys, 1);
|
||||
});
|
||||
|
||||
test('a destroyed controller aborts creation and disposes a late provider without touching the scene', async () => {
|
||||
let resolve,
|
||||
signal,
|
||||
destroyed = 0;
|
||||
const env = fixture({
|
||||
defaultId: 'slow',
|
||||
sources: [
|
||||
{
|
||||
descriptor: descriptor('slow'),
|
||||
imagery: (request) => {
|
||||
signal = request.signal;
|
||||
return new Promise((done) => {
|
||||
resolve = done;
|
||||
});
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
const loading = env.controller.setStack('slow');
|
||||
await settle();
|
||||
env.controller.destroy();
|
||||
assert.equal(signal.aborted, true);
|
||||
resolve({
|
||||
destroy() {
|
||||
destroyed++;
|
||||
},
|
||||
});
|
||||
await loading;
|
||||
await settle();
|
||||
assert.equal(destroyed, 1);
|
||||
assert.equal(env.imagery.length, 0);
|
||||
assert.deepEqual(
|
||||
env.changes.map((state) => state.status),
|
||||
['switching'],
|
||||
);
|
||||
});
|
||||
|
||||
test('slow terrain cannot overwrite a newer source and a 3D view never starts unused terrain', async () => {
|
||||
const env = publicFixture();
|
||||
let resolve,
|
||||
reads = 0;
|
||||
const osm = env.registry.sources.find(
|
||||
(source) => source.descriptor.id === 'osm',
|
||||
);
|
||||
osm.terrain = {
|
||||
id: 'slow-floor',
|
||||
create: () => {
|
||||
reads++;
|
||||
return new Promise((done) => {
|
||||
resolve = done;
|
||||
});
|
||||
},
|
||||
};
|
||||
await env.controller.setStack('photoreal');
|
||||
assert.equal(reads, 0);
|
||||
const loading = env.controller.setStack('osm');
|
||||
await settle();
|
||||
await env.controller.setStack('photoreal');
|
||||
resolve({ provider: { id: 'late-terrain' } });
|
||||
await loading;
|
||||
assert.equal(env.viewer.terrainProvider, undefined);
|
||||
assert.equal(env.viewer.scene.globe.show, false);
|
||||
assert.equal(env.tileset.show, true);
|
||||
assert.equal(env.controller.getActiveId(), 'photoreal');
|
||||
env.controller.destroy();
|
||||
});
|
||||
|
||||
test('Esri construction fallback reports and attributes the source actually rendered', async () => {
|
||||
const env = publicFixture();
|
||||
env.registry.sources.find(
|
||||
(source) => source.descriptor.id === 'esri-imagery',
|
||||
).imagery = async () => {
|
||||
throw new Error('unreachable');
|
||||
};
|
||||
await env.controller.setStack('esri-imagery');
|
||||
assert.equal(env.controller.getActiveId(), 'osm');
|
||||
assert.equal(
|
||||
env.controller.getState().lastError,
|
||||
'Esri Satellite is unavailable; using OSM',
|
||||
);
|
||||
assert.equal(env.imagery[0].provider, env.providers.get('osm'));
|
||||
assert.equal(env.credits.size, 0);
|
||||
env.controller.destroy();
|
||||
});
|
||||
|
||||
test('one Esri tile failure stays put, two fall back, and stale errors cannot replace a selection', async () => {
|
||||
const env = publicFixture();
|
||||
await env.controller.setStack('esri-imagery');
|
||||
assert.equal(env.credits.size, 1);
|
||||
const errorEvent = env.providers.get('esri-imagery').errorEvent;
|
||||
errorEvent.raise();
|
||||
await settle();
|
||||
assert.equal(env.controller.getActiveId(), 'esri-imagery');
|
||||
errorEvent.raise();
|
||||
await settle();
|
||||
assert.equal(env.controller.getActiveId(), 'osm');
|
||||
assert.equal(env.credits.size, 0);
|
||||
assert.equal(
|
||||
env.controller.getState().lastError,
|
||||
'Esri Satellite tile requests failed; using OSM',
|
||||
);
|
||||
assert.equal(errorEvent.size, 0);
|
||||
await env.controller.setStack('photoreal');
|
||||
errorEvent.raise({ timesRetried: 9 });
|
||||
await settle();
|
||||
assert.equal(env.controller.getActiveId(), 'photoreal');
|
||||
env.controller.destroy();
|
||||
});
|
||||
|
||||
test('tooltips and rejected selection share the registry reason, including retired map IDs', async () => {
|
||||
const errors = [],
|
||||
env = publicFixture();
|
||||
env.controller._onError = (message) => errors.push(message);
|
||||
const reason = env.controller
|
||||
.getStacks()
|
||||
.find((stack) => stack.id === 'bing-aerial').unavailableReason;
|
||||
await env.controller.setStack('bing-aerial');
|
||||
assert.deepEqual(errors, [reason]);
|
||||
assert.match(reason, /CESIUM_ION_TOKEN/);
|
||||
await env.controller.setStack('bing-road');
|
||||
assert.equal(env.controller.getActiveId(), 'photoreal');
|
||||
env.controller.destroy();
|
||||
});
|
||||
|
||||
test('a factory-owned 3D tileset is released after late completion and supplied tilesets stay caller-owned', async () => {
|
||||
let resolve,
|
||||
destroyed = 0;
|
||||
const supplied = {
|
||||
show: true,
|
||||
destroy() {
|
||||
assert.fail('caller-owned tileset');
|
||||
},
|
||||
};
|
||||
const env = fixture({
|
||||
defaultId: 'three',
|
||||
sources: [
|
||||
{
|
||||
descriptor: { id: 'three' },
|
||||
createTileset: () =>
|
||||
new Promise((done) => {
|
||||
resolve = done;
|
||||
}),
|
||||
},
|
||||
{ descriptor: { id: 'supplied' }, tileset: supplied },
|
||||
],
|
||||
});
|
||||
const loading = env.controller.setStack('three');
|
||||
await settle();
|
||||
env.controller.destroy();
|
||||
resolve({
|
||||
destroy() {
|
||||
destroyed++;
|
||||
},
|
||||
});
|
||||
await loading;
|
||||
assert.equal(destroyed, 1);
|
||||
assert.equal(env.primitives.length, 0);
|
||||
});
|
||||
|
||||
test('invalid source graphs fail before constructing or caching a provider', () => {
|
||||
const a = { descriptor: descriptor('a'), constructionFallback: { id: 'b' } };
|
||||
const b = { descriptor: descriptor('b'), constructionFallback: { id: 'a' } };
|
||||
assert.throws(() => fixture({ sources: [a, b] }), /fallback cycle/);
|
||||
assert.throws(() => fixture({ sources: [a, a] }), /unique/);
|
||||
assert.throws(() => fixture({ sources: [a] }), /Unknown map fallback/);
|
||||
});
|
||||
Reference in new issue
Block a user