From 7e905b165120563b465e6b53d2910fa9e236f43d Mon Sep 17 00:00:00 2001 From: Stan Runge Date: Sun, 25 Oct 2026 20:56:29 +0000 Subject: [PATCH] stats: index neighbour growth from 2016 (after mergers), clearer tariff and levy labels --- src/routes/stats/energy/+page.svelte | 6 +++++- src/routes/stats/gouda/+page.svelte | 15 +++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/routes/stats/energy/+page.svelte b/src/routes/stats/energy/+page.svelte index 14fc428..1d1ea79 100644 --- a/src/routes/stats/energy/+page.svelte +++ b/src/routes/stats/energy/+page.svelte @@ -173,7 +173,11 @@ }, { name: 'Variable + tax 2018–2022', points: elec1823, color: '#eab308', dashed: true }, { name: 'Variable + tax (new contracts)', points: elecAllIn, color: '#eab308' }, - { name: 'Dynamic contract', points: pts('cbs:tariff:elec:dynamic'), color: '#10b981' } + { + name: 'Dynamic contract (supply only)', + points: pts('cbs:tariff:elec:dynamic'), + color: '#10b981' + } ], { unit: '€/kWh', decimals: 3, zoom: true } )} diff --git a/src/routes/stats/gouda/+page.svelte b/src/routes/stats/gouda/+page.svelte index 4d62731..059f879 100644 --- a/src/routes/stats/gouda/+page.svelte +++ b/src/routes/stats/gouda/+page.svelte @@ -42,9 +42,12 @@ const social = $derived(last('cbs:stock:social:GM0513')); const levy = $derived(last('cbs:levy:total:GM0513')); - // Index every ring municipality's monthly population to 100 in Jan 2002 so sizes compare. - const indexed = (p: StatPoint[]): StatPoint[] => - p.length ? p.map(([d, v]) => [d, Math.round((v / p[0][1]) * 1000) / 10]) : []; + // Index every ring municipality's monthly population to 100 in Jan 2016 so sizes compare. + // CBS reports historical borders, so start after the last merger (Krimpenerwaard, 2015). + const indexed = (all: StatPoint[]): StatPoint[] => { + const p = all.filter(([d]) => d >= '2016-01-01'); + return p.map(([d, v]) => [d, Math.round((v / p[0][1]) * 1000) / 10] as StatPoint); + }; const levyRank = $derived( RING.map((r) => ({ r, p: last(`cbs:levy:total:${r}`) })) .filter((x) => x.p) @@ -164,8 +167,8 @@ )} /> @@ -293,7 +296,7 @@ /> barRankOption(t, levyRank, { decimals: 0, unit: '€', color: '#64748b' })}