Data model simplification

Weather/Service/Data/Resources/GetReadingHistoryGrouped.sql

@@ -1,7 +1,6 @@
 SELECT Bucket,
-	   AVG(HumidityTemperature) AS AverageHumidityTemperature,
 	   AVG(Humidity) AS AverageHumidity,
-       AVG(PressureTemperature) AS AveragePressureTemperature,
+       AVG(Temperature) AS AverageTemperature,
        AVG(Pressure) AS AveragePressure,
 	   AVG(LightLevel) AS AverageLightLevel,
        SUM(Rain) AS RainTotal
@@ -9,11 +8,10 @@ FROM (
          SELECT CAST(FORMAT(Timestamp, 'yyyy-MM-ddTHH:') +
                 RIGHT('00' + CAST(DATEPART(MINUTE, Timestamp) / @BucketMinutes * @BucketMinutes AS VARCHAR), 2)
 				+ ':00+00:00' AS DATETIMEOFFSET)									  AS Bucket,
-                HumidityTemperature,
 				Humidity,
-				PressureTemperature,
+				PressureTemperature AS Temperature,
 				Pressure,
-				LightLevel / 3.3 AS LightLevel,
+				LightLevel / 3.3 * 100 AS LightLevel,
                 Rain
          FROM Reading
          WHERE Timestamp BETWEEN @Start AND @End