mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-18 01:02:23 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63c9e80a40 | ||
|
|
1923547d43 | ||
|
|
b6c241a68e | ||
|
|
f42980a04d |
No files matched your search
@@ -0,0 +1,3 @@
|
||||
- Shorten the freeze when Submarine cables is switched on from about 1.4 s to
|
||||
about 0.2 s. Landing markers are now shown a few dozen per frame instead of
|
||||
all at once (mazy1998, #1707).
|
||||
@@ -1,2 +0,0 @@
|
||||
- `/api/firms` keeps its response bytes and sends them gzipped instead of
|
||||
serialising the whole fire set for every request (mazy1998, #1711).
|
||||
@@ -0,0 +1,4 @@
|
||||
- Submarine cables draw from a few batched primitives instead of thousands of
|
||||
entities. Switching the layer off and back on, and zooming with it on, no
|
||||
longer stall the page, and it holds about 900 MB less memory. Double-click
|
||||
no longer starts Cesium's entity tracking on a cable (mazy1998, #1722).
|
||||
+31
-18
@@ -1541,12 +1541,14 @@ query. Movement within an accepted or pending query reuses it. Markers retain
|
||||
their Cesium identity while their geometry is unchanged; refreshes preserve
|
||||
selection without replaying a click event.
|
||||
|
||||
Data Centers, Dams and Submarine Cables release their built Cesium data sources
|
||||
Data Centers and Dams release their built Cesium data sources
|
||||
and record references when disabled. Parsed datasets remain cached for the layer
|
||||
lifetime, so re-enable rebuilds entities without downloading or parsing again;
|
||||
this can take longer than simply revealing hidden entities. Destruction clears
|
||||
the parsed cache as well. A disable during loading cannot leave a completed
|
||||
build hidden in the scene.
|
||||
build hidden in the scene. Submarine Cables draws with its own primitives
|
||||
instead of entities and only hides them when disabled (see "Bundled geography
|
||||
and submarine cable components").
|
||||
|
||||
CCTV exposes a factory through `./layers/cctv`. Catalog and health requests,
|
||||
frame/media URLs, camera records, ground placement, geometry queues, playback,
|
||||
@@ -3297,15 +3299,6 @@ The `get_active_fires` tool reports acquisition times as UTC ISO timestamps,
|
||||
including zero-padded hours and minutes; missing or invalid dates and times
|
||||
remain `null`, including impossible calendar dates from a custom source.
|
||||
|
||||
`/api/firms` keeps its last response body as bytes and reuses it for requests
|
||||
that would get the same payload: the same cache entry and `stale` flag, while
|
||||
the clock stays inside the span over which the trailing-24-hour filter keeps
|
||||
the same detections. That span ends when the oldest kept acquisition minute
|
||||
turns 24 hours old, so requests minutes apart are still serialised afresh. A
|
||||
client that sends `Accept-Encoding: gzip` gets the body gzipped (compressed
|
||||
once per kept body, `Content-Encoding: gzip`); every response carries
|
||||
`Vary: Accept-Encoding`. The JSON is unchanged.
|
||||
|
||||
The FIRMS proxy records source success after appending its rows. If aggregation
|
||||
throws, that source reports failure without a contradictory success entry.
|
||||
The existing per-record append continues to support large feeds; sequential
|
||||
@@ -8156,17 +8149,37 @@ an error. Without feeds it keeps the WebUSB statuses. See
|
||||
Submarine cables use separate source, geometry, rendering, interaction and
|
||||
lifecycle modules. The layer factory accepts cable and landing-point GeoJSON
|
||||
collections from a source with `fetch(signal)` and a display label. The default
|
||||
source loads the same bundled TeleGeography files. Disabling still removes all
|
||||
three Cesium data sources; enabling rebuilds from the accepted parsed cache,
|
||||
and destroying clears it. Load ownership prevents cancelled work from adding
|
||||
entities after teardown.
|
||||
source loads the same bundled TeleGeography files. Load ownership prevents
|
||||
cancelled work from adding anything to the scene after teardown: the fetch is
|
||||
the load's only await, and everything is built in the turn after it.
|
||||
|
||||
Every Cesium entity from multipart cable or landing-point geometry stays tied
|
||||
to its source feature, including generated IDs and IDs that collide with
|
||||
Cesium's multipart suffixes. Each segment gets its own feature's styling, click
|
||||
The layer draws with four Cesium primitives of its own and creates no entity
|
||||
or data source. Every line is one instance of a single
|
||||
`GroundPolylinePrimitive` (per-line colour and show flag, rhumb lines,
|
||||
tessellated in a worker; a map-stack change re-classifies it in place). Every
|
||||
point is a billboard in one `BillboardCollection`. Reference tips are one
|
||||
`PointPrimitiveCollection`, and the stems of the references in view are one
|
||||
static polyline `Primitive`: a horizon sweep that moved a tip or changed which
|
||||
references are in view builds a replacement in a worker, and it replaces the
|
||||
shown stems once it is ready. Disabling hides the lines, markers and tips and
|
||||
keeps them, so enabling again neither fetches nor builds them (only the stems
|
||||
are redrawn, for the new view); destroying removes everything. These are
|
||||
the same primitives Cesium built from the layer's entities, so the layer looks
|
||||
the same. Polygon geometry in a custom source is not drawn, and GeoJSON
|
||||
simplestyle properties (`marker-color`, `stroke` and the like) are not read.
|
||||
|
||||
Every line and marker from multipart cable or landing-point geometry stays tied
|
||||
to its source feature. Each part gets its own feature's styling, click
|
||||
destination and horizon-culling reference, and each source feature has one
|
||||
reference stem. The source collections are not modified.
|
||||
|
||||
Landing markers are ground-clamped billboards. A marker starts hidden and
|
||||
unclamped; the horizon sweep clamps and shows the visible ones 48 per rendered
|
||||
frame (`CABLE_LANDING_REVEALS_PER_FRAME`), so the terrain height reads are
|
||||
never one task. A marker is clamped once: Cesium then keeps it on the surface
|
||||
as terrain loads, and hiding or showing it again reads nothing; hiding is
|
||||
immediate.
|
||||
|
||||
Natural Earth regions and neighborhood polygon lookup are package exports.
|
||||
Their existing lazy loaders, retry behavior, bundled datasets and attribution
|
||||
are unchanged. The cable dataset remains CC BY-NC-SA 3.0 and is not covered by
|
||||
|
||||
@@ -376,7 +376,6 @@
|
||||
"modules": [
|
||||
"server/providers/firms.js",
|
||||
"server/providers/common/http.js",
|
||||
"server/providers/common/compress.js",
|
||||
"src/sources/httpBody.js",
|
||||
"src/i18n/marker.js",
|
||||
"src/data/firmsCsv.js"
|
||||
|
||||
+10
-58
@@ -3,12 +3,7 @@ import https from 'node:https';
|
||||
import { promises as fsp } from 'node:fs';
|
||||
import { Readable } from 'node:stream';
|
||||
|
||||
import {
|
||||
filterTrailing24h,
|
||||
parseFirmsCsv,
|
||||
trailing24hWindow,
|
||||
} from '../../src/data/firmsCsv.js';
|
||||
import { acceptsGzip, encodedBody, gzipBody } from './common/compress.js';
|
||||
import { filterTrailing24h, parseFirmsCsv } from '../../src/data/firmsCsv.js';
|
||||
import { readResponseTextCapped } from './common/http.js';
|
||||
|
||||
const NULL_BODY_STATUSES = new Set([204, 205, 304]);
|
||||
@@ -184,11 +179,6 @@ export function firmsProxy() {
|
||||
let statusCache = null;
|
||||
/** @type {?Promise<?{used: number, limit: number}>} */
|
||||
let statusInflight = null;
|
||||
/**
|
||||
* The last /api/firms payload as bytes, with its gzip. One slot.
|
||||
* @type {?{entry: object, stale: boolean, from: number, until: number, body: Buffer, gzip: ?Promise<?Buffer>}}
|
||||
*/
|
||||
let served = null;
|
||||
|
||||
const mapKey = () => String(process.env.FIRMS_MAP_KEY || '').trim();
|
||||
|
||||
@@ -269,8 +259,12 @@ export function firmsProxy() {
|
||||
return { at: now, sources, fires };
|
||||
}
|
||||
|
||||
/** Cache entry and the fires to serve from it → response payload. */
|
||||
function buildPayload(entry, stale, fires) {
|
||||
/**
|
||||
* Cache entry → response payload. Fires are RE-filtered to the trailing
|
||||
* 24 h at serve time so a stale cache never serves >24h-old detections.
|
||||
*/
|
||||
function buildPayload(entry, stale) {
|
||||
const fires = filterTrailing24h(entry.fires, Date.now());
|
||||
return {
|
||||
fetchedAt: entry.at,
|
||||
stale,
|
||||
@@ -281,32 +275,6 @@ export function firmsProxy() {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The payload as the bytes to send. Serialising the whole fire set is tens
|
||||
* of MB in a heavy season, so it is done once and kept, not once per request.
|
||||
*
|
||||
* Fires are RE-filtered to the trailing 24 h at serve time so a stale cache
|
||||
* never serves >24h-old detections. The kept bytes are therefore reused only
|
||||
* for the same entry and stale flag while the clock is inside the span over
|
||||
* which that filter keeps the same records: a request never gets a body that
|
||||
* serialising for it would not have produced.
|
||||
*/
|
||||
function payloadBody(entry, stale) {
|
||||
const now = Date.now();
|
||||
if (
|
||||
served?.entry === entry &&
|
||||
served.stale === stale &&
|
||||
now >= served.from &&
|
||||
now <= served.until
|
||||
) {
|
||||
return served;
|
||||
}
|
||||
const { kept, from, until } = trailing24hWindow(entry.fires, now);
|
||||
const body = Buffer.from(JSON.stringify(buildPayload(entry, stale, kept)));
|
||||
served = { entry, stale, from, until, body, gzip: null };
|
||||
return served;
|
||||
}
|
||||
|
||||
/** mapkey_status transactions, cached 5 min, best-effort (null on failure). */
|
||||
function getTransactions(key) {
|
||||
const now = Date.now();
|
||||
@@ -359,22 +327,6 @@ export function firmsProxy() {
|
||||
});
|
||||
res.end(JSON.stringify(obj));
|
||||
};
|
||||
const sendPayload = async (entry, stale) => {
|
||||
const kept = payloadBody(entry, stale);
|
||||
// Compressed once per kept body, on the first request that accepts
|
||||
// gzip, so an identity response never pays or waits for it.
|
||||
const gzip = acceptsGzip(req)
|
||||
? await (kept.gzip ??= gzipBody(kept.body).catch(() => null))
|
||||
: null;
|
||||
const encoded = encodedBody(req, kept.body, gzip);
|
||||
if (res.headersSent) return;
|
||||
res.writeHead(200, {
|
||||
'Content-Type': 'application/json',
|
||||
'Cache-Control': 'no-store',
|
||||
...encoded.headers,
|
||||
});
|
||||
res.end(encoded.body);
|
||||
};
|
||||
try {
|
||||
const subPath = String(req.url || '').split('?')[0];
|
||||
const key = mapKey();
|
||||
@@ -411,7 +363,7 @@ export function firmsProxy() {
|
||||
|
||||
const entry = mem;
|
||||
if (entry && Date.now() - entry.at < TTL_MS) {
|
||||
await sendPayload(entry, false);
|
||||
sendJson(200, buildPayload(entry, false));
|
||||
return;
|
||||
}
|
||||
// Stale or missing → refresh, single-flight (concurrent requests
|
||||
@@ -437,9 +389,9 @@ export function firmsProxy() {
|
||||
const pending = inflight;
|
||||
const fresh = await pending;
|
||||
if (fresh) {
|
||||
await sendPayload(fresh, false);
|
||||
sendJson(200, buildPayload(fresh, false));
|
||||
} else if (entry) {
|
||||
await sendPayload(entry, true); // upstream down — stale beats empty
|
||||
sendJson(200, buildPayload(entry, true)); // upstream down — stale beats empty
|
||||
} else {
|
||||
sendJson(502, {
|
||||
error: 'firms fetch failed and no cache available',
|
||||
|
||||
+2
-27
@@ -182,44 +182,19 @@ export function acquisitionMsUtc(acqDate, acqTime) {
|
||||
* @returns {Array<Object>} Filtered records (original objects, order preserved).
|
||||
*/
|
||||
export function filterTrailing24h(records, nowMs) {
|
||||
return trailing24hWindow(records, nowMs).kept;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@link filterTrailing24h} with the span of `nowMs` values, inclusive, over
|
||||
* which it keeps exactly these records. A caller holding something built from
|
||||
* `kept` can reuse it while its clock stays inside `from..until`.
|
||||
* @param {Array<{acqDate: string, acqTime: string|number}>} records - Parser records.
|
||||
* @param {number} nowMs - Reference epoch milliseconds.
|
||||
* @returns {{kept: Array<Object>, from: number, until: number}} Span in epoch
|
||||
* ms; NaN (never reusable) for unusable input.
|
||||
*/
|
||||
export function trailing24hWindow(records, nowMs) {
|
||||
if (!Array.isArray(records) || !Number.isFinite(nowMs))
|
||||
return { kept: [], from: NaN, until: NaN };
|
||||
if (!Array.isArray(records) || !Number.isFinite(nowMs)) return [];
|
||||
const oldest = nowMs - WINDOW_MS;
|
||||
const newest = nowMs + FORWARD_SLACK_MS;
|
||||
let from = -Infinity;
|
||||
let until = Infinity;
|
||||
const memo = new Map();
|
||||
const kept = records.filter((record) => {
|
||||
return records.filter((record) => {
|
||||
const key = `${record.acqDate}:${record.acqTime}`;
|
||||
let ms = memo.get(key);
|
||||
if (ms === undefined) {
|
||||
ms = acquisitionMsUtc(record.acqDate, record.acqTime);
|
||||
memo.set(key, ms);
|
||||
// Each distinct time narrows the span to the clock values that leave
|
||||
// it on the same side of the window.
|
||||
if (ms < oldest) from = Math.max(from, ms + WINDOW_MS + 1);
|
||||
else if (ms > newest) until = Math.min(until, ms - FORWARD_SLACK_MS - 1);
|
||||
else if (Number.isFinite(ms)) {
|
||||
from = Math.max(from, ms - FORWARD_SLACK_MS);
|
||||
until = Math.min(until, ms + WINDOW_MS);
|
||||
}
|
||||
}
|
||||
return Number.isFinite(ms) && ms >= oldest && ms <= newest;
|
||||
});
|
||||
return { kept, from, until };
|
||||
}
|
||||
|
||||
/** Trimmed string cell at index, '' for missing columns. */
|
||||
|
||||
@@ -7,15 +7,11 @@ import dnsLookup from 'node:dns';
|
||||
import https from 'node:https';
|
||||
import net from 'node:net';
|
||||
import { Readable } from 'node:stream';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { gunzipSync } from 'node:zlib';
|
||||
import { filterTrailing24h, parseFirmsCsv, trailing24hWindow } from './firmsCsv.js';
|
||||
import { filterTrailing24h, parseFirmsCsv } from './firmsCsv.js';
|
||||
import {
|
||||
describeFetchError,
|
||||
fetchFirms,
|
||||
fetchIpv4,
|
||||
firmsProxy,
|
||||
isAddressSelectionFailure,
|
||||
} from '../../server/providers/firms.js';
|
||||
|
||||
@@ -320,119 +316,3 @@ test('FIRMS requests only the satellites NASA still delivers', () => {
|
||||
// a MAP_KEY transaction.
|
||||
assert.ok(!SOURCES.includes('VIIRS_SNPP_NRT'));
|
||||
});
|
||||
|
||||
// The /api/firms handler itself, over a disk cache seeded in a temp directory:
|
||||
// no server, no upstream, and a placeholder MAP_KEY that is never sent anywhere.
|
||||
const TTL_MS = 30 * 60_000;
|
||||
const fire = (acqDate, acqTime, lat = 1) => ({ lat, lon: 2, frp: 4.5, confidence: 'n', brightness: 330.1,
|
||||
brightnessTi5: 290.2, daynight: 'D', acqDate, acqTime, satellite: 'N20', instrument: 'VIIRS' });
|
||||
const SERVED_SOURCES = SOURCES.map((source, index) => ({ source, count: index === 0 ? 20_001 : 0, ok: true }));
|
||||
// 20,000 detections an hour old and one that turns 24 h old five minutes after NOW.
|
||||
const SERVED_FIRES = [fire('2026-09-10', '1205'), ...Array.from({ length: 20_000 }, (_, i) => fire('2026-09-11', '1100', i / 1000))];
|
||||
const LEAVES_AT = NOW + 5 * 60_000;
|
||||
/** What the handler sent before it kept a body: one JSON.stringify of the payload per request. */
|
||||
const unfixedBody = (at, stale, now) => {
|
||||
const fires = filterTrailing24h(SERVED_FIRES, now);
|
||||
return JSON.stringify({ fetchedAt: at, stale, ttlMs: TTL_MS, sources: SERVED_SOURCES, count: fires.length, fires });
|
||||
};
|
||||
|
||||
function createFirmsHandler(t, at) {
|
||||
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'firms-proxy-'));
|
||||
fs.mkdirSync(path.join(dir, '.gev-cache'));
|
||||
fs.writeFileSync(path.join(dir, '.gev-cache', 'firms.json'), JSON.stringify({ at, sources: SERVED_SOURCES, fires: SERVED_FIRES }));
|
||||
const cwd = process.cwd();
|
||||
const key = process.env.FIRMS_MAP_KEY;
|
||||
const realFetch = globalThis.fetch;
|
||||
process.env.FIRMS_MAP_KEY = 'unit-test-placeholder';
|
||||
// A refresh must never reach NASA from a test: every upstream call fails.
|
||||
globalThis.fetch = async () => { throw new Error('upstream down'); };
|
||||
t.mock.method(console, 'warn', () => {});
|
||||
t.mock.timers.enable({ apis: ['Date'], now: NOW });
|
||||
t.after(() => {
|
||||
globalThis.fetch = realFetch;
|
||||
if (key === undefined) delete process.env.FIRMS_MAP_KEY; else process.env.FIRMS_MAP_KEY = key;
|
||||
fs.rmSync(dir, { recursive: true, force: true });
|
||||
});
|
||||
let handler;
|
||||
process.chdir(dir); // the proxy resolves its cache directory when created
|
||||
try {
|
||||
firmsProxy().configureServer({ middlewares: { use: (route, fn) => { handler = fn; } } });
|
||||
} finally {
|
||||
process.chdir(cwd);
|
||||
}
|
||||
return (acceptEncoding) => new Promise((resolve, reject) => {
|
||||
const res = {
|
||||
headersSent: false,
|
||||
writeHead(status, headers) { this.headersSent = true; this.status = status; this.headers = headers; },
|
||||
end(body) { resolve({ status: this.status, headers: this.headers, body }); },
|
||||
};
|
||||
handler({ url: '/', headers: acceptEncoding === undefined ? {} : { 'accept-encoding': acceptEncoding } }, res).catch(reject);
|
||||
});
|
||||
}
|
||||
|
||||
test('/api/firms serialises once for requests that share a payload', async (t) => {
|
||||
const request = createFirmsHandler(t, NOW);
|
||||
const first = await request();
|
||||
t.mock.timers.setTime(LEAVES_AT); // exactly 24 h old is still inside the window
|
||||
const second = await request();
|
||||
assert.equal(first.status, 200);
|
||||
assert.ok(Buffer.isBuffer(first.body), 'the body is kept as bytes');
|
||||
assert.equal(second.body, first.body, 'the second request sends the kept bytes, not a new serialisation');
|
||||
assert.equal(first.body.toString(), unfixedBody(NOW, false, NOW), 'byte-identical to the per-request serialisation');
|
||||
assert.equal(JSON.parse(first.body).count, 20_001);
|
||||
});
|
||||
|
||||
test('/api/firms sends gzip only to a client that accepts it', async (t) => {
|
||||
const request = createFirmsHandler(t, NOW);
|
||||
const identity = await request();
|
||||
const gzipped = await request('gzip, deflate, br');
|
||||
const refused = await request('gzip;q=0, br');
|
||||
assert.deepEqual(identity.headers,
|
||||
{ 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'Accept-Encoding' });
|
||||
assert.deepEqual(gzipped.headers, { 'Content-Type': 'application/json', 'Cache-Control': 'no-store',
|
||||
'Content-Encoding': 'gzip', Vary: 'Accept-Encoding' });
|
||||
assert.deepEqual(refused.headers, identity.headers);
|
||||
assert.equal(refused.body, identity.body);
|
||||
assert.ok(gzipped.body.byteLength < identity.body.byteLength / 4, 'the fire set compresses');
|
||||
assert.equal(gunzipSync(gzipped.body).toString(), unfixedBody(NOW, false, NOW), 'decodes to the identity bytes');
|
||||
assert.equal((await request('gzip')).body, gzipped.body, 'compressed once');
|
||||
});
|
||||
|
||||
test('/api/firms never reuses a body the request would not have produced', async (t) => {
|
||||
const request = createFirmsHandler(t, NOW - TTL_MS + 6 * 60_000);
|
||||
const at = NOW - TTL_MS + 6 * 60_000;
|
||||
const before = await request();
|
||||
t.mock.timers.setTime(LEAVES_AT + 1); // one detection is now older than 24 h
|
||||
const after = await request('gzip');
|
||||
assert.equal(before.body.toString(), unfixedBody(at, false, NOW));
|
||||
assert.equal(gunzipSync(after.body).toString(), unfixedBody(at, false, LEAVES_AT + 1));
|
||||
assert.equal(JSON.parse(gunzipSync(after.body)).count, 20_000);
|
||||
t.mock.timers.setTime(NOW + 6 * 60_000); // the entry reaches its TTL and the refresh fails
|
||||
const stale = await request();
|
||||
assert.equal(stale.body.toString(), unfixedBody(at, true, NOW + 6 * 60_000));
|
||||
assert.equal((await request()).body, stale.body, 'the stale body is kept too');
|
||||
});
|
||||
|
||||
test('trailing24hWindow spans the clock values that keep the same records', () => {
|
||||
const records = [fire('2026-09-10', '1205'), fire('2026-09-10', '1300'), fire('2026-09-11', '1100'),
|
||||
fire('2026-09-11', '1430'), fire('2026-09-11', '1600'), fire('bad-date', '1006')];
|
||||
const edges = records.map((r) => Date.parse(`${r.acqDate}T${r.acqTime.slice(0, 2)}:${r.acqTime.slice(2)}Z`))
|
||||
.filter(Number.isFinite).flatMap((ms) => [ms - 2 * 3600_000, ms + 24 * 3600_000]);
|
||||
assert.equal(edges.length, 10);
|
||||
const clocks = [NOW, ...edges.flatMap((ms) => [ms - 1, ms, ms + 1])];
|
||||
for (const now of clocks) {
|
||||
const { kept, from, until } = trailing24hWindow(records, now);
|
||||
assert.deepEqual(kept, filterTrailing24h(records, now));
|
||||
assert.ok(from <= now && now <= until, 'the span holds its own clock');
|
||||
for (const other of clocks) {
|
||||
const then = filterTrailing24h(records, other);
|
||||
const same = then.length === kept.length && then.every((r, i) => r === kept[i]);
|
||||
// Before the first record and after the last both keep nothing; the span covers one side.
|
||||
const bothEmpty = then.length === 0 && kept.length === 0;
|
||||
if (other >= from && other <= until) assert.ok(same, `${other} is inside the span of ${now}`);
|
||||
else assert.ok(!same || bothEmpty, `${other} is outside the span of ${now}`);
|
||||
}
|
||||
}
|
||||
assert.deepEqual(trailing24hWindow([], NOW), { kept: [], from: -Infinity, until: Infinity });
|
||||
assert.deepEqual(trailing24hWindow(records, NaN), { kept: [], from: NaN, until: NaN });
|
||||
});
|
||||
@@ -24,7 +24,6 @@ export {
|
||||
createCableOverlayEntry,
|
||||
cableClassificationTypeForStack,
|
||||
cableClassificationTypeForScene,
|
||||
applyTranslucentMarkerBlend,
|
||||
createCableReferenceSweepGate,
|
||||
updateCableReferenceStem,
|
||||
} from '../layers/submarineCables/index.js';
|
||||
File diff suppressed because it is too large.
Load diff
@@ -77,3 +77,58 @@ export function normalizeFeatures(json, kind) {
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function partPosition(value) {
|
||||
if (!Array.isArray(value)) return null;
|
||||
const lon = Number(value[0]);
|
||||
const lat = Number(value[1]);
|
||||
if (!Number.isFinite(lon) || !Number.isFinite(lat)) return null;
|
||||
const height = Number(value[2]);
|
||||
return Number.isFinite(height) ? [lon, lat, height] : [lon, lat];
|
||||
}
|
||||
|
||||
function collectParts(geometry, out) {
|
||||
const coordinates = geometry?.coordinates;
|
||||
switch (geometry?.type) {
|
||||
case 'Point': {
|
||||
const point = partPosition(coordinates);
|
||||
if (point) out.points.push(point);
|
||||
break;
|
||||
}
|
||||
case 'MultiPoint':
|
||||
for (const value of coordinates || []) {
|
||||
const point = partPosition(value);
|
||||
if (point) out.points.push(point);
|
||||
}
|
||||
break;
|
||||
case 'LineString': {
|
||||
const line = (coordinates || []).map(partPosition).filter(Boolean);
|
||||
if (line.length >= 2) out.lines.push(line);
|
||||
break;
|
||||
}
|
||||
case 'MultiLineString':
|
||||
for (const part of coordinates || []) {
|
||||
const line = (part || []).map(partPosition).filter(Boolean);
|
||||
if (line.length >= 2) out.lines.push(line);
|
||||
}
|
||||
break;
|
||||
case 'GeometryCollection':
|
||||
for (const child of geometry.geometries || []) collectParts(child, out);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The parts of a feature the layer draws: every line of a LineString or
|
||||
* MultiLineString and every point of a Point or MultiPoint, also inside a
|
||||
* GeometryCollection. Each is [lon, lat] or [lon, lat, height] in degrees
|
||||
* and metres. Polygons are not drawn.
|
||||
* @returns {{lines:number[][][],points:number[][]}}
|
||||
*/
|
||||
export function featureParts(feature) {
|
||||
const out = { lines: [], points: [] };
|
||||
collectParts(feature?.geometry, out);
|
||||
return out;
|
||||
}
|
||||
@@ -10,6 +10,7 @@ export function createSubmarineCableLayer({
|
||||
screenSpaceEventHandlerFactory,
|
||||
mapStackEventTarget = null,
|
||||
sweepClock = defaultSweepClock,
|
||||
createMarkerImage,
|
||||
}) {
|
||||
if (!source?.fetch || !source.label)
|
||||
throw new TypeError(
|
||||
@@ -23,6 +24,7 @@ export function createSubmarineCableLayer({
|
||||
source,
|
||||
screenSpaceEventHandlerFactory,
|
||||
mapStackEventTarget,
|
||||
createMarkerImage,
|
||||
};
|
||||
parts.rendering = createRendering(context);
|
||||
parts.ingestion = createIngestion(context);
|
||||
@@ -40,7 +42,6 @@ export {
|
||||
export {
|
||||
cableClassificationTypeForStack,
|
||||
cableClassificationTypeForScene,
|
||||
applyTranslucentMarkerBlend,
|
||||
} from './surface.js';
|
||||
export {
|
||||
CABLE_REFERENCE_LABEL_WINNER_CAP,
|
||||
|
||||
@@ -1,27 +1,82 @@
|
||||
import { msg, t } from '../../i18n/index.js';
|
||||
import {
|
||||
featureLabel,
|
||||
featureParts,
|
||||
featureReference,
|
||||
normalizeFeatures,
|
||||
} from './geometry.js';
|
||||
import * as Cesium from 'cesium';
|
||||
|
||||
const SOURCE_FEATURE_INDEX = '__gevSourceFeatureIndex';
|
||||
|
||||
function indexedCollection(features) {
|
||||
return {
|
||||
type: 'FeatureCollection',
|
||||
features: features.map((feature, index) => ({
|
||||
...feature,
|
||||
properties: {
|
||||
...feature.properties,
|
||||
[SOURCE_FEATURE_INDEX]: index,
|
||||
},
|
||||
})),
|
||||
};
|
||||
}
|
||||
const toCartesian = ([lon, lat, height]) =>
|
||||
Cesium.Cartesian3.fromDegrees(lon, lat, height ?? 0);
|
||||
|
||||
export function createIngestion({ state, parts, source }) {
|
||||
/**
|
||||
* Turn the two feature collections into what rendering draws. Every part
|
||||
* of a multipart feature is its own line or marker with its own pick
|
||||
* record, all sharing the feature's reference; a feature gets one
|
||||
* reference stem however many parts it has.
|
||||
*/
|
||||
function describeScene(cableFeatures, landingFeatures) {
|
||||
const lines = [];
|
||||
const markers = [];
|
||||
const references = [];
|
||||
const add = (features, kind, style) => {
|
||||
for (const feature of features) {
|
||||
const reference = featureReference(feature);
|
||||
if (!reference) continue;
|
||||
const label = featureLabel(feature);
|
||||
const base = Cesium.Cartesian3.fromDegrees(
|
||||
reference.lon,
|
||||
reference.lat,
|
||||
0,
|
||||
);
|
||||
const drawn = featureParts(feature);
|
||||
const pick = () =>
|
||||
parts.interaction.registerPick({ kind, reference, label });
|
||||
for (const line of drawn.lines)
|
||||
lines.push({
|
||||
info: pick(),
|
||||
base,
|
||||
positions: line.map(toCartesian),
|
||||
color: style.lineColor(feature),
|
||||
width: style.lineWidth,
|
||||
});
|
||||
for (const point of drawn.points)
|
||||
markers.push({
|
||||
info: pick(),
|
||||
base,
|
||||
position: toCartesian(point),
|
||||
hasHeight: point.length > 2,
|
||||
color: style.color,
|
||||
});
|
||||
references.push({
|
||||
reference,
|
||||
label,
|
||||
kind,
|
||||
color: style.color,
|
||||
feature,
|
||||
});
|
||||
}
|
||||
};
|
||||
add(cableFeatures, 'cable', {
|
||||
color: state.cableColor,
|
||||
lineWidth: 2.5,
|
||||
lineColor: (feature) => {
|
||||
const css = feature?.properties?.color;
|
||||
const color = css && Cesium.Color.fromCssColorString(String(css));
|
||||
return (color || state.cableColor).withAlpha(0.92);
|
||||
},
|
||||
});
|
||||
const landingLine = state.landingColor.withAlpha(0.9);
|
||||
add(landingFeatures, 'landing-point', {
|
||||
color: state.landingColor,
|
||||
lineWidth: 2,
|
||||
lineColor: () => landingLine,
|
||||
});
|
||||
return { lines, markers, references };
|
||||
}
|
||||
|
||||
async function load(viewer) {
|
||||
if (state._loading || state._loaded) return;
|
||||
|
||||
@@ -30,10 +85,10 @@ export function createIngestion({ state, parts, source }) {
|
||||
state._loadingLabel = t('loading...');
|
||||
// Ownership token (the militaryAwareness activationId pattern): a
|
||||
// disable/abort followed by a fresh enable starts a NEWER load while this
|
||||
// one is still settling. The stale load must bail after every await and
|
||||
// one is still settling. The stale load must bail after its await and
|
||||
// must never touch shared lifecycle state or the viewer it no longer
|
||||
// owns — clearing `_loading`/`_abort` for the successor is how duplicate
|
||||
// or post-destroy data sources got added.
|
||||
// or post-destroy primitives would get added.
|
||||
const generation = ++state._loadGeneration;
|
||||
const abort = new AbortController();
|
||||
state._abort = abort;
|
||||
@@ -41,170 +96,34 @@ export function createIngestion({ state, parts, source }) {
|
||||
generation === state._loadGeneration && !abort.signal.aborted;
|
||||
|
||||
try {
|
||||
let cableJson = state._cachedCableJson;
|
||||
let landingJson = state._cachedLandingJson;
|
||||
if (!cableJson || !landingJson) {
|
||||
({ cables: cableJson, landingPoints: landingJson } = await source.fetch(
|
||||
abort.signal,
|
||||
));
|
||||
if (!owns()) return;
|
||||
if (
|
||||
!Array.isArray(cableJson?.features) ||
|
||||
!Array.isArray(landingJson?.features)
|
||||
) {
|
||||
throw new TypeError(
|
||||
'A cable source must return cables and landingPoints GeoJSON collections',
|
||||
);
|
||||
}
|
||||
state._cachedCableJson = cableJson;
|
||||
state._cachedLandingJson = landingJson;
|
||||
const { cables: cableJson, landingPoints: landingJson } =
|
||||
await source.fetch(abort.signal);
|
||||
// The fetch is the only await: everything after it runs in this one
|
||||
// turn, so no disable or destroy can land between the ownership check
|
||||
// and the primitives reaching the scene.
|
||||
if (!owns()) return;
|
||||
if (
|
||||
!Array.isArray(cableJson?.features) ||
|
||||
!Array.isArray(landingJson?.features)
|
||||
) {
|
||||
throw new TypeError(
|
||||
'A cable source must return cables and landingPoints GeoJSON collections',
|
||||
);
|
||||
}
|
||||
|
||||
const cableFeatures = normalizeFeatures(cableJson, 'cable');
|
||||
const landingFeatures = normalizeFeatures(landingJson, 'landing');
|
||||
|
||||
const cableDataSource = await Cesium.GeoJsonDataSource.load(
|
||||
indexedCollection(cableFeatures),
|
||||
{
|
||||
clampToGround: true,
|
||||
stroke: state.cableColor.withAlpha(0.95),
|
||||
fill: state.cableColor.withAlpha(0.18),
|
||||
strokeWidth: 2,
|
||||
markerColor: state.cableColor,
|
||||
markerSize: 6,
|
||||
},
|
||||
);
|
||||
if (!owns()) return;
|
||||
const landingDataSource = await Cesium.GeoJsonDataSource.load(
|
||||
indexedCollection(landingFeatures),
|
||||
{
|
||||
clampToGround: true,
|
||||
stroke: state.landingColor.withAlpha(0.9),
|
||||
fill: state.landingColor.withAlpha(0.35),
|
||||
strokeWidth: 2,
|
||||
markerColor: state.landingColor,
|
||||
markerSize: 6,
|
||||
},
|
||||
);
|
||||
if (!owns()) return;
|
||||
|
||||
cableDataSource.name = `${source.label} Submarine Cables`;
|
||||
landingDataSource.name = `${source.label} Landing Points`;
|
||||
const referenceDataSource = new Cesium.CustomDataSource(
|
||||
`${source.label} Cable References`,
|
||||
);
|
||||
const addedSources = [
|
||||
cableDataSource,
|
||||
landingDataSource,
|
||||
referenceDataSource,
|
||||
];
|
||||
|
||||
// dataSources.add() is itself an await point: Cesium mutates the
|
||||
// collection on a DEFERRED tick, so a disable/destroy racing this
|
||||
// window finds nothing to remove and the adds still materialize
|
||||
// afterwards. Await every add to settlement (allSettled so a partial
|
||||
// failure cannot leave an unawaited add materializing later), then
|
||||
// re-check ownership. Pinned teardown mechanism: disable/destroy never
|
||||
// wait for in-flight adds — the stale generation's own post-await
|
||||
// check here guarantees cleanup by removing exactly the sources THIS
|
||||
// generation added.
|
||||
const addResults = await Promise.allSettled([
|
||||
viewer.dataSources.add(cableDataSource),
|
||||
viewer.dataSources.add(landingDataSource),
|
||||
viewer.dataSources.add(referenceDataSource),
|
||||
]);
|
||||
const rejectedAdd = addResults.find(
|
||||
(result) => result.status === 'rejected',
|
||||
);
|
||||
if (!owns() || rejectedAdd) {
|
||||
// Compensate: every add has settled by now, so removal is effective
|
||||
// (a remove inside the deferred window would have been a no-op).
|
||||
// Remove EVERY generation-local source regardless of settle status:
|
||||
// Cesium's add() pushes into the collection BEFORE raising
|
||||
// dataSourceAdded, so a REJECTED add may still have landed its
|
||||
// mutation. remove() of a never-added source is a harmless no-op.
|
||||
for (const source of addedSources) {
|
||||
try {
|
||||
viewer.dataSources.remove(source, true);
|
||||
} catch {
|
||||
/* collection gone */
|
||||
}
|
||||
}
|
||||
if (owns() && rejectedAdd) throw rejectedAdd.reason;
|
||||
return;
|
||||
try {
|
||||
parts.rendering.buildScene(
|
||||
viewer,
|
||||
describeScene(cableFeatures, landingFeatures),
|
||||
);
|
||||
} catch (error) {
|
||||
// Leave nothing half built in the scene.
|
||||
parts.rendering.destroyScene(viewer);
|
||||
throw error;
|
||||
}
|
||||
|
||||
// Await-free commit: the viewer accepted all three sources and this
|
||||
// load still owns the lifecycle.
|
||||
state._cableDataSource = cableDataSource;
|
||||
state._landingDataSource = landingDataSource;
|
||||
state._referenceDataSource = referenceDataSource;
|
||||
|
||||
const cableEntities = state._cableDataSource.entities.values;
|
||||
const landingEntities = state._landingDataSource.entities.values;
|
||||
state._pickByEntity = new WeakMap();
|
||||
state._referenceRecords = [];
|
||||
state._surfaceRecords = [];
|
||||
|
||||
// Cesium expands multipart geometry into several entities and suffixes
|
||||
// colliding IDs. Its copied properties retain this source index even
|
||||
// when a provider has no ID, so every segment keeps the right owner.
|
||||
const cableReferences = new Set();
|
||||
cableEntities.forEach((entity) => {
|
||||
const index = entity.properties?.[SOURCE_FEATURE_INDEX]?.getValue();
|
||||
const feature = cableFeatures[index];
|
||||
const reference = featureReference(feature);
|
||||
if (!reference) return;
|
||||
|
||||
parts.rendering.styleCableEntity(entity, feature);
|
||||
parts.interaction.registerPickEntity(entity, {
|
||||
kind: 'cable',
|
||||
reference,
|
||||
label: featureLabel(feature),
|
||||
});
|
||||
state._surfaceRecords.push({
|
||||
entity,
|
||||
base: Cesium.Cartesian3.fromDegrees(reference.lon, reference.lat, 0),
|
||||
});
|
||||
if (cableReferences.has(index)) return;
|
||||
cableReferences.add(index);
|
||||
parts.rendering.addReferenceStem({
|
||||
reference,
|
||||
label: featureLabel(feature),
|
||||
kind: 'cable',
|
||||
color: state.cableColor,
|
||||
feature,
|
||||
});
|
||||
});
|
||||
|
||||
const landingReferences = new Set();
|
||||
landingEntities.forEach((entity) => {
|
||||
const index = entity.properties?.[SOURCE_FEATURE_INDEX]?.getValue();
|
||||
const feature = landingFeatures[index];
|
||||
const reference = featureReference(feature);
|
||||
if (!reference) return;
|
||||
|
||||
parts.rendering.styleLandingEntity(entity, feature);
|
||||
parts.interaction.registerPickEntity(entity, {
|
||||
kind: 'landing-point',
|
||||
reference,
|
||||
label: featureLabel(feature),
|
||||
});
|
||||
state._surfaceRecords.push({
|
||||
entity,
|
||||
base: Cesium.Cartesian3.fromDegrees(reference.lon, reference.lat, 0),
|
||||
});
|
||||
if (landingReferences.has(index)) return;
|
||||
landingReferences.add(index);
|
||||
parts.rendering.addReferenceStem({
|
||||
reference,
|
||||
label: featureLabel(feature),
|
||||
kind: 'landing-point',
|
||||
color: state.landingColor,
|
||||
feature,
|
||||
});
|
||||
});
|
||||
|
||||
state._count = cableFeatures.length + landingFeatures.length;
|
||||
state._loaded = true;
|
||||
state._lastUpdate = Date.now();
|
||||
|
||||
@@ -2,9 +2,10 @@ import * as Cesium from 'cesium';
|
||||
import { isPointerFree } from '../../data/inputOwnership.js';
|
||||
|
||||
export function createInteraction({ state, screenSpaceEventHandlerFactory }) {
|
||||
function registerPickEntity(entity, info) {
|
||||
entity.__gevTeleGeography = info;
|
||||
state._pickByEntity.set(entity, info);
|
||||
/** Every drawn part carries its own record as the Cesium pick id. */
|
||||
function registerPick(info) {
|
||||
state._pickRecords.add(info);
|
||||
return info;
|
||||
}
|
||||
|
||||
function beginInteraction(viewer) {
|
||||
@@ -22,32 +23,8 @@ export function createInteraction({ state, screenSpaceEventHandlerFactory }) {
|
||||
}
|
||||
|
||||
function resolvePickRecord(picked) {
|
||||
if (!picked) return null;
|
||||
const primitive = picked.primitive;
|
||||
if (primitive) {
|
||||
const primitiveInfo = state._pickByEntity.get(primitive);
|
||||
if (primitiveInfo) return primitiveInfo;
|
||||
if (primitive.__gevTeleGeography) return primitive.__gevTeleGeography;
|
||||
if (
|
||||
primitive.id &&
|
||||
typeof primitive.id === 'object' &&
|
||||
primitive.id.reference
|
||||
) {
|
||||
return primitive.id;
|
||||
}
|
||||
}
|
||||
|
||||
const entity = picked.id;
|
||||
if (entity) {
|
||||
const entityInfo = state._pickByEntity.get(entity);
|
||||
if (entityInfo) return entityInfo;
|
||||
if (entity.__gevTeleGeography) return entity.__gevTeleGeography;
|
||||
if (entity.id && typeof entity.id === 'object' && entity.id.reference) {
|
||||
return entity.id;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
const info = picked?.id;
|
||||
return info && state._pickRecords.has(info) ? info : null;
|
||||
}
|
||||
|
||||
function flyToReference(viewer, reference) {
|
||||
@@ -70,7 +47,7 @@ export function createInteraction({ state, screenSpaceEventHandlerFactory }) {
|
||||
});
|
||||
}
|
||||
return {
|
||||
registerPickEntity,
|
||||
registerPick,
|
||||
beginInteraction,
|
||||
resolvePickRecord,
|
||||
flyToReference,
|
||||
|
||||
@@ -38,12 +38,13 @@ export function createLifecycle({ state, parts, source, mapStackEventTarget }) {
|
||||
// never emit moveEnd — reach the motion fallback. No render is
|
||||
// requested for a fallback sweep: it only fires while the camera is
|
||||
// already moving, so frames are flowing by construction.
|
||||
if (
|
||||
!state._enabled ||
|
||||
!state._loaded ||
|
||||
!state._referenceSweepGate.shouldRun(viewer.camera)
|
||||
)
|
||||
return;
|
||||
if (!state._enabled || !state._loaded) return;
|
||||
// Markers left over from the last sweep, a few per frame; line
|
||||
// shows and rebuilt stems waiting for their geometry.
|
||||
parts.rendering.revealLandingMarkers();
|
||||
parts.rendering.syncLineShow();
|
||||
parts.rendering.settleStems();
|
||||
if (!state._referenceSweepGate.shouldRun(viewer.camera)) return;
|
||||
parts.rendering.updateReferenceVisibility();
|
||||
},
|
||||
);
|
||||
@@ -80,10 +81,15 @@ export function createLifecycle({ state, parts, source, mapStackEventTarget }) {
|
||||
state._loading = false;
|
||||
state._loadingLabel = '';
|
||||
}
|
||||
// Free the entities rather than hide them; enable() rebuilds from the
|
||||
// cached JSON. An in-flight load's own post-await ownership check
|
||||
// removes whatever that stale generation adds later.
|
||||
parts.rendering.releaseDataSources(state._viewer);
|
||||
// Hide what is built and keep it: a hidden primitive is skipped by
|
||||
// the scene, so it costs nothing per frame, and the next enable shows
|
||||
// it again without a rebuild. Only the stems go: they are sized for
|
||||
// the view and the next sweep redraws them in a worker. An in-flight load's own post-await
|
||||
// ownership check stops that stale generation from building anything.
|
||||
state._pendingLandingReveals.length = 0;
|
||||
parts.rendering.dropStems();
|
||||
parts.rendering.updateVisibility();
|
||||
state._viewer?.scene?.requestRender?.();
|
||||
},
|
||||
|
||||
update(viewer) {
|
||||
@@ -92,9 +98,7 @@ export function createLifecycle({ state, parts, source, mapStackEventTarget }) {
|
||||
|
||||
destroy(viewer) {
|
||||
if (state._abort) state._abort.abort();
|
||||
parts.rendering.releaseDataSources(viewer || state._viewer);
|
||||
state._cachedCableJson = null;
|
||||
state._cachedLandingJson = null;
|
||||
parts.rendering.destroyScene(viewer || state._viewer);
|
||||
// hide() clears every published host entry and goes invisible while
|
||||
// keeping the publisher reusable — the legacy layer supported re-init
|
||||
// after destroy, and hidden publishers already drop late publishes.
|
||||
@@ -128,16 +132,6 @@ export function createLifecycle({ state, parts, source, mapStackEventTarget }) {
|
||||
state._error = null;
|
||||
state._lastUpdate = null;
|
||||
state._loadingLabel = '';
|
||||
state._cableDataSource = null;
|
||||
state._landingDataSource = null;
|
||||
state._referenceDataSource = null;
|
||||
state._referenceRecords = [];
|
||||
state._surfaceRecords = [];
|
||||
state._pickByEntity = new WeakMap();
|
||||
state._referenceLabelCount = 0;
|
||||
state._publishScratch.length = 0;
|
||||
state._markerBlendDone = false;
|
||||
state._markerBlendInvariantWarned = false;
|
||||
parts.rendering.resetPublishSignature();
|
||||
state._referenceSweepGate.reset();
|
||||
},
|
||||
|
||||
@@ -41,7 +41,7 @@ export function selectCableReferenceLabelWinners(
|
||||
.sort(
|
||||
(a, b) =>
|
||||
a.distanceM - b.distanceM ||
|
||||
String(a.entity?.id || '').localeCompare(String(b.entity?.id || '')),
|
||||
String(a.id || '').localeCompare(String(b.id || '')),
|
||||
)
|
||||
.slice(0, cap);
|
||||
}
|
||||
@@ -248,16 +248,15 @@ export function createCableReferenceSweepGate({
|
||||
}
|
||||
|
||||
/**
|
||||
* Recompute one staticized stem on the sweep cadence. Replaces the former
|
||||
* per-frame `CallbackProperty` pair: constant properties are redefined only
|
||||
* when the camera-scaled tip moved beyond the settle epsilon, and the two
|
||||
* preallocated position buffers alternate so each real change raises exactly
|
||||
* one geometry notification (the localGeojson double-buffer pattern).
|
||||
* @param {object} record Reference record with entity/base/tip/nextTip/buffers.
|
||||
* Recompute one stem tip on the sweep cadence. The tip is moved in place, so
|
||||
* the label entry keeps pointing at it, and only when the camera-scaled tip
|
||||
* moved beyond the settle epsilon; the tip point follows with one buffer
|
||||
* write, and the caller redraws the stems when any tip moved.
|
||||
* @param {object} record Reference record with point/base/tip/nextTip.
|
||||
* @param {Cesium.Cartesian3} cameraPositionWC
|
||||
* @param {number} canvasHeight CSS-pixel canvas height.
|
||||
* @param {number} fov Camera frustum field of view (radians).
|
||||
* @returns {boolean} True when the stem geometry was redefined.
|
||||
* @returns {boolean} True when the tip moved.
|
||||
*/
|
||||
|
||||
export function updateCableReferenceStem(
|
||||
@@ -289,13 +288,7 @@ export function updateCableReferenceStem(
|
||||
return false;
|
||||
}
|
||||
Cesium.Cartesian3.clone(record.nextTip, record.tip);
|
||||
record.stemPositionBufferIndex = 1 - record.stemPositionBufferIndex;
|
||||
const stemPositions =
|
||||
record.stemPositionBuffers[record.stemPositionBufferIndex];
|
||||
stemPositions[0] = record.base;
|
||||
stemPositions[1] = record.tip;
|
||||
record.entity.position.setValue(record.tip);
|
||||
record.entity.polyline.positions.setValue(stemPositions);
|
||||
record.point.position = record.tip;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import * as Cesium from 'cesium';
|
||||
|
||||
export const BASE_CABLE_COLOR = '#39d5ff';
|
||||
|
||||
export const BASE_LANDING_COLOR = '#8fffd2';
|
||||
@@ -66,6 +64,22 @@ export const CABLE_LABEL_DEPTH_DECISION = Object.freeze({
|
||||
depthTested: false,
|
||||
});
|
||||
|
||||
/**
|
||||
* Landing markers clamped to the ground per rendered frame. A marker is put
|
||||
* on the surface the first time it comes into view, and that reads the
|
||||
* terrain height under it. Doing it for all 1,917 in the frame after the
|
||||
* layer was switched on was a single task (measured 1.2 s on a loaded
|
||||
* globe); a few dozen per frame keeps each frame short and the markers still
|
||||
* fill in within a second. A marker is clamped once: after that Cesium moves
|
||||
* it as terrain loads, and hiding or showing it reads nothing.
|
||||
*/
|
||||
|
||||
export const CABLE_LANDING_REVEALS_PER_FRAME = 48;
|
||||
|
||||
/** Pixel size of the marker drawn for point geometry (GeoJSON's small pin). */
|
||||
|
||||
export const CABLE_MARKER_SIZE = 6;
|
||||
|
||||
/**
|
||||
* `MAP_STACKS` ids that render imagery on the SHOWN Cesium globe (the ion
|
||||
* Bing stacks + OSM). Deliberately an explicit allowlist, not "anything that
|
||||
@@ -81,19 +95,6 @@ export const CABLE_GLOBE_STACK_IDS = Object.freeze(
|
||||
new Set(['bing-aerial', 'bing-labels', 'esri-imagery', 'osm']),
|
||||
);
|
||||
|
||||
/** EntityCluster's private marker collections and their required types. */
|
||||
|
||||
export const MARKER_COLLECTION_EXPECTATIONS = Object.freeze([
|
||||
Object.freeze({
|
||||
key: '_billboardCollection',
|
||||
type: Cesium.BillboardCollection,
|
||||
}),
|
||||
Object.freeze({
|
||||
key: '_pointCollection',
|
||||
type: Cesium.PointPrimitiveCollection,
|
||||
}),
|
||||
]);
|
||||
|
||||
/**
|
||||
* Monotonic clock for the sweep gate's motion probe. A hoisted declaration:
|
||||
* the module's `export default createTeleGeographySubmarineCableLayer()`
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import * as Cesium from 'cesium';
|
||||
import {
|
||||
probeTranslucentMarkerBlend,
|
||||
commitTranslucentMarkerBlend,
|
||||
} from './surface.js';
|
||||
CABLE_LANDING_REVEALS_PER_FRAME,
|
||||
CABLE_MARKER_SIZE,
|
||||
} from './policy.js';
|
||||
import {
|
||||
clampLabel,
|
||||
createCableOverlayEntry,
|
||||
@@ -11,7 +11,13 @@ import {
|
||||
cableReferencePriority,
|
||||
} from './overlay.js';
|
||||
|
||||
export function createRendering({ state }) {
|
||||
const defaultMarkerImage = (color) =>
|
||||
new Cesium.PinBuilder().fromColor(color, CABLE_MARKER_SIZE);
|
||||
|
||||
export function createRendering({
|
||||
state,
|
||||
createMarkerImage = defaultMarkerImage,
|
||||
}) {
|
||||
function resetPublishSignature() {
|
||||
state._lastPublishedIds.length = 0;
|
||||
state._lastPublishedPriorities.length = 0;
|
||||
@@ -19,129 +25,131 @@ export function createRendering({ state }) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the three data sources from the viewer and forget the built
|
||||
* entities. Hiding them (`show = false`) is NOT enough: Cesium's
|
||||
* DataSourceDisplay still walks every visualizer of a hidden source on
|
||||
* every frame, and the thousands of hidden polylines/billboards keep
|
||||
* costing CPU and GC pressure long after the user toggled the layer off —
|
||||
* that is the "everything gets sluggish after I turn layers off" report.
|
||||
* The fetched JSON stays cached, so the next enable rebuilds without a
|
||||
* network round trip or a re-parse.
|
||||
* Build everything the layer draws, in one synchronous pass with no entity
|
||||
* per feature. The layer used to load two GeoJsonDataSources and a
|
||||
* CustomDataSource: 6,459 entities whose creation held about 1 GB of
|
||||
* short-lived heap, whose visualizers ran 100–250 ms tasks whenever shows
|
||||
* or stems changed, and whose removal on disable was a 150 ms task. These
|
||||
* are the primitives Cesium built from those entities, made directly:
|
||||
*
|
||||
* - lines: one GroundPolylinePrimitive, a colour and a show flag per line
|
||||
* (Cesium's own batch for clamped colour polylines), tessellated in a
|
||||
* worker;
|
||||
* - point markers: one BillboardCollection, each billboard hidden and
|
||||
* unclamped until revealLandingMarkers puts it on the ground;
|
||||
* - references: one PointPrimitiveCollection for the tips, whose positions
|
||||
* and shows are plain buffer writes, and one Primitive of polylines for
|
||||
* the stems (see rebuildStems).
|
||||
*
|
||||
* `lines`, `markers` and `references` come from ingestion; each line and
|
||||
* marker carries the pick record Cesium returns as the pick id.
|
||||
*/
|
||||
|
||||
function releaseDataSources(viewer) {
|
||||
const sources = [
|
||||
state._cableDataSource,
|
||||
state._landingDataSource,
|
||||
state._referenceDataSource,
|
||||
];
|
||||
state._cableDataSource = null;
|
||||
state._landingDataSource = null;
|
||||
state._referenceDataSource = null;
|
||||
function buildScene(viewer, { lines, markers, references }) {
|
||||
const scene = viewer.scene;
|
||||
state._lineRecords = [];
|
||||
state._markerRecords = [];
|
||||
state._referenceRecords = [];
|
||||
state._surfaceRecords = [];
|
||||
state._pickByEntity = new WeakMap();
|
||||
state._referenceLabelCount = 0;
|
||||
state._publishScratch.length = 0;
|
||||
// The blend pass targets the collections being dropped; the rebuilt
|
||||
// sources need their own pass.
|
||||
state._markerBlendDone = false;
|
||||
state._loaded = false;
|
||||
state._referenceSweepGate.reset();
|
||||
for (const source of sources) {
|
||||
if (!source) continue;
|
||||
try {
|
||||
viewer?.dataSources?.remove(source, true);
|
||||
} catch {
|
||||
/* collection gone */
|
||||
}
|
||||
}
|
||||
}
|
||||
state._pendingLandingReveals.length = 0;
|
||||
|
||||
function updateVisibility() {
|
||||
if (state._cableDataSource) state._cableDataSource.show = state._enabled;
|
||||
if (state._landingDataSource)
|
||||
state._landingDataSource.show = state._enabled;
|
||||
if (state._referenceDataSource)
|
||||
state._referenceDataSource.show = state._enabled;
|
||||
}
|
||||
|
||||
function styleCableEntity(entity, feature) {
|
||||
if (!entity?.polyline) return;
|
||||
const color = feature?.properties?.color
|
||||
? Cesium.Color.fromCssColorString(String(feature.properties.color))
|
||||
: state.cableColor;
|
||||
entity.polyline.material = color.withAlpha(0.92);
|
||||
entity.polyline.width = 2.5;
|
||||
entity.polyline.clampToGround = true;
|
||||
entity.polyline.classificationType = state._classificationType;
|
||||
entity.show = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply the single translucent blend pass to the landing-billboard and
|
||||
* reference-point collections. Landing entities carry only billboards and
|
||||
* reference entities only points, so completion is one applied collection
|
||||
* per source; a failed shape probe disables the optimization permanently
|
||||
* for this session and says so loudly in dev builds.
|
||||
* Both sources are probed BEFORE either is committed, so the helper's
|
||||
* "defaults untouched on shape drift" fallback holds across the pair too —
|
||||
* a reference-source failure can never leave the landing source already
|
||||
* forced to TRANSLUCENT.
|
||||
*/
|
||||
|
||||
function applyMarkerBlendOnce() {
|
||||
const landing = probeTranslucentMarkerBlend(state._landingDataSource);
|
||||
const reference = probeTranslucentMarkerBlend(state._referenceDataSource);
|
||||
if (landing.invariantFailed || reference.invariantFailed) {
|
||||
state._markerBlendDone = true;
|
||||
if (!state._markerBlendInvariantWarned && import.meta.env?.DEV === true) {
|
||||
state._markerBlendInvariantWarned = true;
|
||||
console.error(
|
||||
'[Data:telegeography-submarine-cables] EntityCluster marker-collection ' +
|
||||
'shape changed — single-pass translucent blend skipped; markers fall ' +
|
||||
"back to Cesium's default two-pass blend.",
|
||||
if (lines.length) {
|
||||
// The entity display gave every line this attribute too. It is a float
|
||||
// attribute, and with one present Cesium keeps the per-line width as a
|
||||
// float; without it the 2.5 px width is stored as a byte and draws 2 px.
|
||||
const always =
|
||||
Cesium.DistanceDisplayConditionGeometryInstanceAttribute.fromDistanceDisplayCondition(
|
||||
new Cesium.DistanceDisplayCondition(),
|
||||
);
|
||||
const instances = lines.map(
|
||||
(line) =>
|
||||
new Cesium.GeometryInstance({
|
||||
id: line.info,
|
||||
geometry: new Cesium.GroundPolylineGeometry({
|
||||
positions: line.positions,
|
||||
width: line.width,
|
||||
// GeoJSON lines are rhumb lines (GeoJsonDataSource's choice).
|
||||
arcType: Cesium.ArcType.RHUMB,
|
||||
}),
|
||||
attributes: {
|
||||
color: Cesium.ColorGeometryInstanceAttribute.fromColor(
|
||||
line.color,
|
||||
),
|
||||
show: new Cesium.ShowGeometryInstanceAttribute(true),
|
||||
distanceDisplayCondition: always,
|
||||
},
|
||||
}),
|
||||
);
|
||||
state._cablePrimitive = scene.groundPrimitives.add(
|
||||
new Cesium.GroundPolylinePrimitive({
|
||||
geometryInstances: instances,
|
||||
appearance: new Cesium.PolylineColorAppearance(),
|
||||
classificationType: state._classificationType,
|
||||
asynchronous: true,
|
||||
show: state._enabled,
|
||||
}),
|
||||
);
|
||||
for (const line of lines)
|
||||
state._lineRecords.push({
|
||||
info: line.info,
|
||||
base: line.base,
|
||||
visible: true,
|
||||
shown: true,
|
||||
attributes: null,
|
||||
});
|
||||
}
|
||||
|
||||
if (markers.length) {
|
||||
// Every marker is translucent, so one blend pass, not Cesium's two.
|
||||
const billboards = scene.primitives.add(
|
||||
new Cesium.BillboardCollection({
|
||||
scene,
|
||||
blendOption: Cesium.BlendOption.TRANSLUCENT,
|
||||
show: state._enabled,
|
||||
}),
|
||||
);
|
||||
state._markerBillboards = billboards;
|
||||
const images = new Map();
|
||||
for (const marker of markers) {
|
||||
const key = marker.color.toCssHexString();
|
||||
let image = images.get(key);
|
||||
if (!image) {
|
||||
image = {
|
||||
id: `gev-cable-marker-${key}`,
|
||||
source: createMarkerImage(marker.color),
|
||||
};
|
||||
images.set(key, image);
|
||||
}
|
||||
const billboard = billboards.add({
|
||||
id: marker.info,
|
||||
position: marker.position,
|
||||
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
||||
show: false,
|
||||
});
|
||||
billboard.setImage(image.id, image.source);
|
||||
state._markerRecords.push({
|
||||
info: marker.info,
|
||||
marker: billboard,
|
||||
base: marker.base,
|
||||
// A position with its own height is drawn there, as before.
|
||||
clamped: marker.hasHeight,
|
||||
visible: false,
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
const landingBlend = commitTranslucentMarkerBlend(landing);
|
||||
const referenceBlend = commitTranslucentMarkerBlend(reference);
|
||||
if (landingBlend.applied > 0 && referenceBlend.applied > 0)
|
||||
state._markerBlendDone = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-classify every cable ground line for the active surface. One batched
|
||||
* ground-primitive rebuild per stack switch — never per frame.
|
||||
* @param {Cesium.ClassificationType} next
|
||||
*/
|
||||
|
||||
function applyCableClassification(next) {
|
||||
if (next === undefined || next === state._classificationType) return;
|
||||
state._classificationType = next;
|
||||
if (!state._cableDataSource) return;
|
||||
const entities = state._cableDataSource.entities.values;
|
||||
for (let i = 0; i < entities.length; i++) {
|
||||
const polyline = entities[i].polyline;
|
||||
if (polyline) polyline.classificationType = next;
|
||||
if (references.length) {
|
||||
state._referencePoints = scene.primitives.add(
|
||||
new Cesium.PointPrimitiveCollection({
|
||||
blendOption: Cesium.BlendOption.TRANSLUCENT,
|
||||
show: state._enabled,
|
||||
}),
|
||||
);
|
||||
for (const reference of references) addReferenceStem(reference);
|
||||
}
|
||||
state._viewer?.scene?.requestRender?.();
|
||||
}
|
||||
|
||||
function styleLandingEntity(entity, feature) {
|
||||
if (!entity?.point) return;
|
||||
entity.point.color = state.landingColor.withAlpha(0.92);
|
||||
entity.point.pixelSize = feature?.properties?.is_tbd ? 6 : 7;
|
||||
entity.point.outlineColor = state.cableOutline;
|
||||
entity.point.outlineWidth = 1;
|
||||
entity.point.disableDepthTestDistance = 0;
|
||||
entity.show = true;
|
||||
state._lineShowDirty = false;
|
||||
}
|
||||
|
||||
function addReferenceStem({ reference, label, kind, color, feature }) {
|
||||
if (!state._referenceDataSource || !reference) return;
|
||||
|
||||
const base = Cesium.Cartesian3.fromDegrees(reference.lon, reference.lat, 0);
|
||||
const tip = Cesium.Cartesian3.fromDegrees(
|
||||
reference.lon,
|
||||
@@ -154,42 +162,31 @@ export function createRendering({ state }) {
|
||||
label,
|
||||
featureId: feature?.id || feature?.properties?.id || null,
|
||||
};
|
||||
state._pickRecords.add(info);
|
||||
const pointColor = color.withAlpha(kind === 'cable' ? 0.84 : 0.94);
|
||||
const stemColor = color.withAlpha(kind === 'cable' ? 0.58 : 0.68);
|
||||
// Constant properties on the sweep cadence, never per-frame callbacks:
|
||||
// the sweep redefines them through the alternating buffers below.
|
||||
const stemPositionBuffers = [
|
||||
[base, tip],
|
||||
[base, tip],
|
||||
];
|
||||
|
||||
const entity = state._referenceDataSource.entities.add({
|
||||
id: `${kind}-reference-${state._referenceRecords.length}-${info.featureId || 'feature'}`,
|
||||
// The tip is moved in place on the sweep cadence (overlay.js), never by a
|
||||
// per-frame callback.
|
||||
const point = state._referencePoints.add({
|
||||
id: info,
|
||||
position: tip,
|
||||
polyline: {
|
||||
positions: stemPositionBuffers[0],
|
||||
width: kind === 'cable' ? 2 : 2.4,
|
||||
material: new Cesium.ColorMaterialProperty(stemColor),
|
||||
},
|
||||
point: {
|
||||
pixelSize: kind === 'cable' ? 7 : 8,
|
||||
color: pointColor,
|
||||
outlineColor: Cesium.Color.BLACK.withAlpha(0.65),
|
||||
outlineWidth: 1,
|
||||
disableDepthTestDistance: 0,
|
||||
},
|
||||
pixelSize: kind === 'cable' ? 7 : 8,
|
||||
color: pointColor,
|
||||
outlineColor: Cesium.Color.BLACK.withAlpha(0.65),
|
||||
outlineWidth: 1,
|
||||
disableDepthTestDistance: 0,
|
||||
show: false,
|
||||
});
|
||||
|
||||
entity.__gevTeleGeography = info;
|
||||
state._pickByEntity.set(entity, info);
|
||||
const record = {
|
||||
id: entity.id,
|
||||
entity,
|
||||
id: `${kind}-reference-${state._referenceRecords.length}-${info.featureId || 'feature'}`,
|
||||
info,
|
||||
point,
|
||||
base,
|
||||
tip,
|
||||
nextTip: Cesium.Cartesian3.clone(tip),
|
||||
stemPositionBuffers,
|
||||
stemPositionBufferIndex: 0,
|
||||
stemColor: Cesium.ColorGeometryInstanceAttribute.fromColor(
|
||||
color.withAlpha(kind === 'cable' ? 0.58 : 0.68),
|
||||
),
|
||||
stemWidth: kind === 'cable' ? 2 : 2.4,
|
||||
reference,
|
||||
kind,
|
||||
label: clampLabel(label),
|
||||
@@ -201,6 +198,212 @@ export function createRendering({ state }) {
|
||||
state._referenceRecords.push(record);
|
||||
}
|
||||
|
||||
/**
|
||||
* Draw the stems of the references now in view, base to tip. Stems are one
|
||||
* static polyline primitive, as the entity display batched them: nothing
|
||||
* runs for it per frame, and a stem's length cannot change without new
|
||||
* geometry. So a sweep that moved a tip or changed which references are
|
||||
* in view builds a replacement in a worker, and settleStems swaps it in
|
||||
* once it is ready; the previous stems stay until then. A sweep that
|
||||
* changed nothing builds nothing.
|
||||
*/
|
||||
|
||||
function rebuildStems() {
|
||||
const primitives = state._viewer?.scene?.primitives;
|
||||
if (!primitives) return;
|
||||
if (state._stemPrimitivePending) {
|
||||
// Superseded before it was ever shown.
|
||||
primitives.remove(state._stemPrimitivePending);
|
||||
state._stemPrimitivePending = null;
|
||||
}
|
||||
const instances = [];
|
||||
for (const record of state._referenceRecords) {
|
||||
if (!record.visible) continue;
|
||||
instances.push(
|
||||
new Cesium.GeometryInstance({
|
||||
id: record.info,
|
||||
geometry: new Cesium.PolylineGeometry({
|
||||
positions: [record.base, record.tip],
|
||||
width: record.stemWidth,
|
||||
vertexFormat: Cesium.PolylineColorAppearance.VERTEX_FORMAT,
|
||||
}),
|
||||
attributes: { color: record.stemColor },
|
||||
}),
|
||||
);
|
||||
}
|
||||
state._stemsDirty = false;
|
||||
if (!instances.length) {
|
||||
if (state._stemPrimitive) primitives.remove(state._stemPrimitive);
|
||||
state._stemPrimitive = null;
|
||||
return;
|
||||
}
|
||||
state._stemPrimitivePending = primitives.add(
|
||||
new Cesium.Primitive({
|
||||
geometryInstances: instances,
|
||||
appearance: new Cesium.PolylineColorAppearance({ translucent: true }),
|
||||
asynchronous: true,
|
||||
// Hidden while it builds; settleStems shows it.
|
||||
show: false,
|
||||
}),
|
||||
);
|
||||
state._viewer.scene.requestRender?.();
|
||||
}
|
||||
|
||||
/** Swap in rebuilt stems once their geometry is ready; called per frame. */
|
||||
|
||||
function settleStems() {
|
||||
const pending = state._stemPrimitivePending;
|
||||
if (!pending) return;
|
||||
const scene = state._viewer?.scene;
|
||||
if (!pending.ready) {
|
||||
// Keep frames coming until the geometry is in.
|
||||
scene?.requestRender?.();
|
||||
return;
|
||||
}
|
||||
pending.show = state._enabled;
|
||||
if (state._stemPrimitive) scene?.primitives?.remove(state._stemPrimitive);
|
||||
state._stemPrimitive = pending;
|
||||
state._stemPrimitivePending = null;
|
||||
scene?.requestRender?.();
|
||||
}
|
||||
|
||||
/** Remove and destroy everything buildScene made. Only destroy() does this;
|
||||
* a disable hides the primitives and keeps them for the next enable. */
|
||||
|
||||
function destroyScene(viewer) {
|
||||
const scene = viewer?.scene;
|
||||
const owned = [
|
||||
[scene?.groundPrimitives, state._cablePrimitive],
|
||||
[scene?.primitives, state._markerBillboards],
|
||||
[scene?.primitives, state._stemPrimitive],
|
||||
[scene?.primitives, state._stemPrimitivePending],
|
||||
[scene?.primitives, state._referencePoints],
|
||||
];
|
||||
state._cablePrimitive = null;
|
||||
state._markerBillboards = null;
|
||||
state._stemPrimitive = null;
|
||||
state._stemPrimitivePending = null;
|
||||
state._stemsDirty = false;
|
||||
state._referencePoints = null;
|
||||
state._referenceRecords = [];
|
||||
state._lineRecords = [];
|
||||
state._markerRecords = [];
|
||||
state._lineShowDirty = false;
|
||||
state._pendingLandingReveals.length = 0;
|
||||
state._pickRecords = new WeakSet();
|
||||
state._referenceLabelCount = 0;
|
||||
state._publishScratch.length = 0;
|
||||
state._loaded = false;
|
||||
state._referenceSweepGate.reset();
|
||||
for (const [collection, primitive] of owned) {
|
||||
if (!primitive) continue;
|
||||
try {
|
||||
// A collection destroys what it removes; one that is already gone
|
||||
// has destroyed it too.
|
||||
if (!collection?.remove?.(primitive) && !primitive.isDestroyed())
|
||||
primitive.destroy();
|
||||
} catch {
|
||||
/* collection gone */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Drop the stems, shown and building, so the next sweep draws them afresh.
|
||||
* A disable does this: stems kept from the view the layer was switched off
|
||||
* in would show at their old lengths until the rebuild for the new view
|
||||
* was ready.
|
||||
*/
|
||||
|
||||
function dropStems() {
|
||||
const primitives = state._viewer?.scene?.primitives;
|
||||
for (const primitive of [state._stemPrimitive, state._stemPrimitivePending])
|
||||
if (primitive) primitives?.remove(primitive);
|
||||
state._stemPrimitive = null;
|
||||
state._stemPrimitivePending = null;
|
||||
state._stemsDirty = true;
|
||||
}
|
||||
|
||||
function updateVisibility() {
|
||||
for (const primitive of [
|
||||
state._cablePrimitive,
|
||||
state._markerBillboards,
|
||||
state._stemPrimitive,
|
||||
state._referencePoints,
|
||||
])
|
||||
if (primitive) primitive.show = state._enabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-classify the cable ground lines for the active surface. The primitive
|
||||
* reads its classification as it queues commands, so this is one
|
||||
* assignment per stack switch and no rebuild.
|
||||
* @param {Cesium.ClassificationType} next
|
||||
*/
|
||||
|
||||
function applyCableClassification(next) {
|
||||
if (next === undefined || next === state._classificationType) return;
|
||||
state._classificationType = next;
|
||||
if (!state._cablePrimitive) return;
|
||||
state._cablePrimitive.classificationType = next;
|
||||
state._viewer?.scene?.requestRender?.();
|
||||
}
|
||||
|
||||
/**
|
||||
* Write the line show states the last sweep worked out. The primitive
|
||||
* builds its geometry in a worker and has no per-line attributes until it
|
||||
* is ready, so the states wait in the records until then.
|
||||
*/
|
||||
|
||||
function syncLineShow() {
|
||||
if (!state._lineShowDirty) return;
|
||||
const primitive = state._cablePrimitive;
|
||||
if (!primitive?.ready) {
|
||||
// Keep frames coming until the geometry is in.
|
||||
if (primitive) state._viewer?.scene?.requestRender?.();
|
||||
return;
|
||||
}
|
||||
for (const record of state._lineRecords) {
|
||||
if (record.shown === record.visible) continue;
|
||||
record.attributes ??= primitive.getGeometryInstanceAttributes(
|
||||
record.info,
|
||||
);
|
||||
if (!record.attributes) continue;
|
||||
record.attributes.show = Cesium.ShowGeometryInstanceAttribute.toValue(
|
||||
record.visible,
|
||||
record.attributes.show,
|
||||
);
|
||||
record.shown = record.visible;
|
||||
}
|
||||
state._lineShowDirty = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Put the next few markers the last sweep found visible on the ground and
|
||||
* show them, and ask for another frame while any are left. Called from the
|
||||
* sweep and then once per rendered frame, so a parked camera costs nothing
|
||||
* once the list is empty. Clamping is what reads the terrain height, once
|
||||
* per marker; Cesium then keeps the marker on the surface as terrain loads,
|
||||
* within its own per-frame time budget.
|
||||
*/
|
||||
|
||||
function revealLandingMarkers() {
|
||||
const pending = state._pendingLandingReveals;
|
||||
if (!pending.length) return;
|
||||
let budget = CABLE_LANDING_REVEALS_PER_FRAME;
|
||||
while (pending.length && budget > 0) {
|
||||
const record = pending.pop();
|
||||
if (!record.visible || record.marker.show) continue;
|
||||
if (!record.clamped) {
|
||||
record.marker.heightReference = Cesium.HeightReference.CLAMP_TO_GROUND;
|
||||
record.clamped = true;
|
||||
budget--;
|
||||
}
|
||||
record.marker.show = true;
|
||||
}
|
||||
if (pending.length) state._viewer?.scene?.requestRender?.();
|
||||
}
|
||||
|
||||
function updateReferenceVisibility() {
|
||||
if (!state._enabled || !state._viewer?.camera) return;
|
||||
const cameraPos = state._viewer.camera.positionWC;
|
||||
@@ -216,20 +419,35 @@ export function createRendering({ state }) {
|
||||
const visible = occluder.isPointVisible(record.base);
|
||||
record.visible = visible;
|
||||
record.distanceM = Cesium.Cartesian3.distance(cameraPos, record.base);
|
||||
if (record.entity.show !== visible) {
|
||||
record.entity.show = visible;
|
||||
if (record.point.show !== visible) {
|
||||
record.point.show = visible;
|
||||
state._stemsDirty = true;
|
||||
}
|
||||
// Hidden stems keep their last geometry; this same sweep refreshes them
|
||||
// in the pass where they turn visible again.
|
||||
if (visible)
|
||||
updateCableReferenceStem(record, cameraPos, canvasHeight, fov);
|
||||
// Hidden stems keep their last tip; this same sweep refreshes them in
|
||||
// the pass where they turn visible again.
|
||||
if (
|
||||
visible &&
|
||||
updateCableReferenceStem(record, cameraPos, canvasHeight, fov)
|
||||
)
|
||||
state._stemsDirty = true;
|
||||
}
|
||||
for (const record of state._surfaceRecords) {
|
||||
if (state._stemsDirty) rebuildStems();
|
||||
for (const record of state._lineRecords) {
|
||||
record.visible = occluder.isPointVisible(record.base);
|
||||
if (record.visible !== record.shown) state._lineShowDirty = true;
|
||||
}
|
||||
syncLineShow();
|
||||
state._pendingLandingReveals.length = 0;
|
||||
for (const record of state._markerRecords) {
|
||||
const visible = occluder.isPointVisible(record.base);
|
||||
if (record.entity.show !== visible) {
|
||||
record.entity.show = visible;
|
||||
}
|
||||
record.visible = visible;
|
||||
if (record.marker.show === visible) continue;
|
||||
// A marker not yet on the ground waits its turn; one that already is
|
||||
// shows at once, and hiding is immediate.
|
||||
if (visible && !record.clamped) state._pendingLandingReveals.push(record);
|
||||
else record.marker.show = visible;
|
||||
}
|
||||
revealLandingMarkers();
|
||||
const winners = selectCableReferenceLabelWinners(state._referenceRecords);
|
||||
let changed = winners.length !== state._lastPublishedCount;
|
||||
for (let i = 0; i < winners.length; i++) {
|
||||
@@ -247,9 +465,6 @@ export function createRendering({ state }) {
|
||||
}
|
||||
state._publishScratch.length = winners.length;
|
||||
state._referenceLabelCount = winners.length;
|
||||
// The marker collections are created lazily by the visualizers, so the
|
||||
// single-pass blend is applied on the sweep cadence until both landed.
|
||||
if (!state._markerBlendDone) applyMarkerBlendOnce();
|
||||
if (!changed) return;
|
||||
state._overlayPublisher.publish(state._publishScratch);
|
||||
state._lastPublishedCount = winners.length;
|
||||
@@ -262,13 +477,14 @@ export function createRendering({ state }) {
|
||||
}
|
||||
return {
|
||||
resetPublishSignature,
|
||||
releaseDataSources,
|
||||
buildScene,
|
||||
destroyScene,
|
||||
updateVisibility,
|
||||
styleCableEntity,
|
||||
applyMarkerBlendOnce,
|
||||
applyCableClassification,
|
||||
styleLandingEntity,
|
||||
addReferenceStem,
|
||||
syncLineShow,
|
||||
settleStems,
|
||||
dropStems,
|
||||
revealLandingMarkers,
|
||||
updateReferenceVisibility,
|
||||
};
|
||||
}
|
||||
@@ -30,26 +30,50 @@ export function createState({ sweepClock, overlayHost }) {
|
||||
|
||||
state._loadGeneration = 0;
|
||||
|
||||
state._cableDataSource = null;
|
||||
|
||||
state._landingDataSource = null;
|
||||
|
||||
state._referenceDataSource = null;
|
||||
|
||||
/**
|
||||
* Fetched cable/landing JSON kept across disable/enable. A disable RELEASES
|
||||
* the three data sources (see releaseDataSources) instead of hiding them,
|
||||
* so a re-enable has to rebuild the entities; the network/parse half of
|
||||
* that rebuild is the expensive part users would notice, so it is cached.
|
||||
* What the layer draws, built once per load and kept across disable/enable
|
||||
* (a disable only hides them, which costs nothing per frame):
|
||||
* one ground polyline primitive for every line, one billboard collection
|
||||
* for every point marker, a point collection for the reference tips and
|
||||
* one polyline primitive for the reference stems.
|
||||
*/
|
||||
|
||||
state._cachedCableJson = null;
|
||||
state._cablePrimitive = null;
|
||||
|
||||
state._cachedLandingJson = null;
|
||||
state._markerBillboards = null;
|
||||
|
||||
state._referencePoints = null;
|
||||
|
||||
/** The stems now drawn, and their replacement while it builds. */
|
||||
|
||||
state._stemPrimitive = null;
|
||||
|
||||
state._stemPrimitivePending = null;
|
||||
|
||||
state._stemsDirty = false;
|
||||
|
||||
state._referenceRecords = [];
|
||||
|
||||
state._surfaceRecords = [];
|
||||
/** One record per drawn line: its pick record, horizon base and show state. */
|
||||
|
||||
state._lineRecords = [];
|
||||
|
||||
/** Line show states still to be written once the primitive is ready. */
|
||||
|
||||
state._lineShowDirty = false;
|
||||
|
||||
/** One record per point marker: its billboard and horizon base. */
|
||||
|
||||
state._markerRecords = [];
|
||||
|
||||
/** Markers the last sweep found visible but not on the ground yet; drained
|
||||
* a few per frame (CABLE_LANDING_REVEALS_PER_FRAME). */
|
||||
|
||||
state._pendingLandingReveals = [];
|
||||
|
||||
/** The pick records handed to Cesium as ids, so a pick is known to be ours. */
|
||||
|
||||
state._pickRecords = new WeakSet();
|
||||
|
||||
state._clickHandler = null;
|
||||
|
||||
@@ -63,14 +87,6 @@ export function createState({ sweepClock, overlayHost }) {
|
||||
|
||||
state._classificationType = Cesium.ClassificationType.BOTH;
|
||||
|
||||
/** True once both marker collections blend translucent (or the shape probe failed). */
|
||||
|
||||
state._markerBlendDone = false;
|
||||
|
||||
state._markerBlendInvariantWarned = false;
|
||||
|
||||
state._pickByEntity = new WeakMap();
|
||||
|
||||
state._referenceLabelCount = 0;
|
||||
|
||||
state._referenceSweepGate = createCableReferenceSweepGate({
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
import * as Cesium from 'cesium';
|
||||
import {
|
||||
CABLE_GLOBE_STACK_IDS,
|
||||
MARKER_COLLECTION_EXPECTATIONS,
|
||||
} from './policy.js';
|
||||
import { CABLE_GLOBE_STACK_IDS } from './policy.js';
|
||||
|
||||
/**
|
||||
* Ground-line classification for one map stack. The photoreal stack renders
|
||||
@@ -10,7 +7,7 @@ import {
|
||||
* need the 3D-tile classification pass there; every other known stack (the
|
||||
* bing stacks and osm) renders imagery on the shown globe, so only the
|
||||
* terrain pass applies.
|
||||
* Classifying against just the active surface halves the batched
|
||||
* Classifying against just the active surface halves the
|
||||
* GroundPolylinePrimitive's emitted command sets. BOTH is the safe fallback
|
||||
* for an unknown stack — it renders on every surface, exactly the shipped
|
||||
* pre-optimization behavior.
|
||||
@@ -40,87 +37,3 @@ export function cableClassificationTypeForScene(scene) {
|
||||
? Cesium.ClassificationType.CESIUM_3D_TILE
|
||||
: Cesium.ClassificationType.TERRAIN;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate one data source's marker collections WITHOUT mutating anything.
|
||||
* Splitting validation from mutation is what makes the fallback honest: a
|
||||
* shape failure on the SECOND collection (or the second data source) must
|
||||
* not leave the first one already forced to TRANSLUCENT.
|
||||
* @param {Cesium.DataSource|null|undefined} dataSource
|
||||
* @returns {{ready:object[],pending:number,invariantFailed:boolean}}
|
||||
*/
|
||||
|
||||
export function probeTranslucentMarkerBlend(dataSource) {
|
||||
const cluster = dataSource?.clustering;
|
||||
if (!cluster) return { ready: [], pending: 0, invariantFailed: true };
|
||||
const ready = [];
|
||||
let pending = 0;
|
||||
let invariantFailed = false;
|
||||
for (const { key, type } of MARKER_COLLECTION_EXPECTATIONS) {
|
||||
if (!(key in cluster)) {
|
||||
invariantFailed = true;
|
||||
continue;
|
||||
}
|
||||
const collection = cluster[key];
|
||||
if (collection === undefined || collection === null) {
|
||||
pending++;
|
||||
continue;
|
||||
}
|
||||
if (!(collection instanceof type) || !('blendOption' in collection)) {
|
||||
invariantFailed = true;
|
||||
continue;
|
||||
}
|
||||
ready.push(collection);
|
||||
}
|
||||
// Any failure discards every collected target: nothing is mutated at all.
|
||||
if (invariantFailed) return { ready: [], pending: 0, invariantFailed: true };
|
||||
return { ready, pending, invariantFailed: false };
|
||||
}
|
||||
|
||||
/**
|
||||
* Commit a clean probe. Only ever called once every probe in the batch has
|
||||
* passed, so this cannot land a partial application.
|
||||
* @param {{ready:object[],pending:number}} probe
|
||||
* @returns {{applied:number,pending:number,invariantFailed:boolean}}
|
||||
*/
|
||||
|
||||
export function commitTranslucentMarkerBlend(probe) {
|
||||
for (const collection of probe.ready) {
|
||||
if (collection.blendOption !== Cesium.BlendOption.TRANSLUCENT) {
|
||||
collection.blendOption = Cesium.BlendOption.TRANSLUCENT;
|
||||
}
|
||||
}
|
||||
return {
|
||||
applied: probe.ready.length,
|
||||
pending: probe.pending,
|
||||
invariantFailed: false,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Force one translucent draw pass for a data source's marker collections.
|
||||
* The default `OPAQUE_AND_TRANSLUCENT` blend emits two draw commands per
|
||||
* collection, and every cable marker is translucent (alpha < 1), so the
|
||||
* opaque pass is pure overhead across 1,917 landing billboards + 2,629
|
||||
* reference points. Cesium has no public accessor for the entity-backed
|
||||
* collections, so this reaches through EntityCluster's private fields under
|
||||
* a SHAPE INVARIANT the caller must honor loudly: the constructor
|
||||
* pre-assigns `_billboardCollection`/`_pointCollection` (= undefined until a
|
||||
* visualizer lazily creates them), so a missing PROPERTY means Cesium's
|
||||
* shape changed — report `invariantFailed` and never touch anything —
|
||||
* while a present-but-undefined value only means "not created yet"
|
||||
* (`pending`). Wrong instance types also fail the invariant. The cables
|
||||
* sources never enable clustering, so created collections persist.
|
||||
* VALIDATE-ALL-THEN-MUTATE-ALL: every field/type check runs before the first
|
||||
* assignment, so a failure anywhere leaves BOTH collections on Cesium's
|
||||
* default blend — the fallback this helper promises.
|
||||
* @param {Cesium.DataSource|null|undefined} dataSource
|
||||
* @returns {{applied:number,pending:number,invariantFailed:boolean}}
|
||||
*/
|
||||
|
||||
export function applyTranslucentMarkerBlend(dataSource) {
|
||||
const probe = probeTranslucentMarkerBlend(dataSource);
|
||||
if (probe.invariantFailed)
|
||||
return { applied: 0, pending: 0, invariantFailed: true };
|
||||
return commitTranslucentMarkerBlend(probe);
|
||||
}
|
||||
Reference in new issue
Block a user