diff --git a/Weather/Service/Data/Resources/GetReadingHistory.sql b/Weather/Service/Data/Resources/GetReadingHistory.sql index 9ff1335..c2b3e24 100644 --- a/Weather/Service/Data/Resources/GetReadingHistory.sql +++ b/Weather/Service/Data/Resources/GetReadingHistory.sql @@ -2,9 +2,10 @@ SELECT Timestamp, WindDirection, WindSpeed, Humidity, + HumidityTemperature, Rain, Pressure, - PressureTemperature AS Temperature, + PressureTemperature, LightLevel, Latitude, Longitude, diff --git a/Weather/Service/Models/WeatherAggregate.cs b/Weather/Service/Models/WeatherAggregate.cs index a84c759..8b4aad6 100644 --- a/Weather/Service/Models/WeatherAggregate.cs +++ b/Weather/Service/Models/WeatherAggregate.cs @@ -23,7 +23,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Models public decimal RainTotal { get; set; } - private readonly static List _windDirectionValues = ((WindDirection[])Enum.GetValues(typeof(WindDirection))).Select(e => (int)e).ToList(); + private static readonly List _windDirectionValues = ((WindDirection[])Enum.GetValues(typeof(WindDirection))).Select(e => (int)e).ToList(); public WeatherAggregate(IEnumerable readings) { @@ -32,7 +32,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Models Humidity = new ReadingAggregate(readings, r => r.Humidity, 1); - Temperature = new ReadingAggregate(readings, r => r.PressureTemperature, 1); + Temperature = new ReadingAggregate(readings, r => r.HumidityTemperature, 1); Pressure = new ReadingAggregate(readings, r => r.Pressure, 2);