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

Update 59_Weather.pm

Browse Source 
Aktualisierung des Änderungsvorschlags wie besprochen:
- WeatherAsHtml() haben jetzt alle die gleiche Schnittstelle  ($d, $f , $items)und sind damit abwärtskompatibel entsprechend Doku (ebenfalls angepasst)
Zur Absicherung der optionalen Parameter in WeatherAsHtml(): Filter auf die erlaubten Zeichen und setzen eines defaultwertes, falls der Parameter leer ist. Eine Abfrage auf defined() ist nicht notwendig, habe alle möglichen Eingabekombinationen abgeprüft.
In WeatherAsHtmlH($;$$) wird, wie vereinbart, _low_c und _high_c nur angezeigt, wenn die Readings vorhanden sind, ansonsten wird _temperature verwendet.
Gleiches habe ich in WeatherAsHtmlV($;$$) angepasst.
Die Änderungen laufen bei mir mit DarkSkyAPI und OpenWeatherMapAPI einwandfrei. Aussehen habe ich ebenfalls gecheckt.

Beste Grüße
Lippie
This commit is contained in:
Lippie81 2019-03-07 22:34:49 +01:00 committed by GitHub
parent 31256f1a17
commit ff1b906e33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
59_Weather.pm
View File

@ -709,10 +709,13 @@ sub WeatherIconIMGTag($) {
##################################### #####################################
sub WeatherAsHtmlV($;$$) { sub WeatherAsHtmlV($;$$) {
my ( $d, $items, $f ) = @_; my ( $d, $f, $items ) = @_;
$d = "<none>" if ( !$d ); $f =~ tr/dh/./cd;
$items = 6 if ( !$items ); $f = "h" if ( !$f || length($f) > 1);
$items =~ tr/0-9/./cd;
$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" );
@ -749,15 +752,28 @@ sub WeatherAsHtmlV($;$$) {
); );
for ( my $i = 1 ; $i < $items ; $i++ ) { for ( my $i = 1 ; $i < $items ; $i++ ) {
$ret .= sprintf( if(defined($h->{READINGS}->{"${fc}${i}_low_c"}) and $h->{READINGS}->{"${fc}${i}_low_c"}){
'<tr><td class="weatherIcon" width=%d>%s</td><td class="weatherValue"><span class="weatherDay">%s: %s</span><br><span class="weatherMin">min %s°C</span> <span class="weatherMax">max %s°C</span></td></tr>', $ret .= sprintf(
$width, '<tr><td class="weatherIcon" width=%d>%s</td><td class="weatherValue"><span class="weatherDay">%s: %s</span><br><span class="weatherMin">min %s°C</span> <span class="weatherMax">max %s°C</span><br>%s</td></tr>',
WeatherIconIMGTag( ReadingsVal( $d, "${fc}${i}_icon", "" ) ), $width,
ReadingsVal( $d, "${fc}${i}_day_of_week", "" ), WeatherIconIMGTag( ReadingsVal( $d, "${fc}${i}_icon", "" ) ),
ReadingsVal( $d, "${fc}${i}_condition", "" ), ReadingsVal( $d, "${fc}${i}_day_of_week", "" ),<br>%s
ReadingsVal( $d, "${fc}${i}_low_c", " - " ), ReadingsVal( $d, "${fc}${i}_condition", "" ),
ReadingsVal( $d, "${fc}${i}_high_c", " - " ) ReadingsVal( $d, "${fc}${i}_low_c", " - " ),
); ReadingsVal( $d, "${fc}${i}_high_c", " - " )
ReadingsVal( $d, "${fc}${i}_wind_condition", " - " )
);
}else{
$ret .= sprintf(
'<tr><td class="weatherIcon" width=%d>%s</td><td class="weatherValue"><span class="weatherDay">%s: %s</span><br><span class="weatherTemp"> %s°C</span><br>%s</td></tr>',
$width,
WeatherIconIMGTag( ReadingsVal( $d, "${fc}${i}_icon", "" ) ),
ReadingsVal( $d, "${fc}${i}_day_of_week", "" ),
ReadingsVal( $d, "${fc}${i}_condition", "" ),
ReadingsVal( $d, "${fc}${i}_temperature", " - " )
ReadingsVal( $d, "${fc}${i}_wind_condition", " - " )
);
}
} }
$ret .= "</table>"; $ret .= "</table>";
@ -765,16 +781,24 @@ sub WeatherAsHtmlV($;$$) {
} }
sub WeatherAsHtml($;$$) { sub WeatherAsHtml($;$$) {
my ( $d, $items, $i ) = @_; my ( $d, $f, $items ) = @_;
WeatherAsHtmlV( $d, $items, $i ); $f =~ tr/dh/./cd;
$f = "h" if ( !$f || length($f) > 1);
$items =~ tr/0-9/./cd;
$items = 6 if ( !$items );
WeatherAsHtmlV( $d, $f, $items );
} }
sub WeatherAsHtmlH($;$$) { sub WeatherAsHtmlH($;$$) {
my ( $d, $items, $f ) = @_; my ( $d, $f, $items ) = @_;
$d = "<none>" if ( !$d ); $f =~ tr/dh/./cd;
$items = 6 if ( !$items ); $f = "h" if ( !$f || length($f) > 1);
$items =~ tr/0-9/./cd;
$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" );
@ -860,13 +884,18 @@ sub WeatherAsHtmlH($;$$) {
} }
sub WeatherAsHtmlD($;$$) { sub WeatherAsHtmlD($;$$) {
my ( $d, $items, $i ) = @_; my ( $d, $f, $items ) = @_;
$f =~ tr/dh/./cd;
$f = "h" if ( !$f || length($f) > 1);
$items =~ tr/0-9/./cd;
$items = 6 if ( !$items );
if ($FW_ss) { if ($FW_ss) {
WeatherAsHtmlV( $d, $items, $i ); WeatherAsHtmlV( $d, $f , $items);
} }
else { else {
WeatherAsHtmlH( $d, $items, $i ); WeatherAsHtmlH( $d, $f , $items);
} }
} }
@ -967,7 +996,7 @@ sub WeatherAsHtmlD($;$$) {
to limit the numer of icons to display.<br><br> to limit the numer of icons to display.<br><br>
Example: Example:
<pre> <pre>
define MyWeatherWeblink weblink htmlCode { WeatherAsHtmlH("MyWeather",10,"h") } define MyWeatherWeblink weblink htmlCode { WeatherAsHtmlH("MyWeather","h",10) }
</pre> </pre>
@ -1140,7 +1169,7 @@ sub WeatherAsHtmlD($;$$) {
Wird der dritte Parameter verwendet muss auch der zweite Parameter f&uuml;r die Anzahl der darzustellenden Icons gesetzt werden.<br><br> Wird der dritte Parameter verwendet muss auch der zweite Parameter f&uuml;r die Anzahl der darzustellenden Icons gesetzt werden.<br><br>
Beispiel: Beispiel:
<pre> <pre>
define MyWeatherWeblink weblink htmlCode { WeatherAsHtmlH("MyWeather",10,"h") } define MyWeatherWeblink weblink htmlCode { WeatherAsHtmlH("MyWeather","h",10) }
</pre> </pre>
</ul> </ul>