chore: bugfixes and notes after merging

# Conflicts:
#	layers/boundary/mapping.yaml
#	layers/mountain_peak/style.json
#	layers/place/style.json
#	layers/poi/poi.yaml

.env

@@ -1,7 +1,10 @@
 # This file defines default environment variables for all images
 
-# Use 3-part patch version to ignore patch updates, e.g. 5.0.0
-TOOLS_VERSION=5.1
+# Layers definition and meta data
+TILESET_FILE=openmaptiles.yaml
+
+# Use 3-part patch version to ignore patch updates, e.g. 7.0.0
+TOOLS_VERSION=7.1
 
 # Make sure these values are in sync with the ones in .env-postgres file
 PGDATABASE=openmaptiles
@@ -10,17 +13,55 @@ PGPASSWORD=openmaptiles
 PGHOST=postgres
 PGPORT=5432
 
-QUICKSTART_MIN_ZOOM=0
-QUICKSTART_MAX_ZOOM=7
+# BBOX may get overwritten by the computed bbox of the specific area:
+#   make generate-bbox-file
+# By default, the Makefile will use the content of data/$(area).bbox file if it exists.
+#BBOX=4.964926,50.882471,5.411252,51.071236
+#BBOX=4.964926,50.882471,5.411252,51.071236
+
+
+# Which zooms to generate with   make generate-tiles-pg
+MIN_ZOOM=0
+MAX_ZOOM=16
+
+# `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
 
-BBOX=-180.0,-85.0511,180.0,85.0511
-MIN_ZOOM=0
-MAX_ZOOM=14
+# The current setup assumes this file is placed inside the data/ dir
+MBTILES_FILE=tiles.mbtiles
 
-# Hide some output from Mapnik tile generation for clarity
-FILTER_MAPNIK_OUTPUT=1
+# This is the current repl_config.json location, pre-configured in the tools Dockerfile
+# Makefile and quickstart replace it with the dynamically generated one, but we keep it here in case some other method is used to run.
+IMPOSM_CONFIG_FILE=/usr/src/app/config/repl_config.json
 
-# 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
+# Number of parallel processes to use when importing sql files
+MAX_PARALLEL_PSQL=5
+#MAX_PARALLEL_PSQL=16
+
+# Number of concurrent IO ops to use when generating vector map tiles
+# Set to ridiculous high values for SSD/NVME
+# Test results: (These were without setting UV_THREADPOOL_SIZE)
+#   64: ~100/s peak
+#   256: ~200/s peak, stabilizes to a 50% improvement over 64 concurrency
+#   1024: ~400/s peak, still at 400/s speed after a few minutes (unlike before, oddly enough)
+#   4096: ~250/s peak, stabilizes to 200. But it appears to be choking on something, only updates progress periodically
+#   1024 & 24 Threads: ~700/s peak - drops to 214s after 10mins, 178/s after 15mins. EST after 20min: 23hours
+#                     Postgres is mainly idle during all of this (coarse dataset), using only half a core
+#                     To be tested if 1 core is dedicated to postgres and the others to tilelive(UV_THREADPOOL_SIZE)
+#                     will prove to be more efficient on average. Or just UV_THREADPOOL_SIZE==CPU_THREADS.
+#COPY_CONCURRENCY=10
+COPY_CONCURRENCY=64
+#COPY_CONCURRENCY=256
+#COPY_CONCURRENCY=512
+#COPY_CONCURRENCY=1024
+#COPY_CONCURRENCY=4096
+
+#UV_THREADPOOL_SIZE=16
+#UV_THREADPOOL_SIZE=24
+
+# Variables for generate tiles using tilelive-pgquery
+PGHOSTS_LIST=

.env-postgres

@@ -1,8 +0,0 @@
-# This file defines environment variables for the PostgreSQL image.
-# The main docker PostgreSQL image requires these vars rather than
-# the standard PG* ones that all PostgreSQL tools use.
-
-# Make sure these values are in sync with the ones in .env file
-POSTGRES_DB=openmaptiles
-POSTGRES_USER=openmaptiles
-POSTGRES_PASSWORD=openmaptiles

.github/workflows/integrity.yml

@@ -0,0 +1,71 @@
+# Workflow to run basic integrity checks on OMT`s new Pull Requests and commits pushed into OMT repo
+
+name: OpenMapTiles Integrity CI
+
+on:
+  push:
+    branches: [ master, master-tools ]
+  pull_request:
+
+jobs:
+
+  integrity_test:
+    name: Run integrity test
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout the changes
+        uses: actions/checkout@v4
+
+      - name: Run quickstart for a small area
+        env:
+          area: monaco
+          QUIET: 1
+        run: |
+          echo MIN_ZOOM=0 >> .env
+          echo MAX_ZOOM=14 >> .env
+          ./quickstart.sh $area
+
+      - name: Save quickstart.log
+        uses: actions/upload-artifact@v4
+        with:
+          name: quickstart.log
+          path: quickstart.log
+
+      - name: Test etldoc images
+        run: |
+          export TEST_MODE=yes
+          make generate-devdoc
+
+      - name: Run quickstart and update in DIFF mode
+        env:
+          area: europe/monaco
+          QUIET: 1
+        run: |
+          echo MIN_ZOOM=0 >> .env
+          echo MAX_ZOOM=14 >> .env
+          echo DIFF_MODE=true >> .env
+          # Cleanup
+          rm -fr data build cache
+          # Create data/$area.repl.json
+          make download-geofabrik area=$area
+          # Download 2+ month old data
+          export old_date=$(date --date="$(date +%Y-%m-15) -2 month" +'%y%m01')
+          echo Downloading $old_date extract of $area
+          docker compose run --rm --user=$(id -u):$(id -g) openmaptiles-tools sh -c "wget -O data/$area.osm.pbf http://download.geofabrik.de/$area-$old_date.osm.pbf"
+          # Initial import and tile generation
+          ./quickstart.sh $area
+          sleep 2
+          echo Downloading updates
+          # Loop to recover from potential "ERROR 429: Too Many Requests"
+          docker compose run --rm --user=$(id -u):$(id -g) openmaptiles-tools sh -c "
+            while ! osmupdate --keep-tempfiles --base-url=$(sed -n 's/ *\"replication_url\": //p' data/$area.repl.json) data/$area.osm.pbf data/changes.osc.gz ; do 
+              sleep 2;
+              echo Sleeping...;
+              sleep 630;
+            done"
+          echo Downloading updates completed
+          echo Importing updates
+          make import-diff
+          echo Generating new tiles
+          make generate-tiles-pg

.github/workflows/performance.yml

@@ -1,6 +1,6 @@
-# Workflow to validate OMT`s new Pull Requests and commits pushed into OMT repo
+# Workflow to run performance tests OMT`s new Pull Requests and commits pushed into OMT repo
 
-name: OpenMapTiles CI
+name: OpenMapTiles Performance CI
 
 on:
   push:
@@ -8,44 +8,9 @@ on:
   pull_request:
 
 jobs:
-
-  integrity_test:
-    name: Run integrity test
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout the changes
-        uses: actions/checkout@v2
-
-      - name: Run quickstart for a small area
-        env:
-          area: monaco
-          QUICKSTART_MIN_ZOOM: 0
-          QUICKSTART_MAX_ZOOM: 14
-        run: |
-          # For now, change the quickstart values directly in the .env file
-          # TODO: We should probably use env vars instead
-          sed -i 's/QUICKSTART_MAX_ZOOM=7/QUICKSTART_MAX_ZOOM=14/g' .env
-          export QUIET=1
-          ./quickstart.sh $area
-
-      - name: Save quickstart.log
-        uses: actions/upload-artifact@v1
-        with:
-          name: quickstart.log
-          path: quickstart.log
-
-      - name: Test etldoc images
-        run: |
-          export TEST_MODE=yes
-          make generate-devdoc
-
   performance:
     name: Evaluate performance
-    runs-on: ubuntu-latest
-    # Even though we technically don't need to wait for integrity test to finish,
-    # there is no point to run long perf test until we know the code is OK
-    needs: integrity_test
+    runs-on: self-hosted
     env:
       ## Smaller tests (runs everything in about 30 minutes)
       ## Two test areas:  equatorial-guinea  and  liechtenstein
@@ -69,9 +34,18 @@ jobs:
       # TEST_DATA_URL: "https://drive.google.com/uc?export=download&id=1kw7XPDPd1Rc-Zi2XxGLTXdinUSq-S4pT"
       # TEST_PERF_PARAMS: "--minzoom 0 --maxzoom 14 --test hungary --test isle-of-man"
     steps:
+      - name: Cleanup workdir
+        id: cleanup
+        run: |
+          set -euo pipefail
+          pwd
+          ls -al .
+          shopt -s dotglob
+          rm -rf *
+
       - name: Cache test data download
         id: cache-testdata
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ci_cache
           key: "v2-${{ env.TEST_DATA_URL }}"
@@ -84,7 +58,7 @@ jobs:
           curl --silent --show-error --location --output ci_cache/perf-test-areas-latest.osm.pbf "$TEST_DATA_URL"
 
       - name: Get code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # Fetch the last two commits in case this is a PR,
           # and we need to profile the base branch first
@@ -102,14 +76,14 @@ jobs:
             # Take the first parent of the grafted commit (cannot use HEAD^1 with shallow clones)
             REV_HASH=$(git cat-file -p $REV_HASH | awk 'NR > 1 {if(/^parent/){print $2; exit}}')
           fi
-          echo "::set-output name=hash::$REV_HASH"
+          echo "hash=$REV_HASH" >> $GITHUB_OUTPUT
 
       - name: Set up caching for the performance results
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: perf_cache
           # If profiling result cache has incompatible format, increase this "v" number
-          key: "v11-${{ steps.calc.outputs.hash }}-${{ env.TEST_DATA_URL }}"
+          key: "v13-${{ steps.calc.outputs.hash }}-${{ env.TEST_DATA_URL }}"
 
       - name: Load test data into DB and run performance test
         id: main
@@ -173,33 +147,29 @@ jobs:
           create_db() {
             make clean
             make init-dirs
-            cp ../ci_cache/perf-test-areas-latest.osm.pbf data/perf-test-areas-latest.osm.pbf
+            cp ../ci_cache/perf-test-areas-latest.osm.pbf data/perf-test-areas.osm.pbf
             make destroy-db
             make all
             make start-db
             profile 1_data     make import-data
             profile 2_osm      make import-osm
-            profile 3_borders  make import-borders
 
             if [ -f ../ci_cache/wikidata-cache.json ]; then
               cp ../ci_cache/wikidata-cache.json cache/wikidata-cache.json
             fi
-            profile 4_wikidata make import-wikidata
-            profile 5_sql      make import-sql
+            profile 3_wikidata make import-wikidata
+            profile 4_sql      make import-sql
 
             # Get database total size, in MB
             # Once Makefile has a few more improvements, we can use this approach instead:
             # echo $'\\set QUIET on \\a \\x off \\t \\\\ select pg_database_size(current_database())/1024/1024;' | make -s psql
-            if grep -qE '^  import-osm:$' docker-compose.yml; then
-              # old version using dedicated import-osm docker image
-              DB_SIZE_MB=$(docker-compose run --rm -u $(id -u):$(id -g) import-osm ./psql.sh -qtAc 'select pg_database_size(current_database())/1024/1024;')
-            else
-              DB_SIZE_MB=$(docker-compose run --rm -u $(id -u):$(id -g) openmaptiles-tools psql.sh -qtAc 'select pg_database_size(current_database())/1024/1024;')
-            fi
-            docker-compose run --rm -u $(id -u):$(id -g) openmaptiles-tools pg_dump --schema-only > "${PROFILE_DIR}/schema.sql"
+            DB_SIZE_MB=$(docker compose run --rm -u $(id -u):$(id -g) openmaptiles-tools psql.sh -qtAc 'select pg_database_size(current_database())/1024/1024;')
+            docker compose run --rm -u $(id -u):$(id -g) openmaptiles-tools pg_dump --schema-only > "${PROFILE_DIR}/schema.sql"
             echo "$DB_SIZE_MB" > "${PROFILE_DIR}/db_size.tsv"
           }
 
+          echo "Ensuring we have the needed dirs"
+          pwd
           mkdir -p perf_cache
           mkdir -p artifacts
           mkdir -p pr_message
@@ -213,15 +183,18 @@ jobs:
               git reset --hard ${CURRENT_SHA}^1
             fi
 
+            docker compose pull
             PROFILE_DIR=../perf_cache
             create_db
             if [ ! -f ../ci_cache/wikidata-cache.json ]; then
               cp cache/wikidata-cache.json ../ci_cache/wikidata-cache.json
             fi
 
-            (set -x; profile test-perf docker-compose run --rm -T openmaptiles-tools \
+            (set -x; profile test-perf docker compose run --rm -T openmaptiles-tools \
               test-perf openmaptiles.yaml $TEST_PERF_PARAMS \
               --record /tileset/results.json)
+            echo "Done generating base perf results, moving them to ../perf_cache"
+            pwd
             mv results.json ../perf_cache
 
             if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
@@ -232,7 +205,10 @@ jobs:
             echo "Found cached performance results"
           fi
 
+          docker compose pull
           pushd ../perf_cache
+          echo "Should be in perf_cache"
+          pwd
           if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
             cp results.json ../artifacts/base-results.json
             # Copy all tsv files, not just the ones with "profile-" prefix.
@@ -252,8 +228,10 @@ jobs:
             PROFILE_DIR=../artifacts
             create_db
 
+            echo "Copying existing perf_cache results to current dir"
+            pwd
             cp ../perf_cache/results.json .
-            OUTPUT="$(set -x; profile test-perf docker-compose run --rm -T openmaptiles-tools \
+            OUTPUT="$(set -x; profile test-perf docker compose run --rm -T openmaptiles-tools \
                         test-perf openmaptiles.yaml $TEST_PERF_PARAMS \
                         --compare /tileset/results.json --record /tileset/pr-results.json)"
             rm results.json
@@ -309,14 +287,14 @@ jobs:
           fi
 
       - name: Save performance artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: performance_results
           path: artifacts
 
       - name: Save PR message artifact
         if: github.event_name == 'pull_request'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: pr_message
           path: pr_message

.github/workflows/pr-updater.yml

@@ -1,21 +1,20 @@
 name: Update PR comments
 
 on:
-  # This number should correspond to the IGNORE_RUNS_OLDER_THAN value below.
-  # When setting up for the first time, use "on: push" instead of "on: schedule"
-  # and set IGNORE_RUNS_OLDER_THAN to a very high number until it runs once.
-  schedule:
-    - cron: '*/6 * * * *'
+  workflow_run:
+    workflows: ["OpenMapTiles Performance CI"]
+    types: [completed]
 
 jobs:
   update_PRs:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
       - name: main
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          WORKFLOW_NAME: "OpenMapTiles CI"
+          WORKFLOW_NAME: "OpenMapTiles Performance CI"
           # the name of the artifact whose content comment published by PR. Must have a single markdown file inside.
           MSG_ARTIFACT_NAME: "pr_message"
           # How far back to look for finished runs, in minutes.

.github/workflows/sql-tests.yml

@@ -0,0 +1,22 @@
+# Workflow to run unit tests on OMT`s new Pull Requests and commits pushed into OMT repo
+
+name: OpenMapTiles SQL Test CI
+
+on:
+  push:
+    branches: [ master, master-tools ]
+  pull_request:
+
+jobs:
+
+  unit_tests:
+    name: Run unit test
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout the changes
+        uses: actions/checkout@v4
+
+      - name: Run unit tests
+        run: |
+          make clean && make test-sql

.gitignore

@@ -10,6 +10,7 @@ quickstart.log
 
 # imput / output data
 data/*
+data.backup/*
 
 # generated source files
 build/*

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Introduction
 
-Thank you for considering contributing to OpenMapTiles. It's people like you that make OpenMapTiles such a great project. Talk to us at the OSM Slack **#openmaptiles** channel ([join](https://osmus-slack.herokuapp.com/)).
+Thank you for considering contributing to OpenMapTiles. It's people like you that make OpenMapTiles such a great project. Talk to us at the OSM Slack **#openmaptiles** channel ([join](https://slack.openstreetmap.us/)).
 
 Following these guidelines helps to communicate that you respect the time of the developers managing and developing this open source project. In return, they should reciprocate that respect in addressing your issue, assessing changes, and helping you finalize your pull requests.
 
@@ -41,3 +41,48 @@ When you modify import data rules in `mapping.yaml` or `*.sql`, please update:
 5. check if OMT styles are affected by the PR and if there is a need for style updates
 
 When you are making PR that adds new spatial features to OpenMapTiles schema, please make also PR for at least one of our GL styles to show it on the map. Visual check is crucial.
+
+# SQL unit testing
+
+It is recommended that you create a [unit test](TESTING.md) when modifying the behavior of the SQL layer.  This will ensure that your changes are working as expected when importing or updating OSM data into an OpenMapTiles database.
+
+# Verifying that updates still work
+
+When testing a PR, you should also verify that the update process completes without an error. Please modify, if necessary, and run the script below.
+
+**Note:**
+
+The verification requires the script to append temporary changes to the `.env` file. Please restore the original version from git using `git checkout .env` or remove these changes before submitting a PR.
+
+```
+(
+set -e
+
+cat >> .env << EOM
+
+# temporary changes for verifying that updates still work
+# Ensure DIFF_MODE is active
+DIFF_MODE=true
+# Ensure all zoom levels are tested
+MAX_ZOOM=14
+EOM
+
+# Set the test area to the appropriate geofabrik extract
+export area=north-america/us/indiana
+
+# Build 1-month-old tiles
+rm -fr data build cache
+make destroy-db
+make download-geofabrik area=$area
+docker-compose run --rm --user=$(id -u):$(id -g) openmaptiles-tools sh -c "wget -nv -O data/$area.osm.pbf http://download.geofabrik.de/$area-$(date --date="$(date +%Y-%m-15) -1 month" +'%y%m01').osm.pbf"
+./quickstart.sh $area
+cat << EOM
+
+# Update with the changes since a month+ ago
+
+EOM
+docker-compose run --rm --user=$(id -u):$(id -g) openmaptiles-tools sh -c "osmupdate --base-url=$(sed -n 's/ *\"replication_url\": //p' data/$area.repl.json) data/$area.osm.pbf data/changes.osc.gz"
+make import-diff
+make generate-tiles-pg
+) < /dev/null
+```

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2016, KlokanTech.com & OpenMapTiles contributors.  
+Copyright (c) 2024, MapTiler.com & OpenMapTiles contributors.  
 All rights reserved.  
 
 The vector tile schema has been developed by Klokan Technologies GmbH and
@@ -55,6 +55,6 @@ For printed and static maps a similar attribution should be made in a textual
 description near the image, in the same fashion as if you cite a photograph.
 
 Exceptions to OpenMapTiles attribution requirement can be in a written form granted
-by Klokan Technologies GmbH (info@klokantech.com).  
-The project contributors grant Klokan Technologies GmbH the license to give such
+by MapTiler (info@maptiler.com).  
+The project contributors grant MapTiler AG the license to give such
 exceptions on a commercial basis.

MIEL-open-issues.md

@@ -0,0 +1,15 @@
+
+#### amenity:	parking_entrance
+is nog niet covered:
+https://www.openstreetmap.org/node/3192139608
+http://localhost:8080/styles/light/?vector#18.53/50.8813949/4.707086
+
+### While we're at it, add trees
+As a near-max zoom level thing only.
+https://www.openstreetmap.org/node/3192142615
+Would need to be a new layer to style correctly,
+and other such 'decorations' could be considered.
+(currently, bins, park-benches, etc are considered regular POI while these
+would fit in their own 'low-rank' category)
+
+![miel_screenshot.png](miel_screenshot.png)

Makefile

@@ -1,41 +1,61 @@
+#
+# First section - common variable initialization
+#
+
 # Ensure that errors don't hide inside pipes
 SHELL         = /bin/bash
 .SHELLFLAGS   = -o pipefail -c
 
+# Layers definition and meta data
+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)
-DC_OPTS?=--rm -u $(shell id -u):$(shell id -g)
+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?=
-
-# If set, this file will be imported in the import-osm target
-PBF_FILE?=
+USE_PRELOADED_IMAGE ?=
 
 # Local port to use with postserve
-PPORT?=8090
+PPORT ?= 8090
 export PPORT
 # Local port to use with tileserver
-TPORT?=8081
+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)),)
-  override DC_PROJECT:=$(notdir $(shell pwd))
-  DOCKER_COMPOSE:= docker-compose
+DC_PROJECT := $(or $(DC_PROJECT),$(shell (. .env; echo $${DC_PROJECT})))
+ifeq ($(DC_PROJECT),)
+  DC_PROJECT := $(notdir $(shell pwd))
+  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)),)
-  QUIET_FLAG:=
+ifeq ($(or $(QUIET),$(shell (. .env; echo $${QUIET})))),)
+  QUIET_FLAG :=
 else
-  QUIET_FLAG:=--quiet
+  QUIET_FLAG := --quiet
 endif
 
 # 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)
+XARGS := xargs $(shell xargs --no-run-if-empty </dev/null 2>/dev/null && echo --no-run-if-empty)
 
 # If running in the test mode, compare files rather than copy them
 TEST_MODE?=no
@@ -47,82 +67,272 @@ else
   GRAPH_PARAMS=./layers
 endif
 
-.PHONY: all
-all: init-dirs build/openmaptiles.tm2source/data.yml build/mapping.yaml build-sql
-
 # Set OpenMapTiles host
-OMT_HOST:=http://$(firstword $(subst :, ,$(subst tcp://,,$(DOCKER_HOST))) localhost)
+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
+
+
+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
+# If $(area) parameter is not set, and only one *.osm.pbf file is found in ./data, use it as $(area).
+# Otherwise, all make targets requiring an area will show an error.
+# Note: If no *.osm.pbf files are found, once the users call  "make download area=..."
+#       they will not need to use an "area=" parameter again because there will be just a single file.
+#
+
+# 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 ($(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)),)
+    define assert_area_is_given
+	  @echo ""
+	  @echo "ERROR: The 'area' parameter or environment variable have not been set, and there several 'area' options:"
+	  @$(patsubst data/%.osm.pbf,echo "  '%'";,$(data_files))
+	  @echo ""
+	  @echo "To specify an area use:"
+	  @echo "  make $@ area=<area-id>"
+	  @echo ""
+	  @exit 1
+    endef
+  else
+    ifeq ($(word 1,$(data_files)),)
+      define assert_area_is_given
+        @echo ""
+        @echo "ERROR: The 'area' parameter (or env var) has not been set, and there are no data/*.osm.pbf files"
+        @echo ""
+        @echo "To specify an area use"
+        @echo "  make $@ area=<area-id>"
+        @echo ""
+        @echo "To download an area, use   make download area=<area-id>"
+        @echo "To list downloadable areas, use   make list-geofabrik   and/or   make list-bbbike"
+        @exit 1
+        @echo ""
+      endef
+    else
+      # Keep just the name of the data file, without the .osm.pbf extension
+      area := $(patsubst data/%.osm.pbf,%,$(data_files))
+      # Rename area-latest.osm.pbf to area.osm.pbf
+      # TODO: This if statement could be removed in a few months once everyone is using the file without the `-latest`?
+      ifneq ($(area),$(area:-latest=))
+        $(shell mv "data/$(area).osm.pbf" "data/$(area:-latest=).osm.pbf")
+        area := $(area:-latest=)
+        $(warning ATTENTION: File data/$(area)-latest.osm.pbf was renamed to $(area).osm.pbf.)
+        AREA_INFO := Detected area=$(area) based on finding a 'data/$(area)-latest.osm.pbf' file - renamed to '$(area).osm.pbf'. Use 'area' parameter or environment variable to override.
+      else
+        AREA_INFO := Detected area=$(area) based on finding a 'data/$(area).osm.pbf' file. Use 'area' parameter or environment variable to override.
+      endif
+    endif
+  endif
+endif
+
+ifneq ($(AREA_INFO),)
+  define assert_area_is_given
+      @echo "$(AREA_INFO)"
+  endef
+endif
+
+# If set, this file will be downloaded in download-osm and imported in the import-osm targets
+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.
+DOWNLOAD_AREA := $(or $(url), $(area))
+
+# 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)
+
+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 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
+
+# Load area-specific bbox file that gets generated by the download-osm --bbox
+AREA_BBOX_FILE ?= data/$(area).bbox
+ifneq (,$(wildcard $(AREA_BBOX_FILE)))
+  cat := $(if $(filter $(OS),Windows_NT),type,cat)
+  BBOX := $(shell $(cat) ${AREA_BBOX_FILE})
+  export BBOX
+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 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 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 vacuum-db                       # PostgreSQL: VACUUM ANALYZE"
-	@echo "  make analyze-db                      # PostgreSQL: ANALYZE"
-	@echo "  make generate-qareports              # generate reports                                [./build/qareports]"
-	@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 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                  # 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
+	@mkdir -p build/sql/parallel
+	@mkdir -p build/openmaptiles.tm2source
+	@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
-	mkdir -p build/openmaptiles.tm2source
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > $@
+ifeq (,$(wildcard build/openmaptiles.tm2source/data.yml))
+	$(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
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-imposm3 openmaptiles.yaml > $@
+ifeq (,$(wildcard build/mapping.yaml))
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
+		'generate-imposm3 $(TILESET_FILE) > $@'
+endif
 
 .PHONY: build-sql
 build-sql: init-dirs
+ifeq (,$(wildcard build/sql/run_last.sql))
+	@mkdir -p build/sql/parallel
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
-		'generate-sql openmaptiles.yaml --dir ./build/sql \
-		&& generate-sqltomvt openmaptiles.yaml --key --postgis-ver 2.4.8 --function --fname=getmvt >> "./build/sql/run_last.sql"'
+		'generate-sql $(TILESET_FILE) --dir ./build/sql \
+		&& generate-sqltomvt $(TILESET_FILE) \
+							 --key --gzip --postgis-ver 3.3.4 \
+							 --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 'spreet /style/icons build/style/sprite && \
+		spreet --retina /style/icons build/style/sprite@2x'
+
+.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) && \
+		spreet /style/icons build/style/sprite && spreet --retina /style/icons build/style/sprite@2x'
+
+.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
-destroy-db: override 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
@@ -149,77 +359,148 @@ stop-db:
 list-geofabrik: init-dirs
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools download-osm list geofabrik
 
-OSM_SERVERS:=geofabrik osmfr bbbike
-ALL_DOWNLOADS:=$(addprefix download-,$(OSM_SERVERS))
-OSM_SERVER=$(patsubst download-%,%,$@)
+.PHONY: list-bbbike
+list-bbbike: init-dirs
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools download-osm list bbbike
+
+#
+# download, download-geofabrik, download-osmfr, and download-bbbike are handled here
+# The --imposm-cfg will fail for some of the sources, but we ignore that error -- only needed for diff mode
+#
+OSM_SERVERS := geofabrik osmfr bbbike
+ALL_DOWNLOADS := $(addprefix download-,$(OSM_SERVERS)) download
+OSM_SERVER=$(patsubst download,,$(patsubst download-%,%,$@))
 .PHONY: $(ALL_DOWNLOADS)
 $(ALL_DOWNLOADS): init-dirs
-ifeq ($(strip $(area)),)
+	@$(assert_area_is_given)
+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 ($(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)" \
+				--bbox "$(AREA_BBOX_FILE)" \
+				--output "$(PBF_FILE)"
+ else
+	@echo "Downloading $(DOWNLOAD_AREA) into $(PBF_FILE) from $(if $(OSM_SERVER),$(OSM_SERVER),any source)"
+	@$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools download-osm $(OSM_SERVER) "$(DOWNLOAD_AREA)" \
+				--bbox "$(AREA_BBOX_FILE)" \
+				--output "$(PBF_FILE)"
+ endif
 	@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 ""
+ ifeq ($(DIFF_MODE),true)
+  ifeq (,$(wildcard $(IMPOSM_CONFIG_FILE)))
+	$(error \
+		$(newline)   Data files $(PBF_FILE) already exists, but $(IMPOSM_CONFIG_FILE) does not. \
+		$(newline)   You probably downloaded the data file before setting DIFF_MODE=true. \
+		$(newline)   You can delete the data file  $(PBF_FILE) and re-run  make download \
+		$(newline)   to re-download and generate config, or manually create  $(IMPOSM_CONFIG_FILE) \
+		$(newline)   See example    https://github.com/openmaptiles/openmaptiles-tools/blob/v5.2/bin/config/repl_config.json \
+		$(newline))
+  else
+	@echo "Data files $(PBF_FILE) and replication config $(IMPOSM_CONFIG_FILE) already exists, skipping the download."
+  endif
+ else
+	@echo "Data files $(PBF_FILE) already exists, skipping the download."
+ endif
+endif
+
+.PHONY: generate-bbox-file
+generate-bbox-file:
+	@$(assert_area_is_given)
+ifeq (,$(wildcard $(AREA_BBOX_FILE)))
+	@$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools download-osm bbox "$(PBF_FILE)" "$(AREA_BBOX_FILE)"
+else
+	@echo "Configuration file $(AREA_BBOX_FILE) already exists, no need to regenerate.  BBOX=$(BBOX)"
 endif
 
 .PHONY: psql
 psql: start-db-nowait
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && psql.sh'
 
+# 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 := $(filter-out --user=%,$(DC_OPTS))
+else
+  DC_OPTS_CACHE := $(DC_OPTS)
+endif
+
 .PHONY: import-osm
 import-osm: all start-db-nowait
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && import-osm $(PBF_FILE)'
+	@$(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
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && import-update'
+.PHONY: start-update-osm
+start-update-osm: start-db
+	@$(assert_area_is_given)
+	$(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
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && import-diff'
+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'
 
 .PHONY: import-data
 import-data: start-db
-	$(DOCKER_COMPOSE) run $(DC_OPTS) import-data
-
-.PHONY: import-borders
-import-borders: start-db-nowait
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && import-borders'
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) import-data
 
 .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:" '$$0~s{print; print "\n*** WARNING detected, aborting"; exit(1)} 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:
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
+        osmosis --rb data/belgium.osm.pbf --rb data/netherlands.osm.pbf --merge --wb data/merges.osm.pbf
 
-.PHONY: show-metadata
-show-metadata: init-dirs
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools mbtiles-tools meta-all ./data/tiles.mbtiles
 
 .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: all start-db
-	rm -rf data/tiles.mbtiles
-	echo "Generating tiles ..."; \
-	$(DOCKER_COMPOSE) $(DC_CONFIG_TILES) run $(DC_OPTS) generate-vectortiles
+	@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
 	@echo "Updating generated tile metadata ..."
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-metadata ./data/tiles.mbtiles
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
+			mbtiles-tools meta-generate "$(MBTILES_LOCAL_FILE)" $(TILESET_FILE) --auto-minmax --show-ranges
+
+.PHONY: generate-tiles-pg
+generate-tiles-pg: all start-db
+	@echo "Generating tiles into $(MBTILES_LOCAL_FILE) (will delete if already exists) using PostGIS ST_MVT()..."
+	@rm -rf "$(MBTILES_LOCAL_FILE)"
+# 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 "* "
@@ -228,7 +509,7 @@ start-tileserver: init-dirs
 	@echo "* "
 	@echo "***********************************************************"
 	@echo " "
-	docker pull maptiler/tileserver-gl
+	$(DOCKER_COMPOSE_COMMAND) pull tileserver-gl
 	@echo " "
 	@echo "***********************************************************"
 	@echo "* "
@@ -237,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
@@ -269,23 +554,28 @@ 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
 
-.PHONY: generate-qareports
-generate-qareports: start-db
-	./qa/run.sh
+# STAT_FUNCTION=frequency|toplength|variance
+.PHONY: generate-qa
+generate-qa: all start-db-nowait
+	@echo " "
+	@echo "e.g. make generate-qa STAT_FUNCTION=frequency LAYER=transportation ATTRIBUTE=class"
+	@echo " "
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
+		layer-stats $(STAT_FUNCTION) $(TILESET_FILE) $(LAYER) $(ATTRIBUTE) -m 0 -n 14 -v
 
 # generate all etl and mapping graphs
 .PHONY: generate-devdoc
 generate-devdoc: init-dirs
 	mkdir -p ./build/devdoc && \
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c \
-			'generate-etlgraph openmaptiles.yaml $(GRAPH_PARAMS) && \
-			 generate-mapping-graph openmaptiles.yaml $(GRAPH_PARAMS)'
+			'generate-etlgraph $(TILESET_FILE) $(GRAPH_PARAMS) && \
+			 generate-mapping-graph $(TILESET_FILE) $(GRAPH_PARAMS)'
 
 .PHONY: bash
 bash: init-dirs
@@ -293,7 +583,7 @@ bash: init-dirs
 
 .PHONY: import-wikidata
 import-wikidata: init-dirs
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools import-wikidata --cache /cache/wikidata-cache.json openmaptiles.yaml
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools import-wikidata --cache /cache/wikidata-cache.json $(TILESET_FILE)
 
 .PHONY: reset-db-stats
 reset-db-stats: init-dirs
@@ -302,12 +592,12 @@ reset-db-stats: init-dirs
 .PHONY: list-views
 list-views: init-dirs
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools psql.sh -v ON_ERROR_STOP=1 -A -F"," -P pager=off -P footer=off \
-		-c "select schemaname, viewname from pg_views where schemaname='public' order by viewname;"
+		-c "select viewname from pg_views where schemaname='public' order by viewname;"
 
 .PHONY: list-tables
 list-tables: init-dirs
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools psql.sh -v ON_ERROR_STOP=1 -A -F"," -P pager=off -P footer=off \
-		-c "select schemaname, tablename from pg_tables where schemaname='public' order by tablename;"
+		-c "select tablename from pg_tables where schemaname='public' order by tablename;"
 
 .PHONY: psql-list-tables
 psql-list-tables: init-dirs
@@ -316,7 +606,7 @@ psql-list-tables: init-dirs
 .PHONY: vacuum-db
 vacuum-db: init-dirs
 	@echo "Start - postgresql: VACUUM ANALYZE VERBOSE;"
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools psql.sh -v ON_ERROR_STOP=1 -P pager=off -c 'VACUUM ANALYZE VERBOSE;'
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools psql.sh -v ON_ERROR_STOP=1 -P pager=off -c 'VACUUM (ANALYZE, VERBOSE);'
 
 .PHONY: analyze-db
 analyze-db: init-dirs
@@ -329,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
 
@@ -353,14 +643,65 @@ remove-docker-images:
 .PHONY: clean-unnecessary-docker
 clean-unnecessary-docker:
 	@echo "Deleting unnecessary container(s)..."
-	@docker ps -a --filter "status=exited" | $(XARGS) docker rm
+	@docker ps -a -q --filter "status=exited" | $(XARGS) docker rm
 	@echo "Deleting unnecessary image(s)..."
-	@docker images | grep \<none\> | awk -F" " '{print $$3}' | $(XARGS) docker rmi
+	@docker images | awk -F" " '/<none>/{print $$3}' | $(XARGS) docker rmi
 
 .PHONY: test-perf-null
 test-perf-null: init-dirs
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools test-perf openmaptiles.yaml --test null --no-color
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools test-perf $(TILESET_FILE) --test null --no-color
 
 .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
+	@$(assert_area_is_given)
+	@echo file_exists = $(wildcard $(AREA_BBOX_FILE))
+	@echo AREA_BBOX_FILE = $(AREA_BBOX_FILE) , $$AREA_ENV_FILE
+	@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)}'

QUICKSTART.md

@@ -2,7 +2,7 @@
 
 ### Req:
 * CPU: AMD64 ( = Intel 64 bit)
-    *  The base docker debian images are x86_64 based, so the ARM,MIPS currently not supported!
+    *  The base docker debian images are x86_64 based, so the ARM, MIPS currently not supported!
 * Operating system
     * Linux is suggested
         * The development and the testing platform is Linux.
@@ -59,7 +59,7 @@ If you have problems with the quickstart
 IF the previous step is working,
 THEN you can test other available quickstart extracts ( based on [Geofabrik extracts](http://download.geofabrik.de/index.html) ) !
  * We are using https://github.com/julien-noblet/download-geofabrik tool
- * The current extract list, and more information  ->  `make list`
+ * The current extract list, and more information  ->  `make list-geofabrik` or `make list-bbbike`
 
 This is generating `.mbtiles` for your area :  [ MIN_ZOOM: "0"  - MAX_ZOOM: "7" ]
 
@@ -363,12 +363,13 @@ This is generating `.mbtiles` for your area :  [ MIN_ZOOM: "0"  - MAX_ZOOM: "7"
 ./quickstart.sh yukon                        # Yukon, Canada
 ```
 ### Using your own OSM data
-Mbtiles can be generated from an arbitrary osm.pbf (e.g. for a region that is not covered by an existing extract) by making the `data/` directory and placing an *-latest.osm.pbf inside. Inside of folder have to be `docker-compose-config.yml` file too, otherwize whole folder `data/` will be deleted and `download-osm` will try to download osm.pbf file from `geofabric`, `osmfr` or `bbbike`.
+Mbtiles can be generated from an arbitrary osm.pbf (e.g. for a region that is not covered by an existing extract) by making the `data/` directory and placing an *.osm.pbf (e.g. `mydata.osm.pbf`) inside.
 
 ```
 mkdir -p data
-mv my-latest.osm.pbf data/
-./quickstart.sh my
+mv mydata.osm.pbf data/
+make generate-bbox-file area=mydata
+./quickstart.sh mydata
 ```
 
 ### Check postserve
@@ -384,20 +385,26 @@ and the generated maps are going to be available in webbrowser on [localhost:808
 This is only a quick preview, because your mbtiles only generated to zoom level 7 !
 
 
-### Change MIN_ZOOM and MAX_ZOOM
+### Set which zooms to generate
 
-modify the settings in the `.env`  file, the defaults :
-* QUICKSTART_MIN_ZOOM=0
-* QUICKSTART_MAX_ZOOM=7
-
-and re-start  `./quickstart.sh `
-*  the new config file re-generating to here  ./data/docker-compose-config.yml
-*  Known problems:
-    * If you use same area - then the ./data/docker-compose-config.yml not re-generating, so you have to modify by hand!
+modify the settings in the `.env` file, the defaults:
+* `MIN_ZOOM=0`
+* `MAX_ZOOM=7`
 
 Hints:
-* Small increments! Never starts with the MAX_ZOOM = 14
-* The suggested  MAX_ZOOM = 14  - use only with small extracts
+* Small increments! Never starts with the `MAX_ZOOM = 14`
+* The suggested  `MAX_ZOOM = 14`  - use only with small extracts
+
+### Set the bounding box to generate
+
+By default, tile generation is done for the full extent of the area.
+If you want to generate a tiles for a smaller extent, modify the settings in the `.env` file, the default:
+* `BBOX=-180.0,-85.0511,180.0,85.0511`
+
+Delete the `./data/<area>.bbox` file, and re-start `./quickstart.sh <area>`
+
+Hint:
+* The [boundingbox.klokantech.com](https://boundingbox.klokantech.com/) site can be used to find a bounding box (CSV format) using a map.
 
 ### Check other commands
 
@@ -408,33 +415,63 @@ the current output:
 
 ```
 ==============================================================================
- OpenMapTiles  https://github.com/openmaptiles/openmaptiles
+OpenMapTiles  https://github.com/openmaptiles/openmaptiles
+
 Hints for testing areas
-  make download-geofabrik-list         # list actual geofabrik OSM extracts for download -> <<your-area>>
+  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-postserve                 # start Postserver + Maputnik Editor [ see localhost:8088 ]
-  make start-tileserver                # start maptiler/tileserver-gl [ see localhost:8081 ]
+  make start-maputnik                  # start Maputnik Editor + dynamic tile server [ see http://localhost:8088 ]
+  make stop-maputnik                   # stop Maputnik Editor + dynamic tile server
+  make start-postserve                 # start dynamic tile server                   [ see http://localhost:8090 ]
+  make stop-postserve                  # stop dynamic tile server
+  make start-tileserver                # start maptiler/tileserver-gl                [ see http://localhost:8081 ]
+  make stop-tileserver                 # stop maptiler/tileserver-gl
 
 Hints for developers:
   make                                 # build source code
-  make download-geofabrik area=albania # download OSM data from geofabrik, and create config file
+  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 psql-vacuum-analyze             # PostgreSQL: VACUUM ANALYZE
-  make psql-analyze                    # PostgreSQL: ANALYZE
-  make generate-qareports              # generate reports [./build/qareports]
-  make generate-devdoc                 # generate devdoc  [./build/devdoc]
-  make tools-dev                       # start import-sql  /bin/bash terminal
-  make db-destroy                      # remove docker containers, PG data volume
-  make docker-unnecessary-clean        # 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-views                      # list PostgreSQL public schema views
   make list-tables                     # list PostgreSQL public schema tables
-  cat  .env                            # list PG database and MIN_ZOOM and MAX_ZOOM information
-  cat ./quickstart.log                 # backup  of the last ./quickstart.sh
-  make help                            # help about available commands
+  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
 ==============================================================================
 ```

README.md

@@ -1,6 +1,6 @@
-## OpenMapTiles [![Build Status](https://github.com/openmaptiles/openmaptiles/workflows/OMT_CI/badge.svg?branch=master)](https://github.com/openmaptiles/openmaptiles/actions)
+## OpenMapTiles [![Build Status](https://github.com/openmaptiles/openmaptiles/workflows/OpenMapTiles%20Integrity%20CI/badge.svg?branch=master)](https://github.com/openmaptiles/openmaptiles/actions)
 
-OpenMapTiles is an extensible and open tile schema based on the OpenStreetMap. This project is used to generate vector tiles for online zoomable maps. OpenMapTiles is about creating a beautiful basemaps with general layers containing topographic information. More information [openmaptiles.org](https://openmaptiles.org/) and [openmaptiles.com](https://openmaptiles.com/).
+OpenMapTiles is an extensible and open tile schema based on the OpenStreetMap. This project is used to generate vector tiles for online zoomable maps. OpenMapTiles is about creating a beautiful basemaps with general layers containing topographic information. More information [openmaptiles.org](https://openmaptiles.org/) and [maptiler.com/data/](https://www.maptiler.com/data/).
 
 We encourage you to collaborate, reuse and adapt existing layers, or add your own layers. You may use our approach for your own vector tile project. Feel free to fork the repo and experiment. The repository is built on top of the [openmaptiles/openmaptiles-tools](https://github.com/openmaptiles/openmaptiles-tools) to simplify vector tile creation.
 
@@ -8,10 +8,11 @@ Please keep in mind that OpenMapTiles schema should display general topographic
 
 - :link: Schema https://openmaptiles.org/schema
 - :link: Docs https://openmaptiles.org/docs
-- :link: Production package: https://openmaptiles.com/production-package/
+- :link: Data for download: https://www.maptiler.com/data/
 - :link: Hosting https://www.maptiler.com/cloud/
 - :link: Create own layer https://github.com/openmaptiles/openmaptiles-skiing
-- :link: Discuss at the #openmaptiles channel at [OSM Slack](https://osmus-slack.herokuapp.com/)
+- :link: Practical usage of OpenMapTiles https://github.com/maptiler/foss4g-workshop
+- :link: Discuss at the #openmaptiles channel at [OSM Slack](https://slack.openstreetmap.us/)
 
 ## Styles
 
@@ -20,14 +21,15 @@ You can start from several GL styles supporting the OpenMapTiles vector schema.
 :link: [Learn how to create Mapbox GL styles with Maputnik and OpenMapTiles](http://openmaptiles.org/docs/style/maputnik/).
 
 
+- [OSM OpenMapTiles](./style/README.md)
 - [OSM Bright](https://github.com/openmaptiles/osm-bright-gl-style)
+- [MapTiler Basic](https://github.com/openmaptiles/maptiler-basic-gl-style)
+- [MapTiler 3D](https://github.com/openmaptiles/maptiler-3d-gl-style)
+- [Fiord Color](https://github.com/openmaptiles/fiord-color-gl-style)
+- [MapTiler Toner](https://github.com/openmaptiles/maptiler-toner-gl-style)
+- [OSM Liberty](https://github.com/maputnik/osm-liberty)
 - [Positron](https://github.com/openmaptiles/positron-gl-style)
 - [Dark Matter](https://github.com/openmaptiles/dark-matter-gl-style)
-- [Klokantech Basic](https://github.com/openmaptiles/klokantech-basic-gl-style)
-- [Klokantech 3D](https://github.com/openmaptiles/klokantech-3d-gl-style)
-- [Fiord Color](https://github.com/openmaptiles/fiord-color-gl-style)
-- [Toner](https://github.com/openmaptiles/toner-gl-style)
-- [OSM Liberty](https://github.com/maputnik/osm-liberty)
 
 We also ported over our favorite old raster styles (TM2).
 
@@ -71,6 +73,10 @@ To work on OpenMapTiles you need Docker.
 - Install [Docker](https://docs.docker.com/engine/installation/). Minimum version is 1.12.3+.
 - Install [Docker Compose](https://docs.docker.com/compose/install/). Minimum version is 1.7.1+.
 
+### Microsoft Windows Subsystem for Linux (WSL)
+
+Please use Linux `/home/user/` directory, not Windows e.g. `/mnt/c` directory.
+
 ### Build
 
 Build the tileset.
@@ -83,10 +89,10 @@ make
 ```
 
 You can execute the following manual steps (for better understanding)
-or use the provided `quickstart.sh` script.
+or use the provided `quickstart.sh` script to automatically download and import given area. If area is not given, Albania will be imported. List of available areas `make list-geofabrik`.
 
 ```
-./quickstart.sh
+./quickstart.sh <area>
 ```
 
 ### Prepare the Database
@@ -97,24 +103,23 @@ Now start up the database container.
 make start-db
 ```
 
-Import external data from [OpenStreetMapData](http://osmdata.openstreetmap.de/), [Natural Earth](http://www.naturalearthdata.com/) and [OpenStreetMap Lake Labels](https://github.com/lukasmartinelli/osm-lakelines).
+Import external data from [OpenStreetMapData](http://osmdata.openstreetmap.de/), [Natural Earth](http://www.naturalearthdata.com/) and [OpenStreetMap Lake Labels](https://github.com/openmaptiles/osm-lakelines). Natural Earth country boundaries are used in the few lowest zoom levels.
 
 ```bash
 make import-data
 ```
 
-[Download OpenStreetMap data extracts](http://download.geofabrik.de/) and store the PBF file in the `./data` directory.
+Download OpenStreetMap data extracts from any source like [Geofabrik](http://download.geofabrik.de/), and store the PBF file in the `./data` directory. To use a specific download source, use `download-geofabrik`, `download-bbbike`, or `download-osmfr`, or use `download` to make it auto-pick the area. You can use `area=planet` for the entire OSM dataset (very large).  Note that if you have more than one `data/*.osm.pbf` file, every `make` command will always require `area=...` parameter (or you can just `export area=...` first).
 
 ```bash
-make download-geofabrik area=albania
+make download area=albania
 ```
 
-[Import OpenStreetMap data](https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-osm) with the mapping rules from
-`build/mapping.yaml` (which has been created by `make`). Run after any change in layers definition.  Also create borders table using extra processing with [osmborder](https://github.com/pnorman/osmborder) tool.
+[Import OpenStreetMap data](https://github.com/openmaptiles/openmaptiles-tools/blob/master/bin/import-osm) with the mapping rules from
+`build/mapping.yaml` (which has been created by `make`). Run after any change in layers definition (any change in `mapping.yaml`).
 
 ```bash
 make import-osm
-make import-borders
 ```
 
 Import labels from Wikidata. If an OSM feature has [Key:wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata), OpenMapTiles check corresponding item in Wikidata and use its [labels](https://www.wikidata.org/wiki/Help:Label) for languages listed in [openmaptiles.yaml](openmaptiles.yaml). So the generated vector tiles includes multi-languages in name field.
@@ -126,6 +131,13 @@ make import-wikidata
 ```
 
 ### Work on Layers
+Each time you modify a layer's `mapping.yaml` file or add new OSM tags, run `make` and `make import-osm` to recreate tables (potentially with additional data) in PostgreSQL. With the new data, there can be new Wikidata records also.
+```
+make clean
+make
+make import-osm
+make import-wikidata
+```
 
 Each time you modify layer SQL code run `make` and `make import-sql`.
 
@@ -135,18 +147,47 @@ make
 make import-sql
 ```
 
-Now you are ready to **generate the vector tiles**. Using environment variables
-you can limit the bounding box and zoom levels of what you want to generate (`docker-compose.yml`).
+Each time you make a modification that adds a new feature to vector tiles e.g. adding new OSM tags, modify the layer 
+style snippet by adding new style layer so the changes are propagated visually into the style.
+All new style layers must have the `order` value which determines the order or rendering in the map style. 
+After the layer style snippet is modified run:
+```bash
+make build-style
+```
+
+
+
+Now you are ready to **generate the vector tiles**. By default, `./.env` specifies the entire planet BBOX for zooms 0-7, but running `generate-bbox-file` will analyze the data file and set the `BBOX` param to limit tile generation.
 
 ```
-make generate-tiles
+make generate-bbox-file  # compute data bbox -- not needed for the whole planet or for downloaded area by `make download`
+make generate-tiles-pg   # generate tiles
 ```
 
+### Workflow to generate tiles
+If you go from top to bottom you can be sure that it will generate a .mbtiles file out of a .osm.pbf file
+```
+make clean                  # clean / remove existing build files
+make                        # generate build files
+make start-db               # start up the database container.
+make import-data            # Import external data from OpenStreetMapData, Natural Earth and OpenStreetMap Lake Labels.
+make download area=albania  # download albania .osm.pbf file -- can be skipped if a .osm.pbf file already existing
+make import-osm             # import data into postgres
+make import-wikidata        # import Wikidata
+make import-sql             # create / import sql functions 
+make generate-bbox-file     # compute data bbox -- not needed for the whole planet or for downloaded area by `make download`
+make generate-tiles-pg      # generate tiles
+```
+Instead of calling `make download area=albania` you can add a .osm.pbf file in the `data` folder `openmaptiles/data/your_area_file.osm.pbf`
+
+To change the name of the output filename, you can modify the variable `MBTILES_FILE` in the `.env` file or set up the environment variable `MBTILES_FILE` before running `./quickstart.sh` or `make generate-tiles-pg` (e.g., `MBTILES_FILENAME=monaco.mbtiles ./quickstart.sh monaco`).
+
+
 ## License
 
-All code in this repository is under the [BSD license](./LICENSE.md) and the cartography decisions encoded in the schema and SQL are licensed under [CC-BY](./LICENSE.md).
+All code in this repository is under the [BSD license](./LICENSE.md). Design and the cartography decisions encoded in the schema and SQL are licensed under [CC-BY](./LICENSE.md).
 
-Products or services using maps derived from OpenMapTiles schema need to visibly credit "OpenMapTiles.org" or reference "OpenMapTiles" with a link to https://openmaptiles.org/. Exceptions to attribution requirement can be granted on request.
+Products or services using maps derived from OpenMapTiles schema need to **visibly credit "OpenMapTiles.org"** or **reference "OpenMapTiles"** with a link to https://openmaptiles.org/. Exceptions to attribution requirement can be granted on request.
 
 For a browsable electronic map based on OpenMapTiles and OpenStreetMap data, the
 credit should appear in the corner of the map. For example:

TESTING.md

@@ -0,0 +1,18 @@
+
+# OpenMapTiles SQL Testing
+
+The OpenMapTiles SQL tests ensure that OSM data is properly imported and updated in the OpenMapTiles data schema.  The tests work by injecting test OSM data into the database and checking to ensure that the data is properly reflected in the SQL output. 
+
+Usage:
+
+`make clean && make test-sql`
+
+## How it works
+
+The SQL tests consist of the following parts:
+
+ 1. **Test import data**, located in `tests/import`.  This test data is in the [OSM XML](https://wiki.openstreetmap.org/wiki/OSM_XML) format and contains the data that should be initially injected into the database.  The files are numbered in order to ensure that each test data file OSM id numbers that are unique from the other files.  For example, the file starting with `100` will use node ids from 100000-199999, way ids from 1000-1999, and relation ids from 100-199.
+ 2. **Test update data**, located in `tests/update`.  This test data is in the [osmChange XML](https://wiki.openstreetmap.org/wiki/OsmChange) format, and contains the data that will be used to update the test import data (in order to verify that the update process is working correctly.  These files are also numbered using the same scheme as the test import data.
+ 3. **Import SQL test script**, located at `tests/test-post-import.sql`.  This script is executed after the test import data has been injected, and runs SQL-based checks to ensure that the import data was properly imported.  If there are failures in the tests, an entry will be added to the table `omt_test_failures`, with one record per error that occurs during the import process.  A test failure will also fail the build.  To inspect the test failure messages, run `make psql` and issue the comment `SELECT * FROM omt_test_failures`.
+ 4. **Update SQL test script**, located at `tests/test-post-update.sql`.  This script performs the same function as the import test script, except that it occurs after the test update data has been applied to the database.  Note that script will only run if the import script passes all tests.
+

UPDATE.md

@@ -1,42 +1,116 @@
-# Keep the vector tiles updated
+# Keeping the Vector Tiles Updated
 
 Once you have imported OpenMapTiles you can also keep it up to date by importing the latest OSM changes and
 regenerating the tables.
 
 ## Import
 
-You can either keep the database up to date based on the daily OSM change feed
+You can either keep the database up to date based on the daily (or minutely) OSM change feed
 or import specific change files.
 
+### Choosing the Download Source
+
+While GeoFabrik currently provides extracts of basically all countries, they provide only daily updates.
+If you need minutely updates you might want to try openstreetmap.fr, for example like this: `make download-osmfr area=africa/eritrea`, which configures minutely updates.
+
+### Preparations
+
+If you plan to keep data updated automatically, before importing any data, make sure to set
+
+```
+DIFF_MODE=true
+```
+
+in the `.env`
+
+Now download fresh data:
+
+```
+make download area=your-area-of-choice
+```
+
 ### Keep Database Updated
 
-You can use the new imposm3 feature to keep the database updated (thanks to the [work by @stirringhalo](https://github.com/openmaptiles/openmaptiles/pull/131)). This will automatically download
-the OSM change feed and import it into the database.
-After each run you should also have a list of tiles that have updated.
+You can use imposm3 to keep the database updated (thanks to the [work by @stirringhalo](https://github.com/openmaptiles/openmaptiles/pull/131)).
+This will repeatedly download the OSM change feed and import it into the database.
+In order to be able to update the database, the initial download and import of the OSM data must be done when `DIFF_MODE=true` is set in the `.env` file.
+In this mode the initial download also sets the update source and the update intervals.
+
+To start the update process please use
+```
+make start-update-osm
+```
+
+To stop the update process please use
+```
+make stop-update-osm
+```
+
+After each update activation, **imposm3** will store lists of updated tiles in text format in subfolders of the `diffdir`,
+named for the date(s) on which the import took place (`YYYYMMDD`).
+
+See [Generate Changed Tiles](#generate-changed-tiles) below on how this file can be used.
+
+#### Note
+When the update process is actively updating the DB it is impossible to successfully generate tiles,
+as there will be conflicts and deadlocks related to the DB access.
+
+Unfortunately, there is no known way to execute an external command in-between rounds of the `update-osm` process.
+
+#### Troubleshooting
+
+The log file for osm update can be viewed using
 
 ```
-make update-osm
+docker-compose logs --tail 100 --follow update-osm
+```
+
+Use `Ctrl-C` to stop following the log.
+
+The output will be similar to this:
+
+```
+[info] Importing #4889572 including changes till ....... +0000 UTC (2h10m10s behind)
+```
+
+It might take some time to catch up with the latest changes, but the "time behind" should decrease until it is a few minutes.
+If it doesn't, you need to download a new extract or check that there are enough system resources to keep-up with the changes.
+
+Finally you will get an output like this - this indicates, that some 6 objects were changed:
+
+```
+[progress]     3s C:       0/s (0) N:       0/s (0) W:       0/s (6) R:      0/s (0)
+```
+
+The process will keep running foreverprint something like this - which just means that no changes were in the latest changeset:
+
+```
+[progress]     0s C:       0/s (0) N:       0/s (0) W:       0/s (0) R:      0/s (0)
 ```
 
 ### Import Change File
 
-Given you have a file `changes.osc.gz` in your import folder. Once you ran the import command you should also have a list of tiles that have updated.
+You may perform a one-time import of OSM changes from the `changes.osc.gz` file in your import folder using
 
 ```
 make import-diff
 ```
 
+Similar to[Keep Database Updated](#keep_database_updated) above, **imposm3** will store the list of updated tiles in text file in subfolders of the `diffdir`,
+named for the date on which the import took place (`YYYYMMDD`).
+
+See [Generate Changed Tiles](#generate-changed-tiles) below.
+
+#### Note
+There is no `make` command for downloading OSM changes into `changes.osc.gz`.
+You may perform this task using [`osmupdate`](https://wiki.openstreetmap.org/wiki/Osmupdate),
+[pyosmium-get-changes](https://docs.osmcode.org/pyosmium/latest/tools_get_changes.html),
+or downloading the changefile directly from the replication server.
+
 ## Generate Changed Tiles
 
-After the import has finished **imposm3** will store lists of tiles in text format in subfolders of the `diffdir`,
-named for the date(s) on which the import took place (`YYYYMMDD`).
-Copy and merge the files to `tiles.txt` in the import folder (`data`), either manually or with the following command, which also removes duplicate tiles so they are only generated once:  
-```
-cd data && sort ./*/*.tiles | uniq > tiles.txt
-```
-
-Now run the command to read the tilelist and write the vector tiles for it to a new MBTiles.
+To generate all changed tiles, based on the lists of all updated tiles, and update the existing MBtiles file, please use
 
 ```
-docker-compose run generate-changed-vectortiles
+make generate-changed-tiles
 ```

benelux.sh

@@ -0,0 +1,322 @@
+#!/bin/bash
+set -o errexit
+set -o pipefail
+set -o nounset
+
+
+###########################################
+# This file is a modified quickstart.sh, intended to load benelux region
+#
+
+# If --empty is not given, use preloaded docker image to speed up
+if [ $# -gt 0 ] && [[ $1 == --empty ]]; then
+  export USE_PRELOADED_IMAGE=""
+  shift
+else
+  export USE_PRELOADED_IMAGE=true
+fi
+
+if [ $# -eq 0 ]; then
+  #  default test area
+  export area=belgium
+  echo "No parameter - set area=$area "
+else
+  export area=$1
+fi
+
+if [ $# -eq 2 ]; then
+  osm_server=$2
+fi
+
+##  Min versions ...
+MIN_COMPOSE_VER=1.7.1
+MIN_DOCKER_VER=1.12.3
+STARTTIME=$(date +%s)
+STARTDATE=$(date +"%Y-%m-%dT%H:%M%z")
+
+log_file=./quickstart.log
+rm -f $log_file
+echo " "
+echo "====================================================================================="
+echo "                       Docker check & Download images                                "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Please check the Docker and docker-compose version!"
+echo "      : We are using docker-compose v2 file format!  see more at https://docs.docker.com/"
+echo "      : Minimum required Docker version: $MIN_DOCKER_VER+"
+echo "      : Minimum required docker-compose version: $MIN_COMPOSE_VER+"
+echo "      : See the .travis build for the currently supported versions."
+echo "      : Your docker system:"
+docker         --version
+docker-compose --version
+
+# based on: http://stackoverflow.com/questions/16989598/bash-comparing-version-numbers
+function version { echo "$@" | tr -cs '0-9.' '.' | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }'; }
+
+COMPOSE_VER=$(docker-compose version --short)
+if [ "$(version "$COMPOSE_VER")" -lt "$(version "$MIN_COMPOSE_VER")" ]; then
+  echo "ERR: Your Docker-compose version is known to have bugs, please update docker-compose!"
+  exit 1
+fi
+
+DOCKER_VER="$(docker -v | awk -F '[ ,]+' '{ print $3 }')"
+if [ "$(version "$DOCKER_VER")" -lt "$(version "$MIN_DOCKER_VER")" ]; then
+  echo "ERR: Your Docker version is not compatible. Please Update docker!"
+  exit 1
+fi
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Pulling or refreshing OpenMapTiles docker images "
+make refresh-docker-images
+
+
+#####  backup log from here ...
+exec &> >(tee -a "$log_file")
+
+echo " "
+echo "====================================================================================="
+echo "                                Start processing                                     "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : OpenMapTiles quickstart! [ https://github.com/openmaptiles/openmaptiles ]    "
+echo "      : This will be logged to the $log_file file (for debugging) and to the screen"
+echo "      : Area             : $area "
+echo "      : Download server  : ${osm_server:-unset (automatic)} "
+echo "      : Preloaded image  : $USE_PRELOADED_IMAGE "
+echo "      : Git version      : $(git rev-parse HEAD) "
+echo "      : Started          : $STARTDATE "
+echo "      : Your bash version: $BASH_VERSION"
+echo "      : Your OS          : $OSTYPE"
+docker         --version
+docker-compose --version
+
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+    echo " "
+    echo "-------------------------------------------------------------------------------------"
+    echo "      : This is working on x86_64 ; Your kernel is:"
+    uname -r
+    uname -m
+
+    KERNEL_CPU_VER=$(uname -m)
+    if [ "$KERNEL_CPU_VER" != "x86_64" ]; then
+      echo "ERR: Sorry this is working only on x86_64!"
+      exit 1
+    fi
+    echo "      : --- Memory, CPU info ---- "
+    mem=$( grep MemTotal /proc/meminfo | awk '{print $2}' | xargs -I {} echo "scale=4; {}/1024^2" | bc )
+    echo "System memory (GB): ${mem}"
+    grep SwapTotal /proc/meminfo
+    echo "CPU number: $(grep -c processor /proc/cpuinfo) x $(grep "bogomips" /proc/cpuinfo | head -1)"
+    grep Free /proc/meminfo
+else
+    echo " "
+    echo "Warning : Platforms other than Linux are less tested"
+    echo " "
+fi
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Stopping running services & removing old containers"
+make destroy-db
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Existing OpenMapTiles docker images. Will use version $(source .env && echo "$TOOLS_VERSION")"
+docker images | grep openmaptiles
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Create directories if they don't exist"
+make init-dirs
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Removing old MBTILES if exists ( ./data/${area}.mbtiles ) "
+rm -f "./data/${area}.mbtiles"
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Downloading ${area} from ${osm_server:-any source}..."
+make "download${osm_server:+-${osm_server}}"
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Remove old generated source files ( ./build/* ) ( if they exist ) "
+make clean
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Code generating from the layer definitions ( ./build/mapping.yaml; ./build/sql/* )"
+echo "      : The tool source code: https://github.com/openmaptiles/openmaptiles-tools "
+echo "      : But we generate the tm2source, Imposm mappings and SQL functions from the layer definitions! "
+make all
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+if [[ "$USE_PRELOADED_IMAGE" == true ]]; then
+  echo "====> : Start PostgreSQL service using postgis image preloaded with this data:"
+  echo "      : * Water data from http://osmdata.openstreetmap.de"
+  echo "      :   Data license: https://osmdata.openstreetmap.de/info/license.html"
+  echo "      : * Natural Earth from http://www.naturalearthdata.com"
+  echo "      :   Terms-of-use: http://www.naturalearthdata.com/about/terms-of-use"
+  echo "      : * OpenStreetMap Lakelines data https://github.com/lukasmartinelli/osm-lakelines"
+  echo "      :"
+  echo "      : Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-data"
+  echo "      :   includes all data from the import-data image"
+  echo "      :"
+  echo "      : Use the --empty flag to start with an empty database:"
+  echo "      :   ./quickstart.sh --empty albania "
+  echo "      : If desired, you can manually import data by using these commands:"
+  echo "      :   make destroy-db"
+  echo "      :   make start-db"
+  echo "      :   make import-data"
+  echo "      :"
+  echo "      : Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/postgis-preloaded"
+  echo "      : Thank you https://www.postgresql.org !  Thank you http://postgis.org !"
+  make start-db-preloaded
+else
+  echo "====> : Start PostgreSQL service using empty database and importing all the data:"
+  echo "      : * Water data from http://osmdata.openstreetmap.de"
+  echo "      :   Data license: https://osmdata.openstreetmap.de/info/license.html"
+  echo "      : * Natural Earth from http://www.naturalearthdata.com"
+  echo "      :   Terms-of-use: http://www.naturalearthdata.com/about/terms-of-use"
+  echo "      : * OpenStreetMap Lakelines data https://github.com/lukasmartinelli/osm-lakelines"
+  echo "      :"
+  echo "      : Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-data"
+  echo "      :   includes all data from the import-data image"
+  echo "      :"
+  echo "      : Thank you https://www.postgresql.org !  Thank you http://postgis.org !"
+  make start-db
+  make import-data
+fi
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Start importing OpenStreetMap data: ${area} -> imposm3[./build/mapping.yaml] -> PostgreSQL"
+echo "      : Imposm3 documentation: https://imposm.org/docs/imposm3/latest/index.html "
+echo "      :   Thank you Omniscale! "
+echo "      :   Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-osm "
+echo "      : The OpenstreetMap data license: https://www.openstreetmap.org/copyright (ODBL) "
+echo "      : Thank you OpenStreetMap Contributors ! "
+make import-osm
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Start importing border ${area} data into PostgreSQL using osmborder"
+echo "      : Source code: https://github.com/pnorman/osmborder"
+echo "      : Data license: http://www.openstreetmap.org/copyright"
+echo "      : Thank you Paul Norman"
+make import-borders
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Start importing Wikidata: Wikidata Query Service -> PostgreSQL"
+echo "      : The Wikidata license: CC0 - https://www.wikidata.org/wiki/Wikidata:Main_Page "
+echo "      : Thank you Wikidata Contributors ! "
+make import-wikidata
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Start SQL postprocessing:  ./build/sql/* -> PostgreSQL "
+echo "      : Source code: https://github.com/openmaptiles/openmaptiles-tools/blob/master/bin/import-sql"
+# If the output contains a WARNING, stop further processing
+# Adapted from https://unix.stackexchange.com/questions/307562
+make import-sql
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Analyze PostgreSQL tables"
+make analyze-db
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Testing PostgreSQL tables to match layer definitions metadata"
+make test-perf-null
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+
+if [[ "$(source .env ; echo "$BBOX")" = "-180.0,-85.0511,180.0,85.0511" ]]; then
+  if [[ "$area" != "planet" ]]; then
+    echo "====> : Compute bounding box for tile generation"
+    make generate-bbox-file ${MIN_ZOOM:+MIN_ZOOM="${MIN_ZOOM}"} ${MAX_ZOOM:+MAX_ZOOM="${MAX_ZOOM}"}
+  else
+    echo "====> : Skipping bbox calculation when generating the entire planet"
+  fi
+
+else
+  echo "====> : Bounding box is set in .env file"
+fi
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Start generating MBTiles (containing gzipped MVT PBF) from a TM2Source project. "
+echo "      : TM2Source project definitions : ./build/openmaptiles.tm2source/data.yml "
+echo "      : Output MBTiles: ./data/${area}.mbtiles  "
+echo "      : Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/generate-vectortiles "
+echo "      : We are using a lot of Mapbox Open Source tools! : https://github.com/mapbox "
+echo "      : Thank you https://www.mapbox.com !"
+echo "      : See other MVT tools : https://github.com/mapbox/awesome-vector-tiles "
+echo "      :  "
+echo "      : You will see a lot of deprecated warning in the log! This is normal!  "
+echo "      :    like :  Mapnik LOG>  ... is deprecated and will be removed in Mapnik 4.x ... "
+make generate-tiles
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Stop PostgreSQL service ( but we keep PostgreSQL data volume for debugging )"
+make stop-db
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Inputs - Outputs md5sum for debugging "
+rm -f ./data/quickstart_checklist.chk
+{
+  find build -type f | sort | xargs md5sum
+  find data -type f | sort | xargs md5sum
+} >> ./data/quickstart_checklist.chk
+cat ./data/quickstart_checklist.chk
+
+ENDTIME=$(date +%s)
+
+echo " "
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "--                           S u m m a r y                                         --"
+echo "-------------------------------------------------------------------------------------"
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : (disk space) We have created a lot of docker images: "
+echo "      : Hint: you can remove with:  docker rmi IMAGE "
+docker images | grep openmaptiles
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : (disk space) We have created the new vectortiles ( ./data/${area}.mbtiles ) "
+echo "      : Please respect the licenses (OdBL for OSM data) of the sources when distributing the MBTiles file."
+echo "      : Data directory content:"
+ls -la ./data
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "The ./quickstart.sh $area  is finished! "
+echo "It took $((ENDTIME - STARTTIME)) seconds to complete"
+echo "We saved the log file to $log_file  (for debugging) You can compare with the travis log !"
+echo " "
+echo "Start experimenting and check the QUICKSTART.MD file!"
+echo " "
+echo "*  Use   make start-maputnik     to explore tile generation on request"
+echo "*  Use   make start-tileserver   to view pre-generated tiles"
+echo " "
+echo "Available help commands (make help)  "
+make help
+
+echo "-------------------------------------------------------------------------------------"
+echo " Acknowledgments "
+echo " Generated vector tiles are produced work of OpenStreetMap data. "
+echo " Such tiles are reusable under CC-BY license granted by OpenMapTiles team: "
+echo "   https://github.com/openmaptiles/openmaptiles/#license "
+echo " Maps made with these vector tiles must display a visible credit: "
+echo "   © OpenMapTiles © OpenStreetMap contributors "
+echo " "
+echo " Thanks to all free, open source software developers and Open Data Contributors!    "
+echo "-------------------------------------------------------------------------------------"

cerxes-maps-belgium.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -e
+
+# Test script for generating tiles for Lummen and region (e.g. including Hasselt)
+export SOURCE=osmfr
+export AREA=europe/belgium
+export BBOX=2.255544,49.857797,6.586904,51.389246
+# Which zooms to generate in   make generate-tiles
+export MIN_ZOOM=0
+export MAX_ZOOM=16
+
+# Update the .env to match
+sed -i "s/MIN_ZOOM=.*/MIN_ZOOM=${MIN_ZOOM}/" .env
+sed -i "s/MAX_ZOOM=.*/MAX_ZOOM=${MAX_ZOOM}/" .env
+sed -i "s/BBOX=.*/BBOX=${BBOX}/" .env
+
+
+# Setup
+make clean
+make DC_OPTS=--rm
+
+# Start from a clean db
+make start-db
+make destroy-db
+make import-data
+# ALTERNATIVE would be this
+#make start-db-preloaded
+
+# Download
+make download-${SOURCE} area="${AREA}"
+
+# Import (yes we're doing import borders twice, it crashes on first run, oddly enough)
+make import-osm
+make import-wikidata
+make import-borders || true
+make import-sql
+make analyze-db
+
+# (This potentially screws stuff up?!)
+#rm -rf data/${AREA}.dc-config.yml
+#make generate-dc-config
+
+# Generate
+make generate-tiles-pg
+
+make stop-db

cerxes-maps.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -e
+
+# Script for generating tiles for what cerxes server should host
+export SOURCE=geofabrik
+export AREA=europe
+export BBOX=-4.382176,47.705913,13.053127,53.803762
+# Which zooms to generate in   make generate-tiles
+export MIN_ZOOM=0
+export MAX_ZOOM=16
+
+# Update the .env to match
+sed -i "s/MIN_ZOOM=.*/MIN_ZOOM=${MIN_ZOOM}/" .env
+sed -i "s/MAX_ZOOM=.*/MAX_ZOOM=${MAX_ZOOM}/" .env
+sed -i "s/BBOX=.*/BBOX=${BBOX}/" .env
+
+
+# Setup
+make clean
+make DC_OPTS=--rm
+
+# Start from a clean db
+make start-db
+make destroy-db
+make import-data
+# ALTERNATIVE would be this
+#make start-db-preloaded
+
+# Download
+make download-${SOURCE} area="${AREA}"
+
+# Import (yes we're doing import borders twice, it crashes on first run, oddly enough)
+make import-osm
+make import-wikidata
+make import-borders || true
+make import-sql
+make analyze-db
+
+# (This potentially screws stuff up?!)
+#rm -rf data/${AREA}.dc-config.yml
+#make generate-dc-config
+
+# Generate
+make generate-tiles-pg
+
+make stop-db

docker-compose-MINGW64.yml

@@ -0,0 +1,11 @@
+# This version must match the MAKE_DC_VERSION in docker-compose.yml
+version: "3"
+
+volumes:
+  cache:
+
+services:
+
+  openmaptiles-tools:
+    volumes:
+      - cache:/cache

docker-compose.yml

@@ -1,49 +1,79 @@
 # This version must match the MAKE_DC_VERSION value below
-version: "2.3"
+version: "3"
 
 volumes:
   pgdata:
 
 networks:
-  postgres_conn:
+  postgres:
     driver: bridge
 
 services:
 
   postgres:
     image: "${POSTGIS_IMAGE:-openmaptiles/postgis}:${TOOLS_VERSION}"
+    # image: harbor.cerxes.net/openmaptiles/postgis:5.3
     # Use "command: postgres -c jit=off" for PostgreSQL 11+ because of slow large MVT query processing
+    # Use "shm_size: 512m" if you want to prevent a possible 'No space left on device' during 'make generate-tiles-pg'
     volumes:
       - pgdata:/var/lib/postgresql/data
     networks:
-      - postgres_conn
+      - postgres
     ports:
-      - "5432"
-    env_file: .env-postgres
+      - "${PGPORT:-5432}:${PGPORT:-5432}"
+    env_file: .env
+    environment:
+      # postgress container uses old variable names
+      POSTGRES_DB: ${PGDATABASE:-openmaptiles}
+      POSTGRES_USER: ${PGUSER:-openmaptiles}
+      POSTGRES_PASSWORD: ${PGPASSWORD:-openmaptiles}
+      PGPORT: ${PGPORT:-5432}
+    shm_size: 16384MB
+    #command: /docker-entrypoint-initdb.d/01_tune-postgis.sh
+    #command: /docker-entrypoint-initdb.d/01_tune-postgis.sh && echo 'tuned' && postgres -c 'config_file=/etc/postgresql/postgresql.conf'
 
   import-data:
     image: "openmaptiles/import-data:${TOOLS_VERSION}"
     env_file: .env
     networks:
-      - postgres_conn
+      - postgres
 
-  openmaptiles-tools:
+  openmaptiles-tools: &openmaptiles-tools
     image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
     env_file: .env
     environment:
       # Must match the version of this file (first line)
       # download-osm will use it when generating a composer file
-      MAKE_DC_VERSION: "2.3"
-      # Allow DIFF_MODE to be overwritten from shell
+      MAKE_DC_VERSION: "3"
+      # Allow DIFF_MODE, MIN_ZOOM, and MAX_ZOOM to be overwritten from shell
       DIFF_MODE: ${DIFF_MODE}
+      MIN_ZOOM: ${MIN_ZOOM}
+      MAX_ZOOM: ${MAX_ZOOM}
+      #Provide BBOX from *.bbox file if exists, else from .env
+      BBOX: ${BBOX}
+      # Imposm configuration file describes how to load updates when enabled
+      IMPOSM_CONFIG_FILE: ${IMPOSM_CONFIG_FILE}
+      # Control import-sql processes
+      MAX_PARALLEL_PSQL: ${MAX_PARALLEL_PSQL}
+      PGDATABASE: ${PGDATABASE:-openmaptiles}
+      PGUSER: ${PGUSER:-openmaptiles}
+      PGPASSWORD: ${PGPASSWORD:-openmaptiles}
+      PGPORT: ${PGPORT:-5432}
+      MBTILES_FILE: ${MBTILES_FILE}
     networks:
-      - postgres_conn
+      - postgres
     volumes:
       - .:/tileset
       - ./data:/import
+      - ./data:/export
       - ./build/sql:/sql
       - ./build:/mapping
       - ./cache:/cache
+      - ./style:/style
+
+  update-osm:
+    <<: *openmaptiles-tools
+    command: import-update
 
   generate-changed-vectortiles:
     image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"
@@ -52,8 +82,16 @@ services:
       - ./data:/export
       - ./build/openmaptiles.tm2source:/tm2source
     networks:
-      - postgres_conn
+      - postgres
     env_file: .env
+    environment:
+      MBTILES_NAME: ${MBTILES_FILE}
+      # Control tilelive-copy threads
+      COPY_CONCURRENCY: ${COPY_CONCURRENCY}
+      PGDATABASE: ${PGDATABASE:-openmaptiles}
+      PGUSER: ${PGUSER:-openmaptiles}
+      PGPASSWORD: ${PGPASSWORD:-openmaptiles}
+      PGPORT: ${PGPORT:-5432}
 
   generate-vectortiles:
     image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"
@@ -61,21 +99,49 @@ services:
       - ./data:/export
       - ./build/openmaptiles.tm2source:/tm2source
     networks:
-      - postgres_conn
+      - postgres
     env_file: .env
     environment:
+      MBTILES_NAME: ${MBTILES_FILE}
       BBOX: ${BBOX}
       MIN_ZOOM: ${MIN_ZOOM}
       MAX_ZOOM: ${MAX_ZOOM}
-      FILTER_MAPNIK_OUTPUT: ${FILTER_MAPNIK_OUTPUT}
+      # Control tilelive-copy threads
+      COPY_CONCURRENCY: ${COPY_CONCURRENCY}
+      #
+      PGDATABASE: ${PGDATABASE:-openmaptiles}
+      PGUSER: ${PGUSER:-openmaptiles}
+      PGPASSWORD: ${PGPASSWORD:-openmaptiles}
+      PGPORT: ${PGPORT:-5432}
 
   postserve:
     image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
-    command: "postserve openmaptiles.yaml --verbose --port ${PPORT:-8090}"
+    command: "postserve ${TILESET_FILE} --verbose --serve=${OMT_HOST:-http://localhost}:${PPORT:-8090}"
     env_file: .env
+    environment:
+      TILESET_FILE: ${TILESET_FILE}
     networks:
-      - postgres_conn
+      - postgres
     ports:
       - "${PPORT:-8090}:${PPORT:-8090}"
     volumes:
       - .:/tileset
+
+  maputnik_editor:
+    image: "maputnik/editor"
+    ports:
+      - "8088:8888"
+
+  tileserver-gl:
+    image: "maptiler/tileserver-gl:latest"
+    command:
+      - --port
+      - "${TPORT:-8080}"
+      - --config
+      - "/style/config.json"
+    ports:
+      - "${TPORT:-8080}:${TPORT:-8080}"
+    volumes:
+      - ./data:/data
+      - ./style:/style
+      - ./build:/build

europe.sh

@@ -0,0 +1,150 @@
+set -e
+
+#area=europe
+area=planet
+
+make refresh-docker-images
+
+# Show mem info
+mem=$( grep MemTotal /proc/meminfo | awk '{print $2}' | xargs -I {} echo "scale=4; {}/1024^2" | bc )
+echo "System memory (GB): ${mem}"
+grep SwapTotal /proc/meminfo
+echo "CPU number: $(grep -c processor /proc/cpuinfo) x $(grep "bogomips" /proc/cpuinfo | head -1)"
+grep Free /proc/meminfo
+
+
+make destroy-db
+make init-dirs
+
+# rm -f "./data/${area}.mbtiles"
+#echo "====> : Downloading ${area} from ${osm_server:-any source}..."
+#area=$area make "download${osm_server:+-${osm_server}}"
+
+make clean
+make all
+
+make start-db
+make import-data
+
+# about 1.25hrs, Presumably Disk IO limited.
+# If there is an option to double the amount of processes this might
+# also help. Seeing about 50% usage per core
+# [May 21 08:52:53] [INFO] Reading OSM data took: 22m9.040318577s
+# [May 21 09:42:37] [INFO] Writing OSM data took: 49m44.555518107s
+# [May 21 09:45:15] [INFO] Importing OSM data took: 52m21.813870474s
+# [May 21 09:45:15] [INFO] [PostGIS] Rotating tables took: 38.69062ms
+# [May 21 09:45:15] [INFO] Imposm took: 1h14m30.893125729s
+make import-osm area=$area
+
+make import-borders area=$area
+
+
+make import-wikidata
+
+# It not doing the materialized view in parallel despite postgres 12?!
+# argh
+make import-sql
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Analyze PostgreSQL tables"
+make analyze-db
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Testing PostgreSQL tables to match layer definitions metadata"
+# TODO: this right here shows us whats wrong. settings aren't optimal (see performance tips tabs)
+# shared_buffersm work_mem, max_worker_processes,
+# TODO, Ideal solution: Autoconfigure according to performance tips (and max_worker_processes == HT Cores ( or 1.5X HT Cores)
+# (1.5x HT Cores might make sense as most work is probably memory-limited (latency), not CPU limited)
+make test-perf-null
+
+#echo " "
+#echo "-------------------------------------------------------------------------------------"
+#
+#if [[ "$(source .env ; echo "$BBOX")" = "-180.0,-85.0511,180.0,85.0511" ]]; then
+#  if [[ "$area" != "planet" ]]; then
+#    echo "====> : Compute bounding box for tile generation"
+#    make generate-bbox-file ${MIN_ZOOM:+MIN_ZOOM="${MIN_ZOOM}"} ${MAX_ZOOM:+MAX_ZOOM="${MAX_ZOOM}"}
+#  else
+#    echo "====> : Skipping bbox calculation when generating the entire planet"
+#  fi
+#
+#else
+#  echo "====> : Bounding box is set in .env file"
+#fi
+#
+##echo " "
+##echo "-------------------------------------------------------------------------------------"
+##echo "====> : Start generating MBTiles (containing gzipped MVT PBF) from a TM2Source project. "
+##echo "      : TM2Source project definitions : ./build/openmaptiles.tm2source/data.yml "
+##echo "      : Output MBTiles: ./data/${area}.mbtiles  "
+##echo "      : Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/generate-vectortiles "
+##echo "      : We are using a lot of Mapbox Open Source tools! : https://github.com/mapbox "
+##echo "      : Thank you https://www.mapbox.com !"
+##echo "      : See other MVT tools : https://github.com/mapbox/awesome-vector-tiles "
+##echo "      :  "
+##echo "      : You will see a lot of deprecated warning in the log! This is normal!  "
+##echo "      :    like :  Mapnik LOG>  ... is deprecated and will be removed in Mapnik 4.x ... "
+make generate-tiles area=europe
+#OVERLAY
+##
+##echo " "
+##echo "-------------------------------------------------------------------------------------"
+##echo "====> : Stop PostgreSQL service ( but we keep PostgreSQL data volume for debugging )"
+##make stop-db
+##
+##echo " "
+##echo "-------------------------------------------------------------------------------------"
+##echo "====> : Inputs - Outputs md5sum for debugging "
+##rm -f ./data/quickstart_checklist.chk
+##{
+##  find build -type f | sort | xargs md5sum
+##  find data -type f | sort | xargs md5sum
+##} >> ./data/quickstart_checklist.chk
+##cat ./data/quickstart_checklist.chk
+##
+##ENDTIME=$(date +%s)
+##
+##echo " "
+##echo " "
+##echo "-------------------------------------------------------------------------------------"
+##echo "--                           S u m m a r y                                         --"
+##echo "-------------------------------------------------------------------------------------"
+##echo " "
+##echo "-------------------------------------------------------------------------------------"
+##echo "====> : (disk space) We have created a lot of docker images: "
+##echo "      : Hint: you can remove with:  docker rmi IMAGE "
+##docker images | grep openmaptiles
+##
+##echo " "
+##echo "-------------------------------------------------------------------------------------"
+##echo "====> : (disk space) We have created the new vectortiles ( ./data/${area}.mbtiles ) "
+##echo "      : Please respect the licenses (OdBL for OSM data) of the sources when distributing the MBTiles file."
+##echo "      : Data directory content:"
+##ls -la ./data
+##
+##echo " "
+##echo "-------------------------------------------------------------------------------------"
+##echo "The ./quickstart.sh $area  is finished! "
+##echo "It took $((ENDTIME - STARTTIME)) seconds to complete"
+##echo "We saved the log file to $log_file  (for debugging) You can compare with the travis log !"
+##echo " "
+##echo "Start experimenting and check the QUICKSTART.MD file!"
+##echo " "
+##echo "*  Use   make start-maputnik     to explore tile generation on request"
+##echo "*  Use   make start-tileserver   to view pre-generated tiles"
+##echo " "
+##echo "Available help commands (make help)  "
+##make help
+##
+##echo "-------------------------------------------------------------------------------------"
+##echo " Acknowledgments "
+##echo " Generated vector tiles are produced work of OpenStreetMap data. "
+##echo " Such tiles are reusable under CC-BY license granted by OpenMapTiles team: "
+##echo "   https://github.com/openmaptiles/openmaptiles/#license "
+##echo " Maps made with these vector tiles must display a visible credit: "
+##echo "   © OpenMapTiles © OpenStreetMap contributors "
+##echo " "
+##echo " Thanks to all free, open source software developers and Open Data Contributors!    "
+##echo "-------------------------------------------------------------------------------------"

integrity.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# A script to run the "integrity" continuous integration script.
+
+area=monaco
+echo MIN_ZOOM=0 >> .env
+echo MAX_ZOOM=14 >> .env
+./quickstart.sh $area
+export TEST_MODE=yes
+make generate-devdoc
+area=europe/monaco
+echo DIFF_MODE=true >> .env
+
+# Cleanup
+rm -fr data build cache
+# Create data/$area.repl.json
+make download-geofabrik area=$area
+# Download 2+ month old data
+export old_date=$(date --date="$(date +%Y-%m-15) -2 month" +'%y%m01')
+echo Downloading $old_date extract of $area
+docker-compose run --rm --user=$(id -u):$(id -g) openmaptiles-tools sh -c "wget -O data/$area.osm.pbf http://download.geofabrik.de/$area-$old_date.osm.pbf"
+# Initial import and tile generation
+./quickstart.sh $area
+sleep 2
+echo Downloading updates
+# Loop to recover from potential "ERROR 429: Too Many Requests"
+docker-compose run --rm --user=$(id -u):$(id -g) openmaptiles-tools sh -c "
+while ! osmupdate --keep-tempfiles --base-url=$(sed -n 's/ *\"replication_url\": //p' data/$area.repl.json) data/$area.osm.pbf data/changes.osc.gz ; do 
+  sleep 2;
+  echo Sleeping...;
+  sleep 630;
+done"
+echo Downloading updates completed
+echo Importing updates
+make import-diff
+echo Generating new tiles
+make generate-tiles-pg

layers/aerodrome_label/aerodrome_label.sql

@@ -0,0 +1,62 @@
+
+-- etldoc: layer_aerodrome_label[shape=record fillcolor=lightpink, style="rounded,filled", label="layer_aerodrome_label | <z8> z8 | <z9> z9 | <z10_> z10+" ] ;
+
+CREATE OR REPLACE FUNCTION layer_aerodrome_label(bbox geometry,
+                                                 zoom_level integer)
+    RETURNS TABLE
+            (
+                id       bigint,
+                geometry geometry,
+                name     text,
+                name_en  text,
+                name_de  text,
+                tags     hstore,
+                class    text,
+                iata     text,
+                icao     text,
+                ele      int,
+                ele_ft   int
+            )
+AS
+$$
+SELECT
+    -- etldoc: osm_aerodrome_label_point -> layer_aerodrome_label:z8
+    -- etldoc: osm_aerodrome_label_point -> layer_aerodrome_label:z9
+    ABS(osm_id) AS id, -- mvt feature IDs can't be negative
+    geometry,
+    name,
+    COALESCE(NULLIF(name_en, ''), name) AS name_en,
+    COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
+    tags,
+    aerodrome_type AS class,
+    NULLIF(iata, '') AS iata,
+    NULLIF(icao, '') AS icao,
+    substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele,
+    round(substring(ele FROM E'^(-?\\d+)(\\D|$)')::int * 3.2808399)::int AS ele_ft
+FROM osm_aerodrome_label_point
+WHERE geometry && bbox
+  AND aerodrome_type = 'international'
+  AND iata <> ''
+  AND zoom_level BETWEEN 8 AND 9
+
+UNION ALL
+
+SELECT
+    -- etldoc: osm_aerodrome_label_point -> layer_aerodrome_label:z10_
+    ABS(osm_id) AS id, -- mvt feature IDs can't be negative
+    geometry,
+    name,
+    COALESCE(NULLIF(name_en, ''), name) AS name_en,
+    COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
+    tags,
+    aerodrome_type AS class,
+    NULLIF(iata, '') AS iata,
+    NULLIF(icao, '') AS icao,
+    substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele,
+    round(substring(ele FROM E'^(-?\\d+)(\\D|$)')::int * 3.2808399)::int AS ele_ft
+FROM osm_aerodrome_label_point
+WHERE geometry && bbox
+  AND zoom_level >= 10;
+$$ LANGUAGE SQL STABLE
+                -- STRICT
+                PARALLEL SAFE;

layers/aerodrome_label/aerodrome_label.yaml

@@ -1,13 +1,13 @@
 layer:
-  id: "aerodrome_label"
+  id: aerodrome_label
   description: |
       [Aerodrome labels](http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome)
   buffer_size: 64
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
   fields:
-    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the aerodrome.
-    name_en: English name `name:en` if available, otherwise `name`.
-    name_de: German name `name:de` if available, otherwise `name` or `name:en`.
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the aerodrome. Language-specific values are in `name:xx`.
+    name_en: English name `name:en` if available, otherwise `name`. This is deprecated and will be removed in a future release in favor of `name:en`.
+    name_de: German name `name:de` if available, otherwise `name` or `name:en`. This is deprecated and will be removed in a future release in favor of `name:de`.
     class:
       description: |
           Distinguish between more and less important aerodromes.
@@ -38,13 +38,13 @@ layer:
     ele_ft: Elevation (`ele`) in feets.
   datasource:
     geometry_field: geometry
-    key_field: osm_id
+    key_field: id
     key_field_as_attribute: no
     srid: 900913
-    query: (SELECT osm_id, geometry, name, name_en, name_de, {name_languages}, class, iata, icao, ele, ele_ft FROM layer_aerodrome_label (!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
+    query: (SELECT id, geometry, name, name_en, name_de, {name_languages}, class, iata, icao, ele, ele_ft FROM layer_aerodrome_label(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./update_aerodrome_label_point.sql
-  - ./layer.sql
+  - ./aerodrome_label.sql
 datasources:
   - type: imposm3
     mapping_file: ./mapping.yaml

layers/aerodrome_label/layer.sql

@@ -1,41 +0,0 @@
-
--- etldoc: layer_aerodrome_label[shape=record fillcolor=lightpink, style="rounded,filled", label="layer_aerodrome_label | <z10_> z10+" ] ;
-
-CREATE OR REPLACE FUNCTION layer_aerodrome_label(
-    bbox geometry,
-    zoom_level integer,
-    pixel_width numeric)
-  RETURNS TABLE(
-    osm_id bigint,
-    geometry geometry,
-    name text,
-    name_en text,
-    name_de text,
-    tags hstore,
-    class text,
-    iata text,
-    icao text,
-    ele int,
-    ele_ft int) AS
-$$
-  -- etldoc: osm_aerodrome_label_point -> layer_aerodrome_label:z10_
-  SELECT
-    osm_id,
-    geometry,
-    name,
-    COALESCE(NULLIF(name_en, ''), name) AS name_en,
-    COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
-    tags,
-    CASE
-      %%FIELD_MAPPING: class %%
-      ELSE 'other'
-    END AS class,
-    NULLIF(iata, '') AS iata,
-    NULLIF(icao, '') AS icao,
-    substring(ele from E'^(-?\\d+)(\\D|$)')::int AS ele,
-    round(substring(ele from E'^(-?\\d+)(\\D|$)')::int*3.2808399)::int AS ele_ft
-  FROM osm_aerodrome_label_point
-  WHERE geometry && bbox AND zoom_level >= 10;
-$$
-LANGUAGE SQL
-IMMUTABLE PARALLEL SAFE;

layers/aerodrome_label/style.json

@@ -0,0 +1,69 @@
+{
+  "layers": [
+    {
+      "id": "airport-label-major",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "aerodrome_label",
+      "minzoom": 8,
+      "maxzoom": 17,
+      "layout": {
+        "icon-size": 1,
+        "text-font": [
+          "Noto Sans Italic"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              8,
+              10
+            ],
+            [
+              14,
+              12
+            ]
+          ]
+        },
+        "icon-image": "aerodrome.12",
+        "text-field": {
+          "stops": [
+            [
+              8,
+              " "
+            ],
+            [
+              11,
+              "{name:latin}\n{name:nonlatin}"
+            ]
+          ]
+        },
+        "visibility": "visible",
+        "text-anchor": "top",
+        "text-offset": [
+          0,
+          0.6
+        ],
+        "text-padding": 2,
+        "text-optional": true,
+        "symbol-z-order": "auto",
+        "text-max-width": 9,
+        "icon-allow-overlap": false,
+        "text-allow-overlap": false
+      },
+      "paint": {
+        "text-color": "#5e3b9e",
+        "text-halo-blur": 0.5,
+        "text-halo-color": "rgba(255, 255, 255, 0.8)",
+        "text-halo-width": 1
+      },
+      "filter": [
+        "all",
+        [
+          "has",
+          "iata"
+        ]
+      ],
+      "order": 185
+    }
+  ]
+}

layers/aerodrome_label/update_aerodrome_label_point.sql

@@ -1,51 +1,111 @@
 DROP TRIGGER IF EXISTS trigger_flag ON osm_aerodrome_label_point;
+DROP TRIGGER IF EXISTS trigger_store ON osm_aerodrome_label_point;
 DROP TRIGGER IF EXISTS trigger_refresh ON aerodrome_label.updates;
 
--- etldoc: osm_aerodrome_label_point -> osm_aerodrome_label_point
-CREATE OR REPLACE FUNCTION update_aerodrome_label_point() RETURNS VOID AS $$
-BEGIN
-  UPDATE osm_aerodrome_label_point
-  SET geometry = ST_Centroid(geometry)
-  WHERE ST_GeometryType(geometry) <> 'ST_Point';
-
-  UPDATE osm_aerodrome_label_point
-  SET tags = update_tags(tags, geometry)
-  WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
-END;
-$$ LANGUAGE plpgsql;
-
-SELECT update_aerodrome_label_point();
-
--- Handle updates
+-- Partial index for zoom 8/9 queries
+CREATE INDEX IF NOT EXISTS osm_aerodrome_label_point_type_partial_idx
+    ON osm_aerodrome_label_point USING gist (geometry)
+    WHERE aerodrome_type = 'international'
+      AND iata <> '';
 
 CREATE SCHEMA IF NOT EXISTS aerodrome_label;
 
-CREATE TABLE IF NOT EXISTS aerodrome_label.updates(id serial primary key, t text, unique (t));
-CREATE OR REPLACE FUNCTION aerodrome_label.flag() RETURNS trigger AS $$
+CREATE TABLE IF NOT EXISTS aerodrome_label.osm_ids
+(
+    osm_id bigint PRIMARY KEY
+);
+
+-- etldoc: osm_aerodrome_label_point -> osm_aerodrome_label_point
+CREATE OR REPLACE FUNCTION update_aerodrome_label_point(full_update boolean) RETURNS void AS
+$$
+    UPDATE osm_aerodrome_label_point
+    SET geometry = ST_Centroid(geometry)
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM aerodrome_label.osm_ids))
+        AND ST_GeometryType(geometry) <> 'ST_Point';
+
+    UPDATE osm_aerodrome_label_point
+    SET tags = update_tags(tags, geometry)
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM aerodrome_label.osm_ids))
+        AND COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL
+        AND tags != update_tags(tags, geometry);
+
+    UPDATE osm_aerodrome_label_point
+    SET aerodrome_type=
+       CASE
+	    %%FIELD_MAPPING: class %%
+	    ELSE 'other' END
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM aerodrome_label.osm_ids))
+    AND aerodrome_type !=
+       CASE
+	    %%FIELD_MAPPING: class %%
+	    ELSE 'other' END;
+$$ LANGUAGE SQL;
+
+SELECT update_aerodrome_label_point(true);
+
+-- Handle updates
+
+CREATE OR REPLACE FUNCTION aerodrome_label.store() RETURNS trigger AS
+$$
 BEGIN
-    INSERT INTO aerodrome_label.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
-    RETURN null;
+    INSERT INTO aerodrome_label.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
+    RETURN NULL;
 END;
-$$ language plpgsql;
+$$ LANGUAGE plpgsql;
+
+CREATE TABLE IF NOT EXISTS aerodrome_label.updates
+(
+    id serial PRIMARY KEY,
+    t text,
+    UNIQUE (t)
+);
+CREATE OR REPLACE FUNCTION aerodrome_label.flag() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO aerodrome_label.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION aerodrome_label.refresh() RETURNS trigger AS
-  $BODY$
-  BEGIN
+$$
+DECLARE
+    t TIMESTAMP WITH TIME ZONE := clock_timestamp();
+BEGIN
     RAISE LOG 'Refresh aerodrome_label';
-    PERFORM update_aerodrome_label_point();
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE aerodrome_label.osm_ids;
+    ANALYZE osm_aerodrome_label_point;
+
+    PERFORM update_aerodrome_label_point(false);
+    -- noinspection SqlWithoutWhere
+    DELETE FROM aerodrome_label.osm_ids;
+    -- noinspection SqlWithoutWhere
     DELETE FROM aerodrome_label.updates;
-    RETURN null;
-  END;
-  $BODY$
-language plpgsql;
+
+    RAISE LOG 'Refresh aerodrome_label done in %', age(clock_timestamp(), t);
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_store
+    AFTER INSERT OR UPDATE
+    ON osm_aerodrome_label_point
+    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
+EXECUTE PROCEDURE aerodrome_label.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE ON osm_aerodrome_label_point
+    AFTER INSERT OR UPDATE
+    ON osm_aerodrome_label_point
     FOR EACH STATEMENT
-    EXECUTE PROCEDURE aerodrome_label.flag();
+    WHEN (pg_trigger_depth() < 1)
+EXECUTE PROCEDURE aerodrome_label.flag();
 
 CREATE CONSTRAINT TRIGGER trigger_refresh
-    AFTER INSERT ON aerodrome_label.updates
+    AFTER INSERT
+    ON aerodrome_label.updates
     INITIALLY DEFERRED
     FOR EACH ROW
-    EXECUTE PROCEDURE aerodrome_label.refresh();
+EXECUTE PROCEDURE aerodrome_label.refresh();

layers/aeroway/aeroway.sql

@@ -0,0 +1,70 @@
+-- etldoc: layer_aeroway[shape=record fillcolor=lightpink, style="rounded,filled",
+-- etldoc:     label="layer_aeroway |<z10> z10|<z11> z11|<z12> z12|<z13> z13|<z14_> z14+" ];
+
+CREATE OR REPLACE FUNCTION layer_aeroway(bbox geometry, zoom_level int)
+    RETURNS TABLE
+            (
+                geometry geometry,
+                class    text,
+                ref      text
+            )
+AS
+$$
+SELECT geometry, aeroway AS class, ref
+FROM (
+         -- etldoc:  osm_aeroway_linestring_gen_z10 -> layer_aeroway:z10
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_linestring_gen_z10
+         WHERE zoom_level = 10
+         UNION ALL
+         -- etldoc:  osm_aeroway_linestring_gen_z11 -> layer_aeroway:z11
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_linestring_gen_z11
+         WHERE zoom_level = 11
+         UNION ALL
+         -- etldoc:  osm_aeroway_linestring_gen_z12 -> layer_aeroway:z12
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_linestring_gen_z12
+         WHERE zoom_level = 12
+         UNION ALL
+         -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z13
+         -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z14_
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_linestring
+         WHERE zoom_level >= 13
+         UNION ALL
+         -- etldoc:  osm_aeroway_polygon_gen_z10 -> layer_aeroway:z10
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_polygon_gen_z10
+         WHERE zoom_level = 10
+         UNION ALL
+         -- etldoc:  osm_aeroway_polygon_gen_z11 -> layer_aeroway:z11
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_polygon_gen_z11
+         WHERE zoom_level = 11
+         UNION ALL
+         -- etldoc:  osm_aeroway_polygon_gen_z12 -> layer_aeroway:z12
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_polygon_gen_z12
+         WHERE zoom_level = 12
+         UNION ALL
+         -- etldoc:  osm_aeroway_polygon_gen_z13 -> layer_aeroway:z13
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_polygon_gen_z13
+         WHERE zoom_level = 13
+         UNION ALL
+         -- etldoc:  osm_aeroway_polygon -> layer_aeroway:z14_
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_polygon
+         WHERE zoom_level >= 14
+         UNION ALL
+         
+         -- etldoc:  osm_aeroway_point -> layer_aeroway:z14_
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_point
+         WHERE zoom_level >= 14
+     ) AS zoom_levels
+WHERE geometry && bbox;
+$$ LANGUAGE SQL STABLE
+                -- STRICT
+                PARALLEL SAFE;

layers/aeroway/aeroway.yaml

@@ -19,11 +19,12 @@ layer:
       - helipad
       - taxiway
       - apron
+      - gate
   datasource:
     geometry_field: geometry
     query: (SELECT geometry, ref, class FROM layer_aeroway(!bbox!, z(!scale_denominator!))) AS t
 schema:
-  - ./layer.sql
+  - ./aeroway.sql
 datasources:
   - type: imposm3
     mapping_file: ./mapping.yaml

layers/aeroway/layer.sql

@@ -1,45 +0,0 @@
--- etldoc: layer_aeroway[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_aeroway |<z10> z10|<z11> z11|<z12> z12|<z13> z13|<z14_> z14+" ];
-
-CREATE OR REPLACE FUNCTION layer_aeroway(bbox geometry, zoom_level int)
-RETURNS TABLE(geometry geometry, class text, ref text) AS $$
-    SELECT geometry, aeroway AS class, ref FROM (
-        -- etldoc:  osm_aeroway_linestring_gen3 -> layer_aeroway:z10
-        SELECT geometry, aeroway, ref
-        FROM osm_aeroway_linestring_gen3 WHERE zoom_level = 10
-        UNION ALL
-        -- etldoc:  osm_aeroway_linestring_gen2 -> layer_aeroway:z11
-        SELECT geometry, aeroway, ref
-        FROM osm_aeroway_linestring_gen2 WHERE zoom_level = 11
-        UNION ALL
-        -- etldoc:  osm_aeroway_linestring_gen1 -> layer_aeroway:z12
-        SELECT geometry, aeroway, ref
-        FROM osm_aeroway_linestring_gen1 WHERE zoom_level = 12
-        UNION ALL
-        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z13
-        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z14_
-        SELECT geometry, aeroway, ref
-        FROM osm_aeroway_linestring WHERE zoom_level >= 13
-        UNION ALL
-
-        -- etldoc:  osm_aeroway_polygon_gen3 -> layer_aeroway:z10
-        -- etldoc:  osm_aeroway_polygon_gen3 -> layer_aeroway:z11
-        SELECT geometry, aeroway, ref
-        FROM osm_aeroway_polygon_gen3 WHERE zoom_level BETWEEN 10 AND 11
-        UNION ALL
-        -- etldoc:  osm_aeroway_polygon_gen2 -> layer_aeroway:z12
-        SELECT geometry, aeroway, ref
-        FROM osm_aeroway_polygon_gen2 WHERE zoom_level = 12
-        UNION ALL
-        -- etldoc:  osm_aeroway_polygon_gen1 -> layer_aeroway:z13
-        SELECT geometry, aeroway, ref
-        FROM osm_aeroway_polygon_gen1 WHERE zoom_level = 13
-        UNION ALL
-        -- etldoc:  osm_aeroway_polygon -> layer_aeroway:z14_
-        SELECT geometry, aeroway, ref
-        FROM osm_aeroway_polygon WHERE zoom_level >= 14
-    ) AS zoom_levels
-    WHERE geometry && bbox;
-$$
-LANGUAGE SQL IMMUTABLE
-PARALLEL SAFE;

layers/aeroway/mapping.yaml

@@ -1,34 +1,40 @@
 generalized_tables:
-  # etldoc: imposm3 -> osm_aeroway_linestring_gen3
-  aeroway_linestring_gen3:
-    source: aeroway_linestring_gen2
+  # etldoc: osm_aeroway_linestring_gen_z11 -> osm_aeroway_linestring_gen_z10
+  aeroway_linestring_gen_z10:
+    source: aeroway_linestring_gen_z11
     tolerance: ZRES11
 
-  # etldoc: imposm3 -> osm_aeroway_linestring_gen2
-  aeroway_linestring_gen2:
-    source: aeroway_linestring_gen1
+  # etldoc: osm_aeroway_linestring_gen_z12 -> osm_aeroway_linestring_gen_z11
+  aeroway_linestring_gen_z11:
+    source: aeroway_linestring_gen_z12
     tolerance: ZRES12
 
-  # etldoc: imposm3 -> osm_aeroway_linestring_gen1
-  aeroway_linestring_gen1:
+  # etldoc: osm_aeroway_linestring -> osm_aeroway_linestring_gen_z12
+  aeroway_linestring_gen_z12:
     source: aeroway_linestring
     sql_filter: ST_IsValid(geometry)
     tolerance: ZRES13
 
-  # etldoc: imposm3 -> osm_aeroway_polygon_gen3
-  aeroway_polygon_gen3:
-    source: aeroway_polygon_gen2
+  # etldoc: osm_aeroway_polygon_gen_z11 -> osm_aeroway_polygon_gen_z10
+  aeroway_polygon_gen_z10:
+    source: aeroway_polygon_gen_z11
+    sql_filter: area>power(ZRES9,2)
+    tolerance: ZRES10
+
+  # etldoc: osm_aeroway_polygon_gen_z12 -> osm_aeroway_polygon_gen_z11
+  aeroway_polygon_gen_z11:
+    source: aeroway_polygon_gen_z12
     sql_filter: area>power(ZRES10,2)
     tolerance: ZRES11
 
-  # etldoc: imposm3 -> osm_aeroway_polygon_gen2
-  aeroway_polygon_gen2:
-    source: aeroway_polygon_gen1
+  # etldoc: osm_aeroway_polygon_gen_z13 -> osm_aeroway_polygon_gen_z12
+  aeroway_polygon_gen_z12:
+    source: aeroway_polygon_gen_z13
     sql_filter: area>power(ZRES11,2)
     tolerance: ZRES12
 
-  # etldoc: imposm3 -> osm_aeroway_polygon_gen1
-  aeroway_polygon_gen1:
+  # etldoc: osm_aeroway_polygon -> osm_aeroway_polygon_gen_z13
+  aeroway_polygon_gen_z13:
     source: aeroway_polygon
     sql_filter: area>power(ZRES12,2) AND ST_IsValid(geometry)
     tolerance: ZRES13
@@ -80,3 +86,19 @@ tables:
       aeroway:
       - runway
       - taxiway
+      
+  # etldoc: imposm3 -> osm_aeroway_point
+  aeroway_point:
+    type: point
+    columns:
+    - *ref
+    - name: osm_id
+      type: id
+    - name: geometry
+      type: geometry
+    - name: aeroway
+      key: aeroway
+      type: string
+    mapping:
+      aeroway:
+      - gate

layers/aeroway/style.json

@@ -0,0 +1,203 @@
+{
+  "layers": [
+    {
+      "id": "aeroway_fill",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "aeroway",
+      "minzoom": 11,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-color": {
+          "stops": [
+            [
+              6,
+              "rgba(223, 223, 228, 1)"
+            ],
+            [
+              12,
+              "rgba(232, 231, 223, 1)"
+            ]
+          ]
+        },
+        "fill-opacity": 1
+      },
+      "metadata": {},
+      "filter": [
+        "==",
+        "$type",
+        "Polygon"
+      ],
+      "order": 3
+    },
+    {
+      "id": "aeroway_runway",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "aeroway",
+      "minzoom": 11,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(178, 181, 209, 1)",
+        "line-width": {
+          "base": 1.2,
+          "stops": [
+            [
+              11,
+              3
+            ],
+            [
+              20,
+              48
+            ]
+          ]
+        },
+        "line-opacity": 1
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "$type",
+          "LineString"
+        ],
+        [
+          "==",
+          "class",
+          "runway"
+        ]
+      ],
+      "order": 22
+    },
+    {
+      "id": "aeroway_taxiway",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "aeroway",
+      "minzoom": 11,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(178, 181, 209, 1)",
+        "line-width": {
+          "base": 1.2,
+          "stops": [
+            [
+              11,
+              1
+            ],
+            [
+              20,
+              24
+            ]
+          ]
+        },
+        "line-opacity": 1
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "$type",
+          "LineString"
+        ],
+        [
+          "==",
+          "class",
+          "taxiway"
+        ]
+      ],
+      "order": 23
+    },
+    {
+      "id": "airport_label",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "aeroway",
+      "minzoom": 14,
+      "layout": {
+        "text-font": [
+          "Noto Sans Italic",
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              15,
+              9
+            ],
+            [
+              19,
+              15
+            ]
+          ]
+        },
+        "text-field": "{ref}",
+        "visibility": "visible",
+        "symbol-placement": "line"
+      },
+      "paint": {
+        "text-color": "#333333",
+        "text-halo-color": "rgba(255, 255, 255, 0.8)",
+        "text-halo-width": 1
+      },
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "runway",
+          "taxiway"
+        ]
+      ],
+      "order": 186
+    },
+    {
+      "id": "airport_gate",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "aeroway",
+      "minzoom": 16.5,
+      "layout": {
+        "text-font": [
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              17,
+              9
+            ],
+            [
+              19,
+              15
+            ]
+          ]
+        },
+        "text-field": "{ref}",
+        "visibility": "visible"
+      },
+      "paint": {
+        "text-color": "rgba(135, 135, 135, 1)",
+        "text-halo-color": "rgba(255, 255, 255, 1)",
+        "text-halo-width": 1
+      },
+      "filter": [
+        "all",
+        [
+          "==",
+          "class",
+          "gate"
+        ]
+      ],
+      "order": 187
+    }
+  ]
+}

layers/boundary/boundary.yaml

@@ -1,19 +1,35 @@
 layer:
   id: "boundary"
+  requires:
+    tables:
+      - osm_border_linestring
+      - ne_10m_admin_0_countries
+      - ne_10m_admin_0_boundary_lines_land
+      - ne_10m_admin_1_states_provinces_lines
+      - ne_50m_admin_0_boundary_lines_land
+      - ne_110m_admin_0_boundary_lines_land
   description: |
-      Contains administrative boundaries as linestrings.
+      Contains administrative boundaries as linestrings and aboriginal lands as polygons.
       Until z4 [Natural Earth data](http://www.naturalearthdata.com/downloads/) is used after which
       OSM boundaries ([`boundary=administrative`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative))
       are present from z5 to z14 (also for maritime boundaries with `admin_level <= 2` at z4).
       OSM data contains several [`admin_level`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative#admin_level)
       but for most styles it makes sense to just style `admin_level=2` and `admin_level=4`.
   fields:
+    class:
+      description: |
+        Use the **class** to differentiate between different kinds of boundaries.  The class for `boundary=aboriginal_lands` is `aboriginal_lands`.
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value (area features only).
     admin_level: |
         OSM [admin_level](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative#admin_level)
         indicating the level of importance of this boundary.
         The `admin_level` corresponds to the lowest `admin_level`
         the line participates in.
         At low zoom levels the Natural Earth boundaries are mapped to the equivalent admin levels.
+    adm0_l: |
+        State name on the left of the border. For country boundaries only (`admin_level = 2`).
+    adm0_r: |
+        State name on the right of the border. For country boundaries only (`admin_level = 2`).
     disputed:
       description: |
           Mark with `1` if the border is disputed.
@@ -46,8 +62,10 @@ layer:
   buffer_size: 4
   datasource:
     geometry_field: geometry
-    query: (SELECT geometry, admin_level, disputed, disputed_name, claimed_by, maritime FROM layer_boundary(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, admin_level, adm0_l, adm0_r, disputed, disputed_name, claimed_by, maritime, class, name, {name_languages} FROM layer_boundary(!bbox!, z(!scale_denominator!))) AS t
 schema:
+  - ./update_boundary_polygon.sql
+  - ./boundary_name.sql
   - ./boundary.sql
 datasources:
   - type: imposm3

layers/boundary/boundary_name.sql

@@ -0,0 +1,105 @@
+DROP TABLE IF EXISTS osm_border_linestring_adm CASCADE;
+
+-- etldoc: osm_border_linestring -> osm_border_linestring_adm
+-- etldoc: osm_border_disp_linestring -> osm_border_linestring_adm
+-- etldoc: ne_10m_admin_0_countries -> osm_border_linestring_adm
+CREATE TABLE IF NOT EXISTS osm_border_linestring_adm AS ( 
+  WITH 
+    -- Prepare lines from osm to be merged
+	multiline AS (
+        SELECT osm_id,
+               ST_Node(ST_Collect(geometry)) AS geometry,
+               BOOL_OR(maritime) AS maritime,
+               FALSE AS disputed
+    	FROM osm_border_linestring
+    	WHERE admin_level = 2 AND ST_Dimension(geometry) = 1
+		    AND osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring)
+              GROUP BY osm_id
+		),
+
+	mergedline AS (
+		SELECT osm_id,
+      		     (ST_Dump(ST_LineMerge(geometry))).geom AS geometry,
+			maritime,
+			disputed
+  		FROM multiline
+		),
+    -- Create polygons from all boundaries to preserve real shape of country
+	polyg AS (
+    	SELECT (ST_Dump(
+        		 ST_Polygonize(geometry))).geom AS geometry  
+    	FROM (
+			SELECT (ST_Dump(
+      				ST_LineMerge(geometry))).geom AS geometry
+  			FROM (SELECT ST_Node(
+                          ST_Collect(geometry)) AS geometry
+    			FROM osm_border_linestring
+    			WHERE admin_level = 2 AND ST_Dimension(geometry) = 1
+                ) nodes
+			) linemerge
+  		), 
+
+    centroids AS (
+		SELECT polyg.geometry,
+			   ne.adm0_a3
+		FROM polyg,
+			 ne_10m_admin_0_countries AS ne
+		WHERE ST_Within(
+			   ST_PointOnSurface(polyg.geometry), ne.geometry)
+    	),
+
+	country_osm_polyg AS  (
+		SELECT country.adm0_a3,
+			   border.geometry
+  		FROM polyg border,
+			 centroids country
+  		WHERE ST_Within(country.geometry, border.geometry)
+	),
+
+	rights AS (
+        SELECT osm_id,
+			   adm0_r,
+			   geometry,
+			   maritime,
+			   disputed
+		FROM (
+			SELECT a.osm_id AS osm_id,
+                   b.adm0_a3 AS adm0_r,
+                   a.geometry,
+                   a.maritime,
+                   a.disputed
+			FROM mergedline AS a
+			LEFT JOIN country_osm_polyg AS b
+            -- Create short line on the right of the boundary (mergedline) and find state where line lies.
+			ON ST_Within(
+				ST_OffsetCurve(
+				(ST_LineSubString(a.geometry, 0.3,0.3004)), 70, 'quad_segs=4 join=mitre'), b.geometry)
+            ) line_rights
+		)
+
+  SELECT osm_id,
+		 adm0_l,
+		 adm0_r,
+		 geometry,
+		 maritime,
+		 2::integer AS admin_level,
+		 disputed
+  FROM (
+    SELECT r.osm_id AS osm_id,
+           b.adm0_a3 AS adm0_l,
+           r.adm0_r AS adm0_r,
+           r.geometry,
+           r.maritime,
+           r.disputed
+    FROM rights AS r
+    LEFT JOIN country_osm_polyg AS b
+      -- Create short line on the left of the boundary (mergedline) and find state where line lies.
+      ON ST_Within(
+        ST_OffsetCurve(
+          (ST_LineSubString(r.geometry, 0.4,0.4004)), -70, 'quad_segs=4 join=mitre'), b.geometry)
+    ) both_lines
+);
+
+CREATE INDEX IF NOT EXISTS osm_border_linestring_adm_geom_idx
+  ON osm_border_linestring_adm
+  USING GIST (geometry);

layers/boundary/mapping.yaml

@@ -1,95 +1,95 @@
 generalized_tables:
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen11
-  border_disp_linestring_gen11:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 9600
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen10
-  border_disp_linestring_gen10:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 4800
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen9
-  border_disp_linestring_gen9:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 2400
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen8
-  border_disp_linestring_gen8:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 1200
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen7
-  border_disp_linestring_gen7:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 600
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen6
-  border_disp_linestring_gen6:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 300
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen5
-  border_disp_linestring_gen5:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 160
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen4
-  border_disp_linestring_gen4:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 80
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen3
-  border_disp_linestring_gen3:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 40
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen2
-  border_disp_linestring_gen2:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 20
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen1
-  border_disp_linestring_gen1:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: 10
-
-  # etldoc: osm_border_disp_relation -> osm_border_disp_linestring
+  # etldoc: osm_border_linestring -> osm_border_disp_linestring
   border_disp_linestring:
-    source: border_disp_relation
-    sql_filter: ST_GeometryType(geometry) = 'ST_LineString'
+    source: border_linestring
+    sql_filter: ST_GeometryType(geometry) = 'ST_LineString' AND (disputed OR dispute OR border_status = 'disputed' OR disputed_by <> '') AND admin_level = 2
+
+  # etldoc: osm_boundary_polygon_gen_z5 -> osm_boundary_polygon_gen_z4
+  boundary_polygon_gen_z4:
+    source: boundary_polygon_gen_z5
+    sql_filter: area>power(ZRES3,2)
+    tolerance: ZRES4
+
+  # etldoc: osm_boundary_polygon_gen_z6 -> osm_boundary_polygon_gen_z5
+  boundary_polygon_gen_z5:
+    source: boundary_polygon_gen_z6
+    sql_filter: area>power(ZRES4,2)
+    tolerance: ZRES5
+
+  # etldoc: osm_boundary_polygon_gen_z7 -> osm_boundary_polygon_gen_z6
+  boundary_polygon_gen_z6:
+    source: boundary_polygon_gen_z7
+    sql_filter: area>power(ZRES5,2)
+    tolerance: ZRES6
+
+  # etldoc: osm_boundary_polygon_gen_z8 -> osm_boundary_polygon_gen_z7
+  boundary_polygon_gen_z7:
+    source: boundary_polygon_gen_z8
+    sql_filter: area>power(ZRES6,2)
+    tolerance: ZRES7
+
+  # etldoc: osm_boundary_polygon_gen_z9 -> osm_boundary_polygon_gen_z8
+  boundary_polygon_gen_z8:
+    source: boundary_polygon_gen_z9
+    sql_filter: area>power(ZRES7,2)
+    tolerance: ZRES8
+
+  # etldoc: osm_boundary_polygon_gen_z10 -> osm_boundary_polygon_gen_z9
+  boundary_polygon_gen_z9:
+    source: boundary_polygon_gen_z10
+    sql_filter: area>power(ZRES8,2)
+    tolerance: ZRES9
+
+  # etldoc: osm_boundary_polygon_gen_z11 -> osm_boundary_polygon_gen_z10
+  boundary_polygon_gen_z10:
+    source: boundary_polygon_gen_z11
+    sql_filter: area>power(ZRES9,2)
+    tolerance: ZRES10
+
+  # etldoc: osm_boundary_polygon_gen_z12 -> osm_boundary_polygon_gen_z11
+  boundary_polygon_gen_z11:
+    source: boundary_polygon_gen_z12
+    sql_filter: area>power(ZRES10,2)
+    tolerance: ZRES11
+
+  # etldoc: osm_boundary_polygon_gen_z13 -> osm_boundary_polygon_gen_z12
+  boundary_polygon_gen_z12:
+    source: boundary_polygon_gen_z13
+    sql_filter: area>power(ZRES11,2)
+    tolerance: ZRES12
+
+  # etldoc: osm_boundary_polygon -> osm_boundary_polygon_gen_z13
+  boundary_polygon_gen_z13:
+    source: boundary_polygon
+    sql_filter: area>power(ZRES12,2) AND ST_IsValid(geometry)
+    tolerance: ZRES13
 
 
 tables:
-  # etldoc: imposm3 -> osm_border_disp_relation
-  border_disp_relation:
+  # etldoc: imposm3 -> osm_border_linestring
+  border_linestring:
     type: relation_member
+    filters:
+      require:
+        admin_level: [__any__]
+        boundary: [administrative]
     columns:
     - name: relation_id
       type: id
     - name: osm_id
       type: id
       from_member: true
+    - name: member
+      type: member_id
+    - name: type
+      type: member_type
     - name: geometry
       type: geometry
     - key: name
       name: name
       type: string
-    - key: boundary
-      name: boundary
-      type: string
+      # Used for disputed boundary, e.g. "Line of actual control"
+      from_member: true
     - key: admin_level
       name: admin_level
       type: integer
@@ -99,15 +99,193 @@ tables:
     - key: disputed_by
       name: disputed_by
       type: string
+      from_member: true
+    - key: dispute
+      name: dispute
+      type: bool
+      from_member: true
+    - key: disputed
+      name: disputed
+      type: bool
+      from_member: true
+    - key: border_status
+      name: border_status
+      type: string
+      from_member: true
     - key: maritime
       name: maritime
       type: bool
       from_member: true
+    - name: index
+      type: member_index
+    - name: role
+      type: member_role
+#    - name: type
+#      type: member_type
+    - key: boundary_type
+      name: boundary_type
+      type: string
+      from_member: true
+    - key: natural
+      name: natural
+      type: string
+      from_member: true
+    relation_types: [boundary]
+    mapping:
+      boundary:
+        - administrative
+      border_status:
+        - dispute
+      boundary_type:
+        - maritime
+
+  # etldoc: imposm3 -> osm_boundary_polygon
+  boundary_polygon:
+    type: polygon
+    filters:
+      require:
+        type: [boundary]
+        boundary: [aboriginal_lands]
+    columns:
+    - name: osm_id
+      type: id
+    - name: geometry
+      type: validated_geometry
+    - name: name
+      key: name
+      type: string
+    - name: tags
+      type: hstore_tags
+    - name: boundary
+      key: boundary
+      type: string
+    - name: area
+      type: area
+    mapping:
+      boundary:
+      - aboriginal_lands
+
+
+  # etldoc: imposm3 -> osm_border_disp_relation
+  border_disp_relation:
+    type: relation_member
+    columns:
+      - name: relation_id
+        type: id
+      - name: osm_id
+        type: id
+        from_member: true
+      - name: geometry
+        type: geometry
+      - key: name
+        name: name
+        type: string
+      - key: boundary
+        name: boundary
+        type: string
+      - key: admin_level
+        name: admin_level
+        type: integer
+      - key: claimed_by
+        name: claimed_by
+        type: string
+      - key: disputed_by
+        name: disputed_by
+        type: string
+      - key: maritime
+        name: maritime
+        type: bool
+        from_member: true
+      - name: index
+        type: member_index
+      - name: role
+        type: member_role
+      - name: type
+        type: member_type
     mapping:
       type: [boundary]
     filters:
       require:
-        #admin_level: ['2']
+        #admin_level: ['2'] # this used to be specified, re-enable if bugs show up with country borders
         admin_level: [__any__]
-        claimed_by: [__any__]
+        boundary: ['administrative'] # Filters out boundary	administrative_fraction and religious_administration
 
+  # FOr NUTS  in linestring version
+  administrative_relation:
+    type: relation
+    columns:
+      - name: osm_id
+        type: id
+      - key: name
+        name: name
+        type: string
+      - name: name_en
+        key: name:en
+        type: string
+      - name: name_nl
+        key: name:nl
+        type: string
+      - name: name_de
+        key: name:de
+        type: string
+      - name: name_fr
+        key: name:fr
+        type: string
+      - key: boundary
+        name: boundary
+        type: string
+      - key: admin_level
+        name: admin_level
+        type: integer
+    mapping:
+      boundary: [ 'administrative' ]
+    filters:
+      require:
+        admin_level: [ __any__ ]
+
+  administrative_member:
+    type: relation_member
+    columns:
+      - name: relation_id
+        type: id
+      - name: boundary_id
+        type: id
+        from_member: true
+      - key: admin_level
+        name: admin_level
+        type: integer
+      - key: maritime
+        name: maritime
+        type: bool
+        from_member: true
+      - name: index
+        type: member_index
+      - name: role
+        type: member_role
+      - name: type
+        type: member_type
+    mapping:
+      type: [boundary]
+    filters:
+      require:
+        admin_level: [__any__]
+        boundary: ['administrative']
+
+  administrative_boundary:
+    type: linestring
+    columns:
+      - name: osm_id
+        type: id
+      - name: geometry
+        type: geometry
+      - key: admin_level
+        name: admin_level
+        type: integer
+      - key: maritime
+        name: maritime
+        type: bool
+    mapping:
+      boundary: [ 'administrative' ]
+    filters:
+      require:
+        admin_level: [ __any__ ]

layers/boundary/nuts.sql

@@ -0,0 +1,193 @@
+-- This is very crude and not finetuned yet
+
+-- This statement can be deleted after the border importer image stops creating this object as a table
+DO
+$$
+    BEGIN
+        DROP TABLE IF EXISTS osm_boundary_polygon_nuts CASCADE;
+    EXCEPTION
+        WHEN wrong_object_type THEN
+    END;
+$$ LANGUAGE plpgsql;
+
+-- etldoc: osm_border_linestring -> osm_border_linestring_gen_z13
+-- etldoc: osm_border_linestring_adm -> osm_border_linestring_gen_z13
+DROP MATERIALIZED VIEW IF EXISTS osm_boundary_polygon_nuts CASCADE;
+CREATE MATERIALIZED VIEW osm_boundary_polygon_nuts AS
+(
+SELECT r.osm_id as relation_id,
+       r.name,
+       r.name_en,
+       r.name_nl,
+       r.name_de,
+       r.name_fr,
+       r.admin_level,
+       p.geometry
+FROM (
+         SELECT relation_id,
+                ST_BuildArea(ST_Node(ST_Collect(geometry))) as geometry
+         FROM osm_border_disp_relation
+         WHERE (role = 'outer' or role = 'inner')
+           AND ST_GeometryType(geometry) = 'ST_LineString'
+         GROUP BY relation_id
+     ) as p
+         LEFT JOIN osm_administrative_relation as r on r.osm_id = p.relation_id
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_idx ON osm_boundary_polygon_nuts USING gist (geometry);
+
+
+-- etldoc: osm_border_linestring -> osm_border_linestring_gen_z13
+-- etldoc: osm_border_linestring_adm -> osm_border_linestring_gen_z13
+DROP MATERIALIZED VIEW IF EXISTS osm_boundary_linestring CASCADE;
+CREATE MATERIALIZED VIEW osm_boundary_linestring AS
+SELECT osm_id,
+       geometry,
+       nuts_level,
+       nuts ->> 'l_nuts_0_name' as l_nuts_0_name,
+       nuts ->> 'l_nuts_1_name' as l_nuts_1_name,
+       nuts ->> 'l_nuts_2_name' as l_nuts_2_name,
+       nuts ->> 'l_nuts_3_name' as l_nuts_3_name,
+       nuts ->> 'l_nuts_4_name' as l_nuts_4_name,
+       nuts ->> 'l_nuts_5_name' as l_nuts_5_name,
+       nuts ->> 'r_nuts_0_name' as r_nuts_0_name,
+       nuts ->> 'r_nuts_1_name' as r_nuts_1_name,
+       nuts ->> 'r_nuts_2_name' as r_nuts_2_name,
+       nuts ->> 'r_nuts_3_name' as r_nuts_3_name,
+       nuts ->> 'r_nuts_4_name' as r_nuts_4_name,
+       nuts ->> 'r_nuts_5_name' as r_nuts_5_name
+--  Shouldnt be needed for the map
+--     nuts->'l_nuts_1_id' as l_nuts_1_id,
+--     nuts->'l_nuts_2_id' as l_nuts_2_id,
+--     nuts->'l_nuts_3_id' as l_nuts_3_id,
+--     nuts->'l_nuts_4_id' as l_nuts_4_id,
+--     nuts->'l_nuts_5_id' as l_nuts_5_id,
+--     nuts->'r_nuts_1_id' as r_nuts_1_id,
+--     nuts->'r_nuts_2_id' as r_nuts_2_id,
+--     nuts->'r_nuts_3_id' as r_nuts_3_id,
+--     nuts->'r_nuts_4_id' as r_nuts_4_id,
+--     nuts->'r_nuts_5_id' as r_nuts_5_id
+FROM (
+         SELECT osm_id,
+                geometry,
+                MIN(nuts_level) as nuts_level,
+                jsonb_object_agg(
+                        CONCAT(side, '_nuts_', nuts_level, '_name'), name
+                    )
+                    || jsonb_object_agg(
+                        CONCAT(side, '_nuts_', nuts_level, '_id'), -relation_id
+                    )           as nuts
+         FROM (
+                  SELECT b.osm_id,
+                         b.geometry,
+                         CASE
+                             WHEN r.admin_level = 10 THEN 6
+                             WHEN r.admin_level = 9 THEN 5
+                             WHEN r.admin_level = 8 THEN 4
+                             WHEN r.admin_level = 7 THEN 3
+                             WHEN r.admin_level = 6 THEN 2
+                             WHEN r.admin_level = 4 THEN 1
+                             -- No admin_level =3?
+                             WHEN r.admin_level = 2 THEN 0
+                             -- All other are stored as low priority NUTS, for future reference
+                             ELSE 1000 + r.admin_level
+                         END    as nuts_level,
+                         COALESCE(NULLIF(r.name_en,''), NULLIF(r.name,''), NULL) as name,
+                         r.relation_id,
+                         CASE
+                             WHEN
+                                 ST_Within(
+                                         ST_OffsetCurve(
+                                                 (ST_LineSubString(b.geometry, 0.499, 0.501)), 10,
+                                                 'quad_segs=4 join=mitre'
+                                             ),
+                                         r.geometry
+                                     )
+                                 THEN 'r'
+                             WHEN
+                                 ST_Within(
+                                         ST_OffsetCurve(
+                                                 (ST_LineSubString(b.geometry, 0.499, 0.501)), -10,
+                                                 'quad_segs=4 join=mitre'
+                                             ),
+                                         r.geometry
+                                     )
+                                 THEN 'l'
+                             ELSE 'unknown' -- TODO: Debug if this ever happens, if so our method isn't fool proof
+                             END    as side
+                  FROM osm_administrative_boundary as b
+                           INNER JOIN osm_administrative_member as m
+                                      ON b.osm_id = m.boundary_id
+                           INNER JOIN osm_boundary_polygon_nuts as r
+                                      ON m.relation_id = r.relation_id
+              ) as g
+         GROUP BY osm_id, geometry
+     ) as p /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS osm_boundary_linestring_idx ON osm_boundary_linestring USING gist (geometry);
+
+
+-- etldoc: layer_boundary[shape=record fillcolor=lightpink, style="rounded,filled",
+-- etldoc:     label="<sql> layer_boundary |<z0> z0 |<z1> z1 |<z2> z2 | <z3> z3 | <z4> z4 | <z5> z5 | <z6> z6 | <z7> z7 | <z8> z8 | <z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13+"]
+CREATE OR REPLACE FUNCTION layer_nuts(bbox geometry, zoom_level int)
+    RETURNS TABLE
+            (
+                geometry      geometry,
+                nuts_level    int,
+                l_nuts_0_name text,
+                l_nuts_1_name text,
+                l_nuts_2_name text,
+                l_nuts_3_name text,
+                l_nuts_4_name text,
+                l_nuts_5_name text,
+                r_nuts_0_name text,
+                r_nuts_1_name text,
+                r_nuts_2_name text,
+                r_nuts_3_name text,
+                r_nuts_4_name text,
+                r_nuts_5_name text
+            )
+AS
+$$
+SELECT geometry,
+       nuts_level,
+       l_nuts_0_name,
+       l_nuts_1_name,
+       l_nuts_2_name,
+       l_nuts_3_name,
+       l_nuts_4_name,
+       l_nuts_5_name,
+       r_nuts_0_name,
+       r_nuts_1_name,
+       r_nuts_2_name,
+       r_nuts_3_name,
+       r_nuts_4_name,
+       r_nuts_5_name
+FROM osm_boundary_linestring
+WHERE geometry && bbox
+  AND zoom_level >
+      (CASE
+           WHEN nuts_level = 0 THEN 2
+           WHEN nuts_level = 1 THEN 4
+           WHEN nuts_level = 2 THEN 6
+           WHEN nuts_level = 3 THEN 6
+           WHEN nuts_level = 4 THEN 8
+           WHEN nuts_level = 5 THEN 10
+          END)
+$$ LANGUAGE SQL STABLE
+    -- STRICT
+                PARALLEL SAFE;
+
+
+/*
+ r.name,
+        CASE
+         WHEN r.admin_level = 10 THEN 6
+         WHEN r.admin_level = 9 THEN 5
+         WHEN r.admin_level = 8 THEN 4
+         WHEN r.admin_level = 7 THEN 3
+         WHEN r.admin_level = 6 THEN 2
+         WHEN r.admin_level = 4 THEN 1
+         -- No admin_level =3?
+         WHEN r.admin_level = 2 THEN 0
+         ELSE null
+        END as nuts_level,
+ */

layers/boundary/nuts.yaml

@@ -0,0 +1,49 @@
+layer:
+  id: "nuts"
+  description: |
+      Contains administrative boundaries as linestrings (municipalities, counties, provinces, ...)
+      Administrative regions are translated to their equivalent NUTS/LAU classification
+      Fields indicate which NUTS-region is to the left and right of the linestring
+  fields:
+    nuts_level:
+        The mininum NUTS/LAU classification this linestring is part of.
+        NUTS only goes to 3 thus LAU 1 & 2 are mapped as NUTS 4 & 5.
+         NUTS 0 = Countries
+         NUTS 1 = Regions (e.g. Vlaams-brabant)
+         NUTS 2 = Provinces (e.g. Limburg)
+         NUTS 3 = Administrative arrondissements (e.g. Antwerpen, best to ignore these)
+         NUTS 4 = Municipalities (e.g. Lummen)
+         NUTS 5 = Villages/Suburbs (e.g. Linkhout)
+    l_nuts_0_name: |
+      Country on the left side of the linestring
+    l_nuts_1_name: |
+      Region on the left side of the linestring
+    l_nuts_2_name: |
+      Province on the left side of the linestring
+    l_nuts_3_name: |
+      Administrative arrondissement on the left side of the linestring
+    l_nuts_4_name: |
+      Municipality on the left side of the linestring
+    l_nuts_5_name: |
+      Village/suburb on the left side of the linestring
+    r_nuts_0_name: |
+      Country on the right side of the linestring
+    r_nuts_1_name: |
+      Region on the right side of the linestring
+    r_nuts_2_name: |
+      Province on the right side of the linestring
+    r_nuts_3_name: |
+      Administrative arrondissement on the right side of the linestring
+    r_nuts_4_name: |
+      Municipality on the right side of the linestring
+    r_nuts_5_name: |
+      Village/suburb on the right side of the linestring
+  buffer_size: 4
+  datasource:
+    geometry_field: geometry
+    query: (SELECT geometry, nuts_level, l_nuts_0_name, l_nuts_1_name, l_nuts_2_name, l_nuts_3_name, l_nuts_4_name, l_nuts_5_name, r_nuts_0_name, r_nuts_1_name, r_nuts_2_name, r_nuts_3_name, r_nuts_4_name, r_nuts_5_name FROM layer_nuts(!bbox!, z(!scale_denominator!))) AS t
+schema:
+  - ./nuts.sql
+datasources:
+  - type: imposm3
+    mapping_file: ./mapping.yaml

layers/boundary/nuts.yaml.polygons.backup

@@ -0,0 +1,26 @@
+layer:
+  id: "nuts"
+  description: |
+      Contains administrative boundaries as polygons (municipalities, counties, provinces, ...)
+      Administrative regions are translated to their equivalent NUTS/LAU classification
+  fields:
+    nuts_level:
+        The NUTS/LAU classification this polygon fall in.
+        NUTS only goes to 3 thus LAU 1 & 2 are mapped as NUTS 4 & 5.
+         NUTS 0 = Countries
+         NUTS 1 = Regions (e.g. Vlaams-brabant)
+         NUTS 2 = Provinces (e.g. Limburg)
+         NUTS 3 = Administrative arrondissements (e.g. Antwerpen, best to ignore these)
+         NUTS 4 = Municipalities (e.g. Lummen)
+         NUTS 5 = Villages/Suburbs (e.g. Linkhout)
+    name: |
+        Name of the region
+  buffer_size: 4
+  datasource:
+    geometry_field: geometry
+    query: (SELECT geometry, nuts_level, name FROM osm_boundary_polygon) AS t
+schema:
+  - ./nuts.sql
+datasources:
+  - type: imposm3
+    mapping_file: ./mapping.yaml

layers/boundary/style.json

@@ -0,0 +1,3 @@
+{
+  "layers": []
+}

layers/boundary/update_boundary_polygon.sql

@@ -0,0 +1,170 @@
+ALTER TABLE osm_boundary_polygon
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z13
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z12
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z11
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z10
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z9
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z8
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z7
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z6
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_boundary_polygon_gen_z5
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z13;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z12;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z11;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z10;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z9;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z8;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z7;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z6;
+DROP TRIGGER IF EXISTS update_row ON osm_boundary_polygon_gen_z5;
+
+-- etldoc:  osm_boundary_polygon ->  osm_boundary_polygon
+-- etldoc:  osm_boundary_polygon_gen_z13 ->  osm_boundary_polygon_gen_z13
+-- etldoc:  osm_boundary_polygon_gen_z12 ->  osm_boundary_polygon_gen_z12
+-- etldoc:  osm_boundary_polygon_gen_z11 ->  osm_boundary_polygon_gen_z11
+-- etldoc:  osm_boundary_polygon_gen_z10 ->  osm_boundary_polygon_gen_z10
+-- etldoc:  osm_boundary_polygon_gen_z9 ->  osm_boundary_polygon_gen_z9
+-- etldoc:  osm_boundary_polygon_gen_z8 ->  osm_boundary_polygon_gen_z8
+-- etldoc:  osm_boundary_polygon_gen_z7 ->  osm_boundary_polygon_gen_z7
+-- etldoc:  osm_boundary_polygon_gen_z6 ->  osm_boundary_polygon_gen_z6
+-- etldoc:  osm_boundary_polygon_gen_z5 ->  osm_boundary_polygon_gen_z5
+CREATE OR REPLACE FUNCTION update_osm_boundary_polygon() RETURNS void AS
+$$
+BEGIN
+    UPDATE osm_boundary_polygon
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z13
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z12
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z11
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z10
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z9
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z8
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z7
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z6
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+    UPDATE osm_boundary_polygon_gen_z5
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = ST_PointOnSurface(geometry);
+
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT update_osm_boundary_polygon();
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_point_geom_idx ON osm_boundary_polygon USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z13_point_geom_idx ON osm_boundary_polygon_gen_z13 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z12_point_geom_idx ON osm_boundary_polygon_gen_z12 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z11_point_geom_idx ON osm_boundary_polygon_gen_z11 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z10_point_geom_idx ON osm_boundary_polygon_gen_z10 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z9_point_geom_idx ON osm_boundary_polygon_gen_z9 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z8_point_geom_idx ON osm_boundary_polygon_gen_z8 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z7_point_geom_idx ON osm_boundary_polygon_gen_z7 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z6_point_geom_idx ON osm_boundary_polygon_gen_z6 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_boundary_polygon_gen_z5_point_geom_idx ON osm_boundary_polygon_gen_z5 USING gist (geometry_point);
+
+CREATE OR REPLACE FUNCTION update_osm_boundary_polygon_row()
+    RETURNS trigger
+AS
+$$
+BEGIN
+    NEW.tags = update_tags(NEW.tags, NEW.geometry);
+    NEW.geometry_point = ST_PointOnSurface(NEW.geometry);
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z13
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z12
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z11
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z10
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z9
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z8
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z7
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z6
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_boundary_polygon_gen_z5
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_boundary_polygon_row();

layers/building/building.sql

@@ -1,95 +1,120 @@
 -- etldoc: layer_building[shape=record fillcolor=lightpink, style="rounded,filled",
 -- etldoc:     label="layer_building | <z13> z13 | <z14_> z14+ " ] ;
 
-CREATE INDEX IF NOT EXISTS osm_building_relation_building_idx ON osm_building_relation(building) WHERE building = '' AND ST_GeometryType(geometry) = 'ST_Polygon';
-CREATE INDEX IF NOT EXISTS osm_building_relation_member_idx ON osm_building_relation(member) WHERE role = 'outline';
+CREATE INDEX IF NOT EXISTS osm_building_relation_building_idx ON osm_building_relation (building) WHERE building = '' AND ST_GeometryType(geometry) = 'ST_Polygon';
+CREATE INDEX IF NOT EXISTS osm_building_relation_member_idx ON osm_building_relation (member) WHERE role = 'outline';
 
-CREATE OR REPLACE VIEW osm_all_buildings AS (
-         -- etldoc: osm_building_relation -> layer_building:z14_
-         -- Buildings built from relations
-         SELECT member AS osm_id, geometry,
-                  COALESCE(CleanNumeric(height), CleanNumeric(buildingheight)) as height,
-                  COALESCE(CleanNumeric(min_height), CleanNumeric(buildingmin_height)) as min_height,
-                  COALESCE(CleanNumeric(levels), CleanNumeric(buildinglevels)) as levels,
-                  COALESCE(CleanNumeric(min_level), CleanNumeric(buildingmin_level)) as min_level,
-                  nullif(material, '') AS material,
-                  nullif(colour, '') AS colour,
-                  FALSE as hide_3d
-         FROM
-         osm_building_relation WHERE building = '' AND ST_GeometryType(geometry) = 'ST_Polygon'
-         UNION ALL
+CREATE OR REPLACE VIEW osm_all_buildings AS
+(
+SELECT
+    -- etldoc: osm_building_relation -> layer_building:z14_
+    -- Buildings built from relations
+    member AS osm_id,
+    geometry,
+    COALESCE(CleanNumeric(height), CleanNumeric(buildingheight)) AS height,
+    COALESCE(CleanNumeric(min_height), CleanNumeric(buildingmin_height)) AS min_height,
+    COALESCE(CleanNumeric(levels), CleanNumeric(buildinglevels)) AS levels,
+    COALESCE(CleanNumeric(min_level), CleanNumeric(buildingmin_level)) AS min_level,
+    nullif(material, '') AS material,
+    nullif(colour, '') AS colour,
+    FALSE AS hide_3d
+FROM osm_building_relation
+WHERE building = ''
+  AND ST_GeometryType(geometry) = 'ST_Polygon'
+UNION ALL
 
-         -- etldoc: osm_building_polygon -> layer_building:z14_
-         -- Standalone buildings
-         SELECT obp.osm_id, obp.geometry,
-                  COALESCE(CleanNumeric(obp.height), CleanNumeric(obp.buildingheight)) as height,
-                  COALESCE(CleanNumeric(obp.min_height), CleanNumeric(obp.buildingmin_height)) as min_height,
-                  COALESCE(CleanNumeric(obp.levels), CleanNumeric(obp.buildinglevels)) as levels,
-                  COALESCE(CleanNumeric(obp.min_level), CleanNumeric(obp.buildingmin_level)) as min_level,
-                  nullif(obp.material, '') AS material,
-                  nullif(obp.colour, '') AS colour,
-                  obr.role IS NOT NULL AS hide_3d
-         FROM
-         osm_building_polygon obp
-           LEFT JOIN osm_building_relation obr ON
-             obp.osm_id >= 0 AND
-             obr.member = obp.osm_id AND
-             obr.role = 'outline'
-         WHERE ST_GeometryType(obp.geometry) IN ('ST_Polygon', 'ST_MultiPolygon')
-);
+SELECT
+    -- etldoc: osm_building_polygon -> layer_building:z14_
+    -- Standalone buildings
+    obp.osm_id,
+    obp.geometry,
+    COALESCE(CleanNumeric(obp.height), CleanNumeric(obp.buildingheight)) AS height,
+    COALESCE(CleanNumeric(obp.min_height), CleanNumeric(obp.buildingmin_height)) AS min_height,
+    COALESCE(CleanNumeric(obp.levels), CleanNumeric(obp.buildinglevels)) AS levels,
+    COALESCE(CleanNumeric(obp.min_level), CleanNumeric(obp.buildingmin_level)) AS min_level,
+    nullif(obp.material, '') AS material,
+    nullif(obp.colour, '') AS colour,
+    obr.role IS NOT NULL AS hide_3d
+FROM osm_building_polygon obp
+         LEFT JOIN osm_building_relation obr ON
+        obp.osm_id >= 0 AND
+        obr.member = obp.osm_id AND
+        obr.role = 'outline'
+WHERE ST_GeometryType(obp.geometry) IN ('ST_Polygon', 'ST_MultiPolygon')
+    );
 
 CREATE OR REPLACE FUNCTION layer_building(bbox geometry, zoom_level int)
-RETURNS TABLE(geometry geometry, osm_id bigint, render_height int, render_min_height int, colour text, hide_3d boolean) AS $$
-    SELECT geometry, osm_id, render_height, render_min_height,
+    RETURNS TABLE
+            (
+                geometry          geometry,
+                osm_id            bigint,
+                render_height     int,
+                render_min_height int,
+                colour            text,
+                hide_3d           boolean
+            )
+AS
+$$
+SELECT geometry,
+       osm_id,
+       render_height,
+       render_min_height,
        COALESCE(colour, CASE material
            -- Ordered by count from taginfo
-           WHEN 'cement_block' THEN '#6a7880'
-           WHEN 'brick' THEN '#bd8161'
-           WHEN 'plaster' THEN '#dadbdb'
-           WHEN 'wood' THEN '#d48741'
-           WHEN 'concrete' THEN '#d3c2b0'
-           WHEN 'metal' THEN '#b7b1a6'
-           WHEN 'stone' THEN '#b4a995'
-           WHEN 'mud' THEN '#9d8b75'
-           WHEN 'steel' THEN '#b7b1a6' -- same as metal
-           WHEN 'glass' THEN '#5a81a0'
-           WHEN 'traditional' THEN '#bd8161' -- same as brick
-           WHEN 'masonry' THEN '#bd8161' -- same as brick
-           WHEN 'Brick' THEN '#bd8161' -- same as brick
-           WHEN 'tin' THEN '#b7b1a6' -- same as metal
-           WHEN 'timber_framing' THEN '#b3b0a9'
-           WHEN 'sandstone' THEN '#b4a995' -- same as stone
-           WHEN 'clay' THEN '#9d8b75' -- same as mud
-       END) AS colour,
-      CASE WHEN hide_3d THEN TRUE END AS hide_3d
-    FROM (
-        -- etldoc: osm_building_polygon_gen1 -> layer_building:z13
-        SELECT
-            osm_id, geometry,
-            NULL::int AS render_height, NULL::int AS render_min_height,
-            NULL::text AS material, NULL::text AS colour,
-            FALSE AS hide_3d
-        FROM osm_building_polygon_gen1
-        WHERE zoom_level = 13 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_building_polygon -> layer_building:z14_
-        SELECT DISTINCT ON (osm_id)
-           osm_id, geometry,
-           ceil(COALESCE(height, levels*3.66, 5))::int AS render_height,
-           floor(COALESCE(min_height, min_level*3.66, 0))::int AS render_min_height,
-           material,
-           colour,
-           hide_3d
-        FROM osm_all_buildings
-        WHERE
-            (levels IS NULL OR levels < 1000) AND
-            (min_level IS NULL OR min_level < 1000) AND
-            (height IS NULL OR height < 3000) AND
-            (min_height IS NULL OR min_height < 3000) AND
-            zoom_level >= 14 AND geometry && bbox
-    ) AS zoom_levels
-    ORDER BY render_height ASC, ST_YMin(geometry) DESC;
-$$
-LANGUAGE SQL IMMUTABLE;
+                            WHEN 'cement_block' THEN '#6a7880'
+                            WHEN 'brick' THEN '#bd8161'
+                            WHEN 'plaster' THEN '#dadbdb'
+                            WHEN 'wood' THEN '#d48741'
+                            WHEN 'concrete' THEN '#d3c2b0'
+                            WHEN 'metal' THEN '#b7b1a6'
+                            WHEN 'stone' THEN '#b4a995'
+                            WHEN 'mud' THEN '#9d8b75'
+                            WHEN 'steel' THEN '#b7b1a6' -- same as metal
+                            WHEN 'glass' THEN '#5a81a0'
+                            WHEN 'traditional' THEN '#bd8161' -- same as brick
+                            WHEN 'masonry' THEN '#bd8161' -- same as brick
+                            WHEN 'Brick' THEN '#bd8161' -- same as brick
+                            WHEN 'tin' THEN '#b7b1a6' -- same as metal
+                            WHEN 'timber_framing' THEN '#b3b0a9'
+                            WHEN 'sandstone' THEN '#b4a995' -- same as stone
+                            WHEN 'clay' THEN '#9d8b75' -- same as mud
+           END) AS colour,
+       CASE WHEN hide_3d THEN TRUE END AS hide_3d
+FROM (
+         SELECT
+             -- etldoc: osm_building_block_gen_z13 -> layer_building:z13
+             osm_id,
+             geometry,
+             NULL::int AS render_height,
+             NULL::int AS render_min_height,
+             NULL::text AS material,
+             NULL::text AS colour,
+             FALSE AS hide_3d
+         FROM osm_building_block_gen_z13
+         WHERE zoom_level = 13
+           AND geometry && bbox
+         UNION ALL
+         SELECT
+                                  -- etldoc: osm_building_polygon -> layer_building:z14_
+             DISTINCT ON (osm_id) osm_id,
+                                  geometry,
+                                  ceil(COALESCE(height, levels * 3.66, 5))::int AS render_height,
+                                  floor(COALESCE(min_height, min_level * 3.66, 0))::int AS render_min_height,
+                                  material,
+                                  colour,
+                                  hide_3d
+         FROM osm_all_buildings
+         WHERE (levels IS NULL OR levels < 1000)
+           AND (min_level IS NULL OR min_level < 1000)
+           AND (height IS NULL OR height < 3000)
+           AND (min_height IS NULL OR min_height < 3000)
+           AND zoom_level >= 14
+           AND geometry && bbox
+     ) AS zoom_levels
+ORDER BY render_height ASC, ST_YMin(geometry) DESC;
+$$ LANGUAGE SQL STABLE
+                -- STRICT
+                PARALLEL SAFE
+                ;
 
 -- not handled: where a building outline covers building parts

layers/building/building.yaml

@@ -1,8 +1,8 @@
 layer:
   id: "building"
   description: |
-      All [OSM Buildings](http://wiki.openstreetmap.org/wiki/Buildings). All building tags are imported ([`building=*`](http://wiki.openstreetmap.org/wiki/Key:building)). The buildings are not yet ready for 3D rendering support and any help to improve
-      this is welcomed.
+      All [OSM Buildings](http://wiki.openstreetmap.org/wiki/Buildings). All building tags are imported ([`building=*`](http://wiki.openstreetmap.org/wiki/Key:building)).
+      Only buildings with tag location:underground are excluded.
   buffer_size: 4
   datasource:
     geometry_field: geometry
@@ -12,15 +12,16 @@ layer:
     query: (SELECT osm_id, geometry, render_height, render_min_height, colour, hide_3d FROM layer_building(!bbox!, z(!scale_denominator!))) AS t
   fields:
     render_height: |
-        An approximated height from levels and height of the building or building:part after the method of Paul Norman in [OSM Clear](https://github.com/ClearTables/osm-clear). For future 3D rendering of buildings.
+        An approximated height from levels and height of the building or building:part.
     render_min_height: |
-        An approximated height from levels and height of the bottom of the building or building:part after the method of Paul Norman in [OSM Clear](https://github.com/ClearTables/osm-clear). For future 3D rendering of buildings.
+        An approximated height from minimum levels or minimum height of the bottom of the building or building:part.
     colour: |
         Colour
     hide_3d: |
         If True, building (part) should not be rendered in 3D. Currently, [building outlines](https://wiki.openstreetmap.org/wiki/Simple_3D_buildings) are marked as hide_3d.
 schema:
+  - ./update_building.sql
   - ./building.sql
 datasources:
   - type: imposm3
-    mapping_file: ./mapping.yaml
+    mapping_file: ./mapping.yaml

layers/building/mapping.yaml

@@ -1,9 +1,9 @@
-generalized_tables:
-  # etldoc: imposm3 -> osm_building_polygon_gen1
-  building_polygon_gen1:
-    source: building_polygon
-    sql_filter: area>power(ZRES12,2) AND ST_IsValid(geometry)
-    tolerance: ZRES14
+#generalized_tables:
+#  # etldoc: imposm3 -> osm_building_polygon_gen1
+#  building_polygon_gen1:
+#    source: building_polygon
+#    sql_filter: area>power(ZRES12,2) AND ST_IsValid(geometry)
+#    tolerance: ZRES14
 
 tables:
   # etldoc: imposm3 -> osm_building_polygon
@@ -60,11 +60,14 @@ tables:
       aeroway:
       - terminal
       - hangar
+      location:
+      - underground
     filters:
       reject:
         building: ["no","none","No"]
         building:part: ["no","none","No"]
         man_made: ["bridge"]
+        location: ["underground"]
     type: polygon
 
   # etldoc: imposm3 -> osm_building_relation

layers/building/style.json

@@ -0,0 +1,44 @@
+{
+  "layers": [
+    {
+      "id": "building",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "building",
+      "minzoom": 12,
+      "maxzoom": 24,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-color": {
+          "stops": [
+            [
+              13,
+              "rgba(222, 213, 207, 1)"
+            ],
+            [
+              16,
+              "#d9d0c9"
+            ]
+          ]
+        },
+        "fill-outline-color": {
+          "base": 1,
+          "stops": [
+            [
+              13,
+              "#9A918A"
+            ],
+            [
+              16,
+              "rgba(166, 157, 150, 1)"
+            ]
+          ]
+        }
+      },
+      "metadata": {},
+      "order": 19
+    }
+  ]
+}

layers/building/update_building.sql

@@ -0,0 +1,185 @@
+DROP TRIGGER IF EXISTS trigger_refresh ON buildings.updates;
+DROP TRIGGER IF EXISTS trigger_flag ON osm_building_polygon;
+
+-- Creating aggregated building blocks with removed small polygons and small
+-- holes. Aggregated polygons are simplified by Visvalingam-Whyatt algorithm.
+-- Aggregating is made block by block using country_osm_grid polygon table.
+
+-- Function returning recordset for matview.
+-- Returning recordset of buildings aggregates by zres 14, with removed small
+-- holes and with removed small buildings/blocks.
+
+CREATE OR REPLACE FUNCTION osm_building_block_gen1()
+    RETURNS table
+            (
+                osm_id   bigint,
+                geometry geometry
+            )
+AS
+$$
+DECLARE
+    zres14 float := Zres(14);
+    zres12 float := Zres(12);
+    zres14vw float := Zres(14) * Zres(14);
+    polyg_world record;
+
+BEGIN
+    FOR polyg_world IN 
+        SELECT ST_Transform(country.geometry, 3857) AS geometry 
+        FROM country_osm_grid country
+        
+        LOOP
+            FOR osm_id, geometry IN
+                WITH dta AS ( -- CTE is used because of optimization
+                    SELECT o.osm_id,
+                            o.geometry,
+                            ST_ClusterDBSCAN(o.geometry, eps := zres14, minpoints := 1) OVER () cid
+                    FROM osm_building_polygon o
+                    WHERE ST_Intersects(o.geometry, polyg_world.geometry)
+                )
+                SELECT (array_agg(dta.osm_id))[1] AS osm_id,
+                    ST_Buffer(
+                        ST_Union(
+                            ST_Buffer(
+                                ST_SnapToGrid(dta.geometry, 0.000001)
+                                , zres14, 'join=mitre')
+                            )
+                        , -zres14, 'join=mitre') AS geometry
+                FROM dta
+                GROUP BY cid
+
+                LOOP
+                    -- removing holes smaller than
+                    IF ST_NumInteriorRings(geometry) > 0 THEN -- only from geometries wih holes
+                        geometry := (
+                            -- there are some multi-geometries in this layer
+                            SELECT ST_Collect(gn)
+                            FROM (
+                                    -- in some cases are "holes" NULL, because all holes are smaller than
+                                    SELECT COALESCE(
+                                                -- exterior ring
+                                                    ST_MakePolygon(ST_ExteriorRing(dmp.geom), holes),
+                                                    ST_MakePolygon(ST_ExteriorRing(dmp.geom))
+                                                ) gn
+
+                                    FROM ST_Dump(geometry) dmp, -- 1 dump polygons
+                                        LATERAL (
+                                            SELECT array_agg(ST_Boundary(rg.geom)) holes -- 2 create array
+                                            FROM ST_DumpRings(dmp.geom) rg -- 3 from rings
+                                            WHERE rg.path[1] > 0 -- 5 except inner ring
+                                                AND ST_Area(rg.geom) >= power(zres12, 2) -- 4 bigger than
+                                            ) holes
+                                ) new_geom
+                        );
+                    END IF;
+
+                    IF ST_Area(geometry) < power(zres12, 2) THEN
+                        CONTINUE;
+                    END IF;
+
+                    -- simplify
+                    geometry := ST_SimplifyVW(geometry, zres14vw);
+
+                    RETURN NEXT;
+                END LOOP;
+        END LOOP;
+END;
+$$ LANGUAGE plpgsql STABLE
+                    STRICT
+                    PARALLEL SAFE;
+
+
+DROP MATERIALIZED VIEW IF EXISTS osm_building_block_gen1_dup CASCADE;
+
+CREATE MATERIALIZED VIEW osm_building_block_gen1_dup AS
+SELECT *
+FROM osm_building_block_gen1();
+
+CREATE INDEX ON osm_building_block_gen1_dup USING gist (geometry);
+
+-- etldoc: osm_building_polygon -> osm_building_block_gen_z13
+DROP MATERIALIZED VIEW IF EXISTS osm_building_block_gen_z13;
+CREATE MATERIALIZED VIEW osm_building_block_gen_z13 AS
+(
+WITH 
+    counts AS (
+        SELECT count(osm_id) AS counts,
+		        osm_id
+	    FROM osm_building_block_gen1_dup
+	GROUP BY osm_id
+    ),
+
+    duplicates AS (
+        SELECT counts.osm_id
+	    FROM counts
+	    WHERE counts.counts > 1
+    )
+
+SELECT osm.osm_id,
+		ST_Union(
+            ST_MakeValid(osm.geometry)) AS geometry
+	FROM osm_building_block_gen1_dup osm,
+			duplicates
+	WHERE osm.osm_id = duplicates.osm_id
+	GROUP BY osm.osm_id
+	
+	UNION ALL
+
+	SELECT osm.osm_id, 
+			osm.geometry 
+	FROM osm_building_block_gen1_dup osm, 
+            counts 
+	WHERE counts.counts = 1 
+		AND osm.osm_id = counts.osm_id
+);
+
+CREATE INDEX ON osm_building_block_gen_z13 USING gist (geometry);
+CREATE UNIQUE INDEX ON osm_building_block_gen_z13 USING btree (osm_id);
+
+-- Handle updates
+
+CREATE SCHEMA IF NOT EXISTS buildings;
+
+CREATE TABLE IF NOT EXISTS buildings.updates
+(
+    id serial PRIMARY KEY,
+    t text,
+    UNIQUE (t)
+);
+
+CREATE OR REPLACE FUNCTION buildings.flag() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO buildings.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION buildings.refresh() RETURNS trigger AS
+$$
+DECLARE
+    t TIMESTAMP WITH TIME ZONE := clock_timestamp();
+BEGIN
+    RAISE LOG 'Refresh buildings block';
+    REFRESH MATERIALIZED VIEW osm_building_block_gen1_dup;
+    REFRESH MATERIALIZED VIEW osm_building_block_gen_z13;
+    -- noinspection SqlWithoutWhere
+    DELETE FROM buildings.updates;
+
+    RAISE LOG 'Update buildings block done in %', age(clock_timestamp(), t);
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_flag
+    AFTER INSERT OR UPDATE OR DELETE
+    ON osm_building_polygon
+    FOR EACH STATEMENT
+EXECUTE PROCEDURE buildings.flag();
+
+CREATE CONSTRAINT TRIGGER trigger_refresh
+    AFTER INSERT
+    ON buildings.updates
+    INITIALLY DEFERRED
+    FOR EACH ROW
+EXECUTE PROCEDURE buildings.refresh();

layers/housenumber/housenumber.sql

@@ -0,0 +1,33 @@
+-- etldoc: layer_housenumber[shape=record fillcolor=lightpink, style="rounded,filled",
+-- etldoc:     label="layer_housenumber | <z14_> z14+" ] ;
+
+CREATE OR REPLACE FUNCTION layer_housenumber(bbox geometry, zoom_level integer)
+    RETURNS TABLE
+            (
+                osm_id      bigint,
+                geometry    geometry,
+                housenumber text
+            )
+AS
+$$
+SELECT
+    -- etldoc: osm_housenumber_point -> layer_housenumber:z14_
+    osm_id,
+    geometry,
+    display_housenumber(housenumber)
+FROM (
+    SELECT
+        osm_id,
+        geometry,
+        housenumber,
+        row_number() OVER(PARTITION BY concat(street, block_number, housenumber) ORDER BY has_name ASC) as rn
+    FROM osm_housenumber_point
+    WHERE 1=1
+        AND zoom_level >= 14
+        AND geometry && bbox
+) t
+WHERE rn = 1;
+
+$$ LANGUAGE SQL STABLE
+                -- STRICT
+                PARALLEL SAFE;

layers/housenumber/housenumber.yaml

@@ -3,17 +3,20 @@ layer:
   description: |
       Everything in OpenStreetMap which contains a `addr:housenumber` tag useful for labelling housenumbers on a map.
       This adds significant size to *z14*. For buildings the centroid of the building is used as housenumber.
+      Duplicates within a tile are dropped if they have the same street/block_number (records without name tag are prioritized for preservation).
   buffer_size: 8
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
   fields:
-    housenumber: Value of the [`addr:housenumber`](http://wiki.openstreetmap.org/wiki/Key:addr) tag.
+    housenumber: Value of the [`addr:housenumber`](http://wiki.openstreetmap.org/wiki/Key:addr) tag. 
+      If there are multiple values separated by semi-colons, the first and last value separated by a dash.
   datasource:
     geometry_field: geometry
     srid: 900913
     query: (SELECT geometry, housenumber FROM layer_housenumber(!bbox!, z(!scale_denominator!))) AS t
 schema:
+  - ./housenumber_display.sql
   - ./housenumber_centroid.sql
-  - ./layer.sql
+  - ./housenumber.sql
 datasources:
   - type: imposm3
     mapping_file: ./mapping.yaml

layers/housenumber/housenumber_centroid.sql

@@ -1,51 +1,104 @@
 DROP TRIGGER IF EXISTS trigger_flag ON osm_housenumber_point;
+DROP TRIGGER IF EXISTS trigger_store ON osm_housenumber_point;
 DROP TRIGGER IF EXISTS trigger_refresh ON housenumber.updates;
 
--- etldoc: osm_housenumber_point -> osm_housenumber_point
-CREATE OR REPLACE FUNCTION convert_housenumber_point() RETURNS VOID AS $$
-BEGIN
-  UPDATE osm_housenumber_point
-  SET geometry =
-           CASE WHEN ST_NPoints(ST_ConvexHull(geometry))=ST_NPoints(geometry)
-           THEN ST_Centroid(geometry)
-           ELSE ST_PointOnSurface(geometry)
-    END
-  WHERE ST_GeometryType(geometry) <> 'ST_Point';
-END;
-$$ LANGUAGE plpgsql;
-
-SELECT convert_housenumber_point();
-
--- Handle updates
-
 CREATE SCHEMA IF NOT EXISTS housenumber;
 
-CREATE TABLE IF NOT EXISTS housenumber.updates(id serial primary key, t text, unique (t));
-CREATE OR REPLACE FUNCTION housenumber.flag() RETURNS trigger AS $$
+CREATE TABLE IF NOT EXISTS housenumber.osm_ids
+(
+    osm_id bigint PRIMARY KEY
+);
+
+-- etldoc: osm_housenumber_point -> osm_housenumber_point
+CREATE OR REPLACE FUNCTION convert_housenumber_point(full_update boolean) RETURNS void AS
+$$
+    UPDATE osm_housenumber_point
+    SET geometry =
+            CASE
+                WHEN ST_NPoints(ST_ConvexHull(geometry)) = ST_NPoints(geometry)
+                    THEN ST_Centroid(geometry)
+                ELSE ST_PointOnSurface(geometry)
+                END
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM housenumber.osm_ids))
+        AND ST_GeometryType(geometry) <> 'ST_Point'
+        AND ST_IsValid(geometry);
+
+    -- we don't need exact name just to know if it's present
+    UPDATE osm_housenumber_point
+    SET has_name = 
+            CASE
+                WHEN has_name = '' THEN '0'
+                ELSE '1'
+            END
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM housenumber.osm_ids));
+
+$$ LANGUAGE SQL;
+
+SELECT convert_housenumber_point(true);
+
+-- Handle updates
+
+CREATE OR REPLACE FUNCTION housenumber.store() RETURNS trigger AS
+$$
 BEGIN
-    INSERT INTO housenumber.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
-    RETURN null;
+    INSERT INTO housenumber.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
+    RETURN NULL;
 END;
-$$ language plpgsql;
+$$ LANGUAGE plpgsql;
+
+CREATE TABLE IF NOT EXISTS housenumber.updates
+(
+    id serial PRIMARY KEY,
+    t text,
+    UNIQUE (t)
+);
+CREATE OR REPLACE FUNCTION housenumber.flag() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO housenumber.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION housenumber.refresh() RETURNS trigger AS
-  $BODY$
-  BEGIN
+$$
+DECLARE
+    t TIMESTAMP WITH TIME ZONE := clock_timestamp();
+BEGIN
     RAISE LOG 'Refresh housenumber';
-    PERFORM convert_housenumber_point();
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE housenumber.osm_ids;
+    ANALYZE osm_housenumber_point;
+
+    PERFORM convert_housenumber_point(false);
+    -- noinspection SqlWithoutWhere
+    DELETE FROM housenumber.osm_ids;
+    -- noinspection SqlWithoutWhere
     DELETE FROM housenumber.updates;
-    RETURN null;
-  END;
-  $BODY$
-language plpgsql;
+
+    RAISE LOG 'Refresh housenumber done in %', age(clock_timestamp(), t);
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_store
+    AFTER INSERT OR UPDATE
+    ON osm_housenumber_point
+    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
+EXECUTE PROCEDURE housenumber.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE ON osm_housenumber_point
+    AFTER INSERT OR UPDATE
+    ON osm_housenumber_point
     FOR EACH STATEMENT
-    EXECUTE PROCEDURE housenumber.flag();
+    WHEN (pg_trigger_depth() < 1)
+EXECUTE PROCEDURE housenumber.flag();
 
 CREATE CONSTRAINT TRIGGER trigger_refresh
-    AFTER INSERT ON housenumber.updates
+    AFTER INSERT
+    ON housenumber.updates
     INITIALLY DEFERRED
     FOR EACH ROW
-    EXECUTE PROCEDURE housenumber.refresh();
+EXECUTE PROCEDURE housenumber.refresh();

layers/housenumber/housenumber_display.sql

@@ -0,0 +1,20 @@
+CREATE OR REPLACE FUNCTION display_housenumber_nonnumeric(raw_housenumber text)
+RETURNS text AS $$
+  -- Find the position of the semicolon in the input string
+  -- and extract the first and last value
+  SELECT substring(raw_housenumber from 1 for position(';' in raw_housenumber) - 1)
+         || '–'
+         || substring(raw_housenumber from position(';' in raw_housenumber) + 1);
+$$ LANGUAGE SQL IMMUTABLE;
+
+
+CREATE OR REPLACE FUNCTION display_housenumber(raw_housenumber text)
+RETURNS text AS $$
+  SELECT CASE
+    WHEN raw_housenumber !~ ';' THEN raw_housenumber
+    WHEN raw_housenumber ~ '[^0-9;]' THEN display_housenumber_nonnumeric(raw_housenumber)
+    ELSE
+      (SELECT min(value)::text || '–' || max(value)::text
+        FROM unnest(array_remove(string_to_array(raw_housenumber, ';'), '')::bigint[]) AS value)
+  END
+$$ LANGUAGE SQL IMMUTABLE;

layers/housenumber/layer.sql

@@ -1,12 +0,0 @@
-
--- etldoc: layer_housenumber[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_housenumber | <z14_> z14+" ] ;
-
-CREATE OR REPLACE FUNCTION layer_housenumber(bbox geometry, zoom_level integer)
-RETURNS TABLE(osm_id bigint, geometry geometry, housenumber text) AS $$
-   -- etldoc: osm_housenumber_point -> layer_housenumber:z14_
-    SELECT osm_id, geometry, housenumber FROM osm_housenumber_point
-    WHERE zoom_level >= 14 AND geometry && bbox;
-$$
-LANGUAGE SQL
-IMMUTABLE PARALLEL SAFE;

layers/housenumber/mapping.yaml

@@ -12,6 +12,15 @@ tables:
     - name: housenumber
       key: addr:housenumber
       type: string
+    - name: street
+      key: addr:street
+      type: string
+    - name: block_number
+      key: addr:block_number
+      type: string
+    - name: has_name
+      key: name
+      type: string
     type_mappings:
       points:
         addr:housenumber:

layers/housenumber/style.json

@@ -0,0 +1,40 @@
+{
+  "layers": [
+    {
+      "id": "housenumber",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "housenumber",
+      "minzoom": 17,
+      "layout": {
+        "text-font": [
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              17,
+              9
+            ],
+            [
+              22,
+              11
+            ]
+          ]
+        },
+        "text-field": "{housenumber}",
+        "text-padding": 3,
+        "text-line-height": -0.15,
+        "symbol-avoid-edges": false,
+        "text-allow-overlap": false,
+        "text-ignore-placement": false
+      },
+      "paint": {
+        "text-color": "rgba(102, 102, 102, 1)",
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 1
+      },
+      "order": 149
+    }
+  ]
+}

layers/landcover/generalized.sql

@@ -0,0 +1,287 @@
+DROP TABLE IF EXISTS osm_landcover_gen_z7;
+DROP TABLE IF EXISTS osm_landcover_gen_z8;
+DROP TABLE IF EXISTS osm_landcover_gen_z9;
+DROP TABLE IF EXISTS osm_landcover_gen_z10;
+DROP TABLE IF EXISTS osm_landcover_gen_z11;
+DROP TABLE IF EXISTS osm_landcover_gen_z12;
+DROP TABLE IF EXISTS osm_landcover_gen_z13;
+DROP TABLE IF EXISTS simplify_vw_z7 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z8 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z9 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z10 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z11 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z12 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z13 CASCADE;
+
+-- etldoc: osm_landcover_polygon ->  simplify_vw_z13
+CREATE TABLE simplify_vw_z13 AS
+(
+    SELECT subclass,
+           ST_MakeValid(
+            ST_SnapToGrid(
+             ST_SimplifyVW(geometry, power(zres(13),2)),
+             0.001)) AS geometry
+    FROM osm_landcover_polygon
+    WHERE ST_Area(geometry) > power(zres(12),2)
+);
+CREATE INDEX ON simplify_vw_z13 USING GIST (geometry);
+
+-- etldoc: simplify_vw_z13 ->  osm_landcover_gen_z13
+CREATE TABLE osm_landcover_gen_z13 AS
+(
+    SELECT subclass, ST_MakeValid((ST_dump(ST_Union(geometry))).geom) AS geometry
+    FROM (
+        SELECT subclass,
+               ST_ClusterDBSCAN(geometry, eps := 0, minpoints := 1) over () AS cid, geometry
+        FROM simplify_vw_z13
+        WHERE ST_NPoints(geometry) < 300
+          AND subclass IN ('wood', 'forest')) union_geom300
+    GROUP BY subclass,
+             cid
+    UNION ALL
+    SELECT subclass,
+           geometry
+    FROM simplify_vw_z13
+    WHERE (ST_NPoints(geometry) >= 300 AND subclass IN ('wood', 'forest'))
+       OR (subclass NOT IN ('wood', 'forest'))
+    );
+
+CREATE INDEX ON osm_landcover_gen_z13 USING GIST (geometry);
+
+
+-- etldoc: simplify_vw_z13 ->  simplify_vw_z12
+CREATE TABLE simplify_vw_z12 AS
+(
+    SELECT subclass,
+           ST_MakeValid(
+            ST_SnapToGrid(
+             ST_SimplifyVW(geometry, power(zres(12),2)),
+             0.001)) AS geometry
+    FROM simplify_vw_z13
+    WHERE ST_Area(geometry) > power(zres(11),2)
+);
+CREATE INDEX ON simplify_vw_z12 USING GIST (geometry);
+
+-- etldoc: simplify_vw_z12 ->  osm_landcover_gen_z12
+CREATE TABLE osm_landcover_gen_z12 AS
+(
+    SELECT subclass, ST_MakeValid((ST_dump(ST_Union(geometry))).geom) AS geometry
+    FROM (
+        SELECT subclass,
+               ST_ClusterDBSCAN(geometry, eps := 0, minpoints := 1) over () AS cid, geometry
+        FROM simplify_vw_z12
+        WHERE ST_NPoints(geometry) < 300
+          AND subclass IN ('wood', 'forest')) union_geom300
+    GROUP BY subclass,
+             cid
+    UNION ALL
+    SELECT subclass,
+           geometry
+    FROM simplify_vw_z12
+    WHERE (ST_NPoints(geometry) >= 300  AND subclass IN ('wood', 'forest'))
+       OR (subclass NOT IN ('wood', 'forest'))
+    );
+
+CREATE INDEX ON osm_landcover_gen_z12 USING GIST (geometry);
+
+
+-- etldoc: simplify_vw_z12 ->  simplify_vw_z11
+CREATE TABLE simplify_vw_z11 AS
+(
+    SELECT subclass,
+            ST_MakeValid(
+            ST_SnapToGrid(
+             ST_SimplifyVW(geometry, power(zres(11),2)),
+             0.001)) AS geometry
+    FROM simplify_vw_z12
+    WHERE ST_Area(geometry) > power(zres(10),2)
+);
+CREATE INDEX ON simplify_vw_z11 USING GIST (geometry);
+
+-- etldoc: simplify_vw_z11 ->  osm_landcover_gen_z11
+CREATE TABLE osm_landcover_gen_z11 AS
+(
+    SELECT subclass, ST_MakeValid((ST_dump(ST_Union(geometry))).geom) AS geometry
+    FROM (
+        SELECT subclass,
+               ST_ClusterDBSCAN(geometry, eps := 0, minpoints := 1) over () AS cid, geometry
+        FROM simplify_vw_z11
+        WHERE ST_NPoints(geometry) < 300
+          AND subclass IN ('wood', 'forest')) union_geom300
+    GROUP BY subclass,
+             cid
+    UNION ALL
+    SELECT subclass,
+           geometry
+    FROM simplify_vw_z11
+    WHERE (ST_NPoints(geometry) >= 300 AND subclass IN ('wood', 'forest'))
+       OR (subclass NOT IN ('wood', 'forest'))
+    );
+
+CREATE INDEX ON osm_landcover_gen_z11 USING GIST (geometry);
+
+
+-- etldoc: simplify_vw_z11 ->  simplify_vw_z10
+CREATE TABLE simplify_vw_z10 AS
+(
+    SELECT subclass,
+           ST_MakeValid(
+            ST_SnapToGrid(
+             ST_SimplifyVW(geometry, power(zres(10),2)),
+             0.001)) AS geometry
+    FROM simplify_vw_z11
+    WHERE ST_Area(geometry) > power(zres(9),2)
+);
+CREATE INDEX ON simplify_vw_z10 USING GIST (geometry);
+
+-- etldoc: simplify_vw_z10 ->  osm_landcover_gen_z10
+CREATE TABLE osm_landcover_gen_z10 AS
+(
+    SELECT subclass, ST_MakeValid((ST_dump(ST_Union(geometry))).geom) AS geometry
+    FROM (
+        SELECT subclass,
+               ST_ClusterDBSCAN(geometry, eps := 0, minpoints := 1) over () AS cid, geometry
+        FROM simplify_vw_z10
+        WHERE ST_NPoints(geometry) < 300
+          AND subclass IN ('wood', 'forest')) union_geom300
+    GROUP BY subclass,
+             cid
+    UNION ALL
+    SELECT subclass,
+           geometry
+    FROM simplify_vw_z10
+    WHERE (ST_NPoints(geometry) >= 300 AND subclass IN ('wood', 'forest'))
+       OR (subclass NOT IN ('wood', 'forest'))
+    );
+
+CREATE INDEX ON osm_landcover_gen_z10 USING GIST (geometry);
+
+
+-- etldoc: simplify_vw_z10 ->  simplify_vw_z9
+CREATE TABLE simplify_vw_z9 AS
+(
+    SELECT subclass,
+           ST_MakeValid(
+            ST_SnapToGrid(
+             ST_SimplifyVW(geometry, power(zres(9),2)),
+             0.001)) AS geometry
+    FROM simplify_vw_z10
+    WHERE ST_Area(geometry) > power(zres(8),2)
+);
+CREATE INDEX ON simplify_vw_z9 USING GIST (geometry);
+
+-- etldoc: simplify_vw_z9 ->  osm_landcover_gen_z9
+CREATE TABLE osm_landcover_gen_z9 AS
+(
+    SELECT subclass, ST_MakeValid((ST_dump(ST_Union(geometry))).geom) AS geometry
+    FROM (
+        SELECT subclass,
+               ST_ClusterDBSCAN(geometry, eps := 0, minpoints := 1) over () AS cid, geometry
+        FROM simplify_vw_z9
+        WHERE ST_NPoints(geometry) < 300
+          AND subclass IN ('wood', 'forest')) union_geom300
+    GROUP BY subclass,
+             cid
+    UNION ALL
+    SELECT subclass,
+           ST_MakeValid(
+            (ST_Dump(
+             ST_Union(geometry))).geom) AS geometry
+    FROM (
+        SELECT subclass,
+               ST_ClusterDBSCAN(geometry, eps := 0, minpoints := 1) over () AS cid, geometry
+        FROM simplify_vw_z9
+        WHERE ST_NPoints(geometry) >= 300
+          AND subclass IN ('wood', 'forest')) union_geom_rest
+    GROUP BY subclass,
+             cid
+    UNION ALL
+    SELECT subclass,
+           geometry
+    FROM simplify_vw_z9
+    WHERE subclass NOT IN ('wood', 'forest')
+    );
+
+CREATE INDEX ON osm_landcover_gen_z9 USING GIST (geometry);
+
+
+-- etldoc: simplify_vw_z9 ->  simplify_vw_z8
+CREATE TABLE simplify_vw_z8 AS
+(
+    SELECT subclass,
+           ST_MakeValid(
+            ST_SnapToGrid(
+             ST_SimplifyVW(geometry, power(zres(8),2)),
+             0.001)) AS geometry
+    FROM simplify_vw_z9
+    WHERE ST_Area(geometry) > power(zres(7),2)
+    );
+CREATE INDEX ON simplify_vw_z8 USING GIST (geometry);
+
+-- etldoc: simplify_vw_z8 ->  osm_landcover_gen_z8
+CREATE TABLE osm_landcover_gen_z8 AS
+(
+SELECT subclass,
+       ST_MakeValid(
+        (ST_Dump(
+         ST_Union(geometry))).geom) AS geometry
+    FROM
+        (
+        SELECT subclass,
+               ST_ClusterDBSCAN(geometry, eps := 0, minpoints := 1) OVER () AS cid,
+               geometry
+        FROM simplify_vw_z8
+        WHERE subclass IN ('wood', 'forest')
+        ) union_geom
+    GROUP BY subclass,
+             cid
+    UNION ALL
+    SELECT subclass,
+           geometry
+    FROM simplify_vw_z8
+    WHERE subclass NOT IN ('wood', 'forest')
+    );
+
+CREATE INDEX ON osm_landcover_gen_z8 USING GIST (geometry);
+
+
+-- etldoc: simplify_vw_z8 ->  simplify_vw_z7
+CREATE TABLE simplify_vw_z7 AS
+(
+    SELECT subclass,
+           ST_MakeValid(
+            ST_SnapToGrid(
+             ST_SimplifyVW(geometry, power(zres(7),2)),
+             0.001)) AS geometry
+    FROM simplify_vw_z8
+    WHERE ST_Area(geometry) > power(zres(6),2)
+);
+CREATE INDEX ON simplify_vw_z7 USING GIST (geometry);
+
+-- etldoc: simplify_vw_z7 ->  osm_landcover_gen_z7
+CREATE TABLE osm_landcover_gen_z7 AS
+(
+SELECT subclass,
+       ST_MakeValid(
+        (ST_Dump(
+         ST_Union(geometry))).geom) AS geometry
+    FROM
+        (
+        SELECT  subclass,
+                ST_ClusterDBSCAN(geometry, eps := 0, minpoints := 1) OVER () AS cid,
+                geometry
+        FROM simplify_vw_z7
+        ) union_geom
+GROUP BY subclass,
+         cid
+    );
+
+CREATE INDEX ON osm_landcover_gen_z7 USING GIST (geometry);
+
+DROP TABLE IF EXISTS simplify_vw_z7 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z8 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z9 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z10 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z11 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z12 CASCADE;
+DROP TABLE IF EXISTS simplify_vw_z13 CASCADE;

layers/landcover/landcover.sql

@@ -9,127 +9,365 @@
 --);
 --CREATE INDEX IF NOT EXISTS landcover_grouped_gen2_geometry_idx ON landcover_grouped_gen2 USING gist(geometry);
 
-CREATE OR REPLACE FUNCTION landcover_class(subclass VARCHAR) RETURNS TEXT AS $$
-    SELECT CASE
-        %%FIELD_MAPPING: class %%
-    END;
+CREATE OR REPLACE FUNCTION landcover_class(subclass varchar) RETURNS text AS
 $$
-LANGUAGE SQL
-IMMUTABLE PARALLEL SAFE;
+SELECT CASE
+           %%FIELD_MAPPING: class %%
+           END;
+$$ LANGUAGE SQL IMMUTABLE
+                -- STRICT
+                PARALLEL SAFE;
 
--- etldoc: ne_110m_glaciated_areas ->  landcover_z0
-CREATE OR REPLACE VIEW landcover_z0 AS (
-    SELECT NULL::bigint AS osm_id, geometry, 'glacier'::text AS subclass FROM ne_110m_glaciated_areas
-);
+-- ne_50m_antarctic_ice_shelves_polys
+-- etldoc: ne_50m_antarctic_ice_shelves_polys ->  ne_50m_antarctic_ice_shelves_polys_gen_z4
+DROP MATERIALIZED VIEW IF EXISTS ne_50m_antarctic_ice_shelves_polys_gen_z4 CASCADE;
+CREATE MATERIALIZED VIEW ne_50m_antarctic_ice_shelves_polys_gen_z4 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(6)) as geometry,
+    'ice_shelf'::text AS subclass
+FROM ne_50m_antarctic_ice_shelves_polys
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_50m_antarctic_ice_shelves_polys_gen_z4_idx ON ne_50m_antarctic_ice_shelves_polys_gen_z4 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z2 AS (
-    -- etldoc: ne_50m_glaciated_areas ->  landcover_z2
-    SELECT NULL::bigint AS osm_id, geometry, 'glacier'::text AS subclass FROM ne_50m_glaciated_areas
-    UNION ALL
-    -- etldoc: ne_50m_antarctic_ice_shelves_polys ->  landcover_z2
-    SELECT NULL::bigint AS osm_id, geometry, 'ice_shelf'::text AS subclass FROM ne_50m_antarctic_ice_shelves_polys
-);
+-- ne_110m_glaciated_areas
+-- etldoc: ne_110m_glaciated_areas ->  ne_110m_glaciated_areas_gen_z1
+DROP MATERIALIZED VIEW IF EXISTS ne_110m_glaciated_areas_gen_z1 CASCADE;
+CREATE MATERIALIZED VIEW ne_110m_glaciated_areas_gen_z1 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(3)) as geometry,
+    'glacier'::text AS subclass
+FROM ne_110m_glaciated_areas
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_110m_glaciated_areas_gen_z1_idx ON ne_110m_glaciated_areas_gen_z1 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z5 AS (
-    -- etldoc: ne_10m_glaciated_areas ->  landcover_z5
-    SELECT NULL::bigint AS osm_id, geometry, 'glacier'::text AS subclass FROM ne_10m_glaciated_areas
-    UNION ALL
-    -- etldoc: ne_10m_antarctic_ice_shelves_polys ->  landcover_z5
-    SELECT NULL::bigint AS osm_id, geometry, 'ice_shelf'::text AS subclass FROM ne_10m_antarctic_ice_shelves_polys
-);
+-- etldoc: ne_110m_glaciated_areas_gen_z1 ->  ne_110m_glaciated_areas_gen_z0
+DROP MATERIALIZED VIEW IF EXISTS ne_110m_glaciated_areas_gen_z0 CASCADE;
+CREATE MATERIALIZED VIEW ne_110m_glaciated_areas_gen_z0 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(2)) as geometry,
+    subclass
+FROM ne_110m_glaciated_areas_gen_z1
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_110m_glaciated_areas_gen_z0_idx ON ne_110m_glaciated_areas_gen_z0 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z7 AS (
-    -- etldoc: osm_landcover_polygon_gen7 ->  landcover_z7
-    SELECT osm_id, geometry, subclass FROM osm_landcover_polygon_gen7
-);
+-- etldoc: ne_50m_antarctic_ice_shelves_polys_gen_z4 ->  ne_50m_antarctic_ice_shelves_polys_gen_z3
+DROP MATERIALIZED VIEW IF EXISTS ne_50m_antarctic_ice_shelves_polys_gen_z3 CASCADE;
+CREATE MATERIALIZED VIEW ne_50m_antarctic_ice_shelves_polys_gen_z3 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(5)) as geometry,
+    subclass
+FROM ne_50m_antarctic_ice_shelves_polys_gen_z4
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_50m_antarctic_ice_shelves_polys_gen_z3_idx ON ne_50m_antarctic_ice_shelves_polys_gen_z3 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z8 AS (
-    -- etldoc: osm_landcover_polygon_gen6 ->  landcover_z8
-    SELECT osm_id, geometry, subclass FROM osm_landcover_polygon_gen6
-);
+-- etldoc: ne_50m_antarctic_ice_shelves_polys_gen_z3 ->  ne_50m_antarctic_ice_shelves_polys_gen_z2
+DROP MATERIALIZED VIEW IF EXISTS ne_50m_antarctic_ice_shelves_polys_gen_z2 CASCADE;
+CREATE MATERIALIZED VIEW ne_50m_antarctic_ice_shelves_polys_gen_z2 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(4)) as geometry,
+    subclass
+FROM ne_50m_antarctic_ice_shelves_polys_gen_z3
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_50m_antarctic_ice_shelves_polys_gen_z2_idx ON ne_50m_antarctic_ice_shelves_polys_gen_z2 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z9 AS (
-    -- etldoc: osm_landcover_polygon_gen5 ->  landcover_z9
-    SELECT osm_id, geometry, subclass FROM osm_landcover_polygon_gen5
-);
+-- ne_50m_glaciated_areas
+-- etldoc: ne_50m_glaciated_areas ->  ne_50m_glaciated_areas_gen_z4
+DROP MATERIALIZED VIEW IF EXISTS ne_50m_glaciated_areas_gen_z4 CASCADE;
+CREATE MATERIALIZED VIEW ne_50m_glaciated_areas_gen_z4 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(6)) as geometry,
+    'glacier'::text AS subclass
+FROM ne_50m_glaciated_areas
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_50m_glaciated_areas_gen_z4_idx ON ne_50m_glaciated_areas_gen_z4 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z10 AS (
-    -- etldoc: osm_landcover_polygon_gen4 ->  landcover_z10
-    SELECT osm_id, geometry, subclass FROM osm_landcover_polygon_gen4
-);
+-- etldoc: ne_50m_glaciated_areas_gen_z4 ->  ne_50m_glaciated_areas_gen_z3
+DROP MATERIALIZED VIEW IF EXISTS ne_50m_glaciated_areas_gen_z3 CASCADE;
+CREATE MATERIALIZED VIEW ne_50m_glaciated_areas_gen_z3 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(5)) as geometry,
+    subclass
+FROM ne_50m_glaciated_areas_gen_z4
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_50m_glaciated_areas_gen_z3_idx ON ne_50m_glaciated_areas_gen_z3 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z11 AS (
-    -- etldoc: osm_landcover_polygon_gen3 ->  landcover_z11
-    SELECT osm_id, geometry, subclass FROM osm_landcover_polygon_gen3
-);
+-- etldoc: ne_50m_glaciated_areas_gen_z3 ->  ne_50m_glaciated_areas_gen_z2
+DROP MATERIALIZED VIEW IF EXISTS ne_50m_glaciated_areas_gen_z2 CASCADE;
+CREATE MATERIALIZED VIEW ne_50m_glaciated_areas_gen_z2 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(4)) as geometry,
+    subclass
+FROM ne_50m_glaciated_areas_gen_z3
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_50m_glaciated_areas_gen_z2_idx ON ne_50m_glaciated_areas_gen_z2 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z12 AS (
-    -- etldoc: osm_landcover_polygon_gen2 ->  landcover_z12
-    SELECT osm_id, geometry, subclass FROM osm_landcover_polygon_gen2
-);
+-- ne_10m_glaciated_areas
+-- etldoc: ne_10m_glaciated_areas ->  ne_10m_glaciated_areas_gen_z6
+DROP MATERIALIZED VIEW IF EXISTS ne_10m_glaciated_areas_gen_z6 CASCADE;
+CREATE MATERIALIZED VIEW ne_10m_glaciated_areas_gen_z6 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(8)) as geometry,
+    'glacier'::text AS subclass
+FROM ne_10m_glaciated_areas
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_10m_glaciated_areas_gen_z6_idx ON ne_10m_glaciated_areas_gen_z6 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z13 AS (
-    -- etldoc: osm_landcover_polygon_gen1 ->  landcover_z13
-    SELECT osm_id, geometry, subclass FROM osm_landcover_polygon_gen1
-);
+-- etldoc: ne_10m_glaciated_areas_gen_z6 ->  ne_10m_glaciated_areas_gen_z5
+DROP MATERIALIZED VIEW IF EXISTS ne_10m_glaciated_areas_gen_z5 CASCADE;
+CREATE MATERIALIZED VIEW ne_10m_glaciated_areas_gen_z5 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(7)) as geometry,
+    subclass
+FROM ne_10m_glaciated_areas_gen_z6
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_10m_glaciated_areas_gen_z5_idx ON ne_10m_glaciated_areas_gen_z5 USING gist (geometry);
 
-CREATE OR REPLACE VIEW landcover_z14 AS (
-    -- etldoc: osm_landcover_polygon ->  landcover_z14
-    SELECT osm_id, geometry, subclass FROM osm_landcover_polygon
-);
+-- ne_10m_antarctic_ice_shelves_polys
+-- etldoc: ne_10m_antarctic_ice_shelves_polys ->  ne_10m_antarctic_ice_shelves_polys_gen_z6
+DROP MATERIALIZED VIEW IF EXISTS ne_10m_antarctic_ice_shelves_polys_gen_z6 CASCADE;
+CREATE MATERIALIZED VIEW ne_10m_antarctic_ice_shelves_polys_gen_z6 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(8)) as geometry,
+    'ice_shelf'::text AS subclass
+FROM ne_10m_antarctic_ice_shelves_polys
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_10m_antarctic_ice_shelves_polys_gen_z6_idx ON ne_10m_antarctic_ice_shelves_polys_gen_z6 USING gist (geometry);
 
--- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded, filled", label="layer_landcover | <z0_1> z0-z1 | <z2_4> z2-z4 | <z5_6> z5-z6 |<z7> z7 |<z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
+-- etldoc: ne_10m_antarctic_ice_shelves_polys_gen_z6 ->  ne_10m_antarctic_ice_shelves_polys_gen_z5
+DROP MATERIALIZED VIEW IF EXISTS ne_10m_antarctic_ice_shelves_polys_gen_z5 CASCADE;
+CREATE MATERIALIZED VIEW ne_10m_antarctic_ice_shelves_polys_gen_z5 AS
+(
+SELECT
+    ST_Simplify(geometry, ZRes(7)) as geometry,
+    subclass
+FROM ne_10m_antarctic_ice_shelves_polys_gen_z6
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_10m_antarctic_ice_shelves_polys_gen_z5_idx ON ne_10m_antarctic_ice_shelves_polys_gen_z5 USING gist (geometry);
+
+-- etldoc: ne_110m_glaciated_areas_gen_z0 ->  landcover_z0
+CREATE OR REPLACE VIEW landcover_z0 AS
+(
+SELECT
+    geometry,
+    subclass
+FROM ne_110m_glaciated_areas_gen_z0
+    );
+
+-- etldoc: ne_110m_glaciated_areas_gen_z1 ->  landcover_z1
+CREATE OR REPLACE VIEW landcover_z1 AS
+(
+SELECT
+    geometry,
+    subclass
+FROM ne_110m_glaciated_areas_gen_z1
+    );
+
+CREATE OR REPLACE VIEW landcover_z2 AS
+(
+-- etldoc: ne_50m_glaciated_areas_gen_z2 ->  landcover_z2
+SELECT
+    geometry,
+    subclass
+FROM ne_50m_glaciated_areas_gen_z2
+UNION ALL
+-- etldoc: ne_50m_antarctic_ice_shelves_polys_gen_z2 ->  landcover_z2
+SELECT
+    geometry,
+    subclass
+FROM ne_50m_antarctic_ice_shelves_polys_gen_z2
+    );
+
+CREATE OR REPLACE VIEW landcover_z3 AS
+(
+-- etldoc: ne_50m_glaciated_areas_gen_z3 ->  landcover_z3
+SELECT
+    geometry,
+    subclass
+FROM ne_50m_glaciated_areas_gen_z3
+UNION ALL
+-- etldoc: ne_50m_antarctic_ice_shelves_polys_gen_z3 ->  landcover_z3
+SELECT
+    geometry,
+    subclass
+FROM ne_50m_antarctic_ice_shelves_polys_gen_z3
+    );
+
+CREATE OR REPLACE VIEW landcover_z4 AS
+(
+-- etldoc: ne_50m_glaciated_areas_gen_z4 ->  landcover_z4
+SELECT
+    geometry,
+    subclass
+FROM ne_50m_glaciated_areas_gen_z4
+UNION ALL
+-- etldoc: ne_50m_antarctic_ice_shelves_polys_gen_z4 ->  landcover_z4
+SELECT
+    geometry,
+    subclass
+FROM ne_50m_antarctic_ice_shelves_polys_gen_z4
+    );
+
+CREATE OR REPLACE VIEW landcover_z5 AS
+(
+-- etldoc: ne_10m_glaciated_areas_gen_z5 ->  landcover_z5
+SELECT
+    geometry,
+    subclass
+FROM ne_10m_glaciated_areas_gen_z5
+UNION ALL
+-- etldoc: ne_10m_antarctic_ice_shelves_polys_gen_z5 ->  landcover_z5
+SELECT
+    geometry,
+    subclass
+FROM ne_10m_antarctic_ice_shelves_polys_gen_z5
+    );
+
+CREATE OR REPLACE VIEW landcover_z6 AS
+(
+-- etldoc: ne_10m_glaciated_areas_gen_z6 ->  landcover_z6
+SELECT
+    geometry,
+    subclass
+FROM ne_10m_glaciated_areas_gen_z6
+UNION ALL
+-- etldoc: ne_10m_antarctic_ice_shelves_polys_gen_z6 ->  landcover_z6
+SELECT
+    geometry,
+    subclass
+FROM ne_10m_antarctic_ice_shelves_polys_gen_z6
+    );
+
+-- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded, filled", label="layer_landcover | <z0> z0 | <z1> z1 | <z2> z2 | <z3> z3 | <z4> z4 | <z5> z5 | <z6> z6 |<z7> z7 |<z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
 
 CREATE OR REPLACE FUNCTION layer_landcover(bbox geometry, zoom_level int)
-RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
-    SELECT osm_id, geometry,
-        landcover_class(subclass) AS class,
-        subclass
-        FROM (
-        -- etldoc:  landcover_z0 -> layer_landcover:z0_1
-        SELECT * FROM landcover_z0
-        WHERE zoom_level BETWEEN 0 AND 1 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z2 -> layer_landcover:z2_4
-        SELECT * FROM landcover_z2
-        WHERE zoom_level BETWEEN 2 AND 4 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z5 -> layer_landcover:z5_6
-        SELECT * FROM landcover_z5
-        WHERE zoom_level BETWEEN 5 AND 6 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z7 -> layer_landcover:z7
-        SELECT *
-        FROM landcover_z7 WHERE zoom_level = 7 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z8 -> layer_landcover:z8
-        SELECT *
-        FROM landcover_z8 WHERE zoom_level = 8 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z9 -> layer_landcover:z9
-        SELECT *
-        FROM landcover_z9 WHERE zoom_level = 9 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z10 -> layer_landcover:z10
-        SELECT *
-        FROM landcover_z10 WHERE zoom_level = 10 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z11 -> layer_landcover:z11
-        SELECT *
-        FROM landcover_z11 WHERE zoom_level = 11 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z12 -> layer_landcover:z12
-        SELECT *
-        FROM landcover_z12 WHERE zoom_level = 12 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z13 -> layer_landcover:z13
-        SELECT *
-        FROM landcover_z13 WHERE zoom_level = 13 AND geometry && bbox
-        UNION ALL
-        -- etldoc:  landcover_z14 -> layer_landcover:z14_
-        SELECT *
-        FROM landcover_z14 WHERE zoom_level >= 14 AND geometry && bbox
-    ) AS zoom_levels;
+    RETURNS TABLE
+            (
+                geometry geometry,
+                class    text,
+                subclass text
+            )
+AS
 $$
-LANGUAGE SQL
-IMMUTABLE PARALLEL SAFE;
+SELECT geometry,
+       landcover_class(subclass) AS class,
+       subclass
+FROM (
+         -- etldoc:  landcover_z0 -> layer_landcover:z0
+         SELECT geometry, 
+                subclass
+         FROM landcover_z0
+         WHERE zoom_level = 0
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  landcover_z1 -> layer_landcover:z1
+         SELECT geometry,
+                subclass
+         FROM landcover_z1
+         WHERE zoom_level = 1
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  landcover_z2 -> layer_landcover:z2
+         SELECT geometry, 
+                subclass
+         FROM landcover_z2
+         WHERE zoom_level = 2
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  landcover_z3 -> layer_landcover:z3
+         SELECT geometry,
+                subclass
+         FROM landcover_z3
+         WHERE zoom_level = 3
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  landcover_z4 -> layer_landcover:z4
+         SELECT geometry,
+                subclass
+         FROM landcover_z4
+         WHERE zoom_level = 4
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  landcover_z5 -> layer_landcover:z5
+         SELECT geometry, 
+                subclass
+         FROM landcover_z5
+         WHERE zoom_level = 5
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  landcover_z6 -> layer_landcover:z6
+         SELECT geometry,
+                subclass
+         FROM landcover_z6
+         WHERE zoom_level = 6
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  osm_landcover_gen_z7 -> layer_landcover:z7
+         SELECT geometry, 
+                subclass
+         FROM osm_landcover_gen_z7
+         WHERE zoom_level = 7
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  osm_landcover_gen_z8 -> layer_landcover:z8
+         SELECT geometry, 
+                subclass
+         FROM osm_landcover_gen_z8
+         WHERE zoom_level = 8
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  osm_landcover_gen_z9 -> layer_landcover:z9
+         SELECT geometry, 
+                subclass
+         FROM osm_landcover_gen_z9
+         WHERE zoom_level = 9
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  osm_landcover_gen_z10 -> layer_landcover:z10
+         SELECT geometry, 
+                subclass
+         FROM osm_landcover_gen_z10
+         WHERE zoom_level = 10
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  osm_landcover_gen_z11 -> layer_landcover:z11
+         SELECT geometry, 
+                subclass
+         FROM osm_landcover_gen_z11
+         WHERE zoom_level = 11
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  osm_landcover_gen_z12 -> layer_landcover:z12
+         SELECT geometry, 
+                subclass
+         FROM osm_landcover_gen_z12
+         WHERE zoom_level = 12
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  osm_landcover_gen_z13 -> layer_landcover:z13
+         SELECT geometry, 
+                subclass
+         FROM osm_landcover_gen_z13
+         WHERE zoom_level = 13
+           AND geometry && bbox
+         UNION ALL
+         -- etldoc:  osm_landcover_polygon -> layer_landcover:z14_
+         SELECT geometry, 
+                subclass
+         FROM osm_landcover_polygon
+         WHERE zoom_level >= 14
+           AND geometry && bbox
+     ) AS zoom_levels;
+$$ LANGUAGE SQL STABLE
+                -- STRICT
+                PARALLEL SAFE;

layers/landcover/landcover.yaml

@@ -1,5 +1,12 @@
 layer:
   id: "landcover"
+  requires:
+    tables:
+      - ne_10m_antarctic_ice_shelves_polys
+      - ne_10m_glaciated_areas
+      - ne_50m_antarctic_ice_shelves_polys
+      - ne_50m_glaciated_areas
+      - ne_110m_glaciated_areas
   description: |
       Landcover is used to describe the physical material at the surface of the earth. At lower zoom levels this is
       from Natural Earth data for glaciers and ice shelves and at higher zoom levels the landcover is [implied by OSM tags](http://wiki.openstreetmap.org/wiki/Landcover). The most common use case for this layer
@@ -19,7 +26,7 @@ layer:
         rock:
           subclass: ['bare_rock', 'scree']
         grass:
-          subclass: ['fell', 'grassland', 'heath', 'scrub', 'tundra', 'grass', 'meadow', 'allotments', 'park', 'village_green', 'recreation_ground', 'garden', 'golf_course']
+          subclass: ['fell', 'flowerbed', 'grassland', 'heath', 'scrub', 'shrubbery', 'tundra', 'grass', 'meadow', 'allotments', 'park', 'village_green', 'recreation_ground', 'garden', 'golf_course']
         wetland:
           subclass: ['wetland', 'bog', 'swamp', 'wet_meadow', 'marsh', 'reedbed', 'saltern', 'tidalflat', 'saltmarsh', 'mangrove']
         sand:
@@ -39,9 +46,11 @@ layer:
       - bog
       - dune
       - scrub
+      - shrubbery
       - farm
       - farmland
       - fell
+      - flowerbed
       - forest
       - garden
       - glacier
@@ -73,6 +82,7 @@ layer:
     geometry_field: geometry
     query: (SELECT geometry, class, subclass FROM layer_landcover(!bbox!, z(!scale_denominator!))) AS t
 schema:
+  - ./generalized.sql
   - ./landcover.sql
 datasources:
   - type: imposm3

layers/landcover/mapping.yaml

@@ -1,48 +1,3 @@
-
-generalized_tables:
-
-  # etldoc: imposm3 -> osm_landcover_polygon_gen7
-  landcover_polygon_gen7:
-    source: landcover_polygon_gen6
-    sql_filter: area>power(ZRES5,2)
-    tolerance: ZRES7
-
-  # etldoc: imposm3 -> osm_landcover_polygon_gen6
-  landcover_polygon_gen6:
-    source: landcover_polygon_gen5
-    sql_filter: area>power(ZRES6,2)
-    tolerance: ZRES8
-
-  # etldoc: imposm3 -> osm_landcover_polygon_gen5
-  landcover_polygon_gen5:
-    source: landcover_polygon_gen4
-    sql_filter: area>power(ZRES7,2)
-    tolerance: ZRES9
-
-  # etldoc: imposm3 -> osm_landcover_polygon_gen4
-  landcover_polygon_gen4:
-    source: landcover_polygon_gen3
-    sql_filter: area>power(ZRES8,2)
-    tolerance: ZRES10
-
-  # etldoc: imposm3 -> osm_landcover_polygon_gen3
-  landcover_polygon_gen3:
-    source: landcover_polygon_gen2
-    sql_filter: area>power(ZRES8,2)
-    tolerance: ZRES11
-
-  # etldoc: imposm3 -> osm_landcover_polygon_gen2
-  landcover_polygon_gen2:
-    source: landcover_polygon_gen1
-    sql_filter: area>power(ZRES9,2)
-    tolerance: ZRES12
-
-  # etldoc: imposm3 -> osm_landcover_polygon_gen1
-  landcover_polygon_gen1:
-    source: landcover_polygon
-    sql_filter: area>power(ZRES10,2) AND ST_IsValid(geometry)
-    tolerance: ZRES13
-
 tables:
   # etldoc: imposm3 -> osm_landcover_polygon
   landcover_polygon:
@@ -63,6 +18,7 @@ tables:
       - farm
       - farmland
       - orchard
+      - flowerbed
       - plant_nursery
       - vineyard
       - grass
@@ -71,8 +27,6 @@ tables:
       - forest
       - village_green
       - recreation_ground
-      # There are 600 parks tagged with landuse=park instead of leisure=park
-      - park
       natural:
       - wood
       - wetland
@@ -80,6 +34,7 @@ tables:
       - grassland
       - heath
       - scrub
+      - shrubbery
       - tundra
       - glacier
       - bare_rock

layers/landcover/style.json

@@ -0,0 +1,482 @@
+{
+  "layers": [
+    {
+      "id": "landcover_classes",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "landcover",
+      "maxzoom": 13,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-color": [
+          "match",
+          [
+            "get",
+            "class"
+          ],
+          "farmland",
+          "#eef0d5",
+          "wood",
+          "#add19e",
+          "rock",
+          "#eee5dc",
+          "grass",
+          "#cdebb0",
+          "sand",
+          "#f5e9c6",
+          "wetland",
+          "#add19e",
+          "#000"
+        ],
+        "fill-opacity": {
+          "stops": [
+            [
+              7,
+              0.5
+            ],
+            [
+              10,
+              1
+            ]
+          ]
+        },
+        "fill-antialias": false
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "farmland",
+          "wood",
+          "rock",
+          "grass",
+          "wetland",
+          "sand"
+        ]
+      ],
+      "order": 4
+    },
+    {
+      "id": "landcover_class_outline",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "landcover",
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "#c7c9ae",
+        "line-width": 0.5
+      },
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "farmland"
+        ]
+      ],
+      "order": 5
+    },
+    {
+      "id": "landcover_park",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "landcover",
+      "minzoom": 13,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-color": "#c8facc",
+        "fill-antialias": true
+      },
+      "filter": [
+        "all",
+        [
+          "==",
+          "subclass",
+          "park"
+        ]
+      ],
+      "order": 6
+    },
+    {
+      "id": "landcover_subclasses",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "landcover",
+      "minzoom": 13,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-color": [
+          "match",
+          [
+            "get",
+            "subclass"
+          ],
+          "allotments",
+          "#c9e1bf",
+          "bare_rock",
+          "#eee5dc",
+          "beach",
+          "#fff1ba",
+          "bog",
+          "#d6d99f",
+          "dune",
+          "#f5e9c6",
+          "scrub",
+          "#c8d7ab",
+          "farm",
+          "#f5dcba",
+          "farmland",
+          "#eef0d5",
+          "flowerbed",
+          "#cdebb0",
+          "forest",
+          "#add19e",
+          "grass",
+          "#cdebb0",
+          "grassland",
+          "#cdebb0",
+          "golf_course",
+          "#def6c0",
+          "heath",
+          "#d6d99f",
+          "mangrove",
+          "#c8d7ab",
+          "meadow",
+          "#cdebb0",
+          "orchard",
+          "#aedfa3",
+          "park",
+          "#c8facc",
+          "garden",
+          "#cdebb0",
+          "plant_nursery",
+          "#aedfa3",
+          "recreation_ground",
+          "#d5ffd9",
+          "reedbed",
+          "#cdebb0",
+          "saltmarsh",
+          "#cdebb0",
+          "sand",
+          "#f5e9c6",
+          "scree",
+          "#eee5dc",
+          "swamp",
+          "#add19e",
+          "tidalflat",
+          "#DED6CF",
+          "village_green",
+          "#cdebb0",
+          "vineyard",
+          "#aedfa3",
+          "wet_meadow",
+          "#cdebb0",
+          "wetland",
+          "#add19e",
+          "wood",
+          "#add19e",
+          "marsh",
+          "#ff0",
+          "#FFFFFF"
+        ],
+        "fill-antialias": true
+      },
+      "filter": [
+        "all",
+        [
+          "in",
+          "subclass",
+          "allotments",
+          "bare_rock",
+          "beach",
+          "dune",
+          "scrub",
+          "farm",
+          "farmland",
+          "flowerbed",
+          "forest",
+          "garden",
+          "grass",
+          "grassland",
+          "golf_course",
+          "heath",
+          "meadow",
+          "orchard",
+          "plant_nursery",
+          "recreation_ground",
+          "reedbed",
+          "saltmarsh",
+          "sand",
+          "scree",
+          "swamp",
+          "tidalflat",
+          "tundra",
+          "village_green",
+          "vineyard",
+          "wet_meadow",
+          "wetland",
+          "wood"
+        ]
+      ],
+      "order": 7
+    },
+    {
+      "id": "landcover_subclass_patterns",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "landcover",
+      "minzoom": 13,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-opacity": [
+          "match",
+          [
+            "get",
+            "subclass"
+          ],
+          "beach",
+          0.4,
+          "forest",
+          0.4,
+          "bare_rock",
+          0.3,
+          "scrub",
+          0.6,
+          "garden",
+          0.6,
+          "scree",
+          0.3,
+          "wood",
+          0.4,
+          1
+        ],
+        "fill-pattern": [
+          "match",
+          [
+            "get",
+            "subclass"
+          ],
+          "allotments",
+          "allotments",
+          "bare_rock",
+          "rock_overlay",
+          "beach",
+          "beach",
+          "bog",
+          "wetland_bog",
+          "scrub",
+          "scrub",
+          "flowerbed",
+          "flowerbed_high_zoom",
+          "forest",
+          "leaftype_unknown",
+          "garden",
+          "plant_nursery",
+          "mangrove",
+          "wetland_mangrove",
+          "marsh",
+          "wetland_marsh",
+          "orchard",
+          "orchard",
+          "plant_nursery",
+          "plant_nursery",
+          "reedbed",
+          "wetland_reed",
+          "saltmarsh",
+          "wetland_marsh",
+          "scree",
+          "scree_overlay",
+          "swamp",
+          "wetland_swamp",
+          "vineyard",
+          "vineyard",
+          "wet_meadow",
+          "wetland_marsh",
+          "wetland",
+          "wetland",
+          "wood",
+          "leaftype_unknown",
+          ""
+        ]
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "in",
+          "subclass",
+          "allotments",
+          "bare_rock",
+          "beach",
+          "bog",
+          "dune",
+          "scrub",
+          "farm",
+          "farmland",
+          "flowerbed",
+          "forest",
+          "garden",
+          "grass",
+          "grassland",
+          "golf_course",
+          "heath",
+          "mangrove",
+          "marsh",
+          "meadow",
+          "orchard",
+          "park",
+          "plant_nursery",
+          "recreation_ground",
+          "reedbed",
+          "saltern",
+          "saltmarsh",
+          "sand",
+          "scree",
+          "swamp",
+          "village_green",
+          "vineyard",
+          "wet_meadow",
+          "wetland",
+          "wood"
+        ]
+      ],
+      "order": 8
+    },
+    {
+      "id": "landcover_subclass_outline",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "landcover",
+      "minzoom": 15,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": [
+          "match",
+          [
+            "get",
+            "subclass"
+          ],
+          "allotments",
+          "#B1C6A8",
+          "farm",
+          "#d1b48c",
+          "farmland",
+          "#c7c9ae",
+          "recreation_ground",
+          "#3c6640",
+          "#000"
+        ],
+        "line-width": [
+          "match",
+          [
+            "get",
+            "subclass"
+          ],
+          "recreation_ground",
+          0.3,
+          0.5
+        ],
+        "line-opacity": 1
+      },
+      "filter": [
+        "all",
+        [
+          "in",
+          "subclass",
+          "allotments",
+          "farm",
+          "farmland",
+          "recreation_ground"
+        ]
+      ],
+      "order": 9
+    },
+    {
+      "id": "landcover_ice",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "landcover",
+      "minzoom": 5,
+      "paint": {
+        "fill-color": "#ddecec",
+        "fill-antialias": false
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "ice"
+        ]
+      ],
+      "order": 10
+    },
+    {
+      "id": "landcover_ice_outline",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "landcover",
+      "minzoom": 5,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "#9cf",
+        "line-width": {
+          "stops": [
+            [
+              5,
+              1
+            ],
+            [
+              10,
+              1.5
+            ]
+          ]
+        },
+        "line-dasharray": {
+          "stops": [
+            [
+              5,
+              [
+                1,
+                0
+              ]
+            ],
+            [
+              10,
+              [
+                4,
+                2
+              ]
+            ]
+          ]
+        }
+      },
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "ice"
+        ]
+      ],
+      "order": 11
+    }
+  ]
+}

layers/landmarks/README.md

@@ -0,0 +1,10 @@
+## Landmarks
+
+### Docs
+This is a custom layer including landmarks (named forests) that can not be classified as a POI
+
+### Mapping Diagram
+
+
+### ETL diagram
+

layers/landmarks/class.sql

@@ -0,0 +1,19 @@
+CREATE OR REPLACE FUNCTION lm_class_rank(class text)
+    RETURNS int AS
+$$
+SELECT CASE class
+           WHEN 'forest' THEN 120
+           ELSE 1000
+           END;
+$$ LANGUAGE SQL IMMUTABLE
+                PARALLEL SAFE;
+
+CREATE OR REPLACE FUNCTION lm_class(subclass text, mapping_key text)
+    RETURNS text AS
+$$
+SELECT CASE
+           %%FIELD_MAPPING: class %%
+           ELSE subclass
+           END;
+$$ LANGUAGE SQL IMMUTABLE
+                PARALLEL SAFE;

layers/landmarks/landmark.yaml

@@ -0,0 +1,139 @@
+layer:
+  id: "landmarks"
+  description: |
+      [Points of interests](http://wiki.openstreetmap.org/wiki/Points_of_interest) containing
+      a of a variety of OpenStreetMap tags. Mostly contains amenities, sport, shop and tourist POIs.
+  buffer_size: 64
+  srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
+  fields:
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the POI.
+    name_en: English name `name:en` if available, otherwise `name`.
+    name_de: German name `name:de` if available, otherwise `name` or `name:en`.
+    class:
+      description: |
+        More general classes of landmarks. If there is no more general `class` for the `subclass`
+        this field will contain the same value as `subclass`.
+      values:
+        shop:
+          subclass: ['accessories', 'antiques', 'beauty', 'bed', 'boutique', 'camera', 'carpet', 'charity', 'chemist',
+                     'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics', 'garden_centre', 'doityourself',
+                     'erotic', 'electronics', 'fabric', 'florist', 'frozen_food', 'furniture', 'video_games', 'video',
+                     'general', 'gift', 'hardware', 'hearing_aids', 'hifi', 'ice_cream', 'interior_decoration',
+                     'jewelry', 'kiosk', 'lamps', 'mall', 'massage', 'motorcycle', 'mobile_phone', 'newsagent',
+                     'optician', 'outdoor', 'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 'shoes', 'sports',
+                     'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys', 'travel_agency', 'watches',
+                     'weapons', 'wholesale']
+        town_hall:
+          subclass: ['townhall', 'public_building', 'courthouse', 'community_centre']
+        golf:
+          subclass: ['golf', 'golf_course', 'miniature_golf']
+        fast_food:
+          subclass: ['fast_food', 'food_court']
+        park:
+          subclass: ['park', 'bbq']
+        bus:
+          subclass: ['bus_stop', 'bus_station']
+        railway:
+          - __AND__:
+              subclass: 'station'
+              mapping_key: 'railway'
+          - subclass: ['halt', 'tram_stop', 'subway']
+        aerialway:
+          __AND__:
+            subclass: 'station'
+            mapping_key: 'aerialway'
+        entrance:
+          subclass: ['subway_entrance', 'train_station_entrance']
+        campsite:
+          subclass: ['camp_site', 'caravan_site']
+        laundry:
+          subclass: ['laundry', 'dry_cleaning']
+        grocery:
+          subclass: ['supermarket', 'deli', 'delicatessen', 'department_store', 'greengrocer', 'marketplace']
+        library:
+          subclass: ['books', 'library']
+        college:
+          subclass: ['university', 'college']
+        lodging:
+          subclass: ['hotel', 'motel', 'bed_and_breakfast', 'guest_house', 'hostel', 'chalet', 'alpine_hut', 'dormitory']
+        ice_cream:
+          subclass: ['chocolate', 'confectionery']
+        post:
+          subclass: ['post_box', 'post_office']
+        cafe:
+          subclass: ['cafe']
+        school:
+          subclass: ['school', 'kindergarten']
+        alcohol_shop:
+          subclass: ['alcohol', 'beverages', 'wine']
+        bar:
+          subclass: ['bar', 'nightclub']
+        harbor:
+          subclass: ['marina', 'dock']
+        car:
+          subclass: ['car', 'car_repair', 'car_parts', 'taxi']
+        hospital:
+          subclass: ['hospital', 'nursing_home', 'clinic']
+        cemetery:
+          subclass: ['grave_yard', 'cemetery']
+        attraction:
+          subclass: ['attraction', 'viewpoint']
+        beer:
+          subclass: ['biergarten', 'pub']
+        music:
+          subclass: ['music', 'musical_instrument']
+        stadium:
+          subclass: ['american_football', 'stadium', 'soccer']
+        art_gallery:
+          subclass: ['art', 'artwork', 'gallery', 'arts_centre']
+        clothing_store:
+          subclass: ['bag', 'clothes']
+        swimming:
+          subclass: ['swimming_area', 'swimming']
+        castle:
+          subclass: ['castle', 'ruins']
+    subclass:
+      description: |
+          Original value of either the
+          [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity),
+          [`barrier`](http://wiki.openstreetmap.org/wiki/Key:barrier),
+          [`historic`](http://wiki.openstreetmap.org/wiki/Key:historic),
+          [`information`](http://wiki.openstreetmap.org/wiki/Key:information),
+          [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse),
+          [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure),
+          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway),
+          [`shop`](http://wiki.openstreetmap.org/wiki/Key:shop),
+          [`sport`](http://wiki.openstreetmap.org/wiki/Key:sport),
+          [`station`](http://wiki.openstreetmap.org/wiki/Key:station),
+          [`religion`](http://wiki.openstreetmap.org/wiki/Key:religion),
+          [`tourism`](http://wiki.openstreetmap.org/wiki/Key:tourism),
+          [`aerialway`](http://wiki.openstreetmap.org/wiki/Key:aerialway),
+          [`building`](http://wiki.openstreetmap.org/wiki/Key:building),
+          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway)
+          or [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway)
+          tag.  Use this to do more precise styling.
+    rank: |
+        The POIs are ranked ascending according to their importance within a grid. The `rank` value shows the
+        local relative importance of a POI within it's cell in the grid. This can be used to reduce label density at *z14*.
+        Since all POIs already need to be contained at *z14* you can use `less than rank=10` epxression to limit
+        LMs. At some point like *z17* you can show all LMs.
+    level:
+      description: |
+          Original value of [`level`](http://wiki.openstreetmap.org/wiki/Key:level) tag.
+    layer:
+      description: |
+          Original value of [`layer`](http://wiki.openstreetmap.org/wiki/Key:layer) tag.
+  datasource:
+    geometry_field: geometry
+    key_field: osm_id
+    key_field_as_attribute: no
+    srid: 900913
+    query: (SELECT osm_id, geometry, name, name_en, name_de, {name_languages}, class, subclass, layer, level, rank FROM layer_lm(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
+schema:
+  - ./class.sql
+  - ./update_lm_polygon.sql
+  - ./update_lm_point.sql
+  - ./layer.sql
+datasources:
+  - type: imposm3
+    mapping_file: ./mapping.yaml

layers/landmarks/layer.sql

@@ -0,0 +1,85 @@
+-- etldoc: layer_lm[shape=record fillcolor=lightpink, style="rounded,filled",
+-- etldoc:     label="layer_lm | <z12> z12 | <z13> z13 | <z14_> z14+" ] ;
+
+CREATE OR REPLACE FUNCTION layer_lm(bbox geometry, zoom_level integer, pixel_width numeric)
+    RETURNS TABLE
+            (
+                osm_id   bigint,
+                geometry geometry,
+                name     text,
+                name_en  text,
+                name_de  text,
+                tags     hstore,
+                class    text,
+                subclass text,
+                layer    integer,
+                level    integer,
+                "rank"   int
+            )
+AS
+$$
+SELECT osm_id_hash                                  AS osm_id,
+       geometry,
+       NULLIF(name, '')                             AS name,
+       COALESCE(NULLIF(name_en, ''), name)          AS name_en,
+       COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
+       tags,
+       lm_class(subclass, mapping_key)             AS class,
+       subclass                                      AS subclass,
+       NULLIF(layer, 0)                             AS layer,
+       "level",
+       row_number() OVER (
+           PARTITION BY LabelGrid(geometry, 100 * pixel_width)
+           ORDER BY CASE WHEN name = '' THEN 2000 ELSE lm_class_rank(lm_class(subclass, mapping_key)) END ASC
+           )::int                                   AS "rank"
+FROM (
+         -- etldoc: osm_lm_point ->  layer_lm:z12
+         -- etldoc: osm_lm_point ->  layer_lm:z13
+         SELECT *,
+                osm_id * 10 AS osm_id_hash
+         FROM osm_lm_point
+         WHERE geometry && bbox
+           AND zoom_level BETWEEN 12 AND 13
+           AND ((subclass = 'station' AND mapping_key = 'railway')
+             OR subclass IN ('halt', 'ferry_terminal'))
+
+         UNION ALL
+
+         -- etldoc: osm_lm_point ->  layer_lm:z14_
+         SELECT *,
+                osm_id * 10 AS osm_id_hash
+         FROM osm_lm_point
+         WHERE geometry && bbox
+           AND zoom_level >= 14
+
+         UNION ALL
+
+         -- etldoc: osm_lm_polygon ->  layer_lm:z12
+         -- etldoc: osm_lm_polygon ->  layer_lm:z13
+         SELECT *,
+                CASE
+                    WHEN osm_id < 0 THEN -osm_id * 10 + 4
+                    ELSE osm_id * 10 + 1
+                    END       AS osm_id_hash
+         FROM osm_lm_polygon
+         WHERE geometry && bbox
+           AND zoom_level BETWEEN 12 AND 13
+           AND ((subclass = 'station' AND mapping_key = 'railway')
+             OR subclass IN ('halt', 'ferry_terminal'))
+
+         UNION ALL
+
+         -- etldoc: osm_lm_polygon ->  layer_lm:z14_
+         SELECT *,
+                CASE
+                    WHEN osm_id < 0 THEN -osm_id * 10 + 4
+                    ELSE osm_id * 10 + 1
+                    END       AS osm_id_hash
+         FROM osm_lm_polygon
+         WHERE geometry && bbox
+           AND zoom_level >= 14
+     ) AS lm_union
+ORDER BY "rank"
+$$ LANGUAGE SQL STABLE
+                PARALLEL SAFE;
+-- TODO: Check if the above can be made STRICT -- i.e. if pixel_width could be NULL

layers/landmarks/mapping.yaml

@@ -0,0 +1,74 @@
+
+# imposm3 mapping file for https://github.com/osm2vectortiles/imposm3
+# Warning: this is not the official imposm3
+
+# landuse values , see http://taginfo.openstreetmap.org/keys/landuse#values
+def_lm_mapping_landuse: &lm_mapping_landuse
+  - forest
+
+def_poi_fields: &lm_fields
+  - name: osm_id
+    type: id
+  - name: geometry
+    type: geometry
+  - name: name
+    key: name
+    type: string
+  - name: name_en
+    key: name:en
+    type: string
+  - name: name_de
+    key: name:de
+    type: string
+  - name: tags
+    type: hstore_tags
+  - name: subclass
+    type: mapping_value
+  - name: mapping_key
+    type: mapping_key
+  - name: station
+    key: station
+    type: string
+  - name: funicular
+    key: funicular
+    type: string
+  - name: information
+    key: information
+    type: string
+  - name: uic_ref
+    key: uic_ref
+    type: string
+  - name: religion
+    key: religion
+    type: string
+  - name: level
+    key: level
+    type: integer
+  - name: layer
+    key: layer
+    type: integer
+  - name: sport
+    key: sport
+    type: string
+
+def_lm_mapping: &lm_mapping
+  landuse: *lm_mapping_landuse
+
+tables:
+  # etldoc: imposm3 -> osm_lm_point
+  lm_point:
+    type: point
+    columns: *lm_fields
+    filters:
+      require:
+        name: ["__any__"]
+    mapping: *lm_mapping
+
+  # etldoc: imposm3 -> osm_lm_polygon
+  lm_polygon:
+    type: polygon
+    columns: *lm_fields
+    filters:
+      require:
+        name: ["__any__"]
+    mapping: *lm_mapping

layers/landmarks/style.json

@@ -0,0 +1,3 @@
+{
+  "layers": []
+}

layers/landmarks/update_lm_point.sql

@@ -0,0 +1,69 @@
+DROP TRIGGER IF EXISTS trigger_flag ON osm_lm_point;
+DROP TRIGGER IF EXISTS trigger_refresh ON lm_point.updates;
+
+-- etldoc:  osm_lm_point ->  osm_lm_point
+CREATE OR REPLACE FUNCTION update_osm_lm_point() RETURNS void AS
+$$
+BEGIN
+    UPDATE osm_lm_point
+    SET subclass = 'subway'
+    WHERE station = 'subway'
+      AND subclass = 'station';
+
+    UPDATE osm_lm_point
+    SET subclass = 'halt'
+    WHERE funicular = 'yes'
+      AND subclass = 'station';
+
+    UPDATE osm_lm_point
+    SET tags = update_tags(tags, geometry)
+    WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
+
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT update_osm_lm_point();
+
+-- Handle updates
+
+CREATE SCHEMA IF NOT EXISTS lm_point;
+
+CREATE TABLE IF NOT EXISTS lm_point.updates
+(
+    id serial PRIMARY KEY,
+    t  text,
+    UNIQUE (t)
+);
+CREATE OR REPLACE FUNCTION lm_point.flag() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO lm_point.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION lm_point.refresh() RETURNS trigger AS
+$$
+BEGIN
+    RAISE LOG 'Refresh lm_point';
+    PERFORM update_osm_lm_point();
+    REFRESH MATERIALIZED VIEW osm_lm_stop_centroid;
+    REFRESH MATERIALIZED VIEW osm_lm_stop_rank;
+    -- noinspection SqlWithoutWhere
+    DELETE FROM lm_point.updates;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_flag
+    AFTER INSERT OR UPDATE OR DELETE
+    ON osm_lm_point
+    FOR EACH STATEMENT
+EXECUTE PROCEDURE lm_point.flag();
+
+CREATE CONSTRAINT TRIGGER trigger_refresh
+    AFTER INSERT
+    ON lm_point.updates
+    INITIALLY DEFERRED
+    FOR EACH ROW
+EXECUTE PROCEDURE lm_point.refresh();

layers/landmarks/update_lm_polygon.sql

@@ -0,0 +1,78 @@
+DROP TRIGGER IF EXISTS trigger_flag ON osm_lm_polygon;
+DROP TRIGGER IF EXISTS trigger_refresh ON lm_polygon.updates;
+
+-- etldoc:  osm_lm_polygon ->  osm_lm_polygon
+
+CREATE OR REPLACE FUNCTION update_lm_polygon() RETURNS void AS
+$$
+BEGIN
+    UPDATE osm_lm_polygon
+    SET geometry =
+            CASE
+                WHEN ST_NPoints(ST_ConvexHull(geometry)) = ST_NPoints(geometry)
+                    THEN ST_Centroid(geometry)
+                ELSE ST_PointOnSurface(geometry)
+                END
+    WHERE ST_GeometryType(geometry) <> 'ST_Point';
+
+    UPDATE osm_lm_polygon
+    SET subclass = 'subway'
+    WHERE station = 'subway'
+      AND subclass = 'station';
+
+    UPDATE osm_lm_polygon
+    SET subclass = 'halt'
+    WHERE funicular = 'yes'
+      AND subclass = 'station';
+
+    UPDATE osm_lm_polygon
+    SET tags = update_tags(tags, geometry)
+    WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
+
+    ANALYZE osm_lm_polygon;
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT update_lm_polygon();
+
+-- Handle updates
+
+CREATE SCHEMA IF NOT EXISTS lm_polygon;
+
+CREATE TABLE IF NOT EXISTS lm_polygon.updates
+(
+    id serial PRIMARY KEY,
+    t  text,
+    UNIQUE (t)
+);
+CREATE OR REPLACE FUNCTION lm_polygon.flag() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO lm_polygon.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION lm_polygon.refresh() RETURNS trigger AS
+$$
+BEGIN
+    RAISE LOG 'Refresh lm_polygon';
+    PERFORM update_lm_polygon();
+    -- noinspection SqlWithoutWhere
+    DELETE FROM lm_polygon.updates;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_flag
+    AFTER INSERT OR UPDATE OR DELETE
+    ON osm_lm_polygon
+    FOR EACH STATEMENT
+EXECUTE PROCEDURE lm_polygon.flag();
+
+CREATE CONSTRAINT TRIGGER trigger_refresh
+    AFTER INSERT
+    ON lm_polygon.updates
+    INITIALLY DEFERRED
+    FOR EACH ROW
+EXECUTE PROCEDURE lm_polygon.refresh();

layers/landuse/class.sql

@@ -0,0 +1,10 @@
+-- Unify class names that represent the same type of feature
+CREATE OR REPLACE FUNCTION landuse_unify(class text) RETURNS text LANGUAGE plpgsql
+AS
+$$
+BEGIN
+  RETURN CASE
+    WHEN class='grave_yard' THEN 'cemetery'
+    ELSE class END;
+END;
+$$;

layers/landuse/landuse.sql

@@ -1,113 +1,407 @@
--- etldoc: ne_50m_urban_areas -> landuse_z4
-CREATE OR REPLACE VIEW landuse_z4 AS (
-    SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS tourism, NULL::text AS place, NULL::text AS waterway
-    FROM ne_50m_urban_areas
-    WHERE scalerank <= 2
+-- ne_50m_urban_areas
+-- etldoc: ne_50m_urban_areas ->  ne_50m_urban_areas_gen_z5
+DROP MATERIALIZED VIEW IF EXISTS ne_50m_urban_areas_gen_z5 CASCADE;
+CREATE MATERIALIZED VIEW ne_50m_urban_areas_gen_z5 AS
+(
+SELECT
+       NULL::bigint AS osm_id,
+       ST_Simplify(geometry, ZRes(7)) as geometry,
+       'residential'::text AS landuse,
+       NULL::text AS amenity,
+       NULL::text AS leisure,
+       NULL::text AS tourism,
+       NULL::text AS place,
+       NULL::text AS waterway,
+       NULL::text AS man_made,
+       scalerank
+FROM ne_50m_urban_areas
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_50m_urban_areas_gen_z5_idx ON ne_50m_urban_areas_gen_z5 USING gist (geometry);
+
+-- etldoc: ne_50m_urban_areas_gen_z5 ->  ne_50m_urban_areas_gen_z4
+DROP MATERIALIZED VIEW IF EXISTS ne_50m_urban_areas_gen_z4 CASCADE;
+CREATE MATERIALIZED VIEW ne_50m_urban_areas_gen_z4 AS
+(
+SELECT
+       osm_id,
+       ST_Simplify(geometry, ZRes(6)) as geometry,
+       landuse,
+       amenity,
+       leisure,
+       tourism,
+       place,
+       waterway,
+       man_made
+FROM ne_50m_urban_areas_gen_z5
+WHERE scalerank <= 2
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS ne_50m_urban_areas_gen_z4_idx ON ne_50m_urban_areas_gen_z4 USING gist (geometry);
+
+-- etldoc: osm_landuse_polygon_gen_z6 ->  osm_landuse_polygon_gen_z6_union
+-- etldoc: osm_residential_gen_z6 ->  osm_landuse_polygon_gen_z6_union
+CREATE OR REPLACE VIEW osm_landuse_polygon_gen_z6_union AS
+(
+       SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z6
+		 WHERE landuse <> 'residential'
+       UNION ALL
+       SELECT NULL::bigint AS osm_id,
+              geometry,
+              'residential' AS landuse,
+              '' AS amenity,
+              '' AS leisure,
+              '' AS tourism,
+              '' AS place,
+              '' AS waterway,
+              '' AS man_made
+         FROM osm_residential_gen_z6
 );
 
--- etldoc: ne_50m_urban_areas -> landuse_z5
-CREATE OR REPLACE VIEW landuse_z5 AS (
-    SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS tourism, NULL::text AS place, NULL::text AS waterway
-    FROM ne_50m_urban_areas
+-- etldoc: osm_landuse_polygon_gen_z7 ->  osm_landuse_polygon_gen_z7_union
+-- etldoc: osm_residential_gen_z7 ->  osm_landuse_polygon_gen_z7_union
+CREATE OR REPLACE VIEW osm_landuse_polygon_gen_z7_union AS
+(
+       SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z7
+		 WHERE landuse <> 'residential'
+       UNION ALL
+       SELECT NULL::bigint AS osm_id,
+              geometry,
+              'residential' AS landuse,
+              '' AS amenity,
+              '' AS leisure,
+              '' AS tourism,
+              '' AS place,
+              '' AS waterway,
+              '' AS man_made
+         FROM osm_residential_gen_z7
 );
 
--- etldoc: osm_landuse_polygon_gen7 -> landuse_z6
-CREATE OR REPLACE VIEW landuse_z6 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway
-    FROM osm_landuse_polygon_gen7
+-- etldoc: osm_landuse_polygon_gen_z8 ->  osm_landuse_polygon_gen_z8_union
+-- etldoc: osm_residential_gen_z8 ->  osm_landuse_polygon_gen_z8_union
+CREATE OR REPLACE VIEW osm_landuse_polygon_gen_z8_union AS
+(
+       SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z8
+		 WHERE landuse <> 'residential'
+       UNION ALL
+       SELECT NULL::bigint AS osm_id,
+              geometry,
+              'residential' AS landuse,
+              '' AS amenity,
+              '' AS leisure,
+              '' AS tourism,
+              '' AS place,
+              '' AS waterway,
+              '' AS man_made
+         FROM osm_residential_gen_z8
 );
 
--- etldoc: osm_landuse_polygon_gen6 -> landuse_z8
-CREATE OR REPLACE VIEW landuse_z8 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway
-    FROM osm_landuse_polygon_gen6
+-- etldoc: osm_landuse_polygon_gen_z9 ->  osm_landuse_polygon_gen_z9_union
+-- etldoc: osm_residential_gen_z9 ->  osm_landuse_polygon_gen_z9_union
+CREATE OR REPLACE VIEW osm_landuse_polygon_gen_z9_union AS
+(
+       SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z9
+		 WHERE landuse <> 'residential'
+       UNION ALL
+       SELECT NULL::bigint AS osm_id,
+              geometry,
+              'residential' AS landuse,
+              '' AS amenity,
+              '' AS leisure,
+              '' AS tourism,
+              '' AS place,
+              '' AS waterway,
+              '' AS man_made
+         FROM osm_residential_gen_z9
 );
 
--- etldoc: osm_landuse_polygon_gen5 -> landuse_z9
-CREATE OR REPLACE VIEW landuse_z9 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway
-    FROM osm_landuse_polygon_gen5
+-- etldoc: osm_landuse_polygon_gen_z10 ->  osm_landuse_polygon_gen_z10_union
+-- etldoc: osm_residential_gen_z10 ->  osm_landuse_polygon_gen_z10_union
+CREATE OR REPLACE VIEW osm_landuse_polygon_gen_z10_union AS
+(
+       SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z10
+		 WHERE landuse <> 'residential'
+       UNION ALL
+       SELECT NULL::bigint AS osm_id,
+              geometry,
+              'residential' AS landuse,
+              '' AS amenity,
+              '' AS leisure,
+              '' AS tourism,
+              '' AS place,
+              '' AS waterway,
+              '' AS man_made
+         FROM osm_residential_gen_z10
 );
 
--- etldoc: osm_landuse_polygon_gen4 -> landuse_z10
-CREATE OR REPLACE VIEW landuse_z10 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway
-    FROM osm_landuse_polygon_gen4
+-- etldoc: osm_landuse_polygon_gen_z11 ->  osm_landuse_polygon_gen_z11_union
+-- etldoc: osm_residential_gen_z11 ->  osm_landuse_polygon_gen_z11_union
+CREATE OR REPLACE VIEW osm_landuse_polygon_gen_z11_union AS
+(
+       SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z11
+		 WHERE landuse <> 'residential'
+       UNION ALL
+       SELECT NULL::bigint AS osm_id,
+              geometry,
+              'residential' AS landuse,
+              '' AS amenity,
+              '' AS leisure,
+              '' AS tourism,
+              '' AS place,
+              '' AS waterway,
+              '' AS man_made
+         FROM osm_residential_gen_z11
 );
 
--- etldoc: osm_landuse_polygon_gen3 -> landuse_z11
-CREATE OR REPLACE VIEW landuse_z11 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway
-    FROM osm_landuse_polygon_gen3
-);
-
--- etldoc: osm_landuse_polygon_gen2 -> landuse_z12
-CREATE OR REPLACE VIEW landuse_z12 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway
-    FROM osm_landuse_polygon_gen2
-);
-
--- etldoc: osm_landuse_polygon_gen1 -> landuse_z13
-CREATE OR REPLACE VIEW landuse_z13 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway
-    FROM osm_landuse_polygon_gen1
-);
-
--- etldoc: osm_landuse_polygon -> landuse_z14
-CREATE OR REPLACE VIEW landuse_z14 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway
-    FROM osm_landuse_polygon
+-- etldoc: osm_landuse_polygon_gen_z12 ->  osm_landuse_polygon_gen_z12_union
+-- etldoc: osm_residential_gen_z12 ->  osm_landuse_polygon_gen_z12_union
+CREATE OR REPLACE VIEW osm_landuse_polygon_gen_z12_union AS
+(
+       SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z12
+		 WHERE landuse <> 'residential'
+       UNION ALL
+       SELECT NULL::bigint AS osm_id,
+              geometry,
+              'residential' AS landuse,
+              '' AS amenity,
+              '' AS leisure,
+              '' AS tourism,
+              '' AS place,
+              '' AS waterway,
+              '' AS man_made
+         FROM osm_residential_gen_z12
 );
 
 -- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_landuse |<z4> z4|<z5>z5|<z6>z6|<z7>z7| <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11|<z12> z12|<z13> z13|<z14> z14+" ] ;
+-- etldoc:     label="layer_landuse |<z4> z4|<z5> z5|<z6> z6|<z7> z7|<z8> z8|<z9> z9|<z10> z10|<z11> z11|<z12> z12|<z13> z13|<z14> z14+" ] ;
 
 CREATE OR REPLACE FUNCTION layer_landuse(bbox geometry, zoom_level int)
-RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$
-    SELECT osm_id, geometry,
-        COALESCE(
-            NULLIF(landuse, ''),
-            NULLIF(amenity, ''),
-            NULLIF(leisure, ''),
-            NULLIF(tourism, ''),
-            NULLIF(place, ''),
-            NULLIF(waterway, '')
-        ) AS class
-        FROM (
-        -- etldoc: landuse_z4 -> layer_landuse:z4
-        SELECT * FROM landuse_z4
-        WHERE zoom_level = 4
-        UNION ALL
-        -- etldoc: landuse_z5 -> layer_landuse:z5
-        SELECT * FROM landuse_z5
-        WHERE zoom_level = 5
-        UNION ALL
-        -- etldoc: landuse_z6 -> layer_landuse:z6
-        -- etldoc: landuse_z6 -> layer_landuse:z7
-        SELECT * FROM landuse_z6 WHERE zoom_level BETWEEN 6 AND 7
-        UNION ALL
-        -- etldoc: landuse_z8 -> layer_landuse:z8
-        SELECT * FROM landuse_z8 WHERE zoom_level = 8
-        UNION ALL
-        -- etldoc: landuse_z9 -> layer_landuse:z9
-        SELECT * FROM landuse_z9 WHERE zoom_level = 9
-        UNION ALL
-        -- etldoc: landuse_z10 -> layer_landuse:z10
-        SELECT * FROM landuse_z10 WHERE zoom_level = 10
-        UNION ALL
-        -- etldoc: landuse_z11 -> layer_landuse:z11
-        SELECT * FROM landuse_z11 WHERE zoom_level = 11
-        UNION ALL
-        -- etldoc: landuse_z12 -> layer_landuse:z12
-        SELECT * FROM landuse_z12 WHERE zoom_level = 12
-        UNION ALL
-        -- etldoc: landuse_z13 -> layer_landuse:z13
-        SELECT * FROM landuse_z13 WHERE zoom_level = 13
-        UNION ALL
-        -- etldoc: landuse_z14 -> layer_landuse:z14
-        SELECT * FROM landuse_z14 WHERE zoom_level >= 14
-    ) AS zoom_levels
-    WHERE geometry && bbox;
+    RETURNS TABLE
+            (
+                osm_id   bigint,
+                geometry geometry,
+                class    text
+            )
+AS
 $$
-LANGUAGE SQL
-IMMUTABLE PARALLEL SAFE;
+SELECT osm_id,
+       geometry,
+       landuse_unify(
+         COALESCE(
+               NULLIF(landuse, ''),
+               NULLIF(amenity, ''),
+               NULLIF(leisure, ''),
+               NULLIF(tourism, ''),
+               NULLIF(place, ''),
+               NULLIF(waterway, ''),
+               NULLIF(man_made, '')
+           )) AS class
+FROM (
+         -- etldoc: ne_50m_urban_areas_gen_z4 -> layer_landuse:z4
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM ne_50m_urban_areas_gen_z4
+         WHERE zoom_level = 4
+         UNION ALL
+         -- etldoc: ne_50m_urban_areas_gen_z5 -> layer_landuse:z5
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM ne_50m_urban_areas_gen_z5
+         WHERE zoom_level = 5
+         UNION ALL
+         -- etldoc: osm_landuse_polygon_gen_z6_union -> layer_landuse:z6
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z6_union
+         WHERE zoom_level = 6
+         UNION ALL
+         -- etldoc: osm_landuse_polygon_gen_z7_union -> layer_landuse:z7
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z7_union
+         WHERE zoom_level = 7
+         UNION ALL
+         -- etldoc: osm_landuse_polygon_gen_z8_union -> layer_landuse:z8
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z8_union
+         WHERE zoom_level = 8
+         UNION ALL
+         -- etldoc: osm_landuse_polygon_gen_z9_union -> layer_landuse:z9
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z9_union
+         WHERE zoom_level = 9
+         UNION ALL
+         -- etldoc: osm_landuse_polygon_gen_z10_union -> layer_landuse:z10
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z10_union
+         WHERE zoom_level = 10
+         UNION ALL
+         -- etldoc: osm_landuse_polygon_gen_z11_union -> layer_landuse:z11
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z11_union
+         WHERE zoom_level = 11
+         UNION ALL
+         -- etldoc: osm_landuse_polygon_gen_z12_union -> layer_landuse:z12
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z12_union
+         WHERE zoom_level = 12
+         UNION ALL
+         -- etldoc: osm_landuse_polygon_gen_z13 -> layer_landuse:z13
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon_gen_z13
+         WHERE zoom_level = 13
+         UNION ALL
+         -- etldoc: osm_landuse_polygon -> layer_landuse:z14
+         SELECT osm_id,
+                geometry,
+                landuse,
+                amenity,
+                leisure,
+                tourism,
+                place,
+                waterway,
+                man_made
+         FROM osm_landuse_polygon
+         WHERE zoom_level >= 14
+     ) AS zoom_levels
+WHERE geometry && bbox;
+$$ LANGUAGE SQL STABLE
+                -- STRICT
+                PARALLEL SAFE;

layers/landuse/landuse.yaml

@@ -1,5 +1,8 @@
 layer:
   id: "landuse"
+  requires:
+    tables:
+      - ne_50m_urban_areas
   description: |
       Landuse is used to describe use of land by humans. At lower zoom levels this is
       from Natural Earth data for residential (urban) areas and at higher zoom levels mostly OSM `landuse` tags.
@@ -22,6 +25,7 @@ layer:
       - residential
       - commercial
       - industrial
+      - garages
       - retail
       - bus_station
       - school
@@ -37,15 +41,24 @@ layer:
       - theme_park
       - zoo
       - suburb
+      - quarter
       - neighbourhood
       - dam
       - sports_centre
       - parking
+      - motorcycle_parking
+      - bicycle_parking
       - religious
+      - prison
+      - wastewater_plant
+      - water_works
+      - quarry
   datasource:
     geometry_field: geometry
     query: (SELECT geometry, class FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t
 schema:
+  - ./class.sql
+  - ./prep_landuse.sql
   - ./landuse.sql
 datasources:
   - type: imposm3

layers/landuse/mapping.yaml

@@ -1,35 +1,41 @@
 generalized_tables:
-  # etldoc: imposm3 -> osm_landuse_polygon_gen7
-  landuse_polygon_gen7:
-    source: landuse_polygon_gen6
+  # etldoc: osm_landuse_polygon_gen_z7 -> osm_landuse_polygon_gen_z6
+  landuse_polygon_gen_z6:
+    source: landuse_polygon_gen_z7
+    tolerance: ZRES6
+    sql_filter: area>power(ZRES6,2)
+  # etldoc: osm_landuse_polygon_gen_z8 -> osm_landuse_polygon_gen_z7
+  landuse_polygon_gen_z7:
+    source: landuse_polygon_gen_z8
     tolerance: ZRES7
-  # etldoc: imposm3 -> osm_landuse_polygon_gen6
-  landuse_polygon_gen6:
-    source: landuse_polygon_gen5
-    sql_filter: area>power(ZRES6,2) AND (landuse='residential' OR place='suburb' OR place='neighbourhood')
+    sql_filter: area>power(ZRES6,2)
+  # etldoc: osm_landuse_polygon_gen_z9 -> osm_landuse_polygon_gen_z8
+  landuse_polygon_gen_z8:
+    source: landuse_polygon_gen_z9
+    sql_filter: area>power(ZRES6,2) AND (landuse='residential' OR place='suburb' OR place='quarter' OR place='neighbourhood')
     tolerance: ZRES8
-  # etldoc: imposm3 -> osm_landuse_polygon_gen5
-  landuse_polygon_gen5:
-    source: landuse_polygon_gen4
+  # etldoc: osm_landuse_polygon_gen_z10 -> osm_landuse_polygon_gen_z9
+  landuse_polygon_gen_z9:
+    source: landuse_polygon_gen_z10
     sql_filter: area>power(ZRES7,2)
     tolerance: ZRES9
-  # etldoc: imposm3 -> osm_landuse_polygon_gen4
-  landuse_polygon_gen4:
-    source: landuse_polygon_gen3
+  # etldoc: osm_landuse_polygon_gen_z11 -> osm_landuse_polygon_gen_z10
+  landuse_polygon_gen_z10:
+    source: landuse_polygon_gen_z11
     sql_filter: area>power(ZRES8,2)
     tolerance: ZRES10
-  # etldoc: imposm3 -> osm_landuse_polygon_gen3
-  landuse_polygon_gen3:
-    source: landuse_polygon_gen2
+  # etldoc: osm_landuse_polygon_gen_z12 -> osm_landuse_polygon_gen_z11
+  landuse_polygon_gen_z11:
+    source: landuse_polygon_gen_z12
     sql_filter: area>power(ZRES9,2)
     tolerance: ZRES11
-  # etldoc: imposm3 -> osm_landuse_polygon_gen2
-  landuse_polygon_gen2:
-    source: landuse_polygon_gen1
+  # etldoc: osm_landuse_polygon_gen_z13 -> osm_landuse_polygon_gen_z12
+  landuse_polygon_gen_z12:
+    source: landuse_polygon_gen_z13
     sql_filter: area>power(ZRES10,2)
     tolerance: ZRES12
-  # etldoc: imposm3 -> osm_landuse_polygon_gen1
-  landuse_polygon_gen1:
+  # etldoc: osm_landuse_polygon -> osm_landuse_polygon_gen_z13
+  landuse_polygon_gen_z13:
     source: landuse_polygon
     sql_filter: area>power(ZRES11,2) AND ST_IsValid(geometry)
     tolerance: ZRES13
@@ -63,11 +69,15 @@ tables:
       type: string
     - name: area
       type: area
+    - name: man_made
+      key: man_made
+      type: string
     mapping:
       landuse:
       - railway
       - cemetery
       - military
+      - quarry
       # zoning
       - residential
       - commercial
@@ -75,6 +85,7 @@ tables:
       - garages
       - retail
       - religious
+      - construction
       amenity:
       - bus_station
       - school
@@ -84,7 +95,11 @@ tables:
       - library
       - hospital
       - parking
+      - prison
+      - motorcycle_parking
+      - bicycle_parking
       - animal_training
+      - grave_yard
       leisure:
       - stadium
       - pitch
@@ -97,6 +112,10 @@ tables:
       - picnic_site
       place:
       - suburb
+      - quarter
       - neighbourhood
       waterway:
       - dam
+      man_made:
+      - wastewater_plant
+      - water_works

layers/landuse/prep_landuse.sql

@@ -0,0 +1,176 @@
+DROP TABLE IF EXISTS cluster_zres14;
+CREATE TABLE cluster_zres14 AS 
+(
+WITH single_geom AS (
+        SELECT (ST_Dump(geometry)).geom AS geometry
+        FROM osm_landuse_polygon 
+        WHERE landuse='residential'
+    )
+    SELECT ST_ClusterDBSCAN(geometry, eps := zres(14), minpoints := 1) over () AS cid,
+           geometry
+    FROM single_geom
+);
+CREATE INDEX ON cluster_zres14 USING gist(geometry);
+
+
+DROP TABLE IF EXISTS cluster_zres14_union;
+CREATE TABLE cluster_zres14_union AS (
+SELECT ST_Buffer(
+            ST_Union(
+                ST_Buffer(
+                    ST_SnapToGrid(geometry, 0.01)
+                    , zres(14), 'join=mitre'
+                )
+            ),-zres(14), 'join=mitre'
+        ) AS geometry
+FROM cluster_zres14
+GROUP BY cid
+);
+CREATE INDEX ON cluster_zres14_union USING gist(geometry);
+
+
+DROP TABLE IF EXISTS cluster_zres12;
+CREATE TABLE cluster_zres12 AS 
+(
+WITH single_geom AS (
+    SELECT (ST_Dump(geometry)).geom AS geometry
+    FROM osm_landuse_polygon 
+    WHERE landuse='residential'
+    )
+    SELECT ST_ClusterDBSCAN(geometry, eps := zres(12), minpoints := 1) over () AS cid,
+           geometry
+    FROM single_geom
+);
+CREATE INDEX ON cluster_zres12 USING gist(geometry);
+
+
+DROP TABLE IF EXISTS cluster_zres12_union;
+CREATE TABLE cluster_zres12_union AS 
+(
+SELECT ST_Buffer(
+            ST_Union(
+                ST_Buffer(
+                    ST_SnapToGrid(geometry, 1)
+                        , zres(12), 'join=mitre'
+                    )
+                ), -zres(12), 'join=mitre'
+            ) AS geometry
+FROM cluster_zres12
+GROUP BY cid
+);
+CREATE INDEX ON cluster_zres12_union USING gist(geometry);
+
+
+DROP TABLE IF EXISTS cluster_zres9;
+CREATE TABLE cluster_zres9 AS 
+(
+WITH single_geom AS (
+        SELECT (ST_Dump(geometry)).geom AS geometry
+        FROM osm_landuse_polygon 
+        WHERE landuse='residential'
+    )
+    SELECT ST_ClusterDBSCAN(geometry, eps := zres(9), minpoints := 1) over () AS cid,
+           geometry
+    FROM single_geom
+);
+CREATE INDEX ON cluster_zres9 USING gist(geometry);
+
+
+DROP TABLE IF EXISTS cluster_zres9_union;
+CREATE TABLE cluster_zres9_union AS 
+(
+SELECT ST_Buffer(
+            ST_Union(
+                ST_Buffer(
+                    ST_SnapToGrid(geometry, 1)
+                        , zres(9), 'join=mitre'
+                    )
+                ), -zres(9), 'join=mitre'
+            ) AS geometry
+FROM cluster_zres9
+GROUP BY cid
+);
+CREATE INDEX ON cluster_zres9_union USING gist(geometry);
+
+-- For z6
+-- etldoc: osm_landuse_polygon ->  osm_residential_gen_z6
+DROP TABLE IF EXISTS osm_residential_gen_z6 CASCADE;
+CREATE TABLE osm_residential_gen_z6 AS
+(
+SELECT ST_SimplifyVW(geometry, power(zres(6), 2)) AS geometry
+FROM cluster_zres9_union
+WHERE ST_Area(geometry) > power(zres(6), 2)
+);
+CREATE INDEX ON osm_residential_gen_z6 USING gist(geometry);
+
+
+-- For z7
+-- etldoc: osm_landuse_polygon ->  osm_residential_gen_z7
+DROP TABLE IF EXISTS osm_residential_gen_z7 CASCADE;
+CREATE TABLE osm_residential_gen_z7 AS
+(
+SELECT ST_SimplifyVW(geometry, power(zres(7), 2)) AS geometry
+FROM cluster_zres12_union
+WHERE ST_Area(geometry) > power(zres(6), 2)
+);
+CREATE INDEX ON osm_residential_gen_z7 USING gist(geometry);
+
+
+-- For z8
+-- etldoc: osm_landuse_polygon ->  osm_residential_gen_z8
+DROP TABLE IF EXISTS osm_residential_gen_z8 CASCADE;
+CREATE TABLE osm_residential_gen_z8 AS
+(
+SELECT ST_SimplifyVW(geometry, power(zres(8), 2)) AS geometry
+FROM cluster_zres12_union
+WHERE ST_Area(geometry) > power(zres(7), 2)
+);
+CREATE INDEX ON osm_residential_gen_z8 USING gist(geometry);
+
+
+-- For z9
+-- etldoc: osm_landuse_polygon ->  osm_residential_gen_z9
+DROP TABLE IF EXISTS osm_residential_gen_z9 CASCADE;
+CREATE TABLE osm_residential_gen_z9 AS
+(
+SELECT ST_SimplifyVW(geometry, power(zres(9), 2)) AS geometry
+FROM cluster_zres12_union
+WHERE ST_Area(geometry) > power(zres(9), 2)
+);
+CREATE INDEX ON osm_residential_gen_z9 USING gist(geometry);
+
+
+-- For z10
+-- etldoc: osm_landuse_polygon ->  osm_residential_gen_z10
+DROP TABLE IF EXISTS osm_residential_gen_z10 CASCADE;
+CREATE TABLE osm_residential_gen_z10 AS
+(
+SELECT ST_SimplifyVW(geometry, power(zres(10), 2)) AS geometry
+FROM cluster_zres14_union
+WHERE ST_Area(geometry) > power(zres(10), 2)
+);
+CREATE INDEX ON osm_residential_gen_z10 USING gist(geometry);
+
+
+-- For z11
+-- etldoc: osm_landuse_polygon ->  osm_residential_gen_z11
+DROP TABLE IF EXISTS osm_residential_gen_z11 CASCADE;
+CREATE TABLE osm_residential_gen_z11 AS
+(
+SELECT ST_SimplifyVW(geometry, power(zres(11), 2)) AS geometry
+FROM cluster_zres14_union
+WHERE ST_Area(geometry) > power(zres(11), 2)
+);
+CREATE INDEX ON osm_residential_gen_z11 USING gist(geometry);
+
+
+-- For z12
+-- etldoc: osm_landuse_polygon ->  osm_residential_gen_z12
+DROP TABLE IF EXISTS osm_residential_gen_z12 CASCADE;
+CREATE TABLE osm_residential_gen_z12 AS
+(
+SELECT ST_SimplifyVW(geometry, power(zres(12), 2)) AS geometry
+FROM cluster_zres14_union
+WHERE ST_Area(geometry) > power(zres(12), 2)
+);
+CREATE INDEX ON osm_residential_gen_z12 USING gist(geometry);

layers/landuse/style.json

@@ -0,0 +1,369 @@
+{
+  "layers": [
+    {
+      "id": "landuse_classes",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "landuse",
+      "minzoom": 7,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-color": [
+          "match",
+          [
+            "get",
+            "class"
+          ],
+          "railway",
+          "#ebdbe8",
+          "residential",
+          "#e0dfdf",
+          "cemetery",
+          "#aacbaf",
+          "military",
+          "#fceaea",
+          "commercial",
+          "#f2dad9",
+          "industrial",
+          "#ebdbe8",
+          "garages",
+          "#dfddce",
+          "retail",
+          "#ffd6d1",
+          "bus_station",
+          "#e9e7e2",
+          "school",
+          "#ffffe5",
+          "university",
+          "#ffffe5",
+          "kindergarten",
+          "#ffffe5",
+          "college",
+          "#ffffe5",
+          "hospital",
+          "#ffffe5",
+          "stadium",
+          "#d5ffd9",
+          "pitch",
+          "#aae0cb",
+          "playground",
+          "#d5ffd9",
+          "track",
+          "#aae0cb",
+          "dam",
+          "#adadad",
+          "#000"
+        ],
+        "fill-opacity": 1
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "railway",
+          "cemetery",
+          "military",
+          "residential",
+          "commercial",
+          "industrial",
+          "garages",
+          "retail",
+          "bus_station",
+          "school",
+          "university",
+          "kindergarten",
+          "college",
+          "hospital",
+          "stadium",
+          "pitch",
+          "playground",
+          "track",
+          "dam"
+        ],
+        [
+          "==",
+          "$type",
+          "Polygon"
+        ]
+      ],
+      "order": 1
+    },
+    {
+      "id": "landuse_residential",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "landuse",
+      "minzoom": 6,
+      "maxzoom": 24,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-color": {
+          "stops": [
+            [
+              7,
+              "#d0d0d0"
+            ],
+            [
+              11,
+              "#dddddd"
+            ],
+            [
+              12,
+              "#e0dfdf"
+            ]
+          ]
+        }
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "residential",
+          "suburbs",
+          "neighbourhood"
+        ]
+      ],
+      "order": 2
+    },
+    {
+      "id": "landuse_class_pattern",
+      "type": "fill",
+      "source": "openmaptiles",
+      "source-layer": "landuse",
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-color": "#000000",
+        "fill-opacity": 1,
+        "fill-pattern": [
+          "match",
+          [
+            "get",
+            "class"
+          ],
+          "military",
+          "military_red_hatch",
+          "cemetery",
+          "grave_yard_generic",
+          ""
+        ]
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "military",
+          "cemetery"
+        ]
+      ],
+      "order": 25
+    },
+    {
+      "id": "landuse_class_outline",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "landuse",
+      "minzoom": 13,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": [
+          "match",
+          [
+            "get",
+            "class"
+          ],
+          "railway",
+          "#c6b3c3",
+          "military",
+          "#ff5555",
+          "residential",
+          "#b9b9b9",
+          "commercial",
+          "#f2dad9",
+          "industrial",
+          "#c6b3c3",
+          "retail",
+          "#d99c95",
+          "school",
+          "#A6A68C",
+          "university",
+          "#A6A68C",
+          "kindergarten",
+          "#A6A68C",
+          "college",
+          "#A6A68C",
+          "hospital",
+          "#A6A68C",
+          "stadium",
+          "#7ca680",
+          "pitch",
+          "#7aaa97",
+          "playground",
+          "#3c6640",
+          "track",
+          "#7aaa96",
+          "theme_park",
+          "#660033",
+          "zoo",
+          "#660033",
+          "dam",
+          "#444444",
+          "#000"
+        ],
+        "line-width": [
+          "match",
+          [
+            "get",
+            "class"
+          ],
+          "railway",
+          0.7,
+          "military",
+          2,
+          "residential",
+          0.5,
+          "commercial",
+          0.5,
+          "industrial",
+          0.5,
+          "retail",
+          0.5,
+          "school",
+          0.3,
+          "university",
+          0.3,
+          "kindergarten",
+          0.3,
+          "college",
+          0.3,
+          "hospital",
+          0.3,
+          "stadium",
+          0.3,
+          "pitch",
+          0.5,
+          "playground",
+          0.3,
+          "track",
+          0.5,
+          "theme_park",
+          1,
+          "zoo",
+          1,
+          "dam",
+          2,
+          1
+        ],
+        "line-offset": [
+          "match",
+          [
+            "get",
+            "class"
+          ],
+          "military",
+          1,
+          0
+        ],
+        "line-opacity": [
+          "match",
+          [
+            "get",
+            "class"
+          ],
+          "military",
+          0.24,
+          1
+        ]
+      },
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "railway",
+          "military",
+          "residential",
+          "commercial",
+          "industrial",
+          "retail",
+          "school",
+          "university",
+          "kindergarten",
+          "college",
+          "hospital",
+          "stadium",
+          "pitch",
+          "playground",
+          "track",
+          "theme_park",
+          "zoo",
+          "dam"
+        ]
+      ],
+      "order": 26
+    },
+    {
+      "id": "landuse_class_themepark",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "landuse",
+      "minzoom": 13,
+      "layout": {
+        "line-cap": "square",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "#660033",
+        "line-width": {
+          "stops": [
+            [
+              9,
+              3.5
+            ],
+            [
+              14,
+              5.5
+            ]
+          ]
+        },
+        "line-offset": 2,
+        "line-opacity": {
+          "stops": [
+            [
+              9,
+              0.1
+            ],
+            [
+              12,
+              0.3
+            ]
+          ]
+        }
+      },
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "theme_park",
+          "zoo"
+        ]
+      ],
+      "order": 27
+    }
+  ]
+}

layers/mountain_peak/layer.sql

@@ -1,57 +0,0 @@
-
--- etldoc: layer_mountain_peak[shape=record fillcolor=lightpink,
--- etldoc:     style="rounded,filled", label="layer_mountain_peak | <z7_> z7+" ] ;
-
-CREATE OR REPLACE FUNCTION layer_mountain_peak(
-    bbox geometry,
-    zoom_level integer,
-    pixel_width numeric)
-  RETURNS TABLE(
-    osm_id bigint,
-    geometry geometry,
-    name text,
-    name_en text,
-    name_de text,
-    class text,
-    tags hstore,
-    ele int,
-    ele_ft int,
-    "rank" int) AS
-$$
-   -- etldoc: osm_peak_point -> layer_mountain_peak:z7_
-  SELECT
-    osm_id,
-    geometry,
-    name,
-    name_en,
-    name_de,
-    tags -> 'natural' AS class,
-    tags,
-    ele::int,
-    ele_ft::int,
-    rank::int FROM (
-      SELECT osm_id, geometry, name,
-      COALESCE(NULLIF(name_en, ''), name) AS name_en,
-      COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
-      tags,
-      substring(ele from E'^(-?\\d+)(\\D|$)')::int AS ele,
-      round(substring(ele from E'^(-?\\d+)(\\D|$)')::int*3.2808399)::int AS ele_ft,
-      row_number() OVER (
-          PARTITION BY LabelGrid(geometry, 100 * pixel_width)
-          ORDER BY (
-            substring(ele from E'^(-?\\d+)(\\D|$)')::int +
-            (CASE WHEN NULLIF(wikipedia, '') is not null THEN 10000 ELSE 0 END) +
-            (CASE WHEN NULLIF(name, '') is not null THEN 10000 ELSE 0 END)
-          ) DESC
-      )::int AS "rank"
-      FROM osm_peak_point
-      WHERE geometry && bbox
-        AND ele is not null
-        AND ele ~ E'^-?\\d{1,4}(\\D|$)'
-    ) AS ranked_peaks
-  WHERE zoom_level >= 7 AND (rank <= 5 OR zoom_level >= 14)
-  ORDER BY "rank" ASC;
-
-$$
-LANGUAGE SQL
-IMMUTABLE PARALLEL SAFE;

layers/mountain_peak/mapping.yaml

@@ -29,3 +29,32 @@ tables:
       natural:
       - peak
       - volcano
+      - saddle
+
+  # etldoc: imposm3 -> osm_mountain_linestring
+  mountain_linestring:
+    type: linestring
+    columns:
+    - name: osm_id
+      type: id
+    - name: geometry
+      type: geometry
+    - name: name
+      key: name
+      type: string
+    - name: name_en
+      key: name:en
+      type: string
+    - name: name_de
+      key: name:de
+      type: string
+    - name: tags
+      type: hstore_tags
+    - name: wikipedia
+      key: wikipedia
+      type: string
+    mapping:
+      natural:
+      - ridge
+      - cliff
+      - arete

layers/mountain_peak/mountain_peak.sql

@@ -0,0 +1,120 @@
+-- etldoc: osm_peak_point -> peak_point
+-- etldoc: ne_10m_admin_0_countries -> peak_point
+CREATE OR REPLACE VIEW peak_point AS
+(
+SELECT pp.osm_id,
+       pp.geometry,
+       pp.name,
+       pp.name_en,
+       pp.name_de,
+       pp.tags,
+       pp.ele,
+       ne.iso_a2,
+       pp.wikipedia
+FROM osm_peak_point pp, ne_10m_admin_0_countries ne
+WHERE ST_Intersects(pp.geometry, ne.geometry)
+    );
+
+
+
+-- etldoc: layer_mountain_peak[shape=record fillcolor=lightpink,
+-- etldoc:     style="rounded,filled", label="layer_mountain_peak | <z7_> z7+ | <z13_> z13+" ] ;
+
+CREATE OR REPLACE FUNCTION layer_mountain_peak(bbox geometry,
+                                               zoom_level integer,
+                                               pixel_width numeric)
+    RETURNS TABLE
+            (
+                osm_id          bigint,
+                geometry        geometry,
+                name            text,
+                name_en         text,
+                name_de         text,
+                class           text,
+                tags            hstore,
+                ele             int,
+                ele_ft          int,
+                customary_ft    int,
+                "rank"          int
+            )
+AS
+$$
+SELECT
+    -- etldoc: peak_point -> layer_mountain_peak:z7_
+    osm_id,
+    geometry,
+    name,
+    name_en,
+    name_de,
+    tags->'natural' AS class,
+    tags,
+    ele::int,
+    ele_ft::int,
+    customary_ft,
+    rank::int
+FROM (
+         SELECT osm_id,
+                geometry,
+                NULLIF(name, '') as name,
+                COALESCE(NULLIF(name_en, ''), NULLIF(name, '')) AS name_en,
+                COALESCE(NULLIF(name_de, ''), NULLIF(name, ''), NULLIF(name_en, '')) AS name_de,
+                tags,
+                substring(ele FROM E'^(-?\\d+)(\\D|$)')::int AS ele,
+                round(substring(ele FROM E'^(-?\\d+)(\\D|$)')::int * 3.2808399)::int AS ele_ft,
+                CASE WHEN iso_a2 = 'US' THEN 1 END AS customary_ft,
+                row_number() OVER (
+                    PARTITION BY LabelGrid(geometry, 100 * pixel_width)
+                    ORDER BY (
+                            (CASE WHEN ele <> '' THEN substring(ele FROM E'^(-?\\d+)(\\D|$)')::int ELSE 0 END) +
+                            (CASE WHEN wikipedia <> '' THEN 10000 ELSE 0 END) +
+                            (CASE WHEN name <> '' THEN 10000 ELSE 0 END)
+                        ) DESC
+                    )::int AS "rank"
+         FROM peak_point
+         WHERE geometry && bbox
+           AND (
+            (ele <> '' AND ele ~ E'^-?\\d{1,4}(\\D|$)')
+            OR name <> ''
+           )
+     ) AS ranked_peaks
+WHERE zoom_level >= 7
+  AND (rank <= 5 OR zoom_level >= 14)
+
+UNION ALL
+
+SELECT
+    -- etldoc: osm_mountain_linestring -> layer_mountain_peak:z13_
+    osm_id,
+    geometry,
+    name,
+    name_en,
+    name_de,
+    tags->'natural' AS class,
+    tags,
+    NULL AS ele,
+    NULL AS ele_ft,
+    NULL AS customary_ft,
+    rank::int
+FROM (
+         SELECT osm_id,
+                geometry,
+                name,
+                COALESCE(NULLIF(name_en, ''), name) AS name_en,
+                COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
+                tags,
+                row_number() OVER (
+                    PARTITION BY LabelGrid(geometry, 100 * pixel_width)
+                    ORDER BY (
+                            (CASE WHEN wikipedia <> '' THEN 10000 ELSE 0 END) +
+                            (CASE WHEN name <> '' THEN 10000 ELSE 0 END)
+                        ) DESC
+                    )::int AS "rank"
+         FROM osm_mountain_linestring
+         WHERE geometry && bbox
+     ) AS ranked_mountain_linestring
+WHERE zoom_level >= 13
+ORDER BY "rank" ASC;
+
+$$ LANGUAGE SQL STABLE
+                PARALLEL SAFE;
+-- TODO: Check if the above can be made STRICT -- i.e. if pixel_width could be NULL

layers/mountain_peak/mountain_peak.yaml

@@ -1,31 +1,45 @@
 layer:
   id: "mountain_peak"
+  requires:
+    tables:
+      - ne_10m_admin_0_countries
   description: |
       [Natural peaks](http://wiki.openstreetmap.org/wiki/Tag:natural%3Dpeak)
   buffer_size: 64
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
   fields:
-    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the peak.
-    name_en: English name `name:en` if available, otherwise `name`.
-    name_de: German name `name:de` if available, otherwise `name` or `name:en`.
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the peak. Language-specific values are in `name:xx`.
+    name_en: English name `name:en` if available, otherwise `name`. This is deprecated and will be removed in a future release in favor of `name:en`.
+    name_de: German name `name:de` if available, otherwise `name` or `name:en`. This is deprecated and will be removed in a future release in favor of `name:de`.
     class:
       description: |
-        Use the **class** to differentiate between mountain peak and volcano.
+        Use the **class** to differentiate between natural objects.
       values:
       - peak
       - volcano
+      - saddle
+      - ridge
+      - cliff
+      - arete
     ele: Elevation (`ele`) in meters.
-    ele_ft: Elevation (`ele`) in feets.
+    ele_ft: Elevation (`ele`) in feet.
+    customary_ft:
+      description: |
+        Value 1 for peaks in location where feet is used as customary unit (USA).
+      values:
+      - 1
+      - NULL
     rank: Rank of the peak within one tile (starting at 1 that is the most important peak).
   datasource:
     geometry_field: geometry
     key_field: osm_id
     key_field_as_attribute: no
     srid: 900913
-    query: (SELECT osm_id, geometry, name, name_en, name_de, {name_languages}, class, ele, ele_ft, rank FROM layer_mountain_peak(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
+    query: (SELECT osm_id, geometry, name, name_en, name_de, {name_languages}, class, ele, ele_ft, customary_ft, rank FROM layer_mountain_peak(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
 schema:
   - ./update_peak_point.sql
-  - ./layer.sql
+  - ./update_mountain_linestring.sql
+  - ./mountain_peak.sql
 datasources:
   - type: imposm3
     mapping_file: ./mapping.yaml

layers/mountain_peak/style.json

@@ -0,0 +1,101 @@
+{
+  "layers": [
+    {
+      "id": "mountain_peak",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "mountain_peak",
+      "maxzoom": 16,
+      "filter": [
+        "all",
+        [
+          "!in",
+          "class",
+          "cliff",
+          "volcano"
+        ]
+      ],
+      "layout": {
+        "text-size": 10,
+        "icon-image": "peak",
+        "text-field": {
+          "stops": [
+            [
+              6,
+              " "
+            ],
+            [
+              12,
+              "{name} {ele}m"
+            ]
+          ]
+        },
+        "text-anchor": "top",
+        "text-offset": [
+          0,
+          0.5
+        ],
+        "text-max-width": 6,
+        "text-line-height": 1.1,
+        "text-font": [
+          "Noto Sans Regular",
+          "Noto Sans Italic"
+        ]
+      },
+      "paint": {
+        "text-color": "#6e441e",
+        "text-halo-color": "rgba(255, 255, 255, .8)",
+        "text-halo-width": 1
+      },
+      "order": 192
+    },
+    {
+      "id": "mountain_peak_volcano",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "mountain_peak",
+      "maxzoom": 16,
+      "filter": [
+        "all",
+        [
+          "==",
+          "class",
+          "volcano"
+        ]
+      ],
+      "layout": {
+        "text-size": 10,
+        "icon-image": "volcano",
+        "text-field": {
+          "stops": [
+            [
+              6,
+              " "
+            ],
+            [
+              12,
+              "{name} {ele}m"
+            ]
+          ]
+        },
+        "text-anchor": "top",
+        "text-offset": [
+          0,
+          0.5
+        ],
+        "text-max-width": 6,
+        "text-line-height": 1.1,
+        "text-font": [
+          "Noto Sans Regular",
+          "Noto Sans Italic"
+        ]
+      },
+      "paint": {
+        "text-color": "#d40000",
+        "text-halo-color": "rgba(255, 255, 255, .8)",
+        "text-halo-width": 1
+      },
+      "order": 193
+    }
+  ]
+}

layers/mountain_peak/update_mountain_linestring.sql

@@ -0,0 +1,89 @@
+DROP TRIGGER IF EXISTS trigger_flag ON osm_mountain_linestring;
+DROP TRIGGER IF EXISTS trigger_store ON osm_mountain_linestring;
+DROP TRIGGER IF EXISTS trigger_refresh ON mountain_linestring.updates;
+
+CREATE SCHEMA IF NOT EXISTS mountain_linestring;
+
+CREATE TABLE IF NOT EXISTS mountain_linestring.osm_ids
+(
+    osm_id bigint PRIMARY KEY
+);
+
+-- etldoc:  osm_mountain_linestring ->  osm_mountain_linestring
+CREATE OR REPLACE FUNCTION update_osm_mountain_linestring(full_update boolean) RETURNS void AS
+$$
+    UPDATE osm_mountain_linestring
+    SET tags = update_tags(tags, geometry)
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM mountain_linestring.osm_ids))
+      AND COALESCE(tags -> 'name:latin', tags -> 'name:nonlatin', tags -> 'name_int') IS NULL
+      AND tags != update_tags(tags, geometry)
+$$ LANGUAGE SQL;
+
+SELECT update_osm_mountain_linestring(true);
+
+-- Handle updates
+
+CREATE OR REPLACE FUNCTION mountain_linestring.store() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO mountain_linestring.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TABLE IF NOT EXISTS mountain_linestring.updates
+(
+    id serial PRIMARY KEY,
+    t  text,
+    UNIQUE (t)
+);
+CREATE OR REPLACE FUNCTION mountain_linestring.flag() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO mountain_linestring.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION mountain_linestring.refresh() RETURNS trigger AS
+$$
+DECLARE
+    t TIMESTAMP WITH TIME ZONE := clock_timestamp();
+BEGIN
+    RAISE LOG 'Refresh mountain_linestring';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE mountain_linestring.osm_ids;
+    ANALYZE osm_mountain_linestring;
+
+    PERFORM update_osm_mountain_linestring(false);
+    -- noinspection SqlWithoutWhere
+    DELETE FROM mountain_linestring.osm_ids;
+    -- noinspection SqlWithoutWhere
+    DELETE FROM mountain_linestring.updates;
+
+    RAISE LOG 'Refresh mountain_linestring done in %', age(clock_timestamp(), t);
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_store
+    AFTER INSERT OR UPDATE
+    ON osm_mountain_linestring
+    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
+EXECUTE PROCEDURE mountain_linestring.store();
+
+CREATE TRIGGER trigger_flag
+    AFTER INSERT OR UPDATE
+    ON osm_mountain_linestring
+    FOR EACH STATEMENT
+    WHEN (pg_trigger_depth() < 1)
+EXECUTE PROCEDURE mountain_linestring.flag();
+
+CREATE CONSTRAINT TRIGGER trigger_refresh
+    AFTER INSERT
+    ON mountain_linestring.updates
+    INITIALLY DEFERRED
+    FOR EACH ROW
+EXECUTE PROCEDURE mountain_linestring.refresh();

layers/mountain_peak/update_peak_point.sql

@@ -1,48 +1,89 @@
 DROP TRIGGER IF EXISTS trigger_flag ON osm_peak_point;
+DROP TRIGGER IF EXISTS trigger_store ON osm_peak_point;
 DROP TRIGGER IF EXISTS trigger_refresh ON mountain_peak_point.updates;
 
--- etldoc:  osm_peak_point ->  osm_peak_point
-CREATE OR REPLACE FUNCTION update_osm_peak_point() RETURNS VOID AS $$
-BEGIN
-  UPDATE osm_peak_point
-  SET tags = update_tags(tags, geometry)
-  WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
-
-END;
-$$ LANGUAGE plpgsql;
-
-SELECT update_osm_peak_point();
-
--- Handle updates
-
 CREATE SCHEMA IF NOT EXISTS mountain_peak_point;
 
-CREATE TABLE IF NOT EXISTS mountain_peak_point.updates(id serial primary key, t text, unique (t));
-CREATE OR REPLACE FUNCTION mountain_peak_point.flag() RETURNS trigger AS $$
+CREATE TABLE IF NOT EXISTS mountain_peak_point.osm_ids
+(
+    osm_id bigint PRIMARY KEY
+);
+
+-- etldoc:  osm_peak_point ->  osm_peak_point
+CREATE OR REPLACE FUNCTION update_osm_peak_point(full_update boolean) RETURNS void AS
+$$
+    UPDATE osm_peak_point
+    SET tags = update_tags(tags, geometry)
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM mountain_peak_point.osm_ids))
+      AND COALESCE(tags -> 'name:latin', tags -> 'name:nonlatin', tags -> 'name_int') IS NULL
+      AND tags != update_tags(tags, geometry)
+$$ LANGUAGE SQL;
+
+SELECT update_osm_peak_point(true);
+
+-- Handle updates
+
+CREATE OR REPLACE FUNCTION mountain_peak_point.store() RETURNS trigger AS
+$$
 BEGIN
-    INSERT INTO mountain_peak_point.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
-    RETURN null;
+    INSERT INTO mountain_peak_point.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
+    RETURN NULL;
 END;
-$$ language plpgsql;
+$$ LANGUAGE plpgsql;
+
+CREATE TABLE IF NOT EXISTS mountain_peak_point.updates
+(
+    id serial PRIMARY KEY,
+    t  text,
+    UNIQUE (t)
+);
+CREATE OR REPLACE FUNCTION mountain_peak_point.flag() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO mountain_peak_point.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION mountain_peak_point.refresh() RETURNS trigger AS
-  $BODY$
-  BEGIN
+$$
+DECLARE
+    t TIMESTAMP WITH TIME ZONE := clock_timestamp();
+BEGIN
     RAISE LOG 'Refresh mountain_peak_point';
-    PERFORM update_osm_peak_point();
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE mountain_peak_point.osm_ids;
+    ANALYZE osm_peak_point;
+
+    PERFORM update_osm_peak_point(false);
+    -- noinspection SqlWithoutWhere
+    DELETE FROM mountain_peak_point.osm_ids;
+    -- noinspection SqlWithoutWhere
     DELETE FROM mountain_peak_point.updates;
-    RETURN null;
-  END;
-  $BODY$
-language plpgsql;
+
+    RAISE LOG 'Refresh mountain_peak_point done in %', age(clock_timestamp(), t);
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_store
+    AFTER INSERT OR UPDATE
+    ON osm_peak_point
+    FOR EACH ROW
+    WHEN (pg_trigger_depth() < 1)
+EXECUTE PROCEDURE mountain_peak_point.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE ON osm_peak_point
+    AFTER INSERT OR UPDATE
+    ON osm_peak_point
     FOR EACH STATEMENT
-    EXECUTE PROCEDURE mountain_peak_point.flag();
+    WHEN (pg_trigger_depth() < 1)
+EXECUTE PROCEDURE mountain_peak_point.flag();
 
 CREATE CONSTRAINT TRIGGER trigger_refresh
-    AFTER INSERT ON mountain_peak_point.updates
+    AFTER INSERT
+    ON mountain_peak_point.updates
     INITIALLY DEFERRED
     FOR EACH ROW
-    EXECUTE PROCEDURE mountain_peak_point.refresh();
+EXECUTE PROCEDURE mountain_peak_point.refresh();

layers/park/layer.sql

@@ -1,135 +0,0 @@
--- etldoc: layer_park[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_park |<z6> z6 |<z7> z7 |<z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14> z14+" ] ;
-
-CREATE OR REPLACE FUNCTION layer_park(bbox geometry, zoom_level int, pixel_width numeric)
-RETURNS TABLE(osm_id bigint, geometry geometry, class text, name text, name_en text, name_de text, tags hstore, rank int) AS $$
-    SELECT osm_id, geometry, class, name, name_en, name_de, tags, rank
-    FROM (
-    SELECT osm_id, geometry,
-        COALESCE(
-            LOWER(REPLACE(NULLIF(protection_title, ''), ' ', '_')),
-            NULLIF(boundary, ''),
-            NULLIF(leisure, '')
-        ) AS class,
-        name, name_en, name_de, tags,
-        NULL::int as rank
-        FROM (
-        -- etldoc: osm_park_polygon_gen8 -> layer_park:z6
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon_gen8
-        WHERE zoom_level = 6 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_park_polygon_gen7 -> layer_park:z7
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon_gen7
-        WHERE zoom_level = 7 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_park_polygon_gen6 -> layer_park:z8
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon_gen6
-        WHERE zoom_level = 8 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_park_polygon_gen5 -> layer_park:z9
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon_gen5
-        WHERE zoom_level = 9 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_park_polygon_gen4 -> layer_park:z10
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon_gen4
-        WHERE zoom_level = 10 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_park_polygon_gen3 -> layer_park:z11
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon_gen3
-        WHERE zoom_level = 11 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_park_polygon_gen2 -> layer_park:z12
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon_gen2
-        WHERE zoom_level = 12 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_park_polygon_gen1 -> layer_park:z13
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon_gen1
-        WHERE zoom_level = 13 AND geometry && bbox
-        UNION ALL
-        -- etldoc: osm_park_polygon -> layer_park:z14
-        SELECT osm_id, geometry, name, name_en, name_de, tags, leisure, boundary, protection_title
-        FROM osm_park_polygon
-        WHERE zoom_level >= 14 AND geometry && bbox
-    ) AS park_polygon
-
-    UNION ALL
-    SELECT osm_id, geometry_point AS geometry,
-        COALESCE(
-            LOWER(REPLACE(NULLIF(protection_title, ''), ' ', '_')),
-            NULLIF(boundary, ''),
-            NULLIF(leisure, '')
-        ) AS class,
-        name, name_en, name_de, tags,
-        row_number() OVER (
-           PARTITION BY LabelGrid(geometry_point, 100 * pixel_width)
-           ORDER BY
-               (CASE WHEN boundary = 'national_park' THEN true ELSE false END) DESC,
-               (COALESCE(NULLIF(tags->'wikipedia', ''), NULLIF(tags->'wikidata', '')) IS NOT NULL) DESC,
-               area DESC
-        )::int AS "rank"
-        FROM (
-        -- etldoc: osm_park_polygon_gen8 -> layer_park:z6
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon_gen8
-        WHERE zoom_level = 6 AND geometry_point && bbox
-        UNION ALL
-
-        -- etldoc: osm_park_polygon_gen7 -> layer_park:z7
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon_gen7
-        WHERE zoom_level = 7 AND geometry_point && bbox
-        UNION ALL
-
-        -- etldoc: osm_park_polygon_gen6 -> layer_park:z8
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon_gen6
-        WHERE zoom_level = 8 AND geometry_point && bbox
-        UNION ALL
-
-        -- etldoc: osm_park_polygon_gen5 -> layer_park:z9
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon_gen5
-        WHERE zoom_level = 9 AND geometry_point && bbox
-        UNION ALL
-
-        -- etldoc: osm_park_polygon_gen4 -> layer_park:z10
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon_gen4
-        WHERE zoom_level = 10 AND geometry_point && bbox
-        UNION ALL
-
-        -- etldoc: osm_park_polygon_gen3 -> layer_park:z11
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon_gen3
-        WHERE zoom_level = 11 AND geometry_point && bbox
-        UNION ALL
-
-        -- etldoc: osm_park_polygon_gen2 -> layer_park:z12
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon_gen2
-        WHERE zoom_level = 12 AND geometry_point && bbox
-        UNION ALL
-
-        -- etldoc: osm_park_polygon_gen1 -> layer_park:z13
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon_gen1
-        WHERE zoom_level = 13 AND geometry_point && bbox
-        UNION ALL
-
-        -- etldoc: osm_park_polygon -> layer_park:z14
-        SELECT osm_id, geometry_point, name, name_en, name_de, tags, leisure, boundary, protection_title, area
-        FROM osm_park_polygon
-        WHERE zoom_level >= 14 AND geometry_point && bbox
-    ) AS park_point
-    ) AS park_all;
-$$
-LANGUAGE SQL
-IMMUTABLE PARALLEL SAFE;

layers/park/mapping.yaml

@@ -1,48 +1,60 @@
 generalized_tables:
-  # etldoc: imposm3 -> osm_park_polygon_gen8
-  park_polygon_gen8:
-    source: park_polygon_gen7
+  # etldoc: osm_park_polygon_gen_z5 -> osm_park_polygon_gen_z4
+  park_polygon_gen_z4:
+    source: park_polygon_gen_z5
+    sql_filter: area>power(ZRES3,2)
+    tolerance: ZRES4
+
+  # etldoc: osm_park_polygon_gen_z6 -> osm_park_polygon_gen_z5
+  park_polygon_gen_z5:
+    source: park_polygon_gen_z6
+    sql_filter: area>power(ZRES4,2)
+    tolerance: ZRES5
+
+  # etldoc: osm_park_polygon_gen_z7 -> osm_park_polygon_gen_z6
+  park_polygon_gen_z6:
+    source: park_polygon_gen_z7
     sql_filter: area>power(ZRES5,2)
-    tolerance: ZRES8
+    tolerance: ZRES6
 
-  # etldoc: imposm3 -> osm_park_polygon_gen7
-  park_polygon_gen7:
-    source: park_polygon_gen6
+  # etldoc: osm_park_polygon_gen_z8 -> osm_park_polygon_gen_z7
+  park_polygon_gen_z7:
+    source: park_polygon_gen_z8
     sql_filter: area>power(ZRES6,2)
+    tolerance: ZRES7
+
+  # etldoc: osm_park_polygon_gen_z9 -> osm_park_polygon_gen_z8
+  park_polygon_gen_z8:
+    source: park_polygon_gen_z9
+    sql_filter: area>power(ZRES7,2)
     tolerance: ZRES8
 
-  # etldoc: imposm3 -> osm_park_polygon_gen6
-  park_polygon_gen6:
-    source: park_polygon_gen5
-    sql_filter: area>power(ZRES7,2)
+  # etldoc: osm_park_polygon_gen_z10 -> osm_park_polygon_gen_z9
+  park_polygon_gen_z9:
+    source: park_polygon_gen_z10
+    sql_filter: area>power(ZRES8,2)
     tolerance: ZRES9
 
-  # etldoc: imposm3 -> osm_park_polygon_gen5
-  park_polygon_gen5:
-    source: park_polygon_gen4
-    sql_filter: area>power(ZRES8,2)
+  # etldoc: osm_park_polygon_gen_z11 -> osm_park_polygon_gen_z10
+  park_polygon_gen_z10:
+    source: park_polygon_gen_z11
+    sql_filter: area>power(ZRES9,2)
     tolerance: ZRES10
 
-  # etldoc: imposm3 -> osm_park_polygon_gen4
-  park_polygon_gen4:
-    source: park_polygon_gen3
-    sql_filter: area>power(ZRES9,2)
-    tolerance: ZRES11
-
-  # etldoc: imposm3 -> osm_park_polygon_gen3
-  park_polygon_gen3:
-    source: park_polygon_gen2
+  # etldoc: osm_park_polygon_gen_z12 -> osm_park_polygon_gen_z11
+  park_polygon_gen_z11:
+    source: park_polygon_gen_z12
     sql_filter: area>power(ZRES10,2)
     tolerance: ZRES11
 
-  # etldoc: imposm3 -> osm_park_polygon_gen2
-  park_polygon_gen2:
-    source: park_polygon_gen1
+  # etldoc: osm_park_polygon_gen_z13 -> osm_park_polygon_gen_z12
+  park_polygon_gen_z12:
+    source: park_polygon_gen_z13
     sql_filter: area>power(ZRES11,2)
     tolerance: ZRES12
 
-  # etldoc: imposm3 -> osm_park_polygon_gen1
-  park_polygon_gen1:
+  # etldoc: osm_park_polygon -> osm_park_polygon_gen_z13
+  park_polygon_gen_z13:
     source: park_polygon
     sql_filter: area>power(ZRES12,2) AND ST_IsValid(geometry)
     tolerance: ZRES13