From 5d75b4301ced38530688e10ba1352590035a4d05 Mon Sep 17 00:00:00 2001
From: Ralf Wilke <wilke@ihf.rwth-aachen.de>
Date: Thu, 25 Oct 2018 14:52:12 +0200
Subject: [PATCH] Updated added rubrics database description

---
 6_Protocol_Definitions.tex | 48 ++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/6_Protocol_Definitions.tex b/6_Protocol_Definitions.tex
index 3c101f5..74a515f 100644
--- a/6_Protocol_Definitions.tex
+++ b/6_Protocol_Definitions.tex
@@ -1400,7 +1400,11 @@ \subsubsection{PUT /transmitters - Add new transmitter}
                        & \verb|type           :| \ref{protocoldef:inputvalidation:antennatype} \\
                        & \verb|gain           :| \ref{protocoldef:inputvalidation:antennagain}\\
                        & \verb|direction      :| \ref{protocoldef:inputvalidation:antennadirection}\\
-                       & \verb|agl            :| \ref{protocoldef:inputvalidation:antennaagl}\\ \hline
+                       & \verb|agl            :| \ref{protocoldef:inputvalidation:antennaagl}\\
+                       & \verb|transmit_rubrics_format :| Array with possible content "SKYPER" and "PLAIN"\\
+                       & \verb|direction      :| \ref{protocoldef:inputvalidation:antennadirection}\\ \hline
+
+
   \end{tabular}
 \end{table}
 \FloatBarrier
@@ -3192,9 +3196,10 @@ \subsection{Users}
   role & string & "admin"|"support"|"user"|"thirdparty.[aprs|brandmeister]" & true \\
   enabled & boolean & & true \\
   created\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
+  created\_by & string & valid user name & dh3wr \\
   changed\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
   changed\_by & string & valid user name & dh3wr \\
-  email\_valid & boolean & & true \\
+  email\_lastchecked & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
   avatar\_picture & couchdb\_attachment & & \\ \hline
   \end{tabular}
   \label{tab:couchdb:users}
@@ -3211,12 +3216,11 @@ \subsection{Users}
   "created_by": "dh3wr",
   "changed_on": "2018-07-03T08:00:52.786458Z",
   "changed_by":"dh3wr",
-  "email_valid": true
+  "email_lastchecked": "2018-07-03T08:00:52.786458Z",
   "avatar_picture": <couchdb attachment>
 }
 \end{lstlisting}
 
-\todo{Wofür genau braucht man email\_valid? - Um ab und zu mal eine Testmail an die User zu schicken, ob sie unter der Email noch erreichbar sind und sonst sie zu löschen.}
 
 \subsection{Nodes}
 \begin{table}[h]
@@ -3229,7 +3233,7 @@ \subsection{Nodes}
   description & string & whatever & Aachen, Germany\\
   hamcloud & boolean & true/false & true \\
   created\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
-  changed\_by & string & valid user name & dh3wr \\
+  created\_by & string & valid user name & dh3wr \\
   changed\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
   changed\_by & string & valid user name & dh3wr \\
   owners & [string] & N/A & ["dl1abc","dh3wr","dl2ic"] \\
@@ -3268,7 +3272,7 @@ \subsection{Transmitters}
   coordinates & [number; 2]  & [lat, lon] & [34.123456, 6.23144] \\
   power & number & 0.001 ...  & 12.3 \\
   created\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
-  changed\_by & string & valid user name & dh3wr \\
+  created\_by & string & valid user name & dh3wr \\
   changed\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
   changed\_by & string & valid user name & dh3wr \\
   owners & ARRAY of STRING & N/A & ["dl1abc","dh3wr","dl2ic"] \\
@@ -3304,8 +3308,16 @@ \subsection{Transmitters}
   "changed_on": "2018-07-03T08:00:52.786458Z",
   "changed_by": "dh3wr",
   "aprs_broadcast": false,
+  "transmit_rubrics_format": ["SKYPER","PLAIN"],
   "antenna_pattern" : <couchDB attachment>,
-  "avatar_picture" : <couchDB attachment>
+  "avatar_picture" : <couchDB attachment>,
+  "simplified_coverage_polygon": [34.1, -23.3, 34.1 -23.2, 34.3, -23.3],
+  "coverage_edges": [
+  	[lat1, long1],
+  	[lat2, long2],
+  	[lat3, long3],
+  	[lat4, long4]
+  ]
 }
 \end{lstlisting}
 
@@ -3344,26 +3356,16 @@ \subsection{Rubrics}
   "number": 14,
   "description": "Wetter DL-HH",
   "label": "WX DL-HH",
-  "transmitter_groups": ["dl-hh","dl-ns"],
+  "transmitter_groups": ["dl-hh", "dl-ns"],
   "transmitters": ["db0abc"],
   "cyclic_transmit": true,
   "cyclic_transmit_interval": 3600, // seconds
-  "owner" : ["dh3wr", "dl1abc"]
-}
-\end{lstlisting}
-
-\subsection{Rubric's content}
-<UUID> of rubric (as defined in \ref{rubric_list})
-
-\begin{lstlisting}
-{
-  "_id" : "<UUID>",
-  "rubric": "wx-dl-hh",
+  "owner" : ["dh3wr", "dl1abc"],
   "content": [
-    "message1",
-    ..,
-    "message10"
-  ],
+  "message1",
+  ...,
+  "message10"
+  ]
 }
 \end{lstlisting}