Bugfix - handle null temperature unit

Author: llbbdd

src/services/weather-service.ts

@@ -34,15 +34,15 @@ export class WeatherService {
     const endIndex = Math.min(startIndex + totalHours, this._forecast.length);
     const result = new Map<string, WeatherRowData>();
 
+    const tempUnit = this.temperatureUnit;
+
     for (let i = startIndex; i < endIndex; i++) {
-      const tempUnit = this.temperatureUnit;
+      const item = this._forecast[i];
+      const temp = item.temperature.toFixed(1);
 
-      const weatherColour = ((): string => {
-        if (tempUnit === '°C') {
-          return getColourFromScale(-10, 40, this._forecast[i].temperature.toFixed(1), 'redToBlue', true);
-        }
-        return getColourFromScale(14, 104, this._forecast[i].temperature.toFixed(1), 'redToBlue');
-      })();
+      const weatherColour = tempUnit === '°C'
+        ? getColourFromScale(-10, 40, temp, 'redToBlue', true)
+        : getColourFromScale(14, 104, temp, 'redToBlue');
 
       result.set(this._forecast[i].datetime.toString(), {
         'weather-column': { value: this._forecast[i].condition, colour: white },
@@ -114,9 +114,7 @@ export class WeatherService {
     return this._forecast !== null;
   }
 
-  public get temperatureUnit(): TemperatureUnit {
-    if (this._temperatureUnit === null) throw new Error('this._temperatureUnit is null');
-
+  public get temperatureUnit(): TemperatureUnit | null {
     return this._temperatureUnit;
   }
 

src/utils/TableRenderer.ts

@@ -51,7 +51,7 @@ export class TableRenderer {
     this._state = state;
   }
 
-  public render(predbatData: PredbatData, temperatureUnit: TemperatureUnit, dayLimit: number, generatingPlan: boolean, carChargeSwitch: 'on' | 'off' | undefined, forceEntityObjects: EntityObject[], weather: Map<string, WeatherRowData> | null): void {
+  public render(predbatData: PredbatData, temperatureUnit: TemperatureUnit | null, dayLimit: number, generatingPlan: boolean, carChargeSwitch: 'on' | 'off' | undefined, forceEntityObjects: EntityObject[], weather: Map<string, WeatherRowData> | null): void {
     if (this._container === null) return;
 
     const leftColumn = divElement('table-left-column');
@@ -233,6 +233,7 @@ export class TableRenderer {
             ////
             case 'temp-column': {
               if (typeof columnData.value !== 'number') throw new Error('Invalid temp-column data' + columnData.value);
+              if(temperatureUnit === null) throw new Error('temperatureUnit must have a value to render temp-column'); // this error should be impossible due to the column being excluded for having no data
 
               cellInner.appendChild(temperatureElement(columnData.value, columnData.colour, temperatureUnit));