FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

59_Weather: fix multiple issues in API modules

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27004 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2023-01-08 16:21:07 +00:00
parent fb4789262a
commit c32e19e45d
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- feature: 59_Weather: fix multiple issues in API modules
- feature: 59_Weather: support for new openweathermap mod onecall
- rewrite old parts of api modules
- move apo modules to new directory structure

20
fhem/lib/FHEM/APIs/Weather/DarkSkyAPI.pm
View File

@ -726,9 +726,9 @@ sub _CreateForecastRef {
{
lat => $self->{lat},
long => $self->{long},
apiMaintainer => 'Marko Oldenburg ('
. $META->{x_fhem_maintainer}[0] . ')',
apiVersion => version->parse( __PACKAGE__->VERSION() )->normal,
apiMaintainer => $META->{author}[0],
apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-'
. $META->{release_status},
}
);
@ -773,12 +773,19 @@ sub _strftimeWrapper {
"abstract": "Wetter API für Weather DarkSky"
}
},
"version": "v1.2.10",
"keywords": [
"fhem-mod-device",
"Weather",
"API"
],
"release_status": "stable",
"license": "GPL_2",
"version": "v1.2.11",
"author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
],
"x_fhem_maintainer": [
"CoolTux"
"<a href=https://forum.fhem.de/index.php?action=profile;u=13684>CoolTux</a>"
],
"x_fhem_maintainer_github": [
"CoolTuxNet"
@ -786,8 +793,9 @@ sub _strftimeWrapper {
"prereqs": {
"runtime": {
"requires": {
"FHEM": 5.00918799,
"HttpUtils": 5.023,
"FHEM::Meta": 0,
"HttpUtils": 0,
"strict": 0,
"warnings": 0,
"constant": 0,

20
fhem/lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
View File

@ -688,7 +688,7 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
),
'snow3h' => (
$data->{list}->[$i]->{snow}->{'3h'}
? $data->{list}->[$i]->{snow}->{'1h'}
? $data->{list}->[$i]->{snow}->{'3h'}
: 0
),
}
@ -977,9 +977,9 @@ sub _CreateForecastRef {
{
lat => $self->{lat},
long => $self->{long},
apiMaintainer => 'Marko Oldenburg ('
. $META->{x_fhem_maintainer}[0] . ')',
apiVersion => version->parse( __PACKAGE__->VERSION() )->normal,
apiMaintainer => $META->{author}[0],
apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-'
. $META->{release_status},
}
);
@ -1024,7 +1024,14 @@ sub _strftimeWrapper {
"abstract": "Wetter API für OpenWeatherMap"
}
},
"version": "v3.2.5",
"keywords": [
"fhem-mod-device",
"Weather",
"API"
],
"release_status": "stable",
"license": "GPL_2",
"version": "v3.2.6",
"author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
],
@ -1037,8 +1044,9 @@ sub _strftimeWrapper {
"prereqs": {
"runtime": {
"requires": {
"FHEM": 5.00918799,
"HttpUtils": 5.023,
"FHEM::Meta": 0,
"HttpUtils": 0,
"strict": 0,
"warnings": 0,
"constant": 0,