diff --git a/IV/Makefile b/IV/Makefile index 42e70f5..69c7009 100644 --- a/IV/Makefile +++ b/IV/Makefile @@ -39,7 +39,8 @@ RIVERS = \ salvis-douglas-64-chaikin-50k \ salvis-visvalingam-64-chaikin-50k \ salvis-overlaid-douglas-64-chaikin-50k \ - salvis-overlaid-visvalingam-64-chaikin-50k + salvis-overlaid-visvalingam-64-chaikin-50k \ + salvis-wm-24-50k ################################# # The thesis, publishable version @@ -167,11 +168,10 @@ salvis-50k_WIDTHDIV = 2 salvis-250k_1SELECT = wm_visuals where name='salvis' salvis-250k_WIDTHDIV = 10 -#salvis-douglas-64-50k_1SELECT = wm_visuals where name='salvis' -salvis-douglas-64-50k_2SELECT = wm_visuals where name='salvis-douglas-64' +salvis-douglas-64-50k_1SELECT = wm_visuals where name='salvis-douglas-64' salvis-douglas-64-50k_WIDTHDIV = 2 -salvis-visvalingam-64-50k_2SELECT = wm_visuals where name='salvis-visvalingam-64' +salvis-visvalingam-64-50k_1SELECT = wm_visuals where name='salvis-visvalingam-64' salvis-visvalingam-64-50k_WIDTHDIV = 2 salvis-douglas-64-chaikin-50k_2SELECT = wm_visuals where name='salvis-douglas-64-chaikin' @@ -192,6 +192,10 @@ salvis-overlaid-visvalingam-64-chaikin-50k_1COLOR = orange salvis-overlaid-visvalingam-64-chaikin-50k_WIDTHDIV = 2 salvis-overlaid-visvalingam-64-chaikin-50k_QUADRANT = 1 +salvis-wm-24-50k_1SELECT = wm_visuals where name='salvis' +salvis-wm-24-50k_2SELECT = wm_visuals where name='salvis-wm-24' +salvis-wm-24-50k_2COLOR = orange +#salvis-wm-24-50k_WIDTHDIV = 4 .faux_db: db init.sql rivers.sql bash db start diff --git a/IV/mj-msc.tex b/IV/mj-msc.tex index 221e43b..3e67606 100644 --- a/IV/mj-msc.tex +++ b/IV/mj-msc.tex @@ -1292,10 +1292,21 @@ NOTE: this should provide a higher-level overview of the written code: \subsection{Generalization results of Analyzed Rivers} -\subsection{Generalization result comparison with national spatial datasets} +Figure~\ref{fig:salvis-wm-24-50k} visualizes the generalization result for +Šalčia and Visinčia. The generalized feature is orange. As can be seen, +some isolated bends are exaggerated, and some small bends are removed. -% TODO: [Šioje dalyje turi būti pateikt rezultatai ir jų palyginimai su GDR50LT -% ir GDR250LT] +% TODO: replace 24 to 75. +\begin{figure}[ht] + \centering + \includegraphics[width=.5\textwidth]{salvis-wm-24-50k} + \caption{{\WM}-generalized river (1:{\numprint{50000}}).} + \label{fig:salvis-wm-24-50k} +\end{figure} + +\subsection{Generalization result comparison with national spatial data sets} + +% TODO: GDR50LT and GDR250LT \subsection{Testing results online} diff --git a/IV/visuals.sql b/IV/visuals.sql index 109ef07..797f50d 100644 --- a/IV/visuals.sql +++ b/IV/visuals.sql @@ -123,7 +123,7 @@ begin ('salvis-visvalingam-' || i, geom2), ('salvis-visvalingam-' || i || '-chaikin', st_chaikinsmoothing(geom2, 5)); end loop; - -- TODO: try 32, 64, 256? + -- TODO: 75 foreach i in array array[16, 24] loop geom3 = st_simplifywm((select way from wm_visuals where name='salvis'), i, 50, 'salvis-' || i); insert into wm_visuals(name, way) values