Merge origin/main into fix/earthquake-click-details

This commit is contained in:
manjunath22466 committed 2026-11-17 11:49:17 +05:30
commit 4804097ca1
204 files changed
+34669 -680

No files matched your search

+27
View File
@@ -320,6 +320,9 @@
"src/ui/scenes.js",
"src/ui/sceneControls.js",
"src/ui/scenePresentation.js",
"src/scenes/storyThumb.test.mjs",
"src/scenes/storyThumb.js",
"src/scenes/storyTags.js",
"src/ui/sceneControls.test.mjs",
"scripts/qa-scene-controls.mjs",
"scripts/qa-action-buttons.mjs",
@@ -1323,6 +1326,30 @@
"src/ui/stores/owners.test.mjs",
"src/ui/stores/panels.test.mjs",
"src/ui/stores/status.js",
"src/stories/catalog.js",
"src/stories/format.js",
"src/stories/gevLogo.js",
"src/stories/storyMeta.js",
"src/stories/thumbs.js",
"src/stories/thumbs.test.mjs",
"src/stories/controller.js",
"src/stories/gevPlayer.js",
"src/stories/gevPlayer.test.mjs",
"src/stories/boot.js",
"src/stories/keyboard.js",
"src/stories/keyboard.test.mjs",
"src/stories/boot.test.mjs",
"src/stories/controller.test.mjs",
"src/ui/storiesCredit.test.mjs",
"src/ui/styles/stories.css",
"src/ui/styles/stories-entry.css",
"src/ui/views/stories/ExploreScreen.vue",
"src/ui/views/stories/StoriesHeader.vue",
"src/ui/views/stories/StoryContext.vue",
"src/ui/views/stories/StoryRail.vue",
"src/ui/views/stories/StoryScreen.vue",
"src/ui/views/stories/StoryTimeline.vue",
"src/ui/stores/stories.js",
"src/ui/statusChipsView.test.mjs",
"src/ui/statusChipOwners.test.mjs",
"src/ui/toast.js",
+104 -37
View File
@@ -77,6 +77,19 @@
"src/app/application.js",
"src/ui/vueRuntime.js",
"src/ui/views/index.js",
"src/ui/views/StoriesView.vue",
"src/ui/views/stories/StoryContext.vue",
"src/ui/views/stories/StoriesHeader.vue",
"src/ui/views/stories/ExploreScreen.vue",
"src/ui/views/stories/StoryScreen.vue",
"src/ui/views/stories/StoryRail.vue",
"src/ui/views/stories/StoryTimeline.vue",
"src/ui/stores/stories.js",
"src/ui/styles/stories.css",
"src/stories/format.js",
"src/stories/keyboard.js",
"src/stories/storyMeta.js",
"src/stories/gevLogo.js",
"src/ui/views/CockpitView.vue",
"src/ui/views/panels/CockpitProgress.vue",
"src/cockpitProgress.js",
@@ -236,7 +249,43 @@
"src/ui/kit/UiIcon.vue",
"src/ui/stores/worldTime.js",
"src/ui/views/panels/WorldTimeline.vue",
"src/ui/surfaceKeyboard.js"
"src/ui/surfaceKeyboard.js",
"src/scenes/storyTags.js",
"src/ui/contextLayerTabs.js",
"src/ui/contextSearch.js",
"src/ui/layerNames.js",
"src/ui/views/panels/AltitudeGraph.vue",
"src/ui/stores/omnibar.js",
"src/ui/views/panels/SunDial.vue",
"src/ui/views/panels/CctvPreview.vue",
"src/data/contextStore.js",
"src/data/entityContext.js",
"src/ui/stores/entityCard.js",
"src/ui/contextRadius.js",
"src/layers/firms/source.js",
"src/layers/earthquakes/records.js",
"src/ui/views/panels/ViewContext.vue",
"src/layers/earthquakes/source.js",
"src/layers/cyclones/source.js",
"src/i18n/marker.js",
"src/sources/httpBody.js",
"src/layers/perimeters/source.js",
"src/ui/spotConditions.js",
"src/ui/views/panels/SpotConditions.vue",
"src/data/wikidataCities.js",
"src/ui/views/panels/EntityCard.vue",
"src/data/aircraftEmergency.js",
"src/data/aircraftClass.js",
"src/data/entityRecords.js",
"src/ui/views/panels/RouteGlobe.vue",
"src/maps/attribution.js",
"src/ui/views/panels/FlightCockpitView.vue",
"src/ui/views/panels/PreviewHud.vue",
"src/data/fleetTrailAnchors.js",
"src/ui/views/panels/SatelliteGroundView.vue",
"src/data/vesselTypes.js",
"src/data/fleetModels.js",
"src/ui/views/panels/AircraftModelHero.vue"
],
"external": ["vue", "pinia", "vue-i18n"]
},
@@ -1507,7 +1556,6 @@
"src/ui/stores/cockpit.js",
"src/ui/stores/locale.js",
"src/ui/stores/providerSettings.js",
"src/ui/stores/sceneSharing.js",
"src/ui/stores/voice.js",
"src/ui/stores/location.js",
"src/ui/stores/display.js",
@@ -1587,7 +1635,18 @@
"src/render/vectorBase/style.js",
"src/render/vectorBase/paint.js",
"src/render/vectorBase/expressions.js",
"src/time/frameWait.js"
"src/time/frameWait.js",
"src/ui/stores/omnibar.js",
"src/data/contextStore.js",
"src/data/pickedContext.js",
"src/data/entityContext.js",
"src/data/aircraftClass.js",
"src/data/aircraftEmergency.js",
"src/ui/stores/entityCard.js",
"src/ui/entityContextBridge.js",
"src/data/trackingClickGesture.js",
"src/ui/stores/sceneSharing.js",
"src/maps/attribution.js"
],
"external": [
"cesium",
@@ -1655,7 +1714,9 @@
"src/director/sharing/preview.js",
"src/i18n/marker.js",
"src/director/sharing/lifetime.js",
"src/director/authoring.js"
"src/director/authoring.js",
"src/scenes/storyTags.js",
"src/scenes/storyThumb.js"
],
"external": []
},
@@ -1786,7 +1847,9 @@
"src/render/cesium/zoomOutGuard.js",
"src/render/cesium/sceneOcclusionProbe.js",
"src/render/occlusion/depthProbe.js",
"src/data/detectionOcclusion.js"
"src/data/detectionOcclusion.js",
"src/scenes/storyTags.js",
"src/scenes/storyThumb.js"
],
"external": ["cesium", "vue", "pinia", "vue-i18n", "kdbush"]
},
@@ -2369,7 +2432,8 @@
"src/render/vectorBase/paint.js",
"src/layers/wind/streamlines.js",
"src/layers/wind/model.js",
"src/sky/assets.js"
"src/sky/assets.js",
"src/render/cesium/cardPreviews.js"
],
"external": ["cesium", "pbf", "@mapbox/vector-tile", "kdbush"]
},
@@ -2518,7 +2582,8 @@
"src/render/applicationHooks.js",
"src/maps/globeEngine.js",
"src/maps/engine.js",
"src/maps/keylessTerrain.js"
"src/maps/keylessTerrain.js",
"src/maps/attribution.js"
],
"external": ["cesium"]
},
@@ -3971,7 +4036,8 @@
"src/ui/stores/voice.js",
"src/ui/vueRuntime.js",
"src/ui/stores/pointerReticle.js",
"src/ui/i18n.js"
"src/ui/i18n.js",
"src/ui/stores/omnibar.js"
],
"external": ["vue", "pinia", "vue-i18n"]
},
@@ -4117,6 +4183,24 @@
"src/render/cesium/applicationViewer.js",
"src/render/cesium/ctrlWheelZoom.js",
"src/render/cesium/starrySky.js",
"src/stories/catalog.js",
"src/stories/format.js",
"src/stories/keyboard.js",
"src/stories/storyMeta.js",
"src/stories/gevLogo.js",
"src/stories/boot.js",
"src/stories/controller.js",
"src/stories/gevPlayer.js",
"src/stories/thumbs.js",
"src/ui/views/StoriesView.vue",
"src/ui/views/stories/StoryContext.vue",
"src/ui/views/stories/StoriesHeader.vue",
"src/ui/views/stories/ExploreScreen.vue",
"src/ui/views/stories/StoryScreen.vue",
"src/ui/views/stories/StoryRail.vue",
"src/ui/views/stories/StoryTimeline.vue",
"src/ui/stores/stories.js",
"src/ui/styles/stories.css",
"src/sky/stars.js",
"src/app/atmosphereCompat.js",
"src/bloom.js",
@@ -5145,37 +5229,13 @@
"src/library/entries/wri-global-power-plants.json",
"src/library/entries/wv-statewide-imagery.json",
"src/library/formats.js",
"src/library/entries/gvp-holocene-volcanoes.json",
"src/library/entries/nasa-black-marble.json",
"src/library/entries/nasa-eonet-events.json",
"src/library/catalog.js",
"src/library/source.js",
"src/library/layers.js",
"src/library/controller.js",
"src/library/extent.js",
"src/library/camera.js",
"src/library/entries/imf-portwatch-disruptions.json",
"src/library/entries/imf-portwatch-chokepoints.json",
"src/library/entries/noaa-tide-stations.json",
"src/library/entries/nws-active-alerts.json",
"src/library/entries/wri-global-power-plants.json",
"src/library/entries/fema-usa-structures.json",
"src/library/entries/epc-england-wales.json",
"src/library/parquet.js",
"src/library/entries/bkg-topplus-open.json",
"src/library/entries/epa-superfund-sites.json",
"src/library/entries/epa-toxic-release-facilities.json",
"src/library/entries/gbif-occurrence-density.json",
"src/library/entries/gdacs-disaster-alerts.json",
"src/library/entries/gsi-japan-map.json",
"src/library/entries/ign-orthophotos-france.json",
"src/library/entries/gsi-japan-photo.json",
"src/library/entries/jrc-surface-water.json",
"src/library/entries/ntad-national-bridges.json",
"src/library/entries/usgs-hydrography.json",
"src/library/entries/macrostrat-geology.json",
"src/library/entries/swisstopo-swissimage.json",
"src/library/entries/usgs-topo.json",
"src/library/outlines.js",
"src/library/relief.js",
"src/sceneCommandRelease.js",
@@ -5367,7 +5427,14 @@
"src/layers/flights/placed.js",
"src/data/placementProvider.js",
"src/data/courseFromFixes.js",
"src/time/frameWait.js"
"src/time/frameWait.js",
"src/scenes/storyTags.js",
"src/scenes/storyThumb.js",
"src/ui/stores/omnibar.js",
"src/data/entityContext.js",
"src/ui/stores/entityCard.js",
"src/ui/entityContextBridge.js",
"src/render/cesium/cardPreviews.js"
],
"external": [
"hls.js",
@@ -6137,8 +6204,6 @@
"src/layers/osmPlaces/index.js",
"src/app/layers/osmPlaces.js",
"src/layers/awareness/rangeRing.js",
"src/data/feedState.js",
"src/loadingFeedback.js",
"src/data/firmsIntensity.js",
"src/data/firmsHeatRaster.js",
"src/layers/firms/heatImagery.js",
@@ -6196,7 +6261,8 @@
"src/layers/flights/placed.js",
"src/data/placementProvider.js",
"src/data/courseFromFixes.js",
"src/time/frameWait.js"
"src/time/frameWait.js",
"src/maps/attribution.js"
],
"external": [
"hls.js",
@@ -6813,7 +6879,8 @@
"src/ui/vueRuntime.js",
"src/ui/stores/voice.js",
"src/ui/stores/pointerReticle.js",
"src/ui/i18n.js"
"src/ui/i18n.js",
"src/ui/stores/omnibar.js"
],
"external": ["vue", "pinia", "vue-i18n"]
},
+19 -10
View File
@@ -116,7 +116,7 @@ try {
document.getElementById('loading-screen')?.classList.contains('hidden'),
{ timeout: 60000 },
);
await page.click('[data-collapse-target="scene-panel"]');
await page.click('[data-rail-item="scene-panel"]');
const before = await page.evaluate(() =>
JSON.stringify(window.__godsEyeView.sceneDirector._project),
);
@@ -304,18 +304,17 @@ try {
window.__godsEyeView.sceneDirector.getInteractionState().count === 1,
)),
);
await page.waitForFunction(
() => window.__godsEyeView.tileset?.tilesLoaded === true,
{ timeout: 60000 },
);
const activeMapReady = () => {
const { viewer, mapStackController } = window.__godsEyeView;
const tileset = mapStackController.getImageryHostTileset();
if (tileset) return tileset.tilesLoaded;
return viewer.scene.globe.show && viewer.scene.globe.tilesLoaded;
};
await page.waitForFunction(activeMapReady, { timeout: 60000 });
await page.screenshot({ path: path.join(output, 'rendered.png') });
fs.writeFileSync(
path.join(output, 'report.json'),
JSON.stringify(
await page.evaluate(() => ({
tilesSettled: window.__godsEyeView.tileset?.tilesLoaded === true,
})),
),
JSON.stringify({ tilesSettled: await page.evaluate(activeMapReady) }),
);
await page.evaluate(() => window.__godsEyeView.sceneDirector.stopScene());
check(
@@ -368,6 +367,16 @@ try {
);
await page.screenshot({ path: path.join(output, 'narrow.png') });
await page.keyboard.press('Escape');
await page.setViewport({ width: 1440, height: 900 });
await page.waitForSelector('[data-rail-item="scene-panel"]', {
visible: true,
});
if (
await page.$eval('#scene-panel', (panel) =>
panel.classList.contains('collapsed'),
)
)
await page.click('[data-rail-item="scene-panel"]');
const pending = await page.evaluate(async () => {
const d = window.__godsEyeView.sceneDirector;
let finish;
+9 -8
View File
@@ -590,14 +590,9 @@ async function main() {
*
* KEYED — both datasets must actually arrive, and a failure banner in
* that state is a real defect, so the chip IS asserted.
* KEYLESS — only the LAYER ROW is asserted: FIRMS reports KEY REQUIRED,
* which is the honest surface a keyless visitor is judged on.
* The GLOBAL chip is deliberately NOT asserted in either
* direction here: it has no key-required terminal state and
* folds that row into a misleading LOAD FAILED. That
* aggregation is a defect in the shared state machine
* (`src/loadingFeedback.js`), LEDGERED post-launch — it is not
* a desirable outcome and not this tile's contract.
* KEYLESS — the LAYER ROW reports KEY REQUIRED, and the GLOBAL chip
* never says LOAD FAILED: a missing key ends the batch
* KEY REQUIRED (`src/loadingFeedback.js`).
*/
const keyless = state.firmsError === 'KEY REQUIRED';
console.log(` \x1b[2m FIRMS key state: ${keyless ? 'KEYLESS' : 'KEYED'} `
@@ -613,6 +608,12 @@ async function main() {
(state.counts.earthquakes ?? 0) > 0,
`${state.counts.earthquakes} quakes`,
);
const keylessChip = await readLoadingChip(page);
record(
'KEYLESS: the global chip never says LOAD FAILED for a missing key',
!keylessChip.some((entry) => /LOAD FAILED/i.test(entry)),
keylessChip.join(' → ') || 'no chip',
);
} else {
record(
'KEYED: both datasets actually arrive',
+6 -2
View File
@@ -45,7 +45,7 @@ try {
window.__qaSceneState.push(notification),
);
});
await page.click('[data-collapse-target="scene-panel"]');
await page.click('[data-rail-item="scene-panel"]');
await page.click('#scene-new-btn');
await page.waitForFunction(
() =>
@@ -278,7 +278,7 @@ try {
panel.classList.contains('collapsed'),
)
)
await page.click('[data-collapse-target="scene-panel"]');
await page.click('[data-rail-item="scene-panel"]');
await page.waitForSelector('#scene-download-btn', { visible: true });
await page.click('#scene-download-btn');
const metadata = await page.evaluate(async () =>
@@ -426,6 +426,10 @@ try {
);
}),
);
promptValue = 'Disposal scene';
await page.click('#scene-new-btn');
await page.click('#scene-capture-btn');
await page.waitForSelector('.scene-shot-label', { visible: true });
const teardown = await page.evaluate(async () => {
const director = window.__godsEyeView.sceneDirector;
const controls = director._controls;
+146
View File
@@ -0,0 +1,146 @@
/** Run against the built app's preview server (QA_BASE_URL, port 4173 by default). */
import assert from 'node:assert/strict';
import puppeteer from 'puppeteer';
const browser = await puppeteer.launch({
headless: true,
args: [
'--no-sandbox',
...(process.platform === 'darwin'
? ['--use-angle=metal', '--enable-gpu']
: ['--use-gl=angle', '--use-angle=swiftshader']),
],
});
try {
const page = await browser.newPage();
await page.setViewport({ width: 1440, height: 900 });
await page.emulateMediaFeatures([
{ name: 'prefers-reduced-motion', value: 'reduce' },
]);
const url = new URL(process.env.QA_BASE_URL || 'http://localhost:4173/');
url.searchParams.set('welcome', '0');
url.searchParams.set('story', 'gev:flights-radar');
url.searchParams.set('storyTime', '1250');
url.hash =
'v=2&lat=20&lon=10&alt=2500000&heading=0&pitch=-90&roll=0&style=normal&map=esri-imagery';
await page.goto(url.href, { waitUntil: 'domcontentloaded' });
async function waitForPausedStory() {
await page.waitForSelector('#tlTrack', { visible: true, timeout: 60000 });
await page.waitForFunction(
() => window.__godsEyeView?.styleManager.activeStyle === 'retro',
{ timeout: 30000 },
);
const timing = await page.evaluate(async () => {
const director = window.__godsEyeView.sceneDirector;
await director.whenIdle();
return {
elapsed: director.getPlaybackTimingState().snapshot.sceneElapsedSec,
running: director.running,
};
});
assert.equal(timing.running, false);
assert.ok(Math.abs(timing.elapsed - 1.25) < 0.001);
}
await waitForPausedStory();
await page.evaluate(() => history.back());
await page.waitForSelector('#scrExplore', { visible: true });
await page.waitForFunction(
() => window.__godsEyeView.styleManager.activeStyle === 'normal',
);
await page.evaluate(() => history.forward());
await waitForPausedStory();
await page.waitForFunction(() =>
document.activeElement.matches(
'#scrStory .s-back, #scrStory .s-trail button',
),
);
console.log('Back and Forward restore the style, paused time and focus');
await page.click('#tlPlay');
const resumedAt = await (
await page.waitForFunction(
() => {
const snap =
window.__godsEyeView.sceneDirector.getPlaybackTimingState().snapshot;
return snap?.running ? snap.sceneElapsedSec : false;
},
{ timeout: 30000 },
)
).jsonValue();
assert.ok(
resumedAt >= 1.25 && resumedAt < 3,
`Play went on from ${resumedAt} s, not the paused 1.25 s`,
);
await page.click('#tlPlay');
await page.waitForFunction(() => !window.__godsEyeView.sceneDirector.running);
await page.evaluate(() => window.__godsEyeView.sceneDirector.whenIdle());
console.log('Play goes on from the paused time, not the start of the shot');
const track = await page.$('#tlTrack');
const box = await track.boundingBox();
assert.ok(box.width > 0);
await page.evaluate(() => {
const director = window.__godsEyeView.sceneDirector;
const seek = director.seekScene.bind(director);
window.qaSeekProgress = [];
director.seekScene = (...args) => {
window.qaSeekProgress.push(args[1]);
return seek(...args);
};
});
const y = box.y + box.height / 2;
const at = (fraction) => box.x + box.width * fraction;
await page.mouse.move(at(0.25), y);
await page.mouse.down();
await page.mouse.move(at(0.65), y, { steps: 12 });
await page.waitForFunction(
() =>
Number(document.querySelector('#tlTrack').getAttribute('aria-valuenow')) >
25,
);
assert.deepEqual(await page.evaluate(() => window.qaSeekProgress), []);
await page.mouse.up();
await page.waitForFunction(() => window.qaSeekProgress.length === 1);
await page.evaluate(() => window.__godsEyeView.sceneDirector.whenIdle());
assert.equal(await page.evaluate(() => window.qaSeekProgress.length), 1);
console.log('A timeline drag updates the preview before one released seek');
const pose = () =>
page.evaluate(() => window.__godsEyeView.styleManager.getCameraState());
const before = await pose();
await page.click('#railGev');
await page.waitForFunction(
() =>
!document.body.classList.contains('stories-mode') &&
document
.querySelector('#scene-select option:checked')
?.textContent.includes('Global Flights Radar'),
);
const after = await pose();
assert.ok(Math.abs(after.lat - before.lat) < 0.01);
assert.ok(Math.abs(after.lon - before.lon) < 0.01);
assert.ok(Math.abs(after.alt - before.alt) < 100);
await page.waitForFunction(() => document.activeElement.id === 'hStories');
console.log('Open in GEV selects the scene without moving its camera');
await page.click('#scene-thumb-btn');
await page.waitForFunction(() =>
document
.querySelector('#scene-thumb-preview')
?.src.startsWith('data:image/jpeg;'),
);
console.log('Authoring captures an Esri thumbnail through the real renderer');
// This width is within GEV's phone layout and used to miss Stories' layout.
await page.setViewport({ width: 710, height: 844 });
await page.goto(url.href, { waitUntil: 'domcontentloaded' });
await waitForPausedStory();
await page.waitForFunction(() =>
document.activeElement.matches('#scrStory .s-back'),
);
console.log('The phone layout uses the same breakpoint as GEV');
} finally {
await browser.close();
}