mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 00:32:21 +00:00
Merge branch 'main' into denis/cockpit-subject-providers
This commit is contained in:
commit
a7d722a1f4
223 files changed
+18891
-137
No files matched your search
@@ -182,7 +182,22 @@ export function createPanel({ state: layerState, parts }) {
|
||||
: null;
|
||||
}
|
||||
|
||||
/** The tracked airliner's photo with its credit, or null. The subject
|
||||
/** The credit line: the photographer, and an open photo's licence. A
|
||||
* photo whose answer names no photographer shows no photographer. */
|
||||
function photoCredit(photo) {
|
||||
if (photo.licence)
|
||||
return photo.photographer
|
||||
? t('Photo: {photographer} · {licence}', {
|
||||
photographer: photo.photographer,
|
||||
licence: photo.licence,
|
||||
})
|
||||
: t('Photo · {licence}', { licence: photo.licence });
|
||||
return photo.photographer
|
||||
? t('Photo © {photographer}', { photographer: photo.photographer })
|
||||
: '';
|
||||
}
|
||||
|
||||
/** The subject's photo with its credit, or null. The subject
|
||||
* refresh resolves it; only the subject it was resolved for shows it. */
|
||||
function presentPhoto(subject) {
|
||||
const held = layerState.subjectPhoto;
|
||||
@@ -198,10 +213,7 @@ export function createPanel({ state: layerState, parts }) {
|
||||
width: photo.width ?? null,
|
||||
height: photo.height ?? null,
|
||||
link: photo.link,
|
||||
// A photo whose answer names no photographer shows no credit line.
|
||||
credit: photo.photographer
|
||||
? t('Photo © {photographer}', { photographer: photo.photographer })
|
||||
: '',
|
||||
credit: photoCredit(photo),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -113,7 +113,52 @@ test('the Contacts view has no photo without one, or with another subject’s',
|
||||
);
|
||||
});
|
||||
|
||||
test('only the tracked flight has a photo: not a vessel, an installation, a military aircraft or another flight', () => {
|
||||
test('the selected vessel shows its own photo, by its id', () => {
|
||||
const asked = [];
|
||||
const { resolveSubjectPhoto, subjectFromContext } = createSubject({
|
||||
state: {},
|
||||
services: {
|
||||
flights: {},
|
||||
military: {},
|
||||
vessels: {
|
||||
getVesselPhoto: (id) => {
|
||||
asked.push(id);
|
||||
return id === 'uuid-1' ? PHOTO : null;
|
||||
},
|
||||
},
|
||||
installations: {},
|
||||
},
|
||||
parts: { navigation: { isFlightLayer: () => false } },
|
||||
});
|
||||
assert.deepEqual(
|
||||
resolveSubjectPhoto({ layerId: 'ais-live-vessels', id: 'uuid-1' }),
|
||||
PHOTO,
|
||||
);
|
||||
assert.equal(
|
||||
resolveSubjectPhoto({ layerId: 'ais-live-vessels', id: 'uuid-2' }),
|
||||
null,
|
||||
);
|
||||
assert.deepEqual(asked, ['uuid-1', 'uuid-2']);
|
||||
const vessel = (label, mmsi) =>
|
||||
subjectFromContext({
|
||||
layerId: 'ais-live-vessels',
|
||||
id: 'ais-uuid-1',
|
||||
label,
|
||||
latitude: 38.3,
|
||||
longitude: -123.05,
|
||||
properties: { vesselId: 'uuid-1', mmsi },
|
||||
});
|
||||
assert.equal(
|
||||
vessel('USCGC SOCKEYE', '366999709').label,
|
||||
'USCGC SOCKEYE · MMSI 366999709',
|
||||
);
|
||||
assert.equal(vessel('USCGC SOCKEYE', '366999709').id, 'uuid-1');
|
||||
// A vessel named by its MMSI, or without one, is not given it twice.
|
||||
assert.equal(vessel('MMSI 366999709', '366999709').label, 'MMSI 366999709');
|
||||
assert.equal(vessel('USCGC SOCKEYE', null).label, 'USCGC SOCKEYE');
|
||||
});
|
||||
|
||||
test('only the tracked flight has a flight photo: not an installation, a military aircraft or another flight', () => {
|
||||
const tracked = {
|
||||
layerId: 'flights',
|
||||
id: 'abc123',
|
||||
|
||||
@@ -406,17 +406,20 @@ export function createSubject({ state: layerState, services, parts, source }) {
|
||||
}
|
||||
|
||||
/**
|
||||
* The tracked airliner's Planespotters photo, for the Contacts panel.
|
||||
* The subject's photo, for the Contacts panel: the tracked airliner's
|
||||
* Planespotters photo, or the selected vessel's Open Vessel Photos photo.
|
||||
*
|
||||
* Only the flights layer looks photos up, and only for the plane it tracks;
|
||||
* a vessel, an installation, a military aircraft or an untracked flight has
|
||||
* none.
|
||||
* The flights layer looks photos up only for the plane it tracks, the
|
||||
* vessel layer only for the vessel selected; an installation, a military
|
||||
* aircraft or an untracked flight has none.
|
||||
* @param {{layerId: string, id: string}|null} subject Current subject.
|
||||
* @param {?object} [tracked] The subject's tracked descriptor, when the
|
||||
* caller already has it.
|
||||
* @returns {?{src: string, width: ?number, height: ?number, photographer: string, link: string}}
|
||||
* @returns {?{src: string, width: ?number, height: ?number, photographer: string, link: string, licence?: string}}
|
||||
*/
|
||||
function resolveSubjectPhoto(subject, tracked = trackedSubjectOf(subject)) {
|
||||
if (subject?.layerId === 'ais-live-vessels')
|
||||
return aisLiveVesselsLayer.getVesselPhoto?.(subject.id) ?? null;
|
||||
return subject?.layerId === 'flights' && tracked?.photo
|
||||
? tracked.photo
|
||||
: null;
|
||||
@@ -517,10 +520,15 @@ export function createSubject({ state: layerState, services, parts, source }) {
|
||||
const latitude = Number(record.latitude);
|
||||
const longitude = Number(record.longitude);
|
||||
if (!Number.isFinite(latitude) || !Number.isFinite(longitude)) return null;
|
||||
// A vessel reads as its name and MMSI; a vessel named by its MMSI alone
|
||||
// already carries it.
|
||||
const label = String(record.label || record.id);
|
||||
const mmsi = String(record.properties?.mmsi || '');
|
||||
return {
|
||||
layerId: record.layerId,
|
||||
id: record.properties?.vesselId || record.id,
|
||||
label: record.label || record.id,
|
||||
// i18n-ignore: MMSI is a radio identity code, as on the vessel card
|
||||
label: mmsi && !label.includes(mmsi) ? `${label} · MMSI ${mmsi}` : label,
|
||||
memberNames: record.properties?.memberNames || [],
|
||||
position: Cesium.Cartesian3.fromDegrees(longitude, latitude, 0),
|
||||
};
|
||||
|
||||
@@ -260,6 +260,21 @@ export function createGeometry({ state: layerState, services, parts, source }) {
|
||||
return Math.max(PROBE_MIN_RANGE_M, hitDistance - PROBE_CLEARANCE_M);
|
||||
}
|
||||
|
||||
/**
|
||||
* Distance along a pitched-down view axis to flat ground at the mount's own
|
||||
* ground height, or null for an axis at or above the horizon.
|
||||
* @param {number} mountHeightM Mount height above its ground.
|
||||
* @param {number} pitchDeg Axis pitch (negative looks down).
|
||||
* @returns {number|null}
|
||||
*/
|
||||
|
||||
function flatGroundAxisDistance(mountHeightM, pitchDeg) {
|
||||
const height = Number(mountHeightM);
|
||||
const pitch = Number(pitchDeg);
|
||||
if (!Number.isFinite(height) || height <= 0 || !(pitch < 0)) return null;
|
||||
return height / Math.sin(Cesium.Math.toRadians(Math.min(89, -pitch)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a computeFrustumGeometry result into the Cartesian3 positions the
|
||||
* entities consume. Fresh objects per call (geometry updates are rare —
|
||||
@@ -616,10 +631,14 @@ export function createGeometry({ state: layerState, services, parts, source }) {
|
||||
* range, clamp the plane's effective range just short of the first hit so the
|
||||
* "big and dramatic" true end cap never clips into downtown buildings.
|
||||
*
|
||||
* This is the ONLY raycast in the whole CCTV subsystem — once per activation,
|
||||
* never per-frame (the zero-raycast invariant applies to steady state). The
|
||||
* per-camera range slider overrides the clamp: a user-set rangeScale skips the
|
||||
* probe entirely. Probe failure/miss keeps the unclamped range.
|
||||
* On a globe map it also picks the globe's terrain along the same axis
|
||||
* (flat ground at the mount's ground when terrain is missed or met beyond
|
||||
* the range) and clamps at the nearer end. These are the ONLY raycasts in the
|
||||
* whole CCTV subsystem — once per activation, never per-frame (the
|
||||
* zero-raycast invariant applies to steady state). The per-camera range
|
||||
* slider overrides the clamp: a user-set rangeScale skips the probe
|
||||
* entirely. A miss on the photoreal stack or a probe failure keeps the
|
||||
* unclamped range.
|
||||
* @param {Object} record - Camera record being activated.
|
||||
*/
|
||||
|
||||
@@ -646,9 +665,33 @@ export function createGeometry({ state: layerState, services, parts, source }) {
|
||||
for (const runtime of layerState._projectionEntities) {
|
||||
if (runtime?.planeEntity) exclude.push(runtime.planeEntity);
|
||||
}
|
||||
const hit = scene.pickFromRay(new Cesium.Ray(mountPos, dir), exclude);
|
||||
if (!hit?.position) return;
|
||||
const dist = Cesium.Cartesian3.distance(mountPos, hit.position);
|
||||
const ray = new Cesium.Ray(mountPos, dir);
|
||||
// pickFromRay hits only primitives (the photoreal tiles), never the
|
||||
// globe: on a globe map the ray runs on through the Earth and can meet
|
||||
// a primitive thousands of kilometres away, which blocks nothing. Such
|
||||
// a hit or none left the plane at the full nominal range, about a
|
||||
// kilometre wide and hundreds of metres up. A hit at or beyond the range
|
||||
// counts as none. On a globe map the axis also ends on the globe's
|
||||
// terrain, the nearer of that and any primitive hit (a primitive behind
|
||||
// a hill the axis has already entered blocks nothing). Terrain still
|
||||
// loading at a coarse level can be missed or met beyond the range; then
|
||||
// flat ground at the mount's own ground stands in for it.
|
||||
const inRange = (distance) =>
|
||||
Number.isFinite(distance) && distance > 0 && distance < camera.rangeM;
|
||||
const hit = scene.pickFromRay(ray, exclude)?.position;
|
||||
const hitDist = hit ? Cesium.Cartesian3.distance(mountPos, hit) : NaN;
|
||||
const distances = inRange(hitDist) ? [hitDist] : [];
|
||||
if (scene.globe?.show) {
|
||||
const terrain = scene.globe.pick(ray, scene);
|
||||
const terrainDist = terrain
|
||||
? Cesium.Cartesian3.distance(mountPos, terrain)
|
||||
: NaN;
|
||||
const ground = inRange(terrainDist)
|
||||
? terrainDist
|
||||
: flatGroundAxisDistance(camera.mountHeightM, camera.pitchDeg);
|
||||
if (Number.isFinite(ground) && ground > 0) distances.push(ground);
|
||||
}
|
||||
const dist = distances.length ? Math.min(...distances) : null;
|
||||
record.probeClampRangeM = activationProbeClampRange(camera.rangeM, dist);
|
||||
} catch {
|
||||
// probe failure → keep the unclamped range
|
||||
@@ -831,6 +874,7 @@ export function createGeometry({ state: layerState, services, parts, source }) {
|
||||
hasShippedFootprint,
|
||||
footprintPose,
|
||||
activationProbeClampRange,
|
||||
flatGroundAxisDistance,
|
||||
frustumCartesians,
|
||||
frustumFrameEcef,
|
||||
applyFrustumGeometry,
|
||||
|
||||
@@ -73,6 +73,7 @@ export function createCctvLayer({ services, source }) {
|
||||
deriveCalBadge: parts.calibration.deriveCalBadge,
|
||||
computeFrustumGeometry: parts.geometry.computeFrustumGeometry,
|
||||
activationProbeClampRange: parts.geometry.activationProbeClampRange,
|
||||
flatGroundAxisDistance: parts.geometry.flatGroundAxisDistance,
|
||||
frameSignatureFromPixels: parts.frames.frameSignatureFromPixels,
|
||||
_createCctvProjectionPlaneForTest:
|
||||
parts.testing._createCctvProjectionPlaneForTest,
|
||||
|
||||
@@ -7,6 +7,7 @@ import { createRendering } from './rendering.js';
|
||||
import { createSelection } from './selection.js';
|
||||
import { createTracking } from './tracking.js';
|
||||
import { createCards } from './cards.js';
|
||||
import { createPhotos } from './photos.js';
|
||||
import { createTesting } from './testing.js';
|
||||
import { createEvidence } from './evidence.js';
|
||||
import { createQueries } from './queries.js';
|
||||
@@ -24,6 +25,7 @@ export function createVesselLayer({ source, services, options = {} } = {}) {
|
||||
parts.selection = createSelection(context);
|
||||
parts.tracking = createTracking(context);
|
||||
parts.cards = createCards(context);
|
||||
parts.photos = createPhotos(context);
|
||||
parts.testing = createTesting(context);
|
||||
parts.evidence = createEvidence(context);
|
||||
parts.queries = createQueries(context);
|
||||
@@ -90,6 +92,9 @@ export function createVesselLayer({ source, services, options = {} } = {}) {
|
||||
buildVesselCard: parts.cards.buildVesselCard,
|
||||
buildSelectedVesselCard: parts.cards.buildSelectedVesselCard,
|
||||
cardScreenSeparated: parts.cards.cardScreenSeparated,
|
||||
/** The vessel's Open Vessel Photos photo, once its lookup answered. */
|
||||
getVesselPhoto: (id) =>
|
||||
parts.photos.vesselPhoto(vesselState.state.records.byId.get(id)),
|
||||
});
|
||||
Object.defineProperty(layer, 'testing', { value: parts.testing });
|
||||
return layer;
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
import { MMSI, parseOpenVesselPhoto } from '../../data/openVesselPhoto.js';
|
||||
|
||||
/** A failed lookup is asked again after this long; a miss is final. */
|
||||
const PHOTO_RETRY_MS = 5 * 60 * 1000;
|
||||
/** Lookups remembered per session, oldest dropped first. */
|
||||
const PHOTO_CACHE_LIMIT = 500;
|
||||
|
||||
/**
|
||||
* The selected vessel's photo, looked up once per MMSI when it is selected.
|
||||
* The answer is read with `parseOpenVesselPhoto` whatever shape the source
|
||||
* returns, so only a checked photo is ever kept. A source without
|
||||
* `getEnrichment` has no photos.
|
||||
*/
|
||||
export function createPhotos({ vesselState }) {
|
||||
/** MMSI → photo, `null` for a final miss, or `{failedAtMs}`/`{pending}`. */
|
||||
const answers = new Map();
|
||||
|
||||
function remember(mmsi, answer) {
|
||||
answers.delete(mmsi);
|
||||
answers.set(mmsi, answer);
|
||||
if (answers.size > PHOTO_CACHE_LIMIT)
|
||||
answers.delete(answers.keys().next().value);
|
||||
}
|
||||
|
||||
/** Ask for the record's photo unless it is known, asked or cooling down. */
|
||||
function requestVesselPhoto(record, now = Date.now()) {
|
||||
const mmsi = String(record?.mmsi || '');
|
||||
const source = vesselState._source;
|
||||
if (!MMSI.test(mmsi) || typeof source?.getEnrichment !== 'function') return;
|
||||
const known = answers.get(mmsi);
|
||||
if (known !== undefined) {
|
||||
if (known?.pending || known === null || known.found) return;
|
||||
if (now - known.failedAtMs < PHOTO_RETRY_MS) return;
|
||||
}
|
||||
remember(mmsi, { pending: true });
|
||||
Promise.resolve()
|
||||
.then(() => source.getEnrichment({ kind: 'photo', id: mmsi }))
|
||||
.then(
|
||||
(answer) => {
|
||||
const photo = parseOpenVesselPhoto(answer);
|
||||
remember(mmsi, photo.found ? photo : null);
|
||||
},
|
||||
() => remember(mmsi, { failedAtMs: Date.now() }),
|
||||
);
|
||||
}
|
||||
|
||||
/** The vessel's checked photo, or null. */
|
||||
function vesselPhoto(record) {
|
||||
const answer = answers.get(String(record?.mmsi || ''));
|
||||
if (!answer?.found) return null;
|
||||
const { src, width, height, photographer, licence, link } = answer;
|
||||
return { src, width, height, photographer, licence, link };
|
||||
}
|
||||
|
||||
return { requestVesselPhoto, vesselPhoto };
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
// src/layers/vessels/photos.test.mjs — a selected vessel's photo is asked for
|
||||
// once per MMSI; a miss is final and a failure is retried only after a pause.
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { createPhotos } from './photos.js';
|
||||
|
||||
const ANSWER = Object.freeze({
|
||||
mmsi: '366999709',
|
||||
photos: [
|
||||
{
|
||||
urls: {
|
||||
mmsi: 'https://openvesselphotos.org/v1/mmsi/366999709/photos/1.jpg',
|
||||
},
|
||||
credit: 'Gordon Leggett',
|
||||
licenceName: 'CC BY 4.0',
|
||||
width: 1600,
|
||||
height: 1200,
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
const settle = () => new Promise((resolve) => setImmediate(resolve));
|
||||
|
||||
function fixture(answer) {
|
||||
const asked = [];
|
||||
const source = {
|
||||
getSnapshot() {},
|
||||
async getEnrichment(query) {
|
||||
asked.push(query);
|
||||
return answer(query);
|
||||
},
|
||||
};
|
||||
const photos = createPhotos({ vesselState: { _source: source } });
|
||||
return { photos, asked };
|
||||
}
|
||||
|
||||
test('a selected vessel is asked once and shows its checked photo', async () => {
|
||||
const { photos, asked } = fixture(() => ANSWER);
|
||||
const record = { id: 'v1', mmsi: '366999709' };
|
||||
photos.requestVesselPhoto(record);
|
||||
photos.requestVesselPhoto(record);
|
||||
await settle();
|
||||
photos.requestVesselPhoto(record);
|
||||
assert.deepEqual(asked, [{ kind: 'photo', id: '366999709' }]);
|
||||
assert.deepEqual(photos.vesselPhoto(record), {
|
||||
src: 'https://openvesselphotos.org/v1/mmsi/366999709/photos/1.jpg?size=800',
|
||||
width: 800,
|
||||
height: 600,
|
||||
photographer: 'Gordon Leggett',
|
||||
licence: 'CC BY 4.0',
|
||||
link: 'https://openvesselphotos.org/vessels/mmsi/366999709',
|
||||
});
|
||||
});
|
||||
|
||||
test('a vessel without a valid MMSI, or a source without lookups, is never asked', async () => {
|
||||
const { photos, asked } = fixture(() => ANSWER);
|
||||
photos.requestVesselPhoto({ id: 'v1', mmsi: '' });
|
||||
photos.requestVesselPhoto({ id: 'v2', mmsi: '12345' });
|
||||
await settle();
|
||||
assert.equal(asked.length, 0);
|
||||
const bare = createPhotos({ vesselState: { _source: { getSnapshot() {} } } });
|
||||
bare.requestVesselPhoto({ id: 'v3', mmsi: '366999709' });
|
||||
assert.equal(bare.vesselPhoto({ mmsi: '366999709' }), null);
|
||||
});
|
||||
|
||||
test('a miss is final; a failure is asked again only after the pause', async () => {
|
||||
let fail = true;
|
||||
const { photos, asked } = fixture(({ id }) => {
|
||||
if (id === '111111111') return { mmsi: id, photos: [] };
|
||||
if (fail) throw new Error('down');
|
||||
return ANSWER;
|
||||
});
|
||||
const missing = { mmsi: '111111111' };
|
||||
const flaky = { mmsi: '366999709' };
|
||||
photos.requestVesselPhoto(missing);
|
||||
photos.requestVesselPhoto(flaky, 0);
|
||||
await settle();
|
||||
photos.requestVesselPhoto(missing);
|
||||
photos.requestVesselPhoto(flaky, Date.now() + 1000);
|
||||
assert.equal(asked.length, 2);
|
||||
fail = false;
|
||||
photos.requestVesselPhoto(flaky, Date.now() + 10 * 60 * 1000);
|
||||
await settle();
|
||||
assert.equal(asked.length, 3);
|
||||
assert.equal(photos.vesselPhoto(missing), null);
|
||||
assert.equal(photos.vesselPhoto(flaky).photographer, 'Gordon Leggett');
|
||||
});
|
||||
@@ -186,6 +186,7 @@ export function createSelection({
|
||||
// click, not up to VISIBILITY_UPDATE_MS later.
|
||||
components.rendering.updateVisibility(true);
|
||||
components.cards.updateSelectedVesselHud(record);
|
||||
components.photos.requestVesselPhoto(record);
|
||||
if (registerSelectedContext(record)) {
|
||||
selectEntityContext(record);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user