FHEM/mod-Weather
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

fix bugs in weblink and expand hourly forcast

Browse Source
This commit is contained in:
Marko Oldenburg 2019-03-18 10:31:41 +01:00
parent 9c11fa7c87
commit e3e7e4980f
2 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
59_Weather.pm
View File

@ -717,17 +717,24 @@ sub WeatherAsHtmlV($;$$) {
my ( $d, $op1, $op2 ) = @_; my ( $d, $op1, $op2 ) = @_;
my $items = $op2; my $items = $op2;
my $f = $op1; my $f = $op1;
if($op1 =~ /[0-9]/g){ $items = $op1; }
if($op2 =~ /[dh]/g){ $f = $op2; }
$f =~ tr/dh/./cd; if( defined($op1) and $op1 and $op1 =~ /[0-9]/g){ $items = $op1; }
$f = "h" if ( !$f || length($f) > 1); if( defined($op2) and $op2 and $op2 =~ /[dh]/g){ $f = $op2; }
$items =~ tr/0-9/./cd;
$f =~ tr/dh/./cd if ( defined $f and $f );
$items =~ tr/0-9/./cd if (defined($items) and $items );
$items = 6 if ( !$items ); $items = 6 if ( !$items );
return "$d is not a Weather instance<br>" return "$d is not a Weather instance<br>"
if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" ); if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" );
if ( AttrVal($d,'forecast','none') ne 'none' ) {
$f = ( AttrVal($d,'forecast','none') eq 'daily' ? 'd' : 'h' );
}
$f = 'h' if ( !$f || length($f) > 1);
my $h = $defs{$d}; my $h = $defs{$d};
my $width = int( ICONSCALE * ICONWIDTH ); my $width = int( ICONSCALE * ICONWIDTH );
@ -793,14 +800,24 @@ sub WeatherAsHtml($;$$) {
my ( $d, $op1, $op2 ) = @_; my ( $d, $op1, $op2 ) = @_;
my $items = $op2; my $items = $op2;
my $f = $op1; my $f = $op1;
if($op1 =~ /[0-9]/g){ $items = $op1; }
if($op2 =~ /[dh]/g){ $f = $op2; }
$f =~ tr/dh/./cd; if( defined($op1) and $op1 and $op1 =~ /[0-9]/g){ $items = $op1; }
$f = "h" if ( !$f || length($f) > 1); if( defined($op2) and $op2 and $op2 =~ /[dh]/g){ $f = $op2; }
$items =~ tr/0-9/./cd;
$f =~ tr/dh/./cd if ( defined $f and $f );
$items =~ tr/0-9/./cd if (defined($items) and $items );
$items = 6 if ( !$items ); $items = 6 if ( !$items );
return "$d is not a Weather instance<br>"
if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" );
if ( AttrVal($d,'forecast','none') ne 'none' ) {
$f = ( AttrVal($d,'forecast','none') eq 'daily' ? 'd' : 'h' );
}
$f = 'h' if ( !$f || length($f) > 1);
WeatherAsHtmlV( $d, $f, $items ); WeatherAsHtmlV( $d, $f, $items );
} }
@ -808,17 +825,24 @@ sub WeatherAsHtmlH($;$$) {
my ( $d, $op1, $op2 ) = @_; my ( $d, $op1, $op2 ) = @_;
my $items = $op2; my $items = $op2;
my $f = $op1; my $f = $op1;
if($op1 =~ /[0-9]/g){ $items = $op1; }
if($op2 =~ /[dh]/g){ $f = $op2; }
$f =~ tr/dh/./cd; if( defined($op1) and $op1 and $op1 =~ /[0-9]/g){ $items = $op1; }
$f = "h" if ( !$f || length($f) > 1); if( defined($op2) and $op2 and $op2 =~ /[dh]/g){ $f = $op2; }
$items =~ tr/0-9/./cd;
$f =~ tr/dh/./cd if ( defined $f and $f );
$items =~ tr/0-9/./cd if (defined($items) and $items );
$items = 6 if ( !$items ); $items = 6 if ( !$items );
return "$d is not a Weather instance<br>" return "$d is not a Weather instance<br>"
if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" ); if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" );
if ( AttrVal($d,'forecast','none') ne 'none' ) {
$f = ( AttrVal($d,'forecast','none') eq 'daily' ? 'd' : 'h' );
}
$f = 'h' if ( !$f || length($f) > 1);
my $h = $defs{$d}; my $h = $defs{$d};
my $width = int( ICONSCALE * ICONWIDTH ); my $width = int( ICONSCALE * ICONWIDTH );
@ -904,14 +928,24 @@ sub WeatherAsHtmlD($;$$) {
my ( $d, $op1, $op2 ) = @_; my ( $d, $op1, $op2 ) = @_;
my $items = $op2; my $items = $op2;
my $f = $op1; my $f = $op1;
if($op1 =~ /[0-9]/g){ $items = $op1; }
if($op2 =~ /[dh]/g){ $f = $op2; }
$f =~ tr/dh/./cd; if( defined($op1) and $op1 and $op1 =~ /[0-9]/g){ $items = $op1; }
$f = "h" if ( !$f || length($f) > 1); if( defined($op2) and $op2 and $op2 =~ /[dh]/g){ $f = $op2; }
$items =~ tr/0-9/./cd;
$f =~ tr/dh/./cd if ( defined $f and $f );
$items =~ tr/0-9/./cd if (defined($items) and $items );
$items = 6 if ( !$items ); $items = 6 if ( !$items );
return "$d is not a Weather instance<br>"
if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" );
if ( AttrVal($d,'forecast','none') ne 'none' ) {
$f = ( AttrVal($d,'forecast','none') eq 'daily' ? 'd' : 'h' );
}
$f = 'h' if ( !$f || length($f) > 1);
if ($FW_ss) { if ($FW_ss) {
WeatherAsHtmlV( $d, $f , $items); WeatherAsHtmlV( $d, $f , $items);
} }

2
DarkSkyAPI.pm
View File

@ -166,7 +166,7 @@ sub _RetrieveDataFromDarkSky($) {
. $self->{long} . $self->{long}
. '?lang=' . '?lang='
. $self->{lang} . $self->{lang}
. '&units=auto'; . '&units=auto&extend=hourly';
if ( lc($self->{key}) eq 'demo' ) if ( lc($self->{key}) eq 'demo' )
{ _RetrieveDataFinished($paramRef,undef,DEMODATA); } { _RetrieveDataFinished($paramRef,undef,DEMODATA); }