Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bundle sprites and font glyphs in frontend #45

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ $(filter %,$(CITIES)): %: \
${DATA_DIR}/%.mbtiles \
${DATA_DIR}/%.graph.obj \
${DATA_DIR}/%.valhalla.tar \
${DATA_DIR}/fonts.tar \
${DATA_DIR}/sprite.tar \
tag_images
@echo "Built $@"

Expand Down Expand Up @@ -111,18 +109,6 @@ $(filter %,$(CITIES)): %: \
docker cp $$CID:/tiles/valhalla.tar $@ ;\
docker rm -v $$CID

# fontnik only runs on amd64 node images unfortunately.
${DATA_DIR}/fonts.tar ${DATA_DIR}/sprite.tar:
ITAG=headway_build_fonts ;\
docker build ./tileserver/assets --tag $${ITAG} ;\
CID=$$(docker create $${ITAG}) ;\
docker cp $$CID:/output/fonts.tar ${DATA_DIR}/fonts.tar ;\
docker cp $$CID:/output/sprite.tar ${DATA_DIR}/sprite.tar ;\
docker rm -v $$CID ;\
mkdir -p ${DATA_DIR}/fonts && cd ${DATA_DIR}/fonts && tar xvf ../fonts.tar ;\
mkdir -p ${DATA_DIR}/sprite && cd ${DATA_DIR}/sprite && tar xvf ../sprite.tar


tag_images: nginx_image photon_image nominatim_image otp_image valhalla_image tileserver_image
@echo "Tagged images"

Expand All @@ -145,8 +131,6 @@ valhalla_image:

# These copies may often be unnecessary, but they're cheap and better to do them too much than forget to do them.
tileserver_image:
mkdir -p ${DATA_DIR}/styles
cp tileserver/style/style.json.template ${DATA_DIR}/styles/bright.json.template
docker build ./tileserver/image --tag headway_tileserver

%.up: %
Expand Down
1 change: 0 additions & 1 deletion tileserver/assets/.dockerignore

This file was deleted.

1 change: 0 additions & 1 deletion tileserver/assets/.gitignore

This file was deleted.

39 changes: 0 additions & 39 deletions tileserver/assets/Dockerfile

This file was deleted.

Binary file removed tileserver/assets/NotoSans-Bold.ttf
Binary file not shown.
Binary file removed tileserver/assets/NotoSans-Italic.ttf
Binary file not shown.
Binary file removed tileserver/assets/NotoSans-Regular.ttf
Binary file not shown.
93 changes: 0 additions & 93 deletions tileserver/assets/OFL.txt

This file was deleted.

44 changes: 0 additions & 44 deletions tileserver/assets/build_glyphs.js

This file was deleted.

103 changes: 0 additions & 103 deletions tileserver/assets/build_sprites.js

This file was deleted.

Loading