Add Merkys

Makefile

@@ -1,5 +1,5 @@
 OSM ?= lithuania-latest.osm.pbf
-WHERE ?= name='Visinčia' OR name='Šalčia' OR name='Nemunas'
+WHERE ?= name='Visinčia' OR name='Šalčia' OR name='Nemunas' OR name='Merkys'
 #WHERE ?= name like '%'
 SLIDES = slides-2021-03-29.pdf
 

init.sql

@@ -11,3 +11,7 @@ create table wm_debug(stage text, name text, gen bigint, nbend bigint, way geome
 -- is used for geometric assertions later in the file.
 drop table if exists wm_demo;
 create table wm_demo (name text, i bigint, way geometry);
+
+-- wm_visuals holds visual aids for the paper.
+drop table if exists wm_visuals;
+create table wm_visuals (name text, way geometry);

tests.sql

@@ -55,9 +55,6 @@ delete from wm_debug where name in (select distinct name from wm_figures);
 delete from wm_demo where name in (select distinct name from wm_figures);
 insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_figures;
 
--- wm_visuals holds visual aids for the paper.
-drop table if exists wm_visuals;
-create table wm_visuals (name text, way geometry);
 do $$
   declare fig6b1 geometry;
   declare fig6b2 geometry;
@@ -65,6 +62,8 @@ do $$
   declare sclong geometry;
   declare scshort geometry;
 begin
+  delete from wm_visuals where name like 'fig6-%' or name like 'selfcrossing-1%';
+
   select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b1 limit 1 offset 0;
   select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b2 limit 1 offset 2;
   insert into wm_visuals (name, way) values('fig6-baseline', st_makeline(st_startpoint(fig6b2), st_endpoint(fig6b2)));