mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 01:32:19 +00:00
Merge main into german/i18n-plurals-context
The catalogs conflicted only on neighbouring lines: no key changed on both sides, so they are merged key by key in main's order. Main removed the rail timeline, the other user of plain "Latest", so that entry is pruned and the News test no longer checks the timeline's wording.
This commit is contained in:
commit
49409ba8f1
1502 files changed
+180715
-47887
No files matched your search
@@ -1,8 +1,8 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import * as Cesium from 'cesium';
|
||||
import { setLocale } from '../../i18n/index.js';
|
||||
import { createGhostMapsLayer } from './index.js';
|
||||
import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
|
||||
import { GHOSTMAPS_PRODUCTS, GHOSTMAPS_LATEST_DROP } from './catalog.js';
|
||||
|
||||
function element(localName, children = [], value = '', attributes = {}) {
|
||||
@@ -119,18 +119,48 @@ function fixture(
|
||||
});
|
||||
t.mock.method(URL, 'revokeObjectURL', (url) => revoked.push(url));
|
||||
t.mock.method(console, 'warn', () => {});
|
||||
const mounted = new Set();
|
||||
const viewer = {
|
||||
scene: { requestRender() {} },
|
||||
dataSources: {
|
||||
async add(dataSource) {
|
||||
mounted.add(dataSource);
|
||||
return dataSource;
|
||||
},
|
||||
remove(dataSource) {
|
||||
return mounted.delete(dataSource);
|
||||
const viewer = {};
|
||||
// An input port and a query port: a click picks what `click(id)` names.
|
||||
const listeners = new Set();
|
||||
let picked = null;
|
||||
const { draw, unbind } = bindFakeDraw(viewer, {
|
||||
input: {
|
||||
on(type, cb) {
|
||||
if (type !== 'click') return () => {};
|
||||
listeners.add(cb);
|
||||
return () => listeners.delete(cb);
|
||||
},
|
||||
},
|
||||
query: { pick: () => picked },
|
||||
});
|
||||
t.after(unbind);
|
||||
// Every live item, by id, with the id of the set drawing it.
|
||||
const items = () =>
|
||||
new Map(
|
||||
[...draw.sets.values()]
|
||||
.filter((set) => !set.disposed)
|
||||
.flatMap((set) => [...set.items.keys()].map((id) => [id, set.spec.id])),
|
||||
);
|
||||
const liveSets = () => [...draw.sets.values()].filter((set) => !set.disposed);
|
||||
const click = (id) => {
|
||||
const set = items().get(id);
|
||||
picked = set ? { set, id } : null;
|
||||
for (const cb of [...listeners])
|
||||
cb({
|
||||
position: { x: 0, y: 0 },
|
||||
button: 0,
|
||||
modifiers: { shift: false, ctrl: false, alt: false },
|
||||
});
|
||||
};
|
||||
// The editions drawn: each draws in sets of its own.
|
||||
const mounted = {
|
||||
get size() {
|
||||
return new Set(
|
||||
[...draw.sets.values()]
|
||||
.filter((set) => !set.disposed)
|
||||
.map((set) => set.spec.id.split(':').slice(0, 3).join(':')),
|
||||
).size;
|
||||
},
|
||||
};
|
||||
const layer = createGhostMapsLayer({
|
||||
storage: null,
|
||||
@@ -151,7 +181,18 @@ function fixture(
|
||||
layer.init(viewer);
|
||||
layer.enable();
|
||||
t.after(() => layer.destroy());
|
||||
return { layer, viewer, mounted, created, revoked };
|
||||
return {
|
||||
layer,
|
||||
viewer,
|
||||
draw,
|
||||
unbind,
|
||||
mounted,
|
||||
created,
|
||||
revoked,
|
||||
items,
|
||||
liveSets,
|
||||
click,
|
||||
};
|
||||
}
|
||||
|
||||
test('cancelling a file read does not allocate packed-image URLs', async (t) => {
|
||||
@@ -174,9 +215,9 @@ test('cancellation during parsing releases every packed-image URL', async (t) =>
|
||||
assert.equal(mounted.size, 0);
|
||||
});
|
||||
|
||||
test('entity construction failure releases parsed image URLs', async (t) => {
|
||||
const { layer, viewer, mounted, created, revoked } = fixture(t);
|
||||
t.mock.method(Cesium.EntityCollection.prototype, 'add', () => {
|
||||
test('a draw failure releases parsed image URLs', async (t) => {
|
||||
const { layer, viewer, draw, mounted, created, revoked } = fixture(t);
|
||||
t.mock.method(draw, 'icons', () => {
|
||||
throw new Error('fixture entity failure');
|
||||
});
|
||||
await layer.update(viewer);
|
||||
@@ -186,13 +227,34 @@ test('entity construction failure releases parsed image URLs', async (t) => {
|
||||
assert.equal(layer.getStats().error, 'fixture entity failure');
|
||||
});
|
||||
|
||||
test('a viewer with no renderer bound releases parsed image URLs', async (t) => {
|
||||
const { layer, viewer, unbind, mounted, created, revoked } = fixture(t);
|
||||
unbind();
|
||||
await layer.update(viewer);
|
||||
assert.equal(created.length, 1);
|
||||
assert.deepEqual(revoked, created);
|
||||
assert.equal(mounted.size, 0);
|
||||
assert.ok(layer.getStats().error);
|
||||
});
|
||||
|
||||
test('successful load keeps icons until the product is disabled', async (t) => {
|
||||
const { layer, viewer, mounted, created, revoked } = fixture(t);
|
||||
const { layer, viewer, draw, mounted, created, revoked } = fixture(t);
|
||||
await layer.update(viewer);
|
||||
assert.equal(created.length, 1);
|
||||
assert.equal(revoked.length, 0);
|
||||
assert.equal(mounted.size, 1);
|
||||
assert.equal(layer.getStats().count, 1);
|
||||
const pins = [...draw.sets.values()].find(
|
||||
(set) => !set.disposed && set.kind === 'icons',
|
||||
);
|
||||
const [pin] = pins.items.values();
|
||||
assert.equal(pin.id, 'ghostmaps:cip:0:0');
|
||||
assert.equal(pin.image, 'blob:local-0');
|
||||
assert.equal(pin.height, 'clampGround');
|
||||
assert.equal(pins.spec.clampTo, 'both');
|
||||
assert.equal(pin.disableDepthTest, Infinity);
|
||||
assert.equal(pin.scale, 0.7);
|
||||
assert.deepEqual(pin.size, [20, 20], 'unread in Node: the marker size');
|
||||
layer.disable();
|
||||
assert.deepEqual(revoked, created);
|
||||
assert.equal(mounted.size, 0);
|
||||
@@ -393,7 +455,7 @@ test('age filtering and All markers apply to every conflict-map product, includi
|
||||
});
|
||||
|
||||
test('default products filter old event dates while keeping recent, future and undated markers', async (t) => {
|
||||
const { layer, viewer, mounted } = fixture(t, {
|
||||
const { layer, viewer, items } = fixture(t, {
|
||||
now: () => Date.UTC(2026, 10, 3, 12),
|
||||
reports: [
|
||||
dated('Old event', '10/20/2026'),
|
||||
@@ -427,21 +489,17 @@ test('default products filter old event dates while keeping recent, future and u
|
||||
],
|
||||
);
|
||||
assert.equal(layer.getStats().count, 7);
|
||||
assert.equal([...mounted][0].entities.values.length, 7);
|
||||
assert.equal(items().size, 7);
|
||||
// Filtering cannot shift pick ids onto a different report.
|
||||
assert.ok([...mounted][0].entities.getById('ghostmaps:cip:1:0'));
|
||||
assert.equal(
|
||||
[...mounted][0].entities.getById('ghostmaps:cip:0:0'),
|
||||
undefined,
|
||||
);
|
||||
assert.ok(items().has('ghostmaps:cip:1:0'));
|
||||
assert.equal(items().has('ghostmaps:cip:0:0'), false);
|
||||
});
|
||||
|
||||
test('unchanged cached products age out on the timer, clear selected cards and keep surviving picks', async (t) => {
|
||||
t.mock.timers.enable({ apis: ['setInterval'] });
|
||||
let at = Date.UTC(2026, 10, 3, 12);
|
||||
let click;
|
||||
const cards = [];
|
||||
const { layer, viewer, mounted } = fixture(t, {
|
||||
const { layer, viewer, mounted, items, liveSets, click } = fixture(t, {
|
||||
now: () => at,
|
||||
reports: [
|
||||
dated('Expiring', '10/27/2026 12:00:00 PM'),
|
||||
@@ -449,31 +507,23 @@ test('unchanged cached products age out on the timer, clear selected cards and k
|
||||
],
|
||||
controls: {
|
||||
overlayHost: { setEntries: (_id, entries) => cards.push(entries) },
|
||||
screenSpaceEventHandlerFactory: () => ({
|
||||
setInputAction: (fn) => {
|
||||
click = fn;
|
||||
},
|
||||
destroy() {},
|
||||
}),
|
||||
picking: { resolvePickId: (picked) => picked },
|
||||
},
|
||||
});
|
||||
await layer.update(viewer);
|
||||
const ds = [...mounted][0];
|
||||
viewer.scene.pick = () => 'ghostmaps:cip:0:0';
|
||||
click({ position: { x: 0, y: 0 } });
|
||||
const sets = liveSets();
|
||||
click('ghostmaps:cip:0:0');
|
||||
assert.equal(cards.at(-1).length, 1);
|
||||
at += 60_000;
|
||||
t.mock.timers.tick(60_000);
|
||||
assert.equal(layer.getStats().count, 1);
|
||||
assert.equal(ds.entities.values.length, 1);
|
||||
assert.equal(ds.entities.getById('ghostmaps:cip:0:0'), undefined);
|
||||
assert.ok(ds.entities.getById('ghostmaps:cip:1:0'));
|
||||
assert.equal(items().size, 1);
|
||||
assert.equal(items().has('ghostmaps:cip:0:0'), false);
|
||||
assert.ok(items().has('ghostmaps:cip:1:0'));
|
||||
assert.deepEqual(cards.at(-1), []);
|
||||
await layer.update(viewer);
|
||||
assert.equal([...mounted][0], ds, 'same-version KMZ is not reloaded');
|
||||
viewer.scene.pick = () => 'ghostmaps:cip:1:0';
|
||||
click({ position: { x: 0, y: 0 } });
|
||||
assert.deepEqual(liveSets(), sets, 'same-version KMZ is not reloaded');
|
||||
click('ghostmaps:cip:1:0');
|
||||
assert.match(cards.at(-1)[0].title, /Surviving/);
|
||||
layer.disable();
|
||||
at += 14 * 86400_000;
|
||||
@@ -495,7 +545,7 @@ test('expiry removes every geometry and polygon outline belonging to an old repo
|
||||
]),
|
||||
]),
|
||||
]);
|
||||
const { layer, viewer, mounted } = fixture(t, {
|
||||
const { layer, viewer, items } = fixture(t, {
|
||||
now: () => at,
|
||||
reports: [
|
||||
{
|
||||
@@ -509,11 +559,10 @@ test('expiry removes every geometry and polygon outline belonging to an old repo
|
||||
],
|
||||
});
|
||||
await layer.update(viewer);
|
||||
const ds = [...mounted][0];
|
||||
assert.equal(ds.entities.values.length, 4);
|
||||
assert.equal(items().size, 4);
|
||||
at += 60_000;
|
||||
t.mock.timers.tick(60_000);
|
||||
assert.equal(ds.entities.values.length, 0);
|
||||
assert.equal(items().size, 0);
|
||||
assert.equal(layer.getStats().count, 0);
|
||||
});
|
||||
|
||||
@@ -548,27 +597,19 @@ test('two quick clicks, 1d then 7d, restore the report', async (t) => {
|
||||
});
|
||||
|
||||
test('narrowing the window keeps the open card of a surviving marker', async (t) => {
|
||||
let click;
|
||||
const cards = [];
|
||||
const { layer, viewer } = fixture(t, {
|
||||
const { layer, viewer, click } = fixture(t, {
|
||||
now: () => Date.UTC(2026, 10, 3, 12),
|
||||
reports: [dated('Recent', '11/2/2026'), dated('Older', '10/20/2026')],
|
||||
controls: {
|
||||
overlayHost: { setEntries: (_id, entries) => cards.push(entries) },
|
||||
screenSpaceEventHandlerFactory: () => ({
|
||||
setInputAction: (fn) => {
|
||||
click = fn;
|
||||
},
|
||||
destroy() {},
|
||||
}),
|
||||
picking: { resolvePickId: (picked) => picked },
|
||||
},
|
||||
});
|
||||
await layer.update(viewer);
|
||||
await ageChip(layer, 30).onClick();
|
||||
assert.equal(layer.getStats().count, 2);
|
||||
viewer.scene.pick = () => 'ghostmaps:cip:0:0';
|
||||
click({ position: { x: 0, y: 0 } });
|
||||
click('ghostmaps:cip:0:0');
|
||||
assert.equal(cards.at(-1).length, 1);
|
||||
await ageChip(layer, 3).onClick();
|
||||
assert.equal(layer.getStats().count, 1);
|
||||
@@ -590,26 +631,18 @@ test('a report dated yesterday is shown by 1d one hour into today (UTC)', async
|
||||
});
|
||||
|
||||
test('a widened reload that returns a different report at the selected index closes its card', async (t) => {
|
||||
let click;
|
||||
const cards = [];
|
||||
const reports = [dated('Recent', '11/2/2026'), dated('Older', '10/20/2026')];
|
||||
const { layer, viewer } = fixture(t, {
|
||||
const { layer, viewer, click } = fixture(t, {
|
||||
now: () => Date.UTC(2026, 10, 3, 12),
|
||||
reports,
|
||||
controls: {
|
||||
overlayHost: { setEntries: (_id, entries) => cards.push(entries) },
|
||||
screenSpaceEventHandlerFactory: () => ({
|
||||
setInputAction: (fn) => {
|
||||
click = fn;
|
||||
},
|
||||
destroy() {},
|
||||
}),
|
||||
picking: { resolvePickId: (picked) => picked },
|
||||
},
|
||||
});
|
||||
await layer.update(viewer);
|
||||
viewer.scene.pick = () => 'ghostmaps:cip:0:0';
|
||||
click({ position: { x: 0, y: 0 } });
|
||||
click('ghostmaps:cip:0:0');
|
||||
assert.equal(cards.at(-1).length, 1);
|
||||
// The server answers the pinned version with a newer edition's bytes.
|
||||
reports[0] = dated('Replacement', '11/2/2026');
|
||||
|
||||
Reference in new issue
Block a user