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

.env

@@ -3,8 +3,8 @@
 # Layers definition and meta data
 TILESET_FILE=openmaptiles.yaml
 
-# Use 3-part patch version to ignore patch updates, e.g. 5.0.0
-TOOLS_VERSION=5.3
+# Use 3-part patch version to ignore patch updates, e.g. 7.0.0
+TOOLS_VERSION=7.0
 
 # Make sure these values are in sync with the ones in .env-postgres file
 PGDATABASE=openmaptiles
@@ -20,16 +20,17 @@ PGPORT=5432
 BBOX=4.827919,50.740472,5.798035,51.095291
 
 
-# Which zooms to generate in   make generate-tiles
+# Which zooms to generate with   make generate-tiles-pg
 MIN_ZOOM=0
 MAX_ZOOM=14
 
+# `MID_ZOOM` setting only works with `make generate-tiles-pg` command.  Make sure MID_ZOOM < MAX_ZOOM.
+# See https://github.com/openmaptiles/openmaptiles-tools/pull/383
+# MID_ZOOM=11
+
 # Use  true  (case sensitive) to allow data updates
 DIFF_MODE=false
 
-# Hide some output from Mapnik tile generation for clarity
-FILTER_MAPNIK_OUTPUT=1
-
 # Some area data like openstreetmap.fr can contain invalid references
 # that must be cleaned up before using it for borders -- set it to true.
 BORDERS_CLEANUP=false
@@ -69,7 +70,5 @@ COPY_CONCURRENCY=1024
 UV_THREADPOOL_SIZE=16
 #UV_THREADPOOL_SIZE=24
 
-# Variables for generate tiles using PGquery
+# Variables for generate tiles using tilelive-pgquery
 PGHOSTS_LIST=
-NO_GZIP=1
-USE_KEY_COLUMN=1