mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Convert voice action positions and distances through src/geo
Voice actions read degrees from ECEF positions with toLonLatH and measure distances with src/geo, at the sites that only did maths. A position that converts to NaN now reads as unknown, never as NaN coordinates. The analyst test gives its subject a real ECEF position instead of patching Cesium. Sites that keep a Cesium Cartographic, or use the camera or picks, wait for the renderer ports.
This commit is contained in:
1 parent
e09b48c4ac
commit
d2bc1e9d44
2 files changed
+23
-28
No files matched your search
+21
-20
@@ -12,6 +12,7 @@ import { msg } from '../i18n/index.js';
|
|||||||
import { useProviderSettingsStore } from '../ui/stores/providerSettings.js';
|
import { useProviderSettingsStore } from '../ui/stores/providerSettings.js';
|
||||||
import { applicationPinia } from '../ui/vueRuntime.js';
|
import { applicationPinia } from '../ui/vueRuntime.js';
|
||||||
import * as Cesium from 'cesium';
|
import * as Cesium from 'cesium';
|
||||||
|
import { distance as chordM, toLonLatH } from '../geo/index.js';
|
||||||
import { CITY_POIS } from '../cityPois.js';
|
import { CITY_POIS } from '../cityPois.js';
|
||||||
import { greatCircleKm } from '../geoDistance.js';
|
import { greatCircleKm } from '../geoDistance.js';
|
||||||
import {
|
import {
|
||||||
@@ -2626,7 +2627,7 @@ async function frameOverhead(viewer, dataManager, styleManager, args = {}) {
|
|||||||
.filter((entry) => entry.position)
|
.filter((entry) => entry.position)
|
||||||
.map((entry) => ({
|
.map((entry) => ({
|
||||||
...entry,
|
...entry,
|
||||||
distance: Cesium.Cartesian3.distance(center, entry.position),
|
distance: chordM(center, entry.position),
|
||||||
}))
|
}))
|
||||||
.filter((entry) => entry.distance <= radiusKm * 1000)
|
.filter((entry) => entry.distance <= radiusKm * 1000)
|
||||||
.sort((a, b) => a.distance - b.distance)
|
.sort((a, b) => a.distance - b.distance)
|
||||||
@@ -2926,7 +2927,7 @@ function adjustCameraZoom(viewer, args) {
|
|||||||
const beforeHeightM = camera.positionCartographic.height;
|
const beforeHeightM = camera.positionCartographic.height;
|
||||||
const target = getViewTargetCartesian(viewer);
|
const target = getViewTargetCartesian(viewer);
|
||||||
const targetDistanceM = target
|
const targetDistanceM = target
|
||||||
? Cesium.Cartesian3.distance(beforePosition, target)
|
? chordM(beforePosition, target)
|
||||||
: Math.max(100, beforeHeightM);
|
: Math.max(100, beforeHeightM);
|
||||||
const minimumDistanceM = direction === 'in' ? 20 : 50;
|
const minimumDistanceM = direction === 'in' ? 20 : 50;
|
||||||
const movementM = Math.max(minimumDistanceM, targetDistanceM * fraction);
|
const movementM = Math.max(minimumDistanceM, targetDistanceM * fraction);
|
||||||
@@ -2953,7 +2954,7 @@ function adjustCameraZoom(viewer, args) {
|
|||||||
viewer.scene.requestRender();
|
viewer.scene.requestRender();
|
||||||
|
|
||||||
const afterPosition = camera.positionWC;
|
const afterPosition = camera.positionWC;
|
||||||
const movedM = Cesium.Cartesian3.distance(beforePosition, afterPosition);
|
const movedM = chordM(beforePosition, afterPosition);
|
||||||
const afterHeightM = camera.positionCartographic.height;
|
const afterHeightM = camera.positionCartographic.height;
|
||||||
const moved = movedM >= 0.5;
|
const moved = movedM >= 0.5;
|
||||||
return {
|
return {
|
||||||
@@ -3751,11 +3752,10 @@ async function aircraftProximityWindowForQuery(
|
|||||||
let lat = record?.lat;
|
let lat = record?.lat;
|
||||||
let lon = record?.lon;
|
let lon = record?.lon;
|
||||||
if (!Number.isFinite(lat) || !Number.isFinite(lon)) {
|
if (!Number.isFinite(lat) || !Number.isFinite(lon)) {
|
||||||
const carto = item.position
|
const at = item.position ? toLonLatH(item.position) : null;
|
||||||
? Cesium.Cartographic.fromCartesian(item.position)
|
const known = at && Number.isFinite(at.lat) && Number.isFinite(at.lon);
|
||||||
: null;
|
lat = known ? at.lat : null;
|
||||||
lat = carto ? Cesium.Math.toDegrees(carto.latitude) : null;
|
lon = known ? at.lon : null;
|
||||||
lon = carto ? Cesium.Math.toDegrees(carto.longitude) : null;
|
|
||||||
}
|
}
|
||||||
const row = {
|
const row = {
|
||||||
...(record || {
|
...(record || {
|
||||||
@@ -3914,10 +3914,10 @@ const SUBJECT_CENTER_TOLERANCE_KM = 1;
|
|||||||
function centerMatchesSubject(center, subjectPosition) {
|
function centerMatchesSubject(center, subjectPosition) {
|
||||||
if (!Number.isFinite(center?.lat) || !Number.isFinite(center?.lon))
|
if (!Number.isFinite(center?.lat) || !Number.isFinite(center?.lon))
|
||||||
return false;
|
return false;
|
||||||
const carto = Cesium.Cartographic.fromCartesian(subjectPosition);
|
const at = toLonLatH(subjectPosition);
|
||||||
if (!carto) return false;
|
if (!at) return false;
|
||||||
const subjectLat = Cesium.Math.toDegrees(carto.latitude);
|
const subjectLat = at.lat;
|
||||||
const subjectLon = Cesium.Math.toDegrees(carto.longitude);
|
const subjectLon = at.lon;
|
||||||
return (
|
return (
|
||||||
greatCircleKm(
|
greatCircleKm(
|
||||||
{ lat: subjectLat, lon: subjectLon },
|
{ lat: subjectLat, lon: subjectLon },
|
||||||
@@ -4368,11 +4368,11 @@ function sampleViewportCartographics(viewer) {
|
|||||||
Cesium.Ellipsoid.WGS84,
|
Cesium.Ellipsoid.WGS84,
|
||||||
);
|
);
|
||||||
if (!isPickedWorldPosition(cartesian)) continue;
|
if (!isPickedWorldPosition(cartesian)) continue;
|
||||||
const carto = Cesium.Cartographic.fromCartesian(cartesian);
|
const at = toLonLatH(cartesian);
|
||||||
if (!carto) continue;
|
if (!at) continue;
|
||||||
samples.push({
|
samples.push({
|
||||||
latitude: Number(Cesium.Math.toDegrees(carto.latitude).toFixed(4)),
|
latitude: Number(at.lat.toFixed(4)),
|
||||||
longitude: Number(Cesium.Math.toDegrees(carto.longitude).toFixed(4)),
|
longitude: Number(at.lon.toFixed(4)),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return samples;
|
return samples;
|
||||||
@@ -4840,11 +4840,12 @@ function analystProviders(
|
|||||||
?.module?.getContextSnapshot?.();
|
?.module?.getContextSnapshot?.();
|
||||||
const subject = snapshot?.subject;
|
const subject = snapshot?.subject;
|
||||||
if (!subject?.position) return null;
|
if (!subject?.position) return null;
|
||||||
const carto = Cesium.Cartographic.fromCartesian(subject.position);
|
const at = toLonLatH(subject.position);
|
||||||
if (!carto) return null;
|
if (!at || !Number.isFinite(at.lat) || !Number.isFinite(at.lon))
|
||||||
|
return null;
|
||||||
return {
|
return {
|
||||||
lat: Cesium.Math.toDegrees(carto.latitude),
|
lat: at.lat,
|
||||||
lon: Cesium.Math.toDegrees(carto.longitude),
|
lon: at.lon,
|
||||||
label: subject.label || subject.id || null,
|
label: subject.label || subject.id || null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { createStandalonePlaceSearch } from '../standalone/placeSearch.js';
|
|||||||
import { test } from 'node:test';
|
import { test } from 'node:test';
|
||||||
import assert from 'node:assert/strict';
|
import assert from 'node:assert/strict';
|
||||||
import * as Cesium from 'cesium';
|
import * as Cesium from 'cesium';
|
||||||
|
import { fromDegrees } from '../geo/index.js';
|
||||||
import { CCTV_FOCUS_RESULT } from '../data/cctv.js';
|
import { CCTV_FOCUS_RESULT } from '../data/cctv.js';
|
||||||
import { getContextStore, registerEntityContext } from '../data/contextStore.js';
|
import { getContextStore, registerEntityContext } from '../data/contextStore.js';
|
||||||
import { DataLayerManager } from '../data/manager.js';
|
import { DataLayerManager } from '../data/manager.js';
|
||||||
@@ -2878,7 +2879,7 @@ test('a nested Cockpit rollback result is translated too', async () => {
|
|||||||
* analyst's 2 000-record last-fix slice). These pin the unified engine.
|
* analyst's 2 000-record last-fix slice). These pin the unified engine.
|
||||||
*/
|
*/
|
||||||
function awarenessSubjectHarness({ subject, flights = [], military = [] }) {
|
function awarenessSubjectHarness({ subject, flights = [], military = [] }) {
|
||||||
const position = subject ? { __subject: true } : null;
|
const position = subject ? fromDegrees(-97.9, 29.9, 9000) : null;
|
||||||
const snapshotFlights = flights.slice(0, 20_000);
|
const snapshotFlights = flights.slice(0, 20_000);
|
||||||
const snapshotMilitary = military.slice(0, 20_000);
|
const snapshotMilitary = military.slice(0, 20_000);
|
||||||
return {
|
return {
|
||||||
@@ -2945,7 +2946,6 @@ async function withAwareness(harness, run) {
|
|||||||
aircraftSnapshot: awareness.getAircraftQuerySnapshot,
|
aircraftSnapshot: awareness.getAircraftQuerySnapshot,
|
||||||
flightsNearby: flightsLayer.getNearby,
|
flightsNearby: flightsLayer.getNearby,
|
||||||
militaryNearby: militaryLayer.getNearby,
|
militaryNearby: militaryLayer.getNearby,
|
||||||
cartoFrom: Cesium.Cartographic.fromCartesian,
|
|
||||||
};
|
};
|
||||||
awareness.getContextSnapshot = () => harness.snapshot;
|
awareness.getContextSnapshot = () => harness.snapshot;
|
||||||
awareness.getAircraftQuerySnapshot = () => {
|
awareness.getAircraftQuerySnapshot = () => {
|
||||||
@@ -2978,11 +2978,6 @@ async function withAwareness(harness, run) {
|
|||||||
};
|
};
|
||||||
flightsLayer.getNearby = () => harness.flights.slice();
|
flightsLayer.getNearby = () => harness.flights.slice();
|
||||||
militaryLayer.getNearby = () => harness.military.slice();
|
militaryLayer.getNearby = () => harness.military.slice();
|
||||||
Cesium.Cartographic.fromCartesian = (value) => (
|
|
||||||
value?.__subject
|
|
||||||
? { latitude: Cesium.Math.toRadians(29.9), longitude: Cesium.Math.toRadians(-97.9), height: 9000 }
|
|
||||||
: originals.cartoFrom(value)
|
|
||||||
);
|
|
||||||
try {
|
try {
|
||||||
return await run(awareness);
|
return await run(awareness);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -2990,7 +2985,6 @@ async function withAwareness(harness, run) {
|
|||||||
awareness.getAircraftQuerySnapshot = originals.aircraftSnapshot;
|
awareness.getAircraftQuerySnapshot = originals.aircraftSnapshot;
|
||||||
flightsLayer.getNearby = originals.flightsNearby;
|
flightsLayer.getNearby = originals.flightsNearby;
|
||||||
militaryLayer.getNearby = originals.militaryNearby;
|
militaryLayer.getNearby = originals.militaryNearby;
|
||||||
Cesium.Cartographic.fromCartesian = originals.cartoFrom;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user