Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WV-2852 Tour Story Transition Duration Adjustment #4784

Merged
merged 3 commits into from
Nov 13, 2023
Merged

WV-2852 Tour Story Transition Duration Adjustment #4784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4db730
Adjusted transition duration timing
christof-wittreich Nov 6, 2023
76183b2
Fixed tests
christof-wittreich Nov 6, 2023
a4ef04e
Merge branch 'develop' into wv-2852-tourstory-transition
christof-wittreich Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion e2e/features/events/event-test.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
})

Expand Down
2 changes: 1 addition & 1 deletion web/js/map/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down