Extend condition model

Refs: #16
orontee · Aug 30, 2023 · dde397b · dde397b
1 parent cdc024f
commit dde397b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/model.h b/src/model.h
@@ -90,9 +90,13 @@ enum Weather {
 
 struct Condition {
   std::time_t date{0};
+  std::time_t sunrise{0};
+  std::time_t sunset{0};
   long double temperature;
   long double felt_temperature;
+  int pressure;
   int humidity;
+  long double uv_index;
   long double wind_speed;
   Weather weather{CLEAR_SKY};
   std::string weather_description;

diff --git a/src/service.h b/src/service.h
@@ -142,13 +142,17 @@ class Service {
 
   static Condition extract_condition(const Json::Value &value) {
     const auto date = static_cast<time_t>(value.get("dt", 0).asInt());
+    const auto sunrise = static_cast<time_t>(value.get("sunrise", 0).asInt());
+    const auto sunset = static_cast<time_t>(value.get("sunset", 0).asInt());
     const auto temperature = value.get("temp", NAN).asDouble();
     const auto felt_temperature = value.get("feels_like", NAN).asDouble();
+    const auto pressure = value.get("pressure", NAN).asInt();
     const auto humidity = value.get("humidity", NAN).asInt();
+    const auto uv_index = value.get("uv_index", NAN).asDouble();
     const auto wind_speed = value.get("wind_speed", NAN).asDouble();
 
-    Condition condition{date, temperature, felt_temperature, humidity,
-                        wind_speed};
+    Condition condition{date, sunrise, sunset, temperature, felt_temperature,
+                        pressure, humidity, uv_index, wind_speed};
 
     if (value.isMember("weather") and value["weather"].isArray() and
         value["weather"].isValidIndex(0)) {