Move map assets out of CI
This commit is contained in:
parent
a5f2e6eabb
commit
9248e26af2
851 changed files with 1925 additions and 10 deletions
|
|
@ -17,12 +17,6 @@ jobs:
|
|||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install uv
|
||||
run: curl -LsSf https://astral.sh/uv/install.sh | sh
|
||||
|
||||
- name: Download map assets (fonts, sprites, twemoji)
|
||||
run: uv run python -m pipeline.download.map_assets --output frontend/public/assets
|
||||
|
||||
- name: Install Docker CLI
|
||||
run: |
|
||||
ARCH=$(uname -m)
|
||||
|
|
@ -84,4 +78,3 @@ jobs:
|
|||
${{ env.REGISTRY }}/${{ steps.tags.outputs.repo }}-screenshot:sha-${{ steps.tags.outputs.sha_short }}
|
||||
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ steps.tags.outputs.repo }}-screenshot:buildcache
|
||||
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ steps.tags.outputs.repo }}-screenshot:buildcache,mode=max
|
||||
|
||||
|
|
|
|||
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -6,6 +6,13 @@
|
|||
server-rs/target
|
||||
.task
|
||||
frontend/public/assets/*
|
||||
!frontend/public/assets/fonts/
|
||||
!frontend/public/assets/fonts/**
|
||||
!frontend/public/assets/sprites/
|
||||
!frontend/public/assets/sprites/**
|
||||
!frontend/public/assets/twemoji/
|
||||
!frontend/public/assets/twemoji/**
|
||||
!frontend/public/assets/poi-icons/
|
||||
!frontend/public/assets/poi-icons/**
|
||||
frontend/public/assets/.done
|
||||
server-rs/logs
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# Usage:
|
||||
# make -f Makefile.data prepare # Build all parquets (+ all deps)
|
||||
# make -f Makefile.data tiles # Download UK map tiles
|
||||
# make -f Makefile.data download-map-assets
|
||||
#
|
||||
# Or include from the main Makefile and use targets directly.
|
||||
|
||||
|
|
@ -55,9 +56,11 @@ MEDIAN_AGE := $(DATA_DIR)/median_age.parquet
|
|||
ELECTION := $(DATA_DIR)/election_results.parquet
|
||||
ENGLAND_BOUNDARY := $(DATA_DIR)/england_boundary.geojson
|
||||
RM_OUTCODES := frontend/src/lib/rightmove-outcodes.json
|
||||
MAP_ASSETS_DIR := frontend/public/assets
|
||||
|
||||
# Sentinel files for directory targets (Make doesn't track directories well)
|
||||
INSPIRE_STAMP := $(INSPIRE_DIR)/.done
|
||||
MAP_ASSETS_STAMP := $(MAP_ASSETS_DIR)/.done
|
||||
|
||||
PMTILES_VERSION := 1.22.3
|
||||
|
||||
|
|
@ -68,6 +71,7 @@ PMTILES_VERSION := 1.22.3
|
|||
download-naptan download-pois download-grocery-retail-points download-ofsted download-broadband download-rental-prices \
|
||||
download-postcodes download-noise download-inspire download-crime \
|
||||
download-oa-boundaries download-uprn-lookup download-transit-network download-greenspace download-os-greenspace download-pbf download-places download-lsoa-population download-median-age download-england-boundary download-rightmove-outcodes \
|
||||
download-map-assets \
|
||||
transform-pois transform-epc-pp transform-crime transform-poi-proximity \
|
||||
transform-school-proximity transform-postcode-boundaries \
|
||||
generate-postcode-boundaries
|
||||
|
|
@ -101,6 +105,7 @@ download-median-age: $(MEDIAN_AGE)
|
|||
download-election-results: $(ELECTION)
|
||||
download-england-boundary: $(ENGLAND_BOUNDARY)
|
||||
download-rightmove-outcodes: $(RM_OUTCODES)
|
||||
download-map-assets: $(MAP_ASSETS_STAMP)
|
||||
transform-pois: $(POIS_FILTERED)
|
||||
transform-epc-pp: $(EPC_PP)
|
||||
transform-crime: $(CRIME)
|
||||
|
|
@ -214,6 +219,10 @@ $(ENGLAND_BOUNDARY):
|
|||
$(RM_OUTCODES): $(MERGE_STAMP)
|
||||
uv run python -m pipeline.download.rightmove_outcodes --postcodes $(POSTCODES_PQ) --output $@
|
||||
|
||||
$(MAP_ASSETS_STAMP):
|
||||
uv run python -m pipeline.download.map_assets --output $(MAP_ASSETS_DIR)
|
||||
@touch $@
|
||||
|
||||
# ── Transforms ────────────────────────────────────────────────────────────────
|
||||
|
||||
$(POIS_FILTERED): $(POIS_RAW) $(NAPTAN) $(GROCERY_RETAIL_POINTS) $(ENGLAND_BOUNDARY)
|
||||
|
|
|
|||
|
|
@ -204,6 +204,5 @@ under `/app/data` and serves `frontend/dist` when `--dist` is present.
|
|||
|
||||
|
||||
make -f Makefile.data tiles prepare generate-postcode-boundaries download-places
|
||||
uv run python -m pipeline.download.map_assets --output frontend/public/assets
|
||||
transform-postcode-boundaries: is dumb
|
||||
./r5-java/run.sh --paths
|
||||
make -f Makefile.data download-map-assets
|
||||
./r5-java/run.sh --paths
|
||||
|
|
|
|||
BIN
frontend/public/assets/fonts/Noto Sans Italic/0-255.pbf
Normal file
BIN
frontend/public/assets/fonts/Noto Sans Italic/0-255.pbf
Normal file
Binary file not shown.
BIN
frontend/public/assets/fonts/Noto Sans Italic/1024-1279.pbf
Normal file
BIN
frontend/public/assets/fonts/Noto Sans Italic/1024-1279.pbf
Normal file
Binary file not shown.
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic10240-10495
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic10496-10751
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic10752-11007
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic11008-11263
|
||||
BIN
frontend/public/assets/fonts/Noto Sans Italic/11264-11519.pbf
Normal file
BIN
frontend/public/assets/fonts/Noto Sans Italic/11264-11519.pbf
Normal file
Binary file not shown.
BIN
frontend/public/assets/fonts/Noto Sans Italic/11520-11775.pbf
Normal file
BIN
frontend/public/assets/fonts/Noto Sans Italic/11520-11775.pbf
Normal file
Binary file not shown.
BIN
frontend/public/assets/fonts/Noto Sans Italic/11776-12031.pbf
Normal file
BIN
frontend/public/assets/fonts/Noto Sans Italic/11776-12031.pbf
Normal file
Binary file not shown.
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic12032-12287
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic12288-12543
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic12544-12799
|
||||
BIN
frontend/public/assets/fonts/Noto Sans Italic/1280-1535.pbf
Normal file
BIN
frontend/public/assets/fonts/Noto Sans Italic/1280-1535.pbf
Normal file
Binary file not shown.
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic12800-13055
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic13056-13311
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic13312-13567
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic13568-13823
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic13824-14079
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic14080-14335
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic14336-14591
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic14592-14847
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic14848-15103
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic15104-15359
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic 1536-1791
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic15360-15615
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic15616-15871
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic15872-16127
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic16128-16383
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic16384-16639
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic16640-16895
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic16896-17151
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic17152-17407
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic17408-17663
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic17664-17919
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic 1792-2047
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic17920-18175
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic18176-18431
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic18432-18687
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic18688-18943
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic18944-19199
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic19200-19455
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic19456-19711
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic19712-19967
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic19968-20223
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic20224-20479
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic 2048-2303
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic20480-20735
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic20736-20991
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic20992-21247
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic21248-21503
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic21504-21759
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic21760-22015
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic22016-22271
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic22272-22527
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic22528-22783
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic22784-23039
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic 2304-2559
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic23040-23295
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic23296-23551
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic23552-23807
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic23808-24063
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic24064-24319
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic24320-24575
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic24576-24831
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic24832-25087
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic25088-25343
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic25344-25599
|
||||
BIN
frontend/public/assets/fonts/Noto Sans Italic/256-511.pbf
Normal file
BIN
frontend/public/assets/fonts/Noto Sans Italic/256-511.pbf
Normal file
Binary file not shown.
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic 2560-2815
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic25600-25855
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic25856-26111
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic26112-26367
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic26368-26623
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic26624-26879
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic26880-27135
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic27136-27391
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic27392-27647
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic27648-27903
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic27904-28159
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic 2816-3071
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic28160-28415
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic28416-28671
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic28672-28927
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic28928-29183
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic29184-29439
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic29440-29695
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic29696-29951
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic29952-30207
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic30208-30463
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic30464-30719
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic 3072-3327
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic30720-30975
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic30976-31231
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic31232-31487
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic31488-31743
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
|
||||
Sans Italic31744-31999
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue