fix write Hash then ref current not present
This commit is contained in:
Marko Oldenburg
parent
209cde6abb
commit
49a292cc50
@ -369,9 +369,11 @@ sub Weather_WriteReadings($$) {
|
||||
|
||||
|
||||
# current
|
||||
if ( ref( $dataRef->{current} ) eq 'HASH' ) {
|
||||
while( my ($r,$v) = each %{$dataRef->{current}} ) {
|
||||
readingsBulkUpdate($hash, $r, $v);
|
||||
}
|
||||
|
||||
readingsBulkUpdate($hash, 'icon', $iconlist[$dataRef->{current}{code}]);
|
||||
if ( defined($dataRef->{current}{wind_direction})
|
||||
and defined($dataRef->{current}{wind_speed} ) )
|
||||
@ -379,6 +381,7 @@ sub Weather_WriteReadings($$) {
|
||||
my $wdir= degrees_to_direction($dataRef->{current}{wind_direction}, @directions_txt_i18n);
|
||||
readingsBulkUpdate($hash, 'wind_condition', 'Wind: ' . $wdir . ' ' . $dataRef->{current}{wind_speed} . ' km/h');
|
||||
}
|
||||
}
|
||||
|
||||
# forecast
|
||||
if ( ref( $dataRef->{forcast} ) eq 'HASH' ) {
|
||||
@ -413,6 +416,7 @@ sub Weather_WriteReadings($$) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
my $val= 'T:' . $dataRef->{current}{temperature} . '°C'
|
||||
.' ' . substr($status_items_txt_i18n{1}, 0, 1) . ':' . $dataRef->{current}{humidity} . '%'
|
||||
.' ' . substr($status_items_txt_i18n{0}, 0, 1) . ':' . $dataRef->{current}{wind} . 'km/h'
|
||||
|
||||
197
DarkSkyAPI.pm
197
DarkSkyAPI.pm
@ -126,12 +126,15 @@ sub _RetrieveDataFromDarkSky($) {
|
||||
or $self->{key} eq 'none'
|
||||
or $missingModul )
|
||||
{
|
||||
_RetrieveDataFinished( $paramRef,
|
||||
_RetrieveDataFinished(
|
||||
$paramRef,
|
||||
'The given location is invalid. (wrong latitude or longitude?) put both as an attribute in the global device or set define option location=[LAT],[LONG]',
|
||||
undef )
|
||||
if ( $self->{lat} eq 'error' or $self->{long} eq 'error' );
|
||||
undef
|
||||
) if ( $self->{lat} eq 'error' or $self->{long} eq 'error' );
|
||||
|
||||
_RetrieveDataFinished( $paramRef, 'No given api key. (define myWeather Weather apikey=[KEY])', undef )
|
||||
_RetrieveDataFinished( $paramRef,
|
||||
'No given api key. (define myWeather Weather apikey=[KEY])',
|
||||
undef )
|
||||
if ( $self->{key} eq 'none' );
|
||||
|
||||
_RetrieveDataFinished( $paramRef,
|
||||
@ -158,8 +161,7 @@ sub _RetrieveDataFinished($$$) {
|
||||
|
||||
if ( !$err ) {
|
||||
$self->{cached}->{status} = 'ok';
|
||||
$self->{cached}->{validity} = 'up-to-date',
|
||||
$self->{fetchTime} = time();
|
||||
$self->{cached}->{validity} = 'up-to-date', $self->{fetchTime} = time();
|
||||
_ProcessingRetrieveData( $self, $response );
|
||||
}
|
||||
else {
|
||||
@ -172,29 +174,37 @@ sub _RetrieveDataFinished($$$) {
|
||||
sub _ProcessingRetrieveData($$) {
|
||||
my ( $self, $response ) = @_;
|
||||
|
||||
if ( $self->{cached}->{status} eq 'ok' and defined($response) )
|
||||
{
|
||||
if ( $self->{cached}->{status} eq 'ok' and defined($response) ) {
|
||||
my $data = eval { decode_json($response) };
|
||||
|
||||
if ($@) {
|
||||
_ErrorHandling( $self, 'DarkSky Weather decode JSON err ' . $@ );
|
||||
}
|
||||
elsif ( defined( $data->{code} ) and defined( $data->{error} ) ) {
|
||||
_ErrorHandling( $self, 'Code: ' . $data->{code} . ' Error: ' . $data->{error} );
|
||||
_ErrorHandling( $self,
|
||||
'Code: ' . $data->{code} . ' Error: ' . $data->{error} );
|
||||
}
|
||||
else {
|
||||
# print Dumper $data; ## für Debugging
|
||||
|
||||
$self->{cached}->{current_date_time} = strftime("%a,%e %b %Y %H:%M %p",localtime( $self->{fetchTime} )),
|
||||
$self->{cached}->{current_date_time} = strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime( $self->{fetchTime} )
|
||||
),
|
||||
$self->{cached}->{timezone} = $data->{timezone};
|
||||
$self->{cached}->{license} = $data->{flags}->{'meteoalarm-license'};
|
||||
$self->{cached}->{current} = {
|
||||
'temperature' => int(sprintf("%.1f",$data->{currently}->{temperature}) + 0.5),
|
||||
'temp_c' => int(sprintf("%.1f",$data->{currently}->{temperature}) + 0.5),
|
||||
'dewPoint' => int(sprintf("%.1f",$data->{currently}->{dewPoint}) + 0.5),
|
||||
'temperature' => int(
|
||||
sprintf( "%.1f", $data->{currently}->{temperature} ) + 0.5
|
||||
),
|
||||
'temp_c' => int(
|
||||
sprintf( "%.1f", $data->{currently}->{temperature} ) + 0.5
|
||||
),
|
||||
'dewPoint' => int(
|
||||
sprintf( "%.1f", $data->{currently}->{dewPoint} ) + 0.5
|
||||
),
|
||||
'humidity' => $data->{currently}->{humidity} * 100,
|
||||
'condition' =>
|
||||
encode_utf8( $data->{currently}->{summary} ),
|
||||
'condition' => encode_utf8( $data->{currently}->{summary} ),
|
||||
'pressure' => $data->{currently}->{pressure},
|
||||
'wind' => $data->{currently}->{windSpeed},
|
||||
'wind_speed' => $data->{currently}->{windSpeed},
|
||||
@ -210,12 +220,13 @@ sub _ProcessingRetrieveData($$) {
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime( $data->{currently}->{'time'} )
|
||||
),
|
||||
'precipProbability' =>
|
||||
$data->{currently}->{precipProbability},
|
||||
'apparentTemperature' =>
|
||||
int(sprintf("%.1f",$data->{currently}->{apparentTemperature}) + 0.5),
|
||||
'precipIntensity' =>
|
||||
$data->{currently}->{precipIntensity},
|
||||
'precipProbability' => $data->{currently}->{precipProbability},
|
||||
'apparentTemperature' => int(
|
||||
sprintf(
|
||||
"%.1f", $data->{currently}->{apparentTemperature}
|
||||
) + 0.5
|
||||
),
|
||||
'precipIntensity' => $data->{currently}->{precipIntensity},
|
||||
};
|
||||
|
||||
my $i = 0;
|
||||
@ -223,7 +234,8 @@ sub _ProcessingRetrieveData($$) {
|
||||
and scalar( @{ $data->{daily}->{data} } ) > 0 )
|
||||
{
|
||||
foreach ( @{ $data->{daily}->{data} } ) {
|
||||
push (@{$self->{cached}->{forcast}->{daily}},
|
||||
push(
|
||||
@{ $self->{cached}->{forcast}->{daily} },
|
||||
{
|
||||
'date' => strftime(
|
||||
"%a, %d.%m.%Y",
|
||||
@ -233,81 +245,122 @@ sub _ProcessingRetrieveData($$) {
|
||||
"%a",
|
||||
localtime( $data->{daily}->{data}[$i]{'time'} )
|
||||
),
|
||||
'low_c' => int(sprintf("%.1f",$data->{daily}->{data}[$i]{temperatureLow}) + 0.5),
|
||||
'high_c' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{temperatureHigh}) + 0.5),
|
||||
'tempMin' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{temperatureMin}) + 0.5),
|
||||
'low_c' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}->{data}[$i]{temperatureLow} )
|
||||
+ 0.5
|
||||
),
|
||||
'high_c' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}->{data}[$i]{temperatureHigh}
|
||||
) + 0.5
|
||||
),
|
||||
'tempMin' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}->{data}[$i]{temperatureMin} )
|
||||
+ 0.5
|
||||
),
|
||||
'tempMinTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]{temperatureMinTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{temperatureMinTime}
|
||||
)
|
||||
),
|
||||
'tempMax' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{temperatureMax}) + 0.5),
|
||||
'tempMax' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}->{data}[$i]{temperatureMax} )
|
||||
+ 0.5
|
||||
),
|
||||
'tempMaxTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]{temperatureMaxTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{temperatureMaxTime}
|
||||
)
|
||||
),
|
||||
'tempLow' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{temperatureLow}) + 0.5),
|
||||
'tempLow' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}->{data}[$i]{temperatureLow} )
|
||||
+ 0.5
|
||||
),
|
||||
'tempLowTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]{temperatureLowTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{temperatureLowTime}
|
||||
)
|
||||
),
|
||||
'tempHigh' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{temperatureHigh}) + 0.5),
|
||||
'tempHigh' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}->{data}[$i]{temperatureHigh}
|
||||
) + 0.5
|
||||
),
|
||||
'tempHighTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]{temperatureHighTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{temperatureHighTime}
|
||||
)
|
||||
),
|
||||
'apparentTempLow' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{apparentTemperatureLow}) + 0.5),
|
||||
'apparentTempLow' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}
|
||||
->{data}[$i]{apparentTemperatureLow} ) +
|
||||
0.5
|
||||
),
|
||||
'apparentTempLowTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]
|
||||
{apparentTemperatureLowTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{apparentTemperatureLowTime}
|
||||
)
|
||||
),
|
||||
'apparentTempHigh' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{apparentTemperatureHigh}) + 0.5),
|
||||
'apparentTempHigh' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}
|
||||
->{data}[$i]{apparentTemperatureHigh} ) +
|
||||
0.5
|
||||
),
|
||||
'apparentTempHighTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]
|
||||
{apparentTemperatureHighTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{apparentTemperatureHighTime}
|
||||
)
|
||||
),
|
||||
'apparenttempMin' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{apparentTemperatureMin}) + 0.5),
|
||||
'apparenttempMin' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}
|
||||
->{data}[$i]{apparentTemperatureMin} ) +
|
||||
0.5
|
||||
),
|
||||
'apparenttempMinTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]
|
||||
{apparentTemperatureMinTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{apparentTemperatureMinTime}
|
||||
)
|
||||
),
|
||||
'apparenttempMax' =>
|
||||
int(sprintf("%.1f",$data->{daily}->{data}[$i]{apparentTemperatureMax}) + 0.5),
|
||||
'apparenttempMax' => int(
|
||||
sprintf( "%.1f",
|
||||
$data->{daily}
|
||||
->{data}[$i]{apparentTemperatureMax} ) +
|
||||
0.5
|
||||
),
|
||||
'apparenttempMaxTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]
|
||||
{apparentTemperatureMaxTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{apparentTemperatureMaxTime}
|
||||
)
|
||||
),
|
||||
'code' => $codes{ $data->{daily}->{data}[$i]{icon} },
|
||||
'code' =>
|
||||
$codes{ $data->{daily}->{data}[$i]{icon} },
|
||||
'iconAPI' => $data->{daily}->{data}[$i]{icon},
|
||||
'condition' =>
|
||||
encode_utf8( $data->{daily}->{data}[$i]{summary} ),
|
||||
'condition' => encode_utf8(
|
||||
$data->{daily}->{data}[$i]{summary}
|
||||
),
|
||||
'ozone' => $data->{daily}->{data}[$i]{ozone},
|
||||
'uvIndex' => $data->{daily}->{data}[$i]{uvIndex},
|
||||
'uvIndexTime' => strftime(
|
||||
@ -323,19 +376,23 @@ sub _ProcessingRetrieveData($$) {
|
||||
'precipIntensityMaxTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
$data->{daily}->{data}[$i]
|
||||
{precipIntensityMaxTime}
|
||||
$data->{daily}
|
||||
->{data}[$i]{precipIntensityMaxTime}
|
||||
)
|
||||
),
|
||||
'dewPoint' => $data->{daily}->{data}[$i]{dewPoint},
|
||||
'humidity' => $data->{daily}->{data}[$i]{humidity} * 100,
|
||||
'cloudCover' => $data->{daily}->{data}[$i]{cloudCover},
|
||||
'precipType' => $data->{daily}->{data}[$i]{precipType},
|
||||
'humidity' => $data->{daily}->{data}[$i]{humidity}
|
||||
* 100,
|
||||
'cloudCover' =>
|
||||
$data->{daily}->{data}[$i]{cloudCover},
|
||||
'precipType' =>
|
||||
$data->{daily}->{data}[$i]{precipType},
|
||||
|
||||
'wind_direction' =>
|
||||
$data->{daily}->{data}[$i]{windBearing},
|
||||
'wind' => $data->{daily}->{data}[$i]{windSpeed},
|
||||
'wind_speed' => $data->{daily}->{data}[$i]{windSpeed},
|
||||
'wind_speed' =>
|
||||
$data->{daily}->{data}[$i]{windSpeed},
|
||||
'windGust' => $data->{daily}->{data}[$i]{windGust},
|
||||
'windGustTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
@ -343,7 +400,8 @@ sub _ProcessingRetrieveData($$) {
|
||||
$data->{daily}->{data}[$i]{windGustTime}
|
||||
)
|
||||
),
|
||||
'moonPhase' => $data->{daily}->{data}[$i]{moonPhase},
|
||||
'moonPhase' =>
|
||||
$data->{daily}->{data}[$i]{moonPhase},
|
||||
'sunsetTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime(
|
||||
@ -360,8 +418,11 @@ sub _ProcessingRetrieveData($$) {
|
||||
'precipProbability' =>
|
||||
$data->{daily}->{data}[$i]{precipProbability},
|
||||
'pressure' => $data->{daily}->{data}[$i]{pressure},
|
||||
'visibility' => $data->{daily}->{data}[$i]{visibility},
|
||||
});
|
||||
'visibility' =>
|
||||
$data->{daily}->{data}[$i]{visibility},
|
||||
}
|
||||
);
|
||||
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
@ -382,7 +443,8 @@ sub _CallWeatherCallbackFn($) {
|
||||
sub _ErrorHandling($$) {
|
||||
my ( $self, $err ) = @_;
|
||||
|
||||
$self->{cached}->{current_date_time} = strftime("%a,%e %b %Y %H:%M %p",localtime( $self->{fetchTime} )),
|
||||
$self->{cached}->{current_date_time} =
|
||||
strftime( "%a,%e %b %Y %H:%M %p", localtime( $self->{fetchTime} ) ),
|
||||
$self->{cached}->{status} = $err;
|
||||
$self->{cached}->{validity} = 'stale';
|
||||
}
|
||||
@ -394,7 +456,8 @@ sub _CreateForcastRef($) {
|
||||
{
|
||||
lat => $self->{lat},
|
||||
long => $self->{long},
|
||||
apiMaintainer => 'Leon Gaultier (<a href=https://forum.fhem.de/index.php?action=profile;u=13684>CoolTux</a>)',
|
||||
apiMaintainer =>
|
||||
'Leon Gaultier (<a href=https://forum.fhem.de/index.php?action=profile;u=13684>CoolTux</a>)',
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@ -53,9 +53,35 @@ use constant URL => 'https://api.openweathermap.org/data/2.5/';
|
||||
## URL . 'forcast?' for forcast data
|
||||
|
||||
my %codes = (
|
||||
200 => 45, 201 => 45, 202 => 45, 210 => 4, 211 => 4, 212 => 3, 221 => 4, 230 => 45, 231 => 45, 232 => 45,
|
||||
300 => 9, 301 => 9, 302 => 9, 310 => 9, 311 => 9, 312 => 9, 313 => 9, 314 => 9, 321 => 9,
|
||||
500 => 35, 501 => 35, 502 => 35, 503 => 35, 504 => 35, 511 => 35, 520 => 35, 521 => 35, 522 => 35, 531 => 35,
|
||||
200 => 45,
|
||||
201 => 45,
|
||||
202 => 45,
|
||||
210 => 4,
|
||||
211 => 4,
|
||||
212 => 3,
|
||||
221 => 4,
|
||||
230 => 45,
|
||||
231 => 45,
|
||||
232 => 45,
|
||||
300 => 9,
|
||||
301 => 9,
|
||||
302 => 9,
|
||||
310 => 9,
|
||||
311 => 9,
|
||||
312 => 9,
|
||||
313 => 9,
|
||||
314 => 9,
|
||||
321 => 9,
|
||||
500 => 35,
|
||||
501 => 35,
|
||||
502 => 35,
|
||||
503 => 35,
|
||||
504 => 35,
|
||||
511 => 35,
|
||||
520 => 35,
|
||||
521 => 35,
|
||||
522 => 35,
|
||||
531 => 35,
|
||||
);
|
||||
|
||||
sub new {
|
||||
@ -127,12 +153,15 @@ sub _RetrieveDataFromOpenWeatherMap($) {
|
||||
or $self->{key} eq 'none'
|
||||
or $missingModul )
|
||||
{
|
||||
_RetrieveDataFinished( $paramRef,
|
||||
_RetrieveDataFinished(
|
||||
$paramRef,
|
||||
'The given location is invalid. (wrong latitude or longitude?) put both as an attribute in the global device or set define option location=[LAT],[LONG]',
|
||||
undef )
|
||||
if ( $self->{lat} eq 'error' or $self->{long} eq 'error' );
|
||||
undef
|
||||
) if ( $self->{lat} eq 'error' or $self->{long} eq 'error' );
|
||||
|
||||
_RetrieveDataFinished( $paramRef, 'No given api key. (define myWeather Weather apikey=[KEY])', undef )
|
||||
_RetrieveDataFinished( $paramRef,
|
||||
'No given api key. (define myWeather Weather apikey=[KEY])',
|
||||
undef )
|
||||
if ( $self->{key} eq 'none' );
|
||||
|
||||
_RetrieveDataFinished( $paramRef,
|
||||
@ -142,14 +171,11 @@ sub _RetrieveDataFromOpenWeatherMap($) {
|
||||
else {
|
||||
$paramRef->{url} =
|
||||
URL
|
||||
. $paramRef->{endpoint} . '?'
|
||||
. 'lat='
|
||||
. $self->{lat} . '&'
|
||||
. 'lon='
|
||||
. $paramRef->{endpoint} . '?' . 'lat='
|
||||
. $self->{lat} . '&' . 'lon='
|
||||
. $self->{long} . '&'
|
||||
. 'APPID='
|
||||
. $self->{key} . '&'
|
||||
. 'lang='
|
||||
. $self->{key} . '&' . 'lang='
|
||||
. $self->{lang};
|
||||
|
||||
main::HttpUtils_NonblockingGet($paramRef);
|
||||
@ -162,8 +188,7 @@ sub _RetrieveDataFinished($$$) {
|
||||
|
||||
if ( !$err ) {
|
||||
$self->{cached}->{status} = 'ok';
|
||||
$self->{cached}->{validity} = 'up-to-date',
|
||||
$self->{fetchTime} = time();
|
||||
$self->{cached}->{validity} = 'up-to-date', $self->{fetchTime} = time();
|
||||
_ProcessingRetrieveData( $self, $response );
|
||||
}
|
||||
else {
|
||||
@ -178,13 +203,14 @@ sub _RetrieveDataFinished($$$) {
|
||||
sub _ProcessingRetrieveData($$) {
|
||||
my ( $self, $response ) = @_;
|
||||
|
||||
if ( $self->{cached}->{status} eq 'ok' and defined($response) )
|
||||
{
|
||||
if ( $self->{cached}->{status} eq 'ok' and defined($response) ) {
|
||||
my $data = eval { decode_json($response) };
|
||||
|
||||
# print 'Dumper1: ' . Dumper $data;
|
||||
|
||||
if ($@) {
|
||||
_ErrorHandling( $self, 'OpenWeatherMap Weather decode JSON err ' . $@ );
|
||||
_ErrorHandling( $self,
|
||||
'OpenWeatherMap Weather decode JSON err ' . $@ );
|
||||
}
|
||||
elsif ( defined( $data->{cod} ) and defined( $data->{message} ) ) {
|
||||
print 'Dumper2: ' . Dumper $data;
|
||||
@ -194,41 +220,63 @@ sub _ProcessingRetrieveData($$) {
|
||||
# print Dumper $data; ## für Debugging
|
||||
return if ( $self->{endpoint} eq 'forcast' );
|
||||
|
||||
|
||||
$self->{cached}->{current_date_time} = strftime("%a,%e %b %Y %H:%M %p",localtime( $self->{fetchTime} )),
|
||||
$self->{cached}->{current_date_time} = strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime( $self->{fetchTime} )
|
||||
),
|
||||
$self->{cached}->{country} = $data->{sys}->{country};
|
||||
$self->{cached}->{city} = $data->{name};
|
||||
$self->{cached}->{current} = {
|
||||
'temperature' => int(sprintf("%.1f",($data->{main}->{temp} - 273.15 )) + 0.5),
|
||||
'temp_c' => int(sprintf("%.1f",($data->{main}->{temp} - 273.15 )) + 0.5),
|
||||
'low_c' => int(sprintf("%.1f",($data->{main}->{temp_min} - 273.15 )) + 0.5),
|
||||
'high_c' => int(sprintf("%.1f",($data->{main}->{temp_max} - 273.15 )) + 0.5),
|
||||
'tempLow' => int(sprintf("%.1f",($data->{main}->{temp_min} - 273.15 )) + 0.5),
|
||||
'tempHigh' => int(sprintf("%.1f",($data->{main}->{temp_max} - 273.15 )) + 0.5),
|
||||
'temperature' => int(
|
||||
sprintf( "%.1f", ( $data->{main}->{temp} - 273.15 ) ) + 0.5
|
||||
),
|
||||
'temp_c' => int(
|
||||
sprintf( "%.1f", ( $data->{main}->{temp} - 273.15 ) ) + 0.5
|
||||
),
|
||||
'low_c' => int(
|
||||
sprintf( "%.1f", ( $data->{main}->{temp_min} - 273.15 ) ) +
|
||||
0.5
|
||||
),
|
||||
'high_c' => int(
|
||||
sprintf( "%.1f", ( $data->{main}->{temp_max} - 273.15 ) ) +
|
||||
0.5
|
||||
),
|
||||
'tempLow' => int(
|
||||
sprintf( "%.1f", ( $data->{main}->{temp_min} - 273.15 ) ) +
|
||||
0.5
|
||||
),
|
||||
'tempHigh' => int(
|
||||
sprintf( "%.1f", ( $data->{main}->{temp_max} - 273.15 ) ) +
|
||||
0.5
|
||||
),
|
||||
'humidity' => $data->{main}->{humidity},
|
||||
'condition' =>
|
||||
encode_utf8( $data->{weather}[0]{description} ),
|
||||
'condition' => encode_utf8( $data->{weather}[0]{description} ),
|
||||
'pressure' => $data->{main}->{pressure},
|
||||
'wind' => $data->{wind}->{speed},
|
||||
'wind_speed' => $data->{wind}->{speed},
|
||||
'wind_direction' => $data->{wind}->{deg},
|
||||
'cloudCover' => $data->{clouds}->{all},
|
||||
'visibility' => $data->{visibility},
|
||||
|
||||
# 'code' => $codes{ $data->{weather}[0]{icon} },
|
||||
'iconAPI' => $data->{weather}[0]{icon},
|
||||
'sunsetTime' => strftime("%a,%e %b %Y %H:%M %p",localtime($data->{sys}->{sunset})),
|
||||
'sunriseTime' => strftime("%a,%e %b %Y %H:%M %p",localtime($data->{sys}->{sunrise})),
|
||||
'pubDate' => strftime(
|
||||
'sunsetTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime( $data->{dt} )
|
||||
localtime( $data->{sys}->{sunset} )
|
||||
),
|
||||
} if ( $self->{endpoint} eq 'weather' );
|
||||
'sunriseTime' => strftime(
|
||||
"%a,%e %b %Y %H:%M %p",
|
||||
localtime( $data->{sys}->{sunrise} )
|
||||
),
|
||||
'pubDate' =>
|
||||
strftime( "%a,%e %b %Y %H:%M %p", localtime( $data->{dt} ) ),
|
||||
}
|
||||
if ( $self->{endpoint} eq 'weather' );
|
||||
}
|
||||
}
|
||||
|
||||
# $self->{cached} = $forcastRef; Vorsicht
|
||||
|
||||
_RetrieveDataFromOpenWeatherMap($self) if ( $self->{endpoint} eq 'weather' );
|
||||
_RetrieveDataFromOpenWeatherMap($self)
|
||||
if ( $self->{endpoint} eq 'weather' );
|
||||
$self->{endpoint} = 'none' if ( $self->{endpoint} eq 'forcast' );
|
||||
|
||||
_CallWeatherCallbackFn($self);
|
||||
@ -244,7 +292,8 @@ sub _CallWeatherCallbackFn($) {
|
||||
sub _ErrorHandling($$) {
|
||||
my ( $self, $err ) = @_;
|
||||
|
||||
$self->{cached}->{current_date_time} = strftime("%a,%e %b %Y %H:%M %p",localtime( $self->{fetchTime} )),
|
||||
$self->{cached}->{current_date_time} =
|
||||
strftime( "%a,%e %b %Y %H:%M %p", localtime( $self->{fetchTime} ) ),
|
||||
$self->{cached}->{status} = $err;
|
||||
$self->{cached}->{validity} = 'stale';
|
||||
}
|
||||
@ -256,7 +305,8 @@ sub _CreateForcastRef($) {
|
||||
{
|
||||
lat => $self->{lat},
|
||||
long => $self->{long},
|
||||
apiMaintainer => 'Leon Gaultier (<a href=https://forum.fhem.de/index.php?action=profile;u=13684>CoolTux</a>)',
|
||||
apiMaintainer =>
|
||||
'Leon Gaultier (<a href=https://forum.fhem.de/index.php?action=profile;u=13684>CoolTux</a>)',
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user