Skip to content

Commit

Permalink
Fix typo and fix description of the UDF catalogue
Browse files Browse the repository at this point in the history
  • Loading branch information
gmantele committed Sep 22, 2023
1 parent 0a36ec3 commit ebe8217
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions ADQL.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1507,9 +1507,10 @@ \subsubsection{Coordinate system}
Future versions of this specification will remove this parameter from the listed
functions.

Coordinate conversions SHOULD now be explictly asked. The ADQL implementers have
to allow it through User Defined Functions. Then, it is recommended to define
them as declared in the \CatalogueUDF{}.
Coordinate conversions SHOULD now be explictly requested. The ADQL implementers
have to allow it through User Defined Functions. An interoperable facility for
frame transformations is in preparation as of this writing and is expected to be
part of the \CatalogueUDF{}.
% Catalogue of {ADQL} User Defined Functions - Endorsed Note 1.0+
% http://www.ivoa.net/documents/udf-catalogue/index.html

Expand Down Expand Up @@ -1792,12 +1793,12 @@ \subsubsection{CONTAINS}

The CONTAINS function is not symmetric in the meaning of the arguments.

The CONTAINS function returns the numeric value 1 if the first argument
is in, or on, the boundary of the second argument and the numeric value 0
The CONTAINS function returns the integer value 1 if the first argument
is in, or on, the boundary of the second argument and the integer value 0
if it is not.

When used as a predicate in the WHERE clause of a query, the numeric returned
value must be compared to the numeric values 0 or 1 to form a SQL predicate:
When used as a predicate in the WHERE clause of a query, the returned integer
value must be compared to the integer values 0 or 1 to form a SQL predicate:
\begin{verbatim}
WHERE 1 = CONTAINS(POINT(25.0, -19.5),
CIRCLE(25.4, -20.0, 10.0))
Expand Down Expand Up @@ -1985,11 +1986,11 @@ \subsubsection{INTERSECTS}
10.0, -15.0))
\end{verbatim}
\noindent
where the INTERSECTS function returns the numeric value 1 if the two arguments
where the INTERSECTS function returns the integer value 1 if the two arguments
overlap and 0 if they do not.

When used as a predicate in the WHERE clause of a query, the numeric return
value should be compared to the numeric values 0 or 1 to form a SQL predicate:
When used as a predicate in the WHERE clause of a query, the returned integer
value should be compared to the integer values 0 or 1 to form a SQL predicate:
\begin{verbatim}
WHERE 1 = INTERSECTS(CIRCLE(25.4, -20.0, 1),
POLYGON(20.0, -15.0,
Expand Down

0 comments on commit ebe8217

Please sign in to comment.