bring back proper salvis

This commit is contained in:
Motiejus Jakštys 2021-05-19 22:57:48 +03:00 committed by Motiejus Jakštys
parent e528ef7dfb
commit 85c22af8f5
2 changed files with 5 additions and 4 deletions

View File

@ -117,13 +117,13 @@ selfcrossing-1-after_1SELECT = wm_debug where name='selfcrossing-1' AND stage='d
selfcrossing-1-after_2SELECT = wm_debug where name='selfcrossing-1' AND stage='bbends' AND gen=1 selfcrossing-1-after_2SELECT = wm_debug where name='selfcrossing-1' AND stage='bbends' AND gen=1
selfcrossing-1-after_2LINESTYLE = invisible selfcrossing-1-after_2LINESTYLE = invisible
salvis-25k_1SELECT = wm_rivers where name='Šalčia' OR name='Visinčia' salvis-25k_1SELECT = wm_visuals where name='salvis'
salvis-25k_WIDTHDIV = 1 salvis-25k_WIDTHDIV = 1
salvis-50k_1SELECT = wm_rivers where name='Šalčia' OR name='Visinčia' salvis-50k_1SELECT = wm_visuals where name='salvis'
salvis-50k_WIDTHDIV = 2 salvis-50k_WIDTHDIV = 2
salvis-250k_1SELECT = wm_rivers where name='Šalčia' OR name='Visinčia' salvis-250k_1SELECT = wm_visuals where name='salvis'
salvis-250k_WIDTHDIV = 10 salvis-250k_WIDTHDIV = 10
.faux_test-rivers: tests-rivers.sql wm.sql Makefile .faux_db .faux_test-rivers: tests-rivers.sql wm.sql Makefile .faux_db

View File

@ -22,6 +22,7 @@ begin
end end
$$ language plpgsql; $$ language plpgsql;
delete from wm_visuals where name in ('salvis');
insert into wm_visuals(name, way) values('salvis', ( insert into wm_visuals(name, way) values('salvis', (
select st_intersection( select st_intersection(
(select st_union(way) from wm_rivers where name in ('Šalčia', 'Visinčia')), (select st_union(way) from wm_rivers where name in ('Šalčia', 'Visinčia')),
@ -47,4 +48,4 @@ end $$ language plpgsql;
delete from wm_debug where name in (select distinct name from wm_rivers); delete from wm_debug where name in (select distinct name from wm_rivers);
delete from wm_demo where name in (select distinct name from wm_rivers); delete from wm_demo where name in (select distinct name from wm_rivers);
insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_rivers; --insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_rivers;