mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Merge main through #1495 into the renderer seam
Brings in radio country coverage (#1206), the restored format scope (#1527), the zoom-out guard (#1522), voice geometry and OSM places (#846) and paired traffic flow density (#1495). What main added that reached Cesium or the viewer now goes through the renderer: - The zoom-out guard reads the Cesium camera controller's own input, so it moves into the adapter (src/render/cesium/zoomOutGuard.js). The application installs it through the scene's viewer hooks, and a scene whose renderer gives no guard starts without one. - OSM places draws its points as a draw set, clamped to the ground. - The voice area actions read the view box and the view centre from the camera port. - The voice workflow harness is test support, named as such where the recent-imagery doubles are.
This commit is contained in:
commit
fd42fc0afd
136 files changed
+17399
-1120
No files matched your search
@@ -159,6 +159,8 @@ export function createNominatimOutlineClient({
|
||||
const outline = {
|
||||
polygons,
|
||||
name: body.outline.name || null,
|
||||
adminArea: body.outline.adminArea || null,
|
||||
adminLevel: body.outline.adminLevel || null,
|
||||
class: body.outline.class || null,
|
||||
type: body.outline.type || null,
|
||||
osm: body.outline.osm || null,
|
||||
|
||||
@@ -44,20 +44,29 @@ test('an accepted outline comes back with its polygons and is remembered', async
|
||||
reply(200, {
|
||||
status: 'OK',
|
||||
outline: {
|
||||
name: 'Paris',
|
||||
name: 'Bagmati Province',
|
||||
adminArea: 'Bagmati Province',
|
||||
adminLevel: 'admin1',
|
||||
class: 'boundary',
|
||||
type: 'administrative',
|
||||
polygons: [[ring, hole]],
|
||||
},
|
||||
}),
|
||||
);
|
||||
const ask = { query: 'Paris', kind: 'city', lat: 48.85, lon: 2.35 };
|
||||
const ask = {
|
||||
query: 'Bagmati Province',
|
||||
kind: 'admin',
|
||||
lat: 27.72,
|
||||
lon: 85.32,
|
||||
};
|
||||
const outline = await lookup(ask);
|
||||
assert.deepEqual(outline.polygons, [[ring, hole]]);
|
||||
assert.equal(outline.class, 'boundary');
|
||||
assert.equal(outline.adminArea, 'Bagmati Province');
|
||||
assert.equal(outline.adminLevel, 'admin1');
|
||||
assert.match(
|
||||
calls[0],
|
||||
/^\/api\/geocode\/outline\?q=Paris&kind=city&lat=48\.850&lon=2\.350$/,
|
||||
/^\/api\/geocode\/outline\?q=Bagmati\+Province&kind=admin&lat=27\.720&lon=85\.320$/,
|
||||
);
|
||||
await lookup(ask);
|
||||
assert.equal(calls.length, 1, 'one request per ask in a session');
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
/**
|
||||
* Browser client for `/api/osm/features`: one curated preset inside a box,
|
||||
* as a count or as features. The server writes and bounds the Overpass
|
||||
* query and answers only when an operator configured Overpass; this only
|
||||
* names the preset, box, mode and limit.
|
||||
* @module sources/osmFeatures
|
||||
*/
|
||||
|
||||
/**
|
||||
* @param {{fetchImpl?: typeof fetch, endpoint?: string}} [options]
|
||||
* @returns {(request: {preset: string, bbox: number[], mode?: 'count'|'features', limit?: number}, options?: {signal?: AbortSignal}) => Promise<object>}
|
||||
*/
|
||||
export function createOsmFeatureSource({
|
||||
fetchImpl = (...args) => globalThis.fetch(...args),
|
||||
endpoint = '/api/osm/features',
|
||||
} = {}) {
|
||||
return async function searchOsmFeatures(
|
||||
{ preset, bbox, mode = 'features', limit },
|
||||
{ signal } = {},
|
||||
) {
|
||||
const params = new URLSearchParams({
|
||||
preset,
|
||||
bbox: bbox.map((v) => Number(v).toFixed(5)).join(','),
|
||||
mode,
|
||||
});
|
||||
if (Number.isFinite(limit)) params.set('limit', String(limit));
|
||||
let response;
|
||||
try {
|
||||
response = await fetchImpl(`${endpoint}?${params}`, { signal });
|
||||
} catch (error) {
|
||||
if (signal?.aborted) throw error;
|
||||
return {
|
||||
ok: false,
|
||||
status: 0,
|
||||
error: 'OpenStreetMap search is unreachable.',
|
||||
};
|
||||
}
|
||||
let body = null;
|
||||
try {
|
||||
body = await response.json();
|
||||
} catch {
|
||||
body = null;
|
||||
}
|
||||
if (!response.ok)
|
||||
return {
|
||||
ok: false,
|
||||
status: response.status,
|
||||
code: body?.code || null,
|
||||
error:
|
||||
body?.error || `OpenStreetMap search failed (${response.status}).`,
|
||||
};
|
||||
// A garbled success (a proxy's error page) is a failure, not zero places.
|
||||
if (!body || typeof body !== 'object')
|
||||
return {
|
||||
ok: false,
|
||||
status: response.status,
|
||||
code: null,
|
||||
error: 'OpenStreetMap search returned an unreadable answer.',
|
||||
};
|
||||
return { ok: true, ...body };
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { createOsmFeatureSource } from './osmFeatures.js';
|
||||
|
||||
const respond = (status, body) => ({
|
||||
ok: status >= 200 && status < 300,
|
||||
status,
|
||||
json: async () => {
|
||||
if (typeof body === 'string') throw new SyntaxError('not JSON');
|
||||
return body;
|
||||
},
|
||||
});
|
||||
|
||||
test('the request names only the preset, box, mode and limit', async () => {
|
||||
let asked = null;
|
||||
const search = createOsmFeatureSource({
|
||||
fetchImpl: async (url) => {
|
||||
asked = new URL(url, 'http://localhost');
|
||||
return respond(200, { features: [], count: 0 });
|
||||
},
|
||||
});
|
||||
const result = await search({
|
||||
preset: 'hospital',
|
||||
bbox: [85.2, 27.6, 85.4, 27.8],
|
||||
limit: 50,
|
||||
});
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(asked.pathname, '/api/osm/features');
|
||||
assert.equal(asked.searchParams.get('preset'), 'hospital');
|
||||
assert.equal(
|
||||
asked.searchParams.get('bbox'),
|
||||
'85.20000,27.60000,85.40000,27.80000',
|
||||
);
|
||||
assert.equal(asked.searchParams.get('mode'), 'features');
|
||||
assert.equal(asked.searchParams.get('limit'), '50');
|
||||
});
|
||||
|
||||
test('an aborted search rethrows; a network failure is a refusal', async () => {
|
||||
const controller = new AbortController();
|
||||
const aborting = createOsmFeatureSource({
|
||||
fetchImpl: async () => {
|
||||
controller.abort();
|
||||
throw new DOMException('Aborted', 'AbortError');
|
||||
},
|
||||
});
|
||||
await assert.rejects(
|
||||
aborting(
|
||||
{ preset: 'hospital', bbox: [0, 0, 1, 1] },
|
||||
{ signal: controller.signal },
|
||||
),
|
||||
{ name: 'AbortError' },
|
||||
);
|
||||
const offline = createOsmFeatureSource({
|
||||
fetchImpl: async () => {
|
||||
throw new TypeError('fetch failed');
|
||||
},
|
||||
});
|
||||
const refused = await offline({ preset: 'hospital', bbox: [0, 0, 1, 1] });
|
||||
assert.deepEqual([refused.ok, refused.status], [false, 0]);
|
||||
});
|
||||
|
||||
test('server refusals keep their status and code', async () => {
|
||||
const notConfigured = createOsmFeatureSource({
|
||||
fetchImpl: async () =>
|
||||
respond(503, {
|
||||
error: 'Place search needs a configured Overpass server.',
|
||||
code: 'OVERPASS_NOT_CONFIGURED',
|
||||
}),
|
||||
});
|
||||
const refused = await notConfigured({
|
||||
preset: 'hospital',
|
||||
bbox: [0, 0, 1, 1],
|
||||
});
|
||||
assert.equal(refused.ok, false);
|
||||
assert.equal(refused.status, 503);
|
||||
assert.equal(refused.code, 'OVERPASS_NOT_CONFIGURED');
|
||||
const busy = createOsmFeatureSource({
|
||||
fetchImpl: async () => respond(429, '<html>Too Many Requests</html>'),
|
||||
});
|
||||
const limited = await busy({ preset: 'hospital', bbox: [0, 0, 1, 1] });
|
||||
assert.equal(limited.ok, false);
|
||||
assert.equal(limited.status, 429);
|
||||
assert.equal(limited.code, null);
|
||||
assert.match(limited.error, /429/);
|
||||
});
|
||||
|
||||
test('a success whose body is not JSON is a failure, not zero places', async () => {
|
||||
const garbled = createOsmFeatureSource({
|
||||
fetchImpl: async () => respond(200, '<html>proxy error</html>'),
|
||||
});
|
||||
const result = await garbled({ preset: 'hospital', bbox: [0, 0, 1, 1] });
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.status, 200);
|
||||
});
|
||||
Reference in new issue
Block a user