diff --git a/Weather/Service/Data/Database.cs b/Weather/Service/Data/Database.cs index 3b485ef..eaa0a93 100644 --- a/Weather/Service/Data/Database.cs +++ b/Weather/Service/Data/Database.cs @@ -126,15 +126,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Data var query = ResourceReader.GetString("ChrisKaczor.HomeMonitor.Weather.Service.Data.Resources.GetReadingValueHistoryGrouped.sql"); - switch (weatherValueType) - { - case WeatherValueType.LightLevel: - query = query.Replace("@Value", "LightLevel / 3.3 * 100"); - break; - default: - query = query.Replace("@Value", weatherValueType.ToString()); - break; - } + query = query.Replace("@Value", weatherValueType.ToString()); return await connection.QueryAsync(query, new { Start = start, End = end, BucketMinutes = bucketMinutes }); } diff --git a/Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql b/Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql index b7dfcea..f057cc0 100644 --- a/Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql +++ b/Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql @@ -11,7 +11,7 @@ FROM ( Humidity, PressureTemperature AS Temperature, Pressure, - LightLevel / 3.3 * 100 AS LightLevel, + LightLevel, Rain FROM Reading WHERE Timestamp BETWEEN @Start AND @End diff --git a/Weather/Service/Models/WeatherAggregate.cs b/Weather/Service/Models/WeatherAggregate.cs index f8c775d..a84c759 100644 --- a/Weather/Service/Models/WeatherAggregate.cs +++ b/Weather/Service/Models/WeatherAggregate.cs @@ -36,7 +36,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Models Pressure = new ReadingAggregate(readings, r => r.Pressure, 2); - Light = new ReadingAggregate(readings, r => (r.LightLevel / 3.3m * 100).Truncate(1), 1); + Light = new ReadingAggregate(readings, r => r.LightLevel, 2); WindSpeed = new ReadingAggregate(readings, r => r.WindSpeed, 1); diff --git a/Weather/Service/Models/WeatherUpdate.cs b/Weather/Service/Models/WeatherUpdate.cs index 0a81f17..33f88e8 100644 --- a/Weather/Service/Models/WeatherUpdate.cs +++ b/Weather/Service/Models/WeatherUpdate.cs @@ -25,7 +25,7 @@ namespace ChrisKaczor.HomeMonitor.Weather.Service.Models Rain = weatherMessage.Rain; Pressure = weatherMessage.Pressure; Temperature = weatherMessage.PressureTemperature; - LightLevel = weatherMessage.LightLevel / 3.3m * 100; + LightLevel = weatherMessage.LightLevel; Latitude = weatherMessage.Latitude; Longitude = weatherMessage.Longitude; Altitude = weatherMessage.Altitude;