mobile improvements mostly

messages/de.json

@@ -293,6 +293,7 @@
 	"compare_selected_models": "Ausgewählte Modelle",
 	"compare_selection_pending": "Auswahl geändert",
 	"compare_apply_selection": "Anwenden & Diagramme neu laden",
+	"compare_discard_changes": "Änderungen verwerfen",
 	"compare_customize_models": "Modelle anpassen",
 	"compare_edit_models": "Modelle bearbeiten",
 	"compare_edit_variables": "Variablen bearbeiten",
@@ -300,6 +301,8 @@
 	"compare_edit_variables_description": "Variablen suchen oder ganze Themengruppen auswählen.",
 	"compare_search_models": "Modelle suchen",
 	"compare_search_variables": "Variablen suchen",
+	"compare_show_model_names": "Modellnamen anzeigen",
+	"compare_hide_model_names": "Modellnamen ausblenden",
 	"compare_only_selected": "Nur ausgewählte",
 	"compare_select_group": "Alle auswählen",
 	"compare_clear_group": "Alle abwählen",

messages/en.json

@@ -293,6 +293,7 @@
 	"compare_selected_models": "Selected models",
 	"compare_selection_pending": "Selection changed",
 	"compare_apply_selection": "Apply & reload charts",
+	"compare_discard_changes": "Discard changes",
 	"compare_customize_models": "Customize models",
 	"compare_edit_models": "Edit models",
 	"compare_edit_variables": "Edit variables",
@@ -300,6 +301,8 @@
 	"compare_edit_variables_description": "Search variables or select complete thematic groups.",
 	"compare_search_models": "Search models",
 	"compare_search_variables": "Search variables",
+	"compare_show_model_names": "Show model names",
+	"compare_hide_model_names": "Hide model names",
 	"compare_only_selected": "Only selected",
 	"compare_select_group": "Select all",
 	"compare_clear_group": "Clear all",

messages/es.json

@@ -293,6 +293,7 @@
 	"compare_selected_models": "Modelos seleccionados",
 	"compare_selection_pending": "Selección modificada",
 	"compare_apply_selection": "Aplicar y recargar gráficos",
+	"compare_discard_changes": "Descartar cambios",
 	"compare_customize_models": "Personalizar modelos",
 	"compare_edit_models": "Editar modelos",
 	"compare_edit_variables": "Editar variables",
@@ -300,6 +301,8 @@
 	"compare_edit_variables_description": "Busca variables o selecciona grupos temáticos completos.",
 	"compare_search_models": "Buscar modelos",
 	"compare_search_variables": "Buscar variables",
+	"compare_show_model_names": "Mostrar nombres de modelos",
+	"compare_hide_model_names": "Ocultar nombres de modelos",
 	"compare_only_selected": "Solo seleccionados",
 	"compare_select_group": "Seleccionar todo",
 	"compare_clear_group": "Deseleccionar todo",

messages/fr.json

@@ -293,6 +293,7 @@
 	"compare_selected_models": "Modèles sélectionnés",
 	"compare_selection_pending": "Sélection modifiée",
 	"compare_apply_selection": "Appliquer et recharger les graphiques",
+	"compare_discard_changes": "Annuler les modifications",
 	"compare_customize_models": "Personnaliser les modèles",
 	"compare_edit_models": "Modifier les modèles",
 	"compare_edit_variables": "Modifier les variables",
@@ -300,6 +301,8 @@
 	"compare_edit_variables_description": "Recherchez des variables ou sélectionnez des groupes thématiques entiers.",
 	"compare_search_models": "Rechercher des modèles",
 	"compare_search_variables": "Rechercher des variables",
+	"compare_show_model_names": "Afficher les noms des modèles",
+	"compare_hide_model_names": "Masquer les noms des modèles",
 	"compare_only_selected": "Sélection uniquement",
 	"compare_select_group": "Tout sélectionner",
 	"compare_clear_group": "Tout désélectionner",

messages/it.json

@@ -293,6 +293,7 @@
 	"compare_selected_models": "Modelli selezionati",
 	"compare_selection_pending": "Selezione modificata",
 	"compare_apply_selection": "Applica e ricarica i grafici",
+	"compare_discard_changes": "Annulla modifiche",
 	"compare_customize_models": "Personalizza modelli",
 	"compare_edit_models": "Modifica modelli",
 	"compare_edit_variables": "Modifica variabili",
@@ -300,6 +301,8 @@
 	"compare_edit_variables_description": "Cerca variabili o seleziona interi gruppi tematici.",
 	"compare_search_models": "Cerca modelli",
 	"compare_search_variables": "Cerca variabili",
+	"compare_show_model_names": "Mostra nomi dei modelli",
+	"compare_hide_model_names": "Nascondi nomi dei modelli",
 	"compare_only_selected": "Solo selezionati",
 	"compare_select_group": "Seleziona tutto",
 	"compare_clear_group": "Deseleziona tutto",

src/lib/charts/CanvasChart.svelte

@@ -209,6 +209,8 @@
 		yTicks?: number[];
 		/** Custom left-axis tick formatter. */
 		yTickFormat?: (value: number) => string;
+		/** Use abbreviated y-axis labels and omit verbose gutter labels. */
+		compactYAxis?: boolean;
 		/** Force the derived left axis to include zero (default true) */
 		zeroBaseLeft?: boolean;
 		/** Fixed right-axis minimum (default 0) */
@@ -260,6 +262,7 @@
 		yMax,
 		yTicks,
 		yTickFormat,
+		compactYAxis = false,
 		yPadTop,
 		yPadBottom,
 		zeroBaseLeft = true,
@@ -497,7 +500,7 @@
 	let iconRows = $derived(isNarrow ? ownIconRows : Math.max(ownIconRows, reserveTopRows));
 	// tighter top/bottom gutters on mobile so charts don't waste vertical space
 	const iconRowH = $derived(isNarrow ? 30 : ICON_ROW_H);
-	let padTop = $derived((title ? (subtitle ? 66 : 46) : isNarrow ? 14 : 28) + iconRows * iconRowH);
+	let padTop = $derived((title ? (subtitle ? 66 : 46) : isNarrow ? 22 : 28) + iconRows * iconRowH);
 	let agreementStripOffset = $derived(
 		agreementStrip ? AGREEMENT_STRIP_HEIGHT + AGREEMENT_STRIP_GAP + 2 : 0
 	);
@@ -1087,7 +1090,13 @@
 			ctx.lineTo(plotRight, y);
 			ctx.stroke();
 			ctx.fillStyle = textColor;
-			ctx.fillText(yTickFormat?.(v) ?? v.toFixed(tickDecimals(leftScale.step)), padLeft - 8, y);
+			ctx.fillText(
+				compactYAxis
+					? v.toFixed(tickDecimals(leftScale.step))
+					: (yTickFormat?.(v) ?? v.toFixed(tickDecimals(leftScale.step))),
+				padLeft - 8,
+				y
+			);
 		}
 
 		// Right axis labels in the gutter (desktop only). On mobile there is no
@@ -1543,6 +1552,7 @@
 			ctx.strokeStyle = withAlpha(gridColor, 0.8);
 			ctx.lineWidth = 1;
 			ctx.strokeRect(padLeft, stripTop + 0.5, plotW, AGREEMENT_STRIP_HEIGHT - 1);
+			if (!compactYAxis) {
 				ctx.fillStyle = textColor;
 				ctx.font = '600 9px system-ui, sans-serif';
 				ctx.textAlign = 'right';
@@ -1554,6 +1564,7 @@
 					Math.max(24, padLeft - 10)
 				);
 			}
+		}
 
 		// Axis unit labels
 		ctx.font = font;

src/lib/components/charts/downloadChartsPng.ts

@@ -108,10 +108,9 @@ export async function downloadChartsPng(
 		}
 		if (row.length > 0) legendRows.push(row);
 	}
-	const headerHeight =
-		(options.title ? 34 * dpr : 0) +
-		(legendRows.length > 0 ? legendRows.length * rowHeight + 8 * dpr : 0);
-	const totalHeight = headerHeight + canvases.reduce((sum, c) => sum + c.height, 0);
+	const titleHeight = options.title ? 34 * dpr : 0;
+	const legendHeight = legendRows.length > 0 ? legendRows.length * rowHeight + 8 * dpr : 0;
+	const totalHeight = titleHeight + canvases.reduce((sum, c) => sum + c.height, 0) + legendHeight;
 
 	const canvas = document.createElement('canvas');
 	canvas.width = maxWidth;
@@ -134,7 +133,12 @@ export async function downloadChartsPng(
 		ctx.fillText(options.title, padding, 17 * dpr);
 		y += 34 * dpr;
 	}
+	for (const c of canvases) {
+		ctx.drawImage(c, 0, y);
+		y += c.height;
+	}
 	if (legendRows.length > 0) {
+		y += 8 * dpr;
 		ctx.font = `${12 * dpr}px system-ui, -apple-system, sans-serif`;
 		ctx.textBaseline = 'middle';
 		for (const row of legendRows) {
@@ -165,11 +169,6 @@ export async function downloadChartsPng(
 			}
 			y += rowHeight;
 		}
-		y += 8 * dpr;
-	}
-	for (const c of canvases) {
-		ctx.drawImage(c, 0, y);
-		y += c.height;
 	}
 
 	triggerDownload(canvas.toDataURL('image/png'), `${fileName}.png`);

src/routes/weather/compare/[location]/+page.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
-	import { onDestroy, onMount, untrack } from 'svelte';
+	import { onDestroy, onMount, tick, untrack } from 'svelte';
 	import { get } from 'svelte/store';
-	import { fade } from 'svelte/transition';
 
 	import { page } from '$app/stores';
 
@@ -17,9 +16,6 @@
 		type ExportableChart,
 		type ExportLegendItem
 	} from '$lib/components/charts';
-	import { Label } from '$lib/components/ui/label';
-	import { Switch } from '$lib/components/ui/switch';
-
 	import {
 		CHART_COLORS,
 		CanvasChart,
@@ -88,17 +84,21 @@
 	let location = $derived(data.location);
 	let mounted = $state(false);
 	let loading = $state(true);
-	let refreshing = $state(false);
 	let loadError = $state<FriendlyWeatherError | null>(null);
 	let retryNonce = $state(0);
 	let requestVersion = 0;
 	let activeController: AbortController | null = null;
 	let chartComponents: CanvasChart[] = $state([]);
 	let pictogramExporter: ExportableChart | null = $state(null);
-	let showLegend = $state(true);
 
 	let isMobile = $state(false);
-	let comparisonPlotInsetLeft = $derived(isMobile ? 92 : 116);
+	let showModelNames = $state(true);
+	let modelNamesInitialized = false;
+	let initialRangeInitialized = false;
+	let compactYAxis = $derived(!showModelNames);
+	let comparisonPlotInsetLeft = $derived(
+		showModelNames ? (isMobile ? 92 : 116) : isMobile ? 34 : 40
+	);
 	let comparisonPlotInsetRight = $derived(isMobile ? 8 : 20);
 	let params = $state({
 		...defaultParameters,
@@ -132,6 +132,15 @@
 		return left.length === right.length && left.every((value, index) => value === right[index]);
 	}
 
+	function changedValueCount(left: string[], right: string[]): number {
+		const leftValues = new Set(left);
+		const rightValues = new Set(right);
+		let count = 0;
+		for (const value of leftValues) if (!rightValues.has(value)) count++;
+		for (const value of rightValues) if (!leftValues.has(value)) count++;
+		return count;
+	}
+
 	function orderModels(values: string[]): string[] {
 		return [...values].sort(
 			(left, right) =>
@@ -159,6 +168,8 @@
 		return current !== null && !hasSameOrder(current.selection.models, appliedModels);
 	});
 	let comparisonSelectionDirty = $derived(variablesDirty || modelsDirty);
+	let pendingVariableChanges = $derived(changedValueCount(params.hourly, appliedHourly));
+	let pendingModelChanges = $derived(changedValueCount(params.models, appliedModels));
 	let comparisonMuted = $derived(
 		comparisonSelectionDirty || displayedVariablesStale || displayedModelsStale
 	);
@@ -198,6 +209,10 @@
 		const media = window.matchMedia('(max-width: 639px)');
 		const applyMedia = () => {
 			isMobile = media.matches;
+			if (!modelNamesInitialized) {
+				showModelNames = !media.matches;
+				modelNamesInitialized = true;
+			}
 		};
 		applyMedia();
 		media.addEventListener('change', applyMedia);
@@ -236,14 +251,12 @@
 		if (modelList.length === 0 || hourlyVars.length === 0) {
 			fetchedData = null;
 			loading = false;
-			refreshing = false;
 			loadError = null;
 			return;
 		}
 
 		const hasFetchedData = untrack(() => fetchedData !== null);
 		loading = !hasFetchedData;
-		refreshing = hasFetchedData;
 		loadError = null;
 		const timer = window.setTimeout(() => {
 			const controller = new AbortController();
@@ -266,15 +279,20 @@
 			)
 				.then((result) => {
 					if (version !== requestVersion) return;
+					const applyInitialMobileRange = !initialRangeInitialized && isMobile;
+					initialRangeInitialized = true;
 					fetchedData = { result, selection: { models: modelList, hourly: hourlyVars } };
 					loading = false;
-					refreshing = false;
+					if (applyInitialMobileRange) {
+						void tick().then(() => {
+							if (version === requestVersion && groupRange(CHART_GROUP) === null) setRangeDays(3);
+						});
+					}
 				})
 				.catch((error: unknown) => {
 					if (version !== requestVersion || controller.signal.aborted) return;
 					loadError = humanizeWeatherError(error);
 					loading = false;
-					refreshing = false;
 				});
 		}, FETCH_DEBOUNCE_MS);
 
@@ -536,6 +554,11 @@
 		if (!variablesChanged && !modelsChanged) retryNonce++;
 	}
 
+	function discardComparisonSelection(): void {
+		params.hourly = [...appliedHourly];
+		params.models = [...appliedModels];
+	}
+
 	const variableGroupLabels = [
 		m.compare_group_temperature,
 		m.compare_group_precipitation,
@@ -568,7 +591,7 @@
 </script>
 
 <svelte:head>
-	<title>{m.page_compare_title()} | Drizz.li</title>
+	<title>Drizz.li | {m.page_compare_title()}</title>
 	<link rel="canonical" href="https://drizz.li/weather/compare" />
 	<meta name="description" content={m.page_compare_description()} />
 </svelte:head>
@@ -689,6 +712,7 @@
 							yMax={def.yMax}
 							yTicks={def.yTicks}
 							yTickFormat={def.yTickFormat}
+							{compactYAxis}
 							plotInsetLeft={comparisonPlotInsetLeft}
 							plotInsetRight={comparisonPlotInsetRight}
 							showCredit={i === chartDefs.length - 1}
@@ -711,14 +735,6 @@
 					<span class="text-xs font-semibold text-muted-foreground">
 						{m.compare_selection_pending()}
 					</span>
-					<button
-						type="button"
-						class="min-h-10 rounded-lg bg-primary px-4 py-2 text-sm font-bold text-primary-foreground hover:bg-primary/90 disabled:cursor-wait disabled:opacity-70"
-						disabled={(displayedVariablesStale || displayedModelsStale) && refreshing}
-						onclick={applyComparisonSelection}
-					>
-						{m.compare_apply_selection()}
-					</button>
 				</div>
 			</div>
 		{/if}
@@ -748,6 +764,8 @@
 			group={CHART_GROUP}
 			plotInsetLeft={comparisonPlotInsetLeft}
 			plotInsetRight={comparisonPlotInsetRight}
+			{showModelNames}
+			onToggleModelNames={() => (showModelNames = !showModelNames)}
 			registerExporter={(exporter) => (pictogramExporter = exporter)}
 		/>
 	</div>
@@ -759,18 +777,8 @@
 			? 'pointer-events-none opacity-40'
 			: ''}"
 	>
-		<div class="flex items-center justify-between gap-3">
 		<p class="text-xs font-semibold text-muted-foreground">{m.compare_model_colors()}</p>
-			<div class="flex items-center gap-2">
-				<Switch id="show_legend" bind:checked={showLegend} />
-				<Label for="show_legend" class="text-xs">{m.legend_show()}</Label>
-			</div>
-		</div>
-		{#if showLegend}
-			<div
-				class="-mx-1 mt-2 flex gap-3 overflow-x-auto px-1 pb-1 sm:flex-wrap"
-				transition:fade={{ duration: 150 }}
-			>
+		<div class="-mx-1 mt-2 flex gap-3 overflow-x-auto px-1 pb-1 sm:flex-wrap">
 			{#each displayedModels as model (model.modelId)}
 				<span class="flex min-h-8 shrink-0 items-center gap-1.5 text-xs">
 					<span
@@ -788,7 +796,6 @@
 				</span>
 			{/if}
 		</div>
-		{/if}
 	</div>
 
 	<div
@@ -826,10 +833,8 @@
 		mode="variables"
 		groups={variableSelectionGroups}
 		selected={params.hourly}
-		dirty={variablesDirty}
 		onToggle={(value) => toggleSelection('hourly', value)}
 		onToggleGroup={(values, select) => toggleGroupSelection('hourly', values, select)}
-		onApply={applyComparisonSelection}
 		onRestoreDefaults={restoreStandardVariables}
 	/>
 </section>
@@ -853,9 +858,46 @@
 		mode="models"
 		groups={modelSelectionGroups}
 		selected={params.models}
-		dirty={modelsDirty}
 		onToggle={(value) => toggleSelection('models', value)}
 		onToggleGroup={(values, select) => toggleGroupSelection('models', values, select)}
-		onApply={applyComparisonSelection}
 	/>
 </section>
+
+{#if comparisonSelectionDirty}
+	<div class="h-24" aria-hidden="true"></div>
+	<div
+		class="pointer-events-none fixed right-3 bottom-3 left-3 z-50 md:left-auto md:w-[42rem] md:max-w-[calc(100vw-2rem)] lg:right-8"
+	>
+		<div
+			class="pointer-events-auto flex flex-col gap-3 rounded-2xl border border-primary/30 bg-background/95 p-3 shadow-2xl backdrop-blur sm:flex-row sm:items-center sm:justify-between sm:p-4"
+		>
+			<div class="min-w-0" aria-live="polite">
+				<p class="text-sm font-bold">{m.compare_selection_pending()}</p>
+				<div class="mt-1 flex flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground">
+					{#if variablesDirty}
+						<span>{m.compare_variables_heading()}: {pendingVariableChanges}</span>
+					{/if}
+					{#if modelsDirty}
+						<span>{m.compare_models_heading()}: {pendingModelChanges}</span>
+					{/if}
+				</div>
+			</div>
+			<div class="grid shrink-0 grid-cols-2 gap-2">
+				<button
+					type="button"
+					class="min-h-10 rounded-lg border border-border bg-background px-3 py-2 text-sm font-semibold hover:bg-muted"
+					onclick={discardComparisonSelection}
+				>
+					{m.compare_discard_changes()}
+				</button>
+				<button
+					type="button"
+					class="min-h-10 rounded-lg bg-primary px-4 py-2 text-sm font-bold text-primary-foreground hover:bg-primary/90"
+					onclick={applyComparisonSelection}
+				>
+					{m.compare_apply_selection()}
+				</button>
+			</div>
+		</div>
+	</div>
+{/if}

src/routes/weather/compare/[location]/ComparisonSelectionPanel.svelte

@@ -21,23 +21,12 @@
 		mode: 'models' | 'variables';
 		groups: OptionGroup[];
 		selected: string[];
-		dirty: boolean;
 		onToggle: (value: string) => void;
 		onToggleGroup: (values: string[], select: boolean) => void;
-		onApply: () => void;
 		onRestoreDefaults?: () => void;
 	}
 
-	let {
-		mode,
-		groups,
-		selected,
-		dirty,
-		onToggle,
-		onToggleGroup,
-		onApply,
-		onRestoreDefaults
-	}: Props = $props();
+	let { mode, groups, selected, onToggle, onToggleGroup, onRestoreDefaults }: Props = $props();
 
 	let search = $state('');
 	let onlySelected = $state(false);
@@ -118,17 +107,6 @@
 							<span class="shrink-0 text-[11px] text-muted-foreground tabular-nums">
 								{selection.count}/{fullGroup.options.length}
 							</span>
-							<button
-								type="button"
-								class="shrink-0 rounded-md px-2 py-1 text-[11px] font-semibold text-primary hover:bg-primary/10"
-								onclick={() =>
-									onToggleGroup(
-										fullGroup.options.map((option) => option.value),
-										!selection.all
-									)}
-							>
-								{selection.all ? m.compare_clear_group() : m.compare_select_group()}
-							</button>
 						</div>
 						<div class="p-2">
 							{#each visibleGroup.options as option (option.value)}
@@ -164,11 +142,8 @@
 		{/if}
 	</div>
 
-	<div
-		class="flex flex-wrap items-center justify-between gap-2 border-t border-border bg-muted/20 px-3 py-3 sm:px-4"
-	>
-		<div>
 	{#if mode === 'variables' && onRestoreDefaults}
+		<div class="border-t border-border bg-muted/20 px-3 py-3 sm:px-4">
 			<button
 				type="button"
 				class="min-h-9 rounded-lg border border-border bg-background px-3 py-1.5 text-xs font-semibold hover:bg-muted"
@@ -176,15 +151,6 @@
 			>
 				{m.compare_restore_defaults()}
 			</button>
+		</div>
 	{/if}
 </div>
-		<button
-			type="button"
-			class="min-h-10 rounded-lg bg-primary px-4 py-2 text-sm font-bold text-primary-foreground hover:bg-primary/90 disabled:opacity-50"
-			disabled={!dirty}
-			onclick={onApply}
-		>
-			{m.compare_apply_selection()}
-		</button>
-	</div>
-</div>

src/routes/weather/compare/[location]/ModelPictogramTimeline.svelte

@@ -26,6 +26,8 @@
 		group: string;
 		plotInsetLeft: number;
 		plotInsetRight: number;
+		showModelNames: boolean;
+		onToggleModelNames: () => void;
 		registerExporter?: (exporter: TimelineExporter | null) => void;
 	}
 
@@ -68,6 +70,8 @@
 		group,
 		plotInsetLeft,
 		plotInsetRight,
+		showModelNames,
+		onToggleModelNames,
 		registerExporter
 	}: Props = $props();
 
@@ -600,9 +604,16 @@
 			context.beginPath();
 			context.arc(9, rowCenter, 4, 0, Math.PI * 2);
 			context.fill();
+			if (showModelNames) {
 				context.fillStyle = foreground;
 				context.textAlign = 'left';
-			context.fillText(modelLabel(model.modelId), 18, rowCenter, Math.max(20, plotInsetLeft - 24));
+				context.fillText(
+					modelLabel(model.modelId),
+					18,
+					rowCenter,
+					Math.max(20, plotInsetLeft - 24)
+				);
+			}
 
 			context.save();
 			context.beginPath();
@@ -659,6 +670,7 @@
 		void daySeparators;
 		void sunlightSegments;
 		void displayModels;
+		void showModelNames;
 		if (!target || currentWidth <= 0 || currentHeight <= 0) return;
 
 		const version = ++screenRenderVersion;
@@ -684,12 +696,22 @@
 		class="mt-7 -mx-3 border-y border-border/70 bg-card shadow-sm lg:mx-0 lg:rounded-2xl lg:border"
 		aria-labelledby="model-pictogram-title"
 	>
-		<div class="px-3 pt-3 pb-2 lg:px-4">
+		<div class="flex items-start justify-between gap-3 px-3 pt-3 pb-2 lg:px-4">
+			<div class="min-w-0">
 				<h2 id="model-pictogram-title" class="text-sm font-bold tracking-tight">
 					{m.compare_timeline_title()}
 				</h2>
 				<p class="text-xs text-muted-foreground">{m.compare_timeline_hint()}</p>
 			</div>
+			<button
+				type="button"
+				class="min-h-8 shrink-0 rounded-lg border border-border bg-background px-2.5 py-1 text-xs font-semibold whitespace-nowrap text-muted-foreground hover:bg-muted hover:text-foreground"
+				aria-pressed={showModelNames}
+				onclick={onToggleModelNames}
+			>
+				{showModelNames ? m.compare_hide_model_names() : m.compare_show_model_names()}
+			</button>
+		</div>
 		<div class="lg:px-4">
 			<div
 				bind:this={containerEl}