Show drone airspace, OSM places, sea marks and ski pistes on Navara, and keep them across engine switches

This commit is contained in:
German Khokhlov committed 2026-11-05 00:47:08 +04:00
1 parent 43b4e9348b
commit 843c4a111d
25 files changed
+838 -295

No files matched your search

+13 -8
View File
@@ -254,15 +254,14 @@ export function createApplicationCatalog({
createApplicationGhostMaps({ source: sources['s2-ghostmaps'] }),
),
],
// Cesium only, and without attachRenderer: built for each catalog and
// destroyed when its globe leaves, so never a session model (as are
// osm-places and the OSM overlays).
[
'drone-airspace',
() =>
createApplicationDroneAirspace({
source: sources['drone-airspace'],
}),
sessionModel('drone-airspace', () =>
createApplicationDroneAirspace({
source: sources['drone-airspace'],
}),
),
],
[
'alpr-cameras',
@@ -352,7 +351,10 @@ export function createApplicationCatalog({
}),
),
],
['osm-places', () => createApplicationOsmPlaces()],
[
'osm-places',
() => sessionModel('osm-places', () => createApplicationOsmPlaces()),
],
['ais-live-vessels', vessels],
['military-installations', installations],
[
@@ -404,7 +406,10 @@ export function createApplicationCatalog({
}),
),
],
[OSM_OVERLAYS.map(({ id }) => id), () => createOsmOverlayLayers()],
[
OSM_OVERLAYS.map(({ id }) => id),
() => sessionModel('osm-overlays', () => createOsmOverlayLayers()),
],
[
['local-datacenters', 'local-dams'],
() =>
+5 -20
View File
@@ -251,15 +251,7 @@ test('the catalog per engine: Cesium as before, Navara only what it can show', a
assert.equal(subset.get('military'), undefined);
});
// Cesium-only layers without attachRenderer: rebuilt for each Cesium catalog.
const CESIUM_ONLY_LAYERS = [
'drone-airspace',
'osm-places',
'sea-marks',
'ski-pistes',
];
test('both production registries attach to the same 33 session models', async (t) => {
test('both production registries attach to the same 37 session models', async (t) => {
const { registerNavaraLayerRenderers } = await import('./navaraMode.js');
const lifetime = new AbortController();
t.after(() => lifetime.abort());
@@ -272,20 +264,13 @@ test('both production registries attach to the same 33 session models', async (t
const cesium = createApplicationCatalog(options);
await registerNavaraLayerRenderers();
const navara = createApplicationCatalog({ ...options, engineKind: 'navara' });
const shared = cesium.layers.filter(
({ id }) => !CESIUM_ONLY_LAYERS.includes(id),
);
assert.equal(cesium.layers.length, 33 + CESIUM_ONLY_LAYERS.length);
assert.equal(shared.length, 33);
assert.equal(cesium.layers.length, 37);
assert.deepEqual(
navara.layers.map(({ id }) => id),
shared.map(({ id }) => id),
cesium.layers.map(({ id }) => id),
);
assert.deepEqual(
navara.unavailableMetadata.map(({ id }) => id).sort(),
[...CESIUM_ONLY_LAYERS].sort(),
);
for (const layer of shared) {
assert.deepEqual(navara.metadata, cesium.metadata);
for (const layer of cesium.layers) {
assert.equal(navara.get(layer.id), layer, layer.id);
assert.equal(typeof layer.attachRenderer, 'function', layer.id);
assert.equal(typeof layer.detachRenderer, 'function', layer.id);
+15 -1
View File
@@ -1,5 +1,9 @@
import * as Cesium from 'cesium';
import { createDroneAirspaceLayer } from '../../layers/droneAirspace/index.js';
import {
createDroneAirspaceLayer,
createDroneAirspaceCesiumRenderer,
} from '../../layers/droneAirspace/index.js';
import { rendererFor } from './renderers.js';
import * as picking from '../../data/pickRegistry.js';
import * as overlays from '../../overlays/worldOverlay.js';
import { isPointerFree } from '../../data/inputOwnership.js';
@@ -15,6 +19,16 @@ export function createApplicationDroneAirspace(options) {
},
screenSpaceEventHandlerFactory: (viewer) =>
new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas),
createRenderer: ({ viewer, engine, screenSpaceEventHandlerFactory }) =>
engine
? rendererFor('drone-airspace', engine, {
viewer,
screenSpaceEventHandlerFactory,
})
: createDroneAirspaceCesiumRenderer({
viewer,
screenSpaceEventHandlerFactory,
}),
picking,
pointer: { isPointerFree },
...options,
+12 -2
View File
@@ -1,7 +1,17 @@
import { createOsmPlacesLayer } from '../../layers/osmPlaces/index.js';
import {
createOsmPlacesLayer,
createOsmPlacesCesiumRenderer,
} from '../../layers/osmPlaces/index.js';
import { overlayHost } from './overlayHost.js';
import { rendererFor } from './renderers.js';
/** Wire OSM Places labels to the application overlay host. */
export function createApplicationOsmPlaces() {
return createOsmPlacesLayer({ overlayHost });
return createOsmPlacesLayer({
overlayHost,
createRenderer: ({ viewer, engine }) =>
engine
? rendererFor('osm-places', engine, { viewer })
: createOsmPlacesCesiumRenderer({ viewer }),
});
}
+5
View File
@@ -1,4 +1,6 @@
import { createPerimetersCesiumRenderer } from '../../layers/perimeters/render/cesium.js';
import { createDroneAirspaceCesiumRenderer } from '../../layers/droneAirspace/index.js';
import { createOsmPlacesCesiumRenderer } from '../../layers/osmPlaces/index.js';
import { createGnssCesiumRenderer } from '../../layers/gnss/render/cesium.js';
import { createAirQualityCesiumRenderer } from '../../layers/airQuality/render/cesium.js';
import { createFirmsCesiumRenderer } from '../../layers/firms/render/cesium.js';
@@ -99,6 +101,9 @@ export const CESIUM_LAYER_RENDERERS = Object.freeze({
'gnss-integrity': (_engine, options) => createGnssCesiumRenderer(options),
'fire-perimeters': (_engine, options) =>
createPerimetersCesiumRenderer(options),
'drone-airspace': (_engine, options) =>
createDroneAirspaceCesiumRenderer(options),
'osm-places': (_engine, options) => createOsmPlacesCesiumRenderer(options),
'local-firms': createFirmsCesiumRenderer,
'rocket-launches': createLaunchesCesiumRenderer,
satellites: createSatellitesCesiumRenderer,
+2
View File
@@ -62,6 +62,8 @@ test('the aircraft, vessels, satellites, launches and earthquakes have extracted
'air-quality',
'gnss-integrity',
'fire-perimeters',
'drone-airspace',
'osm-places',
'local-firms',
'rocket-launches',
'satellites',
+1 -1
View File
@@ -112,7 +112,7 @@ test('the standalone startup graph can be imported before the Cesium SDK exists'
const { createStandaloneCatalog } = await import('./src/standalone/catalog.js');
const lifetime = new AbortController();
const catalog = createStandaloneCatalog({ engineKind: 'navara', signal: lifetime.signal });
if (catalog.layers.length !== 33) throw new Error('Incomplete cold Navara catalog');
if (catalog.layers.length !== 37) throw new Error('Incomplete cold Navara catalog');
lifetime.abort();
`;
const result = spawnSync(
+4
View File
@@ -53,6 +53,7 @@ test('the Navara mode registers migrated renderers once', async () => {
'fire-perimeters',
'gnss-integrity',
's2-ghostmaps',
'drone-airspace',
'alpr-cameras',
'street-level',
'satellites',
@@ -64,6 +65,7 @@ test('the Navara mode registers migrated renderers once', async () => {
'bikeshare',
'directions',
'recent-imagery',
'osm-places',
'ais-live-vessels',
'military-installations',
'military-awareness',
@@ -72,6 +74,8 @@ test('the Navara mode registers migrated renderers once', async () => {
'weather-satellite',
'weather-lightning',
'weather-cyclones',
'sea-marks',
'ski-pistes',
'local-datacenters',
'local-dams',
'telegeography-submarine-cables',
+12
View File
@@ -244,6 +244,15 @@ export async function registerNavaraLayerRenderers() {
...navaraViews.get(engine),
});
},
'osm-places': async () =>
(await import('../layers/osmPlaces/render/navara.js'))
.createOsmPlacesNavaraRenderer,
'drone-airspace': async () => {
const { createDroneAirspaceNavaraRenderer } =
await import('../layers/droneAirspace/render/navara.js');
return (engine) =>
createDroneAirspaceNavaraRenderer(engine, navaraViews.get(engine));
},
'fire-perimeters': async () => {
const { createPerimetersNavaraRenderer } =
await import('../layers/perimeters/render/navara.js');
@@ -295,6 +304,9 @@ export async function registerNavaraLayerRenderers() {
'ais-live-vessels': async () =>
(await import('../layers/vessels/render/navara.js'))
.createVesselsNavaraRenderer,
// The open map overlays drape themselves through engine.maps.addOverlay.
'sea-marks': async () => () => null,
'ski-pistes': async () => () => null,
};
const missing = Object.keys(loaders).filter(
(id) => !layerAvailableOn(id, 'navara'),