diff --git a/IV/Makefile b/IV/Makefile index bc7b0ad..8abcbcc 100644 --- a/IV/Makefile +++ b/IV/Makefile @@ -28,7 +28,9 @@ FIGURES = \ fig6-selfcrossing-before \ fig6-selfcrossing-after \ selfcrossing-1-before \ - selfcrossing-1-after + selfcrossing-1-after \ + isolated-1-before \ + isolated-1-after RIVERS = \ salvis-25k \ @@ -156,6 +158,9 @@ selfcrossing-1-after_1SELECT = wm_debug where name='selfcrossing-1' AND stage='d selfcrossing-1-after_2SELECT = wm_debug where name='selfcrossing-1' AND stage='bbends' AND gen=1 selfcrossing-1-after_2LINESTYLE = invisible +isolated-1-before_WIDTHDIV = 2 +isolated-1-before_1SELECT = wm_debug where name='isolated-1' AND stage='bbends' AND gen=1 +isolated-1-before_2SELECT = wm_debug where name='isolated-1' AND stage='gexaggeration' AND gen=1 salvis-25k_1SELECT = wm_visuals where name='salvis' salvis-25k_WIDTHDIV = 1 diff --git a/IV/mj-msc.tex b/IV/mj-msc.tex index aa645c8..42bd742 100644 --- a/IV/mj-msc.tex +++ b/IV/mj-msc.tex @@ -1135,6 +1135,8 @@ implementation. A single exaggeration increment is done as follows: \end{enumerate} + + \section{Program Implementation} NOTE: this should provide a higher-level overview of the written code: diff --git a/IV/test.sql b/IV/test.sql index 5dc61ce..a792317 100644 --- a/IV/test.sql +++ b/IV/test.sql @@ -36,7 +36,7 @@ insert into wm_figures (name, way) values ('inflection-1', 'LINESTRING(110 24,114 20,133 20,145 15,145 0,136 8,123 10,114 10,111 2)'::geometry), ('multi-island', '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))'::geometry), ('selfcrossing-1','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)'::geometry), - ('isolated-1', 'LINESTRING(-56 103,-54 102,-30 103,-31 105,-31 108,-27 108,-26 103,0 103,2 104)'::geometry), + ('isolated-1', 'LINESTRING(-50 103,-48 102,-30 103,-31 105,-31 107,-27 107,-26 103,-6 103,-4 104)'::geometry), ('isolated-2', 'LINESTRING(250 100,246 104,234 105,230 106,225 101,224 93,217 78,206 69)'::geometry); insert into wm_figures (name, way) values ('fig6-rev',ST_Reverse(