From b2f2299c44ec669d56c134a24e62e4dc45377631 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:47 +0300
Subject: [PATCH] fix gentle inflections: better visuals

---
 Makefile |  3 +++
 wm.sql   | 38 +++++++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 149629e..f4d2d87 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,9 @@ fig5-gentle-inflection-after.pdf: layer2img.py Makefile .faux_test
 	python ./layer2img.py \
 		--group1-table=wm_debug \
 		--group1-where="name='fig5' AND stage='cinflections' AND gen=1" \
+		--group2-cmap=1 \
+		--group2-table=wm_debug \
+		--group2-where="name='fig5' AND stage='cinflections-polygon' AND gen=1" \
 		--outfile=$@
 
 .faux_test: tests.sql wm.sql .faux_db
diff --git a/wm.sql b/wm.sql
index edbfe68..cb6706d 100644
--- a/wm.sql
+++ b/wm.sql
@@ -103,7 +103,11 @@ $$ language plpgsql;
 --
 -- The implementation could be significantly optimized to avoid `st_reverse`
 -- and array reversals, trading for complexity in fix_gentle_inflections1.
-create or replace function fix_gentle_inflections(INOUT bends geometry[]) as $$
+create or replace function fix_gentle_inflections(
+  INOUT bends geometry[],
+  dbgname text default null,
+  dbgstagenum integer default null
+) as $$
 declare
   len int4;
   bends1 geometry[];
@@ -119,6 +123,25 @@ begin
   for i in 1..len loop
     bends[i] = st_reverse(bends1[len-i+1]);
   end loop;
+
+  if dbgname is not null then
+    for i in 1..array_length(bends, 1) loop
+      insert into wm_debug(stage, name, gen, nbend, way) values(
+        'cinflections',
+        dbgname,
+        dbgstagenum,
+        i,
+        bends[i]
+      );
+      insert into wm_debug(stage, name, gen, nbend, way) values(
+        'cinflections-polygon',
+        dbgname,
+        dbgstagenum,
+        i,
+        st_makepolygon(st_addpoint(bends[i], st_startpoint(bends[i])))
+      );
+    end loop;
+  end if;
 end
 $$ language plpgsql;
 
@@ -428,18 +451,7 @@ begin
       end if;
 
       bends = detect_bends(lines[i], dbgname, stagenum);
-
-      bends = fix_gentle_inflections(bends);
-
-      if dbgname is not null then
-        insert into wm_debug(stage, name, gen, nbend, way) values(
-          'cinflections',
-          dbgname,
-          stagenum,
-          generate_subscripts(bends, 1),
-          unnest(bends)
-        );
-      end if;
+      bends = fix_gentle_inflections(bends, dbgname, stagenum);
 
       select * from self_crossing(bends) into bends, mutated;