motiejus/wm
1
Fork 0
Code Releases Activity

fix remaining bugs. gone from debug mode.

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-19 22:57:51 +03:00 committed by Motiejus Jakštys
parent 0c33c1388f
commit 1a4560b119
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -95,7 +95,7 @@ $(1).pdf: layer2img.py Makefile $(2)
$$(if $$($(1)_$$(i)LINESTYLE),--group$$(i)-linestyle="$$($(1)_$$(i)LINESTYLE)") \ $$(if $$($(1)_$$(i)LINESTYLE),--group$$(i)-linestyle="$$($(1)_$$(i)LINESTYLE)") \
) )
endef endef
$(foreach fig,$(FIGURES),$(eval $(call FIG_template,$(fig),.faux_visuals))) $(foreach fig,$(FIGURES),$(eval $(call FIG_template,$(fig),.faux_test)))
$(foreach fig,$(RIVERS), $(eval $(call FIG_template,$(fig),.faux_visuals))) $(foreach fig,$(RIVERS), $(eval $(call FIG_template,$(fig),.faux_visuals)))
test-figures_1SELECT = wm_figures test-figures_1SELECT = wm_figures

6
mj-msc.tex
View File

@ -914,7 +914,7 @@ table~\ref{table:scale-halfcirlce-diameter}.
1:\numprint{15000} & 22.5 \\ 1:\numprint{15000} & 22.5 \\
1:\numprint{25000} & 37.5 \\ 1:\numprint{25000} & 37.5 \\
1:\numprint{50000} & 75 \\ 1:\numprint{50000} & 75 \\
1:\numprint{250000} & 375 \\ 1:\numprint{250000} & 220 \\
\end{tabular} \end{tabular}
\caption{{\WM} half-circle diameter $D$ for popular scales.} \caption{{\WM} half-circle diameter $D$ for popular scales.}
\label{table:scale-halfcirlce-diameter} \label{table:scale-halfcirlce-diameter}
@ -1305,9 +1305,9 @@ some isolated bends are exaggerated, and some small bends are removed.
\begin{figure}[ht] \begin{figure}[ht]
\centering \centering
\includegraphics[width=.5\textwidth]{salvis-wm-375-250k} \includegraphics[width=.5\textwidth]{salvis-wm-220-250k}
\caption{{\WM}-generalized river (1:{\numprint{250000}}).} \caption{{\WM}-generalized river (1:{\numprint{250000}}).}
\label{fig:salvis-wm-375-250k} \label{fig:salvis-wm-220-250k}
\end{figure} \end{figure}

19
test.sql
View File

@ -177,3 +177,22 @@ begin
perform assert_equals('ST_LineString', st_geometrytype(bend)); perform assert_equals('ST_LineString', st_geometrytype(bend));
insert into wm_debug(stage, name, gen, nbend, way) values('manual', 'fig3', 1, 1, bend); insert into wm_debug(stage, name, gen, nbend, way) values('manual', 'fig3', 1, 1, bend);
end $$ language plpgsql; end $$ language plpgsql;
-- misc visuals
do $$
declare fig6b1 geometry;
declare fig6b2 geometry;
declare sclong geometry;
declare scshort 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)));
select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into sclong limit 1 offset 1;
select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into scshort limit 1 offset 4;
insert into wm_visuals (name, way) values('selfcrossing-1-baseline', st_makeline(st_startpoint(sclong), st_endpoint(sclong)));
insert into wm_visuals (name, way) values('selfcrossing-1-newline', st_makeline(st_startpoint(sclong), st_endpoint(scshort)));
end $$ language plpgsql;

21
visuals.sql
View File

@ -88,27 +88,6 @@ insert into wm_visuals(name, way) values('salvis', (
where st_length(a.geom) >= 100 where st_length(a.geom) >= 100
)); ));
do $$
declare fig6b1 geometry;
declare fig6b2 geometry;
declare sclong geometry;
declare scshort geometry;
begin
delete from wm_debug where name like 'fig6-%' or name like 'selfcrossing-1%';
delete from wm_visuals where name like 'fig6-%' or name like 'selfcrossing-1%';
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)));
select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into sclong limit 1 offset 1;
select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into scshort limit 1 offset 4;
insert into wm_visuals (name, way) values('selfcrossing-1-baseline', st_makeline(st_startpoint(sclong), st_endpoint(sclong)));
insert into wm_visuals (name, way) values('selfcrossing-1-newline', st_makeline(st_startpoint(sclong), st_endpoint(scshort)));
end $$ language plpgsql;
do $$ do $$
declare declare
i integer; i integer;