Skip to content

Commit 5d75b43

Browse files
author
Ralf Wilke
committed
Updated added rubrics database description
1 parent 8535725 commit 5d75b43

File tree

1 file changed

+25
-23
lines changed

1 file changed

+25
-23
lines changed

6_Protocol_Definitions.tex

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,11 @@ \subsubsection{PUT /transmitters - Add new transmitter}
14001400
& \verb|type :| \ref{protocoldef:inputvalidation:antennatype} \\
14011401
& \verb|gain :| \ref{protocoldef:inputvalidation:antennagain}\\
14021402
& \verb|direction :| \ref{protocoldef:inputvalidation:antennadirection}\\
1403-
& \verb|agl :| \ref{protocoldef:inputvalidation:antennaagl}\\ \hline
1403+
& \verb|agl :| \ref{protocoldef:inputvalidation:antennaagl}\\
1404+
& \verb|transmit_rubrics_format :| Array with possible content "SKYPER" and "PLAIN"\\
1405+
& \verb|direction :| \ref{protocoldef:inputvalidation:antennadirection}\\ \hline
1406+
1407+
14041408
\end{tabular}
14051409
\end{table}
14061410
\FloatBarrier
@@ -3192,9 +3196,10 @@ \subsection{Users}
31923196
role & string & "admin"|"support"|"user"|"thirdparty.[aprs|brandmeister]" & true \\
31933197
enabled & boolean & & true \\
31943198
created\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
3199+
created\_by & string & valid user name & dh3wr \\
31953200
changed\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
31963201
changed\_by & string & valid user name & dh3wr \\
3197-
email\_valid & boolean & & true \\
3202+
email\_lastchecked & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
31983203
avatar\_picture & couchdb\_attachment & & \\ \hline
31993204
\end{tabular}
32003205
\label{tab:couchdb:users}
@@ -3211,12 +3216,11 @@ \subsection{Users}
32113216
"created_by": "dh3wr",
32123217
"changed_on": "2018-07-03T08:00:52.786458Z",
32133218
"changed_by":"dh3wr",
3214-
"email_valid": true
3219+
"email_lastchecked": "2018-07-03T08:00:52.786458Z",
32153220
"avatar_picture": <couchdb attachment>
32163221
}
32173222
\end{lstlisting}
32183223

3219-
\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.}
32203224

32213225
\subsection{Nodes}
32223226
\begin{table}[h]
@@ -3229,7 +3233,7 @@ \subsection{Nodes}
32293233
description & string & whatever & Aachen, Germany\\
32303234
hamcloud & boolean & true/false & true \\
32313235
created\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
3232-
changed\_by & string & valid user name & dh3wr \\
3236+
created\_by & string & valid user name & dh3wr \\
32333237
changed\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
32343238
changed\_by & string & valid user name & dh3wr \\
32353239
owners & [string] & N/A & ["dl1abc","dh3wr","dl2ic"] \\
@@ -3268,7 +3272,7 @@ \subsection{Transmitters}
32683272
coordinates & [number; 2] & [lat, lon] & [34.123456, 6.23144] \\
32693273
power & number & 0.001 ... & 12.3 \\
32703274
created\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
3271-
changed\_by & string & valid user name & dh3wr \\
3275+
created\_by & string & valid user name & dh3wr \\
32723276
changed\_on & string & ISO8601 & 2018-07-08T11:50:02.168325Z \\
32733277
changed\_by & string & valid user name & dh3wr \\
32743278
owners & ARRAY of STRING & N/A & ["dl1abc","dh3wr","dl2ic"] \\
@@ -3304,8 +3308,16 @@ \subsection{Transmitters}
33043308
"changed_on": "2018-07-03T08:00:52.786458Z",
33053309
"changed_by": "dh3wr",
33063310
"aprs_broadcast": false,
3311+
"transmit_rubrics_format": ["SKYPER","PLAIN"],
33073312
"antenna_pattern" : <couchDB attachment>,
3308-
"avatar_picture" : <couchDB attachment>
3313+
"avatar_picture" : <couchDB attachment>,
3314+
"simplified_coverage_polygon": [34.1, -23.3, 34.1 -23.2, 34.3, -23.3],
3315+
"coverage_edges": [
3316+
[lat1, long1],
3317+
[lat2, long2],
3318+
[lat3, long3],
3319+
[lat4, long4]
3320+
]
33093321
}
33103322
\end{lstlisting}
33113323

@@ -3344,26 +3356,16 @@ \subsection{Rubrics}
33443356
"number": 14,
33453357
"description": "Wetter DL-HH",
33463358
"label": "WX DL-HH",
3347-
"transmitter_groups": ["dl-hh","dl-ns"],
3359+
"transmitter_groups": ["dl-hh", "dl-ns"],
33483360
"transmitters": ["db0abc"],
33493361
"cyclic_transmit": true,
33503362
"cyclic_transmit_interval": 3600, // seconds
3351-
"owner" : ["dh3wr", "dl1abc"]
3352-
}
3353-
\end{lstlisting}
3354-
3355-
\subsection{Rubric's content}
3356-
<UUID> of rubric (as defined in \ref{rubric_list})
3357-
3358-
\begin{lstlisting}
3359-
{
3360-
"_id" : "<UUID>",
3361-
"rubric": "wx-dl-hh",
3363+
"owner" : ["dh3wr", "dl1abc"],
33623364
"content": [
3363-
"message1",
3364-
..,
3365-
"message10"
3366-
],
3365+
"message1",
3366+
...,
3367+
"message10"
3368+
]
33673369
}
33683370
\end{lstlisting}
33693371

0 commit comments

Comments
 (0)