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

# Conflicts:
#	Makefile
#	QUICKSTART.md
#	docker-compose.yml
#	layers/boundary/mapping.yaml
#	layers/landuse/landuse.sql
#	layers/landuse/landuse.yaml
#	layers/landuse/mapping.yaml
#	layers/poi/mapping.yaml
#	layers/poi/poi.sql
#	layers/poi/poi.yaml

.env

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

.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@v2
+
+      - 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@v2
+        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,35 +8,6 @@ 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
-          MIN_ZOOM: 0
-          MAX_ZOOM: 14
-          QUIET: 1
-        run: |
-          ./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: self-hosted
@@ -63,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@v2
         with:
           path: ci_cache
           key: "v2-${{ env.TEST_DATA_URL }}"
@@ -99,11 +79,11 @@ jobs:
           echo "::set-output name=hash::$REV_HASH"
 
       - name: Set up caching for the performance results
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: perf_cache
           # If profiling result cache has incompatible format, increase this "v" number
-          key: "v12-${{ 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,27 +153,23 @@ jobs:
             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 3_wikidata make import-wikidata
-            profile 5_sql      make import-sql
+            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
+            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;')
-              # 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"
             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
@@ -207,6 +183,7 @@ 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
@@ -216,6 +193,8 @@ jobs:
             (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
@@ -226,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.
@@ -246,6 +228,8 @@ 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 \
                         test-perf openmaptiles.yaml $TEST_PERF_PARAMS \
@@ -303,14 +287,14 @@ jobs:
           fi
 
       - name: Save performance artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         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@v2
         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.
+  workflow_run:
-  # When setting up for the first time, use "on: push" instead of "on: schedule"
+    workflows: ["OpenMapTiles Performance CI"]
-  # and set IGNORE_RUNS_OLDER_THAN to a very high number until it runs once.
+    types: [completed]
-  schedule:
-    - cron: '*/6 * * * *'
 
 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@v2
+
+      - name: Run unit tests
+        run: |
+          make clean && make test-sql

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) 2023, 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).  
+by MapTiler (info@maptiler.com).  
-The project contributors grant Klokan Technologies GmbH the license to give such
+The project contributors grant MapTiler AG the license to give such
 exceptions on a commercial basis.

Makefile

@@ -6,11 +6,8 @@
 SHELL         = /bin/bash
 .SHELLFLAGS   = -o pipefail -c
 
-# Make all .env variables available for make targets
-include .env
-
 # Layers definition and meta data
-TILESET_FILE ?= openmaptiles.yaml
+TILESET_FILE := $(or $(TILESET_FILE),$(shell (. .env; echo $${TILESET_FILE})),openmaptiles.yaml)
 
 # Options to run with docker and docker-compose - ensure the container is destroyed on exit
 # Containers run as the current user rather than root (so that created files are not root-owned)
@@ -28,17 +25,30 @@ export PPORT
 # Local port to use with tileserver
 TPORT ?= 8081
 export TPORT
+STYLE_FILE := build/style/style.json
+STYLE_HEADER_FILE := style/style-header.json
+
+# Support newer `docker compose` syntax in addition to `docker-compose`
+
+ifeq (, $(shell which docker-compose))
+  DOCKER_COMPOSE_COMMAND := docker compose
+  $(info Using docker compose V2 (docker compose))
+else
+  DOCKER_COMPOSE_COMMAND := docker-compose
+  $(info Using docker compose V1 (docker-compose))
+endif
 
 # Allow a custom docker-compose project name
-ifeq ($(strip $(DC_PROJECT)),)
+DC_PROJECT := $(or $(DC_PROJECT),$(shell (. .env; echo $${DC_PROJECT})))
+ifeq ($(DC_PROJECT),)
   DC_PROJECT := $(notdir $(shell pwd))
-  DOCKER_COMPOSE := docker-compose
+  DOCKER_COMPOSE := $(DOCKER_COMPOSE_COMMAND)
 else
-  DOCKER_COMPOSE := docker-compose --project-name $(DC_PROJECT)
+  DOCKER_COMPOSE := $(DOCKER_COMPOSE_COMMAND) --project-name $(DC_PROJECT)
 endif
 
 # Make some operations quieter (e.g. inside the test script)
-ifeq ($(strip $(QUIET)),)
+ifeq ($(or $(QUIET),$(shell (. .env; echo $${QUIET})))),)
   QUIET_FLAG :=
 else
   QUIET_FLAG := --quiet
@@ -58,8 +68,7 @@ else
 endif
 
 # Set OpenMapTiles host
-OMT_HOST := http://$(firstword $(subst :, ,$(subst tcp://,,$(DOCKER_HOST))) localhost)
+export OMT_HOST := http://$(firstword $(subst :, ,$(subst tcp://,,$(DOCKER_HOST))) localhost)
-export OMT_HOST
 
 # This defines an easy $(newline) value to act as a "\n". Make sure to keep exactly two empty lines after newline.
 define newline
@@ -67,6 +76,12 @@ define newline
 
 endef
 
+# Use the old Postgres connection values as a fallback
+PGHOST := $(or $(PGHOST),$(shell (. .env; echo $${PGHOST})),$(POSTGRES_HOST),$(shell (. .env; echo $${POSTGRES_HOST})),postgres)
+PGPORT := $(or $(PGPORT),$(shell (. .env; echo $${PGPORT})),$(POSTGRES_PORT),$(shell (. .env; echo $${POSTGRES_PORT})),postgres)
+PGDATABASE := $(or $(PGDATABASE),$(shell (. .env; echo $${PGDATABASE})),$(POSTGRES_DB),$(shell (. .env; echo $${POSTGRES_DB})),postgres)
+PGUSER := $(or $(PGUSER),$(shell (. .env; echo $${PGUSER})),$(POSTGRES_USER),$(shell (. .env; echo $${POSTGRES_USER})),postgres)
+PGPASSWORD := $(or $(PGPASSWORD),$(shell (. .env; echo $${PGPASSWORD})),$(POSTGRES_PASSWORD),$(shell (. .env; echo $${POSTGRES_PASSWORD})),postgres)
 
 #
 # Determine area to work on
@@ -79,7 +94,7 @@ endef
 # historically we have been using $(area) rather than $(AREA), so make both work
 area ?= $(AREA)
 # Ensure the $(area) param is set, or try to automatically determine it based on available data files
-ifeq ($(strip $(area)),)
+ifeq ($(area),)
   # An $(area) parameter is not set. If only one *.osm.pbf file is found in ./data, use it as $(area).
   data_files := $(shell find data -name '*.osm.pbf' 2>/dev/null)
   ifneq ($(word 2,$(data_files)),)
@@ -124,7 +139,7 @@ ifeq ($(strip $(area)),)
   endif
 endif
 
-ifneq ($(strip $(AREA_INFO)),)
+ifneq ($(AREA_INFO),)
   define assert_area_is_given
       @echo "$(AREA_INFO)"
   endef
@@ -134,25 +149,17 @@ endif
 PBF_FILE ?= data/$(area).osm.pbf
 
 # For download-osm, allow URL parameter to download file from a given URL. Area param must still be provided.
-ifneq ($(strip $(url)),)
+DOWNLOAD_AREA := $(or $(url), $(area))
-  DOWNLOAD_AREA := $(url)
-else
-  DOWNLOAD_AREA := $(area)
-endif
 
-# import-borders uses these temp files during border parsing/import
+# The mbtiles file is placed into the $EXPORT_DIR=/export (mapped to ./data)
-export BORDERS_CLEANUP_FILE ?= data/borders/$(area).cleanup.pbf
+MBTILES_FILE := $(or $(MBTILES_FILE),$(shell (. .env; echo $${MBTILES_FILE})),$(area).mbtiles)
-export BORDERS_PBF_FILE ?= data/borders/$(area).filtered.pbf
-export BORDERS_CSV_FILE ?= data/borders/$(area).lines.csv
-
-# The file is placed into the $EXPORT_DIR=/export (mapped to ./data)
-export MBTILES_FILE ?= $(area).mbtiles
 MBTILES_LOCAL_FILE = data/$(MBTILES_FILE)
 
-ifeq ($(strip $(DIFF_MODE)),true)
+DIFF_MODE := $(or $(DIFF_MODE),$(shell (. .env; echo $${DIFF_MODE})))
+ifeq ($(DIFF_MODE),true)
   # import-osm implementation requires IMPOSM_CONFIG_FILE to be set to a valid file
-  # For static (no-updates) import, we don't need to override the default value
+  # For one-time only imports, the default value is fine.
-  # For the update mode, set location of the dynamically-generated area-based config file
+  # For diff mode updates, use the dynamically-generated area-based config file
   export IMPOSM_CONFIG_FILE = data/$(area).repl.json
 endif
 
@@ -164,90 +171,119 @@ ifneq (,$(wildcard $(AREA_BBOX_FILE)))
   export BBOX
 endif
 
-ifeq ($(strip $(area)),)
+# Consult .env if needed
-  define assert_area_is_given
+MIN_ZOOM := $(or $(MIN_ZOOM),$(shell (. .env; echo $${MIN_ZOOM})),0)
-	@echo ""
+MAX_ZOOM := $(or $(MAX_ZOOM),$(shell (. .env; echo $${MAX_ZOOM})),7)
-	@echo "ERROR: $(AREA_ERROR)"
+PPORT := $(or $(PPORT),$(shell (. .env; echo $${PPORT})),7)
-	@echo ""
+TPORT := $(or $(TPORT),$(shell (. .env; echo $${TPORT})),7)
-	@echo "  make $@ area=<area-id>"
+
-	@echo ""
+define HELP_MESSAGE
-	@echo "To download an area, use   make download <area-id>"
+==============================================================================
-	@echo "To list downloadable areas, use   make list-geofabrik   and/or   make list-bbbike"
+OpenMapTiles  https://github.com/openmaptiles/openmaptiles
-	@exit 1
+
-  endef
+Hints for testing areas
-else
+  make list-geofabrik                  # list actual geofabrik OSM extracts for download -> <<your-area>>
-  ifneq ($(strip $(AREA_INFO)),)
+  ./quickstart.sh <<your-area>>        # example:  ./quickstart.sh madagascar
-    define assert_area_is_given
+
-	@echo "$(AREA_INFO)"
+Hints for designers:
-    endef
+  make start-maputnik                  # start Maputnik Editor + dynamic tile server [ see $(OMT_HOST):8088 ]
-  endif
+  make stop-maputnik                   # stop Maputnik Editor + dynamic tile server
-endif
+  make start-postserve                 # start dynamic tile server                   [ see $(OMT_HOST):$(PPORT) ]
+  make stop-postserve                  # stop dynamic tile server
+  make start-tileserver                # start maptiler/tileserver-gl                [ see $(OMT_HOST):$(TPORT) ]
+  make stop-tileserver                 # stop maptiler/tileserver-gl
+
+Hints for developers:
+  make                                 # build source code
+  make bash                            # start openmaptiles-tools /bin/bash terminal
+  make generate-bbox-file              # compute bounding box of a data file and store it in a file
+  make generate-devdoc                 # generate devdoc including graphs for all layers [./layers/...]
+  make generate-qa                     # statistics for a given layer's field
+  make generate-tiles-pg               # generate vector tiles based on .env settings using PostGIS ST_MVT()
+  make generate-tiles                  # generate vector tiles based on .env settings using Mapnik (obsolete)
+  make generate-changed-tiles          # Generate tiles changed by import-diff
+  make test-sql                        # run unit tests on the OpenMapTiles SQL schema
+  cat  .env                            # list PG database and MIN_ZOOM and MAX_ZOOM information
+  cat  quickstart.log                  # transcript of the last ./quickstart.sh run
+  make help                            # help about available commands
+
+Hints for downloading & importing data:
+  make list-geofabrik                  # list actual geofabrik OSM extracts for download
+  make list-bbbike                     # list actual BBBike OSM extracts for download
+  make download area=albania           # download OSM data from any source       and create config file
+  make download-geofabrik area=albania # download OSM data from geofabrik.de     and create config file
+  make download-osmfr area=asia/qatar  # download OSM data from openstreetmap.fr and create config file
+  make download-bbbike area=Amsterdam  # download OSM data from bbbike.org       and create config file
+  make import-data                     # Import data from OpenStreetMapData, Natural Earth and OSM Lake Labels.
+  make import-osm                      # Import OSM data with the mapping rules from build/mapping.yaml
+  make import-diff                     # Import OSM updates from data/changes.osc.gz
+  make import-wikidata                 # Import labels from Wikidata
+  make import-sql                      # Import layers (run this after modifying layer SQL)
+
+Hints for database management:
+  make psql                            # start PostgreSQL console
+  make psql-list-tables                # list all PostgreSQL tables
+  make list-views                      # list PostgreSQL public schema views
+  make list-tables                     # list PostgreSQL public schema tables
+  make vacuum-db                       # PostgreSQL: VACUUM ANALYZE
+  make analyze-db                      # PostgreSQL: ANALYZE
+  make destroy-db                      # remove docker containers and PostgreSQL data volume
+  make start-db                        # start PostgreSQL, creating it if it doesn't exist
+  make start-db-preloaded              # start PostgreSQL, creating data-prepopulated one if it doesn't exist
+  make stop-db                         # stop PostgreSQL database without destroying the data
+
+Hints for Docker management:
+  make clean-unnecessary-docker        # clean unnecessary docker image(s) and container(s)
+  make refresh-docker-images           # refresh openmaptiles docker images from Docker HUB
+  make remove-docker-images            # remove openmaptiles docker images
+  make list-docker-images              # show a list of available docker images
+==============================================================================
+endef
+export HELP_MESSAGE
 
 #
 #  TARGETS
 #
 
 .PHONY: all
-all: init-dirs build/openmaptiles.tm2source/data.yml build/mapping.yaml build-sql
+all: init-dirs build/openmaptiles.tm2source/data.yml build/mapping.yaml build-sql build-style
 
 .PHONY: help
 help:
-	@echo "=============================================================================="
+	@echo "$$HELP_MESSAGE" | less
-	@echo " OpenMapTiles  https://github.com/openmaptiles/openmaptiles "
+
-	@echo "Hints for testing areas                "
+define win_fs_error
-	@echo "  make list-geofabrik                  # list actual geofabrik OSM extracts for download -> <<your-area>> "
+	( \
-	@echo "  ./quickstart.sh <<your-area>>        # example:  ./quickstart.sh madagascar "
+	echo "" ;\
-	@echo " "
+	echo "ERROR: Windows native filesystem" ;\
-	@echo "Hints for designers:"
+	echo "" ;\
-	@echo "  make start-maputnik                  # start Maputnik Editor + dynamic tile server [ see $(OMT_HOST):8088 ]"
+	echo "Please avoid running OpenMapTiles in a Windows filesystem." ;\
-	@echo "  make start-postserve                 # start dynamic tile server                   [ see $(OMT_HOST):$(PPORT) ]"
+	echo "See https://github.com/openmaptiles/openmaptiles/issues/1095#issuecomment-817095465" ;\
-	@echo "  make start-tileserver                # start maptiler/tileserver-gl                [ see $(OMT_HOST):$(TPORT) ]"
+	echo "" ;\
-	@echo " "
+	exit 1 ;\
-	@echo "Hints for developers:"
+	)
-	@echo "  make                                 # build source code"
+endef
-	@echo "  make list-geofabrik                  # list actual geofabrik OSM extracts for download"
-	@echo "  make list-bbbike                     # list actual BBBike OSM extracts for download"
-	@echo "  make download area=albania           # download OSM data from any source       and create config file"
-	@echo "  make download-geofabrik area=albania # download OSM data from geofabrik.de     and create config file"
-	@echo "  make download-osmfr area=asia/qatar  # download OSM data from openstreetmap.fr and create config file"
-	@echo "  make download-bbbike area=Amsterdam  # download OSM data from bbbike.org       and create config file"
-	@echo "  make generate-bbox-file              # compute bounding box of a data file and store it in a file"
-	@echo "  make psql                            # start PostgreSQL console"
-	@echo "  make psql-list-tables                # list all PostgreSQL tables"
-	@echo "  make vacuum-db                       # PostgreSQL: VACUUM ANALYZE"
-	@echo "  make analyze-db                      # PostgreSQL: ANALYZE"
-	@echo "  make generate-qa                     # statistics for a given layer's field"
-	@echo "  make generate-devdoc                 # generate devdoc including graphs for all layers [./layers/...]"
-	@echo "  make bash                            # start openmaptiles-tools /bin/bash terminal"
-	@echo "  make destroy-db                      # remove docker containers and PostgreSQL data volume"
-	@echo "  make start-db                        # start PostgreSQL, creating it if it doesn't exist"
-	@echo "  make start-db-preloaded              # start PostgreSQL, creating data-prepopulated one if it doesn't exist"
-	@echo "  make stop-db                         # stop PostgreSQL database without destroying the data"
-	@echo "  make clean-unnecessary-docker        # clean unnecessary docker image(s) and container(s)"
-	@echo "  make refresh-docker-images           # refresh openmaptiles docker images from Docker HUB"
-	@echo "  make remove-docker-images            # remove openmaptiles docker images"
-	@echo "  make list-views                      # list PostgreSQL public schema views"
-	@echo "  make list-tables                     # list PostgreSQL public schema tables"
-	@echo "  cat  .env                            # list PG database and MIN_ZOOM and MAX_ZOOM information"
-	@echo "  cat  quickstart.log                  # transcript of the last ./quickstart.sh run"
-	@echo "  make help                            # help about available commands"
-	@echo "=============================================================================="
 
 .PHONY: init-dirs
 init-dirs:
 	@mkdir -p build/sql/parallel
 	@mkdir -p build/openmaptiles.tm2source
-	@mkdir -p data/borders
+	@mkdir -p build/style
+	@mkdir -p data
 	@mkdir -p cache
+	@ ! ($(DOCKER_COMPOSE) 2>/dev/null run $(DC_OPTS) openmaptiles-tools df --output=fstype /tileset| grep -q 9p) < /dev/null || ($(win_fs_error))
 
 build/openmaptiles.tm2source/data.yml: init-dirs
 ifeq (,$(wildcard build/openmaptiles.tm2source/data.yml))
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tm2source $(TILESET_FILE) --host="postgres" --port=5432 --database="openmaptiles" --user="$(DC_USER)" --password="$(DC_PASSWORD)" > $@
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
+		'generate-tm2source $(TILESET_FILE) > $@'
+	#OLD: $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tm2source $(TILESET_FILE) --host="postgres" --port=5432 --database="openmaptiles" --user="$(DC_USER)" --password="$(DC_PASSWORD)" > $@
 endif
 
 build/mapping.yaml: init-dirs
 ifeq (,$(wildcard build/mapping.yaml))
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-imposm3 $(TILESET_FILE) > $@
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \
+		'generate-imposm3 $(TILESET_FILE) > $@'
 endif
 
 .PHONY: build-sql
@@ -261,18 +297,42 @@ ifeq (,$(wildcard build/sql/run_last.sql))
 							 --function --fname=getmvt >> ./build/sql/run_last.sql'
 endif
 
+.PHONY: build-sprite
+build-sprite: init-dirs
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c 'spritezero build/style/sprite /style/icons && \
+		spritezero --retina build/style/sprite@2x /style/icons'
+
+.PHONY: build-style
+build-style: init-dirs
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c 'style-tools recompose $(TILESET_FILE) $(STYLE_FILE) \
+		$(STYLE_HEADER_FILE) && \
+		spritezero build/style/sprite /style/icons && spritezero --retina build/style/sprite@2x /style/icons'
+
+.PHONY: download-fonts
+download-fonts:
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c '[ ! -d "/export/fonts" ] && mkdir /export/fonts && \
+		echo "Downloading fonts..." && wget -qO /export/noto-sans.zip --show-progress \
+		https://github.com/openmaptiles/fonts/releases/download/v2.0/noto-sans.zip && \
+		echo "Unzipping fonts..." && unzip -q /export/noto-sans.zip -d /export/fonts && rm /export/noto-sans.zip || \
+		echo "Fonts already exist."'
+
 .PHONY: clean
-clean:
+clean: clean-test-data
 	rm -rf build
 
+clean-test-data:
+	rm -rf data/changes.state.txt
+	rm -rf data/last.state.txt
+	rm -rf data/changes.repl.json
+
 .PHONY: destroy-db
-# TODO:  Use https://stackoverflow.com/a/27852388/177275
+DOCKER_PROJECT = $(shell echo $(DC_PROJECT) | tr A-Z a-z | tr -cd '[:alnum:]')
-destroy-db: DC_PROJECT := $(shell echo $(DC_PROJECT) | tr A-Z a-z)
 destroy-db:
 	$(DOCKER_COMPOSE) down -v --remove-orphans
 	$(DOCKER_COMPOSE) rm -fv
-	docker volume ls -q -f "name=^$(DC_PROJECT)_" | $(XARGS) docker volume rm
+	docker volume ls -q -f "name=^$(DOCKER_PROJECT)_" | $(XARGS) docker volume rm
 	rm -rf cache
+	mkdir cache
 
 .PHONY: start-db-nowait
 start-db-nowait: init-dirs
@@ -313,11 +373,11 @@ OSM_SERVER=$(patsubst download,,$(patsubst download-%,%,$@))
 .PHONY: $(ALL_DOWNLOADS)
 $(ALL_DOWNLOADS): init-dirs
 	@$(assert_area_is_given)
-ifneq ($(strip $(url)),)
+ifneq ($(url),)
 	$(if $(OSM_SERVER),$(error url parameter can only be used with non-specific download target:$(newline)       make download area=$(area) url="$(url)"$(newline)))
 endif
 ifeq (,$(wildcard $(PBF_FILE)))
- ifeq ($(strip $(DIFF_MODE)),true)
+ ifeq ($(DIFF_MODE),true)
 	@echo "Downloading $(DOWNLOAD_AREA) with replication support into $(PBF_FILE) and $(IMPOSM_CONFIG_FILE) from $(if $(OSM_SERVER),$(OSM_SERVER),any source)"
 	@$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools download-osm $(OSM_SERVER) "$(DOWNLOAD_AREA)" \
 				--imposm-cfg "$(IMPOSM_CONFIG_FILE)" \
@@ -331,7 +391,7 @@ ifeq (,$(wildcard $(PBF_FILE)))
  endif
 	@echo ""
 else
- ifeq ($(strip $(DIFF_MODE)),true)
+ ifeq ($(DIFF_MODE),true)
   ifeq (,$(wildcard $(IMPOSM_CONFIG_FILE)))
 	$(error \
 		$(newline)   Data files $(PBF_FILE) already exists, but $(IMPOSM_CONFIG_FILE) does not. \
@@ -364,7 +424,7 @@ psql: start-db-nowait
 # Special cache handling for Docker Toolbox on Windows
 ifeq ($(MSYSTEM),MINGW64)
   DC_CONFIG_CACHE := -f docker-compose.yml -f docker-compose-$(MSYSTEM).yml
-  DC_OPTS_CACHE := $(strip $(filter-out --user=%,$(DC_OPTS)))
+  DC_OPTS_CACHE := $(filter-out --user=%,$(DC_OPTS))
 else
   DC_OPTS_CACHE := $(DC_OPTS)
 endif
@@ -374,13 +434,17 @@ import-osm: all start-db-nowait
 	@$(assert_area_is_given)
 	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-osm $(PBF_FILE)'
 
-.PHONY: update-osm
+.PHONY: start-update-osm
-update-osm: all start-db-nowait
+start-update-osm: start-db
 	@$(assert_area_is_given)
-	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-update'
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) up -d update-osm
+
+.PHONY: stop-update-osm
+stop-update-osm:
+	$(DOCKER_COMPOSE) stop update-osm
 
 .PHONY: import-diff
-import-diff: all start-db-nowait
+import-diff: start-db-nowait
 	@$(assert_area_is_given)
 	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-diff'
 
@@ -388,17 +452,11 @@ import-diff: all start-db-nowait
 import-data: start-db
 	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) import-data
 
-.PHONY: import-borders
-import-borders: start-db-nowait
-	@$(assert_area_is_given)
-	# If CSV borders file already exists, use it without re-parsing
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c \
-		'pgwait && import-borders $$([ -f "$(BORDERS_CSV_FILE)" ] && echo load $(BORDERS_CSV_FILE) || echo import $(PBF_FILE))'
-
 .PHONY: import-sql
 import-sql: all start-db-nowait
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && import-sql' | \
-	  awk -v s=": WARNING:" '1{print; fflush()} $$0~s{print "\n*** WARNING detected, aborting"; exit(1)}'
+    	awk -v s=": WARNING:" '1{print; fflush()} $$0~s{print "\n*** WARNING detected, aborting"; exit(1)}' | \
+    	awk '1{print; fflush()} $$0~".*ERROR" {txt=$$0} END{ if(txt){print "\n*** ERROR detected, aborting:"; print txt; exit(1)} }'
 
 .PHONY: merge-pbf
 merge-pbf:
@@ -408,7 +466,7 @@ merge-pbf:
 
 .PHONY: generate-tiles
 generate-tiles: all start-db
-	@$(assert_area_is_given)
+	@echo "WARNING: This Mapnik-based method of tile generation is obsolete. Use generate-tiles-pg instead."
 	@echo "Generating tiles into $(MBTILES_LOCAL_FILE) (will delete if already exists)..."
 	@rm -rf "$(MBTILES_LOCAL_FILE)"
 	$(DOCKER_COMPOSE) run $(DC_OPTS) generate-vectortiles
@@ -418,16 +476,31 @@ generate-tiles: all start-db
 
 .PHONY: generate-tiles-pg
 generate-tiles-pg: all start-db
-	@$(assert_area_is_given)
+	@echo "Generating tiles into $(MBTILES_LOCAL_FILE) (will delete if already exists) using PostGIS ST_MVT()..."
-	@echo "Generating tiles into $(MBTILES_LOCAL_FILE) (will delete if already exists)..."
 	@rm -rf "$(MBTILES_LOCAL_FILE)"
-	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tiles
+# For some reason Ctrl+C doesn't work here without the -T. Must be pressed twice to stop.
+	$(DOCKER_COMPOSE) run -T $(DC_OPTS) openmaptiles-tools generate-tiles
 	@echo "Updating generated tile metadata ..."
 	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
 			mbtiles-tools meta-generate "$(MBTILES_LOCAL_FILE)" $(TILESET_FILE) --auto-minmax --show-ranges
 
+.PHONY: data/tiles.txt
+data/tiles.txt:
+	find ./data -name "*.tiles" -exec cat {} \; -exec rm {} \; | \
+	  $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools \
+	    tile_multiplier $(MIN_ZOOM) $(MAX_ZOOM) >> data/tiles.txt
+
+.PHONY: generate-changed-tiles
+generate-changed-tiles: data/tiles.txt
+	# Re-generating updated tiles, if needed
+	if [ -s data/tiles.txt ] ; then \
+	  $(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools refresh-views; \
+	  $(DOCKER_COMPOSE) run $(DC_OPTS) -e LIST_FILE=data/tiles.txt openmaptiles-tools generate-tiles; \
+	  rm data/tiles.txt; \
+	fi
+
 .PHONY: start-tileserver
-start-tileserver: init-dirs
+start-tileserver: init-dirs build-style download-fonts
 	@echo " "
 	@echo "***********************************************************"
 	@echo "* "
@@ -445,7 +518,11 @@ start-tileserver: init-dirs
 	@echo "* "
 	@echo "***********************************************************"
 	@echo " "
-	docker run $(DC_OPTS) -it --name tileserver-gl -v $$(pwd)/data:/data -p $(TPORT):$(TPORT) maptiler/tileserver-gl --port $(TPORT)
+	$(DOCKER_COMPOSE) up -d tileserver-gl
+
+.PHONY: stop-tileserver
+stop-tileserver:
+	$(DOCKER_COMPOSE) stop tileserver-gl
 
 .PHONY: start-postserve
 start-postserve: start-db
@@ -477,11 +554,11 @@ start-maputnik: stop-maputnik start-postserve
 	@echo "* "
 	@echo "***********************************************************"
 	@echo " "
-	docker run $(DC_OPTS) --name maputnik_editor -d -p 8088:8888 maputnik/editor
+	$(DOCKER_COMPOSE) up -d maputnik_editor
 
 .PHONY: stop-maputnik
 stop-maputnik:
-	-docker rm -f maputnik_editor
+	-$(DOCKER_COMPOSE) stop maputnik_editor
 
 # STAT_FUNCTION=frequency|toplength|variance
 .PHONY: generate-qa
@@ -542,16 +619,16 @@ list-docker-images:
 
 .PHONY: refresh-docker-images
 refresh-docker-images: init-dirs
-ifneq ($(strip $(NO_REFRESH)),)
+ifneq ($(NO_REFRESH),)
 	@echo "Skipping docker image refresh"
 else
 	@echo ""
 	@echo "Refreshing docker images... Use NO_REFRESH=1 to skip."
-ifneq ($(strip $(USE_PRELOADED_IMAGE)),)
+ifneq ($(USE_PRELOADED_IMAGE),)
 	POSTGIS_IMAGE=openmaptiles/postgis-preloaded \
-		docker-compose pull --ignore-pull-failures $(QUIET_FLAG) openmaptiles-tools generate-vectortiles postgres
+		$(DOCKER_COMPOSE_COMMAND) pull --ignore-pull-failures $(QUIET_FLAG) openmaptiles-tools generate-vectortiles postgres
 else
-	docker-compose pull --ignore-pull-failures $(QUIET_FLAG) openmaptiles-tools generate-vectortiles postgres import-data
+	$(DOCKER_COMPOSE_COMMAND) pull --ignore-pull-failures $(QUIET_FLAG) openmaptiles-tools generate-vectortiles postgres import-data
 endif
 endif
 
@@ -576,7 +653,7 @@ test-perf-null: init-dirs
 
 .PHONY: build-test-pbf
 build-test-pbf: init-dirs
-	docker-compose run $(DC_OPTS) openmaptiles-tools /tileset/.github/workflows/build-test-data.sh
+	$(DOCKER_COMPOSE_COMMAND) run $(DC_OPTS) openmaptiles-tools /tileset/.github/workflows/build-test-data.sh
 
 .PHONY: debug
 debug:  ## Use this target when developing Makefile itself to verify loaded environment variables
@@ -586,3 +663,45 @@ debug:  ## Use this target when developing Makefile itself to verify loaded envi
 	@echo BBOX = $(BBOX) , $$BBOX
 	@echo MIN_ZOOM = $(MIN_ZOOM) , $$MIN_ZOOM
 	@echo MAX_ZOOM = $(MAX_ZOOM) , $$MAX_ZOOM
+
+build/import-tests.osm.pbf: init-dirs
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'osmconvert tests/import/*.osm -o=build/import-tests.osm.pbf'
+
+data/changes.state.txt:
+	cp -f tests/changes.state.txt data/
+
+data/last.state.txt:
+	cp -f tests/last.state.txt data/
+
+data/changes.repl.json:
+	cp -f tests/changes.repl.json data/
+
+data/changes.osc.gz: init-dirs
+	@echo " UPDATE unit test data..."
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'osmconvert tests/update/*.osc --merge-versions -o=data/changes.osc && gzip -f data/changes.osc'
+
+test-sql: clean refresh-docker-images destroy-db start-db-nowait build/import-tests.osm.pbf data/changes.state.txt data/last.state.txt data/changes.repl.json build/mapping.yaml data/changes.osc.gz build/openmaptiles.tm2source/data.yml build/mapping.yaml build-sql
+	$(eval area := changes)
+
+	@echo "Load IMPORT test data"
+	sed -ir "s/^[#]*\s*MAX_ZOOM=.*/MAX_ZOOM=14/" .env
+	sed -ir "s/^[#]*\s*DIFF_MODE=.*/DIFF_MODE=false/" .env
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-osm build/import-tests.osm.pbf'
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) import-data
+
+	@echo "Apply OpenMapTiles SQL schema to test data @ Zoom 14..."
+	$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c 'pgwait && import-sql' | \
+    	awk -v s=": WARNING:" '1{print; fflush()} $$0~s{print "\n*** WARNING detected, aborting"; exit(1)}' | \
+    	awk '1{print; fflush()} $$0~".*ERROR" {txt=$$0} END{ if(txt){print "\n*** ERROR detected, aborting:"; print txt; exit(1)} }'
+
+	@echo "Test SQL output for Import Test Data"
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && psql.sh < tests/test-post-import.sql' 2>&1 | \
+		awk -v s="ERROR:" '1{print; fflush()} $$0~s{print "*** ERROR detected, aborting"; exit(1)}'
+
+	@echo "Run UPDATE process on test data..."
+	sed -ir "s/^[#]*\s*DIFF_MODE=.*/DIFF_MODE=true/" .env
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && import-diff'
+
+	@echo "Test SQL output for Update Test Data"
+	$(DOCKER_COMPOSE) $(DC_CONFIG_CACHE) run $(DC_OPTS_CACHE) openmaptiles-tools sh -c 'pgwait && psql.sh < tests/test-post-update.sql' 2>&1 | \
+		awk -v s="ERROR:" '1{print; fflush()} $$0~s{print "*** ERROR detected, aborting"; exit(1)}'

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" ]
 
@@ -415,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-maputnik                  # start Maputnik Editor + dynamic tile server [ see http://localhost:8088 ]
-  make start-tileserver                # start maptiler/tileserver-gl [ see localhost:8081 ]
+  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-qa                     # statistics for a given layer's field
-  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
+  make vacuum-db                       # PostgreSQL: VACUUM ANALYZE
-  cat ./quickstart.log                 # backup  of the last ./quickstart.sh
+  make analyze-db                      # PostgreSQL: ANALYZE
-  make help                            # help about available commands
+  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,4 +1,4 @@
-## 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 [maptiler.com/data/](https://www.maptiler.com/data/).
 
@@ -20,14 +20,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 +72,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,7 +88,7 @@ make
 ```
 
 You can execute the following manual steps (for better understanding)
-or use the provided `quickstart.sh` script to automatically download and import given area. If area is not given, albania will be imported.
+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 <area>
@@ -97,7 +102,7 @@ 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/lukasmartinelli/osm-lakelines). Natural Earth country boundaries are used in the few lowest zoom levels.
 
 ```bash
 make import-data
@@ -109,12 +114,11 @@ Download OpenStreetMap data extracts from any source like [Geofabrik](http://dow
 make download area=albania
 ```
 
-[Import OpenStreetMap data](https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-osm) with the mapping rules from
+[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.  Also create borders table using extra processing with [osmborder](https://github.com/pnorman/osmborder) tool.
+`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 +130,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,16 +146,43 @@ make
 make import-sql
 ```
 
+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-bbox-file  # compute data bbox -- not needed for the whole planet
-make generate-tiles      # generate tiles
+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
+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`
+
+
 ## 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.
 

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
+You can use imposm3 to keep the database updated (thanks to the [work by @stirringhalo](https://github.com/openmaptiles/openmaptiles/pull/131)).
-the OSM change feed and import it into the database.
+This will repeatedly 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.
+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`,
+To generate all changed tiles, based on the lists of all updated tiles, and update the existing MBtiles file, please use
-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.
 
 ```
-docker-compose run generate-changed-vectortiles
+make generate-changed-tiles
 ```

docker-compose.yml

@@ -11,17 +11,24 @@ networks:
 services:
 
   postgres:
-    #image: "${POSTGIS_IMAGE:-openmaptiles/postgis}:${TOOLS_VERSION}"
+    image: "${POSTGIS_IMAGE:-openmaptiles/postgis}:${TOOLS_VERSION}"
-    image: harbor.cerxes.net/openmaptiles/postgis:5.3
+    # 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
     ports:
-      - "5432"
+      - "${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: 4g
-    env_file: .env-postgres
     #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'
 
@@ -31,7 +38,7 @@ services:
     networks:
       - postgres
 
-  openmaptiles-tools:
+  openmaptiles-tools: &openmaptiles-tools
     image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
     env_file: .env
     environment:
@@ -46,12 +53,13 @@ services:
       BBOX: ${BBOX}
       # Imposm configuration file describes how to load updates when enabled
       IMPOSM_CONFIG_FILE: ${IMPOSM_CONFIG_FILE}
-      # Which files to use during import-borders processing
-      BORDERS_CLEANUP_FILE: ${BORDERS_CLEANUP_FILE}
-      BORDERS_PBF_FILE: ${BORDERS_PBF_FILE}
-      BORDERS_CSV_FILE: ${BORDERS_CSV_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
     volumes:
@@ -61,6 +69,11 @@ services:
       - ./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}"
@@ -72,10 +85,13 @@ services:
       - postgres
     env_file: .env
     environment:
-      FILTER_MAPNIK_OUTPUT: ${FILTER_MAPNIK_OUTPUT}
       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}"
@@ -86,7 +102,6 @@ services:
       - postgres
     env_file: .env
     environment:
-      FILTER_MAPNIK_OUTPUT: ${FILTER_MAPNIK_OUTPUT}
       MBTILES_NAME: ${MBTILES_FILE}
       BBOX: ${BBOX}
       MIN_ZOOM: ${MIN_ZOOM}
@@ -94,6 +109,10 @@ services:
       # 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}"
@@ -107,3 +126,22 @@ services:
       - "${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

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

@@ -1,11 +1,11 @@
 
--- etldoc: layer_aerodrome_label[shape=record fillcolor=lightpink, style="rounded,filled", label="layer_aerodrome_label | <z10_> z10+" ] ;
+-- 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
             (
-                osm_id   bigint,
+                id       bigint,
                 geometry geometry,
                 name     text,
                 name_en  text,
@@ -20,17 +20,36 @@ CREATE OR REPLACE FUNCTION layer_aerodrome_label(bbox geometry,
 AS
 $$
 SELECT
-    -- etldoc: osm_aerodrome_label_point -> layer_aerodrome_label:z10_
+    -- etldoc: osm_aerodrome_label_point -> layer_aerodrome_label:z8
-    osm_id,
+    -- 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,
-    CASE
+    aerodrome_type AS class,
-        %%FIELD_MAPPING: class %%
+    NULLIF(iata, '') AS iata,
-        ELSE 'other'
+    NULLIF(icao, '') AS icao,
-        END AS class,
+    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,

layers/aerodrome_label/aerodrome_label.yaml

@@ -1,5 +1,5 @@
 layer:
-  id: "aerodrome_label"
+  id: aerodrome_label
   description: |
       [Aerodrome labels](http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome)
   buffer_size: 64
@@ -38,10 +38,10 @@ 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!))) 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
   - ./aerodrome_label.sql

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": 190
+    }
+  ]
+}

layers/aerodrome_label/update_aerodrome_label_point.sql

@@ -2,11 +2,17 @@ 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;
 
+-- 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.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc: osm_aerodrome_label_point -> osm_aerodrome_label_point
@@ -22,6 +28,17 @@ $$
     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);
@@ -31,11 +48,7 @@ SELECT update_aerodrome_label_point(true);
 CREATE OR REPLACE FUNCTION aerodrome_label.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO aerodrome_label.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO aerodrome_label.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO aerodrome_label.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -60,6 +73,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh aerodrome_label';
+
+    -- 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;
@@ -72,13 +90,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_aerodrome_label_point
     FOR EACH ROW
 EXECUTE PROCEDURE aerodrome_label.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_aerodrome_label_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE aerodrome_label.flag();

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": 191
+    },
+    {
+      "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": 192
+    }
+  ]
+}

layers/boundary/boundary.sql

@@ -1,207 +1,187 @@
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z13 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
+-- etldoc: osm_border_disp_linestring -> osm_border_linestring_gen_z13
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z13 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z13 AS
 (
-SELECT ST_Simplify(geometry, ZRes(14)) AS geometry, NULL::text AS adm0_l, NULL::text AS adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(ST_Collect(geometry), ZRes(14)) AS geometry,
-FROM osm_border_linestring
+       MAX(adm0_l) AS adm0_l,
-WHERE admin_level BETWEEN 3 AND 10
+       MAX(adm0_r) AS adm0_r,
-UNION ALL
+       MIN(admin_level) AS admin_level,
-SELECT ST_Simplify(geometry, ZRes(14)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+       BOOL_OR(disputed) AS disputed,
-FROM osm_border_linestring_adm
+       MAX(name) AS name,
-    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+       MAX(claimed_by) AS claimed_by,
-CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z13_idx ON osm_border_linestring_gen_z13 USING gist (geometry);
+       BOOL_OR(maritime) AS maritime
+FROM (
+      -- All admin 3-10 boundaries
+      SELECT osm_id,
+             geometry,
+             NULL::text AS adm0_l,
+             NULL::text AS adm0_r,
+             MIN(admin_level) AS admin_level,
+             BOOL_OR(disputed)
+                 OR BOOL_OR(dispute)
+                 OR BOOL_OR(border_status = 'disputed')
+                 OR BOOL_OR(disputed_by <> '') AS disputed,
+             NULLIF(name, '') AS name,
+             NULLIF(claimed_by, '') AS claimed_by,
+             BOOL_OR(maritime) AS maritime
+      FROM osm_border_linestring
+      WHERE admin_level BETWEEN 3 AND 10
+            AND type = 1 -- ways only
+      GROUP BY osm_id, geometry, name, claimed_by
 
--- This statement can be deleted after the border importer image stops creating this object as a table
+      UNION ALL
-DO
+
-$$
+      -- All non-disputed admin 2 boundaries
-    BEGIN
+      SELECT osm_id,
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z12 CASCADE;
+             geometry,
-    EXCEPTION
+             adm0_l,
-        WHEN wrong_object_type THEN
+             adm0_r,
-    END;
+             admin_level,
-$$ LANGUAGE plpgsql;
+             FALSE AS disputed,
+             NULL::text AS name,
+             NULL::text AS claimed_by,
+             maritime
+      FROM osm_border_linestring_adm
+
+      UNION ALL
+
+      -- All disputed admin 2 boundaries
+      SELECT osm_id,
+             geometry,
+             NULL::text AS adm0_l,
+             NULL::text AS adm0_r,
+             2::int AS admin_level,
+             TRUE AS disputed,
+             NULLIF(name, '') AS name,
+             NULLIF(claimed_by, '') AS claimed_by,
+             maritime
+      FROM osm_border_disp_linestring
+      GROUP BY osm_id, geometry, name, claimed_by, maritime
+     ) AS merged_boundary
+GROUP by osm_id
+)/* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z13_idx ON osm_border_linestring_gen_z13 USING gist (geometry);
 
 -- etldoc: osm_border_linestring_gen_z13 -> osm_border_linestring_gen_z12
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z12 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z12 AS
 (
-SELECT ST_Simplify(geometry, ZRes(13)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(13)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z13
 WHERE admin_level BETWEEN 2 AND 10
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z12_idx ON osm_border_linestring_gen_z12 USING gist (geometry);
 
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z11 CASCADE;
-    EXCEPTION
-        WHEN wrong_object_type THEN
-    END;
-$$ LANGUAGE plpgsql;
-
 -- etldoc: osm_border_linestring_gen_z12 -> osm_border_linestring_gen_z11
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z11 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z11 AS
 (
-SELECT ST_Simplify(geometry, ZRes(12)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(12)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z12
 WHERE admin_level BETWEEN 2 AND 8
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z11_idx ON osm_border_linestring_gen_z11 USING gist (geometry);
 
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z10 CASCADE;
-    EXCEPTION
-        WHEN wrong_object_type THEN
-    END;
-$$ LANGUAGE plpgsql;
-
 -- etldoc: osm_border_linestring_gen_z11 -> osm_border_linestring_gen_z10
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z10 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z10 AS
 (
-SELECT ST_Simplify(geometry, ZRes(11)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(11)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z11
 WHERE admin_level BETWEEN 2 AND 6
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z10_idx ON osm_border_linestring_gen_z10 USING gist (geometry);
 
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z9 CASCADE;
-    EXCEPTION
-        WHEN wrong_object_type THEN
-    END;
-$$ LANGUAGE plpgsql;
-
 -- etldoc: osm_border_linestring_gen_z10 -> osm_border_linestring_gen_z9
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z9 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z9 AS
 (
-SELECT ST_Simplify(geometry, ZRes(10)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(10)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z10
-WHERE admin_level BETWEEN 2 AND 6
+-- WHERE admin_level BETWEEN 2 AND 6
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z9_idx ON osm_border_linestring_gen_z9 USING gist (geometry);
 
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z8 CASCADE;
-    EXCEPTION
-        WHEN wrong_object_type THEN
-    END;
-$$ LANGUAGE plpgsql;
-
 -- etldoc: osm_border_linestring_gen_z9 -> osm_border_linestring_gen_z8
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z8 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z8 AS
 (
-SELECT ST_Simplify(geometry, ZRes(9)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(9)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z9
 WHERE admin_level BETWEEN 2 AND 4
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z8_idx ON osm_border_linestring_gen_z8 USING gist (geometry);
 
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z7 CASCADE;
-    EXCEPTION
-        WHEN wrong_object_type THEN
-    END;
-$$ LANGUAGE plpgsql;
-
 -- etldoc: osm_border_linestring_gen_z8 -> osm_border_linestring_gen_z7
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z7 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z7 AS
 (
-SELECT ST_Simplify(geometry, ZRes(8)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(8)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z8
-WHERE admin_level BETWEEN 2 AND 4
+-- WHERE admin_level BETWEEN 2 AND 4
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z7_idx ON osm_border_linestring_gen_z7 USING gist (geometry);
 
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z6 CASCADE;
-    EXCEPTION
-        WHEN wrong_object_type THEN
-    END;
-$$ LANGUAGE plpgsql;
-
 -- etldoc: osm_border_linestring_gen_z7 -> osm_border_linestring_gen_z6
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z6 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z6 AS
 (
-SELECT ST_Simplify(geometry, ZRes(7)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(7)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z7
-WHERE admin_level BETWEEN 2 AND 4
+-- WHERE admin_level BETWEEN 2 AND 4
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z6_idx ON osm_border_linestring_gen_z6 USING gist (geometry);
 
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z5 CASCADE;
-    EXCEPTION
-        WHEN wrong_object_type THEN
-    END;
-$$ LANGUAGE plpgsql;
-
 -- etldoc: osm_border_linestring_gen_z6 -> osm_border_linestring_gen_z5
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z5 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z5 AS
 (
-SELECT ST_Simplify(geometry, ZRes(6)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(6)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z6
-WHERE admin_level BETWEEN 2 AND 4
+-- WHERE admin_level BETWEEN 2 AND 4
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z5_idx ON osm_border_linestring_gen_z5 USING gist (geometry);
 
--- This statement can be deleted after the border importer image stops creating this object as a table
-DO
-$$
-    BEGIN
-        DROP TABLE IF EXISTS osm_border_linestring_gen_z4 CASCADE;
-    EXCEPTION
-        WHEN wrong_object_type THEN
-    END;
-$$ LANGUAGE plpgsql;
-
 -- etldoc: osm_border_linestring_gen_z5 -> osm_border_linestring_gen_z4
 DROP MATERIALIZED VIEW IF EXISTS osm_border_linestring_gen_z4 CASCADE;
 CREATE MATERIALIZED VIEW osm_border_linestring_gen_z4 AS
 (
-SELECT ST_Simplify(geometry, ZRes(5)) AS geometry, adm0_l, adm0_r, admin_level, disputed, maritime
+SELECT ST_Simplify(geometry, ZRes(5)) AS geometry, adm0_l, adm0_r, admin_level, disputed, name, claimed_by, maritime
 FROM osm_border_linestring_gen_z5
-WHERE admin_level = 2
+WHERE admin_level = 2 AND (maritime OR disputed)
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS osm_border_linestring_gen_z4_idx ON osm_border_linestring_gen_z4 USING gist (geometry);
 
+-- etldoc: osm_border_linestring_gen_z4 -> osm_border_disp_linestring_gen_z3
+DROP MATERIALIZED VIEW IF EXISTS osm_border_disp_linestring_gen_z3 CASCADE;
+CREATE MATERIALIZED VIEW osm_border_disp_linestring_gen_z3 AS
+(
+SELECT ST_Simplify(geometry, ZRes(4)) AS geometry, adm0_l, adm0_r, admin_level, TRUE AS disputed, name, claimed_by, maritime
+FROM osm_border_linestring_gen_z4
+WHERE disputed -- AND admin_level = 2
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS osm_border_disp_linestring_gen_z3_idx ON osm_border_disp_linestring_gen_z3 USING gist (geometry);
+
+-- etldoc: osm_border_disp_linestring_gen_z3 -> osm_border_disp_linestring_gen_z2
+DROP MATERIALIZED VIEW IF EXISTS osm_border_disp_linestring_gen_z2 CASCADE;
+CREATE MATERIALIZED VIEW osm_border_disp_linestring_gen_z2 AS
+(
+SELECT ST_Simplify(geometry, ZRes(3)) AS geometry, adm0_l, adm0_r, admin_level, TRUE AS disputed, name, claimed_by, maritime
+FROM osm_border_disp_linestring_gen_z3
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS osm_border_disp_linestring_gen_z2_idx ON osm_border_disp_linestring_gen_z2 USING gist (geometry);
+
+-- etldoc: osm_border_disp_linestring_gen_z2 -> osm_border_disp_linestring_gen_z1
+DROP MATERIALIZED VIEW IF EXISTS osm_border_disp_linestring_gen_z1 CASCADE;
+CREATE MATERIALIZED VIEW osm_border_disp_linestring_gen_z1 AS
+(
+SELECT ST_Simplify(geometry, ZRes(2)) AS geometry, adm0_l, adm0_r, admin_level, TRUE AS disputed, name, claimed_by, maritime
+FROM osm_border_disp_linestring_gen_z2
+    ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
+CREATE INDEX IF NOT EXISTS osm_border_disp_linestring_gen_z1_idx ON osm_border_disp_linestring_gen_z1 USING gist (geometry);
+
 -- ne_10m_admin_0_boundary_lines_land
 -- etldoc: ne_10m_admin_0_boundary_lines_land -> ne_10m_admin_0_boundary_lines_land_gen_z4
 DROP MATERIALIZED VIEW IF EXISTS ne_10m_admin_0_boundary_lines_land_gen_z4 CASCADE;
@@ -228,9 +208,10 @@ SELECT ST_Simplify(geometry, ZRes(6)) as geometry,
        FALSE AS disputed,
        NULL::text AS disputed_name,
        NULL::text AS claimed_by,
-       FALSE AS maritime
+       FALSE AS maritime,
+       min_zoom
 FROM ne_10m_admin_1_states_provinces_lines
-WHERE min_zoom <= 7
+WHERE min_zoom <= 7.7
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS ne_10m_admin_1_states_provinces_lines_gen_z4_idx ON ne_10m_admin_1_states_provinces_lines_gen_z4 USING gist (geometry);
 
@@ -246,6 +227,7 @@ SELECT ST_Simplify(geometry, ZRes(5)) as geometry,
        claimed_by,
        maritime
 FROM ne_10m_admin_1_states_provinces_lines_gen_z4
+WHERE min_zoom <= 7
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS ne_10m_admin_1_states_provinces_lines_gen_z3_idx ON ne_10m_admin_1_states_provinces_lines_gen_z3 USING gist (geometry);
 
@@ -475,7 +457,6 @@ FROM osm_border_disp_linestring_gen_z3
 -- etldoc: ne_10m_admin_0_boundary_lines_land_gen_z4 -> boundary_z4
 -- etldoc: ne_10m_admin_1_states_provinces_lines_gen_z4 -> boundary_z4
 -- etldoc: osm_border_linestring_gen_z4 -> boundary_z4
--- etldoc: osm_border_disp_linestring_gen_z4 -> boundary_z4
 CREATE OR REPLACE VIEW boundary_z4 AS
 (
 SELECT geometry,
@@ -503,26 +484,13 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
-       maritime
-FROM osm_border_linestring_gen_z4
-WHERE maritime = TRUE
-  AND admin_level <= 2
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
        claimed_by,
        maritime
-FROM osm_border_disp_linestring_gen_z4
+FROM osm_border_linestring_gen_z4
     );
 
 -- etldoc: osm_border_linestring_gen_z5 -> boundary_z5
--- etldoc: osm_border_disp_linestring_gen_z5 -> boundary_z5
 CREATE OR REPLACE VIEW boundary_z5 AS
 (
 SELECT geometry,
@@ -530,27 +498,14 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
+       claimed_by,
        maritime
 FROM osm_border_linestring_gen_z5
 WHERE admin_level <= 4
--- already not included in osm_border_linestring_adm
---  AND osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z5)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
-       claimed_by,
-       maritime
-FROM osm_border_disp_linestring_gen_z5
     );
 
 -- etldoc: osm_border_linestring_gen_z6 -> boundary_z6
--- etldoc: osm_border_disp_linestring_gen_z6 -> boundary_z6
 CREATE OR REPLACE VIEW boundary_z6 AS
 (
 SELECT geometry,
@@ -558,26 +513,14 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
+       claimed_by,
        maritime
 FROM osm_border_linestring_gen_z6
 WHERE admin_level <= 4
---  AND osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z6)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
-       claimed_by,
-       maritime
-FROM osm_border_disp_linestring_gen_z6
     );
 
 -- etldoc: osm_border_linestring_gen_z7 -> boundary_z7
--- etldoc: osm_border_disp_linestring_gen_z7 -> boundary_z7
 CREATE OR REPLACE VIEW boundary_z7 AS
 (
 SELECT geometry,
@@ -585,26 +528,14 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
+       claimed_by,
        maritime
 FROM osm_border_linestring_gen_z7
 WHERE admin_level <= 6
---  AND osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z7)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
-       claimed_by,
-       maritime
-FROM osm_border_disp_linestring_gen_z7
     );
 
 -- etldoc: osm_border_linestring_gen_z8 -> boundary_z8
--- etldoc: osm_border_disp_linestring_gen_z8 -> boundary_z8
 CREATE OR REPLACE VIEW boundary_z8 AS
 (
 SELECT geometry,
@@ -612,26 +543,14 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
+       claimed_by,
        maritime
 FROM osm_border_linestring_gen_z8
 WHERE admin_level <= 6
---  AND osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z8)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
-       claimed_by,
-       maritime
-FROM osm_border_disp_linestring_gen_z8
     );
 
 -- etldoc: osm_border_linestring_gen_z9 -> boundary_z9
--- etldoc: osm_border_disp_linestring_gen_z9 -> boundary_z9
 CREATE OR REPLACE VIEW boundary_z9 AS
 (
 SELECT geometry,
@@ -639,26 +558,14 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
+       claimed_by,
        maritime
 FROM osm_border_linestring_gen_z9
 WHERE admin_level <= 6
---  AND osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z9)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
-       claimed_by,
-       maritime
-FROM osm_border_disp_linestring_gen_z9
     );
 
 -- etldoc: osm_border_linestring_gen_z10 -> boundary_z10
--- etldoc: osm_border_disp_linestring_gen_z10 -> boundary_z10
 CREATE OR REPLACE VIEW boundary_z10 AS
 (
 SELECT geometry,
@@ -666,26 +573,14 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
+       claimed_by,
        maritime
 FROM osm_border_linestring_gen_z10
 WHERE admin_level <= 6
---  AND osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z10)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
-       claimed_by,
-       maritime
-FROM osm_border_disp_linestring_gen_z10
     );
 
 -- etldoc: osm_border_linestring_gen_z11 -> boundary_z11
--- etldoc: osm_border_disp_linestring_gen_z11 -> boundary_z11
 CREATE OR REPLACE VIEW boundary_z11 AS
 (
 SELECT geometry,
@@ -693,26 +588,14 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
+       claimed_by,
        maritime
 FROM osm_border_linestring_gen_z11
 WHERE admin_level <= 8
---  AND osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z11)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
-       claimed_by,
-       maritime
-FROM osm_border_disp_linestring_gen_z11
     );
 
 -- etldoc: osm_border_linestring_gen_z12 -> boundary_z12
--- etldoc: osm_border_disp_linestring_gen_z12 -> boundary_z12
 CREATE OR REPLACE VIEW boundary_z12 AS
 (
 SELECT geometry,
@@ -720,25 +603,13 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
-       maritime
-FROM osm_border_linestring_gen_z12
---WHERE osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z12)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
        claimed_by,
        maritime
-FROM osm_border_disp_linestring_gen_z12
+FROM osm_border_linestring_gen_z12
     );
 
 -- etldoc: osm_border_linestring_gen_z13 -> boundary_z13
--- etldoc: osm_border_disp_linestring_gen_z13 -> boundary_z13
 CREATE OR REPLACE VIEW boundary_z13 AS
 (
 SELECT geometry,
@@ -746,21 +617,10 @@ SELECT geometry,
        adm0_l,
        adm0_r,
        disputed,
-       NULL::text AS disputed_name,
+       CASE WHEN disputed THEN edit_name(name) END AS disputed_name,
-       NULL::text AS claimed_by,
-       maritime
-FROM osm_border_linestring_gen_z13
---WHERE osm_id NOT IN (SELECT DISTINCT osm_id FROM osm_border_disp_linestring_gen_z13)
-UNION ALL
-SELECT geometry,
-       admin_level,
-       NULL::text AS adm0_l,
-       NULL::text AS adm0_r,
-       TRUE AS disputed,
-       edit_name(name) AS disputed_name,
        claimed_by,
        maritime
-FROM osm_border_disp_linestring_gen_z13
+FROM osm_border_linestring_gen_z13
     );
 
 -- etldoc: layer_boundary[shape=record fillcolor=lightpink, style="rounded,filled",

layers/boundary/boundary.yaml

@@ -1,5 +1,13 @@
 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.
       Until z4 [Natural Earth data](http://www.naturalearthdata.com/downloads/) is used after which

layers/boundary/boundary_name.sql

@@ -1,23 +1,25 @@
 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 ST_Node(ST_Collect(geometry)) AS geometry, 
+        SELECT osm_id,
-			   maritime,
+               ST_Node(ST_Collect(geometry)) AS geometry,
-			   disputed
+               BOOL_OR(maritime) AS maritime,
+               FALSE AS disputed
     	FROM osm_border_linestring
-    	WHERE admin_level = 2
+    	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 maritime,
+              GROUP BY osm_id
-				 disputed
 		),
 
 	mergedline AS (
-		SELECT (ST_Dump(
+		SELECT osm_id,
-      		     ST_LineMerge(geometry))).geom AS geometry,
+      		     (ST_Dump(ST_LineMerge(geometry))).geom AS geometry,
 			maritime,
 			disputed
   		FROM multiline
@@ -32,7 +34,7 @@ CREATE TABLE IF NOT EXISTS osm_border_linestring_adm AS (
   			FROM (SELECT ST_Node(
                           ST_Collect(geometry)) AS geometry
     			FROM osm_border_linestring
-    			WHERE admin_level = 2
+    			WHERE admin_level = 2 AND ST_Dimension(geometry) = 1
                 ) nodes
 			) linemerge
   		), 
@@ -55,12 +57,14 @@ CREATE TABLE IF NOT EXISTS osm_border_linestring_adm AS (
 	),
 
 	rights AS (
-    	SELECT adm0_r,
+        SELECT osm_id,
+			   adm0_r,
 			   geometry,
 			   maritime,
 			   disputed
 		FROM (
-			SELECT b.adm0_a3 AS adm0_r,
+			SELECT a.osm_id AS osm_id,
+                   b.adm0_a3 AS adm0_r,
                    a.geometry,
                    a.maritime,
                    a.disputed
@@ -73,14 +77,16 @@ CREATE TABLE IF NOT EXISTS osm_border_linestring_adm AS (
             ) line_rights
 		)
 
-  SELECT adm0_l,
+  SELECT osm_id,
+		 adm0_l,
 		 adm0_r,
 		 geometry,
 		 maritime,
 		 2::integer AS admin_level,
 		 disputed
   FROM (
-    SELECT b.adm0_a3 AS adm0_l,
+    SELECT r.osm_id AS osm_id,
+           b.adm0_a3 AS adm0_l,
            r.adm0_r AS adm0_r,
            r.geometry,
            r.maritime,
@@ -96,4 +102,4 @@ CREATE TABLE IF NOT EXISTS osm_border_linestring_adm AS (
 
 CREATE INDEX IF NOT EXISTS osm_border_linestring_adm_geom_idx
   ON osm_border_linestring_adm
-  USING GIST (geometry);
+  USING GIST (geometry);

layers/boundary/mapping.yaml

@@ -1,107 +1,34 @@
 generalized_tables:
-
+  # etldoc: osm_border_linestring -> osm_border_disp_linestring
-  # etldoc: osm_border_disp_linestring_gen_z2 -> osm_border_disp_linestring_gen_z1
-  border_disp_linestring_gen_z1:
-    source: border_disp_linestring_gen_z2
-    sql_filter: admin_level = 2
-    tolerance: ZRES2
-
-  # etldoc: osm_border_disp_linestring_gen_z3 -> osm_border_disp_linestring_gen_z2
-  border_disp_linestring_gen_z2:
-    source: border_disp_linestring_gen_z3
-    sql_filter: admin_level = 2
-    tolerance: ZRES3
-
-  # etldoc: osm_border_disp_linestring_gen_z4 -> osm_border_disp_linestring_gen_z3
-  border_disp_linestring_gen_z3:
-    source: border_disp_linestring_gen_z4
-    sql_filter: admin_level = 2
-    tolerance: ZRES4
-
-  # etldoc: osm_border_disp_linestring_gen_z5 -> osm_border_disp_linestring_gen_z4
-  border_disp_linestring_gen_z4:
-    source: border_disp_linestring_gen_z5
-    sql_filter: admin_level = 2
-    tolerance: ZRES5
-
-  # etldoc: osm_border_disp_linestring_gen_z6 -> osm_border_disp_linestring_gen_z5
-  border_disp_linestring_gen_z5:
-    source: border_disp_linestring_gen_z6
-    sql_filter: admin_level = 2
-    tolerance: ZRES6
-
-  # etldoc: osm_border_disp_linestring_gen_z7 -> osm_border_disp_linestring_gen_z6
-  border_disp_linestring_gen_z6:
-    source: border_disp_linestring_gen_z7
-    sql_filter: admin_level = 2
-    tolerance: ZRES7
-
-  # etldoc: osm_border_disp_linestring_gen_z8 -> osm_border_disp_linestring_gen_z7
-  border_disp_linestring_gen_z7:
-    source: border_disp_linestring_gen_z8
-    sql_filter: admin_level = 2
-    tolerance: ZRES8
-
-  # etldoc: osm_border_disp_linestring_gen_z9 -> osm_border_disp_linestring_gen_z8
-  border_disp_linestring_gen_z8:
-    source: border_disp_linestring_gen_z9
-    sql_filter: admin_level = 2
-    tolerance: ZRES9
-
-  # etldoc: osm_border_disp_linestring_gen_z10 -> osm_border_disp_linestring_gen_z9
-  border_disp_linestring_gen_z9:
-    source: border_disp_linestring_gen_z10
-    sql_filter: admin_level = 2
-    tolerance: ZRES10
-
-  # etldoc: osm_border_disp_linestring_gen_z11 -> osm_border_disp_linestring_gen_z10
-  border_disp_linestring_gen_z10:
-    source: border_disp_linestring_gen_z11
-    sql_filter: admin_level = 2
-    tolerance: ZRES11
-
-  # etldoc: osm_border_disp_linestring_gen_z12 -> osm_border_disp_linestring_gen_z11
-  border_disp_linestring_gen_z11:
-    source: border_disp_linestring_gen_z12
-    sql_filter: admin_level = 2
-    tolerance: ZRES12
-
-  # etldoc: osm_border_disp_linestring_gen_z13 -> osm_border_disp_linestring_gen_z12
-  border_disp_linestring_gen_z12:
-    source: border_disp_linestring_gen_z13
-    sql_filter: admin_level = 2
-    tolerance: ZRES13
-
-  # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen_z13
-  border_disp_linestring_gen_z13:
-    source: border_disp_linestring
-    sql_filter: admin_level = 2
-    tolerance: ZRES14
-
-  # etldoc: osm_border_disp_relation -> osm_border_disp_linestring
   border_disp_linestring:
-    source: border_disp_relation
+    source: border_linestring
-    sql_filter: ST_GeometryType(geometry) = 'ST_LineString'
+    sql_filter: ST_GeometryType(geometry) = 'ST_LineString' AND (disputed OR dispute OR border_status = 'disputed' OR disputed_by <> '') AND admin_level = 2
-
 
 tables:
-  # etldoc: imposm3 -> osm_border_disp_relation
+  # etldoc: imposm3 -> osm_border_linestring
-  border_disp_relation:
+  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
+      # Used for disputed boundary, e.g. "Line of actual control"
-      name: boundary
+      from_member: true
-      type: string
     - key: admin_level
       name: admin_level
       type: integer
@@ -111,6 +38,19 @@ 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
@@ -121,16 +61,24 @@ tables:
       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:
-      type: [boundary]
+      boundary:
-    filters:
+        - administrative
-      require:
+      border_status:
-        #admin_level: ['2'] # this used to be specified, re-enable if bugs show up with country borders
+        - dispute
-        admin_level: [__any__]
+      boundary_type:
-        boundary: ['administrative'] # Filters out boundary	administrative_fraction and religious_administration
+        - maritime
 
-
+  # FOr NUTS  in linestring version
-# FOr NUTS  in linestring version
   administrative_relation:
     type: relation
     columns:
@@ -208,34 +156,4 @@ tables:
       boundary: [ 'administrative' ]
     filters:
       require:
-        admin_level: [ __any__ ]
+        admin_level: [ __any__ ]
-
-
-# not currently used
-#  # etldoc: imposm3 -> osm_adm_boundary_relation
-#  adm_boundary_relation:
-#    type: relation
-#    columns:
-#      - name: relation_id
-#        type: id
-#      - key: name
-#        name: name
-#        type: string
-#      - key: admin_level
-#        name: admin_level
-#        type: integer
-#      - key: border_type
-#        name: border_type
-#        type: string
-#      - key: default_language
-#        name: default_language
-#        type: string
-#      - key: website
-#        name: website
-#        type: string
-#    mapping:
-#      type: [boundary]
-#    filters:
-#      require:
-#        boundary: ['administrative']
-#        admin_level: [__any__]

layers/boundary/style.json

@@ -0,0 +1,287 @@
+{
+  "layers": [
+    {
+      "id": "boundary_3",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "minzoom": 3,
+      "layout": {
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "#845283",
+        "line-width": {
+          "base": 1,
+          "stops": [
+            [
+              4,
+              0.4
+            ],
+            [
+              5,
+              0.7
+            ],
+            [
+              12,
+              1.6
+            ]
+          ]
+        },
+        "line-opacity": {
+          "stops": [
+            [
+              3,
+              0.5
+            ],
+            [
+              10,
+              1
+            ]
+          ]
+        },
+        "line-dasharray": [
+          5,
+          3
+        ]
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "in",
+          "admin_level",
+          3,
+          4
+        ],
+        [
+          "==",
+          "maritime",
+          0
+        ]
+      ],
+      "order": 146
+    },
+    {
+      "id": "boundary_2",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "minzoom": 0,
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "#a37da1",
+        "line-width": {
+          "base": 1,
+          "stops": [
+            [
+              3,
+              0.5
+            ],
+            [
+              5,
+              1.2
+            ],
+            [
+              12,
+              3
+            ]
+          ]
+        },
+        "line-opacity": 1
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "admin_level",
+          2
+        ],
+        [
+          "==",
+          "maritime",
+          0
+        ],
+        [
+          "==",
+          "disputed",
+          0
+        ]
+      ],
+      "order": 147
+    },
+    {
+      "id": "boundary_2_disputed",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "minzoom": 0,
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "#a37da1",
+        "line-width": {
+          "base": 1,
+          "stops": [
+            [
+              3,
+              0.3
+            ],
+            [
+              5,
+              1.2
+            ],
+            [
+              12,
+              3
+            ]
+          ]
+        },
+        "line-opacity": 1,
+        "line-dasharray": [
+          4,
+          3
+        ]
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "admin_level",
+          2
+        ],
+        [
+          "==",
+          "disputed",
+          1
+        ],
+        [
+          "==",
+          "maritime",
+          0
+        ]
+      ],
+      "order": 148
+    },
+    {
+      "id": "boundary_2_disputed_maritime",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "minzoom": 0,
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(129, 125, 163, 1)",
+        "line-width": {
+          "base": 1,
+          "stops": [
+            [
+              3,
+              0.5
+            ],
+            [
+              5,
+              1.2
+            ],
+            [
+              12,
+              3
+            ]
+          ]
+        },
+        "line-opacity": 1,
+        "line-dasharray": [
+          4,
+          3
+        ]
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "admin_level",
+          2
+        ],
+        [
+          "==",
+          "disputed",
+          1
+        ],
+        [
+          "==",
+          "maritime",
+          1
+        ]
+      ],
+      "order": 149
+    },
+    {
+      "id": "boundary_2_maritime",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "minzoom": 4,
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "#a37da1",
+        "line-width": {
+          "base": 1,
+          "stops": [
+            [
+              3,
+              0.5
+            ],
+            [
+              5,
+              1.2
+            ],
+            [
+              12,
+              3
+            ]
+          ]
+        },
+        "line-opacity": 1
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "admin_level",
+          2
+        ],
+        [
+          "==",
+          "disputed",
+          0
+        ],
+        [
+          "==",
+          "maritime",
+          1
+        ]
+      ],
+      "order": 150
+    }
+  ]
+}

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
+      All [OSM Buildings](http://wiki.openstreetmap.org/wiki/Buildings). All building tags are imported ([`building=*`](http://wiki.openstreetmap.org/wiki/Key:building)).
-      this is welcomed.
+      Only buildings with tag location:underground are excluded.
   buffer_size: 4
   datasource:
     geometry_field: geometry
@@ -12,9 +12,9 @@ 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: |

layers/building/mapping.yaml

@@ -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
@@ -157,4 +160,4 @@ tables:
       type: member_type
     mapping:
       type: [building]
-    type: relation_member
+    type: relation_member

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/housenumber/housenumber.sql

@@ -15,9 +15,19 @@ SELECT
     osm_id,
     geometry,
     housenumber
-FROM osm_housenumber_point
+FROM (
-WHERE zoom_level >= 14
+    SELECT
-  AND geometry && bbox;
+        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,6 +3,7 @@ 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:

layers/housenumber/housenumber_centroid.sql

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS housenumber;
 
 CREATE TABLE IF NOT EXISTS housenumber.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc: osm_housenumber_point -> osm_housenumber_point
@@ -22,6 +22,16 @@ $$
     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);
@@ -31,11 +41,7 @@ SELECT convert_housenumber_point(true);
 CREATE OR REPLACE FUNCTION housenumber.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO housenumber.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO housenumber.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO housenumber.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -60,6 +66,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh housenumber';
+
+    -- 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;
@@ -72,13 +83,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_housenumber_point
     FOR EACH ROW
 EXECUTE PROCEDURE housenumber.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_housenumber_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE housenumber.flag();

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": 154
+    }
+  ]
+}

layers/landcover/generalized.sql

@@ -13,7 +13,7 @@ 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 ->  osm_landcover_gen_z13
+-- etldoc: osm_landcover_polygon ->  simplify_vw_z13
 CREATE TABLE simplify_vw_z13 AS
 (
     SELECT subclass,
@@ -22,32 +22,19 @@ CREATE TABLE simplify_vw_z13 AS
              ST_SimplifyVW(geometry, power(zres(13),2)),
              0.001)) AS geometry
     FROM osm_landcover_polygon
-    WHERE ST_Area(geometry) > power(zres(10),2)
+    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) < 50
-          AND subclass IN ('wood', 'forest')) union_geom50
-    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_z13
-        WHERE ST_NPoints(geometry) >= 50
+        WHERE ST_NPoints(geometry) < 300
-          AND ST_NPoints(geometry) < 300
           AND subclass IN ('wood', 'forest')) union_geom300
     GROUP BY subclass,
              cid
@@ -62,7 +49,7 @@ SELECT subclass,
 CREATE INDEX ON osm_landcover_gen_z13 USING GIST (geometry);
 
 
--- etldoc: osm_landcover_gen_z13 ->  osm_landcover_gen_z12
+-- etldoc: simplify_vw_z13 ->  simplify_vw_z12
 CREATE TABLE simplify_vw_z12 AS
 (
     SELECT subclass,
@@ -71,32 +58,19 @@ CREATE TABLE simplify_vw_z12 AS
              ST_SimplifyVW(geometry, power(zres(12),2)),
              0.001)) AS geometry
     FROM simplify_vw_z13
-    WHERE ST_Area(geometry) > power(zres(9),2)
+    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) < 50
-          AND subclass IN ('wood', 'forest')) union_geom50
-    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_z12
-        WHERE ST_NPoints(geometry) >= 50
+        WHERE ST_NPoints(geometry) < 300
-          AND ST_NPoints(geometry) < 300
           AND subclass IN ('wood', 'forest')) union_geom300
     GROUP BY subclass,
              cid
@@ -111,7 +85,7 @@ SELECT subclass,
 CREATE INDEX ON osm_landcover_gen_z12 USING GIST (geometry);
 
 
--- etldoc: osm_landcover_gen_z12 ->  osm_landcover_gen_z11
+-- etldoc: simplify_vw_z12 ->  simplify_vw_z11
 CREATE TABLE simplify_vw_z11 AS
 (
     SELECT subclass,
@@ -120,32 +94,19 @@ CREATE TABLE simplify_vw_z11 AS
              ST_SimplifyVW(geometry, power(zres(11),2)),
              0.001)) AS geometry
     FROM simplify_vw_z12
-    WHERE ST_Area(geometry) > power(zres(8),2)
+    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) < 50
-          AND subclass IN ('wood', 'forest')) union_geom50
-    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_z11
-        WHERE ST_NPoints(geometry) >= 50
+        WHERE ST_NPoints(geometry) < 300
-          AND ST_NPoints(geometry) < 300
           AND subclass IN ('wood', 'forest')) union_geom300
     GROUP BY subclass,
              cid
@@ -160,7 +121,7 @@ SELECT subclass,
 CREATE INDEX ON osm_landcover_gen_z11 USING GIST (geometry);
 
 
--- etldoc: osm_landcover_gen_z11 ->  osm_landcover_gen_z10
+-- etldoc: simplify_vw_z11 ->  simplify_vw_z10
 CREATE TABLE simplify_vw_z10 AS
 (
     SELECT subclass,
@@ -169,32 +130,19 @@ CREATE TABLE simplify_vw_z10 AS
              ST_SimplifyVW(geometry, power(zres(10),2)),
              0.001)) AS geometry
     FROM simplify_vw_z11
-    WHERE ST_Area(geometry) > power(zres(8),2)
+    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) < 50
-          AND subclass IN ('wood', 'forest')) union_geom50
-    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_z10
-        WHERE ST_NPoints(geometry) >= 50
+        WHERE ST_NPoints(geometry) < 300
-          AND ST_NPoints(geometry) < 300
           AND subclass IN ('wood', 'forest')) union_geom300
     GROUP BY subclass,
              cid
@@ -209,7 +157,7 @@ SELECT subclass,
 CREATE INDEX ON osm_landcover_gen_z10 USING GIST (geometry);
 
 
--- etldoc: osm_landcover_gen_z10 ->  osm_landcover_gen_z9
+-- etldoc: simplify_vw_z10 ->  simplify_vw_z9
 CREATE TABLE simplify_vw_z9 AS
 (
     SELECT subclass,
@@ -218,32 +166,19 @@ CREATE TABLE simplify_vw_z9 AS
              ST_SimplifyVW(geometry, power(zres(9),2)),
              0.001)) AS geometry
     FROM simplify_vw_z10
-    WHERE ST_Area(geometry) > power(zres(7),2)
+    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) < 50
-          AND subclass IN ('wood', 'forest')) union_geom50
-    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) >= 50
+        WHERE ST_NPoints(geometry) < 300
-          AND ST_NPoints(geometry) < 300
           AND subclass IN ('wood', 'forest')) union_geom300
     GROUP BY subclass,
              cid
@@ -270,7 +205,7 @@ SELECT subclass,
 CREATE INDEX ON osm_landcover_gen_z9 USING GIST (geometry);
 
 
--- etldoc: osm_landcover_gen_z9 ->  osm_landcover_gen_z8
+-- etldoc: simplify_vw_z9 ->  simplify_vw_z8
 CREATE TABLE simplify_vw_z8 AS
 (
     SELECT subclass,
@@ -279,10 +214,11 @@ CREATE TABLE simplify_vw_z8 AS
              ST_SimplifyVW(geometry, power(zres(8),2)),
              0.001)) AS geometry
     FROM simplify_vw_z9
-    WHERE ST_Area(geometry) > power(zres(6),2)
+    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,
@@ -295,6 +231,7 @@ 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
@@ -308,7 +245,7 @@ SELECT subclass,
 CREATE INDEX ON osm_landcover_gen_z8 USING GIST (geometry);
 
 
--- etldoc: osm_landcover_gen_z8 ->  osm_landcover_gen_z7
+-- etldoc: simplify_vw_z8 ->  simplify_vw_z7
 CREATE TABLE simplify_vw_z7 AS
 (
     SELECT subclass,
@@ -317,10 +254,11 @@ CREATE TABLE simplify_vw_z7 AS
              ST_SimplifyVW(geometry, power(zres(7),2)),
              0.001)) AS geometry
     FROM simplify_vw_z8
-    WHERE ST_Area(geometry) > power(zres(5),2)
+    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,

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', '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,6 +46,7 @@ layer:
       - bog
       - dune
       - scrub
+      - shrubbery
       - farm
       - farmland
       - fell

layers/landcover/mapping.yaml

@@ -26,8 +26,6 @@ tables:
       - forest
       - village_green
       - recreation_ground
-      # There are 600 parks tagged with landuse=park instead of leisure=park
-      - park
       natural:
       - wood
       - wetland
@@ -35,6 +33,7 @@ tables:
       - grassland
       - heath
       - scrub
+      - shrubbery
       - tundra
       - glacier
       - bare_rock

layers/landcover/style.json

@@ -0,0 +1,476 @@
+{
+  "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",
+          "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",
+          "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",
+          "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",
+          "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/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

@@ -37,6 +37,188 @@ 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
+         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
+         FROM osm_residential_gen_z6
+);
+
+-- 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
+         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
+         FROM osm_residential_gen_z7
+);
+
+-- 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
+         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
+         FROM osm_residential_gen_z8
+);
+
+-- 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
+         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
+         FROM osm_residential_gen_z9
+);
+
+-- 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
+         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
+         FROM osm_residential_gen_z10
+);
+
+-- 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
+         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
+         FROM osm_residential_gen_z11
+);
+
+-- 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
+         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
+         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+" ] ;
 
@@ -51,7 +233,8 @@ AS
 $$
 SELECT osm_id,
        geometry,
-       COALESCE(
+       landuse_unify(
+         COALESCE(
                NULLIF(landuse, ''),
                NULLIF(amenity, ''),
                NULLIF(leisure, ''),
@@ -59,7 +242,7 @@ SELECT osm_id,
                NULLIF(place, ''),
                NULLIF(waterway, ''),
                NULLIF(man_made, '')
-           ) AS class
+           )) AS class
 FROM (
          -- etldoc: ne_50m_urban_areas_gen_z4 -> layer_landuse:z4
          SELECT osm_id,
@@ -87,7 +270,7 @@ FROM (
          FROM ne_50m_urban_areas_gen_z5
          WHERE zoom_level = 5
          UNION ALL
-         -- etldoc: osm_landuse_polygon_gen_z6 -> layer_landuse:z6
+         -- etldoc: osm_landuse_polygon_gen_z6_union -> layer_landuse:z6
          SELECT osm_id,
                 geometry,
                 landuse,
@@ -97,10 +280,10 @@ FROM (
                 place,
                 waterway,
                 man_made
-         FROM osm_landuse_polygon_gen_z6
+         FROM osm_landuse_polygon_gen_z6_union
          WHERE zoom_level = 6
          UNION ALL
-         -- etldoc: osm_landuse_polygon_gen_z7 -> layer_landuse:z7
+         -- etldoc: osm_landuse_polygon_gen_z7_union -> layer_landuse:z7
          SELECT osm_id,
                 geometry,
                 landuse,
@@ -110,10 +293,10 @@ FROM (
                 place,
                 waterway,
                 man_made
-         FROM osm_landuse_polygon_gen_z7
+         FROM osm_landuse_polygon_gen_z7_union
          WHERE zoom_level = 7
          UNION ALL
-         -- etldoc: osm_landuse_polygon_gen_z8 -> layer_landuse:z8
+         -- etldoc: osm_landuse_polygon_gen_z8_union -> layer_landuse:z8
          SELECT osm_id,
                 geometry,
                 landuse,
@@ -123,10 +306,10 @@ FROM (
                 place,
                 waterway,
                 man_made
-         FROM osm_landuse_polygon_gen_z8
+         FROM osm_landuse_polygon_gen_z8_union
          WHERE zoom_level = 8
          UNION ALL
-         -- etldoc: osm_landuse_polygon_gen_z9 -> layer_landuse:z9
+         -- etldoc: osm_landuse_polygon_gen_z9_union -> layer_landuse:z9
          SELECT osm_id,
                 geometry,
                 landuse,
@@ -136,10 +319,10 @@ FROM (
                 place,
                 waterway,
                 man_made
-         FROM osm_landuse_polygon_gen_z9
+         FROM osm_landuse_polygon_gen_z9_union
          WHERE zoom_level = 9
          UNION ALL
-         -- etldoc: osm_landuse_polygon_gen_z10 -> layer_landuse:z10
+         -- etldoc: osm_landuse_polygon_gen_z10_union -> layer_landuse:z10
          SELECT osm_id,
                 geometry,
                 landuse,
@@ -149,10 +332,10 @@ FROM (
                 place,
                 waterway,
                 man_made
-         FROM osm_landuse_polygon_gen_z10
+         FROM osm_landuse_polygon_gen_z10_union
          WHERE zoom_level = 10
          UNION ALL
-         -- etldoc: osm_landuse_polygon_gen_z11 -> layer_landuse:z11
+         -- etldoc: osm_landuse_polygon_gen_z11_union -> layer_landuse:z11
          SELECT osm_id,
                 geometry,
                 landuse,
@@ -162,10 +345,10 @@ FROM (
                 place,
                 waterway,
                 man_made
-         FROM osm_landuse_polygon_gen_z11
+         FROM osm_landuse_polygon_gen_z11_union
          WHERE zoom_level = 11
          UNION ALL
-         -- etldoc: osm_landuse_polygon_gen_z12 -> layer_landuse:z12
+         -- etldoc: osm_landuse_polygon_gen_z12_union -> layer_landuse:z12
          SELECT osm_id,
                 geometry,
                 landuse,
@@ -175,7 +358,7 @@ FROM (
                 place,
                 waterway,
                 man_made
-         FROM osm_landuse_polygon_gen_z12
+         FROM osm_landuse_polygon_gen_z12_union
          WHERE zoom_level = 12
          UNION ALL
          -- etldoc: osm_landuse_polygon_gen_z13 -> layer_landuse:z13

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.
@@ -49,10 +52,13 @@ layer:
       - 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

@@ -77,6 +77,7 @@ tables:
       - railway
       - cemetery
       - military
+      - quarry
       # zoning
       - residential
       - commercial
@@ -98,6 +99,7 @@ tables:
       - motorcycle_parking
       - bicycle_parking
       - animal_training
+      - grave_yard
       leisure:
       - stadium
       - pitch

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/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

@@ -1,26 +1,46 @@
+-- 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+" ] ;
+-- 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,
+                osm_id          bigint,
-                geometry geometry,
+                geometry        geometry,
-                name     text,
+                name            text,
-                name_en  text,
+                name_en         text,
-                name_de  text,
+                name_de         text,
-                class    text,
+                class           text,
-                tags     hstore,
+                tags            hstore,
-                ele      int,
+                ele             int,
-                ele_ft   int,
+                ele_ft          int,
-                "rank"   int
+                customary_ft    int,
+                "rank"          int
             )
 AS
 $$
 SELECT
-    -- etldoc: osm_peak_point -> layer_mountain_peak:z7_
+    -- etldoc: peak_point -> layer_mountain_peak:z7_
     osm_id,
     geometry,
     name,
@@ -30,6 +50,7 @@ SELECT
     tags,
     ele::int,
     ele_ft::int,
+    customary_ft,
     rank::int
 FROM (
          SELECT osm_id,
@@ -40,21 +61,56 @@ FROM (
                 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 (
                             substring(ele FROM E'^(-?\\d+)(\\D|$)')::int +
-                            (CASE WHEN NULLIF(wikipedia, '') IS NOT NULL THEN 10000 ELSE 0 END) +
+                            (CASE WHEN wikipedia <> '' THEN 10000 ELSE 0 END) +
-                            (CASE WHEN NULLIF(name, '') IS NOT NULL THEN 10000 ELSE 0 END)
+                            (CASE WHEN name <> '' THEN 10000 ELSE 0 END)
                         ) DESC
                     )::int AS "rank"
-         FROM osm_peak_point
+         FROM 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)
+
+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

layers/mountain_peak/mountain_peak.yaml

@@ -1,5 +1,8 @@
 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
@@ -10,21 +13,32 @@ layer:
     name_de: German name `name:de` if available, otherwise `name` or `name:en`.
     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
+  - ./update_mountain_linestring.sql
   - ./mountain_peak.sql
 datasources:
   - type: imposm3

layers/mountain_peak/style.json

@@ -0,0 +1,52 @@
+{
+  "layers": [
+    {
+      "id": "mountain_peak",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "mountain_peak",
+      "maxzoom": 16,
+      "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
+      },
+      "filter": [
+        "all",
+        [
+          "!=",
+          "class",
+          "cliff"
+        ]
+      ],
+      "order": 197
+    }
+  ]
+}

layers/mountain_peak/update_mountain_linestring.sql

@@ -0,0 +1,87 @@
+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
+EXECUTE PROCEDURE mountain_linestring.store();
+
+CREATE TRIGGER trigger_flag
+    AFTER INSERT OR UPDATE
+    ON osm_mountain_linestring
+    FOR EACH STATEMENT
+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

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS mountain_peak_point;
 
 CREATE TABLE IF NOT EXISTS mountain_peak_point.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc:  osm_peak_point ->  osm_peak_point
@@ -26,11 +26,7 @@ SELECT update_osm_peak_point(true);
 CREATE OR REPLACE FUNCTION mountain_peak_point.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO mountain_peak_point.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO mountain_peak_point.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO mountain_peak_point.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -55,6 +51,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh mountain_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;
@@ -67,13 +68,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_peak_point
     FOR EACH ROW
 EXECUTE PROCEDURE mountain_peak_point.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_peak_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE mountain_peak_point.flag();

layers/park/mapping.yaml

@@ -1,33 +1,45 @@
 generalized_tables:
+  # 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: 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: ZRES8
+    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: ZRES9
+    tolerance: ZRES8
 
   # 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: ZRES10
+    tolerance: ZRES9
 
   # 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: ZRES11
+    tolerance: ZRES10
 
   # etldoc: osm_park_polygon_gen_z12 -> osm_park_polygon_gen_z11
   park_polygon_gen_z11:
@@ -89,3 +101,4 @@ tables:
       boundary:
       - national_park
       - protected_area
+      - aboriginal_lands

layers/park/park.sql

@@ -1,5 +1,5 @@
 -- 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+" ] ;
+-- etldoc:     label="layer_park |<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_park(bbox geometry, zoom_level int, pixel_width numeric)
     RETURNS TABLE
@@ -18,25 +18,54 @@ $$
 SELECT osm_id,
        geometry,
        class,
-       name,
+       NULLIF(name, '') AS name,
-       name_en,
+       NULLIF(name_en, '') AS name_en,
-       name_de,
+       NULLIF(name_de, '') AS name_de,
        tags,
        rank
 FROM (
          SELECT osm_id,
                 geometry,
-                COALESCE(
+                CASE WHEN boundary='aboriginal_lands' THEN 'aboriginal_lands'
-                        LOWER(REPLACE(NULLIF(protection_title, ''), ' ', '_')),
+                     ELSE COALESCE(
-                        NULLIF(boundary, ''),
+                          LOWER(REPLACE(NULLIF(protection_title, ''), ' ', '_')),
-                        NULLIF(leisure, '')
+                          NULLIF(boundary, ''),
-                    ) AS class,
+                          NULLIF(leisure, '')
+                    ) END AS class,
                 name,
                 name_en,
                 name_de,
                 tags,
                 NULL::int AS rank
          FROM (
+                  -- etldoc: osm_park_polygon_dissolve_z4 -> layer_park:z4
+                  SELECT NULL::int AS osm_id,
+                         geometry,
+                         NULL AS name,
+                         NULL AS name_en,
+                         NULL AS name_de,
+                         NULL AS tags,
+                         NULL AS leisure,
+                         CASE WHEN boundary='aboriginal_lands' THEN boundary END AS boundary,
+                         NULL AS protection_title
+                  FROM osm_park_polygon_dissolve_z4
+                  WHERE zoom_level = 4
+                    AND geometry && bbox
+                  UNION ALL
+                  -- etldoc: osm_park_polygon_gen_z5 -> layer_park:z5
+                  SELECT osm_id,
+                         geometry,
+                         name,
+                         name_en,
+                         name_de,
+                         tags,
+                         leisure,
+                         boundary,
+                         protection_title
+                  FROM osm_park_polygon_gen_z5
+                  WHERE zoom_level = 5
+                    AND geometry && bbox
+                  UNION ALL
                   -- etldoc: osm_park_polygon_gen_z6 -> layer_park:z6
                   SELECT osm_id,
                          geometry,
@@ -184,6 +213,23 @@ FROM (
                         area DESC
                     )::int AS "rank"
          FROM (
+                  -- etldoc: osm_park_polygon_gen_z5 -> layer_park:z5
+                  SELECT osm_id,
+                         geometry_point,
+                         name,
+                         name_en,
+                         name_de,
+                         tags,
+                         leisure,
+                         boundary,
+                         protection_title,
+                         area
+                  FROM osm_park_polygon_gen_z5
+                  WHERE zoom_level = 5
+                    AND geometry_point && bbox
+                    AND area > 70000*2^(20-zoom_level)
+                  UNION ALL
+
                   -- etldoc: osm_park_polygon_gen_z6 -> layer_park:z6
                   SELECT osm_id,
                          geometry_point,

layers/park/park.yaml

@@ -17,6 +17,7 @@ layer:
           `nature_reserve` is the class of `protection_title=Nature Reserve` and `leisure=nature_reserve`.
           The class for other [`protection_title`](http://wiki.openstreetmap.org/wiki/key:protection_title) 
           values is similarly assigned.
+          The class for `boundary=aboriginal_lands` is `aboriginal_lands`.
     name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the park (point features only).
     name_en: English name `name:en` if available, otherwise `name` (point features only).
     name_de: German name `name:de` if available, otherwise `name` or `name:en` (point features only).

layers/park/style.json

@@ -0,0 +1,111 @@
+{
+  "layers": [
+    {
+      "id": "national_parks",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "park",
+      "minzoom": 8,
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(154, 199, 136, 1)",
+        "line-width": {
+          "base": 1,
+          "stops": [
+            [
+              8,
+              1.2
+            ],
+            [
+              9,
+              1.5
+            ],
+            [
+              10,
+              3.6
+            ],
+            [
+              24,
+              3.6
+            ]
+          ]
+        },
+        "line-offset": 1,
+        "line-opacity": 0.8
+      },
+      "order": 20
+    },
+    {
+      "id": "national_parks_thin",
+      "type": "line",
+      "source": "openmaptiles",
+      "source-layer": "park",
+      "minzoom": 10,
+      "layout": {
+        "visibility": "none"
+      },
+      "paint": {
+        "line-color": "rgba(93, 156, 76, 1)",
+        "line-width": 1.5
+      },
+      "order": 21
+    },
+    {
+      "id": "park-national",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "park",
+      "minzoom": 7,
+      "maxzoom": 12,
+      "layout": {
+        "text-font": [
+          "Noto Sans Italic"
+        ],
+        "text-size": 12,
+        "text-field": "{name:latin}{name:nonlatin}",
+        "visibility": "visible",
+        "symbol-spacing": 150,
+        "text-allow-overlap": false
+      },
+      "paint": {
+        "text-color": {
+          "stops": [
+            [
+              7,
+              "rgba(70, 164, 70, 1)"
+            ],
+            [
+              10,
+              "#008000"
+            ]
+          ]
+        },
+        "text-halo-blur": 0.1,
+        "text-halo-color": {
+          "stops": [
+            [
+              7,
+              "rgba(241, 255, 234, 1)"
+            ],
+            [
+              10,
+              "rgba(208, 250, 200, 1)"
+            ]
+          ]
+        },
+        "text-halo-width": 0.3
+      },
+      "filter": [
+        "all",
+        [
+          "<=",
+          "rank",
+          2
+        ]
+      ],
+      "order": 195
+    }
+  ]
+}

layers/park/update_park_polygon.sql

@@ -16,6 +16,26 @@ ALTER TABLE osm_park_polygon_gen_z7
     ADD COLUMN IF NOT EXISTS geometry_point geometry;
 ALTER TABLE osm_park_polygon_gen_z6
     ADD COLUMN IF NOT EXISTS geometry_point geometry;
+ALTER TABLE osm_park_polygon_gen_z5
+    ADD COLUMN IF NOT EXISTS geometry_point geometry;
+
+-- etldoc:  osm_park_polygon_gen_z4 -> osm_park_polygon_dissolve_z4
+DROP MATERIALIZED VIEW IF EXISTS osm_park_polygon_dissolve_z4 CASCADE;
+CREATE MATERIALIZED VIEW osm_park_polygon_dissolve_z4 AS
+(
+  SELECT min(osm_id) AS osm_id,
+         ST_Union(geometry) AS geometry,
+         boundary
+  FROM (
+        SELECT ST_ClusterDBSCAN(geometry, 0, 1) OVER() AS cluster,
+               osm_id,
+               geometry,
+               boundary
+        FROM osm_park_polygon_gen_z4
+  ) park_cluster
+  GROUP BY boundary, cluster
+);
+CREATE UNIQUE INDEX IF NOT EXISTS osm_park_polygon_dissolve_idx ON osm_park_polygon_dissolve_z4 (osm_id);
 
 DROP TRIGGER IF EXISTS update_row ON osm_park_polygon;
 DROP TRIGGER IF EXISTS update_row ON osm_park_polygon_gen_z13;
@@ -26,6 +46,10 @@ DROP TRIGGER IF EXISTS update_row ON osm_park_polygon_gen_z9;
 DROP TRIGGER IF EXISTS update_row ON osm_park_polygon_gen_z8;
 DROP TRIGGER IF EXISTS update_row ON osm_park_polygon_gen_z7;
 DROP TRIGGER IF EXISTS update_row ON osm_park_polygon_gen_z6;
+DROP TRIGGER IF EXISTS update_row ON osm_park_polygon_gen_z5;
+DROP TRIGGER IF EXISTS update_row ON osm_park_polygon_gen_z4;
+DROP TRIGGER IF EXISTS tigger_flag ON osm_park_polygon;
+DROP TRIGGER IF EXISTS tigger_refresh ON park_polygon.updates;
 
 -- etldoc:  osm_park_polygon ->  osm_park_polygon
 -- etldoc:  osm_park_polygon_gen_z13 ->  osm_park_polygon_gen_z13
@@ -36,6 +60,8 @@ DROP TRIGGER IF EXISTS update_row ON osm_park_polygon_gen_z6;
 -- etldoc:  osm_park_polygon_gen_z8 ->  osm_park_polygon_gen_z8
 -- etldoc:  osm_park_polygon_gen_z7 ->  osm_park_polygon_gen_z7
 -- etldoc:  osm_park_polygon_gen_z6 ->  osm_park_polygon_gen_z6
+-- etldoc:  osm_park_polygon_gen_z5 ->  osm_park_polygon_gen_z5
+-- etldoc:  osm_park_polygon_gen_z4 ->  osm_park_polygon_gen_z4
 CREATE OR REPLACE FUNCTION update_osm_park_polygon() RETURNS void AS
 $$
 BEGIN
@@ -75,6 +101,11 @@ BEGIN
     SET tags           = update_tags(tags, geometry),
         geometry_point = st_centroid(geometry);
 
+    UPDATE osm_park_polygon_gen_z5
+    SET tags           = update_tags(tags, geometry),
+        geometry_point = st_centroid(geometry);
+
+    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_park_polygon_dissolve_z4;
 END;
 $$ LANGUAGE plpgsql;
 
@@ -88,7 +119,45 @@ CREATE INDEX IF NOT EXISTS osm_park_polygon_gen_z9_point_geom_idx ON osm_park_po
 CREATE INDEX IF NOT EXISTS osm_park_polygon_gen_z8_point_geom_idx ON osm_park_polygon_gen_z8 USING gist (geometry_point);
 CREATE INDEX IF NOT EXISTS osm_park_polygon_gen_z7_point_geom_idx ON osm_park_polygon_gen_z7 USING gist (geometry_point);
 CREATE INDEX IF NOT EXISTS osm_park_polygon_gen_z6_point_geom_idx ON osm_park_polygon_gen_z6 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_park_polygon_gen_z5_point_geom_idx ON osm_park_polygon_gen_z5 USING gist (geometry_point);
+CREATE INDEX IF NOT EXISTS osm_park_polygon_gen_z4_polygon_geom_idx ON osm_park_polygon_gen_z4 USING gist (geometry);
+CREATE INDEX IF NOT EXISTS osm_park_polygon_dissolve_z4_polygon_geom_idx ON osm_park_polygon_dissolve_z4 USING gist (geometry);
 
+CREATE SCHEMA IF NOT EXISTS park_polygon;
+
+CREATE TABLE IF NOT EXISTS park_polygon.updates
+(
+    id serial PRIMARY KEY,
+    t  text,
+    UNIQUE (t)
+);
+
+CREATE OR REPLACE FUNCTION park_polygon.flag() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO park_polygon.updates(t) VALUES ('y') ON CONFLICT(t) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION park_polygon.refresh() RETURNS trigger AS
+$$
+DECLARE
+    t TIMESTAMP WITH TIME ZONE := clock_timestamp();
+BEGIN
+    RAISE LOG 'Refresh park_polygon';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE osm_park_polygon_gen_z4;
+    REFRESH MATERIALIZED VIEW osm_park_polygon_dissolve_z4;
+
+    -- noinspection SqlWithoutWhere
+    DELETE FROM park_polygon.updates;
+
+    RAISE LOG 'Refresh park_polygon done in %', age(clock_timestamp(), t);
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION update_osm_park_polygon_row()
     RETURNS trigger
@@ -101,6 +170,16 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
+CREATE OR REPLACE FUNCTION update_osm_park_dissolved_polygon_row()
+    RETURNS trigger
+AS
+$$
+BEGIN
+    NEW.tags = update_tags(NEW.tags, NEW.geometry);
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
 CREATE TRIGGER update_row
     BEFORE INSERT OR UPDATE
     ON osm_park_polygon
@@ -154,3 +233,28 @@ CREATE TRIGGER update_row
     ON osm_park_polygon_gen_z6
     FOR EACH ROW
 EXECUTE PROCEDURE update_osm_park_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_park_polygon_gen_z5
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_park_polygon_row();
+
+CREATE TRIGGER update_row
+    BEFORE INSERT OR UPDATE
+    ON osm_park_polygon_gen_z4
+    FOR EACH ROW
+EXECUTE PROCEDURE update_osm_park_dissolved_polygon_row();
+
+CREATE TRIGGER trigger_flag
+    AFTER INSERT OR UPDATE OR DELETE
+    ON osm_park_polygon_gen_z4
+    FOR EACH STATEMENT
+EXECUTE PROCEDURE park_polygon.flag();
+
+CREATE CONSTRAINT TRIGGER trigger_refresh
+    AFTER INSERT
+    ON park_polygon.updates
+    INITIALLY DEFERRED
+    FOR EACH ROW
+EXECUTE PROCEDURE park_polygon.refresh();

layers/place/capital.sql

@@ -2,8 +2,8 @@ CREATE OR REPLACE FUNCTION normalize_capital_level(capital text)
     RETURNS int AS
 $$
 SELECT CASE
-           WHEN capital IN ('yes', '2') THEN 2
+           WHEN capital = 'yes' THEN 2
-           WHEN capital = '4' THEN 4
+           WHEN capital IN ('2', '3', '4', '5', '6') THEN capital::int
            END;
 $$ LANGUAGE SQL IMMUTABLE
                 STRICT

layers/place/mapping.yaml

@@ -124,6 +124,9 @@ tables:
     - *name_de
     - name: tags
       type: hstore_tags
+    - name: place
+      key: place
+      type: string
     - name: is_in_country
       key: is_in:country
       type: string
@@ -140,6 +143,7 @@ tables:
     mapping:
       place:
       - state
+      - province
 
   # etldoc: imposm3 -> osm_city_point
   city_point:
@@ -173,6 +177,7 @@ tables:
       - town
       - village
       - hamlet
+      - borough
       - suburb
       - quarter
       - neighbourhood

layers/place/place.sql

@@ -70,7 +70,7 @@ FROM (
              COALESCE(NULLIF(name_en, ''), name) AS name_en,
              COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
              tags,
-             'state' AS class,
+             place::text AS class,
              "rank",
              NULL::int AS capital,
              NULL::text AS iso_a2

layers/place/place.yaml

@@ -1,8 +1,14 @@
 layer:
   id: "place"
+  requires:
+    tables:
+      - ne_10m_admin_1_states_provinces
+      - ne_10m_admin_0_countries
+      - ne_10m_populated_places
   description: |
       The place layer consists out of [countries](http://wiki.openstreetmap.org/wiki/Tag:place%3Dcountry),
-      [states](http://wiki.openstreetmap.org/wiki/Tag:place%3Dstate) and [cities](http://wiki.openstreetmap.org/wiki/Key:place).
+      [states](http://wiki.openstreetmap.org/wiki/Tag:place%3Dstate), [cities](http://wiki.openstreetmap.org/wiki/Key:place)
+      and [islands](https://wiki.openstreetmap.org/wiki/Tag:place%3Disland).
       Apart from the roads this is also one of the more important layers to create a beautiful map.
       We suggest you use different font styles and sizes to create a text hierarchy.
   fields:
@@ -14,12 +20,12 @@ layer:
           The **capital** field marks the
           [`admin_level`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative#admin_level)
           of the boundary the place is a capital of.
-      values: [2, 4]
+      values: [2, 3, 4, 5, 6]
     class:
       description: |
           Original value of the
           [`place`](http://wiki.openstreetmap.org/wiki/Key:place) tag.
-          Distinguish between continents, countries, states and
+          Distinguish between continents, countries, states, islands and
           places like settlements or smaller entities.
           Use **class** to separately style the different places and build
           a text hierarchy according to their importance.
@@ -27,14 +33,17 @@ layer:
       - continent
       - country
       - state
+      - province
       - city
       - town
       - village
       - hamlet
+      - borough
       - suburb
       - quarter
       - neighbourhood
       - isolated_dwelling
+      - island
     iso_a2:
       description: |
           Two-letter country code [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). Available only for `class=country`.
@@ -44,7 +53,7 @@ layer:
       description: |
           Countries, states and the most important cities all have a
           **rank** to boost their importance on the map.
-          The **rank** field for counries and states ranges from
+          The **rank** field for countries and states ranges from
           `1` to `6` while the **rank** field for cities ranges from
           `1` to `10` for the most important cities
           and continues from `10` serially based on the

layers/place/style.json

@@ -0,0 +1,662 @@
+{
+  "layers": [
+    {
+      "id": "place_other",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 8,
+      "layout": {
+        "text-font": [
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "base": 1.2,
+          "stops": [
+            [
+              11,
+              10
+            ],
+            [
+              14,
+              14
+            ],
+            [
+              18,
+              16
+            ]
+          ]
+        },
+        "text-field": "{name:latin}\n{name:nonlatin}",
+        "visibility": "visible",
+        "symbol-spacing": 150,
+        "text-max-width": 10,
+        "text-transform": "none"
+      },
+      "paint": {
+        "text-color": {
+          "stops": [
+            [
+              12.5,
+              "#222222"
+            ],
+            [
+              12.6,
+              "#777777"
+            ]
+          ]
+        },
+        "text-halo-blur": 0,
+        "text-halo-color": {
+          "stops": [
+            [
+              11,
+              "rgba(255,255,255,0.6)"
+            ],
+            [
+              13,
+              "#ffffff"
+            ]
+          ]
+        },
+        "text-halo-width": {
+          "stops": [
+            [
+              8,
+              0.8
+            ],
+            [
+              13,
+              1.5
+            ]
+          ]
+        }
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "in",
+          "class",
+          "hamlet",
+          "island",
+          "islet",
+          "neighbourhood",
+          "suburb",
+          "borough"
+        ]
+      ],
+      "order": 193
+    },
+    {
+      "id": "place_village",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 8,
+      "layout": {
+        "text-font": [
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "base": 1.2,
+          "stops": [
+            [
+              10,
+              10
+            ],
+            [
+              15,
+              16
+            ]
+          ]
+        },
+        "text-field": "{name:latin}\n{name:nonlatin}",
+        "visibility": "visible",
+        "text-max-width": 8
+      },
+      "paint": {
+        "text-color": "#333",
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 1.2
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "class",
+          "village"
+        ]
+      ],
+      "order": 198
+    },
+    {
+      "id": "place_town",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 6,
+      "layout": {
+        "text-font": [
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "base": 1.2,
+          "stops": [
+            [
+              7,
+              10
+            ],
+            [
+              11,
+              13
+            ]
+          ]
+        },
+        "text-field": "{name:latin}\n{name:nonlatin}",
+        "visibility": "visible",
+        "text-anchor": "bottom",
+        "text-offset": [
+          0,
+          0
+        ],
+        "text-max-width": 8
+      },
+      "paint": {
+        "text-color": "#333",
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 1.2
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "class",
+          "town"
+        ]
+      ],
+      "order": 199
+    },
+    {
+      "id": "place_state",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 4,
+      "maxzoom": 12,
+      "layout": {
+        "text-font": [
+          "Noto Sans Regular",
+          "Noto Sans Bold"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              3,
+              10
+            ],
+            [
+              6,
+              14
+            ]
+          ]
+        },
+        "text-field": "{name:latin}",
+        "visibility": "visible",
+        "text-padding": 2,
+        "text-transform": "none",
+        "text-letter-spacing": 0
+      },
+      "paint": {
+        "text-color": "#7e587d",
+        "text-halo-color": "rgba(255,255,255,0.7)",
+        "text-halo-width": 0.8
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "class",
+          "state"
+        ],
+        [
+          "<",
+          "rank",
+          3
+        ]
+      ],
+      "order": 200
+    },
+    {
+      "id": "place_city",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 4,
+      "maxzoom": 14,
+      "layout": {
+        "text-font": [
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "base": 1.2,
+          "stops": [
+            [
+              4,
+              12
+            ],
+            [
+              15,
+              18
+            ]
+          ]
+        },
+        "icon-image": {
+          "stops": [
+            [
+              4,
+              "place-6"
+            ],
+            [
+              7,
+              " "
+            ]
+          ]
+        },
+        "text-field": "{name:latin}\n{name:nonlatin}",
+        "visibility": "visible",
+        "icon-offset": [
+          0,
+          3
+        ],
+        "text-anchor": "bottom",
+        "text-offset": [
+          0,
+          0
+        ],
+        "icon-optional": false,
+        "text-max-width": 8,
+        "icon-allow-overlap": true
+      },
+      "paint": {
+        "text-color": {
+          "stops": [
+            [
+              6,
+              "rgba(88, 88, 88, 1)"
+            ],
+            [
+              14,
+              "rgba(32, 32, 32, 1)"
+            ]
+          ]
+        },
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 1
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "class",
+          "city"
+        ],
+        [
+          "!=",
+          "rank",
+          1
+        ]
+      ],
+      "order": 201
+    },
+    {
+      "id": "place_capital",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 3,
+      "maxzoom": 15,
+      "layout": {
+        "icon-size": 1,
+        "text-font": [
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "base": 1.2,
+          "stops": [
+            [
+              4,
+              11
+            ],
+            [
+              12,
+              16
+            ]
+          ]
+        },
+        "icon-image": {
+          "stops": [
+            [
+              6,
+              "place-capital-8"
+            ],
+            [
+              8,
+              ""
+            ]
+          ]
+        },
+        "text-field": "{name:latin}\n{name:nonlatin}",
+        "visibility": "visible",
+        "icon-offset": [
+          0,
+          3
+        ],
+        "text-anchor": "bottom",
+        "text-offset": [
+          0,
+          0
+        ],
+        "icon-optional": false,
+        "text-max-width": 8,
+        "icon-allow-overlap": true
+      },
+      "paint": {
+        "text-color": {
+          "stops": [
+            [
+              6,
+              "rgba(73, 73, 73, 1)"
+            ],
+            [
+              14,
+              "rgba(32, 32, 32, 1)"
+            ]
+          ]
+        },
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 1.2
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "class",
+          "city"
+        ],
+        [
+          "in",
+          "capital",
+          1,
+          2
+        ]
+      ],
+      "order": 202
+    },
+    {
+      "id": "country_other",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 4,
+      "maxzoom": 15,
+      "layout": {
+        "text-font": [
+          "Noto Sans Regular"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              3,
+              11
+            ],
+            [
+              5,
+              13
+            ],
+            [
+              7,
+              20
+            ]
+          ]
+        },
+        "text-field": "{name:latin}",
+        "visibility": "visible",
+        "text-max-width": 6.25,
+        "text-transform": "none"
+      },
+      "paint": {
+        "text-color": "rgba(131, 81, 130, 1)",
+        "text-halo-blur": 1,
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 0.8
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "class",
+          "country"
+        ],
+        [
+          "!has",
+          "iso_a2"
+        ]
+      ],
+      "order": 203
+    },
+    {
+      "id": "country_3",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 5,
+      "maxzoom": 12,
+      "layout": {
+        "text-font": [
+          "Noto Sans Bold"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              3,
+              11
+            ],
+            [
+              5,
+              13
+            ],
+            [
+              7,
+              17
+            ]
+          ]
+        },
+        "text-field": "{name:latin}",
+        "visibility": "visible",
+        "text-max-width": 6.25,
+        "text-transform": "none"
+      },
+      "paint": {
+        "text-color": {
+          "stops": [
+            [
+              3,
+              "rgba(108, 78, 107, 1)"
+            ],
+            [
+              10,
+              "rgba(57, 37, 73, 1)"
+            ]
+          ]
+        },
+        "text-halo-blur": 1,
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 0.8
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          ">=",
+          "rank",
+          3
+        ],
+        [
+          "==",
+          "class",
+          "country"
+        ],
+        [
+          "has",
+          "iso_a2"
+        ]
+      ],
+      "order": 204
+    },
+    {
+      "id": "country_2",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 2,
+      "maxzoom": 12,
+      "layout": {
+        "text-font": [
+          "Noto Sans Bold"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              3,
+              11
+            ],
+            [
+              5,
+              14
+            ],
+            [
+              7,
+              19
+            ]
+          ]
+        },
+        "text-field": "{name:latin}",
+        "visibility": "visible",
+        "text-max-width": 6.25,
+        "text-transform": "none"
+      },
+      "paint": {
+        "text-color": {
+          "stops": [
+            [
+              3,
+              "rgba(108, 78, 107, 1)"
+            ],
+            [
+              10,
+              "rgba(57, 37, 73, 1)"
+            ]
+          ]
+        },
+        "text-halo-blur": 1,
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 0.8
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "rank",
+          2
+        ],
+        [
+          "==",
+          "class",
+          "country"
+        ],
+        [
+          "has",
+          "iso_a2"
+        ]
+      ],
+      "order": 205
+    },
+    {
+      "id": "country_1",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "place",
+      "minzoom": 2,
+      "maxzoom": 12,
+      "layout": {
+        "text-font": [
+          "Noto Sans Bold"
+        ],
+        "text-size": {
+          "stops": [
+            [
+              3,
+              11
+            ],
+            [
+              5,
+              14
+            ],
+            [
+              7,
+              19
+            ]
+          ]
+        },
+        "text-field": "{name:latin}",
+        "visibility": "visible",
+        "text-max-width": 6.25,
+        "text-transform": "none"
+      },
+      "paint": {
+        "text-color": {
+          "stops": [
+            [
+              2,
+              "rgba(108, 78, 107, 1)"
+            ],
+            [
+              10,
+              "rgba(57, 37, 73, 1)"
+            ]
+          ]
+        },
+        "text-halo-blur": 1,
+        "text-halo-color": "rgba(255,255,255,0.8)",
+        "text-halo-width": 0.8
+      },
+      "metadata": {},
+      "filter": [
+        "all",
+        [
+          "==",
+          "rank",
+          1
+        ],
+        [
+          "==",
+          "class",
+          "country"
+        ],
+        [
+          "has",
+          "iso_a2"
+        ]
+      ],
+      "order": 206
+    }
+  ]
+}

layers/place/types.sql

@@ -1,9 +1,10 @@
 DO
 $$
     BEGIN
-        IF NOT EXISTS(SELECT 1 FROM pg_type WHERE typname = 'city_place') THEN
+        PERFORM 'city_place'::regtype;
-            CREATE TYPE city_place AS enum ('city', 'town', 'village', 'hamlet', 'suburb', 'quarter', 'neighbourhood', 'isolated_dwelling');
+    EXCEPTION
-        END IF;
+        WHEN undefined_object THEN
+            CREATE TYPE city_place AS enum ('city', 'town', 'village', 'hamlet', 'borough', 'suburb', 'quarter', 'neighbourhood', 'isolated_dwelling');
     END
 $$;
 

layers/place/update_city_point.sql

@@ -8,7 +8,7 @@ CREATE SCHEMA IF NOT EXISTS place_city;
 
 CREATE TABLE IF NOT EXISTS place_city.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 CREATE OR REPLACE FUNCTION update_osm_city_point(full_update boolean) RETURNS void AS
@@ -23,8 +23,8 @@ $$
              LEFT JOIN ne_10m_populated_places AS ne ON
             (
                 (osm.tags ? 'wikidata' AND osm.tags->'wikidata' = ne.wikidataid) OR
-                lower(osm.name) IN (lower(ne.name), lower(ne.namealt), lower(ne.meganame), lower(ne.gn_ascii), lower(ne.nameascii)) OR
+                lower(osm.name) IN (lower(ne.name), lower(ne.namealt), lower(ne.meganame), lower(ne.name_en), lower(ne.nameascii)) OR
-                lower(osm.name_en) IN (lower(ne.name), lower(ne.namealt), lower(ne.meganame), lower(ne.gn_ascii), lower(ne.nameascii)) OR
+                lower(osm.name_en) IN (lower(ne.name), lower(ne.namealt), lower(ne.meganame), lower(ne.name_en), lower(ne.nameascii)) OR
                 ne.name = unaccent(osm.name)
             )
           AND osm.place IN ('city', 'town', 'village')
@@ -56,11 +56,7 @@ CREATE INDEX IF NOT EXISTS osm_city_point_rank_idx ON osm_city_point ("rank");
 CREATE OR REPLACE FUNCTION place_city.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO place_city.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO place_city.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO place_city.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -85,6 +81,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh place_city rank';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE place_city.osm_ids;
+    ANALYZE osm_city_point;
+
     PERFORM update_osm_city_point(false);
     -- noinspection SqlWithoutWhere
     DELETE FROM place_city.osm_ids;
@@ -97,13 +98,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_city_point
     FOR EACH ROW
 EXECUTE PROCEDURE place_city.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_city_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE place_city.flag();

layers/place/update_continent_point.sql

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS place_continent_point;
 
 CREATE TABLE IF NOT EXISTS place_continent_point.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc:  osm_continent_point ->  osm_continent_point
@@ -26,11 +26,7 @@ SELECT update_osm_continent_point(true);
 CREATE OR REPLACE FUNCTION place_continent_point.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO place_continent_point.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO place_continent_point.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO place_continent_point.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -55,6 +51,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh place_continent_point';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE place_continent_point.osm_ids;
+    ANALYZE osm_continent_point;
+
     PERFORM update_osm_continent_point(false);
     -- noinspection SqlWithoutWhere
     DELETE FROM place_continent_point.osm_ids;
@@ -67,13 +68,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_continent_point
     FOR EACH ROW
 EXECUTE PROCEDURE place_continent_point.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_continent_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE place_continent_point.flag();

layers/place/update_country_point.sql

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS place_country;
 
 CREATE TABLE IF NOT EXISTS place_country.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc: ne_10m_admin_0_countries   -> osm_country_point
@@ -105,11 +105,7 @@ CREATE INDEX IF NOT EXISTS osm_country_point_rank_idx ON osm_country_point ("ran
 CREATE OR REPLACE FUNCTION place_country.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO place_country.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO place_country.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO place_country.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -134,6 +130,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh place_country rank';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE place_country.osm_ids;
+    ANALYZE osm_country_point;
+
     PERFORM update_osm_country_point(false);
     -- noinspection SqlWithoutWhere
     DELETE FROM place_country.osm_ids;
@@ -146,13 +147,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_country_point
     FOR EACH ROW
 EXECUTE PROCEDURE place_country.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_country_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE place_country.flag();

layers/place/update_island_point.sql

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS place_island_point;
 
 CREATE TABLE IF NOT EXISTS place_island_point.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc:  osm_island_point ->  osm_island_point
@@ -26,11 +26,7 @@ SELECT update_osm_island_point(true);
 CREATE OR REPLACE FUNCTION place_island_point.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO place_island_point.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO place_island_point.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO place_island_point.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -55,6 +51,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh place_island_point';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE place_island_point.osm_ids;
+    ANALYZE osm_island_point;
+
     PERFORM update_osm_island_point(false);
     -- noinspection SqlWithoutWhere
     DELETE FROM place_island_point.osm_ids;
@@ -67,13 +68,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_island_point
     FOR EACH ROW
 EXECUTE PROCEDURE place_island_point.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_island_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE place_island_point.flag();

layers/place/update_island_polygon.sql

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS place_island_polygon;
 
 CREATE TABLE IF NOT EXISTS place_island_polygon.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc:  osm_island_polygon ->  osm_island_polygon
@@ -33,11 +33,7 @@ SELECT update_osm_island_polygon(true);
 CREATE OR REPLACE FUNCTION place_island_polygon.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO place_island_polygon.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO place_island_polygon.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO place_island_polygon.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -62,6 +58,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh place_island_polygon';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE place_island_polygon.osm_ids;
+    ANALYZE osm_island_polygon;
+
     PERFORM update_osm_island_polygon(false);
     -- noinspection SqlWithoutWhere
     DELETE FROM place_island_polygon.osm_ids;
@@ -74,13 +75,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_island_polygon
     FOR EACH ROW
 EXECUTE PROCEDURE place_island_polygon.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_island_polygon
     FOR EACH STATEMENT
 EXECUTE PROCEDURE place_island_polygon.flag();

layers/place/update_state_point.sql

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS place_state;
 
 CREATE TABLE IF NOT EXISTS place_state.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc: ne_10m_admin_1_states_provinces   -> osm_state_point
@@ -29,8 +29,8 @@ $$
           -- because name matching is difficult
             ST_Within(osm.geometry, ne.geometry)
           -- We leave out leess important states
-          AND ne.scalerank <= 3
+          AND ne.scalerank <= 6
-          AND ne.labelrank <= 2
+          AND ne.labelrank <= 7
     )
     UPDATE osm_state_point AS osm
         -- Normalize both scalerank and labelrank into a ranking system from 1 to 6.
@@ -67,11 +67,7 @@ CREATE INDEX IF NOT EXISTS osm_state_point_rank_idx ON osm_state_point ("rank");
 CREATE OR REPLACE FUNCTION place_state.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO place_state.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO place_state.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO place_state.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -96,6 +92,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh place_state rank';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE place_state.osm_ids;
+    ANALYZE osm_state_point;
+
     PERFORM update_osm_state_point(false);
     -- noinspection SqlWithoutWhere
     DELETE FROM place_state.osm_ids;
@@ -108,13 +109,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_state_point
     FOR EACH ROW
 EXECUTE PROCEDURE place_state.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_state_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE place_state.flag();

layers/poi/mapping.yaml

@@ -9,6 +9,7 @@ def_poi_mapping_aerialway: &poi_mapping_aerialway
 # amenity values , see http://taginfo.openstreetmap.org/keys/amenity#values
 def_poi_mapping_amenity: &poi_mapping_amenity
   - arts_centre
+  - atm
   - bank
   - bar
   - bbq
@@ -26,7 +27,6 @@ def_poi_mapping_amenity: &poi_mapping_amenity
   - dentist
   - doctors
   - drinking_water
-  - embassy
   - fast_food
   - ferry_terminal
   - fire_station
@@ -45,6 +45,7 @@ def_poi_mapping_amenity: &poi_mapping_amenity
   - pharmacy
   - place_of_worship
   - police
+  - parcel_locker
   - post_box
   - post_office
   - prison
@@ -121,6 +122,10 @@ def_poi_mapping_leisure: &poi_mapping_leisure
   - water_park
   - nature_reserve
 
+# office values , see http://taginfo.openstreetmap.org/keys/office#values
+def_poi_mapping_office: &poi_mapping_office
+  - diplomatic
+
 # railway values , see http://taginfo.openstreetmap.org/keys/railway#values
 def_poi_mapping_railway: &poi_mapping_railway
   - halt
@@ -184,6 +189,7 @@ def_poi_mapping_shop: &poi_mapping_shop
   - kiosk
   - lamps
   - laundry
+  - locksmith
   - mall
   - massage
   - mobile_phone
@@ -345,6 +351,8 @@ def_poi_fields: &poi_fields
     type: id
   - name: geometry
     type: geometry
+  - name: area
+    type: area
   - name: name
     key: name
     type: string
@@ -372,6 +380,9 @@ def_poi_fields: &poi_fields
   - name: uic_ref
     key: uic_ref
     type: string
+  - name: ref
+    key: ref
+    type: string
   - name: religion
     key: religion
     type: string
@@ -393,6 +404,15 @@ def_poi_fields: &poi_fields
   - name: source
     key: "generator:source"
     type: string
+  - name: operator
+    key: operator
+    type: string
+  - name: network
+    key: network
+    type: string
+  - name: brand
+    key: brand
+    type: string
 
 def_poi_mapping: &poi_mapping
   aerialway: *poi_mapping_aerialway
@@ -403,6 +423,7 @@ def_poi_mapping: &poi_mapping
   historic: *poi_mapping_historic
   landuse: *poi_mapping_landuse
   leisure: *poi_mapping_leisure
+  office: *poi_mapping_office
   railway: *poi_mapping_railway
   shop: *poi_mapping_shop
   sport: *poi_mapping_sport

layers/poi/poi.sql

@@ -94,20 +94,20 @@ FROM (
 
          -- etldoc: osm_poi_polygon ->  layer_poi:z12
          -- etldoc: osm_poi_polygon ->  layer_poi:z13
-         SELECT *,
+--          OLD
-                NULL::integer AS agg_stop,
+--          SELECT *,
-                CASE
+--                 NULL::integer AS agg_stop,
-                    WHEN osm_id < 0 THEN -osm_id * 10 + 4
+--                 CASE
-                    ELSE osm_id * 10 + 1
+--                     WHEN osm_id < 0 THEN -osm_id * 10 + 4
-                    END AS osm_id_hash
+--                     ELSE osm_id * 10 + 1
-         FROM osm_poi_polygon
+--                     END AS osm_id_hash
-         WHERE geometry && bbox
+--          FROM osm_poi_polygon
-           AND zoom_level BETWEEN 12 AND 13
+--          WHERE geometry && bbox
-           AND ((subclass = 'station' AND mapping_key = 'railway')
+--            AND zoom_level BETWEEN 12 AND 13
-             OR subclass IN ('halt', 'ferry_terminal'))
+--            AND ((subclass = 'station' AND mapping_key = 'railway')
-
+--              OR subclass IN ('halt', 'ferry_terminal'))
-         UNION ALL
+--
-
+--          UNION ALL
          -- etldoc: osm_poi_polygon ->  layer_poi:z14_
          SELECT *,
                 NULL::integer AS agg_stop,
@@ -116,8 +116,21 @@ FROM (
                     ELSE osm_id * 10 + 1
                     END AS osm_id_hash
          FROM osm_poi_polygon
-         WHERE geometry && bbox
+         WHERE geometry && bbox AND
-           AND zoom_level >= 14
+           CASE
+               WHEN zoom_level >= 14 THEN TRUE
+               WHEN zoom_level >= 12 AND
+                 ((subclass = 'station' AND mapping_key = 'railway')
+                 OR subclass IN ('halt', 'ferry_terminal')) THEN TRUE
+               WHEN zoom_level BETWEEN 10 AND 14 THEN
+                 subclass IN ('university', 'college') AND
+                 POWER(4,zoom_level)
+                 -- Compute percentage of the earth's surface covered by this feature (approximately)
+                 -- The constant below is 111,842^2 * 180 * 180, where 111,842 is the length of one degree of latitude at the equator in meters.
+                 * area / (405279708033600 * COS(ST_Y(ST_Transform(geometry,4326))*PI()/180))
+                 -- Match features that are at least 10% of a tile at this zoom
+                 > 0.10
+               ELSE FALSE END
      ) AS poi_union_raw
     WHERE NOT (mapping_key = 'building' AND (subclass = 'office' OR subclass = 'industrial') AND coalesce(name, name_en, '') = '')
 ) AS poi_union

layers/poi/poi.yaml

@@ -18,37 +18,39 @@ layer:
       values:
         shop:
           subclass: ['accessories', 'antiques', 'beauty', 'bed', 'boutique', 'camera', 'carpet', 'charity', 'chemist',
-                     'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics',
+                     'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics', 'garden_centre', 'doityourself',
-                     'erotic', 'fabric', 'frozen_food', 'video_games', 'video', 'general', 'gift',
+                     'erotic', 'electronics', 'fabric', 'florist', 'frozen_food', 'furniture', 'video_games', 'video',
-                     'hearing_aids', 'hifi', 'interior_decoration', 'kiosk', 'lamps', 'mall', 'massage','outdoor',
+                     'general', 'gift', 'hardware', 'hearing_aids', 'hifi', 'ice_cream', 'interior_decoration',
-                     'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 'sports', 'stationery', 'tailor', 'tattoo',
+                     'jewelry', 'kiosk', 'locksmith', 'lamps', 'mall', 'massage', 'motorcycle', 'mobile_phone',
-                     'ticket', 'tobacco', 'travel_agency', 'watches', 'weapons', 'wholesale']
+                     'newsagent', 'optician', 'outdoor', 'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 'shoes', 'sports',
+                     'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys', 'travel_agency',
+                     'watches', ''weapons', 'wholesale']
         optician:
-          subclass: ['optician']
+          subclass: [ 'optician' ]
         toys:
-          subclass: ['toys']
+          subclass: [ 'toys' ]
         jewelry:
-          subclass: ['jewelry']
+          subclass: [ 'jewelry' ]
         furniture:
-          subclass: ['furniture']
+          subclass: [ 'furniture' ]
         newsagent:
-          subclass: ['newsagent']
+          subclass: [ 'newsagent' ]
         paint:
-          subclass: ['paint']
+          subclass: [ 'paint' ]
         beverages:
-          subclass: ['beverages']
+          subclass: [ 'beverages' ]
         electronics:
-          subclass: ['electronics']
+          subclass: [ 'electronics' ]
         garden_centre:
-          subclass: ['garden_centre']
+          subclass: [ 'garden_centre' ]
         mobile_phone:
-          subclass: ['mobile_phone']
+          subclass: [ 'mobile_phone' ]
         shoes:
-          subclass: ['shoes']
+          subclass: [ 'shoes' ]
         hardware:
-          subclass: ['hardware', 'doityourself']
+          subclass: [ 'hardware', 'doityourself' ]
         florist:
-          subclass: ['florist']
+          subclass: [ 'florist' ]
         town_hall:
           subclass: ['townhall', 'public_building', 'courthouse']
         community_centre:
@@ -87,7 +89,7 @@ layer:
         ice_cream:
           subclass: ['chocolate', 'confectionery', 'ice_cream']
         post:
-          subclass: ['post_box', 'post_office']
+          subclass: ['post_box', 'post_office', 'parcel_locker']
         cafe:
           subclass: ['cafe']
         school:
@@ -126,25 +128,27 @@ layer:
           subclass: ['swimming_area', 'swimming']
         castle:
           subclass: ['castle', 'ruins']
+        atm:
+          subclass: ['atm']
         airport:
-          subclass: ['aerodrome']
+          subclass: [ 'aerodrome' ]
         heliport:
-          subclass: ['helipad']
+          subclass: [ 'helipad' ]
         wind_turbine:
           __AND__:
-            subclass: ['generator']
+            subclass: [ 'generator' ]
-            subtype: ['wind']
+            subtype: [ 'wind' ]
-            mapping_key: ['power']
+            mapping_key: [ 'power' ]
         communications_tower:
-          subclass: ['communications_tower']
+          subclass: [ 'communications_tower' ]
         water_tower:
-          subclass: ['water_tower']
+          subclass: [ 'water_tower' ]
         wind_mill:
-          subclass: ['wind_mill']
+          subclass: [ 'wind_mill' ]
         power_tower:
-          subclass: ['tower']
+          subclass: [ 'tower' ]
         industry:
-          subclass: ['industrial']
+          subclass: [ 'industrial' ]
     subclass:
       description: |
           Original value of either the
@@ -162,7 +166,8 @@ layer:
           [`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)
+          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway),
+          [`office`](https://wiki.openstreetmap.org/wiki/Key:office)
           or [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway)
           tag.  Use this to do more precise styling.
     rank: |

layers/poi/poi_stop_agg.sql

@@ -1,3 +1,4 @@
+-- etldoc:  osm_poi_point ->  osm_poi_stop_centroid
 DROP MATERIALIZED VIEW IF EXISTS osm_poi_stop_centroid CASCADE;
 CREATE MATERIALIZED VIEW osm_poi_stop_centroid AS
 (
@@ -5,12 +6,14 @@ SELECT uic_ref,
        count(*) AS count,
        CASE WHEN count(*) > 2 THEN ST_Centroid(ST_UNION(geometry)) END AS centroid
 FROM osm_poi_point
-WHERE nullif(uic_ref, '') IS NOT NULL
+WHERE uic_ref <> ''
   AND subclass IN ('bus_stop', 'bus_station', 'tram_stop', 'subway')
 GROUP BY uic_ref
 HAVING count(*) > 1
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */;
 
+-- etldoc:  osm_poi_stop_centroid ->  osm_poi_stop_rank
+-- etldoc:  osm_poi_point ->  osm_poi_stop_rank
 DROP MATERIALIZED VIEW IF EXISTS osm_poi_stop_rank CASCADE;
 CREATE MATERIALIZED VIEW osm_poi_stop_rank AS
 (

layers/poi/public_transport_stop_type.sql

@@ -1,12 +1,11 @@
 DO
 $$
     BEGIN
-        IF NOT EXISTS(SELECT 1
+        PERFORM 'public_transport_stop_type'::regtype;
-                      FROM pg_type
+    EXCEPTION
-                      WHERE typname = 'public_transport_stop_type') THEN
+        WHEN undefined_object THEN
             CREATE TYPE public_transport_stop_type AS enum (
                 'subway', 'tram_stop', 'bus_station', 'bus_stop'
                 );
-        END IF;
     END
 $$;

layers/poi/update_poi_point.sql

@@ -1,47 +1,99 @@
 DROP TRIGGER IF EXISTS trigger_flag ON osm_poi_point;
 DROP TRIGGER IF EXISTS trigger_refresh ON poi_point.updates;
+DROP TRIGGER IF EXISTS trigger_store ON osm_poi_point;
+
+CREATE SCHEMA IF NOT EXISTS poi_point;
+
+CREATE TABLE IF NOT EXISTS poi_point.osm_ids
+(
+    osm_id bigint PRIMARY KEY
+);
 
 -- etldoc:  osm_poi_point ->  osm_poi_point
-CREATE OR REPLACE FUNCTION update_osm_poi_point() RETURNS void AS
+CREATE OR REPLACE FUNCTION update_osm_poi_point(full_update bool) RETURNS void AS
 $$
 BEGIN
     UPDATE osm_poi_point
     SET subclass = 'subway'
-    WHERE station = 'subway'
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM poi_point.osm_ids))
+      AND station = 'subway'
       AND subclass = 'station';
 
     UPDATE osm_poi_point
     SET subclass = 'halt'
-    WHERE funicular = 'yes'
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM poi_point.osm_ids))
+      AND funicular = 'yes'
       AND subclass = 'station';
 
+    -- ATM without name 
+    -- use either operator or network
+    -- (using name for ATM is discouraged, see osm wiki)
+    UPDATE osm_poi_point
+    SET (name, tags) = (
+        COALESCE(tags -> 'operator', tags -> 'network'),
+        tags || hstore('name', COALESCE(tags -> 'operator', tags -> 'network'))
+    )
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM poi_point.osm_ids))
+      AND subclass = 'atm'
+      AND name = ''
+      AND COALESCE(tags -> 'operator', tags -> 'network') IS NOT NULL;
+
+    -- Parcel locker without name 
+    -- use either brand or operator and add ref if present
+    -- (using name for parcel lockers is discouraged, see osm wiki)
+    UPDATE osm_poi_point
+    SET (name, tags) = (
+        CONCAT(COALESCE(tags -> 'brand', tags -> 'operator'), concat(' ', tags -> 'ref')),
+        tags || hstore('name', CONCAT(COALESCE(tags -> 'brand', tags -> 'operator'), concat(' ', tags -> 'ref')))
+    )
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM poi_point.osm_ids))
+      AND subclass = 'parcel_locker'
+      AND name = ''
+      AND COALESCE(tags -> 'brand', tags -> 'operator') IS NOT NULL;
+
     UPDATE osm_poi_point
     SET tags = update_tags(tags, geometry)
-    WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
+    WHERE (full_update OR osm_id IN (SELECT osm_id FROM poi_point.osm_ids))
+      AND COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL
+      AND tags != update_tags(tags, geometry);
 
 END;
 $$ LANGUAGE plpgsql;
 
-SELECT update_osm_poi_point();
+SELECT update_osm_poi_point(TRUE);
 
+-- etldoc:  osm_poi_stop_rank ->  osm_poi_point
 CREATE OR REPLACE FUNCTION update_osm_poi_point_agg() RETURNS void AS
 $$
 BEGIN
     UPDATE osm_poi_point p
-    SET agg_stop = CASE
+    SET
-                       WHEN p.subclass IN ('bus_stop', 'bus_station', 'tram_stop', 'subway')
+        agg_stop = CASE
-                           THEN 1
+            WHEN p.subclass IN ('bus_stop', 'bus_station', 'tram_stop', 'subway')
+                THEN 1
+        END
+    WHERE
+        agg_stop IS DISTINCT FROM CASE
+            WHEN p.subclass IN ('bus_stop', 'bus_station', 'tram_stop', 'subway')
+                THEN 1
         END;
 
     UPDATE osm_poi_point p
-    SET agg_stop = (
+    SET
+        agg_stop = (
         CASE
             WHEN p.subclass IN ('bus_stop', 'bus_station', 'tram_stop', 'subway')
-                     AND r.rk IS NULL OR r.rk = 1
+                     AND (r.rk IS NULL OR r.rk = 1)
                 THEN 1
-            END)
+        END)
     FROM osm_poi_stop_rank r
-    WHERE p.osm_id = r.osm_id;
+    WHERE p.osm_id = r.osm_id AND
+        agg_stop IS DISTINCT FROM (
+        CASE
+            WHEN p.subclass IN ('bus_stop', 'bus_station', 'tram_stop', 'subway')
+                     AND (r.rk IS NULL OR r.rk = 1)
+                THEN 1
+        END);
 
 END;
 $$ LANGUAGE plpgsql;
@@ -52,7 +104,13 @@ SELECT update_osm_poi_point_agg();
 
 -- Handle updates
 
-CREATE SCHEMA IF NOT EXISTS poi_point;
+CREATE OR REPLACE FUNCTION poi_point.store() RETURNS trigger AS
+$$
+BEGIN
+    INSERT INTO poi_point.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
 
 CREATE TABLE IF NOT EXISTS poi_point.updates
 (
@@ -74,11 +132,18 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh poi_point';
-    PERFORM update_osm_poi_point();
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE poi_point.osm_ids;
+    ANALYZE osm_poi_point;
+
+    PERFORM update_osm_poi_point(FALSE);
     REFRESH MATERIALIZED VIEW osm_poi_stop_centroid;
     REFRESH MATERIALIZED VIEW osm_poi_stop_rank;
     PERFORM update_osm_poi_point_agg();
     -- noinspection SqlWithoutWhere
+    DELETE FROM poi_point.osm_ids;
+    -- noinspection SqlWithoutWhere
     DELETE FROM poi_point.updates;
 
     RAISE LOG 'Refresh poi_point done in %', age(clock_timestamp(), t);
@@ -86,8 +151,14 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
+CREATE TRIGGER trigger_store
+    AFTER INSERT OR UPDATE
+    ON osm_poi_point
+    FOR EACH ROW
+EXECUTE PROCEDURE poi_point.store();
+
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_poi_point
     FOR EACH STATEMENT
 EXECUTE PROCEDURE poi_point.flag();

layers/poi/update_poi_polygon.sql

@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS poi_polygon;
 
 CREATE TABLE IF NOT EXISTS poi_polygon.osm_ids
 (
-    osm_id bigint
+    osm_id bigint PRIMARY KEY
 );
 
 -- etldoc:  osm_poi_polygon ->  osm_poi_polygon
@@ -51,11 +51,7 @@ SELECT update_poi_polygon(true);
 CREATE OR REPLACE FUNCTION poi_polygon.store() RETURNS trigger AS
 $$
 BEGIN
-    IF (tg_op = 'DELETE') THEN
+    INSERT INTO poi_polygon.osm_ids VALUES (NEW.osm_id) ON CONFLICT (osm_id) DO NOTHING;
-        INSERT INTO poi_polygon.osm_ids VALUES (OLD.osm_id);
-    ELSE
-        INSERT INTO poi_polygon.osm_ids VALUES (NEW.osm_id);
-    END IF;
     RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
@@ -80,6 +76,11 @@ DECLARE
     t TIMESTAMP WITH TIME ZONE := clock_timestamp();
 BEGIN
     RAISE LOG 'Refresh poi_polygon';
+
+    -- Analyze tracking and source tables before performing update
+    ANALYZE poi_polygon.osm_ids;
+    ANALYZE osm_poi_polygon;
+
     PERFORM update_poi_polygon(false);
     -- noinspection SqlWithoutWhere
     DELETE FROM poi_polygon.osm_ids;
@@ -92,13 +93,13 @@ END;
 $$ LANGUAGE plpgsql;
 
 CREATE TRIGGER trigger_store
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_poi_polygon
     FOR EACH ROW
 EXECUTE PROCEDURE poi_polygon.store();
 
 CREATE TRIGGER trigger_flag
-    AFTER INSERT OR UPDATE OR DELETE
+    AFTER INSERT OR UPDATE
     ON osm_poi_polygon
     FOR EACH STATEMENT
 EXECUTE PROCEDURE poi_polygon.flag();

layers/transportation/class.sql

@@ -48,7 +48,7 @@ CREATE OR REPLACE FUNCTION surface_value(surface text) RETURNS text AS
 $$
 SELECT CASE
            WHEN surface IN ('paved', 'asphalt', 'cobblestone', 'concrete', 'concrete:lanes', 'concrete:plates', 'metal',
-                            'paving_stones', 'sett', 'unhewn_cobblestone', 'wood') THEN 'paved'
+                            'paving_stones', 'sett', 'unhewn_cobblestone', 'wood', 'grade1') THEN 'paved'
            WHEN surface IN ('unpaved', 'compacted', 'dirt', 'earth', 'fine_gravel', 'grass', 'grass_paver', 'gravel',
                             'gravel_turf', 'ground', 'ice', 'mud', 'pebblestone', 'salt', 'sand', 'snow', 'woodchips')
                THEN 'unpaved'
@@ -56,3 +56,38 @@ SELECT CASE
 $$ LANGUAGE SQL IMMUTABLE
                 STRICT
                 PARALLEL SAFE;
+
+-- Determine which transportation features are shown at zoom 12
+CREATE OR REPLACE FUNCTION transportation_filter_z12(highway text, construction text) RETURNS boolean AS
+$$
+SELECT CASE
+           WHEN highway IN ('unclassified', 'residential') THEN TRUE
+           WHEN highway_class(highway, '', construction) IN
+               (
+                'motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'raceway',
+                'motorway_construction', 'trunk_construction', 'primary_construction',
+                'secondary_construction', 'tertiary_construction', 'raceway_construction',
+                'busway', 'bus_guideway'
+               ) THEN TRUE --includes ramps
+           ELSE FALSE
+       END
+$$ LANGUAGE SQL IMMUTABLE
+                STRICT
+                PARALLEL SAFE;
+
+-- Determine which transportation features are shown at zoom 13
+-- Assumes that piers have already been excluded
+CREATE OR REPLACE FUNCTION transportation_filter_z13(highway text,
+                                                     public_transport text,
+                                                     construction text,
+                                                     service text) RETURNS boolean AS
+$$
+SELECT CASE
+           WHEN transportation_filter_z12(highway, construction) THEN TRUE
+           WHEN highway = 'service' OR construction = 'service' THEN service NOT IN ('driveway', 'parking_aisle')
+           WHEN highway_class(highway, public_transport, construction) IN ('minor', 'minor_construction') THEN TRUE
+           ELSE FALSE
+       END
+$$ LANGUAGE SQL IMMUTABLE
+                STRICT
+                PARALLEL SAFE;

layers/transportation/highway_name.sql

@@ -0,0 +1,11 @@
+CREATE OR REPLACE FUNCTION transportation_name_tags(geometry geometry, tags hstore, name text, name_en text, name_de text) RETURNS hstore AS
+$$
+SELECT hstore(string_agg(nullif(slice_language_tags(tags ||
+                     hstore(ARRAY [
+                       'name',    CASE WHEN length(name) > 15    THEN osml10n_street_abbrev_all(name)   ELSE NULLIF(name, '') END,
+                       'name:en', CASE WHEN length(name_en) > 15 THEN osml10n_street_abbrev_en(name_en) ELSE NULLIF(name_en, '') END,
+                       'name:de', CASE WHEN length(name_de) > 15 THEN osml10n_street_abbrev_de(name_de) ELSE NULLIF(name_de, '') END
+                     ]))::text,
+                     ''), ','));
+$$ LANGUAGE SQL IMMUTABLE
+                PARALLEL SAFE;

layers/transportation/mapping.yaml

@@ -31,6 +31,48 @@ generalized_tables:
     sql_filter: ST_IsValid(geometry)
     tolerance: ZRES13
 
+# etldoc: osm_shipway_linestring_gen_z5 -> osm_shipway_linestring_gen_z4
+  shipway_linestring_gen_z4:
+    source: shipway_linestring_gen_z5
+    sql_filter: ST_Length(geometry)>2*ZRES0
+    tolerance: ZRES5
+
+# etldoc: osm_shipway_linestring_gen_z6 -> osm_shipway_linestring_gen_z5
+  shipway_linestring_gen_z5:
+    source: shipway_linestring_gen_z6
+    sql_filter: ST_Length(geometry)>ZRES0
+    tolerance: ZRES6
+
+# etldoc: osm_shipway_linestring_gen_z7 -> osm_shipway_linestring_gen_z6
+  shipway_linestring_gen_z6:
+    source: shipway_linestring_gen_z7
+    sql_filter: ST_Length(geometry)>ZRES1
+    tolerance: ZRES7
+
+# etldoc: osm_shipway_linestring_gen_z8 -> osm_shipway_linestring_gen_z7
+  shipway_linestring_gen_z7:
+    source: shipway_linestring_gen_z8
+    sql_filter: ST_Length(geometry)>ZRES2
+    tolerance: ZRES8
+
+# etldoc: osm_shipway_linestring_gen_z9 -> osm_shipway_linestring_gen_z8
+  shipway_linestring_gen_z8:
+    source: shipway_linestring_gen_z9
+    sql_filter: ST_Length(geometry)>ZRES3
+    tolerance: ZRES9
+
+# etldoc: osm_shipway_linestring_gen_z10 -> osm_shipway_linestring_gen_z9
+  shipway_linestring_gen_z9:
+    source: shipway_linestring_gen_z10
+    sql_filter: ST_Length(geometry)>ZRES4
+    tolerance: ZRES10
+
+# etldoc: osm_shipway_linestring_gen_z11 -> osm_shipway_linestring_gen_z10
+  shipway_linestring_gen_z10:
+    source: shipway_linestring_gen_z11
+    sql_filter: ST_Length(geometry)>ZRES5
+    tolerance: ZRES11
+
 # etldoc: osm_shipway_linestring_gen_z12 -> osm_shipway_linestring_gen_z11
   shipway_linestring_gen_z11:
     source: shipway_linestring_gen_z12
@@ -42,22 +84,10 @@ generalized_tables:
     sql_filter: ST_IsValid(geometry)
     tolerance: ZRES13
 
-# etldoc: osm_highway_linestring_gen_z10 -> osm_highway_linestring_gen_z9
-  highway_linestring_gen_z9:
-    source: highway_linestring_gen_z10
-    sql_filter: (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link') OR highway = 'construction' AND construction IN ('motorway', 'trunk', 'primary', 'secondary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link')) AND NOT is_area
-    tolerance: ZRES10
-
-# etldoc: osm_highway_linestring_gen_z11 -> osm_highway_linestring_gen_z10
-  highway_linestring_gen_z10:
-    source: highway_linestring_gen_z11
-    sql_filter: (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link') OR highway = 'construction' AND construction IN ('motorway', 'trunk', 'primary', 'secondary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link')) AND NOT is_area
-    tolerance: ZRES11
-
 # etldoc: osm_highway_linestring -> osm_highway_linestring_gen_z11
   highway_linestring_gen_z11:
     source: highway_linestring
-    sql_filter: (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link') OR highway = 'construction' AND construction IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link')) AND NOT is_area AND ST_IsValid(geometry)
+    sql_filter: (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link', 'busway', 'bus_guideway') OR highway = 'construction' AND construction IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link', 'busway', 'bus_guideway')) AND NOT is_area AND ST_IsValid(geometry)
     tolerance: ZRES12
 
 name_field: &name
@@ -104,6 +134,14 @@ service_field: &service
   key: service
   name: service
   type: string
+access_field: &access
+  key: access
+  name: access
+  type: string
+toll_field: &toll
+  key: toll
+  name: toll
+  type: bool
 usage_field: &usage
   key: usage
   name: usage
@@ -155,10 +193,18 @@ mtb_scale_field: &mtb_scale
   key: mtb:scale
   name: mtb_scale
   type: string
+sac_scale_field: &sac_scale
+  key: sac_scale
+  name: sac_scale
+  type: string
 surface_field: &surface
   key: surface
   name: surface
   type: string
+expressway_field: &expressway
+  key: expressway
+  name: expressway
+  type: bool
 
 tables:
 # etldoc: imposm3 -> osm_highway_linestring
@@ -176,6 +222,9 @@ tables:
     - name: construction
       key: construction
       type: string
+    - name: tracktype
+      key: tracktype
+      type: string
     - *ref
     - *network
     - *z_order
@@ -195,6 +244,8 @@ tables:
     - *oneway
     - *area
     - *service
+    - *access
+    - *toll
     - *usage
     - *public_transport
     - *man_made
@@ -202,7 +253,9 @@ tables:
     - *foot
     - *horse
     - *mtb_scale
+    - *sac_scale
     - *surface
+    - *expressway
     mapping:
       highway:
       - motorway
@@ -229,11 +282,16 @@ tables:
       - service
       - track
       - raceway
+      - busway
+      - bus_guideway
       - construction
       public_transport:
       - platform
       man_made:
       - pier
+      service:
+      - driveway
+      - parking_aisle
 
 # etldoc: imposm3 -> osm_railway_linestring
   railway_linestring:
@@ -308,8 +366,14 @@ tables:
     - *usage
     mapping:
       aerialway:
-      - cable_car
+      - chair_lift
+      - drag_lift
+      - platter
+      - t-bar
       - gondola
+      - cable_car
+      - j-bar
+      - mixed_lift
 
 # etldoc: imposm3 -> osm_shipway_linestring
   shipway_linestring:
@@ -364,6 +428,7 @@ tables:
       type: bool
     - *public_transport
     - *man_made
+    - *service
     mapping:
       highway:
       - path
@@ -379,6 +444,33 @@ tables:
       - bridge
       - pier
 
+  # etldoc: imposm3 -> highway_point
+  highway_point:
+    type: point
+    columns:
+    - name: osm_id
+      type: id
+    - name: geometry
+      type: geometry
+    - name: highway
+      key: highway
+      type: string
+    - name: z_order
+      type: wayzorder
+    - *layer
+    - *level
+    - *name
+    - *name_en
+    - *name_de
+    - name: tags
+      type: hstore_tags
+    - name: ref
+      key: ref
+      type: string
+    mapping:
+      highway:
+      - motorway_junction
+
 # TODO: Future table for joining networks
 # etldoc: imposm3 -> osm_route_member
   route_member:
@@ -395,6 +487,13 @@ tables:
     - *ref
     - *network
     - *name
+    - name: osmc_symbol
+      key: osmc:symbol
+      type: string
+    - name: colour
+      key: colour
+      type: string
     mapping:
       route:
       - road
+      - hiking