From 255a4250b94068e190d9c4dbab2b0c643b4ad019 Mon Sep 17 00:00:00 2001 From: stirringhalo Date: Wed, 10 May 2017 18:35:01 -0400 Subject: [PATCH] Add support for PBF tiles generated directly from postgres (#240) * Add postserve * Set postserve version --- QUICKSTART.md | 8 +++++++- docker-compose.yml | 12 +++++++++++- quickstart.sh | 5 +++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/QUICKSTART.md b/QUICKSTART.md index 1796195..1213679 100644 --- a/QUICKSTART.md +++ b/QUICKSTART.md @@ -19,10 +19,12 @@ * https://docs.docker.com/compose/install/ * disk space ( >= ~15Gb ) * for small extracts >= ~15Gb - * for big extracts ( continents, planet) > 20 ... 1000 Gb + * for big extracts ( continents, planet) 250 Gb * And depends on * OpenStreetMap data size * Zoom level + * Best on SSD for postserve but completely usable on HDD + * Takes 24hrs to import on a reasonable machine, and is immediately available with postserve * memory ( >= 3Gb ) * for small extracts 3Gb-8Gb RAM * for big extracts ( Europe, Planet) > 8-32 Gb @@ -369,6 +371,10 @@ mv my.osm.pbf data/ ./quickstart.sh my ``` +### Check postserve +* ` docker-compose up -d postserve` +and the generated maps are going to be available in browser on [localhost:8090/0/0/0.pbf](http://localhost:8090/0/0/0.pbf). + ### Check tileserver start: diff --git a/docker-compose.yml b/docker-compose.yml index fb168c6..933cb36 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ volumes: cache: services: postgres: - image: "openmaptiles/postgis:2.3" + image: "openmaptiles/postgis:2.5" volumes: - pgdata:/var/lib/postgresql/data networks: @@ -113,6 +113,16 @@ services: BBOX: ${BBOX} MIN_ZOOM: ${MIN_ZOOM} MAX_ZOOM: ${MAX_ZOOM} + postserve: + image: "openmaptiles/postserve:0.1" + env_file: .env + networks: + - postgres_conn + ports: + - "8090:8080" + volumes: + - ./build/openmaptiles.tm2source:/mapping + networks: postgres_conn: diff --git a/quickstart.sh b/quickstart.sh index a873e25..1216788 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -242,6 +242,11 @@ echo "-------------------------------------------------------------------------- echo "====> : Analyze PostgreSQL tables" make psql-analyze +echo " " +echo "-------------------------------------------------------------------------------------" +echo "====> : Bring up postserve at localhost:8090/tiles/{z}/{x}/{y}.pbf" +docker-compose up -d postserve + echo " " echo "-------------------------------------------------------------------------------------" echo "====> : Start generating MBTiles (containing gzipped MVT PBF) from a TM2Source project. "