kopia lustrzana https://github.com/openmaptiles/openmaptiles
Update Makefile (#812)
- Add `download-osmfr` and `download-bbbike` targets - Port `DC_OPTS` to Windows - Use make conditions instead of shell. Also simplifies `make -n` output - Use remote Docker machine's IP, if defined, rather than `localhost` in `http://...` messages. Also applicable for Docker Toolbox for Windows. - Align texts in `make help` output - Update and bug-fix in `make remove-docker-images`pull/815/head
zstadler
GitHub
rodzic
0683185717
commit
be3c96f835
93
Makefile
93
Makefile
|
|
@ -1,12 +1,14 @@
|
|||
# Options to run with docker and docker-compose - ensure the container is destroyed on exit
|
||||
# Containers run as the current user rather than root (so that created files are not root-owned)
|
||||
DC_OPTS?=--rm -u $$(id -u $${USER}):$$(id -g $${USER})
|
||||
DC_OPTS?=--rm -u $(shell id -u):$(shell id -g)
|
||||
|
||||
# Allow a custom docker-compose project name
|
||||
ifeq ($(strip $(DC_PROJECT)),)
|
||||
override DC_PROJECT:=$(notdir $(shell pwd))
|
||||
DOCKER_COMPOSE:= docker-compose
|
||||
else
|
||||
DOCKER_COMPOSE:= docker-compose --project-name $(DC_PROJECT)
|
||||
endif
|
||||
DOCKER_COMPOSE:= docker-compose --project-name $(DC_PROJECT)
|
||||
|
||||
# Use `xargs --no-run-if-empty` flag, if supported
|
||||
XARGS:=xargs $(shell xargs --no-run-if-empty </dev/null 2>/dev/null && echo --no-run-if-empty)
|
||||
|
|
@ -24,6 +26,9 @@ endif
|
|||
.PHONY: all
|
||||
all: build/openmaptiles.tm2source/data.yml build/mapping.yaml build/tileset.sql
|
||||
|
||||
# Set OpenMapTiles host
|
||||
OMT_HOST:=http://$(firstword $(subst :, ,$(subst tcp://,,$(DOCKER_HOST))) localhost)
|
||||
|
||||
.PHONY: help
|
||||
help:
|
||||
@echo "=============================================================================="
|
||||
|
|
@ -33,19 +38,21 @@ help:
|
|||
@echo " ./quickstart.sh <<your-area>> # example: ./quickstart.sh madagascar "
|
||||
@echo " "
|
||||
@echo "Hints for designers:"
|
||||
@echo " make start-postserve # start Postserver + Maputnik Editor [ see localhost:8088 ] "
|
||||
@echo " make start-tileserver # start klokantech/tileserver-gl [ see localhost:8080 ] "
|
||||
@echo " make start-postserve # start Postserver + Maputnik Editor [ see $(OMT_HOST):8088 ] "
|
||||
@echo " make start-tileserver # start klokantech/tileserver-gl [ see $(OMT_HOST):8080 ] "
|
||||
@echo " "
|
||||
@echo "Hints for developers:"
|
||||
@echo " make # build source code"
|
||||
@echo " make list-geofabrik # list actual geofabrik OSM extracts for download"
|
||||
@echo " make download-geofabrik area=albania # download OSM data from geofabrik, and create config file"
|
||||
@echo " make download-geofabrik area=albania # download OSM data from geofabrik, and create config file"
|
||||
@echo " make download-osmfr area=asia/qatar # download OSM data from openstreetmap.fr, and create config file"
|
||||
@echo " make download-bbike area=Amsterdam # download OSM data from bbike.org, and create config file"
|
||||
@echo " make psql # start PostgreSQL console"
|
||||
@echo " make psql-list-tables # list all PostgreSQL tables"
|
||||
@echo " make psql-vacuum-analyze # PostgreSQL: VACUUM ANALYZE"
|
||||
@echo " make psql-analyze # PostgreSQL: ANALYZE"
|
||||
@echo " make generate-qareports # generate reports [./build/qareports]"
|
||||
@echo " make generate-devdoc # generate devdoc including graphs for all layers [./layers/...]"
|
||||
@echo " make generate-qareports # generate reports [./build/qareports]"
|
||||
@echo " make generate-devdoc # generate devdoc including graphs for all layers [./layers/...]"
|
||||
@echo " make import-sql-dev # start import-sql /bin/bash terminal"
|
||||
@echo " make import-osm-dev # start import-osm /bin/bash terminal (imposm3)"
|
||||
@echo " make clean-docker # remove docker containers, PG data volume"
|
||||
|
|
@ -56,7 +63,7 @@ help:
|
|||
@echo " make pgclimb-list-views # list PostgreSQL public schema views"
|
||||
@echo " make pgclimb-list-tables # list PostgreSQL public schema tables"
|
||||
@echo " cat .env # list PG database and MIN_ZOOM and MAX_ZOOM information"
|
||||
@echo " cat quickstart.log # backup of the last ./quickstart.sh"
|
||||
@echo " cat quickstart.log # transcript of the last ./quickstart.sh run"
|
||||
@echo " make help # help about available commands"
|
||||
@echo "=============================================================================="
|
||||
|
||||
|
|
@ -95,28 +102,30 @@ db-start:
|
|||
db-stop:
|
||||
$(DOCKER_COMPOSE) stop postgres
|
||||
|
||||
.PHONY: download-geofabrik
|
||||
download-geofabrik: init-dirs
|
||||
@if ! test "$(area)"; then \
|
||||
echo "" ;\
|
||||
echo "ERROR: Unable to download an area if area is not given." ;\
|
||||
echo "Usage:" ;\
|
||||
echo " make download-geofabrik area=<area-id>" ;\
|
||||
echo "" ;\
|
||||
echo "Use make list-geofabrik to get a list of all available areas" ;\
|
||||
echo "" ;\
|
||||
exit 1 ;\
|
||||
else \
|
||||
echo "=============== download-geofabrik =======================" ;\
|
||||
echo "Download area: $(area)" ;\
|
||||
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
|
||||
'download-osm geofabrik $(area) \
|
||||
--minzoom $$QUICKSTART_MIN_ZOOM \
|
||||
--maxzoom $$QUICKSTART_MAX_ZOOM \
|
||||
--make-dc /import/docker-compose-config.yml -- -d /import' ;\
|
||||
ls -la ./data/$(area)* ;\
|
||||
echo " " ;\
|
||||
fi
|
||||
OSM_SERVERS:=geofabrik osmfr bbbike
|
||||
ALL_DOWNLOADS:=$(addprefix download-,$(OSM_SERVERS))
|
||||
OSM_SERVER=$(patsubst download-%,%,$@)
|
||||
.PHONY: $(ALL_DOWNLOADS)
|
||||
$(ALL_DOWNLOADS): init-dirs
|
||||
ifeq ($(strip $(area)),)
|
||||
@echo ""
|
||||
@echo "ERROR: Unable to download an area if area is not given."
|
||||
@echo "Usage:"
|
||||
@echo " make download-$(OSM_SERVER) area=<area-id>"
|
||||
@echo ""
|
||||
$(if $(filter %-geofabrik,$@),@echo "Use make list-geofabrik to get a list of all available areas";echo "")
|
||||
@exit 1
|
||||
else
|
||||
@echo "=============== download-$(OSM_SERVER) ======================="
|
||||
@echo "Download area: $(area)"
|
||||
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
|
||||
'download-osm $(OSM_SERVER) $(area) \
|
||||
--minzoom $$QUICKSTART_MIN_ZOOM \
|
||||
--maxzoom $$QUICKSTART_MAX_ZOOM \
|
||||
--make-dc /import/docker-compose-config.yml -- -d /import'
|
||||
ls -la ./data/$(notdir $(area))*
|
||||
@echo ""
|
||||
endif
|
||||
|
||||
.PHONY: psql
|
||||
psql: db-start
|
||||
|
|
@ -150,14 +159,12 @@ import-lakelines: db-start
|
|||
$(DOCKER_COMPOSE) run $(DC_OPTS) import-lakelines
|
||||
|
||||
.PHONY: generate-tiles
|
||||
ifneq ($(wildcard data/docker-compose-config.yml),)
|
||||
DC_CONFIG_TILES:=-f docker-compose.yml -f ./data/docker-compose-config.yml
|
||||
endif
|
||||
generate-tiles: init-dirs db-start all
|
||||
rm -rf data/tiles.mbtiles
|
||||
if [ -f ./data/docker-compose-config.yml ]; then \
|
||||
$(DOCKER_COMPOSE) -f docker-compose.yml -f ./data/docker-compose-config.yml \
|
||||
run $(DC_OPTS) generate-vectortiles; \
|
||||
else \
|
||||
$(DOCKER_COMPOSE) run $(DC_OPTS) generate-vectortiles; \
|
||||
fi
|
||||
$(DOCKER_COMPOSE) $(DC_CONFIG_TILES) run $(DC_OPTS) generate-vectortiles
|
||||
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-metadata ./data/tiles.mbtiles
|
||||
|
||||
.PHONY: start-tileserver
|
||||
|
|
@ -175,7 +182,7 @@ start-tileserver: init-dirs
|
|||
@echo "***********************************************************"
|
||||
@echo "* "
|
||||
@echo "* Start klokantech/tileserver-gl "
|
||||
@echo "* ----------------------------> check localhost:8080 "
|
||||
@echo "* ----------------------------> check $(OMT_HOST):8080 "
|
||||
@echo "* "
|
||||
@echo "***********************************************************"
|
||||
@echo " "
|
||||
|
|
@ -186,7 +193,7 @@ start-postserve: db-start
|
|||
@echo " "
|
||||
@echo "***********************************************************"
|
||||
@echo "* "
|
||||
@echo "* Bring up postserve at localhost:8090"
|
||||
@echo "* Bring up postserve at $(OMT_HOST):8090"
|
||||
@echo "* "
|
||||
@echo "***********************************************************"
|
||||
@echo " "
|
||||
|
|
@ -196,8 +203,8 @@ start-postserve: db-start
|
|||
@echo "***********************************************************"
|
||||
@echo "* "
|
||||
@echo "* Start maputnik/editor "
|
||||
@echo "* ---> go to http://localhost:8088"
|
||||
@echo "* ---> set 'data source' to http://localhost:8090"
|
||||
@echo "* ---> go to http://$(OMT_HOST):8088 "
|
||||
@echo "* ---> set 'data source' to http://$(OMT_HOST):8090"
|
||||
@echo "* "
|
||||
@echo "***********************************************************"
|
||||
@echo " "
|
||||
|
|
@ -276,9 +283,9 @@ refresh-docker-images:
|
|||
remove-docker-images:
|
||||
@echo "Deleting all openmaptiles related docker image(s)..."
|
||||
@$(DOCKER_COMPOSE) down
|
||||
@docker images "openmaptiles/*" | $(XARGS) docker rmi -f
|
||||
@docker images "osm2vectortiles/mapbox-studio" | $(XARGS) docker rmi -f
|
||||
@docker images "klokantech/tileserver-gl" | $(XARGS) docker rmi -f
|
||||
@docker images "openmaptiles/*" -q | $(XARGS) docker rmi -f
|
||||
@docker images "maputnik/editor" -q | $(XARGS) docker rmi -f
|
||||
@docker images "klokantech/tileserver-gl" -q | $(XARGS) docker rmi -f
|
||||
|
||||
.PHONY: docker-unnecessary-clean
|
||||
docker-unnecessary-clean:
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue