wip improvements

src/lib/services/index.ts

@@ -7,7 +7,6 @@ export {
 	getDates,
 	getValues,
 	getInt64Values,
-	extractValues,
 	unitToDisplayString
 } from './weather';
 

src/lib/services/weather.ts

@@ -175,6 +175,8 @@ export interface WeekHourlyData {
 	winddirection_10m: number[];
 	cloud_cover: number[];
 	relative_humidity_2m: number[];
+	apparent_temperature: number[];
+	dew_point_2m: number[];
 }
 
 export interface WeekDailyData {
@@ -259,7 +261,9 @@ const WEEK_HOURLY_VARS = [
 	'wind_speed_10m',
 	'wind_direction_10m',
 	'cloud_cover',
-	'relative_humidity_2m'
+	'relative_humidity_2m',
+	'apparent_temperature',
+	'dew_point_2m'
 ] as const;
 
 const WEEK_DAILY_VARS = [
@@ -324,7 +328,9 @@ export async function fetchWeekForecast(params: WeekForecastParams): Promise<Wee
 		windspeed_10m: getValues(hourlyBlock.variables(4)!),
 		winddirection_10m: getValues(hourlyBlock.variables(5)!),
 		cloud_cover: getValues(hourlyBlock.variables(6)!),
-		relative_humidity_2m: getValues(hourlyBlock.variables(7)!)
+		relative_humidity_2m: getValues(hourlyBlock.variables(7)!),
+		apparent_temperature: getValues(hourlyBlock.variables(8)!),
+		dew_point_2m: getValues(hourlyBlock.variables(9)!)
 	};
 
 	// Daily: variables are in the same order as WEEK_DAILY_VARS

src/routes/weather/canvas/temp-gradient.ts

@@ -8,10 +8,10 @@ export default (
 ): void => {
 	if (ctx && series) {
 		const tempGradientFill = ctx.createLinearGradient(0, 0, 0, config.maxY);
-		tempGradientFill.addColorStop(0, getColor(config.maxTemp.toFixed(0), unit) + '5c');
-		tempGradientFill.addColorStop(0.25, getColor(config.maxTemp.toFixed(0), unit) + '5c');
-		tempGradientFill.addColorStop(0.85, getColor(config.minTemp.toFixed(0), unit) + '06');
-		tempGradientFill.addColorStop(1, getColor(config.minTemp.toFixed(0), unit) + '00');
+		tempGradientFill.addColorStop(0, getColor(config.maxTemp, unit) + '5c');
+		tempGradientFill.addColorStop(0.25, getColor(config.maxTemp, unit) + '5c');
+		tempGradientFill.addColorStop(0.85, getColor(config.minTemp, unit) + '06');
+		tempGradientFill.addColorStop(1, getColor(config.minTemp, unit) + '00');
 
 		ctx.beginPath();
 		ctx.moveTo(

src/routes/weather/utils/colors.ts

@@ -25,19 +25,18 @@ export function rgbToHex(rgb: string) {
 	return hex;
 }
 
-export const getColor = (tempString: string, unit = 'celsius'): string => {
+export const getColor = (temperature: number, unit = 'celsius'): string => {
 	let index = 0;
-	const temp = Number(tempString);
 	if (unit === 'celsius') {
-		if (temp <= -40) {
+		if (temperature <= -40) {
 			index = 0;
-		} else if (temp >= 60) {
+		} else if (temperature >= 60) {
 			index = colorScaleHex.length - 1;
 		} else {
-			index = temp + 40;
+			index = temperature + 40;
 		}
 	} else {
-		const tempInCelsius = Math.round(((temp - 32) * 5) / 9);
+		const tempInCelsius = Math.round(((temperature - 32) * 5) / 9);
 		if (tempInCelsius <= -40) {
 			index = 0;
 		} else if (tempInCelsius >= 60) {