From 331d147d508d15b2739e9d4de36a5f0591be1838 Mon Sep 17 00:00:00 2001 From: Gerardo Gonzalez Date: Sat, 10 Apr 2021 01:20:52 +0100 Subject: [PATCH 1/4] Update ukmetofficedatahub.js There is a wrong treatment to appendLocationNameToHeader. The location should be always returned and leave the weater.js to decide if is included or not in the header. --- modules/default/weather/providers/ukmetofficedatahub.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/default/weather/providers/ukmetofficedatahub.js b/modules/default/weather/providers/ukmetofficedatahub.js index 03e5fa5a..b3772860 100644 --- a/modules/default/weather/providers/ukmetofficedatahub.js +++ b/modules/default/weather/providers/ukmetofficedatahub.js @@ -59,9 +59,8 @@ WeatherProvider.register("ukmetofficedatahub", { let queryStrings = "?"; queryStrings += "latitude=" + this.config.lat; queryStrings += "&longitude=" + this.config.lon; - if (this.config.appendLocationNameToHeader) { - queryStrings += "&includeLocationName=" + true; - } + queryStrings += "&includeLocationName=" + true; + // Return URL, making sure there is a trailing "/" in the base URL. return this.config.apiBase + (this.config.apiBase.endsWith("/") ? "" : "/") + forecastType + queryStrings; From 7fbd326298d15c173d8f0c46dce9bbab7ebad3a1 Mon Sep 17 00:00:00 2001 From: Gerardo Gonzalez Date: Sat, 10 Apr 2021 01:30:12 +0100 Subject: [PATCH 2/4] Update CHANGELOG.md updating the changelog for the fix Fix wrong treatment of `appendLocationNameToHeader` when using `ukmetofficedatahub` --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cdcffd6..eecd8abc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ _This release is scheduled to be released on 2021-04-01._ - Fix calendar start function logging inconsistency. - Fix updatenotification start function logging inconsistency. +- Fix wrong treatment of `appendLocationNameToHeader` when using `ukmetofficedatahub` ## [2.15.0] - 2021-04-01 From eecc95f8fb7b5b69639edbc2b5623ae01d093216 Mon Sep 17 00:00:00 2001 From: rejas Date: Sat, 10 Apr 2021 20:34:27 +0200 Subject: [PATCH 3/4] Run linter --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3c8cbb2..0edad9eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,6 @@ _This release is scheduled to be released on 2021-04-01._ - Checks and applies the showDescription setting for the newsfeed module again - Fix wrong treatment of `appendLocationNameToHeader` when using `ukmetofficedatahub` - ## [2.15.0] - 2021-04-01 Special thanks to the following contributors: @EdgardosReis, @MystaraTheGreat, @TheDuffman85, @ashishtank, @buxxi, @codac, @fewieden, @khassel, @klaernie, @qu1que, @rejas, @sdetweil & @thomasrockhu. From 10c47a6c3842af3ab0e2bedc45fc3dc95aaa28aa Mon Sep 17 00:00:00 2001 From: veeck Date: Mon, 12 Apr 2021 19:33:23 +0200 Subject: [PATCH 4/4] Really run prettier --- modules/default/weather/providers/ukmetofficedatahub.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/default/weather/providers/ukmetofficedatahub.js b/modules/default/weather/providers/ukmetofficedatahub.js index b3772860..d096c33b 100644 --- a/modules/default/weather/providers/ukmetofficedatahub.js +++ b/modules/default/weather/providers/ukmetofficedatahub.js @@ -60,7 +60,6 @@ WeatherProvider.register("ukmetofficedatahub", { queryStrings += "latitude=" + this.config.lat; queryStrings += "&longitude=" + this.config.lon; queryStrings += "&includeLocationName=" + true; - // Return URL, making sure there is a trailing "/" in the base URL. return this.config.apiBase + (this.config.apiBase.endsWith("/") ? "" : "/") + forecastType + queryStrings;