diff --git a/Makefile b/Makefile index ee98e83..33320d8 100644 --- a/Makefile +++ b/Makefile @@ -112,12 +112,41 @@ timestamp: @echo "------------------------------------------------------------------" @docker exec -t -i $(PROJECT_ID)_imposm cat /home/settings/timestamp.txt +### +# SQL FILES +### + + +import_sql: import_sql + @echo + @echo "------------------------------------------------------------------" + @echo "Importing SQL files" + @echo "------------------------------------------------------------------" + @docker exec -i $(PROJECT_ID)_db su - postgres -c "psql -f /home/settings/clip/clip.sql gis" + +validate_geom: validate_geom + @echo + @echo "------------------------------------------------------------------" + @echo "Validating geom for all tables" + @echo "------------------------------------------------------------------" + @docker exec -t -i $(PROJECT_ID)_db /bin/su - postgres -c "psql gis -c 'Select validate_geom();'" + + +clip_tables: clip_tables + @echo + @echo "------------------------------------------------------------------" + @echo "Clip tables using the clip layer" + @echo "------------------------------------------------------------------" + @docker exec -t -i $(PROJECT_ID)_db /bin/su - postgres -c "psql gis -c 'Select clean_tables();'" + + + ### # STYLES ### -import_styles: remove_styles +import_styles: import_styles @echo @echo "------------------------------------------------------------------" @echo "Importing QGIS styles" diff --git a/docker-compose.yml b/docker-compose.yml index 2d434e9..5cbcef9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,8 @@ services: # Uncomment to expose the postgis database on the network # - ALLOW_IP_RANGE= 0.0.0.0/0 volumes: - - 'osm-postgis-data:/var/lib/postgresql' + - osm-postgis-data:/var/lib/postgresql + - ./settings:/home/settings # Uncomment to use the postgis database from outside the docker network # ports: # - "35432:5432" @@ -68,8 +69,8 @@ services: - DBSCHEMA_BACKUP=backup # Install some styles if you are using the default mapping. It can be 'yes' or 'no' - QGIS_STYLE=yes - # Use clip in the database - - CLIP=no + # Use clip in the database - To use this you should have run make import_clip to add your clip to the DB + - CLIP=yes osmupdate: build: docker-osmupdate diff --git a/readme.md b/readme.md index a6a61cb..04e43de 100644 --- a/readme.md +++ b/readme.md @@ -106,7 +106,8 @@ make backup_styles ### SQL Trigger -You can add PostGIS functions, triggers, materialized views in the SQL file. +You can add PostGIS functions, triggers, materialized views in the clip SQL file. You need to run +`make import_sql` to run the clip SQL file ### Build and run