diff --git a/Makefile b/Makefile index 89c5667..ee98e83 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ import_clip: @echo "------------------------------------------------------------------" @echo "Importing clip shapefile into the database" @echo "------------------------------------------------------------------" - @docker exec -t -i $(PROJECT_ID)_imposm /usr/bin/ogr2ogr -lco GEOMETRY_NAME=geom -nlt PROMOTE_TO_MULTI -f PostgreSQL PG:"host=db user=docker password=docker dbname=gis" /home/settings/clip/clip.shp + @docker exec -t -i $(PROJECT_ID)_imposm /usr/bin/ogr2ogr -progress -skipfailures -lco GEOMETRY_NAME=geom -nlt PROMOTE_TO_MULTI -f PostgreSQL PG:"host=db user=docker password=docker dbname=gis" /home/settings/clip/clip.shp remove_clip: @echo diff --git a/settings/clip/clip.sql b/settings/clip/clip.sql index e8a5838..f15ae55 100644 --- a/settings/clip/clip.sql +++ b/settings/clip/clip.sql @@ -11,8 +11,7 @@ BEGIN EXECUTE 'DELETE FROM ' || quote_ident(osm_table.table_name) || ' WHERE osm_id IN ( SELECT DISTINCT osm_id FROM ' || quote_ident(osm_table.table_name) || ' - LEFT JOIN clip ON ST_Intersects(geometry, geom) - WHERE clip.id IS NULL) + LEFT JOIN clip ON ST_Intersects(geometry, geom)) ;'; END LOOP; END;