Format the files this branch wrote or broke with Prettier

This commit is contained in:
German Khokhlov committed 2026-11-03 23:02:04 +04:00
1 parent 227e3c2051
commit 8d7f055572
90 files changed
+1408 -640

No files matched your search

+191 -98
View File
@@ -86,7 +86,11 @@ export function createApplicationCatalog({
const weatherClock = layerSession?.weatherClock ?? createWeatherClock();
if (layerSession && !layerSession.weatherClock) {
layerSession.weatherClock = weatherClock;
layerSession.lifetime.signal.addEventListener('abort', weatherClock.destroy, { once: true });
layerSession.lifetime.signal.addEventListener(
'abort',
weatherClock.destroy,
{ once: true },
);
}
const dispose = () => {
signal.removeEventListener('abort', dispose);
@@ -98,7 +102,9 @@ export function createApplicationCatalog({
if (!layerSession?.militaryRegistry) {
const lifetime = layerSession?.lifetime.signal ?? signal;
if (sourceComposition.isConfigured('military'))
militaryRegistry.configureSource(sources.military, { signal: lifetime });
militaryRegistry.configureSource(sources.military, {
signal: lifetime,
});
if (layerSession) {
layerSession.militaryRegistry = militaryRegistry;
lifetime.addEventListener('abort', militaryRegistry.dispose, {
@@ -129,12 +135,14 @@ export function createApplicationCatalog({
),
);
const military = once(() =>
sessionModel('military', () => createApplicationMilitary({
surface,
source: sources.military,
militaryRegistry,
resolveAsset,
})),
sessionModel('military', () =>
createApplicationMilitary({
surface,
source: sources.military,
militaryRegistry,
resolveAsset,
}),
),
);
const vessels = once(() =>
sessionModel('ais-live-vessels', () =>
@@ -153,39 +161,53 @@ export function createApplicationCatalog({
),
);
const satellites = once(() =>
sessionModel('satellites', () => createApplicationSatellites({
source: sources.satellites,
})),
sessionModel('satellites', () =>
createApplicationSatellites({
source: sources.satellites,
}),
),
);
// Catalog order: [layer id(s), construction]. Only the layers the
// engine can show are constructed (renderers.js).
const entries = [
['bhote-koshi-2026', () => sessionModel('bhote-koshi-2026', () => createBhoteKoshiEventLayer({
createNativeRenderer: (engine) => rendererFor('bhote-koshi-2026', engine),
}))],
[
'bhote-koshi-2026',
() =>
sessionModel('bhote-koshi-2026', () =>
createBhoteKoshiEventLayer({
createNativeRenderer: (engine) =>
rendererFor('bhote-koshi-2026', engine),
}),
),
],
[
'bhote-koshi-locator',
() =>
sessionModel('bhote-koshi-locator', () => createBhoteKoshiLocatorLayer({
boundaryResolver: nepalBoundaryResolver,
createNativeRenderer: (engine, data) => rendererFor('bhote-koshi-locator', engine, { data }),
})),
sessionModel('bhote-koshi-locator', () =>
createBhoteKoshiLocatorLayer({
boundaryResolver: nepalBoundaryResolver,
createNativeRenderer: (engine, data) =>
rendererFor('bhote-koshi-locator', engine, { data }),
}),
),
],
['flights', flights],
['military', military],
[
'local-adsb',
() =>
sessionModel('local-adsb', () => createApplicationLocalAdsb({
surface,
// QA fixture receivers (?qaFeed=local-adsb:fixture, dev only).
...(sources.localAdsbFeeds
? { feeds: sources.localAdsbFeeds }
: {}),
enrichment: sources.flights,
displayParams: () => flights().getParams(),
...(resolveAsset ? { resolveAsset } : {}),
})),
sessionModel('local-adsb', () =>
createApplicationLocalAdsb({
surface,
// QA fixture receivers (?qaFeed=local-adsb:fixture, dev only).
...(sources.localAdsbFeeds
? { feeds: sources.localAdsbFeeds }
: {}),
enrichment: sources.flights,
displayParams: () => flights().getParams(),
...(resolveAsset ? { resolveAsset } : {}),
}),
),
],
[
'earthquakes',
@@ -196,144 +218,215 @@ export function createApplicationCatalog({
],
[
'air-quality',
() => sessionModel('air-quality', () => createApplicationAirQuality({ source: sources['air-quality'] })),
() =>
sessionModel('air-quality', () =>
createApplicationAirQuality({ source: sources['air-quality'] }),
),
],
[
'fire-perimeters',
() =>
sessionModel('fire-perimeters', () => createApplicationFirePerimeters({
source: sources['fire-perimeters'],
})),
sessionModel('fire-perimeters', () =>
createApplicationFirePerimeters({
source: sources['fire-perimeters'],
}),
),
],
[
'gnss-integrity',
() =>
sessionModel('gnss-integrity', () => createApplicationGnssIntegrity({
source: sources['gnss-integrity'],
windowMs: sources['gnss-integrity'].windowMs,
})),
sessionModel('gnss-integrity', () =>
createApplicationGnssIntegrity({
source: sources['gnss-integrity'],
windowMs: sources['gnss-integrity'].windowMs,
}),
),
],
[
's2-ghostmaps',
() => sessionModel('s2-ghostmaps', () => createApplicationGhostMaps({ source: sources['s2-ghostmaps'] })),
() =>
sessionModel('s2-ghostmaps', () =>
createApplicationGhostMaps({ source: sources['s2-ghostmaps'] }),
),
],
[
'alpr-cameras',
() => sessionModel('alpr-cameras', () => createApplicationAlpr({ surface, source: sources.alpr })),
() =>
sessionModel('alpr-cameras', () =>
createApplicationAlpr({ surface, source: sources.alpr }),
),
],
[
'street-level',
() =>
sessionModel('street-level', () => createApplicationStreetLevel({
surface,
nativeRenderer:engine=>rendererFor('street-level',engine),
sources: { mapillary: sources.mapillary },
providers: streetLevelProviders,
})),
sessionModel('street-level', () =>
createApplicationStreetLevel({
surface,
nativeRenderer: (engine) => rendererFor('street-level', engine),
sources: { mapillary: sources.mapillary },
providers: streetLevelProviders,
}),
),
],
['satellites', satellites],
[
'rocket-launches',
() =>
sessionModel('rocket-launches', () => createApplicationLaunches({
source: sources.launches,
satellites: satellites(),
})),
sessionModel('rocket-launches', () =>
createApplicationLaunches({
source: sources.launches,
satellites: satellites(),
}),
),
],
[
'traffic',
() => sessionModel('traffic', () => createApplicationTraffic({
source: sources.traffic, surface, nativeRenderer: engine => rendererFor('traffic',engine),
})),
() =>
sessionModel('traffic', () =>
createApplicationTraffic({
source: sources.traffic,
surface,
nativeRenderer: (engine) => rendererFor('traffic', engine),
}),
),
],
[
'cctv',
() =>
sessionModel('cctv', () =>
createApplicationCctv({ surface, source: sources.cctv }),
),
],
['cctv', () => sessionModel('cctv', () => createApplicationCctv({ surface, source: sources.cctv }))],
[
'radio',
() => sessionModel('radio', () => createApplicationRadio({ surface, source: sources.radio })),
() =>
sessionModel('radio', () =>
createApplicationRadio({ surface, source: sources.radio }),
),
],
[
'transit',
() => sessionModel('transit', () => createApplicationTransit({ surface, source: sources.transit })),
() =>
sessionModel('transit', () =>
createApplicationTransit({ surface, source: sources.transit }),
),
],
[
'bikeshare',
() => sessionModel('bikeshare', () => createApplicationBikeshare({ source: sources.bikeshare })),
() =>
sessionModel('bikeshare', () =>
createApplicationBikeshare({ source: sources.bikeshare }),
),
],
[
'directions',
() => sessionModel('directions', () => createApplicationDirections({ source: sources.directions, surface })),
() =>
sessionModel('directions', () =>
createApplicationDirections({
source: sources.directions,
surface,
}),
),
],
[
'recent-imagery',
() =>
sessionModel('recent-imagery', () => createApplicationRecentImagery({
source: sources['recent-imagery'],
})),
sessionModel('recent-imagery', () =>
createApplicationRecentImagery({
source: sources['recent-imagery'],
}),
),
],
['ais-live-vessels', vessels],
['military-installations', installations],
[
'military-awareness',
() => sessionModel('military-awareness', () =>
createApplicationAwareness({
flights: flights(),
military: military(),
vessels: vessels(),
installations: installations(),
}),
),
() =>
sessionModel('military-awareness', () =>
createApplicationAwareness({
flights: flights(),
military: military(),
vessels: vessels(),
installations: installations(),
}),
),
],
[
'wind',
() => sessionModel('wind', () => createWindLayer({
feed: sources.wind,
clock: weatherClock,
createNativeRendering: (engine) => rendererFor('wind', engine),
})),
() =>
sessionModel('wind', () =>
createWindLayer({
feed: sources.wind,
clock: weatherClock,
createNativeRendering: (engine) => rendererFor('wind', engine),
}),
),
],
...['weather-radar', 'weather-satellite', 'weather-lightning'].map(
(id) => [
id,
() => sessionModel(id, () =>
createWeatherLayer({
feed: sources.weather,
id,
clock: weatherClock,
createNativeRendering: (engine, options) => rendererFor(id, engine, options),
}),
),
() =>
sessionModel(id, () =>
createWeatherLayer({
feed: sources.weather,
id,
clock: weatherClock,
createNativeRendering: (engine, options) =>
rendererFor(id, engine, options),
}),
),
],
),
[
'weather-cyclones',
() => sessionModel('weather-cyclones', () => createCyclonesLayer({
feed: sources.cyclones,
createNativeRendering: (engine, options) => rendererFor('weather-cyclones', engine, options),
})),
() =>
sessionModel('weather-cyclones', () =>
createCyclonesLayer({
feed: sources.cyclones,
createNativeRendering: (engine, options) =>
rendererFor('weather-cyclones', engine, options),
}),
),
],
[
['local-datacenters', 'local-dams'],
() => sessionModel('local-infrastructure', () =>
createInfrastructureLayers(localGeoJsonServices, (config, services) =>
createInfrastructureSessionLayer(config, services, (engine, descriptor, ops) =>
rendererFor(config.id,engine,{config:descriptor,services:ops}))),
),
() =>
sessionModel('local-infrastructure', () =>
createInfrastructureLayers(
localGeoJsonServices,
(config, services) =>
createInfrastructureSessionLayer(
config,
services,
(engine, descriptor, ops) =>
rendererFor(config.id, engine, {
config: descriptor,
services: ops,
}),
),
),
),
],
[
'telegeography-submarine-cables',
() => sessionModel('telegeography-submarine-cables', () => createApplicationCables({ source: sources.cables, session: true })),
() =>
sessionModel('telegeography-submarine-cables', () =>
createApplicationCables({ source: sources.cables, session: true }),
),
],
[
'local-firms',
() =>
sessionModel('local-firms', () => createApplicationFirms({
surface,
id: 'local-firms',
name: 'FIRMS Active Fires',
icon: '▲',
source: 'NASA FIRMS · LIVE',
feed: sources.firms,
})),
sessionModel('local-firms', () =>
createApplicationFirms({
surface,
id: 'local-firms',
name: 'FIRMS Active Fires',
icon: '▲',
source: 'NASA FIRMS · LIVE',
feed: sources.firms,
}),
),
],
];
const available = (id) => availability.isAvailable(id);
+5 -1
View File
@@ -4,5 +4,9 @@ import { rendererFor } from './renderers.js';
/** Construct Directions with application scene owners and an explicit route source. */
export function createApplicationDirections({ source, surface }) {
return createApplicationDirectionsLayer({ source, groundFloor: surface?.groundFloor, createNativeRenderer: (engine) => rendererFor('directions', engine) });
return createApplicationDirectionsLayer({
source,
groundFloor: surface?.groundFloor,
createNativeRenderer: (engine) => rendererFor('directions', engine),
});
}
+4 -3
View File
@@ -5,9 +5,10 @@ import { createGnssIntegrityLayer } from '../../layers/gnss/index.js';
/** Wire the adsb.lol GNSS navigation-integrity layer into the application catalog. */
export function createApplicationGnssIntegrity(options) {
return createGnssIntegrityLayer({
createRenderer: ({ viewer, engine, viewAnchor }) => engine
? rendererFor('gnss-integrity', engine, { viewer, viewAnchor })
: createGnssCesiumRenderer({ viewer, viewAnchor }),
createRenderer: ({ viewer, engine, viewAnchor }) =>
engine
? rendererFor('gnss-integrity', engine, { viewer, viewAnchor })
: createGnssCesiumRenderer({ viewer, viewAnchor }),
...options,
});
}
+10 -3
View File
@@ -24,9 +24,16 @@ export function createApplicationFirePerimeters(options) {
openExternal: (url) => window.open(url, '_blank', 'noopener,noreferrer'),
screenSpaceEventHandlerFactory: (viewer) =>
new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas),
createRenderer: ({viewer, engine, screenSpaceEventHandlerFactory}) => engine
? rendererFor('fire-perimeters', engine, {viewer, screenSpaceEventHandlerFactory})
: createPerimetersCesiumRenderer({viewer, screenSpaceEventHandlerFactory}),
createRenderer: ({ viewer, engine, screenSpaceEventHandlerFactory }) =>
engine
? rendererFor('fire-perimeters', engine, {
viewer,
screenSpaceEventHandlerFactory,
})
: createPerimetersCesiumRenderer({
viewer,
screenSpaceEventHandlerFactory,
}),
picking,
pointer: { isPointerFree },
...options,
+2 -1
View File
@@ -97,7 +97,8 @@ export const CESIUM_LAYER_RENDERERS = Object.freeze({
earthquakes: createEarthquakesCesiumRenderer,
'air-quality': (_engine, options) => createAirQualityCesiumRenderer(options),
'gnss-integrity': (_engine, options) => createGnssCesiumRenderer(options),
'fire-perimeters': (_engine, options) => createPerimetersCesiumRenderer(options),
'fire-perimeters': (_engine, options) =>
createPerimetersCesiumRenderer(options),
'local-firms': createFirmsCesiumRenderer,
'rocket-launches': createLaunchesCesiumRenderer,
satellites: createSatellitesCesiumRenderer,
+11 -9
View File
@@ -5,18 +5,20 @@ import { rendererFor } from './renderers.js';
import { overlayHost } from './overlayHost.js';
/** Wire cable source geometry to the application overlay host. */
export function createApplicationCables({ session = false, ...options }) {
const createCesium = (source) => createSubmarineCableLayer({
overlayHost,
screenSpaceEventHandlerFactory: (canvas) =>
new Cesium.ScreenSpaceEventHandler(canvas),
mapStackEventTarget: typeof window !== 'undefined' ? window : null,
...options,
source,
});
const createCesium = (source) =>
createSubmarineCableLayer({
overlayHost,
screenSpaceEventHandlerFactory: (canvas) =>
new Cesium.ScreenSpaceEventHandler(canvas),
mapStackEventTarget: typeof window !== 'undefined' ? window : null,
...options,
source,
});
if (!session) return createCesium(options.source);
return createCableSessionLayer({
source: options.source,
createCesium,
createNavara: (engine) => rendererFor('telegeography-submarine-cables', engine, { overlayHost }),
createNavara: (engine) =>
rendererFor('telegeography-submarine-cables', engine, { overlayHost }),
});
}
+6 -1
View File
@@ -7,6 +7,11 @@ import * as render from '../../renderGovernor.js';
export function createApplicationTraffic({ source, surface, nativeRenderer }) {
return createTrafficLayer({
source,
services: { credits, render, nativeRenderer, ground: surface?.groundFloor || ground },
services: {
credits,
render,
nativeRenderer,
ground: surface?.groundFloor || ground,
},
});
}
+21 -3
View File
@@ -17,15 +17,33 @@ import {
// The tools without a viewer (the experimental Navara engine); they load
// from src/app/navaraMode.js.
test('without a viewer the tools run the governor on the engine, show the notice, create no viewer tools and run voice on the engine', async (t) => {
const saved = { window: globalThis.window, document: globalThis.document, localStorage:globalThis.localStorage };
const saved = {
window: globalThis.window,
document: globalThis.document,
localStorage: globalThis.localStorage,
};
const listeners = new Map();
globalThis.window = {};
globalThis.localStorage = { getItem:()=>null,setItem(){},removeItem(){} };
globalThis.localStorage = {
getItem: () => null,
setItem() {},
removeItem() {},
};
globalThis.document = {
hidden: false,
getElementById: () => null,
querySelector: () => null,
body: {classList:{add(){},remove(){},toggle(){},contains(){return false;}},appendChild(){}},
body: {
classList: {
add() {},
remove() {},
toggle() {},
contains() {
return false;
},
},
appendChild() {},
},
addEventListener: (type, fn) => listeners.set(type, fn),
removeEventListener: (type, fn) => {
if (listeners.get(type) === fn) listeners.delete(type);