Merge branch 'worktree-extraction-overhaul'

# Conflicts:
#	transform/sqlmesh_padelnomics/models/foundation/dim_cities.sql
#	transform/sqlmesh_padelnomics/models/staging/stg_playtomic_venues.sql

transform/sqlmesh_padelnomics/models/foundation/dim_cities.sql

@@ -31,6 +31,22 @@ venue_counts AS (
   FROM foundation.dim_venues
   WHERE city IS NOT NULL AND city != ''
   GROUP BY country_code, city
+),
+-- Eurostat city label mapping to canonical city names
+-- (Eurostat uses codes like DE001C → Berlin; we keep both)
+eurostat_labels AS (
+  SELECT DISTINCT
+    city_code,
+    country_code,
+    -- Derive a slug-friendly city name from the code as fallback
+    LOWER(REPLACE(city_code, country_code, ''))  AS city_slug_raw
+  FROM eurostat_cities
+),
+-- Country-level median income (latest year per country)
+country_income AS (
+  SELECT country_code, median_income_pps, ref_year AS income_year
+  FROM staging.stg_income
+  QUALIFY ROW_NUMBER() OVER (PARTITION BY country_code ORDER BY ref_year DESC) = 1
 )
 SELECT
   ec.city_code,
@@ -43,8 +59,12 @@ SELECT
   COALESCE(vc.centroid_lon, 0::DOUBLE)           AS lon,
   ec.population,
   ec.ref_year                                    AS population_year,
-  COALESCE(vc.venue_count, 0)                    AS padel_venue_count
+  COALESCE(vc.venue_count, 0)                    AS padel_venue_count,
+  ci.median_income_pps,
+  ci.income_year
 FROM eurostat_cities ec
 LEFT JOIN venue_counts vc
   ON  ec.country_code = vc.country_code
   AND LOWER(TRIM(vc.city)) LIKE '%' || LOWER(LEFT(ec.city_code, 2)) || '%'
+LEFT JOIN country_income ci
+  ON ec.country_code = ci.country_code