diff --git a/Makefile b/Makefile index 8f552c3..dd8a67c 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,12 @@ forced-clean-sql: 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';" +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 + +pgclimb-list-tables: + docker-compose run --rm import-osm /usr/src/app/pgclimb.sh -c "select schemaname,tablename from pg_tables where schemaname='public' order by tablename;" csv + import-sql-dev: docker-compose run --rm import-sql /bin/bash @@ -113,9 +119,19 @@ import-osm-dev: docker-compose run --rm import-osm /bin/bash download-geofabrik: + @echo =============== download-geofabrik ======================= @echo Download area : $(area) + @echo [[ example: make download-greofabrik area=albania ]] + @echo [[ list areas: make download-geofabrik-list ]] docker-compose run --rm import-osm ./download-geofabrik.sh $(area) - ls ./data/* + ls -la ./data/$(area).* + @echo "Generated config file: ./data/docker-compose-config.yml" + @echo " " + cat ./data/docker-compose-config.yml + @echo " " + +list: + docker-compose run --rm import-osm ./download-geofabrik-list.sh download-geofabrik-list: docker-compose run --rm import-osm ./download-geofabrik-list.sh diff --git a/quickstart.sh b/quickstart.sh index 69ed956..73cf4e0 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -93,9 +93,15 @@ if [ $DOCKER_VER "<" $MIN_DOCKER_VER ]; then exit 1 fi +echo " " +echo "-------------------------------------------------------------------------------------" +echo "====> : Docker Space info: " +docker info | grep Space + echo " " echo "-------------------------------------------------------------------------------------" echo "====> : Pulling or Refreshing OpenMapTiles docker images " +#for developers is not perfect ... #make refresh-docker-images echo " " @@ -291,6 +297,7 @@ echo "Start experimenting ! And check the QUICKSTART.MD file !" echo " " echo "Hints for testing other areas" echo " make download-geofabrik-list # list actual geofabrik OSM extracts for download -> <> " +echo " make list # list actual geofabrik OSM extracts for download -> <> " echo " ./quickstart.sh <> # example: ./quickstart.sh madagascar " echo " " echo "Hints for designers:" @@ -299,7 +306,7 @@ echo " .... # start Tileserver-gl-light" echo " make start-mapbox-studio # start Mapbox Studio" echo " " echo "Hints for developers:" -echo " make download-geofabrik area=albania # download OSM data from geofabrik area=albania" +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 " @@ -308,6 +315,8 @@ echo " make clean-docker # remove docker containers, PG data 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 " .... # start lukasmartinelli/postgis-editor"