mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Every layer and tool bound its own ScreenSpaceEventHandler and picked the same click again: with the usual layers on, one click ran about 26 scene.pick and 2 drillPick passes (120-215 ms in NYC with 18 layers). Pointer input now comes in through src/input/dispatcher.js, one handler per scene. A click is picked lazily and at most once per kind of query, and every subscriber reads the same ClickEvent (pick, hit, id, ownerId, gesture, drill, ground). The same click now costs 3 picks and 2 drills, 17-70 ms. - Ambient onClick subscribers run only while no tool holds the pointer, checked once per event; tools subscribe with their lease. Moves and releases always reach ambient subscribers, so hover and drags end cleanly. - Camera input and the viewer's stock select/track clicks are ref-counted holds (suspendCamera, suppressStockClicks). The dispatcher owns the controller's enableInputs, so a Cesium flight that ends no longer turns input back on under a drag or the cockpit. - The draw tool, imagery box, CCTV gizmo, cockpit, directions and every selecting layer use it; bindTrackingClickGesture is gone (the gesture is on the event). A source scan forbids new handlers, enableInputs writes and stock-click removal outside the dispatcher. - The sensor-style pick correction transit had now applies to every layer. - Radio's 8-pick near-miss ring is one 17x17 windowed drill. - A missed pick passed to pickContact is no longer picked again, and a touch tap's contact search shares the click's drill. - A gizmo drag whose release Cesium never reported ends on the next press instead of leaving the camera held. The dispatcher is exported as ./input with the pointer-lease functions, and documented in docs/APPLICATION.md.
179 lines
7.1 KiB
JavaScript
179 lines
7.1 KiB
JavaScript
import test from 'node:test';
|
|
import assert from 'node:assert/strict';
|
|
import * as Cesium from 'cesium';
|
|
import { localGeoJsonServices } from '../app/localGeojsonServices.js';
|
|
import { createLocalGeoJsonLayer as createLayer } from './localGeojsonCore.js';
|
|
import { getContextStore } from './contextStore.js';
|
|
|
|
/** The catalog's services, with the overlay host each test supplies. */
|
|
const createLocalGeoJsonLayer = (options) =>
|
|
createLayer(options, {
|
|
...localGeoJsonServices,
|
|
overlayHost: options.overlayHost,
|
|
});
|
|
|
|
const dataset = JSON.stringify({
|
|
type: 'Feature', id: 'dam', properties: { name: 'Test dam' },
|
|
geometry: { type: 'Polygon', coordinates: [[[0, 0], [0.01, 0], [0, 0.01], [0, 0]]] },
|
|
});
|
|
const response = () => ({ ok: true, text: async () => dataset });
|
|
const deferred = () => {
|
|
let resolve;
|
|
const promise = new Promise(done => { resolve = done; });
|
|
return { promise, resolve };
|
|
};
|
|
|
|
function harness(t) {
|
|
const previousWindow = globalThis.window;
|
|
globalThis.window = { dispatchEvent() {} };
|
|
t.after(() => {
|
|
layer.destroy(viewer);
|
|
if (previousWindow === undefined) delete globalThis.window;
|
|
else globalThis.window = previousWindow;
|
|
});
|
|
const sources = new Set();
|
|
const listeners = new Set();
|
|
const event = { addEventListener(fn) { listeners.add(fn); return () => listeners.delete(fn); } };
|
|
let handlers = 0;
|
|
const viewer = {
|
|
dataSources: {
|
|
async add(source) { sources.add(source); return source; },
|
|
remove(source) { return sources.delete(source); },
|
|
},
|
|
scene: { canvas: {}, preRender: event, requestRender() {} },
|
|
camera: { moveEnd: event },
|
|
};
|
|
const create = () => createLocalGeoJsonLayer({
|
|
id: 'local-dams', name: 'Dams', color: '#0088ff', url: '/dams.geojsonl',
|
|
overlayHost: { setVisible() {}, setEntries() {}, clearSource() {} },
|
|
inputFor: () => ({
|
|
onClick() {
|
|
handlers++;
|
|
return () => { handlers--; };
|
|
},
|
|
suspendCamera: () => () => {},
|
|
}),
|
|
});
|
|
const layer = create();
|
|
return { layer, create, viewer, sources, listeners, handlers: () => handlers };
|
|
}
|
|
|
|
test('destroy removes context records and permits a fresh replacement', async t => {
|
|
const env = harness(t);
|
|
t.mock.method(globalThis, 'fetch', async () => response());
|
|
await env.layer.enable(env.viewer);
|
|
const oldEntity = [...getContextStore().entities.values()][0].entity;
|
|
assert.equal(getContextStore().entities.size, 1);
|
|
env.layer.disable(env.viewer);
|
|
assert.equal(getContextStore().entities.size, 0, 'disable releases its records with the source');
|
|
assert.equal(env.sources.size, 0, 'disable removes the built source from the scene');
|
|
env.layer.destroy(env.viewer);
|
|
assert.equal(getContextStore().entities.size, 0);
|
|
assert.equal(env.sources.size, 0);
|
|
assert.equal(env.listeners.size, 0);
|
|
assert.equal(env.handlers(), 0);
|
|
const replacement = env.create();
|
|
await replacement.enable(env.viewer);
|
|
assert.equal(getContextStore().entities.size, 1);
|
|
assert.notEqual([...getContextStore().entities.values()][0].entity, oldEntity);
|
|
replacement.destroy(env.viewer);
|
|
await env.layer.enable(env.viewer);
|
|
assert.equal(getContextStore().entities.size, 0);
|
|
});
|
|
|
|
for (const phase of ['fetch', 'text', 'parse', 'add']) {
|
|
test(`destroy during ${phase} leaves no late objects or context records`, async t => {
|
|
const env = harness(t);
|
|
const entered = deferred();
|
|
const release = deferred();
|
|
const pause = async value => { entered.resolve(); await release.promise; return value; };
|
|
let signal;
|
|
t.mock.method(globalThis, 'fetch', async (_url, options) => {
|
|
signal = options.signal;
|
|
if (phase === 'fetch') return pause(response());
|
|
if (phase === 'text') return { ok: true, text: () => pause(dataset) };
|
|
return response();
|
|
});
|
|
if (phase === 'parse') {
|
|
const load = Cesium.GeoJsonDataSource.load;
|
|
t.mock.method(Cesium.GeoJsonDataSource, 'load', async (...args) => pause(await load(...args)));
|
|
}
|
|
if (phase === 'add') {
|
|
t.mock.method(env.viewer.dataSources, 'add', async source => {
|
|
await pause();
|
|
env.sources.add(source);
|
|
return source;
|
|
});
|
|
}
|
|
const loading = env.layer.enable(env.viewer);
|
|
await entered.promise;
|
|
env.layer.destroy(env.viewer);
|
|
assert.equal(signal.aborted, true);
|
|
release.resolve();
|
|
await loading;
|
|
assert.equal(env.sources.size, 0);
|
|
assert.equal(env.listeners.size, 0);
|
|
assert.equal(env.handlers(), 0);
|
|
assert.equal(getContextStore().entities.size, 0);
|
|
assert.deepEqual(env.layer.getStats(), { count: 0, lastUpdate: null, error: null });
|
|
});
|
|
}
|
|
|
|
test('concurrent enable and disable/re-enable share one pending dataset load', async t => {
|
|
const env = harness(t);
|
|
const release = deferred();
|
|
const fetchMock = t.mock.method(globalThis, 'fetch', async () => {
|
|
await release.promise;
|
|
return response();
|
|
});
|
|
const first = env.layer.enable(env.viewer);
|
|
env.layer.disable(env.viewer);
|
|
const second = env.layer.enable(env.viewer);
|
|
release.resolve();
|
|
await Promise.all([first, second]);
|
|
assert.equal(fetchMock.mock.callCount(), 1);
|
|
assert.equal(env.sources.size, 1);
|
|
assert.equal(env.handlers(), 1);
|
|
assert.equal(env.listeners.size, 2);
|
|
assert.equal([...env.sources][0].show, true);
|
|
});
|
|
|
|
test('disable during loading releases the completed source; re-enable rebuilds without refetching', async t => {
|
|
const env = harness(t);
|
|
const release = deferred();
|
|
const fetchMock = t.mock.method(globalThis, 'fetch', async () => { await release.promise; return response(); });
|
|
const loading = env.layer.enable(env.viewer);
|
|
env.layer.disable(env.viewer);
|
|
release.resolve();
|
|
await loading;
|
|
assert.equal(env.sources.size, 0, 'a build that finishes after disable() is released, not parked hidden');
|
|
assert.equal(env.listeners.size, 0);
|
|
assert.equal(getContextStore().entities.size, 0);
|
|
await env.layer.enable(env.viewer);
|
|
assert.equal(env.sources.size, 1);
|
|
assert.equal([...env.sources][0].show, true);
|
|
assert.equal(fetchMock.mock.callCount(), 1, 'the parsed dataset is cached across the toggle');
|
|
});
|
|
|
|
test('a toggle-off frees the entities and a toggle-on rebuilds them from the cached dataset', async t => {
|
|
const env = harness(t);
|
|
const fetchMock = t.mock.method(globalThis, 'fetch', async () => response());
|
|
await env.layer.enable(env.viewer);
|
|
const first = [...env.sources][0];
|
|
assert.equal(first.entities.values.length, 1);
|
|
assert.equal(getContextStore().entities.size, 1);
|
|
env.layer.disable(env.viewer);
|
|
assert.equal(env.sources.size, 0, 'no data source stays registered while the layer is off');
|
|
assert.equal(getContextStore().entities.size, 0);
|
|
assert.equal(env.layer.getLodDiagnostics().total, 0);
|
|
assert.equal(env.layer.getStats().count, 1, 'the row keeps reporting the dataset size');
|
|
await env.layer.enable(env.viewer);
|
|
const second = [...env.sources][0];
|
|
assert.notEqual(second, first, 're-enable builds a fresh source');
|
|
assert.equal(second.show, true);
|
|
assert.equal(second.entities.values.length, 1);
|
|
assert.equal(getContextStore().entities.size, 1);
|
|
assert.equal(fetchMock.mock.callCount(), 1, 'no second fetch for a bundled dataset');
|
|
assert.equal(env.layer.getLodDiagnostics().total, 1);
|
|
});
|