Add fitzrovia commute

Taskfile.data.yml

@@ -11,7 +11,8 @@ vars:
   EPC_PP_OUTPUT: "{{.DATA_DIR}}/epc_pp.parquet"
   WIDE_OUTPUT: "{{.DATA_DIR}}/wide.parquet"
   EPC: "{{.DATA_DIR}}/certificates.csv"
-  JOURNEY_TIMES: "{{.DATA_DIR}}/journey_times.parquet"
+  JOURNEY_TIMES_BANK: "{{.DATA_DIR}}/journey_times_bank.parquet"
+  JOURNEY_TIMES_FITZROVIA: "{{.DATA_DIR}}/journey_times_fitzrovia.parquet"
   ETHNICITY_OUTPUT: "{{.DATA_DIR}}/ethnicity_by_la.parquet"
   CRIME_DIR: "{{.DATA_DIR}}/crime"
   CRIME_OUTPUT: "{{.DATA_DIR}}/crime_by_lsoa.parquet"
@@ -20,8 +21,6 @@ vars:
   NAPTAN_OUTPUT: "{{.DATA_DIR}}/naptan.parquet"
   BROADBAND_OUTPUT: "{{.DATA_DIR}}/broadband.parquet"
   SCHOOL_PROXIMITY_OUTPUT: "{{.DATA_DIR}}/school_proximity.parquet"
-  COUNCIL_TAX_OUTPUT: "{{.DATA_DIR}}/council_tax.parquet"
-  COUNCIL_TAX_BANDS_OUTPUT: "{{.DATA_DIR}}/council_tax_bands.parquet"
 
 tasks:
   prompt:epc:
@@ -41,7 +40,7 @@ tasks:
   prompt:journey-times:
     desc: Download TFL journey times if missing (requires API key registration)
     status:
-      - test -f {{.JOURNEY_TIMES}}
+      - test -f {{.JOURNEY_TIMES_BANK}} || test -f {{.JOURNEY_TIMES_FITZROVIA}}
     deps:
       - download:arcgis
     cmds:
@@ -49,7 +48,9 @@ tasks:
         echo ""
         echo "=== TFL journey times not found ==="
         echo "Register for a TFL API key at https://api-portal.tfl.gov.uk/signin"
-        echo "Then set the TFL_API_KEY environment variable and re-run this task."
+        echo "Then set the TFL_API_KEY environment variable and run:"
+        echo "  task download:journey-times -- bank"
+        echo "  task download:journey-times -- fitzrovia"
         echo ""
         exit 1
 
@@ -109,19 +110,6 @@ tasks:
     cmds:
       - uv run python -m pipeline.download.broadband --output {{.BROADBAND_OUTPUT}}
 
-  download:council-tax:
-    desc: Download council tax rates by local authority (GOV.UK Table 9)
-    status:
-      - test -f {{.COUNCIL_TAX_OUTPUT}}
-    cmds:
-      - uv run python -m pipeline.download.council_tax --output {{.COUNCIL_TAX_OUTPUT}}
-
-  download:council-tax-bands:
-    desc: Scrape individual property council tax bands from VOA
-    status:
-      - test -f {{.COUNCIL_TAX_BANDS_OUTPUT}}
-    cmds:
-      - uv run python -m pipeline.download.council_tax_bands --postcodes {{.WIDE_OUTPUT}} --output {{.COUNCIL_TAX_BANDS_OUTPUT}}
 
   download:noise:
     desc: Download Defra noise data (road, rail, airport) sampled at postcode centroids
@@ -199,7 +187,6 @@ tasks:
       - download:ethnicity
       - download:broadband
       - download:noise
-      - download:council-tax
       - transform:crime
       - transform:poi-proximity
       - transform:school-proximity
@@ -213,12 +200,11 @@ tasks:
         --arcgis {{.ARCGIS_OUTPUT}}
         --iod {{.IOD_OUTPUT}}
         --poi-proximity {{.POI_PROXIMITY_OUTPUT}}
-        --journey-times {{.JOURNEY_TIMES}}
+        --journey-times-bank {{.JOURNEY_TIMES_BANK}}
+        --journey-times-fitzrovia {{.JOURNEY_TIMES_FITZROVIA}}
         --ethnicity {{.ETHNICITY_OUTPUT}}
         --crime {{.CRIME_OUTPUT}}
         --noise {{.NOISE_OUTPUT}}
         --school-proximity {{.SCHOOL_PROXIMITY_OUTPUT}}
         --broadband {{.BROADBAND_OUTPUT}}
-        --council-tax {{.COUNCIL_TAX_OUTPUT}}
-        --council-tax-bands {{.COUNCIL_TAX_BANDS_OUTPUT}}
         --output {{.WIDE_OUTPUT}}