tests-integration

IV/Makefile

@@ -1,6 +1,6 @@
 SOURCE ?= lithuania-latest.osm.pbf
+#WHERE ?= name like '%%'
 WHERE ?= name='Visinčia' OR name='Šalčia' OR name='Nemunas' OR name='Žeimena' OR name='Lakaja'
-#WHERE ?= name='Žeimena' OR name='Lakaja'
 SLIDES = slides-2021-03-29.pdf
 
 NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt
@@ -127,8 +127,8 @@ clean-tables:
 	done
 	-rm .faux_test
 
-.faux_filter-rivers: .faux_import-osm Makefile
-	./db -v where="$(WHERE)" -f aggregate-rivers.sql
+.faux_filter-rivers: aggregate-rivers.sql .faux_import-osm Makefile
+	./db -v where="$(WHERE)" -f $<
 	touch $@
 
 .faux_import-osm: $(SOURCE) .faux_db

IV/aggregate-rivers.sql

@@ -24,6 +24,9 @@ begin
 end
 $$ language plpgsql;
 
+drop index if exists aggregate_rivers_tmp_id;
+drop index if exists aggregate_rivers_tmp_gix;
+drop table if exists aggregate_rivers_tmp;
 create temporary table aggregate_rivers_tmp (osm_id bigint, name text, way geometry);
 create index aggregate_rivers_tmp_id on aggregate_rivers_tmp(osm_id);
 create index aggregate_rivers_tmp_gix on aggregate_rivers_tmp using gist(way) include(name);
@@ -33,5 +36,5 @@ insert into aggregate_rivers_tmp
     where waterway in ('river', 'stream', 'canal') and :where;
 
 drop table if exists agg_rivers;
-create table agg_rivers as (select * from aggregate_rivers());
+create table agg_rivers as (select * from aggregate_rivers() where st_length(way) > 20000);
 drop table aggregate_rivers_tmp;

IV/wm.sql

@@ -88,7 +88,6 @@ begin
       if st_npoints(bends[i]) >= 3 then
           dbgpolygon = st_makepolygon(st_addpoint(bends[i], st_startpoint(bends[i])));
       end if;
-
       insert into wm_debug(stage, name, gen, nbend, way) values(
         'bbends-polygon',
         dbgname,