mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Draw vessels, satellites, Space Missions, ALPR, bikeshare and OSM Places through one display each
Each layer now has one render/display.js on the globe contract, the same factory on both engines; its render/cesium* and render/navara* files go. Cesium's behaviour is the reference, and the logic that was written twice is written once: - AIS vessels: atlas chevrons and engine.lines trails. The display registers the gev-trail pick claim itself and its trailing visibility pass now also runs on Navara. - Satellites: point banks per look, orbit rings as lines turned by their model matrix, and selection and follow through engine.camera.follow. The emulated _viewer is gone, and the tracked readout republishes card text on Navara too. - Space Missions: dots, reticle, trajectories and tactical orbits as movers and lines. The layer keeps its own records instead of Entities and DataSources, and camera work goes through engine.camera. Clicks go through the selection dispatcher, and hover keeps Cesium's throttle. The pad zone is its rim only: the contract has no surface fill yet. - ALPR, bikeshare and OSM Places: one display and, for bikeshare, one style module each; clicks through engine.input, no ScreenSpaceEventHandler or EntityCluster. ALPR keeps Navara's horizon cull, and OSM Places points sample the surface where Cesium clamped them. Coupling: layer renderer lines fall from 4546/11106 to 2638/8735 (Cesium/Navara), `viewer` lines from 2209 to 2014, ScreenSpaceEventHandler files from 20 to 15.
This commit is contained in:
1 parent
3e261d1baf
commit
f06b93fbc9
120 files changed
+6626
-6998
No files matched your search
@@ -1,6 +1,5 @@
|
||||
import { createVesselLayer } from '../../layers/vessels/index.js';
|
||||
import * as context from '../../data/contextStore.js';
|
||||
import * as trails from '../../data/trailRenderer.js';
|
||||
import * as labels from '../../data/detectionDraw.js';
|
||||
import * as picking from '../../data/pickRegistry.js';
|
||||
import * as overlay from '../../overlays/worldOverlay.js';
|
||||
@@ -11,19 +10,16 @@ import * as worldFocus from '../../worldFocus.js';
|
||||
import * as render from '../../renderGovernor.js';
|
||||
import * as selection from '../../data/selectionDispatcher.js';
|
||||
import { rendererFor } from './renderers.js';
|
||||
import { createVesselsCesiumRenderer } from '../../layers/vessels/render/cesium.js';
|
||||
import * as readouts from '../../hudReadouts.js';
|
||||
|
||||
/** Construct one layer using the application scene owners and a supplied source. */
|
||||
export function createApplicationVessels({
|
||||
source,
|
||||
options = {},
|
||||
// Test seam: the renderer factory (default: the engine's, from the registry).
|
||||
// Test seam: the renderer factory (default: the engine's, from the
|
||||
// registry: the vessels display on every engine; none without an engine).
|
||||
renderer = {
|
||||
create: ({ engine = null, ...rendererOptions }) =>
|
||||
engine
|
||||
? rendererFor('ais-live-vessels', engine, rendererOptions)
|
||||
: createVesselsCesiumRenderer(null, rendererOptions),
|
||||
create: ({ engine = null } = {}) => rendererFor('ais-live-vessels', engine),
|
||||
},
|
||||
}) {
|
||||
return createVesselLayer({
|
||||
@@ -31,7 +27,6 @@ export function createApplicationVessels({
|
||||
options,
|
||||
services: {
|
||||
context,
|
||||
trails,
|
||||
labels,
|
||||
picking,
|
||||
overlay,
|
||||
@@ -41,8 +36,7 @@ export function createApplicationVessels({
|
||||
worldFocus,
|
||||
render,
|
||||
selection,
|
||||
// The engine's vessel renderer from the registry (render/cesium.js on
|
||||
// Cesium); a bare viewer without an engine (unit tests) draws on Cesium.
|
||||
// The engine's vessel display from the registry (render/display.js).
|
||||
renderer,
|
||||
readouts,
|
||||
},
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { createAlprCesiumRenderer } from '../../layers/alpr/render/cesium.js';
|
||||
import { rendererFor } from './renderers.js';
|
||||
import * as credits from '../../data/dataCredits.js';
|
||||
import { createAlprCamerasLayer } from '../../layers/alpr/index.js';
|
||||
@@ -9,14 +8,16 @@ import { registerWorldOverlayPaintLane } from '../../overlays/worldOverlay.js';
|
||||
import { keyholeLabelAlphaFromGeometry } from '../../celestialRing.js';
|
||||
import { refreshTrackedReadout } from '../../data/trackedReadout.js';
|
||||
|
||||
/** Construct one layer using the application scene owners and a supplied source. */
|
||||
/**
|
||||
* Construct one layer using the application scene owners and a supplied
|
||||
* source; it draws with the engine's renderer from the registry
|
||||
* (render/display.js on every engine).
|
||||
*/
|
||||
export function createApplicationAlpr({
|
||||
surface,
|
||||
source,
|
||||
rendererFactory = ({ engine, ...context }) =>
|
||||
engine?.kind === 'navara'
|
||||
? rendererFor('alpr-cameras', engine, context)
|
||||
: createAlprCesiumRenderer(context),
|
||||
rendererFor('alpr-cameras', engine, context),
|
||||
}) {
|
||||
const { groundFloor } = surface;
|
||||
return createAlprCamerasLayer({
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
import { createBikeshareLayer } from '../../layers/bikeshare/index.js';
|
||||
import { createBikeshareCesiumRenderer } from '../../layers/bikeshare/render/cesium.js';
|
||||
import { rendererFor } from './renderers.js';
|
||||
import * as render from '../../renderGovernor.js';
|
||||
import * as sprites from '../../data/spriteOrder.js';
|
||||
import * as picking from '../../data/pickRegistry.js';
|
||||
import * as overlays from '../../overlays/worldOverlay.js';
|
||||
|
||||
/** Construct one layer using the application scene owners and a supplied source. */
|
||||
/**
|
||||
* Construct one layer using the application scene owners and a supplied
|
||||
* source; it draws with the engine's renderer from the registry
|
||||
* (render/display.js on every engine).
|
||||
*/
|
||||
export function createApplicationBikeshare({ source }) {
|
||||
return createBikeshareLayer({
|
||||
source,
|
||||
rendererFactory: ({ engine, ...context }) =>
|
||||
engine?.kind === 'navara'
|
||||
? rendererFor('bikeshare', engine, context)
|
||||
: createBikeshareCesiumRenderer({ ...context, engine }),
|
||||
services: { render, sprites, picking, overlays },
|
||||
rendererFor('bikeshare', engine, context),
|
||||
services: { render, picking, overlays },
|
||||
});
|
||||
}
|
||||
@@ -1,17 +1,14 @@
|
||||
import {
|
||||
createOsmPlacesLayer,
|
||||
createOsmPlacesCesiumRenderer,
|
||||
} from '../../layers/osmPlaces/index.js';
|
||||
import { createOsmPlacesLayer } from '../../layers/osmPlaces/index.js';
|
||||
import { overlayHost } from './overlayHost.js';
|
||||
import { rendererFor } from './renderers.js';
|
||||
|
||||
/** Wire OSM Places labels to the application overlay host. */
|
||||
/**
|
||||
* Wire OSM Places labels to the application overlay host; the points are the
|
||||
* engine's renderer from the registry (render/display.js on every engine).
|
||||
*/
|
||||
export function createApplicationOsmPlaces() {
|
||||
return createOsmPlacesLayer({
|
||||
overlayHost,
|
||||
createRenderer: ({ viewer, engine }) =>
|
||||
engine
|
||||
? rendererFor('osm-places', engine, { viewer })
|
||||
: createOsmPlacesCesiumRenderer({ viewer }),
|
||||
createRenderer: ({ engine }) => rendererFor('osm-places', engine),
|
||||
});
|
||||
}
|
||||
@@ -1,11 +1,9 @@
|
||||
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';
|
||||
import { createEarthquakesCesiumRenderer } from '../../layers/earthquakes/render/cesium.js';
|
||||
import { createLaunchesCesiumRenderer } from '../../layers/launches/render/cesium.js';
|
||||
// Which engine draws which layer: the layer renderer registry and the layer
|
||||
// availability API built on it.
|
||||
//
|
||||
@@ -36,8 +34,12 @@ import { APPLICATION_LAYER_DIRECTORY } from './directory.js';
|
||||
import { createFlightsDisplay } from '../../layers/flights/render/display.js';
|
||||
import { createMilitaryDisplay } from '../../layers/military/render/display.js';
|
||||
import { createLocalAdsbDisplay } from '../../layers/localAdsb/render/display.js';
|
||||
import { createSatellitesCesiumRenderer } from '../../layers/satellites/render/cesium.js';
|
||||
import { createVesselsCesiumRenderer } from '../../layers/vessels/render/cesium.js';
|
||||
import { createSatellitesDisplay } from '../../layers/satellites/render/display.js';
|
||||
import { createVesselsDisplay } from '../../layers/vessels/render/display.js';
|
||||
import { createLaunchesDisplay } from '../../layers/launches/render/display.js';
|
||||
import { createOsmPlacesDisplay } from '../../layers/osmPlaces/render/display.js';
|
||||
import { createAlprDisplay } from '../../layers/alpr/render/display.js';
|
||||
import { createBikeshareDisplay } from '../../layers/bikeshare/render/display.js';
|
||||
|
||||
const ENGINE_KINDS = new Set(['cesium', 'navara']);
|
||||
|
||||
@@ -104,14 +106,16 @@ export const CESIUM_LAYER_RENDERERS = Object.freeze({
|
||||
createPerimetersCesiumRenderer(options),
|
||||
'drone-airspace': (_engine, options) =>
|
||||
createDroneAirspaceCesiumRenderer(options),
|
||||
'osm-places': (_engine, options) => createOsmPlacesCesiumRenderer(options),
|
||||
'osm-places': createOsmPlacesDisplay,
|
||||
'alpr-cameras': createAlprDisplay,
|
||||
bikeshare: createBikeshareDisplay,
|
||||
'local-firms': createFirmsCesiumRenderer,
|
||||
'rocket-launches': createLaunchesCesiumRenderer,
|
||||
satellites: createSatellitesCesiumRenderer,
|
||||
'rocket-launches': createLaunchesDisplay,
|
||||
satellites: createSatellitesDisplay,
|
||||
flights: createFlightsDisplay,
|
||||
military: createMilitaryDisplay,
|
||||
'local-adsb': createLocalAdsbDisplay,
|
||||
'ais-live-vessels': createVesselsCesiumRenderer,
|
||||
'ais-live-vessels': createVesselsDisplay,
|
||||
});
|
||||
|
||||
// The other application layers still draw themselves on Cesium.
|
||||
|
||||
@@ -58,7 +58,7 @@ test('the default registry: every layer on Cesium, none yet on Navara', () => {
|
||||
}
|
||||
});
|
||||
|
||||
test('the aircraft, vessels, satellites, launches and earthquakes have extracted Cesium renderers', () => {
|
||||
test('the layers with extracted renderers', () => {
|
||||
assert.deepEqual(Object.keys(CESIUM_LAYER_RENDERERS), [
|
||||
'earthquakes',
|
||||
'air-quality',
|
||||
@@ -66,6 +66,8 @@ test('the aircraft, vessels, satellites, launches and earthquakes have extracted
|
||||
'fire-perimeters',
|
||||
'drone-airspace',
|
||||
'osm-places',
|
||||
'alpr-cameras',
|
||||
'bikeshare',
|
||||
'local-firms',
|
||||
'rocket-launches',
|
||||
'satellites',
|
||||
@@ -74,22 +76,19 @@ test('the aircraft, vessels, satellites, launches and earthquakes have extracted
|
||||
'local-adsb',
|
||||
'ais-live-vessels',
|
||||
]);
|
||||
const vessels = rendererFor(
|
||||
'ais-live-vessels',
|
||||
{ kind: 'cesium' },
|
||||
{
|
||||
viewer: { scene: {}, camera: {} },
|
||||
},
|
||||
);
|
||||
assert.equal(vessels.kind, 'cesium');
|
||||
assert.equal(rendererFor('satellites', { kind: 'cesium' }).kind, 'cesium');
|
||||
});
|
||||
|
||||
test('the aircraft family draws through one display, the same factory on every engine', async () => {
|
||||
test('the layers drawn through one display get the same factory on every engine', async () => {
|
||||
const displays = {
|
||||
flights: ['flights', 'createFlightsDisplay'],
|
||||
military: ['military', 'createMilitaryDisplay'],
|
||||
'local-adsb': ['localAdsb', 'createLocalAdsbDisplay'],
|
||||
'ais-live-vessels': ['vessels', 'createVesselsDisplay'],
|
||||
satellites: ['satellites', 'createSatellitesDisplay'],
|
||||
'rocket-launches': ['launches', 'createLaunchesDisplay'],
|
||||
'osm-places': ['osmPlaces', 'createOsmPlacesDisplay'],
|
||||
'alpr-cameras': ['alpr', 'createAlprDisplay'],
|
||||
bikeshare: ['bikeshare', 'createBikeshareDisplay'],
|
||||
};
|
||||
// The Navara mode registers the same modules' factories.
|
||||
const navaraMode = readFileSync(
|
||||
@@ -109,6 +108,9 @@ test('the aircraft family draws through one display, the same factory on every e
|
||||
),
|
||||
id,
|
||||
);
|
||||
// Each display's own tests build it with its services; the aircraft
|
||||
// family needs none beyond an atlas.
|
||||
if (!['flights', 'military', 'local-adsb'].includes(id)) continue;
|
||||
for (const kind of ['cesium', 'navara']) {
|
||||
const engine = createFakeEngine({ kind });
|
||||
const display = factory(engine, { drawAtlas });
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { rendererFor } from './renderers.js';
|
||||
import { createLaunchesCesiumRenderer } from '../../layers/launches/render/cesium.js';
|
||||
import { createRocketLaunchesLayer } from '../../layers/launches/index.js';
|
||||
import * as geometry from '../../celestialRing.js';
|
||||
import * as overlays from '../../overlays/worldOverlay.js';
|
||||
@@ -9,11 +8,10 @@ import * as render from '../../renderGovernor.js';
|
||||
export function createApplicationLaunches({
|
||||
source,
|
||||
satellites,
|
||||
// Test seam: the display factory (default: the engine's, from the
|
||||
// registry: render/display.js on every engine).
|
||||
renderer = {
|
||||
create: ({ engine = null, ...options }) =>
|
||||
engine
|
||||
? rendererFor('rocket-launches', engine, options)
|
||||
: createLaunchesCesiumRenderer(null, options),
|
||||
create: ({ engine }) => rendererFor('rocket-launches', engine),
|
||||
},
|
||||
}) {
|
||||
return createRocketLaunchesLayer({
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { rendererFor } from './renderers.js';
|
||||
import { createSatellitesCesiumRenderer } from '../../layers/satellites/render/cesium.js';
|
||||
import { createSatellitesLayer } from '../../layers/satellites/index.js';
|
||||
import * as picking from '../../data/pickRegistry.js';
|
||||
import * as focus from '../../data/focusDeemphasis.js';
|
||||
@@ -12,11 +11,10 @@ import * as layerState from '../../data/layerState.js';
|
||||
/** Construct one layer using the application scene owners and a supplied source. */
|
||||
export function createApplicationSatellites({
|
||||
source,
|
||||
// Test seam: the renderer factory (default: the engine's, from the
|
||||
// registry: the satellites display on every engine).
|
||||
renderer = {
|
||||
create: ({ engine = null, ...options }) =>
|
||||
engine
|
||||
? rendererFor('satellites', engine, options)
|
||||
: createSatellitesCesiumRenderer(null, options),
|
||||
create: ({ engine = null } = {}) => rendererFor('satellites', engine),
|
||||
},
|
||||
}) {
|
||||
return createSatellitesLayer({
|
||||
|
||||
Reference in new issue
Block a user