Add sun and moon info
This commit is contained in:
@@ -378,6 +378,14 @@ STR_WEATHER_MONTH_SEP: "Sep"
|
||||
STR_WEATHER_MONTH_OCT: "Oct"
|
||||
STR_WEATHER_MONTH_NOV: "Nov"
|
||||
STR_WEATHER_MONTH_DEC: "Dec"
|
||||
STR_WEATHER_MOON_NEW: "New Moon"
|
||||
STR_WEATHER_MOON_WAXING_CRESCENT: "Waxing Crescent"
|
||||
STR_WEATHER_MOON_FIRST_QUARTER: "First Quarter"
|
||||
STR_WEATHER_MOON_WAXING_GIBBOUS: "Waxing Gibbous"
|
||||
STR_WEATHER_MOON_FULL: "Full Moon"
|
||||
STR_WEATHER_MOON_WANING_GIBBOUS: "Waning Gibbous"
|
||||
STR_WEATHER_MOON_LAST_QUARTER: "Last Quarter"
|
||||
STR_WEATHER_MOON_WANING_CRESCENT: "Waning Crescent"
|
||||
STR_WEATHER_DESC_CLEAR_SKY: "Clear sky"
|
||||
STR_WEATHER_DESC_MAINLY_CLEAR: "Mainly clear"
|
||||
STR_WEATHER_DESC_PARTLY_CLOUDY: "Partly cloudy"
|
||||
@@ -434,3 +442,5 @@ STR_UPTIME: "Uptime"
|
||||
STR_CHARGING: "Charging"
|
||||
STR_GATHERING_DATA: "Gathering data..."
|
||||
STR_READING: "Reading..."
|
||||
STR_WEATHER_MOON_INFO: "Moon"
|
||||
STR_WEATHER_SUN_INFO: "Sun"
|
||||
@@ -363,6 +363,16 @@ STR_WEATHER_MONTH_OCT: "Okt"
|
||||
STR_WEATHER_MONTH_NOV: "Nov"
|
||||
STR_WEATHER_MONTH_DEC: "Dez"
|
||||
|
||||
STR_WEATHER_SUN_INFO: "Sonne"
|
||||
STR_WEATHER_MOON_NEW: "Neumond"
|
||||
STR_WEATHER_MOON_WAXING_CRESCENT: "zunehm. Halbmond"
|
||||
STR_WEATHER_MOON_FIRST_QUARTER: "1. Viertel"
|
||||
STR_WEATHER_MOON_WAXING_GIBBOUS: "zunehm. Mond"
|
||||
STR_WEATHER_MOON_FULL: "Vollmond"
|
||||
STR_WEATHER_MOON_WANING_GIBBOUS: "abnehm. Mond"
|
||||
STR_WEATHER_MOON_LAST_QUARTER: "3. Viertel"
|
||||
STR_WEATHER_MOON_WANING_CRESCENT: "abneh. Halbmond"
|
||||
|
||||
STR_WEATHER_DESC_CLEAR_SKY: "Klarer Himmel"
|
||||
STR_WEATHER_DESC_MAINLY_CLEAR: "Überwiegend klar"
|
||||
STR_WEATHER_DESC_PARTLY_CLOUDY: "Teilweise bewölkt"
|
||||
|
||||
@@ -200,6 +200,7 @@ bool WeatherClient::parseWeatherJson(const std::string& json, WeatherData& data)
|
||||
day.sunrise = sunrise[i] | (time_t)0;
|
||||
day.sunset = sunset[i] | (time_t)0;
|
||||
day.uvIndexMax = uvMax[i] | 0.0f;
|
||||
day.moonPhase = daily["moon_phase"] ? (daily["moon_phase"][i] | -1.0f) : -1.0f;
|
||||
data.daily.push_back(day);
|
||||
}
|
||||
}
|
||||
@@ -264,6 +265,8 @@ bool WeatherClient::saveCache(const WeatherData& data) {
|
||||
d["uvIndexMax"] = day.uvIndexMax;
|
||||
d["sunrise"] = day.sunrise;
|
||||
d["sunset"] = day.sunset;
|
||||
d["moonPhase"] = day.moonPhase;
|
||||
d["moonPhaseApiName"] = "moon_phase"; // for compatibility/tracing
|
||||
}
|
||||
|
||||
// Hourly
|
||||
@@ -331,6 +334,7 @@ bool WeatherClient::loadCache(WeatherData& data) {
|
||||
day.uvIndexMax = d["uvIndexMax"] | 0.0f;
|
||||
day.sunrise = d["sunrise"] | (time_t)0;
|
||||
day.sunset = d["sunset"] | (time_t)0;
|
||||
day.moonPhase = d["moonPhase"] | -1.0f;
|
||||
data.daily.push_back(day);
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ struct DailyForecast {
|
||||
float uvIndexMax = 0;
|
||||
time_t sunrise = 0;
|
||||
time_t sunset = 0;
|
||||
float moonPhase = -1.0f; // -1 means unknown, 0.0 new, 0.5 full
|
||||
};
|
||||
|
||||
struct HourlyForecast {
|
||||
|
||||
Reference in New Issue
Block a user