mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 19:01:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

add option to change openweather api to 3.0, since 2.5 will be deactivated in June 2024

Browse Source 
Origin commit data
------------------
Commit: 58cf5bf2f1
Author: TangoCash <eric@loxat.de>
Date: 2024-05-03 (Fri, 03 May 2024)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2024-05-03 22:24:51 +02:00
committed by Thilo Graf
parent beb7c10977
commit 27fadb7864
11 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/weather.cpp
View File

@@ -54,6 +54,7 @@ CWeather *CWeather::getInstance()
CWeather::CWeather()
{
key = g_settings.weather_api_key;
api = g_settings.weather_api_version;
v_forecast.clear();
last_time = 0;
coords = "";
@@ -78,6 +79,22 @@ void CWeather::setCoords(std::string new_coords, std::string new_city)
}
}
void CWeather::updateApi()
{
bool force = false;
if (key.compare(g_settings.weather_api_key))
{
key = g_settings.weather_api_key;
force = true;
}
if (api.compare(g_settings.weather_api_version))
{
api = g_settings.weather_api_version;
force = true;
}
checkUpdate(force);
}
bool CWeather::checkUpdate(bool forceUpdate)
{
time_t current_time = time(NULL);
@@ -100,7 +117,7 @@ bool CWeather::GetWeatherDetails()
std::string lat = coords.substr(0, coords.find_first_of(','));
std::string lon = coords.substr(coords.find_first_of(',') + 1);
std::string data = "https://api.openweathermap.org/data/2.5/onecall?lat=" + lat + "&lon=" + lon + "&units=metric&lang=de&exclude=minutely,hourly,flags,alerts&appid=" + key;
std::string data = "https://api.openweathermap.org/data/"+api+"/onecall?lat=" + lat + "&lon=" + lon + "&units=metric&lang=de&exclude=minutely,hourly,flags,alerts&appid=" + key;
JSONCPP_STRING answer;
JSONCPP_STRING formattedErrors;