Merge branch 'master' of https://github.com/openmaptiles/openmaptiles into merge-github

# Conflicts: # Makefile # QUICKSTART.md # docker-compose.yml # layers/boundary/mapping.yaml # layers/landuse/landuse.sql # layers/landuse/landuse.yaml # layers/landuse/mapping.yaml # layers/poi/mapping.yaml # layers/poi/poi.sql # layers/poi/poi.yaml
2023-04-09 20:39:41 +02:00
parent d5e05f07d4 b3d67ed5b3
commit 91ec87bb49
465 changed files with 23727 additions and 2256 deletions
--- a/363
+++ b/363
@@ -6,11 +6,8 @@
 SHELL         = /bin/bash
 .SHELLFLAGS   = -o pipefail -c

-# Make all .env variables available for make targets
-include .env
-
 # Layers definition and meta data
-TILESET_FILE ?= openmaptiles.yaml
+TILESET_FILE := $(or $(TILESET_FILE),$(shell (. .env; echo $${TILESET_FILE})),openmaptiles.yaml)

 # 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)
@@ -28,17 +25,30 @@ export PPORT
 # Local port to use with tileserver
 TPORT ?= 8081
 export TPORT
+STYLE_FILE := build/style/style.json
+STYLE_HEADER_FILE := style/style-header.json
+
+# Support newer `docker compose` syntax in addition to `docker-compose`
+
+ifeq (, $(shell which docker-compose))
+  DOCKER_COMPOSE_COMMAND := docker compose
+  $(info Using docker compose V2 (docker compose))
+else
+  DOCKER_COMPOSE_COMMAND := docker-compose
+  $(info Using docker compose V1 (docker-compose))
+endif

 # Allow a custom docker-compose project name
-ifeq ($(strip $(DC_PROJECT)),)
+DC_PROJECT := $(or $(DC_PROJECT),$(shell (. .env; echo $${DC_PROJECT})))
+ifeq ($(DC_PROJECT),)
  DC_PROJECT := $(notdir $(shell pwd))
-  DOCKER_COMPOSE := docker-compose
+  DOCKER_COMPOSE := $(DOCKER_COMPOSE_COMMAND)
 else
-  DOCKER_COMPOSE := docker-compose --project-name $(DC_PROJECT)
+  DOCKER_COMPOSE := $(DOCKER_COMPOSE_COMMAND) --project-name $(DC_PROJECT)
 endif

 # Make some operations quieter (e.g. inside the test script)
-ifeq ($(strip $(QUIET)),)
+ifeq ($(or $(QUIET),$(shell (. .env; echo $${QUIET})))),)
  QUIET_FLAG :=
 else
  QUIET_FLAG := --quiet
@@ -58,8 +68,7 @@ else
 endif

 # Set OpenMapTiles host
-OMT_HOST := http://$(firstword $(subst :, ,$(subst tcp://,,$(DOCKER_HOST))) localhost)
-export OMT_HOST
+export OMT_HOST := http://$(firstword $(subst :, ,$(subst tcp://,,$(DOCKER_HOST))) localhost)

 # This defines an easy $(newline) value to act as a "\n". Make sure to keep exactly two empty lines after newline.
 define newline
@@ -67,6 +76,12 @@ define newline

 endef

+# Use the old Postgres connection values as a fallback
+PGHOST := $(or $(PGHOST),$(shell (. .env; echo $${PGHOST})),$(POSTGRES_HOST),$(shell (. .env; echo $${POSTGRES_HOST})),postgres)
+PGPORT := $(or $(PGPORT),$(shell (. .env; echo $${PGPORT})),$(POSTGRES_PORT),$(shell (. .env; echo $${POSTGRES_PORT})),postgres)
+PGDATABASE := $(or $(PGDATABASE),$(shell (. .env; echo $${PGDATABASE})),$(POSTGRES_DB),$(shell (. .env; echo $${POSTGRES_DB})),postgres)
+PGUSER := $(or $(PGUSER),$(shell (. .env; echo $${PGUSER})),$(POSTGRES_USER),$(shell (. .env; echo $${POSTGRES_USER})),postgres)
+PGPASSWORD := $(or $(PGPASSWORD),$(shell (. .env; echo $${PGPASSWORD})),$(POSTGRES_PASSWORD),$(shell (. .env; echo $${POSTGRES_PASSWORD})),postgres)

 #
 # Determine area to work on
@@ -79,7 +94,7 @@ endef
 # historically we have been using $(area) rather than $(AREA), so make both work
 area ?= $(AREA)
 # Ensure the $(area) param is set, or try to automatically determine it based on available data files
-ifeq ($(strip $(area)),)
+ifeq ($(area),)
  # An $(area) parameter is not set. If only one *.osm.pbf file is found in ./data, use it as $(area).
  data_files := $(shell find data -name '*.osm.pbf' 2>/dev/null)
  ifneq ($(word 2,$(data_files)),)
@@ -124,7 +139,7 @@ ifeq ($(strip $(area)),)
  endif
 endif

-ifneq ($(strip $(AREA_INFO)),)
+ifneq ($(AREA_INFO),)
  define assert_area_is_given
      @echo "$(AREA_INFO)"
  endef
@@ -134,25 +149,17 @@ endif
 PBF_FILE ?= data/$(area).osm.pbf

 # For download-osm, allow URL parameter to download file from a given URL. Area param must still be provided.
-ifneq ($(strip $(url)),)
-  DOWNLOAD_AREA := $(url)
-else
-  DOWNLOAD_AREA := $(area)
-endif
+DOWNLOAD_AREA := $(or $(url), $(area))

-# import-borders uses these temp files during border parsing/import
-export BORDERS_CLEANUP_FILE ?= data/borders/$(area).cleanup.pbf
-export BORDERS_PBF_FILE ?= data/borders/$(area).filtered.pbf
-export BORDERS_CSV_FILE ?= data/borders/$(area).lines.csv
-
-# The file is placed into the $EXPORT_DIR=/export (mapped to ./data)
-export MBTILES_FILE ?= $(area).mbtiles
+# The mbtiles file is placed into the $EXPORT_DIR=/export (mapped to ./data)
+MBTILES_FILE := $(or $(MBTILES_FILE),$(shell (. .env; echo $${MBTILES_FILE})),$(area).mbtiles)
 MBTILES_LOCAL_FILE = data/$(MBTILES_FILE)

-ifeq ($(strip $(DIFF_MODE)),true)
+DIFF_MODE := $(or $(DIFF_MODE),$(shell (. .env; echo $${DIFF_MODE})))
+ifeq ($(DIFF_MODE),true)
  # import-osm implementation requires IMPOSM_CONFIG_FILE to be set to a valid file
-  # For static (no-updates) import, we don't need to override the default value
-  # For the update mode, set location of the dynamically-generated area-based config file
+  # For one-time only imports, the default value is fine.
+  # For diff mode updates, use the dynamically-generated area-based config file
  export IMPOSM_CONFIG_FILE = data/$(area).repl.json
 endif

@@ -164,90 +171,119 @@ ifneq (,$(wildcard $(AREA_BBOX_FILE)))
  export BBOX
 endif

-ifeq ($(strip $(area)),)
-  define assert_area_is_given
-	@echo ""
-	@echo "ERROR: $(AREA_ERROR)"
-	@echo ""
-	@echo "  make $@ area=<area-id>"
-	@echo ""
-	@echo "To download an area, use   make download <area-id>"
-	@echo "To list downloadable areas, use   make list-geofabrik   and/or   make list-bbbike"
-	@exit 1
-  endef
-else
-  ifneq ($(strip $(AREA_INFO)),)
-    define assert_area_is_given
-	@echo "$(AREA_INFO)"
-    endef
-  endif
-endif
+# Consult .env if needed
+MIN_ZOOM := $(or $(MIN_ZOOM),$(shell (. .env; echo $${MIN_ZOOM})),0)
+MAX_ZOOM := $(or $(MAX_ZOOM),$(shell (. .env; echo $${MAX_ZOOM})),7)
+PPORT := $(or $(PPORT),$(shell (. .env; echo $${PPORT})),7)
+TPORT := $(or $(TPORT),$(shell (. .env; echo $${TPORT})),7)
+
+define HELP_MESSAGE
+==============================================================================
+OpenMapTiles  https://github.com/openmaptiles/openmaptiles
+
+Hints for testing areas
+  make list-geofabrik                  # list actual geofabrik OSM extracts for download -> <<your-area>>
+  ./quickstart.sh <<your-area>>        # example:  ./quickstart.sh madagascar
+
+Hints for designers:
+  make start-maputnik                  # start Maputnik Editor + dynamic tile server [ see $(OMT_HOST):8088 ]
+  make stop-maputnik                   # stop Maputnik Editor + dynamic tile server
+  make start-postserve                 # start dynamic tile server                   [ see $(OMT_HOST):$(PPORT) ]
+  make stop-postserve                  # stop dynamic tile server
+  make start-tileserver                # start maptiler/tileserver-gl                [ see $(OMT_HOST):$(TPORT) ]
+  make stop-tileserver                 # stop maptiler/tileserver-gl
+
+Hints for developers:
+  make                                 # build source code
+  make bash                            # start openmaptiles-tools /bin/bash terminal
+  make generate-bbox-file              # compute bounding box of a data file and store it in a file
+  make generate-devdoc                 # generate devdoc including graphs for all layers [./layers/...]
+  make generate-qa                     # statistics for a given layer's field
+  make generate-tiles-pg               # generate vector tiles based on .env settings using PostGIS ST_MVT()
+  make generate-tiles                  # generate vector tiles based on .env settings using Mapnik (obsolete)
+  make generate-changed-tiles          # Generate tiles changed by import-diff
+  make test-sql                        # run unit tests on the OpenMapTiles SQL schema
+  cat  .env                            # list PG database and MIN_ZOOM and MAX_ZOOM information
+  cat  quickstart.log                  # transcript of the last ./quickstart.sh run
+  make help                            # help about available commands
+
+Hints for downloading & importing data:
+  make list-geofabrik                  # list actual geofabrik OSM extracts for download
+  make list-bbbike                     # list actual BBBike OSM extracts for download
+  make download area=albania           # download OSM data from any source       and create config file
+  make download-geofabrik area=albania # download OSM data from geofabrik.de     and create config file
+  make download-osmfr area=asia/qatar  # download OSM data from openstreetmap.fr and create config file
+  make download-bbbike area=Amsterdam  # download OSM data from bbbike.org       and create config file
+  make import-data                     # Import data from OpenStreetMapData, Natural Earth and OSM Lake Labels.
+  make import-osm                      # Import OSM data with the mapping rules from build/mapping.yaml
+  make import-diff                     # Import OSM updates from data/changes.osc.gz
+  make import-wikidata                 # Import labels from Wikidata
+  make import-sql                      # Import layers (run this after modifying layer SQL)
+
+Hints for database management:
+  make psql                            # start PostgreSQL console
+  make psql-list-tables                # list all PostgreSQL tables
+  make list-views                      # list PostgreSQL public schema views
+  make list-tables                     # list PostgreSQL public schema tables
+  make vacuum-db                       # PostgreSQL: VACUUM ANALYZE
+  make analyze-db                      # PostgreSQL: ANALYZE
+  make destroy-db                      # remove docker containers and PostgreSQL data volume
+  make start-db                        # start PostgreSQL, creating it if it doesn't exist
+  make start-db-preloaded              # start PostgreSQL, creating data-prepopulated one if it doesn't exist
+  make stop-db                         # stop PostgreSQL database without destroying the data
+
+Hints for Docker management:
+  make clean-unnecessary-docker        # clean unnecessary docker image(s) and container(s)
+  make refresh-docker-images           # refresh openmaptiles docker images from Docker HUB
+  make remove-docker-images            # remove openmaptiles docker images
+  make list-docker-images              # show a list of available docker images
+==============================================================================
+endef
+export HELP_MESSAGE

 #
 #  TARGETS
 #

 .PHONY: all
-all: init-dirs build/openmaptiles.tm2source/data.yml build/mapping.yaml build-sql
+all: init-dirs build/openmaptiles.tm2source/data.yml build/mapping.yaml build-sql build-style

 .PHONY: help
 help:
-	@echo "=============================================================================="
-	@echo " OpenMapTiles  https://github.com/openmaptiles/openmaptiles "
-	@echo "Hints for testing areas                "
-	@echo "  make list-geofabrik                  # list actual geofabrik OSM extracts for download -> <<your-area>> "
-	@echo "  ./quickstart.sh <<your-area>>        # example:  ./quickstart.sh madagascar "
-	@echo " "
-	@echo "Hints for designers:"
-	@echo "  make start-maputnik                  # start Maputnik Editor + dynamic tile server [ see $(OMT_HOST):8088 ]"
-	@echo "  make start-postserve                 # start dynamic tile server                   [ see $(OMT_HOST):$(PPORT) ]"
-	@echo "  make start-tileserver                # start maptiler/tileserver-gl                [ see $(OMT_HOST):$(TPORT) ]"
-	@echo " "
-	@echo "Hints for developers:"
-	@echo "  make                                 # build source code"
-	@echo "  make list-geofabrik                  # list actual geofabrik OSM extracts for download"
-	@echo "  make list-bbbike                     # list actual BBBike OSM extracts for download"
-	@echo "  make download area=albania           # download OSM data from any source       and create config file"
-	@echo "  make download-geofabrik area=albania # download OSM data from geofabrik.de     and create config file"
-	@echo "  make download-osmfr area=asia/qatar  # download OSM data from openstreetmap.fr and create config file"
-	@echo "  make download-bbbike area=Amsterdam  # download OSM data from bbbike.org       and create config file"
-	@echo "  make generate-bbox-file              # compute bounding box of a data file and store it in a file"
-	@echo "  make psql                            # start PostgreSQL console"
-	@echo "  make psql-list-tables                # list all PostgreSQL tables"
-	@echo "  make vacuum-db                       # PostgreSQL: VACUUM ANALYZE"
-	@echo "  make analyze-db                      # PostgreSQL: ANALYZE"
-	@echo "  make generate-qa                     # statistics for a given layer's field"
-	@echo "  make generate-devdoc                 # generate devdoc including graphs for all layers [./layers/...]"
-	@echo "  make bash                            # start openmaptiles-tools /bin/bash terminal"
-	@echo "  make destroy-db                      # remove docker containers and PostgreSQL data volume"
-	@echo "  make start-db                        # start PostgreSQL, creating it if it doesn't exist"
-	@echo "  make start-db-preloaded              # start PostgreSQL, creating data-prepopulated one if it doesn't exist"
-	@echo "  make stop-db                         # stop PostgreSQL database without destroying the data"
-	@echo "  make clean-unnecessary-docker        # clean unnecessary docker image(s) and container(s)"
-	@echo "  make refresh-docker-images           # refresh openmaptiles docker images from Docker HUB"
-	@echo "  make remove-docker-images            # remove openmaptiles docker images"
-	@echo "  make list-views                      # list PostgreSQL public schema views"
-	@echo "  make list-tables                     # list PostgreSQL public schema tables"
-	@echo "  cat  .env                            # list PG database and MIN_ZOOM and MAX_ZOOM information"
-	@echo "  cat  quickstart.log                  # transcript of the last ./quickstart.sh run"
-	@echo "  make help                            # help about available commands"
-	@echo "=============================================================================="
+	@echo "$$HELP_MESSAGE" | less
+
+define win_fs_error
+	( \
+	echo "" ;\
+	echo "ERROR: Windows native filesystem" ;\
+	echo "" ;\
+	echo "Please avoid running OpenMapTiles in a Windows filesystem." ;\
+	echo "See https://github.com/openmaptiles/openmaptiles/issues/1095#issuecomment-817095465" ;\
+	echo "" ;\
+	exit 1 ;\
+	)
+endef

 .PHONY: init-dirs
 init-dirs:
 	@mkdir -p build/sql/parallel
 	@mkdir -p build/openmaptiles.tm2source
-	@mkdir -p data/borders
+	@mkdir -p build/style
+	@mkdir -p data
 	@mkdir -p cache
+	@ ! ($(DOCKER_COMPOSE) 2>/dev/null run $(DC_OPTS) openmaptiles-tools df --output=fstype /tileset| grep -q 9p) < /dev/null || ($(win_fs_error))

 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="$(DC_USER)" --password="$(DC_PASSWORD)" > $@
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
+		'generate-tm2source $(TILESET_FILE) > $@'
+	#OLD: $(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
 ifeq (,$(wildcard build/mapping.yaml))
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-imposm3 $(TILESET_FILE) > $@
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
+		'generate-imposm3 $(TILESET_FILE) > $@'
 endif

 .PHONY: build-sql
@@ -261,18 +297,42 @@ ifeq (,$(wildcard build/sql/run_last.sql))
 							 --function --fname=getmvt >> ./build/sql/run_last.sql'
 endif

+.PHONY: build-sprite
+build-sprite: init-dirs
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c 'spritezero build/style/sprite /style/icons && \
+		spritezero --retina build/style/sprite@2x /style/icons'
+
+.PHONY: build-style
+build-style: init-dirs
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c 'style-tools recompose $(TILESET_FILE) $(STYLE_FILE) \
+		$(STYLE_HEADER_FILE) && \
+		spritezero build/style/sprite /style/icons && spritezero --retina build/style/sprite@2x /style/icons'
+
+.PHONY: download-fonts
+download-fonts:
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c '[ ! -d "/export/fonts" ] && mkdir /export/fonts && \
+		echo "Downloading fonts..." && wget -qO /export/noto-sans.zip --show-progress \
+		https://github.com/openmaptiles/fonts/releases/download/v2.0/noto-sans.zip && \
+		echo "Unzipping fonts..." && unzip -q /export/noto-sans.zip -d /export/fonts && rm /export/noto-sans.zip || \
+		echo "Fonts already exist."'
+
 .PHONY: clean
-clean:
+clean: clean-test-data
 	rm -rf build

+clean-test-data:
+	rm -rf data/changes.state.txt
+	rm -rf data/last.state.txt
+	rm -rf data/changes.repl.json
+
 .PHONY: destroy-db
-# TODO:  Use https://stackoverflow.com/a/27852388/177275
-destroy-db: DC_PROJECT := $(shell echo $(DC_PROJECT) | tr A-Z a-z)
+DOCKER_PROJECT = $(shell echo $(DC_PROJECT) | tr A-Z a-z | tr -cd '[:alnum:]')
 destroy-db:
 	$(DOCKER_COMPOSE) down -v --remove-orphans
 	$(DOCKER_COMPOSE) rm -fv
-	docker volume ls -q -f "name=^$(DC_PROJECT)_" | $(XARGS) docker volume rm
+	docker volume ls -q -f "name=^$(DOCKER_PROJECT)_" | $(XARGS) docker volume rm
 	rm -rf cache
+	mkdir cache

 .PHONY: start-db-nowait
 start-db-nowait: init-dirs
@@ -313,11 +373,11 @@ OSM_SERVER=$(patsubst download,,$(patsubst download-%,%,$@))
 .PHONY: $(ALL_DOWNLOADS)
 $(ALL_DOWNLOADS): init-dirs
 	@$(assert_area_is_given)
-ifneq ($(strip $(url)),)
+ifneq ($(url),)
 	$(if $(OSM_SERVER),$(error url parameter can only be used with non-specific download target:$(newline)       make download area=$(area) url="$(url)"$(newline)))
 endif
 ifeq (,$(wildcard $(PBF_FILE)))
- ifeq ($(strip $(DIFF_MODE)),true)
+ ifeq ($(DIFF_MODE),true)
 	@echo "Downloading $(DOWNLOAD_AREA) with replication support into $(PBF_FILE) and $(IMPOSM_CONFIG_FILE) from $(if $(OSM_SERVER),$(OSM_SERVER),any source)"
 	@$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools download-osm $(OSM_SERVER) "$(DOWNLOAD_AREA)" \
 				--imposm-cfg "$(IMPOSM_CONFIG_FILE)" \
@@ -331,7 +391,7 @@ ifeq (,$(wildcard $(PBF_FILE)))
 endif
 	@echo ""
 else
- ifeq ($(strip $(DIFF_MODE)),true)
+ ifeq ($(DIFF_MODE),true)
  ifeq (,$(wildcard $(IMPOSM_CONFIG_FILE)))
 	$(error \
 		$(newline)   Data files $(PBF_FILE) already exists, but $(IMPOSM_CONFIG_FILE) does not. \
@@ -364,7 +424,7 @@ psql: start-db-nowait
 # Special cache handling for Docker Toolbox on Windows
 ifeq ($(MSYSTEM),MINGW64)
  DC_CONFIG_CACHE := -f docker-compose.yml -f docker-compose-$(MSYSTEM).yml
-  DC_OPTS_CACHE := $(strip $(filter-out --user=%,$(DC_OPTS)))
+  DC_OPTS_CACHE := $(filter-out --user=%,$(DC_OPTS))
 else
  DC_OPTS_CACHE := $(DC_OPTS)
 endif
@@ -374,13 +434,17 @@ import-osm: all start-db-nowait
 	@$(assert_area_is_given)
 	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-osm $(PBF_FILE)'

-.PHONY: update-osm
-update-osm: all start-db-nowait
+.PHONY: start-update-osm
+start-update-osm: start-db
 	@$(assert_area_is_given)
-	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-update'
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) up -d update-osm
+
+.PHONY: stop-update-osm
+stop-update-osm:
+	$(DOCKER_COMPOSE) stop update-osm

 .PHONY: import-diff
-import-diff: all start-db-nowait
+import-diff: start-db-nowait
 	@$(assert_area_is_given)
 	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-diff'

@@ -388,17 +452,11 @@ import-diff: all start-db-nowait
 import-data: start-db
 	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) import-data

-.PHONY: import-borders
-import-borders: start-db-nowait
-	@$(assert_area_is_given)
-	# If CSV borders file already exists, use it without re-parsing
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c \
-		'pgwait && import-borders $$([ -f "$(BORDERS_CSV_FILE)" ] && echo load $(BORDERS_CSV_FILE) || echo import $(PBF_FILE))'
-
 .PHONY: import-sql
 import-sql: all start-db-nowait
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && import-sql' | \
-	  awk -v s=": WARNING:" '1{print; fflush()} $$0~s{print "\n*** WARNING detected, aborting"; exit(1)}'
+    	awk -v s=": WARNING:" '1{print; fflush()} $$0~s{print "\n*** WARNING detected, aborting"; exit(1)}' | \
+    	awk '1{print; fflush()} $$0~".*ERROR" {txt=$$0} END{ if(txt){print "\n*** ERROR detected, aborting:"; print txt; exit(1)} }'

 .PHONY: merge-pbf
 merge-pbf:
@@ -408,7 +466,7 @@ merge-pbf:

 .PHONY: generate-tiles
 generate-tiles: all start-db
-	@$(assert_area_is_given)
+	@echo "WARNING: This Mapnik-based method of tile generation is obsolete. Use generate-tiles-pg instead."
 	@echo "Generating tiles into $(MBTILES_LOCAL_FILE) (will delete if already exists)..."
 	@rm -rf "$(MBTILES_LOCAL_FILE)"
 	$(DOCKER_COMPOSE) run $(DC_OPTS) generate-vectortiles
@@ -418,16 +476,31 @@ generate-tiles: all start-db

 .PHONY: generate-tiles-pg
 generate-tiles-pg: all start-db
-	@$(assert_area_is_given)
-	@echo "Generating tiles into $(MBTILES_LOCAL_FILE) (will delete if already exists)..."
+	@echo "Generating tiles into $(MBTILES_LOCAL_FILE) (will delete if already exists) using PostGIS ST_MVT()..."
 	@rm -rf "$(MBTILES_LOCAL_FILE)"
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tiles
+# For some reason Ctrl+C doesn't work here without the -T. Must be pressed twice to stop.
+	$(DOCKER_COMPOSE) run -T $(DC_OPTS) openmaptiles-tools generate-tiles
 	@echo "Updating generated tile metadata ..."
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
 			mbtiles-tools meta-generate "$(MBTILES_LOCAL_FILE)" $(TILESET_FILE) --auto-minmax --show-ranges

+.PHONY: data/tiles.txt
+data/tiles.txt:
+	find ./data -name "*.tiles" -exec cat {} \; -exec rm {} \; | \
+	  $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
+	    tile_multiplier $(MIN_ZOOM) $(MAX_ZOOM) >> data/tiles.txt
+
+.PHONY: generate-changed-tiles
+generate-changed-tiles: data/tiles.txt
+	# Re-generating updated tiles, if needed
+	if [ -s data/tiles.txt ] ; then \
+	  $(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools refresh-views; \
+	  $(DOCKER_COMPOSE) run $(DC_OPTS) -e LIST_FILE=data/tiles.txt openmaptiles-tools generate-tiles; \
+	  rm data/tiles.txt; \
+	fi
+
 .PHONY: start-tileserver
-start-tileserver: init-dirs
+start-tileserver: init-dirs build-style download-fonts
 	@echo " "
 	@echo "***********************************************************"
 	@echo "* "
@@ -445,7 +518,11 @@ start-tileserver: init-dirs
 	@echo "* "
 	@echo "***********************************************************"
 	@echo " "
-	docker run $(DC_OPTS) -it --name tileserver-gl -v $$(pwd)/data:/data -p $(TPORT):$(TPORT) maptiler/tileserver-gl --port $(TPORT)
+	$(DOCKER_COMPOSE) up -d tileserver-gl
+
+.PHONY: stop-tileserver
+stop-tileserver:
+	$(DOCKER_COMPOSE) stop tileserver-gl

 .PHONY: start-postserve
 start-postserve: start-db
@@ -477,11 +554,11 @@ start-maputnik: stop-maputnik start-postserve
 	@echo "* "
 	@echo "***********************************************************"
 	@echo " "
-	docker run $(DC_OPTS) --name maputnik_editor -d -p 8088:8888 maputnik/editor
+	$(DOCKER_COMPOSE) up -d maputnik_editor

 .PHONY: stop-maputnik
 stop-maputnik:
-	-docker rm -f maputnik_editor
+	-$(DOCKER_COMPOSE) stop maputnik_editor

 # STAT_FUNCTION=frequency|toplength|variance
 .PHONY: generate-qa
@@ -542,16 +619,16 @@ list-docker-images:

 .PHONY: refresh-docker-images
 refresh-docker-images: init-dirs
-ifneq ($(strip $(NO_REFRESH)),)
+ifneq ($(NO_REFRESH),)
 	@echo "Skipping docker image refresh"
 else
 	@echo ""
 	@echo "Refreshing docker images... Use NO_REFRESH=1 to skip."
-ifneq ($(strip $(USE_PRELOADED_IMAGE)),)
+ifneq ($(USE_PRELOADED_IMAGE),)
 	POSTGIS_IMAGE=openmaptiles/postgis-preloaded \
-		docker-compose pull --ignore-pull-failures $(QUIET_FLAG) openmaptiles-tools generate-vectortiles postgres
+		$(DOCKER_COMPOSE_COMMAND) pull --ignore-pull-failures $(QUIET_FLAG) openmaptiles-tools generate-vectortiles postgres
 else
-	docker-compose pull --ignore-pull-failures $(QUIET_FLAG) openmaptiles-tools generate-vectortiles postgres import-data
+	$(DOCKER_COMPOSE_COMMAND) pull --ignore-pull-failures $(QUIET_FLAG) openmaptiles-tools generate-vectortiles postgres import-data
 endif
 endif

@@ -576,7 +653,7 @@ test-perf-null: init-dirs

 .PHONY: build-test-pbf
 build-test-pbf: init-dirs
-	docker-compose run $(DC_OPTS) openmaptiles-tools /tileset/.github/workflows/build-test-data.sh
+	$(DOCKER_COMPOSE_COMMAND) run $(DC_OPTS) openmaptiles-tools /tileset/.github/workflows/build-test-data.sh

 .PHONY: debug
 debug:  ## Use this target when developing Makefile itself to verify loaded environment variables
@@ -586,3 +663,45 @@ debug:  ## Use this target when developing Makefile itself to verify loaded envi
 	@echo BBOX = $(BBOX) , $$BBOX
 	@echo MIN_ZOOM = $(MIN_ZOOM) , $$MIN_ZOOM
 	@echo MAX_ZOOM = $(MAX_ZOOM) , $$MAX_ZOOM
+
+build/import-tests.osm.pbf: init-dirs
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'osmconvert tests/import/*.osm -o=build/import-tests.osm.pbf'
+
+data/changes.state.txt:
+	cp -f tests/changes.state.txt data/
+
+data/last.state.txt:
+	cp -f tests/last.state.txt data/
+
+data/changes.repl.json:
+	cp -f tests/changes.repl.json data/
+
+data/changes.osc.gz: init-dirs
+	@echo " UPDATE unit test data..."
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'osmconvert tests/update/*.osc --merge-versions -o=data/changes.osc && gzip -f data/changes.osc'
+
+test-sql: clean refresh-docker-images destroy-db start-db-nowait build/import-tests.osm.pbf data/changes.state.txt data/last.state.txt data/changes.repl.json build/mapping.yaml data/changes.osc.gz build/openmaptiles.tm2source/data.yml build/mapping.yaml build-sql
+	$(eval area := changes)
+
+	@echo "Load IMPORT test data"
+	sed -ir "s/^[#]*\s*MAX_ZOOM=.*/MAX_ZOOM=14/" .env
+	sed -ir "s/^[#]*\s*DIFF_MODE=.*/DIFF_MODE=false/" .env
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-osm build/import-tests.osm.pbf'
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) import-data
+
+	@echo "Apply OpenMapTiles SQL schema to test data @ Zoom 14..."
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && import-sql' | \
+    	awk -v s=": WARNING:" '1{print; fflush()} $$0~s{print "\n*** WARNING detected, aborting"; exit(1)}' | \
+    	awk '1{print; fflush()} $$0~".*ERROR" {txt=$$0} END{ if(txt){print "\n*** ERROR detected, aborting:"; print txt; exit(1)} }'
+
+	@echo "Test SQL output for Import Test Data"
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && psql.sh < tests/test-post-import.sql' 2>&1 | \
+		awk -v s="ERROR:" '1{print; fflush()} $$0~s{print "*** ERROR detected, aborting"; exit(1)}'
+
+	@echo "Run UPDATE process on test data..."
+	sed -ir "s/^[#]*\s*DIFF_MODE=.*/DIFF_MODE=true/" .env
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-diff'
+
+	@echo "Test SQL output for Update Test Data"
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && psql.sh < tests/test-post-update.sql' 2>&1 | \
+		awk -v s="ERROR:" '1{print; fflush()} $$0~s{print "*** ERROR detected, aborting"; exit(1)}'