From 5fa388d52aef2d1cf68d418b1ee12abe5cbbb097 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 8 Jan 2017 13:22:19 +0100 Subject: [PATCH 1/8] add metadata to ./data/tiles.mbtiles --- quickstart.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/quickstart.sh b/quickstart.sh index 1330d02..6b445d6 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -241,6 +241,12 @@ echo " : like : Mapnik LOG> ... is deprecated and will be removed in M docker-compose -f docker-compose.yml -f ./data/docker-compose-config.yml run --rm generate-vectortiles +echo " " +echo "-------------------------------------------------------------------------------------" +echo "====> : Add special metadata to mbtiles! " +docker-compose run --rm openmaptiles-tools generate-metadata ./data/tiles.mbtiles +docker-compose run --rm openmaptiles-tools chmod 666 ./data/tiles.mbtiles + echo " " echo "-------------------------------------------------------------------------------------" echo "====> : Stop PostgreSQL service ( but we keep PostgreSQL data volume for debugging )" From 524ff207b8535704c82a775953f70505966b53f2 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 8 Jan 2017 13:31:24 +0100 Subject: [PATCH 2/8] add: make start-tileserver --- Makefile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 937060b..9ca89c7 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ help: @echo " " @echo "Hints for designers:" @echo " ....TODO.... # start Maputnik " - @echo " ....TODO.... # start Tileserver-gl-light" + @echo " make start-tileserver # start klokantech/tileserver-gl [ see localhost:8080 ] " @echo " make start-mapbox-studio # start Mapbox Studio" @echo " " @echo "Hints for developers:" @@ -64,6 +64,7 @@ remove-docker-images: @docker images | grep "" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi @docker images | grep "openmaptiles" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi @docker images | grep "osm2vectortiles/mapbox-studio" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi + @docker images | grep "klokantech/tileserver-gl" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi docker-unnecessary-clean: @echo "Deleting unnecessary container(s)..." @@ -117,6 +118,26 @@ list: download-geofabrik-list: docker-compose run --rm import-osm ./download-geofabrik-list.sh +start-tileserver: + @echo " " + @echo "***********************************************************" + @echo "* " + @echo "* Download latest klokantech/tileserver-gl docker image " + @echo "* see documentation: https://github.com/klokantech/tileserver-gl" + @echo "* " + @echo "***********************************************************" + @echo " " + docker pull klokantech/tileserver-gl + @echo " " + @echo "***********************************************************" + @echo "* " + @echo "* Start klokantech/tileserver-gl " + @echo "* ----------------------------> check localhost:8080 " + @echo "* " + @echo "***********************************************************" + @echo " " + docker run -it -v $$(pwd)/data:/data -p 8080:80 klokantech/tileserver-gl + start-mapbox-studio: docker-compose up mapbox-studio From aa2b5d22c24002e3be3649075d6f2a8a08fe25c2 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 8 Jan 2017 13:32:38 +0100 Subject: [PATCH 3/8] image version -> "openmaptiles/openmaptiles-tools:0.3" --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e26f73..ba03389 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: volumes: - ./build:/sql openmaptiles-tools: - image: "openmaptiles/openmaptiles-tools:latest" + image: "openmaptiles/openmaptiles-tools:0.3" env_file: .env links: - postgres From af09175141a9d9d4130bf9840897db720033b745 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 8 Jan 2017 14:08:08 +0100 Subject: [PATCH 4/8] add `make start-tileserver` --- QUICKSTART.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/QUICKSTART.md b/QUICKSTART.md index 36abe18..a0f646a 100644 --- a/QUICKSTART.md +++ b/QUICKSTART.md @@ -272,14 +272,18 @@ This is generating `.mbtiles` for your area : [ MIN_ZOOM: "0" - MAX_ZOOM: "7" ./quickstart.sh yukon ``` -### Check other commands +### Check tileserver -`make help` +start: +* ` make start-tileserver` +and the generated maps are going to be available in webbrowser on [localhost:8080](http://localhost:8080/). + +This is only a quick preview, because your mbtiles only generated to zoom level 7 ! ### Change MIN_ZOOM and MAX_ZOOM -modify the settings in the `.env` file +modify the settings in the `.env` file, the defaults : * QUICKSTART_MIN_ZOOM=0 * QUICKSTART_MAX_ZOOM=7 @@ -292,3 +296,6 @@ Hints: * Small increments! Never starts with the MAX_ZOOM = 14 * The suggested MAX_ZOOM = 14 - use only with small extracts +### Check other commands + +`make help` From 3279c252832961fb33e936146fb4584096210241 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 9 Jan 2017 13:44:54 +0100 Subject: [PATCH 5/8] fix `make remove-docker-images` --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9ca89c7..997cace 100644 --- a/Makefile +++ b/Makefile @@ -61,10 +61,9 @@ refresh-docker-images: remove-docker-images: @echo "Deleting all openmaptiles related docker image(s)..." @docker-compose down - @docker images | grep "" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi - @docker images | grep "openmaptiles" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi - @docker images | grep "osm2vectortiles/mapbox-studio" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi - @docker images | grep "klokantech/tileserver-gl" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi + @docker images | grep "openmaptiles" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f + @docker images | grep "osm2vectortiles/mapbox-studio" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f + @docker images | grep "klokantech/tileserver-gl" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f docker-unnecessary-clean: @echo "Deleting unnecessary container(s)..." From e52fa9dd609f297c98f91260e1b878483445e059 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 9 Jan 2017 13:46:47 +0100 Subject: [PATCH 6/8] change version back to "openmaptiles/openmaptiles-tools:latest" --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ba03389..1e26f73 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: volumes: - ./build:/sql openmaptiles-tools: - image: "openmaptiles/openmaptiles-tools:0.3" + image: "openmaptiles/openmaptiles-tools:latest" env_file: .env links: - postgres From a9a17cb263ae15a1d6027adbbf70c4db458dbe0e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 10 Jan 2017 19:44:31 +0100 Subject: [PATCH 7/8] =?UTF-8?q?add:=20Clean=20up=20(=E2=80=93rm)=20to=20kl?= =?UTF-8?q?okantech/tileserver-gl=20docker=20start?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 997cace..97797bc 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ start-tileserver: @echo "* " @echo "***********************************************************" @echo " " - docker run -it -v $$(pwd)/data:/data -p 8080:80 klokantech/tileserver-gl + docker run -it --rm -v $$(pwd)/data:/data -p 8080:80 klokantech/tileserver-gl start-mapbox-studio: docker-compose up mapbox-studio From 1dfb6d76a5e69d0bbaf343bf51c76cac034a4dd4 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 11 Jan 2017 09:46:19 +0100 Subject: [PATCH 8/8] start-tileserver: text improvement --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 97797bc..05a662f 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ refresh-docker-images: remove-docker-images: @echo "Deleting all openmaptiles related docker image(s)..." @docker-compose down - @docker images | grep "openmaptiles" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f + @docker images | grep "openmaptiles" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f @docker images | grep "osm2vectortiles/mapbox-studio" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f @docker images | grep "klokantech/tileserver-gl" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f @@ -118,21 +118,21 @@ download-geofabrik-list: docker-compose run --rm import-osm ./download-geofabrik-list.sh start-tileserver: - @echo " " + @echo " " @echo "***********************************************************" - @echo "* " - @echo "* Download latest klokantech/tileserver-gl docker image " - @echo "* see documentation: https://github.com/klokantech/tileserver-gl" - @echo "* " + @echo "* " + @echo "* Download/refresh klokantech/tileserver-gl docker image" + @echo "* see documentation: https://github.com/klokantech/tileserver-gl" + @echo "* " @echo "***********************************************************" - @echo " " + @echo " " docker pull klokantech/tileserver-gl - @echo " " + @echo " " @echo "***********************************************************" - @echo "* " + @echo "* " @echo "* Start klokantech/tileserver-gl " @echo "* ----------------------------> check localhost:8080 " - @echo "* " + @echo "* " @echo "***********************************************************" @echo " " docker run -it --rm -v $$(pwd)/data:/data -p 8080:80 klokantech/tileserver-gl