Skip to content

Commit deffc8e

Browse files
committed
Simplification of json rules as per Pat's suggestion.
1 parent 47b9c6a commit deffc8e

File tree

1 file changed

+25
-24
lines changed

1 file changed

+25
-24
lines changed

DALI.tex

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -594,12 +594,12 @@ \section{Data Types and Literal Values}
594594
interoperable and metadata-rich VOTable constructs can be employed
595595
instead.
596596

597-
In the following, where we say \verb|datatype="char"| we also allow the VOTable
598-
\verb|datatype="unicodeChar"|. Where we say \verb|arraysize="*"| we also allow
599-
providers to be more explicit by using a fixed size (e.g. \verb|20|) or fixed
597+
In the following, where we say \verb|datatype="char"| we also allow the VOTable
598+
\verb|datatype="unicodeChar"|. Where we say \verb|arraysize="*"| we also allow
599+
providers to be more explicit by using a fixed size (e.g. \verb|20|) or fixed
600600
with a limit (e.g. \verb|20*|) when applicable.
601601

602-
In the following, where we say "VOTable type metadata", we mean either VOTable
602+
In the following, where we say "VOTable type metadata", we mean either VOTable
603603
\xmlel{FIELD} or \xmlel{PARAM} elements.
604604

605605
Services may use non-standard \xmlel{xtype} values for non-standard datatypes, but if they
@@ -619,7 +619,7 @@ \subsection{Boolean}
619619
values in service parameters, the serialization for \xmlel{TABLEDATA} must be used.
620620

621621
\subsection{Timestamp}
622-
Timestamp values serialised in VOTable or described in service parameters must have
622+
Timestamp values serialised in VOTable or described in service parameters must have
623623
the following VOTable type metadata:
624624

625625
\begin{verbatim}
@@ -686,15 +686,15 @@ \subsection{Intervals}
686686
intervals have one or both bounding values that are infinite. Intervals with two identical values
687687
are equivalent to a scalar value but must still be serialised as a pair of values.
688688

689-
Floating point interval values serialised in VOTable or described in service parameters must have
689+
Floating point interval values serialised in VOTable or described in service parameters must have
690690
the following VOTable type metadata:
691691

692692
\begin{verbatim}
693693
datatype="double" arraysize="2" xtype="interval"
694694
\end{verbatim}
695695
\noindent where \verb|float| is also permitted.
696696

697-
Integer interval values serialised in VOTable or described in service parameters must have the
697+
Integer interval values serialised in VOTable or described in service parameters must have the
698698
following VOTable type metadata:
699699

700700
\begin{verbatim}
@@ -730,7 +730,7 @@ \subsection{Intervals}
730730
upper bound of interval(s) respectively.
731731

732732
\subsection{Sexagesimal Coordinates}
733-
Coordinate values expressed in sexagesimal form can be described using the
733+
Coordinate values expressed in sexagesimal form can be described using the
734734
following VOTable type metadata. For right ascension:
735735

736736
\begin{verbatim}
@@ -747,25 +747,25 @@ \subsection{Sexagesimal Coordinates}
747747
values and seconds is a real value. All hours must fall within [0,24], degrees
748748
(latitude) must fall within [-90,90], minutes must fall within [0,60), and seconds
749749
must fall within [0,60). Leading zeros are permitted so that values of minutes and the integer
750-
part of seconds can be expressed as 2-digit numbers. Valid values for \verb|xtype="hms"| are
750+
part of seconds can be expressed as 2-digit numbers. Valid values for \verb|xtype="hms"| are
751751
from 00:00:00 to 24:00:00.
752752
Valid values for \verb|xtype="dms"| are from -90:00:00 to 90:00:00; an optional + sign at
753-
the start is allowed (e.g. +10:20:30) but not required. The upper bound on minutes
754-
and seconds is not part of the valid range; for example 12:34:60 is not allowed and must
753+
the start is allowed (e.g. +10:20:30) but not required. The upper bound on minutes
754+
and seconds is not part of the valid range; for example 12:34:60 is not allowed and must
755755
be expressed as 12:35:00 instead.
756756

757757
\subsection{Point}
758758
Geometry values are two-dimensional; although they are usually longitude and
759759
latitude values in spherical coordinates this is specified in the coordinate
760760
metadata and not in the values.
761761

762-
Point values serialised in VOTable or described in service parameters must have following
762+
Point values serialised in VOTable or described in service parameters must have following
763763
VOTable type metadata:
764764

765765
\begin{verbatim}
766766
datatype="double" arraysize="2" xtype="point"
767767
\end{verbatim}
768-
\noindent where \verb|float| is also allowed.
768+
\noindent where \verb|float| is also allowed.
769769

770770
For points in a spherical coordinate system, the values are ordered as: longitude latitude. For example:
771771

@@ -789,7 +789,7 @@ \subsection{Circle}
789789
\begin{verbatim}
790790
datatype="double" arraysize="3" xtype="circle"
791791
\end{verbatim}
792-
\noindent where \verb|float| is also allowed.
792+
\noindent where \verb|float| is also allowed.
793793

794794
The values are ordered as a point followed by a radius. For example:
795795

@@ -814,11 +814,11 @@ \subsection{Circle}
814814
more limited context.
815815

816816
\subsection{Range}
817-
Range values serialised in VOTable or described in service parameters must have the following VOTable type metadata:
817+
Range values serialised in VOTable or described in service parameters must have the following VOTable type metadata:
818818
\begin{verbatim}
819819
datatype="double" arraysize="4" xtype="range"
820820
\end{verbatim}
821-
\noindent where \verb|float| is also allowed.
821+
\noindent where \verb|float| is also allowed.
822822

823823
A range is a coordinate bounding box specified
824824
as two pairs of coordinate values: min-coordinate1 max-coordinate1 min-coordinate2 max-coordinate2.
@@ -851,13 +851,13 @@ \subsection{Range}
851851
more limited context.
852852

853853
\subsection{Polygon}
854-
Polygon values serialised in VOTable or described in service parameters must have the
854+
Polygon values serialised in VOTable or described in service parameters must have the
855855
following VOTable type metadata:
856856

857857
\begin{verbatim}
858858
datatype="double" arraysize="*" xtype="polygon"
859859
\end{verbatim}
860-
\noindent where \verb|float| is also allowed.
860+
\noindent where \verb|float| is also allowed.
861861

862862
The array holds a sequence of vertices (points) (e.g. longitude latitude longitude
863863
latitude ...) with an even number of values and at least three (3) points (six
@@ -994,15 +994,15 @@ \subsection{Shape}
994994
more limited context.
995995

996996
\subsection{URI}
997-
URI values \citep{std:RFC3986} serialised in VOTable or described in service parameters
997+
URI values \citep{std:RFC3986} serialised in VOTable or described in service parameters
998998
should have the type following metadata:
999999

10001000
\begin{verbatim}
10011001
datatype="char" arraysize="*" xtype="uri"
10021002
\end{verbatim}
10031003

10041004
\subsection{UUID}
1005-
Universal Unique Identifier (UUID) values serialised in VOTable or described in service parameters
1005+
Universal Unique Identifier (UUID) values serialised in VOTable or described in service parameters
10061006
should have the following VOTable type metadata:
10071007

10081008
\begin{verbatim}
@@ -1020,11 +1020,12 @@ \subsection{JSON}
10201020
(e.g., as a \xmlel{GROUP} for a \xmlel{PARAM} or as unrolled
10211021
\xmlel{FIELD}\/s or a separate table for table cells) is preferred.
10221022

1023-
\xmlel{PARAM}\/s and \xmlel{FIELD}\/s containing JSON values should be
1024-
marked up with a \xmlel{datatype} of \verb|char| or \verb|unicodeChar|,
1025-
with variable or fixed \xmlel{arraysize} and an \xmlel{xtype} of
1026-
\verb|json|.
1023+
JSON values serialised in VOTable or described in service parameters should have
1024+
the following VOTable type metadata:
10271025

1026+
\begin{verbatim}
1027+
datatype="char" arraysize="*" xtype="json"
1028+
\end{verbatim}
10281029

10291030
\subsection{Unsupported Types}
10301031

0 commit comments

Comments
 (0)