Keep the context id in the app's entity records instead of on picked objects

registerEntityContext stamped __gevContextId on the entities, primitives and
carriers it registered, and selection and pick resolution read it back. It
is now the contextId field of the entity's own record.
This commit is contained in:
Sameh Khamis committed 2026-11-03 09:40:15 -08:00
1 parent 393a145137
commit 2394703c14
5 files changed
+18 -16

No files matched your search

+5 -3
View File
@@ -1,3 +1,5 @@
import { entityRecord, readEntityRecord } from './entityRecords.js';
const STORE_KEY = '__gevContextStore';
function createStore() {
@@ -36,14 +38,14 @@ export function registerEntityContext(entity, metadata) {
entity,
updatedAt: Date.now(),
};
entity.__gevContextId = metadata.id;
entityRecord(entity).contextId = metadata.id;
store.entities.set(metadata.id, record);
return record;
}
export function selectEntityContext(entity) {
const store = getContextStore();
const contextId = entity?.__gevContextId;
const contextId = readEntityRecord(entity)?.contextId;
if (!contextId || !store.entities.has(contextId)) return null;
store.selectedEntityId = contextId;
store.selectedAt = Date.now();
@@ -84,7 +86,7 @@ export function selectTrackedSubjectContext(metadata) {
store.entities.delete(key);
}
// Reuse the existing carrier so a per-poll refresh does not churn identity.
const carrier = store.entities.get(id)?.entity || { __gevContextId: id };
const carrier = store.entities.get(id)?.entity || {};
const record = registerEntityContext(carrier, { ...metadata, id });
if (!record) return null;
store.selectedEntityId = id;
+2 -2
View File
@@ -96,7 +96,7 @@ test('a sibling tracking layer keeps its own subject slot', () => {
test('the per-poll refresh updates values without stealing the selection', () => {
withWindow(() => {
selectTrackedSubjectContext(flightSubject('aaa001'));
const other = registerEntityContext({ __gevContextId: 'dc-7' }, {
const other = registerEntityContext({}, {
id: 'dc-7', layerId: 'local-datacenters', label: 'Datacenter 7',
});
selectEntityContext(other.entity);
@@ -130,7 +130,7 @@ test('deselecting a contact releases the shared slot', () => {
test('clearing one tracking layer leaves another layer selection alone', () => {
withWindow(() => {
const other = registerEntityContext({ __gevContextId: 'dam-3' }, {
const other = registerEntityContext({}, {
id: 'dam-3', layerId: 'local-dams', label: 'Dam 3',
});
selectEntityContext(other.entity);
+4 -4
View File
@@ -1,4 +1,5 @@
import { getContextStore, isContextRecordActive } from './contextStore.js';
import { readEntityRecord } from './entityRecords.js';
import { findPickOwner, resolvePickId } from './pickRegistry.js';
/**
@@ -7,8 +8,8 @@ import { findPickOwner, resolvePickId } from './pickRegistry.js';
*
* Two lanes, in order:
* 1. Context-store carriers. Entity-backed layers (infrastructure GeoJSON,
* selected vessels, fires, installations) stamp `__gevContextId` on the
* picked object, and the store record already carries the label and
* selected vessels, fires, installations) write a `contextId` into the
* picked object's entity record, and the store record already carries the label and
* position voice uses everywhere else.
* 2. Pick owners. Primitive-backed layers (aircraft, satellites, vessels)
* register an ownership predicate in `pickRegistry`; the owning layer's
@@ -52,8 +53,7 @@ function contextCarrierRecord(picked, dataManager) {
picked?.primitive?.id,
picked?.primitive,
]) {
const contextId =
carrier && typeof carrier === 'object' ? carrier.__gevContextId : null;
const contextId = readEntityRecord(carrier)?.contextId;
if (!contextId) continue;
const record = store.entities.get(contextId);
if (record && isContextRecordActive(record, dataManager)) return record;