fix(ghostmaps): a double-click follows a pin or zooms to a line or area again

Each edition was drawn as entities, which the default renderer's
double-click followed (a pin) or zoomed to (a line or polygon); an expired
report or a replaced edition took the follow with it. drawnItemTarget reads
that rule off a draw item, for every layer that drew entities before.
This commit is contained in:
Sameh Khamis committed 2026-11-14 01:15:29 -08:00
1 parent 766cf68272
commit 26e8e26ba8
4 files changed
+202 -6

No files matched your search

+58 -3
View File
@@ -16,7 +16,11 @@ import {
import { createHorizonCull } from '../streetLevel/view.js';
import { fromDegrees } from '../../geo/ellipsoid.js';
import { hexColor } from '../../render/color.js';
import { drawOf, findFrame } from '../../render/rendererOf.js';
import { drawOf, findFrame, findInput } from '../../render/rendererOf.js';
import {
drawnItemTarget,
followOnDoubleClick,
} from '../../data/stockFollow.js';
import { readGhostMapsKml } from './kml.js';
import {
fieldLabel,
@@ -197,6 +201,8 @@ export function createGhostMapsLayer({
let _stream = 'closed';
let _queue = Promise.resolve();
let _clickSubscription = null;
/** The follow a double-click on a placemark started, while installed. */
let _stockFollow = null;
let _rowListener = null;
let _selectedKey = null;
let _selectedCardId = null;
@@ -265,7 +271,10 @@ export function createGhostMapsLayer({
for (const [index, feature] of item.features) {
if (!isGhostMapsEventExpired(feature.dateMs, at, _ageDays)) continue;
for (const [kind, ids] of Object.entries(feature.itemIds))
if (ids.length) item.sets?.[kind]?.remove(ids);
if (ids.length) {
dropFollowOf(item.sets?.[kind], ids);
item.sets?.[kind]?.remove(ids);
}
item.features.delete(index);
if (_selectedKey === `${productId}:${index}`) clearSelection();
changed = true;
@@ -278,9 +287,22 @@ export function createGhostMapsLayer({
}
}
/**
* End a double-click's follow of an item that goes (any of `ids`, or the
* whole set), as removing its entity ended the default renderer's.
*/
function dropFollowOf(set, ids = null) {
const key = _stockFollow?.following?.key;
if (!set || !key?.startsWith(`${set.id}:`)) return;
if (!ids || ids.includes(key.slice(set.id.length + 1))) _stockFollow.stop();
}
function disposeSets(sets) {
if (!sets) return;
for (const set of Object.values(sets)) set.dispose();
for (const set of Object.values(sets)) {
dropFollowOf(set);
set.dispose();
}
}
/**
@@ -307,6 +329,13 @@ export function createGhostMapsLayer({
}
for (const pin of next.pins) pin.set = sets.icons;
next.sets = sets;
// Each set's items by id, for a double-click to follow or zoom to.
next.drawn = new Map(
Object.entries(sets).map(([kind, set]) => [
set.id,
new Map(next.items[kind].map((item) => [item.id, item])),
]),
);
}
/** The placemark a hit on one of this layer's items is, or null. */
@@ -736,7 +765,32 @@ export function createGhostMapsLayer({
});
}
/**
* A double-click follows a pin and zooms to a line or an area, as the
* default renderer did for their entities (a scene that takes no input
* has none).
*/
function installFollow() {
if (_stockFollow || !_viewer || !inputFor || !findInput(_viewer)) return;
_stockFollow = followOnDoubleClick({
viewer: _viewer,
inputFor,
name: GHOSTMAPS_LAYER_ID,
enabled: () => _enabled,
targetFor: (hit) => {
const key = hitKey(hit);
const loaded = key && _loaded.get(key.split(':')[0]);
return drawnItemTarget(
hit.set,
loaded?.drawn?.get(hit.set)?.get(hit.id),
);
},
});
}
function removeClickHandler() {
_stockFollow?.destroy();
_stockFollow = null;
_clickSubscription?.();
_clickSubscription = null;
picking?.unregisterPickOwner?.(GHOSTMAPS_LAYER_ID);
@@ -770,6 +824,7 @@ export function createGhostMapsLayer({
for (const item of _loaded.values())
for (const set of Object.values(item.sets ?? {})) set.show = true;
installClickHandler();
installFollow();
if (!_unsubscribe && typeof source.subscribe === 'function')
_unsubscribe = source.subscribe(
(catalog) => {
+40 -3
View File
@@ -2,6 +2,7 @@ import assert from 'node:assert/strict';
import test from 'node:test';
import { createGhostMapsLayer } from './index.js';
import { bindFakeDraw } from '../../testSupport/fakeDrawPort.mjs';
import { fakeCameraPort } from '../../testSupport/fakeCameraPort.mjs';
import { GHOSTMAPS_PRODUCTS, GHOSTMAPS_LATEST_DROP } from './catalog.js';
function element(localName, children = [], value = '', attributes = {}) {
@@ -121,13 +122,26 @@ function fixture(
const viewer = {};
// An input port and a query port: a click picks what `click(id)` names.
const listeners = new Set();
const doubleListeners = new Set();
let picked = null;
const camera = fakeCameraPort();
// What the camera follows, as the port's `follow` sets it.
camera.port.followed = null;
camera.port.follow = (target) => (camera.port.followed = target ?? null);
const { draw, unbind } = bindFakeDraw(viewer, {
camera: camera.port,
input: {
behaviours: { dblclickFollow: { enabled: true } },
on(type, cb) {
if (type !== 'click') return () => {};
listeners.add(cb);
return () => listeners.delete(cb);
const into =
type === 'click'
? listeners
: type === 'dblclick'
? doubleListeners
: null;
if (!into) return () => {};
into.add(cb);
return () => into.delete(cb);
},
},
query: { pick: () => picked },
@@ -151,6 +165,17 @@ function fixture(
modifiers: { shift: false, ctrl: false, alt: false },
});
};
const dblclick = (id) => {
const set = items().get(id);
picked = set ? { set, id, surface: false } : null;
for (const cb of [...doubleListeners])
cb({
type: 'dblclick',
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() {
@@ -191,6 +216,8 @@ function fixture(
items,
liveSets,
click,
dblclick,
camera: camera.port,
};
}
@@ -642,3 +669,13 @@ test('narrowing to a window the loaded data covers clears a failed wider reload'
assert.equal(layer.getStats().error, null);
assert.equal(layer.getStats().count, 1);
});
test('a double-click follows a pin until its edition goes, as its entity was', async (t) => {
const { layer, viewer, dblclick, camera } = fixture(t);
await layer.update(viewer);
dblclick('ghostmaps:cip:0:0');
assert.ok(camera.followed, 'the pin is followed');
assert.match(camera.followed.key, /:icons:ghostmaps:cip:0:0$/);
layer.disable();
assert.equal(camera.followed, null, 'its edition gone, so is the follow');
});