mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Merge main through #1495 into the renderer seam
Brings in radio country coverage (#1206), the restored format scope (#1527), the zoom-out guard (#1522), voice geometry and OSM places (#846) and paired traffic flow density (#1495). What main added that reached Cesium or the viewer now goes through the renderer: - The zoom-out guard reads the Cesium camera controller's own input, so it moves into the adapter (src/render/cesium/zoomOutGuard.js). The application installs it through the scene's viewer hooks, and a scene whose renderer gives no guard starts without one. - OSM places draws its points as a draw set, clamped to the ground. - The voice area actions read the view box and the view centre from the camera port. - The voice workflow harness is test support, named as such where the recent-imagery doubles are.
This commit is contained in:
commit
fd42fc0afd
136 files changed
+17399
-1120
No files matched your search
@@ -30,6 +30,7 @@ export const LAYER_NAME_KEYS = Object.freeze({
|
||||
'telegeography-submarine-cables': msg('Submarine Cables'),
|
||||
'local-firms': msg('FIRMS Active Fires'),
|
||||
'local-adsb': msg('Local ADS-B'),
|
||||
'osm-places': msg('OSM Places'),
|
||||
transit: msg('Transit'),
|
||||
'recent-imagery': msg('Recent Imagery'),
|
||||
'fire-perimeters': msg('Fire Perimeters'),
|
||||
|
||||
@@ -94,7 +94,7 @@ const PANEL_GROUPS = [
|
||||
// needs no heading there.
|
||||
{
|
||||
label: msg('Utilities'),
|
||||
ids: ['directions'],
|
||||
ids: ['directions', 'osm-places'],
|
||||
containerId: 'utilities-toggles',
|
||||
},
|
||||
{
|
||||
|
||||
@@ -38,6 +38,7 @@ const ESRI_NOTE = msg('Imagery on Esri · Google 3D returns when cleared');
|
||||
const LAYER_NOTICES = new Set([
|
||||
ESRI_NOTE,
|
||||
msg('Box and images cleared'),
|
||||
msg('Search cancelled'),
|
||||
msg('Esri map unavailable · no swipe'),
|
||||
msg('Swipe needs a globe map'),
|
||||
msg('Imagery stays on Esri · CLEAR to use Google 3D'),
|
||||
|
||||
@@ -323,7 +323,10 @@ test('a thing view turns its layer on, follows by id and frames the shared offse
|
||||
page.viewer.camera,
|
||||
Object.getOwnPropertyDescriptors(followCamera),
|
||||
);
|
||||
entity = withEntityRecord({}, { trackedId: 'flights:a1b2c3', displayPosition: () => target });
|
||||
entity = withEntityRecord(
|
||||
{},
|
||||
{ trackedId: 'flights:a1b2c3', displayPosition: () => target },
|
||||
);
|
||||
|
||||
const parsed = page.manager._parseShareCode(aircraftCode());
|
||||
assert.deepEqual(parsed.layerState.enabledLayerIds, ['flights']);
|
||||
@@ -495,7 +498,10 @@ test('the followed entity is read in the share format, and its offset round-trip
|
||||
const viewer = bindFakeCesiumCamera({
|
||||
camera: { positionWC: cameraPosition },
|
||||
clock: { currentTime: Cesium.JulianDate.now() },
|
||||
trackedEntity: withEntityRecord({}, { trackedId: 'military:ae1234', displayPosition: () => target }),
|
||||
trackedEntity: withEntityRecord(
|
||||
{},
|
||||
{ trackedId: 'military:ae1234', displayPosition: () => target },
|
||||
),
|
||||
});
|
||||
const subject = readShareFollowSubject({ viewer, nowMs: NOW_MS });
|
||||
assert.equal(subject.kind, 'military_aircraft');
|
||||
|
||||
@@ -37,7 +37,6 @@ registerHooks({
|
||||
|
||||
const { IntelHUD } = await import('../../hud.js');
|
||||
|
||||
|
||||
function mount(t) {
|
||||
document.body.replaceChildren();
|
||||
const pinia = createPinia();
|
||||
@@ -47,7 +46,9 @@ function mount(t) {
|
||||
const hud = new IntelHUD(
|
||||
{},
|
||||
{
|
||||
camera: fakeCameraPort({ pose: { lat: deg(0.7), lon: deg(-1.2), height: 500 } }).port,
|
||||
camera: fakeCameraPort({
|
||||
pose: { lat: deg(0.7), lon: deg(-1.2), height: 500 },
|
||||
}).port,
|
||||
// No AI summary: the readouts are what this test renders.
|
||||
summaryService: { configured: async () => false },
|
||||
publish: (view) => store.publish(view),
|
||||
|
||||
Reference in new issue
Block a user