diff --git a/src/ui/wildlifeSightingCard.js b/src/ui/wildlifeSightingCard.js
index d0b642e6e..5c9544bc7 100644
--- a/src/ui/wildlifeSightingCard.js
+++ b/src/ui/wildlifeSightingCard.js
@@ -192,7 +192,7 @@ export function createWildlifeSightingCard({
if (fresh) panForId = null;
nextTick(() => {
if (destroyed || !selected.value) return;
- position({ allowPan: fresh || metadata?.explicitSelection === true });
+ position({ allowPan: metadata?.explicitSelection === true });
if (moving) startFrameUpdates();
// Focus the container so keyboard navigation starts inside the card.
if (fresh)
diff --git a/src/ui/wildlifeSightingCard.test.mjs b/src/ui/wildlifeSightingCard.test.mjs
index 14c1f5049..3ce55af11 100644
--- a/src/ui/wildlifeSightingCard.test.mjs
+++ b/src/ui/wildlifeSightingCard.test.mjs
@@ -808,3 +808,31 @@ test('newly mounted chrome repositions the open card without camera events or id
'closing disconnects structural observation',
);
});
+
+test('remounting a selected sighting does not pan the new engine', async (context) => {
+ const f = fixture(context);
+ await f.click();
+ f.card.destroy();
+ f.obstacle('.hud-top-left', rect(0, 0, 260, 160));
+ const ui = createUiRuntime();
+ let pans = 0;
+ const card = createWildlifeSightingCard({
+ layer: f.layer,
+ ui,
+ engine: f.engine,
+ documentRef: document,
+ windowRef: f.windowRef,
+ now: () => NOW,
+ project: () => ({ x: 100, y: 100 }),
+ pan: () => {
+ pans++;
+ return true;
+ },
+ });
+ context.after(() => {
+ card.destroy();
+ ui.destroy();
+ });
+ await settle();
+ assert.equal(pans, 0);
+});
diff --git a/src/voice/areaActions.js b/src/voice/areaActions.js
index 1aef6a8d8..594a3e8f0 100644
--- a/src/voice/areaActions.js
+++ b/src/voice/areaActions.js
@@ -162,15 +162,12 @@ export function createVoiceAreas({
findRegion = findNaturalRegion,
findAdminCandidates = findBundledAdminCandidates,
aroundOutlineMs = AROUND_OUTLINE_MS,
-} = {}) {
- // An area an outline on the map still refers to is never evicted: its
- // counting geometry must outlive the display copy drawn from it.
- const store = createAreaStore({
+ store = createAreaStore({
isPinned: (areaId) =>
typeof annotations?.list === 'function' &&
annotations.list().some((anno) => anno?.areaId === areaId),
- });
-
+ }),
+} = {}) {
/** The ground at the centre of the view, else the camera's position. */
function viewCenter() {
const picked = annotationResolver?.pickWorldFromScreen?.(engine, 0.5, 0.5);
diff --git a/src/voice/gevActions.js b/src/voice/gevActions.js
index 56b068f58..eef8158ac 100644
--- a/src/voice/gevActions.js
+++ b/src/voice/gevActions.js
@@ -374,7 +374,7 @@ export function createGevActionRunner({
cameraHandoffs += 1;
}) ?? null;
let analystEngine;
- // Area handles live for this runner (the page): resolve_area, the
+ // Area handles live for the page session: resolve_area, the
// analyst's region/area/drawn scopes, find_imagery and osm_query all read
// the same store.
const voiceAreas = createVoiceAreas({
@@ -3314,12 +3314,14 @@ export async function getBasemapLabelContext(
const latitude = Number(geo.math.toDegrees(viewTarget.latitude).toFixed(6));
const longitude = Number(geo.math.toDegrees(viewTarget.longitude).toFixed(6));
+ const pose = engine.camera.pose();
const view = placeLookupView({
latitude,
longitude,
rangeM: viewTargetRangeM(engine, viewTarget, cameraHeightM),
- fovRad: engine.camera.pose().fovy,
- aspectRatio: engine.camera.pose().aspectRatio,
+ fovRad:
+ 2 * Math.atan(Math.tan(pose.fovy / 2) * Math.max(1, pose.aspectRatio)),
+ aspectRatio: pose.aspectRatio,
tier: basemapLookupTier(cameraHeightM),
});
if (
diff --git a/src/voice/gevRealtime.js b/src/voice/gevRealtime.js
index 64df161c6..59f1cdd3c 100644
--- a/src/voice/gevRealtime.js
+++ b/src/voice/gevRealtime.js
@@ -6,6 +6,7 @@ import { cameraPoseKey, createPointerTracker } from './pointerContext.js';
import { createPointerPicker } from './pointerPick.js';
import { createReferentRegistry } from './referents.js';
import { createSceneRunner } from './sceneRunner.js';
+import { createAreaStore } from '../data/areaStore.js';
export * from './realtimeController.js';
const ACTION_NAMES = new Set(GEV_ACTION_SCHEMAS.map((schema) => schema.name));
@@ -45,6 +46,14 @@ export function withToolCatalog(runner, loadCatalog) {
*/
export function createSceneVoice(options) {
const scene = { engine: null };
+ let areaAnnotations = null;
+ const areaStore =
+ options.areaOptions?.store ??
+ createAreaStore({
+ isPinned: (areaId) =>
+ areaAnnotations?.list?.().some((anno) => anno?.areaId === areaId) ??
+ false,
+ });
const cameraKey = () => cameraPoseKey(scene.engine);
let pick = null;
// Point-and-ask: the tracker and referents are shared by the runner (which
@@ -74,6 +83,7 @@ export function createSceneVoice(options) {
deixis,
analystMemory,
layerEnabledAt,
+ areaOptions: { ...options.areaOptions, store: areaStore },
readVoicePanelOperation: () =>
commands?.captureVoicePanelOperation?.(),
}),
@@ -141,6 +151,7 @@ export function createSceneVoice(options) {
if (lifetime?.aborted) return;
detachScene();
const engine = attached.engine ?? null;
+ areaAnnotations = attached.annotations ?? null;
scene.engine = engine;
shell = attached.styleManager ?? null;
pick = createPointerPicker({
diff --git a/src/voice/hudPlaceLabels.test.mjs b/src/voice/hudPlaceLabels.test.mjs
index 7e4b94ec5..6f94085da 100644
--- a/src/voice/hudPlaceLabels.test.mjs
+++ b/src/voice/hudPlaceLabels.test.mjs
@@ -368,3 +368,17 @@ test('cached-only lookups read every cached viewport sample and never request',
assert.ok(b.placeLabels.includes(cachedLabel));
assert.deepEqual(service.calls, before);
});
+
+test('basemap lookup measures the horizontal camera span', async () => {
+ const { viewer } = createViewer({
+ latitude: 30,
+ longitude: -97,
+ heightM: 1000,
+ });
+ const result = await getBasemapLabelContext(viewer, createService(), {
+ cachedOnly: true,
+ });
+ assert.ok(
+ Math.abs(result.view.spanM - 2 * 1000 * Math.tan(Math.PI / 6) * 1.5) < 1,
+ );
+});
diff --git a/src/voice/sceneVoice.test.mjs b/src/voice/sceneVoice.test.mjs
index e2015bc1d..57d1493bd 100644
--- a/src/voice/sceneVoice.test.mjs
+++ b/src/voice/sceneVoice.test.mjs
@@ -115,3 +115,33 @@ test('annotation outline events reach the session from the attached engine only'
f.restore();
}
});
+
+test('area handles outlive an engine attachment', () => {
+ const f = fixture();
+ try {
+ f.voice.attachScene({ engine: fakeEngine('cesium') });
+ const store = f.built[0].areaOptions?.store;
+ assert.ok(store);
+ const area = store.put({
+ name: 'Area',
+ source: 'drawn',
+ geometry: {
+ type: 'Polygon',
+ coordinates: [
+ [
+ [0, 0],
+ [1, 0],
+ [1, 1],
+ [0, 0],
+ ],
+ ],
+ },
+ });
+ f.voice.detachScene();
+ f.voice.attachScene({ engine: fakeEngine('navara') });
+ assert.equal(f.built[1].areaOptions.store.get(area.areaId), area);
+ } finally {
+ f.lifetime.abort();
+ f.restore();
+ }
+});