From b4db730c5c5ebb25640c4dc09f229414d44cbcf2 Mon Sep 17 00:00:00 2001 From: christof-wittreich Date: Mon, 6 Nov 2023 11:03:00 -0500 Subject: [PATCH 1/2] Adjusted transition duration timing --- web/js/map/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/js/map/util.js b/web/js/map/util.js index c6f534f224..6048e07801 100644 --- a/web/js/map/util.js +++ b/web/js/map/util.js @@ -158,7 +158,7 @@ export function fly (map, proj, endPoint, endZoom = 5, rotation = 0, isKioskMode const distanceDuration = polarProjectionCheck ? distance / 50000 : distance; // limit large polar projection distances from coordinate transforms let duration = isKioskModeActive ? Math.max(5000, 2 * Math.floor(distanceDuration * 20 + 1000)) // Minimum 5 seconds, approx 12 seconds to go 360 degrees - : Math.floor(distanceDuration * 20 + 1000); // approx 6 seconds to go 360 degrees + : Math.min(6000, Math.floor(distanceDuration * (15 * (startZoom + endZoom)) + (100 * (startZoom + endZoom)) + 1000)); // approx 6 seconds to go 360 degrees const animationPromise = function(...args) { return new Promise((resolve, reject) => { From 76183b2f928f0f81e83429bed5508ace9eb2ea1d Mon Sep 17 00:00:00 2001 From: christof-wittreich Date: Mon, 6 Nov 2023 11:41:15 -0500 Subject: [PATCH 2/2] Fixed tests --- e2e/features/events/event-test.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e/features/events/event-test.spec.js b/e2e/features/events/event-test.spec.js index dfb319b519..7ab6cba22b 100644 --- a/e2e/features/events/event-test.spec.js +++ b/e2e/features/events/event-test.spec.js @@ -35,6 +35,7 @@ test('Check that 4 fire layers are now present', async ({ browserName }) => { await modalCloseButton.click() await sidebarEvent.click() await layersTab.click() + await page.waitForTimeout(1000) await expect(thermAnomSNPPday).toBeVisible() await expect(thermAnomSNPPnight).toBeVisible() await expect(thermAnomVIIRSday).toBeVisible() @@ -71,7 +72,7 @@ test('Clicking an event in the list selects the event', async ({ browserName }) const { firstEvent, selectedFirstEvent } = selectors await page.waitForLoadState('networkidle') await firstEvent.click() - await page.waitForTimeout(5000) + await page.waitForTimeout(6000) await expect(selectedFirstEvent).toBeVisible() })