mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-18 01:02:23 +00:00
Draw air quality on both globes from one retained station model
This commit is contained in:
1 parent
99bda8a35e
commit
6fe5bda028
14 files changed
+391
-71
No files matched your search
@@ -1,4 +1,6 @@
|
||||
import * as Cesium from 'cesium';
|
||||
import { fromDegrees } from '../../geo/cartesian3.js';
|
||||
import { toDegrees } from '../../geo/math.js';
|
||||
import { createAirQualityCesiumRenderer } from './render/cesium.js';
|
||||
import { msg, t, tn } from '../../i18n/index.js';
|
||||
import { translateFeedError } from '../../ui/statusText.js';
|
||||
import {
|
||||
@@ -23,13 +25,13 @@ const STATION_MARKER_RADIUS_M = 6_000;
|
||||
const READOUT_LIMIT = 5;
|
||||
|
||||
/** Own one air-quality display, its refresh lifecycle, and its readout card. */
|
||||
export function createAirQualityLayer({ source, overlayHost } = {}) {
|
||||
export function createAirQualityLayer({ source, overlayHost, createRenderer = createAirQualityCesiumRenderer } = {}) {
|
||||
if (typeof source?.getSnapshot !== 'function')
|
||||
throw new TypeError('Air quality requires a snapshot source');
|
||||
if (!overlayHost) throw new TypeError('Air quality requires an overlay host');
|
||||
let _viewer = null;
|
||||
let initialized = false;
|
||||
let _request = null;
|
||||
let _dataSource = null;
|
||||
let renderer = null;
|
||||
let _readings = [];
|
||||
let _count = 0;
|
||||
let _lastUpdate = null;
|
||||
@@ -41,14 +43,13 @@ export function createAirQualityLayer({ source, overlayHost } = {}) {
|
||||
|
||||
/** The camera's lon/lat rectangle in degrees, or null when unresolvable. */
|
||||
const viewRectangle = () => {
|
||||
const rectangle = _viewer?.camera?.computeViewRectangle?.();
|
||||
const rectangle = renderer?.viewRectangle();
|
||||
if (!rectangle) return null;
|
||||
const toDeg = Cesium.Math.toDegrees;
|
||||
return {
|
||||
west: toDeg(rectangle.west),
|
||||
south: toDeg(rectangle.south),
|
||||
east: toDeg(rectangle.east),
|
||||
north: toDeg(rectangle.north),
|
||||
west: toDegrees(rectangle.west),
|
||||
south: toDegrees(rectangle.south),
|
||||
east: toDegrees(rectangle.east),
|
||||
north: toDegrees(rectangle.north),
|
||||
};
|
||||
};
|
||||
|
||||
@@ -59,23 +60,35 @@ export function createAirQualityLayer({ source, overlayHost } = {}) {
|
||||
source: 'ECCC MSC GeoMet',
|
||||
updateInterval: 1_200_000,
|
||||
|
||||
init(viewer) {
|
||||
if (_viewer) throw new Error('Air quality layer is already initialized');
|
||||
_viewer = viewer;
|
||||
_dataSource = new Cesium.CustomDataSource('air-quality');
|
||||
_dataSource.show = false;
|
||||
viewer.dataSources.add(_dataSource);
|
||||
_readings = [];
|
||||
_count = 0;
|
||||
_lastUpdate = null;
|
||||
_lastError = null;
|
||||
_enabled = false;
|
||||
init(viewer, { engine = null } = {}) {
|
||||
if (initialized) throw new Error('Air quality layer is already initialized');
|
||||
initialized = true;
|
||||
try {
|
||||
if (viewer || engine) this.attachRenderer(viewer, { engine });
|
||||
} catch (error) {
|
||||
this.destroy();
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
|
||||
attachRenderer(viewer, { engine = null } = {}) {
|
||||
if (!initialized || renderer) throw new Error('Invalid air quality scene attachment');
|
||||
renderer = createRenderer({ viewer, engine });
|
||||
renderer.setVisible(_enabled);
|
||||
overlayHost.setVisible(AIR_QUALITY_OVERLAY_SOURCE_ID, _enabled);
|
||||
if (_readings.length) this._render();
|
||||
},
|
||||
|
||||
detachRenderer() {
|
||||
overlayHost.clearSource(AIR_QUALITY_OVERLAY_SOURCE_ID);
|
||||
overlayHost.setVisible(AIR_QUALITY_OVERLAY_SOURCE_ID, false);
|
||||
renderer?.destroy();
|
||||
renderer = null;
|
||||
},
|
||||
|
||||
enable() {
|
||||
_enabled = true;
|
||||
if (_dataSource) _dataSource.show = true;
|
||||
renderer?.setVisible(true);
|
||||
overlayHost.setVisible(AIR_QUALITY_OVERLAY_SOURCE_ID, true);
|
||||
notify();
|
||||
},
|
||||
@@ -85,14 +98,14 @@ export function createAirQualityLayer({ source, overlayHost } = {}) {
|
||||
_request?.abort();
|
||||
_request = null;
|
||||
_enabled = false;
|
||||
if (_dataSource) _dataSource.show = false;
|
||||
renderer?.setVisible(false);
|
||||
overlayHost.clearSource(AIR_QUALITY_OVERLAY_SOURCE_ID);
|
||||
overlayHost.setVisible(AIR_QUALITY_OVERLAY_SOURCE_ID, false);
|
||||
notify();
|
||||
},
|
||||
|
||||
async update() {
|
||||
if (!_enabled || !_dataSource) return false;
|
||||
if (!_enabled) return false;
|
||||
_request?.abort();
|
||||
const request = new AbortController();
|
||||
_request = request;
|
||||
@@ -122,45 +135,11 @@ export function createAirQualityLayer({ source, overlayHost } = {}) {
|
||||
|
||||
/** Rebuild entities and overlay labels from the current readings. */
|
||||
_render() {
|
||||
if (!_dataSource) return;
|
||||
_dataSource.entities.removeAll();
|
||||
if (!renderer) return;
|
||||
renderer.replace(_readings, STATION_MARKER_RADIUS_M);
|
||||
const overlayEntries = [];
|
||||
for (const reading of _readings) {
|
||||
const position = Cesium.Cartesian3.fromDegrees(
|
||||
reading.lon,
|
||||
reading.lat,
|
||||
);
|
||||
const color = Cesium.Color.fromCssColorString(reading.color);
|
||||
_dataSource.entities.add(
|
||||
new Cesium.Entity({
|
||||
id: `air-quality:${reading.id}`,
|
||||
position,
|
||||
ellipse: {
|
||||
// Static axes, as in the earthquake layer: a per-frame axis
|
||||
// re-tessellates the clamped ground primitive every frame.
|
||||
semiMajorAxis: STATION_MARKER_RADIUS_M,
|
||||
semiMinorAxis: STATION_MARKER_RADIUS_M,
|
||||
material: new Cesium.ColorMaterialProperty(color.withAlpha(0.35)),
|
||||
outline: true,
|
||||
outlineColor: color.withAlpha(0.9),
|
||||
outlineWidth: 2,
|
||||
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
||||
},
|
||||
properties: {
|
||||
provider: reading.provider,
|
||||
scale: reading.scale,
|
||||
value: reading.value,
|
||||
band: reading.band,
|
||||
name: reading.name,
|
||||
zone: reading.zone,
|
||||
risk: reading.risk,
|
||||
observedMs: reading.observedMs,
|
||||
note: reading.note,
|
||||
lat: reading.lat,
|
||||
lon: reading.lon,
|
||||
},
|
||||
}),
|
||||
);
|
||||
const position = fromDegrees(reading.lon, reading.lat);
|
||||
overlayEntries.push(
|
||||
createAirQualityOverlayEntry({
|
||||
id: reading.id,
|
||||
@@ -184,17 +163,12 @@ export function createAirQualityLayer({ source, overlayHost } = {}) {
|
||||
}
|
||||
},
|
||||
|
||||
destroy(viewer = _viewer) {
|
||||
destroy() {
|
||||
_request?.abort();
|
||||
_request = null;
|
||||
_enabled = false;
|
||||
overlayHost.clearSource(AIR_QUALITY_OVERLAY_SOURCE_ID);
|
||||
overlayHost.setVisible(AIR_QUALITY_OVERLAY_SOURCE_ID, false);
|
||||
if (_dataSource) {
|
||||
viewer?.dataSources?.remove(_dataSource, true);
|
||||
_dataSource = null;
|
||||
}
|
||||
_viewer = null;
|
||||
initialized = false;
|
||||
this.detachRenderer();
|
||||
_readings = [];
|
||||
_count = 0;
|
||||
_lastUpdate = null;
|
||||
|
||||
@@ -273,3 +273,24 @@ test('a failed refresh over good readings reports degraded, not nominal', async
|
||||
'showing old data after a failure is degraded',
|
||||
);
|
||||
});
|
||||
|
||||
test('station data stays queryable and attaches to a fresh scene without polling', async () => {
|
||||
let polls = 0;
|
||||
const h = harness({ getSnapshot: async () => {
|
||||
polls++;
|
||||
return [reading('Toronto', 7)];
|
||||
} });
|
||||
try {
|
||||
h.layer.detachRenderer();
|
||||
assert.equal(h.sources.length, 0);
|
||||
assert.equal(await h.layer.update(), true);
|
||||
assert.equal(h.events.length, 0);
|
||||
assert.equal(h.layer.getAnalystRecords()[0].value, 7);
|
||||
h.layer.attachRenderer(h.viewer);
|
||||
assert.equal(h.events.at(-1)[0], 'air-quality');
|
||||
assert.equal(h.sources[0].entities.values.length, 1);
|
||||
assert.equal(polls, 1);
|
||||
} finally {
|
||||
h.layer.destroy();
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,56 @@
|
||||
import * as Cesium from 'cesium';
|
||||
|
||||
export function createAirQualityCesiumRenderer({ viewer }) {
|
||||
const dataSource = new Cesium.CustomDataSource('air-quality');
|
||||
dataSource.show = false;
|
||||
viewer.dataSources.add(dataSource);
|
||||
return {
|
||||
viewRectangle: () => viewer.camera?.computeViewRectangle?.(),
|
||||
setVisible(visible) {
|
||||
dataSource.show = visible;
|
||||
},
|
||||
replace(readings, radius) {
|
||||
dataSource.entities.removeAll();
|
||||
for (const reading of readings) {
|
||||
const position = Cesium.Cartesian3.fromDegrees(
|
||||
reading.lon,
|
||||
reading.lat,
|
||||
);
|
||||
const color = Cesium.Color.fromCssColorString(reading.color);
|
||||
dataSource.entities.add(
|
||||
new Cesium.Entity({
|
||||
id: `air-quality:${reading.id}`,
|
||||
position,
|
||||
ellipse: {
|
||||
// Static axes, as in the earthquake layer: a per-frame axis
|
||||
// re-tessellates the clamped ground primitive every frame.
|
||||
semiMajorAxis: radius,
|
||||
semiMinorAxis: radius,
|
||||
material: new Cesium.ColorMaterialProperty(color.withAlpha(0.35)),
|
||||
outline: true,
|
||||
outlineColor: color.withAlpha(0.9),
|
||||
outlineWidth: 2,
|
||||
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
||||
},
|
||||
properties: {
|
||||
provider: reading.provider,
|
||||
scale: reading.scale,
|
||||
value: reading.value,
|
||||
band: reading.band,
|
||||
name: reading.name,
|
||||
zone: reading.zone,
|
||||
risk: reading.risk,
|
||||
observedMs: reading.observedMs,
|
||||
note: reading.note,
|
||||
lat: reading.lat,
|
||||
lon: reading.lon,
|
||||
},
|
||||
}),
|
||||
);
|
||||
}
|
||||
},
|
||||
destroy() {
|
||||
viewer.dataSources.remove(dataSource, true);
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
import * as geo from '../../../geo/index.js';
|
||||
|
||||
function stationFeature(reading, radius) {
|
||||
const origin = geo.cartesian3.fromDegrees(reading.lon, reading.lat);
|
||||
const frame = geo.transforms.eastNorthUpToFixedFrame(origin);
|
||||
const ring = [];
|
||||
for (let i = 0; i < 48; i++) {
|
||||
const angle = (i * 2 * Math.PI) / 48;
|
||||
const local = geo.cartesian3.create(
|
||||
radius * Math.cos(angle),
|
||||
radius * Math.sin(angle),
|
||||
0,
|
||||
);
|
||||
const world = geo.matrix4.multiplyByPoint(
|
||||
frame,
|
||||
local,
|
||||
geo.cartesian3.create(),
|
||||
);
|
||||
const point = geo.cartographic.fromCartesian(world);
|
||||
ring.push([
|
||||
geo.math.toDegrees(point.longitude),
|
||||
geo.math.toDegrees(point.latitude),
|
||||
]);
|
||||
}
|
||||
ring.push(ring[0]);
|
||||
return {
|
||||
type: 'Feature',
|
||||
id: `air-quality:${reading.id}`,
|
||||
properties: { ...reading },
|
||||
geometry: { type: 'Polygon', coordinates: [ring] },
|
||||
};
|
||||
}
|
||||
|
||||
/** One native GeoJSON layer per AQHI colour, independent of station count. */
|
||||
export function createAirQualityNavaraRenderer(engine, { view }) {
|
||||
let visible = false;
|
||||
let batches = [];
|
||||
function release(items) {
|
||||
for (const { layer, source } of items) {
|
||||
layer?.delete();
|
||||
source.delete();
|
||||
}
|
||||
}
|
||||
return {
|
||||
viewRectangle: () => engine.camera.viewRectangle(),
|
||||
setVisible(show) {
|
||||
if (visible === show) return;
|
||||
visible = show;
|
||||
for (const { layer, source, paint } of batches) {
|
||||
layer.update({ type: 'vector', source, polygon: { ...paint, show } });
|
||||
}
|
||||
engine.render.request('air-quality-visibility');
|
||||
},
|
||||
replace(rows, radius) {
|
||||
const groups = new Map();
|
||||
for (const row of rows) {
|
||||
if (!groups.has(row.color)) groups.set(row.color, []);
|
||||
groups.get(row.color).push(stationFeature(row, radius));
|
||||
}
|
||||
const next = [];
|
||||
try {
|
||||
for (const [css, features] of groups) {
|
||||
const color = Number.parseInt(css.slice(1), 16);
|
||||
const paint = {
|
||||
color,
|
||||
transparent: true,
|
||||
opacity: 0.35,
|
||||
clampToGround: true,
|
||||
outline: true,
|
||||
outlineShow: true,
|
||||
outlineColor: color,
|
||||
outlineWidth: 2,
|
||||
};
|
||||
const source = view.addSource({
|
||||
type: 'geojson',
|
||||
data: { type: 'FeatureCollection', features },
|
||||
});
|
||||
const batch = { source, paint };
|
||||
next.push(batch);
|
||||
batch.layer = view.addLayer({
|
||||
type: 'vector',
|
||||
source,
|
||||
polygon: { ...paint, show: visible },
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
release(next);
|
||||
throw error;
|
||||
}
|
||||
release(batches);
|
||||
batches = next;
|
||||
engine.render.request('air-quality-readings');
|
||||
},
|
||||
destroy() {
|
||||
release(batches);
|
||||
batches = [];
|
||||
engine.render.request('air-quality-destroy');
|
||||
},
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user