wm

commit 8d4a1c1e60a67d7b88aef496e99dd8d07a1f15ce (tree)
parent 5b805bde9c87473dcc63da679834b9e8ff39ca19
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Wed, 19 May 2021 22:57:46 +0300

fix bug in final line merging

Diffstat:
M
tests.sql
 | 
2
+-
M
wm.sql
 | 
40
+++++++++++++++++++++-------------------

2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/tests.sql b/tests.sql
@@ -53,7 +53,7 @@ insert into demo_selfcrossing3 select name, generate_subscripts(ways, 1), unnest
 
 
 -- COMBINED
-insert into figures (name, way) values ('multi-island',ST_GeomFromText('MULTILINESTRING((-15 10,-10 10,-5 11,0 11,5 11,10 10,11 9,13 10,15 9),(-5 11,-1 15,0 16,1 15,5 11))'));
+insert into figures (name, way) values ('multi-island',ST_GeomFromText('MULTILINESTRING((-15 10,-10 10,-5 11,0 11,5 11,10 10,11 9,13 10,15 9),(-5 11,-2 15,0 16,2 15,5 11))'));
 drop table if exists demo_wm;
 create table demo_wm (name text, i bigint, way geometry);
 insert into demo_wm (name, way) select name, ST_SimplifyWM(way, true) from figures where name='multi-island';
diff --git a/wm.sql b/wm.sql
@@ -273,6 +273,7 @@ drop function if exists ST_SimplifyWM;
 create function ST_SimplifyWM(geom geometry, dbg boolean default false) returns geometry as $$
 declare
   dbg_stage integer;
+  i integer;
   line geometry;
   lines geometry[];
   bends geometry[];
@@ -290,26 +291,26 @@ begin
 
   if dbg then
     drop table if exists debug_wm;
-    create table debug_wm(name text, i bigint, way geometry);
+    create table debug_wm(name text, way geometry);
   end if;
 
-  dbg_stage = 1;
-  foreach line in array lines loop
+  for i in 1..array_length(lines, 1) loop
+
     mutated = true;
+    dbg_stage = 1;
     while mutated loop
       if dbg then
         insert into debug_wm (name, way) values(
-          dbg_stage || 'afigures',
-          line
+          dbg_stage || 'afigures_' || i,
+          lines[i]
         );
       end if;
 
-      bends = detect_bends(line);
+      bends = detect_bends(lines[i]);
 
       if dbg then
-        insert into debug_wm(name, i, way) values(
-          dbg_stage || 'bbends',
-          generate_subscripts(bends, 1),
+        insert into debug_wm(name, way) values(
+          dbg_stage || 'bbends_' || i || '_' || generate_subscripts(bends, 1),
           unnest(bends)
         );
       end if;
@@ -317,9 +318,8 @@ begin
       bends = fix_gentle_inflections(bends);
 
       if dbg then
-        insert into debug_wm(name, i, way) values(
-          dbg_stage || 'cinflections',
-          generate_subscripts(bends, 1),
+        insert into debug_wm(name, way) values(
+          dbg_stage || 'cinflections' || i || '_' || generate_subscripts(bends, 1),
           unnest(bends)
         );
       end if;
@@ -327,22 +327,24 @@ begin
       select * from self_crossing(bends) into bends, mutated;
 
       if dbg then
-        insert into debug_wm(name, i, way) values(
-          dbg_stage || 'dcrossings',
-          generate_subscripts(bends, 1),
+        insert into debug_wm(name, way) values(
+          dbg_stage || 'dcrossings' || i || '_' || generate_subscripts(bends, 1),
           unnest(bends)
         );
       end if;
 
-      line = st_linemerge(st_union(bends));
+      lines[i] = st_linemerge(st_union(bends));
+
+      raise notice 'lines[i]: %', st_summary(lines[i]);
+
+      dbg_stage = dbg_stage + 1;
     end loop;
-    dbg_stage = dbg_stage + 1;
   end loop;
 
   if l_type = 'ST_LineString' then
-    return st_linemerge(st_union(bends));
+    return st_linemerge(st_union(lines));
   elseif l_type = 'ST_MultiLineString' then
-    return st_union(bends);
+    return st_union(lines);
   end if;
 end
 $$ language plpgsql;