mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 08:42:21 +00:00
Merge origin/main into german/navara
Main's work since the last merge runs on the globe contract where this branch draws through it: - Satellites take main's classes, sensors, ground-track bearings and world time through contract points and rings; launches take the world timeline. The satellite's cockpit subject dims, copies positions and refocuses through the contract. - Flights, military and vessels keep main's photos, retry cool-downs, world-clock motion and the ship bridge. Trail seeding in the shared aircraft tracking reads each layer's clock. - Traffic's flow lines and single build draw as ground sets; transit keeps dated credits and the new cities; CCTV opens the nearest camera, and the Quebec overlay projects and tests the horizon through the contract. Bikeshare's manager cleanup moved into its current lifecycle. - Draw keeps main's mark actions across engine switches. - The world clock in src/time is plain numbers again: Julian dates come from src/geo, the frame loop is injected, and the binding to Cesium's viewer clock lives in src/globe/cesium/worldTime.js. Navara's sky and sun follow the world time; live feeds keep the real time. - The cockpit's orbital view, with its sensor zoom, ground focus and satellite switching, stays Cesium-only for now: Navara hides its entry. Its Cesium calls live in src/globe/cesium/orbital.js. The ship bridge's finest-detail waterline sampling is Cesium-only too; Navara samples loaded geometry and detailed terrain. Both are in KNOWN-ISSUES. - Main's tests that built a Cesium scene by hand run on the fake engine. - The boundary manifest is regenerated, the coupling baseline records the orbital and bridge code, and the main-chunk baseline is raised to the merged size: main itself grew its main chunk by 93,959 bytes (gzip -9) since the previous merge base.
This commit is contained in:
commit
2a761aa5eb
452 files changed
+73437
-1752
No files matched your search
+20
-4
@@ -31,6 +31,7 @@ import {
|
||||
} from '../data/detectionPolicy.js';
|
||||
import { clampScopeFeatherPct } from '../scopeMaskPolicy.js';
|
||||
import { VIEW_STYLES } from '../view/index.js';
|
||||
import { isWorldTime } from '../time/worldClock.js';
|
||||
import { RETIRED_STYLES } from '../visualStylePolicy.js';
|
||||
import {
|
||||
GLOBAL_POST_DEFAULTS,
|
||||
@@ -255,7 +256,7 @@ export const SHARE_VIEW_FLAGS = freezeAll([
|
||||
*/
|
||||
export const SHARE_VIEW_LAYER_OPTION_ABSENT = Object.freeze({
|
||||
'local-firms': Object.freeze({ minFrp: 0, confidence: 'all' }),
|
||||
traffic: Object.freeze({ roadMode: null }),
|
||||
traffic: Object.freeze({ roadMode: null, lines: false, dots: true }),
|
||||
'weather-lightning': Object.freeze({ opacity: 'strong' }),
|
||||
'weather-radar': Object.freeze({ opacity: 'strong' }),
|
||||
'weather-satellite': Object.freeze({
|
||||
@@ -275,7 +276,11 @@ export const SHARE_VIEW_LAYER_OPTION_ABSENT = Object.freeze({
|
||||
selectedFlightsTrackingId: null,
|
||||
selectedMilitaryTrackingId: null,
|
||||
}),
|
||||
satellites: Object.freeze({ catalog: 'core', selectedSatTrackingId: null }),
|
||||
satellites: Object.freeze({
|
||||
catalog: 'core',
|
||||
selectedSatTrackingId: null,
|
||||
classes: 'sitpd',
|
||||
}),
|
||||
cctv: Object.freeze({
|
||||
coverageMode: 'on',
|
||||
showProjection: true,
|
||||
@@ -377,6 +382,7 @@ export const SHARE_VIEW_FIELDS = freezeAll([
|
||||
{ number: 25, key: 'scopeFeatherPct', type: 'uint', default: 100 },
|
||||
{ number: 26, key: 'scopeTerminusPct', type: 'uint', default: null },
|
||||
{ number: 27, key: 'styleParams', type: 'bytes', default: BY_STYLE },
|
||||
{ number: 28, key: 'worldTime', type: 'epoch', default: null },
|
||||
]);
|
||||
const FIELD_BY_KEY = new Map(SHARE_VIEW_FIELDS.map((f) => [f.key, f]));
|
||||
const fieldNumber = (key) => FIELD_BY_KEY.get(key).number;
|
||||
@@ -739,6 +745,9 @@ export function normalizeShareViewState(input = {}) {
|
||||
: null;
|
||||
state.panelState = normalizePanelState(source.panelState);
|
||||
state.sharedAtMs = epochMsOr(source.sharedAtMs);
|
||||
state.worldTime = isWorldTime(source.worldTime)
|
||||
? Math.floor(source.worldTime / 1000) * 1000
|
||||
: null;
|
||||
let view = normalizeView(source.view);
|
||||
if (state.layerState) view = liftTrackedEntity(state.layerState, view);
|
||||
if (view.kind === 'thing') {
|
||||
@@ -955,8 +964,9 @@ export function encodeShareView(input) {
|
||||
writer.sintField(field.number, signedAngle(state[field.key]));
|
||||
break;
|
||||
case 'sharedAtMs':
|
||||
if (state.sharedAtMs !== null)
|
||||
writer.sintField(field.number, epochSeconds(state.sharedAtMs));
|
||||
case 'worldTime':
|
||||
if (state[field.key] !== null)
|
||||
writer.sintField(field.number, epochSeconds(state[field.key]));
|
||||
break;
|
||||
case 'flags': {
|
||||
let bits = 0;
|
||||
@@ -1354,6 +1364,12 @@ export function decodeShareView(code, { nowMs = Date.now() } = {}) {
|
||||
raw.sharedAtMs =
|
||||
createdAtS >= 1 && Number.isSafeInteger(ms) && ms <= nowMs ? ms : null;
|
||||
}
|
||||
// The world time the link was made at, when it was away from live. It
|
||||
// may lie ahead of the link's creation (a forecast) or of now.
|
||||
if (get('worldTime')) {
|
||||
const ms = (SHARE_VIEW_EPOCH_S + unz(get('worldTime').varint)) * 1000;
|
||||
raw.worldTime = isWorldTime(ms) ? ms : null;
|
||||
}
|
||||
|
||||
if (get('layerState'))
|
||||
raw.layerState = decodeLayers(
|
||||
|
||||
@@ -361,6 +361,7 @@ test('every registered field round-trips at once', () => {
|
||||
})),
|
||||
},
|
||||
sharedAtMs: NOW_MS,
|
||||
worldTime: NOW_MS - 6 * 3_600_000,
|
||||
};
|
||||
// A thing view derives its camera (roll 0), so the camera fields are
|
||||
// checked on the same state as a place view.
|
||||
@@ -501,6 +502,7 @@ test('the field registry is well formed and permanent', () => {
|
||||
[25, 'scopeFeatherPct', 100],
|
||||
[26, 'scopeTerminusPct', null],
|
||||
[27, 'styleParams', BY_STYLE],
|
||||
[28, 'worldTime', null],
|
||||
],
|
||||
);
|
||||
assert.deepEqual(
|
||||
@@ -1338,3 +1340,22 @@ test('a layer option filed under a mirror layer is ignored', () => {
|
||||
{ scope: 'layer-option', code: `${military}.${layerTokenNumber('m')}` },
|
||||
]);
|
||||
});
|
||||
|
||||
test('the world time is written only away from live, and may lie ahead', () => {
|
||||
const at = (worldTime) =>
|
||||
decodeShareView(encodeShareView({ sharedAtMs: NOW_MS, worldTime }), {
|
||||
nowMs: NOW_MS,
|
||||
}).state.worldTime;
|
||||
assert.equal(at(null), null);
|
||||
assert.equal(at(NOW_MS - 3_600_000), NOW_MS - 3_600_000);
|
||||
// A forecast moment ahead of the link's creation is kept.
|
||||
assert.equal(at(NOW_MS + 86_400_000), NOW_MS + 86_400_000);
|
||||
// Before the 2026 epoch too: the field is zigzag.
|
||||
assert.equal(at(Date.UTC(2024, 0, 1)), Date.UTC(2024, 0, 1));
|
||||
// Past what a Date can hold: dropped, so the link opens live.
|
||||
assert.equal(at(8.8e15), null);
|
||||
assert.ok(
|
||||
encodeShareView({ sharedAtMs: NOW_MS, worldTime: NOW_MS - 1000 }).length >
|
||||
encodeShareView({ sharedAtMs: NOW_MS }).length,
|
||||
);
|
||||
});
|
||||
Reference in new issue
Block a user