mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-20 10:12:18 +00:00
feat(street-level): KartaView as a third, keyless imagery provider
Coverage lines from KartaView's z13-14 JSON tiles (OSM ways with photos, chained end to start), the photo nearest a clicked line, cones along its sequence, and a viewer for flat photos and 360° panoramas (a small WebGL equirectangular renderer, no new dependency) with ‹ › along the sequence. Mapillary's camera-driven line coverage and sequence cones move to the provider-neutral core (lineCoverage.js, sequenceCones.js) with the tile fetch, zoom ladder, colours and pick prefixes injected; Mapillary keeps thin wrappers and its tests pass unchanged. KartaView quirks handled: api.kartaview.org (the documented api.openstreetcam.org serves empty tiles), photo URLs that name storage1 for photos stored elsewhere, and a photo API that answers 429 to more than about three requests at once (two in flight, retried with backoff). Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
9beadbda63
commit
cb01014e36
33 files changed
+4046
-1196
No files matched your search
@@ -0,0 +1,231 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { createKartaViewProvider, kartaViewZoomFor } from './index.js';
|
||||
import { SEQUENCE_PAGE_SIZE } from './policy.js';
|
||||
import { validateProviders } from '../../registry.js';
|
||||
import { fakeHost } from '../../../../testSupport/kartaViewFakes.mjs';
|
||||
|
||||
/** A photo record `metres` east of (42.3314, -83.0458), in sequence `seq` at `index`. */
|
||||
function photoRecord(id, { metres = 0, seq = '14010', index = 0 } = {}) {
|
||||
const lon = -83.0458 + metres / 82_300;
|
||||
return {
|
||||
id: String(id),
|
||||
sequenceId: seq,
|
||||
sequenceIndex: String(index),
|
||||
lat: '42.3314',
|
||||
lng: String(lon),
|
||||
heading: '90',
|
||||
projection: 'PLANE',
|
||||
fieldOfView: '0',
|
||||
shotDate: '2016-08-23 20:17:47.000',
|
||||
storage: 'storage2',
|
||||
filepathLTh: `2016/8/24/lth/${id}.jpg`,
|
||||
filepathProc: `2016/8/24/proc/${id}.jpg`,
|
||||
};
|
||||
}
|
||||
|
||||
/** A source over `sequences` (id → indexes present), recording calls. */
|
||||
function fakeSource({ nearest = [], sequences = {} } = {}) {
|
||||
const calls = { nearest: 0, photo: [], pages: [] };
|
||||
return {
|
||||
calls,
|
||||
getTile: async () => ({ lines: [] }),
|
||||
nearestPhotos: async () => {
|
||||
calls.nearest++;
|
||||
return nearest;
|
||||
},
|
||||
getPhoto: async (id) => {
|
||||
calls.photo.push(id);
|
||||
for (const [seq, indexes] of Object.entries(sequences))
|
||||
for (const index of indexes)
|
||||
if (`${seq}-${index}` === id) return photoRecord(id, { seq, index });
|
||||
throw new Error('KartaView has no such photo');
|
||||
},
|
||||
getSequencePhotos: async (seq, { page, itemsPerPage }) => {
|
||||
calls.pages.push(`${seq}:${page}`);
|
||||
const indexes = sequences[seq] || [];
|
||||
const rows = indexes.slice(
|
||||
(page - 1) * itemsPerPage,
|
||||
page * itemsPerPage,
|
||||
);
|
||||
return {
|
||||
photos: rows.map((index) =>
|
||||
photoRecord(`${seq}-${index}`, { seq, index }),
|
||||
),
|
||||
hasMore: page * itemsPerPage < indexes.length,
|
||||
};
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function fakeContext() {
|
||||
const actions = { opened: [], nearest: [] };
|
||||
return {
|
||||
actions,
|
||||
context: {
|
||||
services: {},
|
||||
getFilter: () => ({ pano: 'all', sinceMs: null }),
|
||||
isActive: () => true,
|
||||
groundCaster: null,
|
||||
meshSampler: null,
|
||||
getSurface: () => 'draped',
|
||||
notify() {},
|
||||
actions: {
|
||||
openImage: (id) => actions.opened.push(id),
|
||||
openNearest: (point) => actions.nearest.push(point),
|
||||
reportError() {},
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function setup(sourceOptions) {
|
||||
const source = fakeSource(sourceOptions);
|
||||
const loads = [];
|
||||
const definition = createKartaViewProvider({
|
||||
source,
|
||||
viewerOptions: {
|
||||
load: async (url) => {
|
||||
loads.push(url);
|
||||
return { src: url };
|
||||
},
|
||||
createRenderer: () => {
|
||||
throw new Error('no WebGL in Node');
|
||||
},
|
||||
},
|
||||
});
|
||||
const { context, actions } = fakeContext();
|
||||
const instance = definition.create(context);
|
||||
return { definition, instance, source, actions, loads };
|
||||
}
|
||||
|
||||
const settle = () => new Promise((resolve) => setTimeout(resolve, 0));
|
||||
|
||||
test('KartaView registers keyless, off by default, with no filters and its own wording', () => {
|
||||
const { definition } = setup();
|
||||
assert.equal(definition.id, 'kartaview');
|
||||
assert.equal(definition.requiresKeyId, null);
|
||||
assert.equal(definition.defaultOn, false);
|
||||
assert.deepEqual(definition.filters, []);
|
||||
assert.match(
|
||||
definition.credit.html,
|
||||
/KartaView<\/a> contributors, CC BY-SA 4\.0/,
|
||||
);
|
||||
assert.equal(definition.colors.coverage, '#635bff');
|
||||
assert.deepEqual(definition.coverageLabel, {
|
||||
noun: 'streets',
|
||||
action: 'click a line for its nearest photo',
|
||||
});
|
||||
// Its prefix fits beside the others.
|
||||
validateProviders([
|
||||
{ ...definition, id: 'mapillary', pickPrefix: 'mly:' },
|
||||
{ ...definition, id: 'google', pickPrefix: 'gsv:' },
|
||||
definition,
|
||||
]);
|
||||
});
|
||||
|
||||
test('coverage is drawn from z14 near the street and z13 a little higher; never from orbit', () => {
|
||||
assert.deepEqual(kartaViewZoomFor(300), { zoom: 14, kind: 'sequence' });
|
||||
assert.deepEqual(kartaViewZoomFor(2_500), { zoom: 14, kind: 'sequence' });
|
||||
assert.deepEqual(kartaViewZoomFor(4_000), { zoom: 13, kind: 'sequence' });
|
||||
assert.equal(kartaViewZoomFor(6_001), null);
|
||||
assert.equal(kartaViewZoomFor(NaN), null);
|
||||
});
|
||||
|
||||
test('the nearest photo is the closest within 50 m, and opening it asks nothing more', async () => {
|
||||
const { instance, source, loads } = setup({
|
||||
nearest: [
|
||||
photoRecord('far', { metres: 80 }),
|
||||
photoRecord('mid', { metres: 30 }),
|
||||
photoRecord('near', { metres: 12 }),
|
||||
],
|
||||
});
|
||||
const id = await instance.nearestImage({ lat: 42.3314, lon: -83.0458 });
|
||||
assert.equal(id, 'near');
|
||||
const host = fakeHost();
|
||||
await instance.viewer.mount(host);
|
||||
await instance.viewer.open(id);
|
||||
assert.deepEqual(source.calls.photo, [], 'the lookup filled the cache');
|
||||
assert.equal(
|
||||
loads[0],
|
||||
'https://storage2.openstreetcam.org/files/photo/2016/8/24/lth/near.jpg',
|
||||
);
|
||||
const none = setup({ nearest: [photoRecord('far', { metres: 80 })] });
|
||||
assert.equal(
|
||||
await none.instance.nearestImage({ lat: 42.3314, lon: -83.0458 }),
|
||||
null,
|
||||
);
|
||||
});
|
||||
|
||||
test('a cone opens its photo; a line opens the photo nearest the click', () => {
|
||||
const { instance, actions } = setup();
|
||||
assert.equal(instance.handlePick('kv:img:123'), true);
|
||||
assert.deepEqual(actions.opened, ['123']);
|
||||
const point = { lon: -83.0458, lat: 42.3314 };
|
||||
assert.equal(
|
||||
instance.handlePick('kv:line:14/1/2/3', { groundPoint: () => point }),
|
||||
true,
|
||||
);
|
||||
assert.deepEqual(actions.nearest, [point]);
|
||||
// Over the sky the line is still ours, but there is nowhere to look.
|
||||
assert.equal(
|
||||
instance.handlePick('kv:line:14/1/2/3', { groundPoint: () => null }),
|
||||
true,
|
||||
);
|
||||
assert.equal(actions.nearest.length, 1);
|
||||
assert.equal(instance.handlePick('mly:seq:1'), false);
|
||||
});
|
||||
|
||||
test('coverage stats report KartaView as configured and key-free', async () => {
|
||||
const { instance } = setup();
|
||||
assert.deepEqual(await instance.status(), { configured: true });
|
||||
const stats = instance.coverageStats();
|
||||
assert.equal(stats.keyRequired, false);
|
||||
assert.equal(stats.keyRejected, false);
|
||||
assert.equal(stats.count, 0);
|
||||
});
|
||||
|
||||
test('› walks across sequence pages; ‹ walks back; the ends stop', async () => {
|
||||
const size = SEQUENCE_PAGE_SIZE;
|
||||
const indexes = Array.from({ length: size + 5 }, (_, i) => i);
|
||||
const { instance, source } = setup({ sequences: { s: indexes } });
|
||||
const host = fakeHost();
|
||||
await instance.viewer.mount(host);
|
||||
const poses = [];
|
||||
instance.viewer.onPose((pose) => poses.push(pose.imageId));
|
||||
const [, , prev, next] = host.children[0].children;
|
||||
const press = async (button) => {
|
||||
button.fire('click');
|
||||
for (let i = 0; i < 6; i++) await settle();
|
||||
};
|
||||
await instance.viewer.open(`s-${size - 1}`);
|
||||
await press(next);
|
||||
assert.equal(poses.at(-1), `s-${size}`, 'onto the second page');
|
||||
assert.deepEqual(source.calls.pages, ['s:1', 's:2']);
|
||||
await press(prev);
|
||||
assert.equal(poses.at(-1), `s-${size - 1}`);
|
||||
await instance.viewer.open('s-0');
|
||||
await press(prev);
|
||||
assert.equal(poses.at(-1), 's-0', 'nothing before the first photo');
|
||||
assert.equal(prev.disabled, true);
|
||||
});
|
||||
|
||||
test('a page with missing photos is found by stepping back a page', async () => {
|
||||
const size = SEQUENCE_PAGE_SIZE;
|
||||
// Index `size + 100` sits on page 1 when 200 earlier photos are gone.
|
||||
const indexes = Array.from({ length: size + 300 }, (_, i) => i).filter(
|
||||
(i) => i < 100 || i >= 300,
|
||||
);
|
||||
const { instance, source } = setup({ sequences: { s: indexes } });
|
||||
const host = fakeHost();
|
||||
await instance.viewer.mount(host);
|
||||
const poses = [];
|
||||
instance.viewer.onPose((pose) => poses.push(pose.imageId));
|
||||
const target = size + 100;
|
||||
await instance.viewer.open(`s-${target}`);
|
||||
const [, , , next] = host.children[0].children;
|
||||
next.fire('click');
|
||||
for (let i = 0; i < 8; i++) await settle();
|
||||
assert.equal(poses.at(-1), `s-${target + 1}`);
|
||||
assert.deepEqual(source.calls.pages.slice(0, 2), ['s:2', 's:1']);
|
||||
});
|
||||
Reference in new issue
Block a user