multimodel improvements

src/lib/charts/data.ts

@@ -33,19 +33,19 @@ export const CHART_COLORS = {
 // ─── Utility: Detect column-type variables ───────────────────────────────────
 
 /** Units that should be rendered as bar/column charts instead of lines. */
-const COLUMN_UNITS = new Set(['mm', 'cm', 'inch', 'MJ/m²']);
+const COLUMN_UNITS = new Set(['mm', 'cm', 'in', 'inch', 'MJ/m²']);
 
 /**
  * Returns true if the given unit should be rendered as a bar chart.
  */
 export function isColumnUnit(unit: string): boolean {
-	return COLUMN_UNITS.has(unit);
+	return COLUMN_UNITS.has(unit.trim());
 }
 
 // ─── Data Processing Helpers ─────────────────────────────────────────────────
 
 export interface AverageResult {
-	average: number[];
+	average: (number | null)[];
 	averageCount: number[];
 }
 
@@ -62,7 +62,7 @@ export function calculateAverage(
 	variable: string,
 	timeLength: number
 ): AverageResult {
-	const average = new Array<number>(timeLength).fill(0);
+	const totals = new Array<number>(timeLength).fill(0);
 	const averageCount = new Array<number>(timeLength).fill(0);
 
 	for (const [model, values] of Object.entries(hourlyData)) {
@@ -71,18 +71,17 @@ export function calculateAverage(
 
 		for (const [index, val] of (values as number[]).entries()) {
 			if (val !== null && val !== undefined && isFinite(val)) {
-				average[index] += val;
+				if (index >= timeLength) continue;
+				totals[index] += val;
 				averageCount[index]++;
 			}
 		}
 	}
 
 	// Finalize average values
-	for (let i = 0; i < timeLength; i++) {
-		if (averageCount[i] > 0) {
-			average[i] = Math.round((average[i] / averageCount[i]) * 10) / 10;
-		}
-	}
+	const average = totals.map((total, i) =>
+		averageCount[i] > 0 ? Math.round((total / averageCount[i]) * 10) / 10 : null
+	);
 
 	return { average, averageCount };
 }