diff --git a/inc/Feed.php b/inc/Feed.php index eed5c36..c031c92 100644 --- a/inc/Feed.php +++ b/inc/Feed.php @@ -232,13 +232,24 @@ class Feed extends PhpObject { $sApiUrl = self::WEATHER_HOOK.'/'.$asLatLng[0].','.$asLatLng[1].'/'.$iTimeStamp.'?'.http_build_query(self::WEATHER_PARAM); $asWeather = json_decode(file_get_contents($sApiUrl), true); + if(array_key_exists('currentConditions', $asWeather)) { //Current conditions + $sWeatherIcon = $asWeather['currentConditions']['icon']; + $sWeatherCond = $asWeather['currentConditions']['conditions']; + $sWeatherTemp = $asWeather['currentConditions']['temp']; + } + else { //Daily Conditions + $sWeatherIcon = $asWeather['days'][0]['icon']; + $sWeatherCond = $asWeather['days'][0]['conditions']; + $sWeatherTemp = $asWeather['days'][0]['temp']; + } + //Get Condition ID - $sCondKey = (new Translator(self::WEATHER_PARAM['lang']))->getTranslationKey($asWeather['currentConditions']['conditions']); + $sCondKey = (new Translator(self::WEATHER_PARAM['lang']))->getTranslationKey($sWeatherCond); return array( - 'weather_icon' => $asWeather['currentConditions']['icon'], + 'weather_icon' => $sWeatherIcon, 'weather_cond' => $sCondKey, - 'weather_temp' => floatval($asWeather['currentConditions']['temp']) + 'weather_temp' => floatval($sWeatherTemp) ); } diff --git a/masks/project.html b/masks/project.html index d0f999e..b21a3ed 100644 --- a/masks/project.html +++ b/masks/project.html @@ -624,10 +624,12 @@ function addSpotMessages(aoMessages) { } //Weather - $Tooltip.append($('

', {'class':'weather', 'title':oSpot.lang(oMsg.weather_cond)}) - .addIcon('fa-'+oMsg.weather_icon+' fa-fw fa-lg', true) - .append(oMsg.weather_temp+'°C') - ); + if(oMsg.weather_icon) { + $Tooltip.append($('

', {'class':'weather', 'title':oSpot.lang(oMsg.weather_cond)}) + .addIcon('fa-'+oMsg.weather_icon+' fa-fw fa-lg', true) + .append(oMsg.weather_temp+'°C') + ); + } //Tooltip: Medias if(oMsg.medias) { @@ -818,7 +820,7 @@ function getPost(asPost) { .append($('

').addIcon('fa-time', true).append(sAbsTime)) .append(bTimeDiff?$('

').addIcon('fa-timezone', true).append(oSpot.lang('local_time', sAbsTimeLocal)):'') .append($('', {'class':'drill'}) - .append($('', {'class':'weather', 'title':oSpot.lang(asPost.weather_cond)}).addIcon('fa-'+asPost.weather_icon, true).append(asPost.weather_temp+'°C')) + .append((!asPost.weather_icon)?'':$('', {'class':'weather', 'title':oSpot.lang(asPost.weather_cond)}).addIcon('fa-'+asPost.weather_icon, true).append(asPost.weather_temp+'°C')) .append($('', {'class':'staticmap', title: oSpot.lang('click_zoom'), src: getWmtsApiUrl('static', asPost.latitude, asPost.longitude, 13)})) .append($('', {'class': 'drill-icon fa-stack'}) .addIcon('fa-message fa-stack-2x')