Skip to content

#689 DST-aware TimeUI #690

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

Merged
tariqksoliman merged 1 commit into from
May 14, 2025
Merged

#689 DST-aware TimeUI #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/essence/Ancillary/TimeUI.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,12 @@
position: absolute;
background: #601a2e;
transition: opacity 0.2s ease-out;
z-index: -1;
}
#mmgisTimeUITimelineExtent {
height: 100%;
position: absolute;
background: rgb(96, 78, 26, 0.7);
transition: opacity 0.2s ease-out;
z-index: -1;
}
52 changes: 26 additions & 26 deletions src/essence/Ancillary/TimeUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,7 @@ const TimeUI = {
date = new Date(TimeUI._initialEnd)
const savedEndDate = new Date(date)

const offsetEndDate = new Date(
date.getTime() + date.getTimezoneOffset() * 60000
)
const offsetEndDate = TimeUI.addOffset(date.getTime())
const parsedEnd = TimeUI.endTempus.dates.parseInput(
new Date(offsetEndDate)
)
Expand All @@ -707,9 +705,7 @@ const TimeUI = {
}
date = new Date(TimeUI._initialStart)

const offsetStartDate = new Date(
date.getTime() + date.getTimezoneOffset() * 60000
)
const offsetStartDate = TimeUI.addOffset(date.getTime())
const parsedStart = TimeUI.startTempus.dates.parseInput(
new Date(offsetStartDate)
)
Expand Down Expand Up @@ -1104,9 +1100,7 @@ const TimeUI = {
let idx = 0
if (TimeUI.modes[TimeUI.modeIndex] === 'Point') idx -= 1
const date = new Date(e.detail.value)
const offsetNowDate = new Date(
date.getTime() + date.getTimezoneOffset() * 60000
)
const offsetNowDate = TimeUI.addOffset(date.getTime())
if (e.detail.activeHandle === idx) {
$('#mmgisTimeUIStartWrapperFake').css('display', 'block')
$('#mmgisTimeUIStartFake').val(
Expand Down Expand Up @@ -1139,9 +1133,7 @@ const TimeUI = {
if (TimeUI.modes[TimeUI.modeIndex] === 'Point') idx -= 1

const date = new Date(e.detail.value)
const offsetNowDate = new Date(
date.getTime() + date.getTimezoneOffset() * 60000
)
const offsetNowDate = TimeUI.addOffset(date.getTime())
if (e.detail.activeHandle === idx) {
const parsedNow = TimeUI.startTempus.dates.parseInput(
new Date(offsetNowDate)
Expand Down Expand Up @@ -1310,9 +1302,7 @@ const TimeUI = {
_setCurrentTime(force, forceDate, disableChange) {
if (TimeUI.now === true || force === true) {
let date = forceDate || new Date()
const offsetNowDate = new Date(
date.getTime() + date.getTimezoneOffset() * 60000
)
const offsetNowDate = TimeUI.addOffset(date.getTime())
const parsedNow = TimeUI.endTempus.dates.parseInput(
new Date(offsetNowDate)
)
Expand Down Expand Up @@ -1410,18 +1400,30 @@ const TimeUI = {
if (disableChange != true) TimeUI.change()
},
addOffset(timestamp) {
const date = new Date(timestamp)
const addedOffset = new Date(
date.getTime() + date.getTimezoneOffset() * 60000
const utcDate = new Date(timestamp)
return new Date(
utcDate.getUTCFullYear(),
utcDate.getUTCMonth(),
utcDate.getUTCDate(),
utcDate.getUTCHours(),
utcDate.getUTCMinutes(),
utcDate.getUTCSeconds(),
utcDate.getUTCMilliseconds()
)
return addedOffset
},
removeOffset(timestamp) {
const date = new Date(timestamp)
const removedOffset = new Date(
date.getTime() - date.getTimezoneOffset() * 60000
const localDate = new Date(timestamp)
return new Date(
Date.UTC(
localDate.getFullYear(),
localDate.getMonth(),
localDate.getDate(),
localDate.getHours(),
localDate.getMinutes(),
localDate.getSeconds(),
localDate.getMilliseconds()
)
)
return removedOffset
},
getCurrentTimestamp(removeOffset) {
let currentTimestamp = TimeUI._timeSliderTimestamp
Expand Down Expand Up @@ -1471,9 +1473,7 @@ const TimeUI = {

if (TimeUI.play) {
const date = new Date(TimeUI._timeSliderTimestamp)
const offsetNowDate = new Date(
date.getTime() // + date.getTimezoneOffset() * 60000 Not needed
)
const offsetNowDate = new Date(date.getTime())
const parsedNow = TimeUI.endTempus.dates.parseInput(
new Date(offsetNowDate)
)
Expand Down
⚡