stud

commit d8e111b093a12ae2214a472ef7d3a498475eb93f (tree)
parent 03ce9fce6db2ff31d6228a42fbaf6ee62a47589c
Author: Motiejus Jakštys <motiejus@uber.com>
Date:   Sun, 25 Apr 2021 15:49:34 +0300

bring back proper salvis

Diffstat:
M
IV/Makefile
 | 
6
+++---
M
IV/tests-rivers.sql
 | 
3
++-

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/IV/Makefile b/IV/Makefile
@@ -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_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-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-250k_1SELECT = wm_rivers where name='Šalčia' OR name='Visinčia'
+salvis-250k_1SELECT = wm_visuals where name='salvis'
 salvis-250k_WIDTHDIV = 10
 
 .faux_test-rivers: tests-rivers.sql wm.sql Makefile .faux_db
diff --git a/IV/tests-rivers.sql b/IV/tests-rivers.sql
@@ -22,6 +22,7 @@ begin
 end
 $$ language plpgsql;
 
+delete from wm_visuals where name in ('salvis');
 insert into wm_visuals(name, way) values('salvis', (
     select st_intersection(
       (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_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;