name all tables to wm_

Makefile

@@ -22,7 +22,7 @@ clean:
 
 .PHONY: clean-tables
 clean-tables:
-	for t in $$(./db -c '\dt' | awk '/\y(demo_wm|debug_wm|figures)\y/{print $$3}'); do \
+	for t in $$(./db -c '\dt' | awk '/\ywm_\w+\y/{print $$3}'); do \
 		./db -c "drop table $$t"; \
 	done
 	-rm .faux_test

tests.sql

@@ -23,45 +23,45 @@ $$ language plpgsql;
 
 -- to preview this somewhat conveniently in QGIS:
 -- stage || '_' || name || ' gen:' || coalesce(gen, 'Ø') || ' nbend:' || lpad(nbend, 2, '0')
-drop table if exists debug_wm;
+drop table if exists wm_debug;
-create table debug_wm(stage text, name text, gen bigint, nbend bigint, way geometry, props json);
+create table wm_debug(stage text, name text, gen bigint, nbend bigint, way geometry, props json);
 
-drop table if exists figures;
+drop table if exists wm_figures;
-create table figures (name text, way geometry);
+create table wm_figures (name text, way geometry);
 -- to "normalize" a new line when it's in `f`:
 --   select st_astext(st_snaptogrid(st_transscale(geometry, 80, 130, .3, .3), 1)) from f;
-insert into figures (name, way) values ('fig3',ST_GeomFromText('LINESTRING(0 0,12 0,13 4,20 2,20 0,32 0,33 10,38 16,43 15,44 10,44 0,60 0)'));
+insert into wm_figures (name, way) values ('fig3',ST_GeomFromText('LINESTRING(0 0,12 0,13 4,20 2,20 0,32 0,33 10,38 16,43 15,44 10,44 0,60 0)'));
-insert into figures (name, way) values ('fig3-1',ST_GeomFromText('LINESTRING(0 0,12 0,13 4,20 2,20 0,32 0,33 10,38 16,43 15,44 10,44 0)'));
+insert into wm_figures (name, way) values ('fig3-1',ST_GeomFromText('LINESTRING(0 0,12 0,13 4,20 2,20 0,32 0,33 10,38 16,43 15,44 10,44 0)'));
-insert into figures (name, way) values ('fig5',ST_GeomFromText('LINESTRING(0 39,19 52,27 77,26 104,41 115,49 115,65 103,65 75,53 45,63 15,91 0)'));
+insert into wm_figures (name, way) values ('fig5',ST_GeomFromText('LINESTRING(0 39,19 52,27 77,26 104,41 115,49 115,65 103,65 75,53 45,63 15,91 0)'));
-insert into figures (name, way) values ('fig6',ST_GeomFromText('LINESTRING(84 47,91 59,114 64,122 80,116 92,110 93,106 106,117 118,136 107,135 76,120 45,125 39,141 39,147 32)'));
+insert into wm_figures (name, way) values ('fig6',ST_GeomFromText('LINESTRING(84 47,91 59,114 64,122 80,116 92,110 93,106 106,117 118,136 107,135 76,120 45,125 39,141 39,147 32)'));
-insert into figures (name, way) values ('fig6-rev',ST_Reverse(ST_Translate((select way from figures where name='fig6'), 60, 0)));
+insert into wm_figures (name, way) values ('fig6-rev',ST_Reverse(ST_Translate((select way from wm_figures where name='fig6'), 60, 0)));
-insert into figures (name, way) values ('fig6-combi',
+insert into wm_figures (name, way) values ('fig6-combi',
   ST_Union(
-      ST_Translate((select way from figures where name='fig6'), 0, 90),
+      ST_Translate((select way from wm_figures where name='fig6'), 0, 90),
-      ST_Translate((select way from figures where name='fig6'), 80, 90)
+      ST_Translate((select way from wm_figures where name='fig6'), 80, 90)
   )
 );
-insert into figures (name, way) values ('inflection-1',ST_GeomFromText('LINESTRING(110 24,114 20,133 20,145 15,145 0,136 5,123 7,114 7,111 2)'));
+insert into wm_figures (name, way) values ('inflection-1',ST_GeomFromText('LINESTRING(110 24,114 20,133 20,145 15,145 0,136 5,123 7,114 7,111 2)'));
-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))'));
+insert into wm_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))'));
 
--- Run ST_SimplifyWM in debug mode, so `debug_wm` is populated. That table
+-- Run ST_SimplifyWM in debug mode, so `wm_debug` is populated. That table
 -- is used for geometric assertions later in the file.
-drop table if exists demo_wm;
+drop table if exists wm_demo;
-create table demo_wm (name text, i bigint, way geometry);
+create table wm_demo (name text, i bigint, way geometry);
-insert into demo_wm (name, way) select name, ST_SimplifyWM(way, name) from figures;
+insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_figures;
 
 do $$
 declare
   vbends geometry[];
 begin
-  select array((select way from debug_wm where name='fig3' and stage='bbends')) into vbends;
+  select array((select way from wm_debug where name='fig3' and stage='bbends')) into vbends;
   perform assert_equals(5, array_length(vbends, 1));
   perform assert_equals('LINESTRING(0 0,12 0,13 4)', st_astext(vbends[1]));
   perform assert_equals('LINESTRING(12 0,13 4,20 2,20 0)', st_astext(vbends[2]));
   perform assert_equals('LINESTRING(20 2,20 0,32 0,33 10)', st_astext(vbends[3]));
   perform assert_equals('LINESTRING(32 0,33 10,38 16,43 15,44 10,44 0)', st_astext(vbends[4]));
-  perform assert_equals(4, array_length(detect_bends((select way from figures where name='fig3-1')), 1));
+  perform assert_equals(4, array_length(detect_bends((select way from wm_figures where name='fig3-1')), 1));
-  select detect_bends((select way from figures where name='fig5')) into vbends;
+  select detect_bends((select way from wm_figures where name='fig5')) into vbends;
   perform assert_equals(3, array_length(vbends, 1));
 end $$ language plpgsql;
 
@@ -70,14 +70,14 @@ declare
   vbends geometry[];
   vinflections geometry[];
 begin
-  select array((select way from debug_wm where name='fig5' and stage='cinflections')) into vinflections;
+  select array((select way from wm_debug where name='fig5' and stage='cinflections')) into vinflections;
   perform assert_equals('LINESTRING(0 39,19 52,27 77)', st_astext(vinflections[1]));
   perform assert_equals('LINESTRING(19 52,27 77,26 104,41 115,49 115,65 103,65 75,53 45)', st_astext(vinflections[2]));
   perform assert_equals('LINESTRING(65 75,53 45,63 15,91 0)', st_astext(vinflections[3]));
 
   -- inflections-1, the example in fix_gentle_inflections docstring
-  select array((select way from debug_wm where name='inflection-1' and stage='bbends')) into vbends;
+  select array((select way from wm_debug where name='inflection-1' and stage='bbends')) into vbends;
-  select array((select way from debug_wm where name='inflection-1' and stage='cinflections')) into vinflections;
+  select array((select way from wm_debug where name='inflection-1' and stage='cinflections')) into vinflections;
   perform assert_equals(vbends[1], vinflections[1]); -- unchanged
   perform assert_equals('LINESTRING(114 20,133 20,145 15,145 0,136 5,123 7,114 7)', st_astext(vinflections[2]));
   perform assert_equals('LINESTRING(123 7,114 7,111 2)', st_astext(vinflections[3]));
@@ -88,7 +88,7 @@ declare
   vcrossings geometry[];
   mutated boolean;
 begin
-  select (self_crossing(array((select way from debug_wm where stage='cinflections' and name='fig6')))).* into vcrossings, mutated;
+  select (self_crossing(array((select way from wm_debug where stage='cinflections' and name='fig6')))).* into vcrossings, mutated;
   perform assert_equals(true, mutated);
   perform assert_equals(
     'LINESTRING(84 47,91 59,114 64,120 45,125 39,141 39,147 32)',
@@ -97,7 +97,7 @@ begin
     ) from (select unnest(vcrossings) way) a)
   );
 
-  select (self_crossing(array((select way from debug_wm where stage='cinflections' and name='fig6-rev')))).* into vcrossings, mutated;
+  select (self_crossing(array((select way from wm_debug where stage='cinflections' and name='fig6-rev')))).* into vcrossings, mutated;
   perform assert_equals(true, mutated);
   perform assert_equals(
     'LINESTRING(84 47,91 59,114 64,120 45,125 39,141 39,147 32)',
@@ -106,7 +106,7 @@ begin
     ) from (select unnest(vcrossings) way) a)
   );
 
-  select (self_crossing(array((select way from debug_wm where stage='cinflections' and name='fig6-combi' and gen=1)))).* into vcrossings, mutated;
+  select (self_crossing(array((select way from wm_debug where stage='cinflections' and name='fig6-combi' and gen=1)))).* into vcrossings, mutated;
   perform assert_equals(true, mutated);
   perform assert_equals(
     'MULTILINESTRING((84 137,91 149,114 154,120 135,125 129,141 129,147 122),(164 137,171 149,194 154,200 135,205 129,221 129,227 122))',

wm.sql

@@ -306,7 +306,7 @@ begin
     end if;
 
     if dbgname is not null then
-      insert into debug_wm (stage, name, nbend, way, props) values(
+      insert into wm_debug (stage, name, nbend, way, props) values(
         'ebendattrs',
         dbgname,
         i,
@@ -355,7 +355,7 @@ begin
     stagenum = 1;
     while mutated loop
       if dbgname is not null then
-        insert into debug_wm (stage, name, gen, nbend, way) values(
+        insert into wm_debug (stage, name, gen, nbend, way) values(
           'afigures',
           dbgname,
           stagenum,
@@ -367,7 +367,7 @@ begin
       bends = detect_bends(lines[i]);
 
       if dbgname is not null then
-        insert into debug_wm(stage, name, gen, nbend, way) values(
+        insert into wm_debug(stage, name, gen, nbend, way) values(
           'bbends',
           dbgname,
           stagenum,
@@ -379,7 +379,7 @@ begin
       bends = fix_gentle_inflections(bends);
 
       if dbgname is not null then
-        insert into debug_wm(stage, name, gen, nbend, way) values(
+        insert into wm_debug(stage, name, gen, nbend, way) values(
           'cinflections',
           dbgname,
           stagenum,
@@ -391,7 +391,7 @@ begin
       select * from self_crossing(bends) into bends, mutated;
 
       if dbgname is not null then
-        insert into debug_wm(stage, name, gen, nbend, way) values(
+        insert into wm_debug(stage, name, gen, nbend, way) values(
           'dcrossings',
           dbgname,
           stagenum,