kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-12-12 09:52:37 +00:00
Code Issues Projects Releases Wiki Activity

fixes problems with daylight-saving-time in weather provider openmeteo (#3931)

Browse Source 
fix for #3930
This commit is contained in:
Karsten Hassel
2025-11-01 13:46:58 +01:00
committed by GitHub
parent 961b3c96d6
commit 1e5d127d44
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -29,6 +29,7 @@ planned for 2026-01-01
- fixed eslint warnings shown in #3911 and updated npm publish docs (#3913) - fixed eslint warnings shown in #3911 and updated npm publish docs (#3913)
- [core] refactor: replace `express-ipfilter` with lightweight custom middleware (#3917) - This fixes security issue [CVE-2023-42282](https://github.com/advisories/GHSA-78xj-cgh5-2h22), which is not very likely to be exploitable in MagicMirror² setups, but still should be fixed. - [core] refactor: replace `express-ipfilter` with lightweight custom middleware (#3917) - This fixes security issue [CVE-2023-42282](https://github.com/advisories/GHSA-78xj-cgh5-2h22), which is not very likely to be exploitable in MagicMirror² setups, but still should be fixed.
- fixed the Environment Canada weather URL (#3912) and now converts a windspeed of 'calm' to 0 - fixed the Environment Canada weather URL (#3912) and now converts a windspeed of 'calm' to 0
- fixed problems with daylight-saving-time in weather provider `openmeto` (#3930, #3931)
### Updated ### Updated

13
modules/default/weather/providers/openmeteo.js
View File

@@ -280,13 +280,24 @@ WeatherProvider.register("openmeteo", {
return `${this.config.apiBase}/forecast?${this.getQueryParameters()}`; return `${this.config.apiBase}/forecast?${this.getQueryParameters()}`;
}, },
// fix daylight-saving-time differences
checkDST (dt) {
const uxdt = moment.unix(dt);
const nowDST = moment().isDST();
if (nowDST === moment(uxdt).isDST()) {
return uxdt;
} else {
return uxdt.add(nowDST ? +1 : -1, "hour");
}
},
// Transpose hourly and daily data matrices // Transpose hourly and daily data matrices
transposeDataMatrix (data) { transposeDataMatrix (data) {
return data.time.map((_, index) => Object.keys(data).reduce((row, key) => { return data.time.map((_, index) => Object.keys(data).reduce((row, key) => {
return { return {
...row, ...row,
// Parse time values as momentjs instances // Parse time values as momentjs instances
[key]: ["time", "sunrise", "sunset"].includes(key) ? moment.unix(data[key][index]) : data[key][index] [key]: ["time", "sunrise", "sunset"].includes(key) ? this.checkDST(data[key][index]) : data[key][index]
}; };
}, {})); }, {}));
}, },