fix(perimeters, drone-airspace): a double-click zooms to an area again

The areas were polygon entities, which the default renderer's double-click
zoomed to. As draw-port items they took no part in it.
This commit is contained in:
Sameh Khamis committed 2026-11-14 01:16:20 -08:00
1 parent 26e8e26ba8
commit def2e1ecca
3 files changed
+87 -2

No files matched your search

+26 -1
View File
@@ -1,5 +1,9 @@
import { fromDegrees } from '../../geo/ellipsoid.js';
import { drawOf } from '../../render/rendererOf.js';
import { drawOf, findInput } from '../../render/rendererOf.js';
import {
drawnItemTarget,
followOnDoubleClick,
} from '../../data/stockFollow.js';
import { cssColor } from '../../render/color.js';
import { inputFor as defaultInputFor } from '../../input/dispatcher.js';
import { msg, t } from '../../i18n/index.js';
@@ -77,6 +81,9 @@ export function createDroneAirspaceLayer({
let _lastError = null;
let _stale = false;
let _enabled = false;
// Each drawn area by id, for a double-click to zoom to.
let _areaById = new Map();
let _stockFollow = null;
let _clickSubscription = null;
let _selectedId = null;
let _selectedCardId = null;
@@ -205,6 +212,19 @@ export function createDroneAirspaceLayer({
if (_fills) _fills.show = _lines.show = true;
overlayHost?.setVisible?.(DRONE_AIRSPACE_OVERLAY_SOURCE_ID, true);
installClickHandler();
// A double-click zooms to an area, as the default renderer zoomed to
// its entity (a scene that takes no input has none).
if (!_stockFollow && inputFor && findInput(_viewer))
_stockFollow = followOnDoubleClick({
viewer: _viewer,
inputFor,
name: layer.id,
enabled: () => _enabled,
targetFor: (hit) =>
_setIds?.has(hit.set)
? drawnItemTarget(hit.set, _areaById.get(hit.id))
: null,
});
},
disable() {
@@ -213,6 +233,8 @@ export function createDroneAirspaceLayer({
_enabled = false;
if (_fills) _fills.show = _lines.show = false;
removeClickHandler();
_stockFollow?.destroy();
_stockFollow = null;
clearSelection();
},
@@ -287,6 +309,7 @@ export function createDroneAirspaceLayer({
_fills.set(nextFills);
_lines.set(nextLines);
_areaById = new Map(nextFills.map((item) => [item.id, item]));
_snapshotSignature = signature;
if (_selectedId) publishSelectedCard();
_count = rows.length;
@@ -314,6 +337,8 @@ export function createDroneAirspaceLayer({
_request?.abort();
_request = null;
removeClickHandler();
_stockFollow?.destroy();
_stockFollow = null;
clearSelection();
_rowById.clear();
_snapshotSignature = null;
+26 -1
View File
@@ -1,5 +1,9 @@
import { fromDegrees } from '../../geo/ellipsoid.js';
import { drawOf } from '../../render/rendererOf.js';
import { drawOf, findInput } from '../../render/rendererOf.js';
import {
drawnItemTarget,
followOnDoubleClick,
} from '../../data/stockFollow.js';
import { hexColor } from '../../render/color.js';
import {
PERIMETER_OVERLAY_SOURCE_ID,
@@ -81,6 +85,9 @@ export function createFirePerimetersLayer({
let _stale = false;
let _lastError = null;
let _enabled = false;
// Each drawn area by id, for a double-click to zoom to.
let _areaById = new Map();
let _stockFollow = null;
let _clickSubscription = null;
let _selectedId = null;
let _selectedLink = null;
@@ -302,6 +309,19 @@ export function createFirePerimetersLayer({
if (_fills) _fills.show = _lines.show = true;
overlayHost?.setVisible?.(PERIMETER_OVERLAY_SOURCE_ID, true);
installClickHandler();
// A double-click zooms to an area, as the default renderer zoomed to
// its entity (a scene that takes no input has none).
if (!_stockFollow && inputFor && findInput(_viewer))
_stockFollow = followOnDoubleClick({
viewer: _viewer,
inputFor,
name: layer.id,
enabled: () => _enabled,
targetFor: (hit) =>
_setIds?.has(hit.set)
? drawnItemTarget(hit.set, _areaById.get(hit.id))
: null,
});
},
disable() {
@@ -310,6 +330,8 @@ export function createFirePerimetersLayer({
_enabled = false;
if (_fills) _fills.show = _lines.show = false;
removeClickHandler();
_stockFollow?.destroy();
_stockFollow = null;
clearSelection();
},
@@ -385,6 +407,7 @@ export function createFirePerimetersLayer({
_fills.set(nextFills);
_lines.set(nextLines);
_areaById = new Map(nextFills.map((item) => [item.id, item]));
_snapshotSignature = signature;
// Refresh (or drop) the selected incident's card against the new feed.
if (_selectedId) publishSelectedCard();
@@ -412,6 +435,8 @@ export function createFirePerimetersLayer({
_request?.abort();
_request = null;
removeClickHandler();
_stockFollow?.destroy();
_stockFollow = null;
clearSelection();
_rowById.clear();
_snapshotSignature = null;
+35
View File
@@ -642,3 +642,38 @@ test('a failed refresh after a stale snapshot reads as the failure, not stale',
assert.equal(h.layer.getStats().stale, false);
assert.equal(h.layer.getStats().error, 'WFIGS HTTP 502');
});
test('a double-click zooms to a perimeter, as the default renderer zoomed to its entity', 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 = createFirePerimetersLayer({
source: { getSnapshot: async () => [row] },
});
t.after(() => {
layer.destroy();
unbind();
renderer.destroy();
});
layer.init(viewer);
layer.enable();
await layer.update();
for (const suffix of [':fills', ':lines']) {
const set = renderer.testing.sets().find((id) => id.endsWith(suffix));
renderer.testing.scriptPicks(() => [
{ set, id: `fire-perimeter:${row.stableId}:0`, surface: false },
]);
renderer.camera.setView({
destination: { lon: 0, lat: 0, height: 20_000_000 },
});
renderer.testing.tick();
assert.ok(renderer.camera.pose().height > 1_000_000, 'starts far out');
renderer.testing.pointer('dblclick', 10, 10);
renderer.testing.tick();
const pose = renderer.camera.pose();
assert.equal(renderer.camera.followed, null, 'zoomed to, not followed');
assert.ok(pose.height < 1_000_000, `${suffix}: ${pose.height}`);
}
});