From 05d7cc0a77ed1fc31acdc6131820e2b1c17e0d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 19 May 2021 22:57:48 +0300
Subject: [PATCH] selfcrossing-1 too

---
 Makefile              |  5 ++++-
 mj-msc.tex            |  8 ++++----
 tests-integration.sql |  2 +-
 tests.sql             | 16 ++++++++--------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 89e4ea0..e24f672 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,8 @@ FIGURES = test-figures \
 					inflection-1-gentle-inflection-after \
 					fig6-selfcrossing-before \
 					fig6-selfcrossing-after \
-					selfcrossing-1-before
+					selfcrossing-1-before \
+					selfcrossing-1-after
 
 #################################
 # The thesis, publishable version
@@ -106,6 +107,8 @@ selfcrossing-1-before_1SELECT = wm_debug where name='selfcrossing-1' AND stage='
 selfcrossing-1-before_2SELECT = wm_visuals where name='selfcrossing-1-baseline'
 selfcrossing-1-before_2LINESTYLE = dotted
 selfcrossing-1-before_3SELECT = wm_visuals where name='selfcrossing-1-newline'
+selfcrossing-1-after_WIDTHDIV = 4
+selfcrossing-1-after_1SELECT = wm_debug where name='selfcrossing-1' AND stage='dcrossings' AND gen=1
 
 .faux_test-integration: tests-integration.sql wm.sql .faux_aggregate-rivers
 	./db -f $<
diff --git a/mj-msc.tex b/mj-msc.tex
index 6e9a452..132649d 100644
--- a/mj-msc.tex
+++ b/mj-msc.tex
@@ -441,10 +441,10 @@ figure~\onpage{fig:selfcrossing-1-non-neighbor}.
         \caption{Bend's baseline is crossing a non-neighboring bend}
     \end{subfigure}
     \hfill
-    %\begin{subfigure}[b]{.4\textwidth}
-    %    \includegraphics[width=\textwidth]{selfcrossing-1-after}
-    %    \caption{Self-crossing removed}
-    %\end{subfigure}
+    \begin{subfigure}[b]{.4\textwidth}
+        \includegraphics[width=\textwidth]{selfcrossing-1-after}
+        \caption{Self-crossing removed}
+    \end{subfigure}
     \caption{Self-crossing with non-neighboring bend}
     \label{fig:selfcrossing-1-non-neighbor}
 \end{figure}
diff --git a/tests-integration.sql b/tests-integration.sql
index bcc6a5e..28d3dd9 100644
--- a/tests-integration.sql
+++ b/tests-integration.sql
@@ -10,6 +10,6 @@ begin
   raise notice 'Expected duration: %s (+-%s)', ceil(secs), floor(secs*.5);
 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;
diff --git a/tests.sql b/tests.sql
index 8b8eece..f6460b1 100644
--- a/tests.sql
+++ b/tests.sql
@@ -51,8 +51,8 @@ insert into wm_figures (name, way) values ('multi-island',ST_GeomFromText('MULTI
 insert into wm_figures (name, way) values ('selfcrossing-1',ST_GeomFromText('LINESTRING(-27 180,-20 166,-21 142,-18 136,55 136,55 136,71 145,44 165,37 146,22 145,14 164,11 164,3 146,-12 146,-13 176,-18 184)'));
 insert into wm_figures (name, way) values ('selfcrossing-1-rev',ST_Reverse(ST_Translate((select way from wm_figures where name='selfcrossing-1'), 0, 60)));
 
-delete from wm_debug where name in (select name from wm_figures);
-
+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.
@@ -62,18 +62,18 @@ do $$
   declare fig6b1 geometry;
   declare fig6b2 geometry;
 
-  declare scb1 geometry;
-  declare scb2 geometry;
+  declare sclong geometry;
+  declare scshort geometry;
 begin
   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)));
   insert into wm_visuals (name, way) values('fig6-newline', st_makeline(st_endpoint(fig6b1), st_endpoint(fig6b2)));
 
-  select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into scb1 limit 1 offset 0;
-  select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into scb2 limit 1 offset 2;
-  insert into wm_visuals (name, way) values('selfcrossing-1-baseline', st_makeline(st_startpoint(scb2), st_endpoint(scb2)));
-  insert into wm_visuals (name, way) values('selfcrossing-1-newline', st_makeline(st_endpoint(scb1), st_endpoint(scb2)));
+  select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into sclong limit 1 offset 1;
+  select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into scshort limit 1 offset 4;
+  insert into wm_visuals (name, way) values('selfcrossing-1-baseline', st_makeline(st_startpoint(sclong), st_endpoint(sclong)));
+  insert into wm_visuals (name, way) values('selfcrossing-1-newline', st_makeline(st_startpoint(sclong), st_endpoint(scshort)));
 end $$ language plpgsql;