motiejus/wm
1
Fork 0
Code Releases Activity

tests-integration

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-19 22:57:48 +03:00 committed by Motiejus Jakštys
parent 55b9d7db8f
commit 6d7b0445d8
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,6 +1,6 @@
SOURCE ?= lithuania-latest.osm.pbf 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='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 SLIDES = slides-2021-03-29.pdf
NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt
@ -127,8 +127,8 @@ clean-tables:
done done
-rm .faux_test -rm .faux_test
.faux_filter-rivers: .faux_import-osm Makefile .faux_filter-rivers: aggregate-rivers.sql .faux_import-osm Makefile
./db -v where="$(WHERE)" -f aggregate-rivers.sql ./db -v where="$(WHERE)" -f $<
touch $@ touch $@
.faux_import-osm: $(SOURCE) .faux_db .faux_import-osm: $(SOURCE) .faux_db

5
aggregate-rivers.sql
View File

@ -24,6 +24,9 @@ begin
end end
$$ language plpgsql; $$ 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 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_id on aggregate_rivers_tmp(osm_id);
create index aggregate_rivers_tmp_gix on aggregate_rivers_tmp using gist(way) include(name); 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; where waterway in ('river', 'stream', 'canal') and :where;
drop table if exists agg_rivers; 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; drop table aggregate_rivers_tmp;

1
wm.sql
View File

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