Merge branch 'master' into gh-master

# Conflicts:
#	Makefile
#	layers/landuse/landuse.sql
#	layers/poi/poi.sql
This commit is contained in:
2021-04-24 22:47:18 +02:00
20 changed files with 760 additions and 42 deletions

View File

@@ -380,7 +380,7 @@ and the generated maps are going to be available in browser on [localhost:8090/t
start:
* ` make start-tileserver`
and the generated maps are going to be available in webbrowser on [localhost:8080](http://localhost:8080/).
and the generated maps are going to be available in webbrowser on [localhost:8081](http://localhost:8081/).
This is only a quick preview, because your mbtiles only generated to zoom level 7 !
@@ -422,7 +422,7 @@ Hints for testing areas
Hints for designers:
make start-postserve # start Postserver + Maputnik Editor [ see localhost:8088 ]
make start-tileserver # start maptiler/tileserver-gl [ see localhost:8080 ]
make start-tileserver # start maptiler/tileserver-gl [ see localhost:8081 ]
Hints for developers:
make # build source code