Draw nine layers' fills through engine.ground, one display each

Earthquakes, air quality, GNSS Integrity, fire perimeters, Prohibited &
Restricted Airspace, Active Fires, S2 GhostMaps, cyclone advisories and
submarine cables each have one render/display.js on the globe contract;
their render/cesium* and render/navara* files go. Their discs, cells,
polygons and corridors are engine.ground sets, so on Navara they come from
the one ground screen pass with exact colours instead of nine hand-written
classification passes and lit SDK vector layers. Cesium's look stays the
reference:

- Earthquake and air-quality discs have no outline (Cesium drew none on
  clamped ellipses); earthquake discs can now be picked on Navara too.
- Perimeters, drone zones and GhostMaps polygons outline their outer
  ring only, as Cesium did.
- GNSS cells stay out of the pick pass; cyclone cones, tracks and centres
  are culled by a port of Cesium's horizon occluder.
- Submarine cables are one ground corridor set, as Cesium batched them;
  landing points, tips and stems are movers and lines.
- FIRMS glows are a sprite set and its cells a ground set. The far-zoom
  heat raster, which no primitive draws yet, sits behind one seam,
  render/heatField.js, with a Cesium and a Navara backend.

The shared Navara ground helpers that only these layers used go
(navaraGroundCells, the cell and ground geometry, the zone renderers), as
does the ground prototype script.

Coupling: layer renderer lines fall from 1636/6953 to 1011/4832
(Cesium/Navara), Navara ground passes from 7 to 5, Cesium-importing files
from 65 to 53, engine.extensions reads from 26 to 19.
This commit is contained in:
German Khokhlov committed 2026-11-07 06:20:48 +04:00
1 parent 974a0b6361
commit 54fe0aea40
124 files changed
+8407 -9576

No files matched your search

+6 -6
View File
@@ -1,15 +1,15 @@
import { rendererFor } from './renderers.js';
import { createAirQualityCesiumRenderer } from '../../layers/airQuality/render/cesium.js';
import { createAirQualityLayer } from '../../layers/airQuality/index.js';
import { overlayHost } from './overlayHost.js';
/** Wire air-quality readings to the application overlay host. */
/**
* Wire air-quality readings to the application overlay host; the station
* discs are the engine's renderer from the registry (render/display.js on
* every engine).
*/
export function createApplicationAirQuality(options) {
return createAirQualityLayer({
overlayHost,
createRenderer: ({ viewer, engine }) =>
engine
? rendererFor('air-quality', engine, { viewer })
: createAirQualityCesiumRenderer({ viewer }),
createRenderer: ({ engine }) => rendererFor('air-quality', engine),
...options,
});
}
+13 -2
View File
@@ -1,10 +1,21 @@
import { createCyclonesLayer } from '../../layers/cyclones/index.js';
import * as context from '../../data/contextStore.js';
import { rendererFor } from './renderers.js';
/** Wire cyclone selection to the application shared context. */
export function createApplicationCyclones(options) {
/**
* Wire cyclone selection to the application shared context; the layer draws
* with the engine's renderer from the registry (render/display.js on every
* engine). The catalog passes the same factory as `createNativeRendering`.
*/
export function createApplicationCyclones({
createNativeRendering,
createRendering = createNativeRendering ??
((engine, options) => rendererFor('weather-cyclones', engine, options)),
...options
} = {}) {
return createCyclonesLayer({
context: typeof window !== 'undefined' ? context : null,
createRendering,
...options,
});
}
+7 -18
View File
@@ -1,14 +1,14 @@
import * as Cesium from 'cesium';
import {
createDroneAirspaceLayer,
createDroneAirspaceCesiumRenderer,
} from '../../layers/droneAirspace/index.js';
import { createDroneAirspaceLayer } 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';
/** Wire FAA special-use airspace into the application catalog. */
/**
* Wire FAA special-use airspace into the application catalog; the zones are
* the engine's renderer from the registry (render/display.js on every
* engine).
*/
export function createApplicationDroneAirspace(options) {
return createDroneAirspaceLayer({
overlayHost: {
@@ -17,18 +17,7 @@ export function createApplicationDroneAirspace(options) {
clearSource: overlays.clearOverlaySource,
hitTest: overlays.hitTestWorldOverlay,
},
screenSpaceEventHandlerFactory: (viewer) =>
new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas),
createRenderer: ({ viewer, engine, screenSpaceEventHandlerFactory }) =>
engine
? rendererFor('drone-airspace', engine, {
viewer,
screenSpaceEventHandlerFactory,
})
: createDroneAirspaceCesiumRenderer({
viewer,
screenSpaceEventHandlerFactory,
}),
createRenderer: ({ engine }) => rendererFor('drone-airspace', engine),
picking,
pointer: { isPointerFree },
...options,
+6 -6
View File
@@ -1,14 +1,14 @@
import { rendererFor } from './renderers.js';
import { createEarthquakesCesiumRenderer } from '../../layers/earthquakes/render/cesium.js';
import { createEarthquakesLayer } from '../../layers/earthquakes/index.js';
import { overlayHost } from './overlayHost.js';
/** Wire earthquake observations to the application overlay host. */
/**
* Wire earthquake observations to the application overlay host; the discs
* are the engine's renderer from the registry (render/display.js on every
* engine).
*/
export function createApplicationEarthquakes({
renderer = {
create: ({ engine = null, ...options }) =>
engine
? rendererFor('earthquakes', engine, options)
: createEarthquakesCesiumRenderer(null, options),
create: ({ engine }) => rendererFor('earthquakes', engine),
},
...options
} = {}) {
+7 -20
View File
@@ -1,28 +1,23 @@
import * as Cesium from 'cesium';
import { rendererFor } from './renderers.js';
import {
createFirmsCesiumRenderer,
projectFirmsWindow,
firmsHorizonOccluder,
FIRMS_LEFT_CLICK,
} from '../../layers/firms/render/cesium.js';
import { createFirmsHeatmapLayer as createLayer } from '../../layers/firms/index.js';
import * as render from '../../renderGovernor.js';
import * as sprites from '../../data/spriteOrder.js';
import * as context from '../../data/contextStore.js';
import * as picking from '../../data/pickRegistry.js';
import * as overlays from '../../overlays/worldOverlay.js';
import * as focus from '../../worldFocus.js';
export const firmsServices = {
render,
sprites,
context,
picking,
overlays,
focus,
};
/** Bind a supplied fire feed to the application scene service owners. */
/**
* Bind a supplied fire feed to the application scene service owners; it
* draws with the engine's renderer from the registry (render/display.js on
* every engine).
*/
export function createApplicationFirms({ surface, ...options }) {
return createLayer({
...options,
@@ -31,22 +26,14 @@ export function createApplicationFirms({ surface, ...options }) {
feed: options.feed,
services: { ...firmsServices, anchors: surface.anchors },
renderer: options.renderer ?? {
create: ({ engine = null, ...renderOptions }) =>
engine
? rendererFor('local-firms', engine, renderOptions)
: createFirmsCesiumRenderer(null, renderOptions),
create: ({ engine, ...renderOptions }) =>
rendererFor('local-firms', engine, renderOptions),
},
projectToWindow: options.projectToWindow ?? projectFirmsWindow,
horizonOccluder: options.horizonOccluder ?? firmsHorizonOccluder,
leftClickEventType: options.leftClickEventType ?? FIRMS_LEFT_CLICK,
overlayHost: options.overlayHost ?? {
setEntries: overlays.setOverlayEntries,
setVisible: overlays.setOverlaySourceVisible,
clearSource: overlays.clearOverlaySource,
hitTest: overlays.hitTestWorldOverlay,
},
screenSpaceEventHandlerFactory:
options.screenSpaceEventHandlerFactory ??
((viewer) => new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas)),
});
}
+5 -4
View File
@@ -1,11 +1,14 @@
import * as Cesium from 'cesium';
import { rendererFor } from './renderers.js';
import { createGhostMapsLayer } from '../../layers/ghostMaps/index.js';
import * as picking from '../../data/pickRegistry.js';
import * as overlays from '../../overlays/worldOverlay.js';
import { isPointerFree } from '../../data/inputOwnership.js';
/** Wire the S2 Underground GhostMaps layer into the application catalog. */
/**
* Wire the S2 Underground GhostMaps layer into the application catalog; it
* draws with the engine's renderer from the registry (render/display.js on
* every engine).
*/
export function createApplicationGhostMaps(options) {
return createGhostMapsLayer({
overlayHost: {
@@ -15,8 +18,6 @@ export function createApplicationGhostMaps(options) {
hitTest: overlays.hitTestWorldOverlay,
},
openExternal: (url) => window.open(url, '_blank', 'noopener,noreferrer'),
screenSpaceEventHandlerFactory: (viewer) =>
new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas),
picking,
pointer: { isPointerFree },
createRenderer: (engine) => rendererFor('s2-ghostmaps', engine),
+7 -6
View File
@@ -1,14 +1,15 @@
import { rendererFor } from './renderers.js';
import { createGnssCesiumRenderer } from '../../layers/gnss/render/cesium.js';
import { createGnssIntegrityLayer } from '../../layers/gnss/index.js';
/** Wire the adsb.lol GNSS navigation-integrity layer into the application catalog. */
/**
* Wire the adsb.lol GNSS navigation-integrity layer into the application
* catalog; the cells are the engine's renderer from the registry
* (render/display.js on every engine).
*/
export function createApplicationGnssIntegrity(options) {
return createGnssIntegrityLayer({
createRenderer: ({ viewer, engine, viewAnchor }) =>
engine
? rendererFor('gnss-integrity', engine, { viewer, viewAnchor })
: createGnssCesiumRenderer({ viewer, viewAnchor }),
createRenderer: ({ engine, viewAnchor }) =>
rendererFor('gnss-integrity', engine, { viewAnchor }),
...options,
});
}
+6 -15
View File
@@ -1,6 +1,4 @@
import { rendererFor } from './renderers.js';
import { createPerimetersCesiumRenderer } from '../../layers/perimeters/render/cesium.js';
import * as Cesium from 'cesium';
import {
createFirePerimetersLayer,
createInciwebIndexSource,
@@ -10,7 +8,11 @@ import * as picking from '../../data/pickRegistry.js';
import * as overlays from '../../overlays/worldOverlay.js';
import { isPointerFree } from '../../data/inputOwnership.js';
/** Wire WFIGS fire perimeters into the application catalog. */
/**
* Wire WFIGS fire perimeters into the application catalog; the perimeters
* are the engine's renderer from the registry (render/display.js on every
* engine).
*/
export function createApplicationFirePerimeters(options) {
return createFirePerimetersLayer({
overlayHost: {
@@ -22,18 +24,7 @@ export function createApplicationFirePerimeters(options) {
inciwebSource: createInciwebIndexSource(),
inciwebPublications: createInciwebPublicationSource(),
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: ({ engine }) => rendererFor('fire-perimeters', engine),
picking,
pointer: { isPointerFree },
...options,
+18 -14
View File
@@ -1,9 +1,3 @@
import { createPerimetersCesiumRenderer } from '../../layers/perimeters/render/cesium.js';
import { createDroneAirspaceCesiumRenderer } from '../../layers/droneAirspace/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';
import { createEarthquakesCesiumRenderer } from '../../layers/earthquakes/render/cesium.js';
// Which engine draws which layer: the layer renderer registry and the layer
// availability API built on it.
//
@@ -43,6 +37,15 @@ import { createBikeshareDisplay } from '../../layers/bikeshare/render/display.js
import { createRadioDisplay } from '../../layers/radio/render/display.js';
import { createTransitDisplay } from '../../layers/transit/render/display.js';
import { createCctvDisplay } from '../../layers/cctv/render/display.js';
import { createEarthquakesDisplay } from '../../layers/earthquakes/render/display.js';
import { createAirQualityDisplay } from '../../layers/airQuality/render/display.js';
import { createGnssDisplay } from '../../layers/gnss/render/display.js';
import { createPerimetersDisplay } from '../../layers/perimeters/render/display.js';
import { createDroneAirspaceDisplay } from '../../layers/droneAirspace/render/display.js';
import { createFirmsDisplay } from '../../layers/firms/render/display.js';
import { createGhostMapsDisplay } from '../../layers/ghostMaps/render/display.js';
import { createCyclonesDisplay } from '../../layers/cyclones/render/display.js';
import { createCablesDisplay } from '../../layers/submarineCables/render/display.js';
const ENGINE_KINDS = new Set(['cesium', 'navara']);
@@ -102,19 +105,20 @@ export const layerAvailableOn = (layerId, engineKind) =>
/** Cesium renderers extracted from their layers (render/cesium.js). */
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),
'drone-airspace': (_engine, options) =>
createDroneAirspaceCesiumRenderer(options),
earthquakes: createEarthquakesDisplay,
'air-quality': createAirQualityDisplay,
'gnss-integrity': createGnssDisplay,
'fire-perimeters': createPerimetersDisplay,
'drone-airspace': createDroneAirspaceDisplay,
'osm-places': createOsmPlacesDisplay,
'alpr-cameras': createAlprDisplay,
bikeshare: createBikeshareDisplay,
radio: createRadioDisplay,
transit: createTransitDisplay,
'local-firms': createFirmsCesiumRenderer,
'local-firms': createFirmsDisplay,
's2-ghostmaps': createGhostMapsDisplay,
'weather-cyclones': createCyclonesDisplay,
'telegeography-submarine-cables': createCablesDisplay,
'rocket-launches': createLaunchesDisplay,
satellites: createSatellitesDisplay,
flights: createFlightsDisplay,
+14
View File
@@ -71,6 +71,9 @@ test('the layers with extracted renderers', () => {
'radio',
'transit',
'local-firms',
's2-ghostmaps',
'weather-cyclones',
'telegeography-submarine-cables',
'rocket-launches',
'satellites',
'flights',
@@ -94,6 +97,17 @@ test('the layers drawn through one display get the same factory on every engine'
bikeshare: ['bikeshare', 'createBikeshareDisplay'],
radio: ['radio', 'createRadioDisplay'],
transit: ['transit', 'createTransitDisplay'],
earthquakes: ['earthquakes', 'createEarthquakesDisplay'],
'air-quality': ['airQuality', 'createAirQualityDisplay'],
'gnss-integrity': ['gnss', 'createGnssDisplay'],
'fire-perimeters': ['perimeters', 'createPerimetersDisplay'],
'drone-airspace': ['droneAirspace', 'createDroneAirspaceDisplay'],
's2-ghostmaps': ['ghostMaps', 'createGhostMapsDisplay'],
'weather-cyclones': ['cyclones', 'createCyclonesDisplay'],
'telegeography-submarine-cables': [
'submarineCables',
'createCablesDisplay',
],
};
// The Navara mode registers the same modules' factories.
const navaraMode = readFileSync(
+20 -20
View File
@@ -1,24 +1,24 @@
import * as Cesium from 'cesium';
import { createSubmarineCableLayer } from '../../layers/submarineCables/index.js';
import { createCableSessionLayer } from '../../layers/submarineCables/session.js';
import { CABLE_OVERLAY_SOURCE_ID } from '../../layers/submarineCables/policy.js';
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({
import { overlayHost as applicationOverlayHost } from './overlayHost.js';
/**
* Wire cable source geometry to the application overlay host and map-stack
* events; it draws with the engine's renderer from the registry
* (render/display.js on every engine).
*/
export function createApplicationCables({
source,
overlayHost = applicationOverlayHost,
mapStackEventTarget = typeof window !== 'undefined' ? window : null,
sweepClock,
createDisplay = (engine) =>
rendererFor(CABLE_OVERLAY_SOURCE_ID, engine, {
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 }),
});
mapStackEventTarget,
...(sweepClock ? { sweepClock } : {}),
}),
}) {
return createSubmarineCableLayer({ source, createDisplay });
}