Share observed weather clocks and render radar, infrared and lightning on Navara

This commit is contained in:
German Khokhlov committed 2026-11-03 03:18:59 +04:00
1 parent 11992828fb
commit cb350fa58d
9 files changed
+674 -59

No files matched your search

+10 -4
View File
@@ -4,7 +4,7 @@ import { createWeatherLayer } from '../layers/weather/index.js';
import { createCyclonesLayer } from '../layers/cyclones/index.js';
import { createWindLayer } from '../layers/wind/index.js';
import { createLayerCatalog } from './catalog.js';
import { createLayerAvailability } from './layers/renderers.js';
import { createLayerAvailability, rendererFor } from './layers/renderers.js';
import { APPLICATION_LAYER_DIRECTORY } from './layers/directory.js';
import { LAYER_STATE_REGISTRY } from '../data/layerState.js';
import { createMilitaryRegistry } from '../layers/aircraft/classification.js';
@@ -82,11 +82,15 @@ export function createApplicationCatalog({
sources = sourceComposition.sources;
const militaryRegistry =
layerSession?.militaryRegistry ?? createMilitaryRegistry();
const weatherClock = createWeatherClock();
const weatherClock = layerSession?.weatherClock ?? createWeatherClock();
if (layerSession && !layerSession.weatherClock) {
layerSession.weatherClock = weatherClock;
layerSession.lifetime.signal.addEventListener('abort', weatherClock.destroy, { once: true });
}
const dispose = () => {
signal.removeEventListener('abort', dispose);
if (!layerSession) militaryRegistry.dispose();
weatherClock.destroy();
if (!layerSession) weatherClock.destroy();
};
signal.addEventListener('abort', dispose, { once: true });
try {
@@ -279,12 +283,14 @@ export function createApplicationCatalog({
...['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),
}),
),
],
),
[
+3
View File
@@ -62,6 +62,9 @@ test('the Navara mode registers migrated renderers once', async () => {
'ais-live-vessels',
'military-installations',
'military-awareness',
'weather-radar',
'weather-satellite',
'weather-lightning',
'local-firms',
],
);
+8
View File
@@ -59,6 +59,8 @@ const NAVARA_CREDIT_KEYS = new Set([
'eccc-aqhi',
'wfigs',
's2-ghostmaps',
'weather-noaa',
'weather-lightning',
'firms',
'gbfs',
'overture-military-names',
@@ -107,6 +109,12 @@ export async function registerNavaraLayerRenderers() {
bikeshare: async () =>
(await import('../layers/bikeshare/render/navara.js'))
.createBikeshareNavaraRenderer,
...Object.fromEntries(['weather-radar', 'weather-satellite', 'weather-lightning'].map((id) => [
id, async () => {
const { createWeatherNavaraRenderer } = await import('../layers/weather/render/navara.js');
return (engine, options) => createWeatherNavaraRenderer(engine, navaraViews.get(engine), options);
},
])),
's2-ghostmaps': async () => {
const { createGhostMapsNavaraRenderer } = await import('../layers/ghostMaps/render/navara.js');
return (engine) => createGhostMapsNavaraRenderer(engine, navaraViews.get(engine).view);