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

.env

@@ -6,6 +6,7 @@ POSTGRES_PORT=5432
 QUICKSTART_MIN_ZOOM=0
 QUICKSTART_MAX_ZOOM=14
 DIFF_MODE=false
+TOOLS_VERSION=3.1.0
 
 BBOX=-180.0,-85.0511,180.0,85.0511
 MIN_ZOOM=0

.travis.yml

@@ -6,4 +6,6 @@ services:
   - docker
 
 script:
+  - set -e
+  - TEST_MODE=yes make generate-devdoc
   - ./quickstart.sh

Makefile

@@ -4,8 +4,13 @@ DC_OPTS?=--rm
 # container runs as the current user rather than root (so that created files are not root-owned)
 DC_USER_OPTS?=$(DC_OPTS) -u $$(id -u $${USER}):$$(id -g $${USER})
 
-TOOLS_VERSION?=$(shell cat TOOLS_VERSION)
-export TOOLS_VERSION
+# If running in the test mode, compare files rather than copy them
+TEST_MODE?=no
+ifeq ($(TEST_MODE),yes)
+  COPY_TO_GIT=diff
+else
+  COPY_TO_GIT=cp
+endif
 
 .PHONY: all
 all: build/openmaptiles.tm2source/data.yml build/mapping.yaml build/tileset.sql
@@ -54,13 +59,13 @@ build:
 
 build/openmaptiles.tm2source/data.yml: build
 	mkdir -p build/openmaptiles.tm2source
-	docker-compose run $(DC_OPTS) openmaptiles-tools generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > build/openmaptiles.tm2source/data.yml
+	docker-compose run $(DC_OPTS) openmaptiles-tools generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > $@
 
 build/mapping.yaml: build
-	docker-compose run $(DC_OPTS) openmaptiles-tools generate-imposm3 openmaptiles.yaml > build/mapping.yaml
+	docker-compose run $(DC_OPTS) openmaptiles-tools generate-imposm3 openmaptiles.yaml > $@
 
 build/tileset.sql: build
-	docker-compose run $(DC_OPTS) openmaptiles-tools generate-sql openmaptiles.yaml > build/tileset.sql
+	docker-compose run $(DC_OPTS) openmaptiles-tools generate-sql openmaptiles.yaml > $@
 
 .PHONY: clean
 clean:
@@ -182,8 +187,8 @@ etl-graph:
 
 # generate etl graph for a certain layer, e.g. etl-graph-building, etl-graph-place
 etl-graph-%: layers/% build/devdoc
-	docker run $(DC_USER_OPTS) -v $$(pwd):/tileset openmaptiles/openmaptiles-tools:${TOOLS_VERSION} generate-etlgraph layers/$*/$*.yaml ./build/devdoc
-	cp ./build/devdoc/etl_$*.png layers/$*/etl_diagram.png
+	docker-compose run $(DC_USER_OPTS) openmaptiles-tools generate-etlgraph layers/$*/$*.yaml ./build/devdoc
+	@$(COPY_TO_GIT) ./build/devdoc/etl_$*.png layers/$*/etl_diagram.png
 
 
 mappingLayers = $(notdir $(patsubst %/mapping.yaml,%, $(wildcard layers/*/mapping.yaml))) # layers with mapping.yaml
@@ -197,8 +202,8 @@ mapping-graph:
 	@echo 'Valid layers: $(mappingLayers)'
 
 mapping-graph-%: ./layers/%/mapping.yaml build/devdoc
-	docker run $(DC_USER_OPTS) -v $$(pwd):/tileset openmaptiles/openmaptiles-tools:${TOOLS_VERSION} generate-mapping-graph layers/$*/$*.yaml ./build/devdoc/mapping-diagram-$*
-	cp ./build/devdoc/mapping-diagram-$*.png layers/$*/mapping_diagram.png
+	docker-compose run $(DC_USER_OPTS) openmaptiles-tools generate-mapping-graph layers/$*/$*.yaml ./build/devdoc/mapping-diagram-$*
+	@$(COPY_TO_GIT) ./build/devdoc/mapping-diagram-$*.png layers/$*/mapping_diagram.png
 
 # generate all etl and mapping graphs
 generate-devdoc: $(addprefix etl-graph-,$(layers)) $(addprefix mapping-graph-,$(mappingLayers))

README.md

@@ -205,7 +205,9 @@ docker-compose run import-osm
 Each time you modify layer SQL code run `make` and `make import-sql`.
 
 ```
-make clean && make && make import-sql
+make clean
+make
+make import-sql
 ```
 
 Now you are ready to **generate the vector tiles**. Using environment variables

layers/boundary/boundary.sql

@@ -12,8 +12,8 @@ CREATE OR REPLACE VIEW boundary_z0 AS (
     SELECT geometry,
         2 AS admin_level,
         (CASE WHEN featurecla LIKE 'Disputed%' THEN true ELSE false END) AS disputed,
-        NULL AS disputed_name,
-        NULL AS claimed_by,
+        NULL::text AS disputed_name,
+        NULL::text AS claimed_by,
         false AS maritime
     FROM ne_110m_admin_0_boundary_lines_land
 );

layers/water/water.sql

@@ -81,13 +81,13 @@ CREATE OR REPLACE VIEW water_z4 AS (
         NULL::boolean AS is_tunnel
     FROM ne_50m_ocean
     UNION ALL
-    -- etldoc:  ne_50m_lakes ->  water_z4
+    -- etldoc:  ne_10m_lakes ->  water_z4
     SELECT geometry,
         'lake'::text AS class,
         NULL::boolean AS is_intermittent,
         NULL::boolean AS is_bridge,
         NULL::boolean AS is_tunnel
-    FROM ne_50m_lakes
+    FROM ne_10m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z5 AS (

openmaptiles.yaml

@@ -17,7 +17,7 @@ tileset:
     - layers/poi/poi.yaml
     - layers/aerodrome_label/aerodrome_label.yaml
   name: OpenMapTiles
-  version: 3.10.0
+  version: 3.11.0
   id: openmaptiles
   description: "A tileset showcasing all layers in OpenMapTiles. https://openmaptiles.org"
   attribution: '<a href="https://www.openmaptiles.org/" target="_blank">&copy; OpenMapTiles</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>'

qa/layer_freq.sh

@@ -13,8 +13,7 @@ do
 echo " "
 echo "## $layerid z$z  - freq"
 
-: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}"
-SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery  layers/${layerid}/${layerid}.yaml $z )
+SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery  layers/${layerid}/${layerid}.yaml $z )
 
 SQLCODE=$(cat <<-END
 select $classvars , count(*) as _count_ from

qa/layer_numvar_analyze.sh

@@ -13,8 +13,7 @@ do
 echo " "
 echo "## $layerid z$z - $var "
 
-: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}"
-SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery  layers/${layerid}/${layerid}.yaml $z )
+SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery  layers/${layerid}/${layerid}.yaml $z )
 
 SQLCODE=$(cat <<-END
 SELECT

qa/layer_toplength.sh

@@ -11,8 +11,7 @@ do
 echo " "
 echo "## $layerid z$z   max length ($classvar)"
 
-: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}"
-SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery  layers/${layerid}/${layerid}.yaml $z )
+SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery  layers/${layerid}/${layerid}.yaml $z )
 
 SQLCODE=$(cat <<-END
 SELECT DISTINCT $classvar , length( $classvar ) AS _length_ from

quickstart.sh

@@ -35,8 +35,6 @@ MIN_DOCKER_VER=1.12.3
 STARTTIME=$(date +%s)
 STARTDATE=$(date +"%Y-%m-%dT%H:%M%z")
 githash=$( git rev-parse HEAD )
-: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/TOOLS_VERSION")}"
-export TOOLS_VERSION
 
 # Options to run with docker and docker-compose - ensure the container is destroyed on exit,
 # as well as pass any other common parameters.
@@ -251,7 +249,10 @@ echo " "
 echo "-------------------------------------------------------------------------------------"
 echo "====> : Start SQL postprocessing:  ./build/tileset.sql -> PostgreSQL "
 echo "      : Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-sql "
-docker-compose run $DC_OPTS openmaptiles-tools import-sql
+# If the output contains a WARNING, stop further processing
+# Adapted from https://unix.stackexchange.com/questions/307562
+docker-compose run $DC_OPTS openmaptiles-tools import-sql | \
+    awk -v s=": WARNING:" '$0~s{print; print "\n*** WARNING detected, aborting"; exit(1)} 1'
 
 echo " "
 echo "-------------------------------------------------------------------------------------"