From ff28d6b14dd68380e4375dd286e85d64c11541d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 19 May 2021 22:57:47 +0300 Subject: [PATCH] remove debug statements, back to normal punt it --- tests.sql | 160 +++++++++++++++++++++++++++--------------------------- wm.sql | 11 ++-- 2 files changed, 86 insertions(+), 85 deletions(-) diff --git a/tests.sql b/tests.sql index c16ad90..8f54249 100644 --- a/tests.sql +++ b/tests.sql @@ -51,9 +51,9 @@ insert into wm_figures (name, way) values ('fig6-combi', insert into wm_figures (name, way) values('fig8', ST_GeomFromText('LINESTRING(173 12,174 10,180 8,186 8,186 13,191 11,189 6,201 5,203 11,216 16,216 6,222 7,229 3,236 2,239 6,243 8,248 6)')); insert into wm_figures (name, way) values ('inflection-1',ST_GeomFromText('LINESTRING(110 24,114 20,133 20,145 15,145 0,136 8,123 10,114 10,111 2)')); 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))')); -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)')); -delete from wm_figures where name <> 'selfcrossing-1'; +-- TODO: there is a bug and it does not go through `self_crossing` function. +--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)')); -- Run ST_SimplifyWM in debug mode, so `wm_debug` is populated. That table -- is used for geometric assertions later in the file. @@ -86,81 +86,81 @@ exception when others then end $$ language plpgsql; -- 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; ---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))); ---end $$ language plpgsql; --- ---do $$ ---declare --- vbends geometry[]; ---begin --- 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 wm_figures where name='fig3-1')), 1)); --- select detect_bends((select way from wm_figures where name='fig5')) into vbends; --- perform assert_equals(3, array_length(vbends, 1)); ---end $$ language plpgsql; --- ---do $$ ---declare --- vbends geometry[]; --- vinflections geometry[]; ---begin --- 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 wm_debug where name='inflection-1' and stage='bbends')) into vbends; --- 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 8,123 10,114 10)', st_astext(vinflections[2])); --- perform assert_equals('LINESTRING(123 10,114 10,111 2)', st_astext(vinflections[3])); ---end $$ language plpgsql; --- ---do $$ ---declare --- vcrossings geometry[]; --- mutated boolean; ---begin --- 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)', --- (select st_astext( --- st_linemerge(st_union(way)) --- ) from (select unnest(vcrossings) way) a) --- ); --- --- 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)', --- (select st_astext( --- st_translate(st_reverse(st_linemerge(st_union(way))), -60, 0) --- ) from (select unnest(vcrossings) way) a) --- ); --- --- 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))', --- (select st_astext( --- st_linemerge(st_union(way)) --- ) from (select unnest(vcrossings) way) a) --- ); --- ---end $$ language plpgsql; +drop table if exists wm_visuals; +create table wm_visuals (name text, way geometry); +do $$ + declare fig6b1 geometry; + declare fig6b2 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))); +end $$ language plpgsql; + +do $$ +declare + vbends geometry[]; +begin + 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 wm_figures where name='fig3-1')), 1)); + select detect_bends((select way from wm_figures where name='fig5')) into vbends; + perform assert_equals(3, array_length(vbends, 1)); +end $$ language plpgsql; + +do $$ +declare + vbends geometry[]; + vinflections geometry[]; +begin + 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 wm_debug where name='inflection-1' and stage='bbends')) into vbends; + 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 8,123 10,114 10)', st_astext(vinflections[2])); + perform assert_equals('LINESTRING(123 10,114 10,111 2)', st_astext(vinflections[3])); +end $$ language plpgsql; + +do $$ +declare + vcrossings geometry[]; + mutated boolean; +begin + 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)', + (select st_astext( + st_linemerge(st_union(way)) + ) from (select unnest(vcrossings) way) a) + ); + + 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)', + (select st_astext( + st_translate(st_reverse(st_linemerge(st_union(way))), -60, 0) + ) from (select unnest(vcrossings) way) a) + ); + + 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))', + (select st_astext( + st_linemerge(st_union(way)) + ) from (select unnest(vcrossings) way) a) + ); + +end $$ language plpgsql; diff --git a/wm.sql b/wm.sql index 33ea351..d3b0333 100644 --- a/wm.sql +++ b/wm.sql @@ -251,7 +251,6 @@ begin -- vertices, segments and stars are aligned, we are changing the bend mutated = true; - raise notice 'splitting bend %', j; -- To understand the block below, I suggest you take a pencil and paper, -- draw a self-crossing bend (fig6 from the article works well), and @@ -274,10 +273,12 @@ begin -- remove last vertex of the previous bend, because the last -- segment is duplicated with the i'th bend. bends[i-1] = st_removepoint(bends[i-1], st_npoints(bends[i-1])-1); - raise notice 'multi: %', st_astext(multi); - raise notice '2: removing first point from %', st_astext(st_geometryn(multi, st_numgeometries(multi))); - mutated = false; - --return; % continue debugging here + -- continue debugging the selfcrossing-1 here. + --raise notice 'previous bend: %', st_astext(bends[i-1]); + --raise notice 'multi: %', st_astext(multi); + --raise notice '2: removing first point from %', st_astext(st_geometryn(multi, st_numgeometries(multi))); + --mutated = false; + --return; bends[i] = st_makeline( st_pointn(bends[i], 1), st_removepoint(st_geometryn(multi, st_numgeometries(multi)), 0)