mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
fix(local-adsb): a double-click follows a local aircraft with its card again
Each aircraft was an entity, which the default renderer's double-click followed, showing its tracked card; an aircraft that expired took the follow with it. As a draw-port icon it took no part in it. A double-click follow can now carry the holder whose entity record shows the card.
This commit is contained in:
1 parent
f2983e8c1a
commit
766cf68272
3 files changed
+71
-3
No files matched your search
@@ -13,6 +13,7 @@ import {
|
||||
findQuery,
|
||||
} from '../../render/rendererOf.js';
|
||||
import { inputFor } from '../../input/dispatcher.js';
|
||||
import { followOnDoubleClick } from '../../data/stockFollow.js';
|
||||
import { pickRenderAltitudeM } from '../../data/renderAltitude.js';
|
||||
import { routePlausible } from '../../data/routePlausible.js';
|
||||
import {
|
||||
@@ -152,6 +153,8 @@ export function createLocalAdsbLayer({
|
||||
let tickTimer = null;
|
||||
let syncTimer = null;
|
||||
let clickSubscription = null;
|
||||
/** The follow a double-click on a marker started, while installed. */
|
||||
let stockFollow = null;
|
||||
let removePreRender = null;
|
||||
let renderHeld = false;
|
||||
let selectedId = null;
|
||||
@@ -587,6 +590,9 @@ export function createLocalAdsbLayer({
|
||||
if (ringsGone.length) sets.rings.remove(ringsGone);
|
||||
// Expired aircraft take their 3D models (and pending loads) with them.
|
||||
if (removed) models?.retain(markers);
|
||||
// An aircraft that went took the follow a double-click gave it.
|
||||
const followed = stockFollow?.following;
|
||||
if (followed && !markers.has(followed.key)) stockFollow.stop();
|
||||
if (selectedId && !live.has(selectedId))
|
||||
clearSelection({ evicted: enabled });
|
||||
removeEntityContextsForLayer(LAYER_ID, { retainIds: live });
|
||||
@@ -692,6 +698,24 @@ export function createLocalAdsbLayer({
|
||||
|
||||
function installInteraction() {
|
||||
if (clickSubscription || !viewer) return;
|
||||
// A double-click follows a local aircraft, its card shown, as the
|
||||
// default renderer followed its entity.
|
||||
stockFollow = followOnDoubleClick({
|
||||
viewer,
|
||||
inputFor,
|
||||
name: LAYER_ID,
|
||||
enabled: () => enabled,
|
||||
targetFor: (hit) => {
|
||||
const marker =
|
||||
!hit.surface && hit.set === sets?.markers.id && markers.get(hit.id);
|
||||
if (!marker?.carrier) return null;
|
||||
return {
|
||||
key: marker.id,
|
||||
position: () => (marker.position ? { ...marker.position } : null),
|
||||
entity: marker.carrier,
|
||||
};
|
||||
},
|
||||
});
|
||||
clickSubscription = inputFor(viewer).onClick((event) => {
|
||||
if (!enabled) return;
|
||||
const target = clickTarget(event);
|
||||
@@ -712,6 +736,8 @@ export function createLocalAdsbLayer({
|
||||
}
|
||||
|
||||
function releaseInteraction() {
|
||||
stockFollow?.destroy();
|
||||
stockFollow = null;
|
||||
clickSubscription?.();
|
||||
clickSubscription = null;
|
||||
}
|
||||
|
||||
@@ -1300,3 +1300,39 @@ test('a type change takes its belly offset with the new model, however soon it i
|
||||
);
|
||||
models.destroy();
|
||||
});
|
||||
|
||||
test('a double-click follows a local aircraft with its card, until it goes, as its entity was', async (t) => {
|
||||
const { bindRenderer } = await import('../../render/rendererOf.js');
|
||||
const { createStubRenderer } = await import('../../render/stub/index.js');
|
||||
const { followedOf } = await import('../../data/followed.js');
|
||||
const renderer = createStubRenderer();
|
||||
const viewer = { isDestroyed: () => false };
|
||||
const unbind = bindRenderer(viewer, renderer);
|
||||
const receiver = fakeReceiver({ mode: 'adsb', connected: true });
|
||||
const clock = { now: 100_000 };
|
||||
const { layer } = await enabledLayer(receiver, clock, null, {
|
||||
viewer: { viewer, draw: renderer.draw },
|
||||
});
|
||||
t.after(() => {
|
||||
layer.destroy();
|
||||
unbind();
|
||||
renderer.destroy();
|
||||
});
|
||||
receiver.set({ aircraft: [record()] });
|
||||
await layer.update();
|
||||
const set = renderer.testing.sets().find((id) => id.endsWith(':markers'));
|
||||
renderer.testing.scriptPicks(() => [
|
||||
{ set, id: 'local-adsb:abc123', surface: false },
|
||||
]);
|
||||
renderer.testing.pointer('dblclick', 10, 10);
|
||||
const followed = followedOf(viewer);
|
||||
assert.ok(followed, 'the aircraft is followed');
|
||||
assert.equal(followed.key, 'local-adsb:abc123');
|
||||
assert.ok(followed.entity, 'its entity record shows the tracked card');
|
||||
assert.equal(typeof followed.displayPosition, 'function');
|
||||
assert.ok(followed.labelModel?.title, 'with its card');
|
||||
receiver.set({ aircraft: [] });
|
||||
clock.now += 10 * 60_000;
|
||||
await layer.update();
|
||||
assert.equal(followedOf(viewer), null, 'gone, it is no longer followed');
|
||||
});
|
||||
Reference in new issue
Block a user