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

fixes , improvements

Browse Source
This commit is contained in:
ImreSamu
2016-11-30 05:39:06 +01:00
parent 0d826d6cc4
commit 631f7b7856
4 changed files with 68 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Makefile
View File

@@ -1,5 +1,37 @@
all: build/openmaptiles.tm2source/data.yml build/mapping.yaml build/tileset.sql
help:
@echo "=============================================================================="
@echo " OpenMapTiles https://github.com/openmaptiles/openmaptiles "
@echo "Hints for testing areas "
@echo " make download-geofabrik-list # list actual geofabrik OSM extracts for download -> <<your-area>> "
@echo " make list # list actual geofabrik OSM extracts for download -> <<your-area>> "
@echo " ./quickstart.sh <<your-area>> # example: ./quickstart.sh madagascar "
@echo " "
@echo "Hints for designers:"
@echo " ....TODO.... # start Maputnik "
@echo " ....TODO.... # start Tileserver-gl-light"
@echo " make start-mapbox-studio # start Mapbox Studio"
@echo " "
@echo "Hints for developers:"
@echo " make # build source code "
@echo " make download-geofabrik area=albania # download OSM data from geofabrik, and create config file"
@echo " make psql # start PostgreSQL console "
@echo " make psql-list-tables # list all PostgreSQL tables "
@echo " make import-sql-dev # start import-sql /bin/bash terminal "
@echo " make import-osm-dev # start import-osm /bin/bash terminal (imposm3)"
@echo " make clean-docker # remove docker containers, PG data volume "
@echo " make forced-clean-sql # drop all PostgreSQL tables for clean environment "
@echo " make refresh-docker-images # refresh openmaptiles docker images from Docker HUB"
@echo " make remove-docker-images # remove openmaptiles docker images"
@echo " make pgclimb-list-views # list PostgreSQL public schema views"
@echo " make pgclimb-list-tables # list PostgreSQL public schema tabless"
@echo " cat .env # list PG database and MIN_ZOOM and MAX_ZOOM informations"
@echo " cat ./quickstart.log # backup of the last ./quickstart.sh "
@echo " ....TODO.... # start lukasmartinelli/postgis-editor"
@echo " make help # help about avaialable commands"
@echo "=============================================================================="
build/openmaptiles.tm2source/data.yml:
mkdir -p build/openmaptiles.tm2source && generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > build/openmaptiles.tm2source/data.yml
@@ -21,25 +53,10 @@ list-docker-images:
docker images | grep openmaptiles
refresh-docker-images:
docker pull openmaptiles/generate-vectortiles
docker pull openmaptiles/import-lakelines
docker pull openmaptiles/import-natural-earth
docker pull openmaptiles/import-osm
docker pull openmaptiles/import-sql
docker pull openmaptiles/import-water
docker pull openmaptiles/openmaptiles-tools
docker pull openmaptiles/postgis
docker pull osm2vectortiles/mapbox-studio
docker-compose pull
remove-docker-images:
docker rmi openmaptiles/generate-vectortiles
docker rmi openmaptiles/import-lakelines
docker rmi openmaptiles/import-natural-earth
docker rmi openmaptiles/import-osm
docker rmi openmaptiles/import-sql
docker rmi openmaptiles/import-water
docker rmi openmaptiles/openmaptiles-tools
docker rmi openmaptiles/postgis
docker rmi -f $(docker images | grep "openmaptiles" | awk "{print \$3}")
docker rmi osm2vectortiles/mapbox-studio
psql:
@@ -52,14 +69,9 @@ psql-pg-stat-reset:
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c 'SELECT pg_stat_statements_reset();'
forced-clean-sql:
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "DROP SCHEMA IF EXISTS public CASCADE"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "CREATE SCHEMA IF NOT EXISTS public"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "CREATE EXTENSION hstore"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "CREATE EXTENSION postgis"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "CREATE EXTENSION pg_stat_statements"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "GRANT ALL ON SCHEMA public TO postgres;"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "GRANT ALL ON SCHEMA public TO public;"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "COMMENT ON SCHEMA public IS 'standard public schema';"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "DROP SCHEMA IF EXISTS public CASCADE ; CREATE SCHEMA IF NOT EXISTS public; "
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "CREATE EXTENSION hstore; CREATE EXTENSION postgis; CREATE EXTENSION pg_stat_statements;"
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "GRANT ALL ON SCHEMA public TO public;COMMENT ON SCHEMA public IS 'standard public schema';"
pgclimb-list-views:
docker-compose run --rm import-osm /usr/src/app/pgclimb.sh -c "select schemaname,viewname from pg_views where schemaname='public' order by viewname;" csv
@@ -85,15 +97,18 @@ download-geofabrik:
cat ./data/docker-compose-config.yml
@echo " "
# the `download-geofabrik` error message mention `list`, if the area parameter is wrong. so I created a similar make command
list:
docker-compose run --rm import-osm ./download-geofabrik-list.sh
# same as a `make list`
download-geofabrik-list:
docker-compose run --rm import-osm ./download-geofabrik-list.sh
start-mapbox-studio:
docker-compose up mapbox-studio
# work in progress - please don't remove
test_etlgraph:
generate-etlgraph layers/boundary/boundary.yaml
generate-etlgraph layers/highway/highway.yaml