From de0690b53a9f6aa210ba239098f5b53a13c93049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 19 May 2021 22:57:51 +0300
Subject: [PATCH] displaying gdr50 and gdr250 wip

---
 Makefile    | 13 ++++++++++---
 mj-msc.tex  | 45 ++++++++++++++++++++++++++++++++++++++++++---
 visuals.sql |  4 ++--
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 6519c41..3320329 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,8 @@ RIVERS = \
 		 salvis-wm-50k \
 		 salvis-wm-250k \
 		 salvis-wm-overlaid-50k-zoom \
-		 salvis-wm-overlaid-250k-zoom
+		 salvis-wm-overlaid-250k-zoom \
+		 salvis-gdr50-overlaid
 
 #################################
 # The thesis, publishable version
@@ -208,10 +209,16 @@ salvis-wm-overlaid-50k-zoom_1SELECT = wm_visuals where name='salvis'
 salvis-wm-overlaid-50k-zoom_2SELECT = wm_visuals where name='salvis-wm-75'
 salvis-wm-overlaid-50k-zoom_1COLOR = orange
 
-salvis-wm-overlaid-250k-zoom_1SELECT = wm_visuals where name='salvis'
-salvis-wm-overlaid-250k-zoom_2SELECT = wm_visuals where name='salvis-wm-220'
+salvis-wm-overlaid-250k-zoom_1SELECT = wm_visuals where name='salvis-wm-220'
+salvis-wm-overlaid-250k-zoom_2SELECT = wm_visuals where name='salvis'
 salvis-wm-overlaid-250k-zoom_1COLOR = orange
 
+salvis-gdr50-overlaid_1SELECT = wm_visuals where name='salvis-wm-75'
+salvis-gdr50-overlaid_2SELECT = wm_visuals where name='salvis-gdr50'
+salvis-gdr50-overlaid_3SELECT = wm_visuals where name='salvis'
+salvis-gdr50-overlaid_1COLOR = orange
+salvis-gdr50-overlaid_2COLOR = green
+
 .faux_db_pre: db init.sql
 	bash db start
 	bash db -f init.sql
diff --git a/mj-msc.tex b/mj-msc.tex
index 3124cd6..d7015c6 100644
--- a/mj-msc.tex
+++ b/mj-msc.tex
@@ -111,7 +111,7 @@
     dokumentacija yra nemokami ir laisvai prieinami naudojant PostGIS
     platformą.
 
- \end{abstract}
+\end{abstract}
 
 \newpage
 
@@ -1376,6 +1376,7 @@ table~\ref{table:scale-halfcirlce-diameter}:
 \end{itemize}
 
 \subsubsection{Medium-scale (1:\numprint{50000})}
+\label{sec:analyzed-medium-scale}
 
 \begin{figure}[ht]
     \centering
@@ -1436,7 +1437,7 @@ simplification and overlays the original (in orange).
 
 \begin{figure}[ht]
     \centering
-    \includegraphics[width=\textwidth]{salvis-wm-overlaid-250k-zoom}
+    \includegraphics[width=.8\textwidth]{salvis-wm-overlaid-250k-zoom}
     \caption{10x zoomed-in {\WM} for 1:\numprint{250000}.}
     \label{fig:salvis-wm-250k-overlaid-zoom}
 \end{figure}
@@ -1449,7 +1450,45 @@ smaller bends at approximately the same location.
 
 \subsection{Comparing Generalized Result with National Spatial Datasets}
 
-% TODO: GDR50LT and GDR250LT
+\subsubsection{Background}
+
+There are a few datasets used in this comparison: GDB10LT, GDR50LT and
+GDR250LT. They are vector datasets, which include rivers. They can be
+downloaded for free from \cite{nzt}. Here are the meanings of the codenames:
+
+\begin{description}
+
+    \item[GDB10LT] is dataset of highest detail. Suited for maps of scale
+        1:\numprint{10000}.
+
+    \item[GDR50LT] is suited for maps of scale 1:\numprint{50000}.
+
+    \item[GDR250LT] offers least detail, and is suited for maps of
+        scale 1:\numprint{250000}.
+
+\end{description}
+
+During the analysis, we ran {\WM} on GDB10LT for 2 destination scales:
+1:\numprint{50000} and 1:\numprint{250000}.\footnote{parameter calculation is
+detailed in section~\ref{sec:bend-scaling-and-dimensions}.} This section
+compares the resulting {\WM}--generalized rivers to GDR50LT and GDR250LT.
+
+\subsubsection{Medium-scale (1:\numprint{50000})}
+
+For our research location, the national dataset GDB10LT is almost equivalent to
+GDR50LT. Figure~\ref{fig:salvis-gdr50-overlaid} illustrates it. Therefore, the
+comparison between {\WM}--simplified GDB10LT and GDR50LT is equivalent to the
+comparison between {\WM}--simplified GDB10LT and non--simplified GDR50LT, which
+was covered in section~\ref{sec:analyzed-medium-scale}.
+
+\begin{figure}[ht]
+    \centering
+    \includegraphics[width=.8\textwidth]{salvis-gdr50-overlaid}
+    \caption{GDB10LT (orange) and GDR50LT (black)}
+    \label{fig:salvis-gdr50-overlaid}
+\end{figure}
+
+\subsubsection{Large-scale (1:\numprint{250000})}
 
 \subsection{Testing Results Online}
 \label{sec:testing-results-online}
diff --git a/visuals.sql b/visuals.sql
index 9834c30..b2bd618 100644
--- a/visuals.sql
+++ b/visuals.sql
@@ -105,13 +105,13 @@ insert into wm_visuals(name, way) values
       :scaledwidth
     )
   )),
-  ('salvis-50', (
+  ('salvis-gdr50', (
     wm_salvisbbox(
       (select st_union(way) from wm_rivers_50 where name in ('Šalčia', 'Visinčia')),
       :scaledwidth
     )
   )),
-  ('salvis-250', (
+  ('salvis-gdr250', (
     wm_salvisbbox(
       (select st_union(way) from wm_rivers_250 where name in ('Šalčia', 'Visinčia')),
       :scaledwidth