cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into gh-master

Browse Source 
# Conflicts:
#	Makefile
#	layers/landuse/landuse.sql
#	layers/poi/poi.sql
This commit is contained in:
Miel Truyen
2021-04-24 22:47:18 +02:00
parent 76d5d753d8 1d39075f03
commit 2a39e1ebfe
20 changed files with 760 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -16,6 +16,9 @@ TILESET_FILE ?= openmaptiles.yaml
# Containers run as the current user rather than root (so that created files are not root-owned)
DC_OPTS ?= --rm --user=$(shell id -u):$(shell id -g)
DC_USER?=openmaptiles
DC_PASSWORD?=openmaptiles
# If set to a non-empty value, will use postgis-preloaded instead of postgis docker image
USE_PRELOADED_IMAGE ?=
@@ -23,7 +26,7 @@ USE_PRELOADED_IMAGE ?=
PPORT ?= 8090
export PPORT
# Local port to use with tileserver
TPORT ?= 8080
TPORT ?= 8081
export TPORT
# Allow a custom docker-compose project name
@@ -239,7 +242,7 @@ init-dirs:
build/openmaptiles.tm2source/data.yml: init-dirs
ifeq (,$(wildcard build/openmaptiles.tm2source/data.yml))
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tm2source $(TILESET_FILE) --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > $@
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tm2source $(TILESET_FILE) --host="postgres" --port=5432 --database="openmaptiles" --user="$(DC_USER)" --password="$(DC_PASSWORD)" > $@
endif
build/mapping.yaml: init-dirs