mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
fix(osm-places): a double-click follows a place again
The places were entities, which the default renderer's double-click followed; new results replaced them all, which ended the follow. As draw-port items they took no part in it.
This commit is contained in:
1 parent
fabf4439fe
commit
f2983e8c1a
2 files changed
+69
-1
No files matched your search
@@ -1,5 +1,7 @@
|
||||
import { fromDegrees } from '../../geo/ellipsoid.js';
|
||||
import { drawOf } from '../../render/rendererOf.js';
|
||||
import { drawOf, findInput } from '../../render/rendererOf.js';
|
||||
import { followOnDoubleClick } from '../../data/stockFollow.js';
|
||||
import { inputFor as defaultInputFor } from '../../input/dispatcher.js';
|
||||
import { msg } from '../../i18n/marker.js';
|
||||
import { OSM_PLACES_LAYER_ID } from './model.js';
|
||||
import { createNominatimStatus } from '../../sources/nominatimStatus.js';
|
||||
@@ -28,6 +30,7 @@ export function createOsmPlacesLayer({
|
||||
overlayHost,
|
||||
// The same once-per-page capability probe as Nominatim's, on Overpass.
|
||||
overpassConfigured = createNominatimStatus({ url: '/api/overpass/status' }),
|
||||
inputFor = defaultInputFor,
|
||||
} = {}) {
|
||||
if (!overlayHost) throw new TypeError('OSM Places requires an overlay host');
|
||||
let viewer = null;
|
||||
@@ -39,12 +42,17 @@ export function createOsmPlacesLayer({
|
||||
let lastUpdate = null;
|
||||
/** true / false from the server's probe, null while unknown. */
|
||||
let configured = null;
|
||||
/** Each drawn place's position, for a double-click to follow. */
|
||||
let placeAt = new Map();
|
||||
let stockFollow = null;
|
||||
|
||||
function render() {
|
||||
if (!points) return;
|
||||
const items = [];
|
||||
const nextAt = new Map();
|
||||
const overlay = [];
|
||||
for (const record of records) {
|
||||
nextAt.set(`osm-place:${record.id}`, fromDegrees(record.lon, record.lat));
|
||||
items.push({
|
||||
id: `osm-place:${record.id}`,
|
||||
pos: { lon: record.lon, lat: record.lat },
|
||||
@@ -77,6 +85,7 @@ export function createOsmPlacesLayer({
|
||||
});
|
||||
}
|
||||
points.set(items);
|
||||
placeAt = nextAt;
|
||||
if (enabled)
|
||||
overlayHost.setEntries(OVERLAY_SOURCE_ID, overlay, {
|
||||
cohortLimit: LABEL_LIMIT,
|
||||
@@ -116,6 +125,23 @@ export function createOsmPlacesLayer({
|
||||
show: false,
|
||||
});
|
||||
overlayHost.setVisible(OVERLAY_SOURCE_ID, false);
|
||||
// A double-click follows a place, as the default renderer followed
|
||||
// the places' entities (a scene that takes no input has none).
|
||||
stockFollow?.destroy();
|
||||
stockFollow =
|
||||
findInput(viewer) &&
|
||||
followOnDoubleClick({
|
||||
viewer,
|
||||
inputFor,
|
||||
name: OSM_PLACES_LAYER_ID,
|
||||
enabled: () => enabled,
|
||||
targetFor: (hit) => {
|
||||
const at = hit.set === points?.id && placeAt.get(hit.id);
|
||||
return at
|
||||
? { key: `${hit.set}:${hit.id}`, position: () => ({ ...at }) }
|
||||
: null;
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
enable() {
|
||||
@@ -128,6 +154,7 @@ export function createOsmPlacesLayer({
|
||||
|
||||
disable() {
|
||||
enabled = false;
|
||||
stockFollow?.stop();
|
||||
if (points) points.show = false;
|
||||
overlayHost.clearSource(OVERLAY_SOURCE_ID);
|
||||
overlayHost.setVisible(OVERLAY_SOURCE_ID, false);
|
||||
@@ -143,8 +170,11 @@ export function createOsmPlacesLayer({
|
||||
enabled = false;
|
||||
overlayHost.clearSource(OVERLAY_SOURCE_ID);
|
||||
overlayHost.setVisible(OVERLAY_SOURCE_ID, false);
|
||||
stockFollow?.destroy();
|
||||
stockFollow = null;
|
||||
points?.dispose();
|
||||
points = null;
|
||||
placeAt = new Map();
|
||||
viewer = null;
|
||||
records = [];
|
||||
meta = null;
|
||||
@@ -160,6 +190,8 @@ export function createOsmPlacesLayer({
|
||||
records = Array.isArray(next) ? next.slice() : [];
|
||||
meta = nextMeta ? { ...nextMeta } : null;
|
||||
lastUpdate = Date.now();
|
||||
// New results replace every place: one followed is gone with them.
|
||||
stockFollow?.stop();
|
||||
render();
|
||||
},
|
||||
|
||||
|
||||
@@ -150,3 +150,39 @@ test('places are depth-tested past close range, so they never show through the g
|
||||
`depth test off only within ${distance} m`,
|
||||
);
|
||||
});
|
||||
|
||||
test('a double-click follows a place until new results replace it, as its entity was', async (t) => {
|
||||
const { bindRenderer } = await import('../../render/rendererOf.js');
|
||||
const { createStubRenderer } = await import('../../render/stub/index.js');
|
||||
const renderer = createStubRenderer();
|
||||
const viewer = { isDestroyed: () => false };
|
||||
const unbind = bindRenderer(viewer, renderer);
|
||||
const layer = createOsmPlacesLayer({
|
||||
overlayHost: fakeOverlayHost(),
|
||||
overpassConfigured: async () => true,
|
||||
});
|
||||
t.after(() => {
|
||||
layer.destroy();
|
||||
unbind();
|
||||
renderer.destroy();
|
||||
});
|
||||
layer.init(viewer);
|
||||
layer.enable();
|
||||
layer.setResults(RECORDS, { kind: 'hospital', label: 'h', area: 'K' });
|
||||
const set = renderer.testing.sets().find((id) => id.endsWith(':points'));
|
||||
renderer.testing.scriptPicks(() => [
|
||||
{ set, id: 'osm-place:node/1', surface: false },
|
||||
]);
|
||||
renderer.testing.pointer('dblclick', 10, 10);
|
||||
const followed = renderer.camera.followed;
|
||||
assert.ok(followed, 'the place is followed');
|
||||
const p = followed.position(0);
|
||||
const lat = (Math.asin(p.z / Math.hypot(p.x, p.y, p.z)) * 180) / Math.PI;
|
||||
assert.ok(Math.abs(lat - 27.7) < 0.2, String(lat));
|
||||
layer.setResults(RECORDS.slice(1), {
|
||||
kind: 'hospital',
|
||||
label: 'h',
|
||||
area: 'K',
|
||||
});
|
||||
assert.equal(renderer.camera.followed, null, 'new results end it');
|
||||
});
|
||||
Reference in new issue
Block a user