benmichael/gods-eye-view
1
0 Fork 0
mirror of https://github.com/bilawalsidhu/gods-eye-view.git synced 2026-11-04 02:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(maps): settle failed recovery and update registry QA

Browse Source
This commit is contained in:
Sameh Khamis committed 2026-09-13 19:01:23 -07:00
1 parent 06c73bca98
commit 8024813792
4 files changed
+145 -300
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

scripts/package-boundaries.json
+96 -297
View File
@@ -10,47 +10,27 @@
"src/data/localGeojsonCore.js",
"src/data/localGeojsonLod.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"application": {
"exports": [
"./application"
],
"modules": [
"src/app/application.js"
],
"exports": ["./application"],
"modules": ["src/app/application.js"],
"external": []
},
"viewer": {
"exports": [
"./application/viewer"
],
"modules": [
"src/app/viewer.js"
],
"external": [
"cesium"
]
"exports": ["./application/viewer"],
"modules": ["src/app/viewer.js"],
"external": ["cesium"]
},
"vite-build": {
"runtime": "node",
"exports": [
"./build/vite"
],
"modules": [
"build/vite.js"
],
"external": [
"vite-plugin-cesium"
]
"exports": ["./build/vite"],
"modules": ["build/vite.js"],
"external": ["vite-plugin-cesium"]
},
"live-providers": {
"runtime": "node",
"exports": [
"./server/providers/live"
],
"exports": ["./server/providers/live"],
"modules": [
"server/providers/live.js",
"server/providers/common/http.js",
@@ -65,24 +45,16 @@
"src/data/aisStreamAdapter.js",
"src/data/aisWatchdog.js"
],
"external": [
"ws"
]
"external": ["ws"]
},
"adsb-lol-source": {
"exports": [
"./sources/adsb-lol"
],
"modules": [
"src/data/adsbLolFallback.js"
],
"exports": ["./sources/adsb-lol"],
"modules": ["src/data/adsbLolFallback.js"],
"external": []
},
"place-providers": {
"runtime": "node",
"exports": [
"./server/providers/places"
],
"exports": ["./server/providers/places"],
"modules": [
"server/providers/places.js",
"server/providers/places/google.js",
@@ -97,19 +69,13 @@
"external": []
},
"place-payloads": {
"exports": [
"./sources/places"
],
"modules": [
"src/data/placeProviderPayloads.js"
],
"exports": ["./sources/places"],
"modules": ["src/data/placeProviderPayloads.js"],
"external": []
},
"space-providers": {
"runtime": "node",
"exports": [
"./server/providers/space"
],
"exports": ["./server/providers/space"],
"modules": [
"server/providers/space.js",
"server/providers/space/celestrak.js",
@@ -120,19 +86,13 @@
"external": []
},
"space-requests": {
"exports": [
"./sources/space"
],
"modules": [
"src/data/spaceProviderRequests.js"
],
"exports": ["./sources/space"],
"modules": ["src/data/spaceProviderRequests.js"],
"external": []
},
"terrain-provider": {
"runtime": "node",
"exports": [
"./server/providers/terrain"
],
"exports": ["./server/providers/terrain"],
"modules": [
"server/providers/terrain.js",
"src/data/terrainHeightsProxy.js"
@@ -140,50 +100,30 @@
"external": []
},
"terrain-source": {
"exports": [
"./sources/terrain"
],
"modules": [
"src/data/terrainHeightsProxy.js"
],
"exports": ["./sources/terrain"],
"modules": ["src/data/terrainHeightsProxy.js"],
"external": []
},
"traffic-provider": {
"runtime": "node",
"exports": [
"./server/providers/traffic"
],
"modules": [
"server/providers/traffic.js",
"src/data/tomtomTiles.js"
],
"exports": ["./server/providers/traffic"],
"modules": ["server/providers/traffic.js", "src/data/tomtomTiles.js"],
"external": []
},
"traffic-source": {
"exports": [
"./sources/traffic"
],
"modules": [
"src/data/tomtomTiles.js"
],
"exports": ["./sources/traffic"],
"modules": ["src/data/tomtomTiles.js"],
"external": []
},
"firms-provider": {
"runtime": "node",
"exports": [
"./server/providers/firms"
],
"modules": [
"server/providers/firms.js",
"src/data/firmsCsv.js"
],
"exports": ["./server/providers/firms"],
"modules": ["server/providers/firms.js", "src/data/firmsCsv.js"],
"external": []
},
"gbfs-provider": {
"runtime": "node",
"exports": [
"./server/providers/gbfs"
],
"exports": ["./server/providers/gbfs"],
"modules": [
"server/providers/gbfs.js",
"server/providers/common/http.js",
@@ -192,19 +132,13 @@
"external": []
},
"gbfs-source": {
"exports": [
"./sources/gbfs"
],
"modules": [
"src/data/gbfsSource.js"
],
"exports": ["./sources/gbfs"],
"modules": ["src/data/gbfsSource.js"],
"external": []
},
"cctv-provider": {
"runtime": "node",
"exports": [
"./server/providers/cctv"
],
"exports": ["./server/providers/cctv"],
"modules": [
"server/providers/cctv.js",
"server/providers/cctv/catalog.js",
@@ -221,9 +155,7 @@
},
"radio-provider": {
"runtime": "node",
"exports": [
"./server/providers/radio"
],
"exports": ["./server/providers/radio"],
"modules": [
"server/providers/radio.js",
"server/providers/radio/catalog.js",
@@ -237,9 +169,7 @@
},
"overpass-provider": {
"runtime": "node",
"exports": [
"./server/providers/overpass"
],
"exports": ["./server/providers/overpass"],
"modules": [
"server/providers/common/geo.js",
"server/providers/common/http.js",
@@ -258,9 +188,7 @@
},
"military-installations-provider": {
"runtime": "node",
"exports": [
"./server/providers/military-installations"
],
"exports": ["./server/providers/military-installations"],
"modules": [
"server/providers/common/http.js",
"server/providers/common/query.js",
@@ -277,9 +205,7 @@
},
"regional-provider": {
"runtime": "node",
"exports": [
"./server/providers/regional"
],
"exports": ["./server/providers/regional"],
"modules": [
"server/providers/common/http.js",
"server/providers/common/query.js",
@@ -298,9 +224,7 @@
},
"openai-provider": {
"runtime": "node",
"exports": [
"./server/providers/openai"
],
"exports": ["./server/providers/openai"],
"modules": [
"server/providers/common/rate-limit.js",
"server/providers/common/request.js",
@@ -320,9 +244,7 @@
},
"standalone-key-setup": {
"runtime": "node",
"exports": [
"./server/standalone/key-setup"
],
"exports": ["./server/standalone/key-setup"],
"modules": [
"scripts/pinokio-environment.mjs",
"server/providers/common/source-root.js",
@@ -333,9 +255,7 @@
"external": []
},
"place-search": {
"exports": [
"./search"
],
"exports": ["./search"],
"modules": [
"src/search/index.js",
"src/search/placeSearch.js",
@@ -345,27 +265,17 @@
"external": []
},
"panel-disclosure": {
"exports": [
"./ui/panels"
],
"modules": [
"src/ui/panelDisclosure.js"
],
"exports": ["./ui/panels"],
"modules": ["src/ui/panelDisclosure.js"],
"external": []
},
"surface-keyboard": {
"exports": [
"./ui/surfaces"
],
"modules": [
"src/ui/surfaceKeyboard.js"
],
"exports": ["./ui/surfaces"],
"modules": ["src/ui/surfaceKeyboard.js"],
"external": []
},
"panel-rail-layout": {
"exports": [
"./ui/layout"
],
"exports": ["./ui/layout"],
"modules": [
"src/ui/panelRails.js",
"src/ui/leftPanelRail.js",
@@ -377,9 +287,7 @@
"external": []
},
"visual-input": {
"exports": [
"./ui/input"
],
"exports": ["./ui/input"],
"modules": [
"src/ui/visualInput.js",
"src/ui/applicationShortcuts.js",
@@ -388,19 +296,12 @@
"external": []
},
"display-controls": {
"exports": [
"./ui/display"
],
"modules": [
"src/ui/displayControls.js"
],
"exports": ["./ui/display"],
"modules": ["src/ui/displayControls.js"],
"external": []
},
"visual-effects": {
"exports": [
"./ui/effects",
"./ui/effects/bloom"
],
"exports": ["./ui/effects", "./ui/effects/bloom"],
"modules": [
"src/ui/effects.js",
"src/ui/visualEffects.js",
@@ -413,14 +314,10 @@
"src/styles/noir.js",
"src/styles/snow.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"map-source-controls": {
"exports": [
"./ui/maps"
],
"exports": ["./ui/maps"],
"modules": [
"src/ui/mapSource.js",
"src/ui/mapSourceControls.js",
@@ -430,10 +327,7 @@
"external": []
},
"layer-panel": {
"exports": [
"./ui/layers",
"./ui/layers/feedback"
],
"exports": ["./ui/layers", "./ui/layers/feedback"],
"modules": [
"src/ui/layers.js",
"src/ui/layerPanel.js",
@@ -444,9 +338,7 @@
"external": []
},
"location-controls": {
"exports": [
"./ui/location"
],
"exports": ["./ui/location"],
"modules": [
"src/ui/location.js",
"src/ui/locationControls.js",
@@ -457,9 +349,7 @@
"external": []
},
"radio-controls": {
"exports": [
"./ui/radio"
],
"exports": ["./ui/radio"],
"modules": [
"src/ui/radio.js",
"src/ui/radioControls.js",
@@ -470,9 +360,7 @@
"external": []
},
"cctv-controls": {
"exports": [
"./ui/cctv"
],
"exports": ["./ui/cctv"],
"modules": [
"src/ui/cctv.js",
"src/ui/cctvBindings.js",
@@ -484,10 +372,7 @@
"external": []
},
"context-controls": {
"exports": [
"./ui/context",
"./ui/context/policy"
],
"exports": ["./ui/context", "./ui/context/policy"],
"modules": [
"src/ui/context.js",
"src/ui/contextActions.js",
@@ -529,14 +414,10 @@
"src/cockpitVisionPolicy.js",
"src/ui/panelRailGeometry.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"scene-controls": {
"exports": [
"./ui/scenes"
],
"exports": ["./ui/scenes"],
"modules": [
"src/ui/scenes.js",
"src/ui/sceneControls.js",
@@ -545,9 +426,7 @@
"external": []
},
"ui-shell": {
"exports": [
"./ui/shell"
],
"exports": ["./ui/shell"],
"modules": [
"src/bloom.js",
"src/cctvFocusPolicy.js",
@@ -644,14 +523,10 @@
"src/app/stateChannel.js",
"src/ui/frameRateMonitor.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"ui-styles": {
"exports": [
"./ui/styles"
],
"exports": ["./ui/styles"],
"modules": [
"src/ui/styles.js",
"style.css",
@@ -678,9 +553,7 @@
"external": []
},
"scenes": {
"exports": [
"./scenes"
],
"exports": ["./scenes"],
"modules": [
"src/scenes/director.js",
"src/scenes/recipes.js",
@@ -692,14 +565,10 @@
"src/ui/scenePresentation.js",
"src/contextModePolicy.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"live-observations": {
"exports": [
"./sources/live"
],
"exports": ["./sources/live"],
"modules": [
"src/sources/live/aircraft.js",
"src/sources/live/contract.js",
@@ -710,9 +579,7 @@
"external": []
},
"civil-flights": {
"exports": [
"./layers/flights"
],
"exports": ["./layers/flights"],
"modules": [
"src/data/aircraftClass.js",
"src/data/aircraftIcons.js",
@@ -743,14 +610,10 @@
"src/layers/flights/testing.js",
"src/layers/flights/tracking.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"military-flights": {
"exports": [
"./layers/military"
],
"exports": ["./layers/military"],
"modules": [
"src/data/aircraftClass.js",
"src/data/aircraftIcons.js",
@@ -778,14 +641,10 @@
"src/layers/military/testing.js",
"src/layers/military/tracking.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"aircraft-mechanics": {
"exports": [
"./aircraft"
],
"exports": ["./aircraft"],
"modules": [
"src/data/aircraftClass.js",
"src/data/aircraftIcons.js",
@@ -805,14 +664,10 @@
"src/layers/aircraft/classification.js",
"src/layers/aircraft/index.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"vessel-layer": {
"exports": [
"./layers/vessels"
],
"exports": ["./layers/vessels"],
"modules": [
"src/layers/vessels/cards.js",
"src/layers/vessels/evidence.js",
@@ -830,27 +685,19 @@
"src/data/iconOrientation.js",
"src/data/vesselLabels.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"earthquakes": {
"exports": [
"./layers/earthquakes"
],
"exports": ["./layers/earthquakes"],
"modules": [
"src/layers/earthquakes/index.js",
"src/layers/earthquakes/model.js",
"src/layers/earthquakes/source.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"fire-layer": {
"exports": [
"./layers/firms"
],
"exports": ["./layers/firms"],
"modules": [
"src/data/firmsAdapt.js",
"src/data/firmsLabels.js",
@@ -869,14 +716,10 @@
"src/layers/firms/state.js",
"src/layers/firms/viewport.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"satellites-layer": {
"exports": [
"./layers/satellites"
],
"exports": ["./layers/satellites"],
"modules": [
"src/data/issPass.js",
"src/data/satelliteClass.js",
@@ -895,15 +738,10 @@
"src/layers/satellites/testing.js",
"src/layers/satellites/tracking.js"
],
"external": [
"cesium",
"satellite.js"
]
"external": ["cesium", "satellite.js"]
},
"launches-layer": {
"exports": [
"./layers/launches"
],
"exports": ["./layers/launches"],
"modules": [
"src/layers/launches/camera.js",
"src/layers/launches/controls.js",
@@ -925,14 +763,10 @@
"src/layers/launches/state.js",
"src/layers/launches/testing.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"installations-layer": {
"exports": [
"./layers/installations"
],
"exports": ["./layers/installations"],
"modules": [
"src/data/installationFeedback.js",
"src/data/militaryInstallationData.js",
@@ -948,14 +782,10 @@
"src/layers/installations/state.js",
"src/layers/installations/viewport.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"awareness-layer": {
"exports": [
"./layers/awareness"
],
"exports": ["./layers/awareness"],
"modules": [
"src/cockpitMath.js",
"src/data/iconOrientation.js",
@@ -978,14 +808,10 @@
"src/layers/awareness/testing.js",
"src/ui/panelRailGeometry.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"traffic-layer": {
"exports": [
"./layers/traffic"
],
"exports": ["./layers/traffic"],
"modules": [
"src/data/flowMatch.js",
"src/data/tomtomTiles.js",
@@ -1010,16 +836,10 @@
"src/layers/traffic/timing.js",
"src/layers/traffic/viewport.js"
],
"external": [
"cesium",
"pbf",
"@mapbox/vector-tile"
]
"external": ["cesium", "pbf", "@mapbox/vector-tile"]
},
"bikeshare-layer": {
"exports": [
"./layers/bikeshare"
],
"exports": ["./layers/bikeshare"],
"modules": [
"src/layers/bikeshare/controls.js",
"src/layers/bikeshare/index.js",
@@ -1036,14 +856,10 @@
"src/layers/bikeshare/testing.js",
"src/layers/bikeshare/viewport.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"cctv-layer": {
"exports": [
"./layers/cctv"
],
"exports": ["./layers/cctv"],
"modules": [
"src/data/cctvCards.js",
"src/data/cctvGizmo.js",
@@ -1076,14 +892,10 @@
"src/layers/cctv/testing.js",
"src/overlays/worldOverlayTokens.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"radio-layer": {
"exports": [
"./layers/radio"
],
"exports": ["./layers/radio"],
"modules": [
"src/data/iconOrientation.js",
"src/data/layerState.js",
@@ -1112,14 +924,10 @@
"src/layers/radio/volume.js",
"src/ui/radioTunerModel.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"submarine-cables": {
"exports": [
"./layers/submarine-cables"
],
"exports": ["./layers/submarine-cables"],
"modules": [
"src/layers/submarineCables/geometry.js",
"src/layers/submarineCables/index.js",
@@ -1132,14 +940,10 @@
"src/layers/submarineCables/state.js",
"src/layers/submarineCables/surface.js"
],
"external": [
"cesium"
]
"external": ["cesium"]
},
"bundled-cables": {
"exports": [
"./sources/bundled-cables"
],
"exports": ["./sources/bundled-cables"],
"modules": [
"src/layers/submarineCables/bundledSource.js",
"src/data/local_data/telegeography_submarine_cables/cable-geo.json",
@@ -1148,10 +952,7 @@
"external": []
},
"geography": {
"exports": [
"./geography/natural-earth",
"./geography/neighborhoods"
],
"exports": ["./geography/natural-earth", "./geography/neighborhoods"],
"modules": [
"src/data/naturalEarthRegions.js",
"src/data/neighborhoodPolygons.js",
@@ -1183,8 +984,6 @@
"src/maps/terrain.js",
"src/keySetupCore.mjs"
],
"external": [
"cesium"
]
"external": ["cesium"]
}
}
scripts/qa-map-source-tray.mjs
+8
View File
@@ -714,6 +714,14 @@ try {
if (controller.googleTileset) controller.googleTileset.show = false;
controller.googleTileset = null;
controller.cesiumToken = '';
// Availability is now composed in the source registry. Override only
// this fixture's choices, as the previous token-field seam did.
for (const source of controller._sources.values()) {
if (source.descriptor.requiresIon || source.descriptor.kind === 'photoreal') {
source.available = false;
}
}
controller._registry.state.hasCesiumIonToken = false;
await styleManager._setMapStack('osm', { syncShare: false });
styleManager._initMapStackControl();
});
src/maps/controller.js
+9 -3
View File
@@ -124,9 +124,15 @@ export class MapSourceController {
recovery.id !== stack.id &&
this.isStackAvailable(recovery.id)
) {
await this._activate(recovery, gen);
if (gen !== this._switchGen) return this.getState();
this._activeId = recovery.id;
try {
const activation = await this._activate(recovery, gen);
if (gen !== this._switchGen) return this.getState();
this._activeId = activation?.effectiveStackId || recovery.id;
} catch (recoveryError) {
if (gen !== this._switchGen) return this.getState();
this._lastError = recoveryError?.message || String(recoveryError);
this._onError?.(this._lastError, recovery);
}
}
if (!silent) this._emitChange('error');
} finally {
src/maps/controller.test.mjs
+32
View File
@@ -349,3 +349,35 @@ for (const reactivate of [false, true]) {
assert.equal(destroyed, 1);
});
}
test('a failed recovery reports its error and leaves switching settled', async () => {
const errors = [];
const env = fixture(
{
defaultId: 'first',
recoveryId: 'recovery',
sources: [
{
descriptor: descriptor('first'),
imagery: async () => {
throw new Error('first offline');
},
},
{
descriptor: descriptor('recovery'),
imagery: async () => {
throw new Error('recovery offline');
},
},
],
},
{ onError: (message) => errors.push(message) },
);
const result = await env.controller.setStack('first');
assert.equal(result.status, 'ready');
assert.equal(result.lastError, 'recovery offline');
assert.deepEqual(errors, ['first offline', 'recovery offline']);
assert.equal(env.changes.at(-1).status, 'error');
assert.equal(env.imagery.length, 0);
env.controller.destroy();
});