cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #126 from openmaptiles/tileserver_integration

Browse Source 
tileserver-gl integration
This commit is contained in:
Lukas Martinelli
2017-01-17 18:01:55 +01:00
committed by GitHub
parent 16f9c56086 1dfb6d76a5
commit 312702ee37
3 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@@ -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:"
@@ -61,9 +61,9 @@ refresh-docker-images:
remove-docker-images:
@echo "Deleting all openmaptiles related docker image(s)..."
@docker-compose down
@docker images | grep "<none>" | 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 "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)..."
@@ -117,6 +117,26 @@ list:
download-geofabrik-list:
docker-compose run --rm import-osm ./download-geofabrik-list.sh
start-tileserver:
@echo " "
@echo "***********************************************************"
@echo "* "
@echo "* Download/refresh 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 --rm -v $$(pwd)/data:/data -p 8080:80 klokantech/tileserver-gl
start-mapbox-studio:
docker-compose up mapbox-studio

13
QUICKSTART.md
View File

@@ -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`

6
quickstart.sh
View File

@@ -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 )"