From 9bda7fd06aa41826955f5b21616d0ba9b9d72a2c Mon Sep 17 00:00:00 2001 From: Markus Demleitner Date: Wed, 15 Jul 2026 14:44:40 +0200 Subject: [PATCH 1/4] Updating vs:catsvc statistics --- VODataService.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VODataService.tex b/VODataService.tex index 682e644..451f6a0 100644 --- a/VODataService.tex +++ b/VODataService.tex @@ -211,8 +211,8 @@ \subsection{Purpose} Resource records using VODataService types are commonly used to register services that support standard IVOA data access layer protocols such as Simple Image Access \citep{2015ivoa.spec.1223D} and Simple Cone Search -\citep{2008ivoa.specQ0222P}. As of October 2018, there are more than -20000~resources of type \xmlel{vs:CatalogService} in the VO Registry. +\citep{2008ivoa.specQ0222P}. As of July 2026, there are more than +31'000~resources of type \xmlel{vs:CatalogService} in the VO Registry. While other VOResource extensions define the protocol-specific metadata (encapsulated as a standard From 7c97ca1331c73b552b9874b09906374f8fbe895e Mon Sep 17 00:00:00 2001 From: Markus Demleitner Date: Wed, 15 Jul 2026 14:46:42 +0200 Subject: [PATCH 2/4] Fixing non-VOUnits units in some example files. I'm using the opportunity to drop the extendedtable example (which was afflicted as well). The technique hasn't been used so far, and what was examined in the example is now done by TAPRegExt. Using this opportunity to run new-release. --- Makefile | 2 +- VODataService-v1.3.xsd | 2 +- VODataService.tex | 8 ++ ipac-resource.xml | 2 +- samples/catalogservice.xml | 2 +- samples/extendedtable.xml.no-test | 132 ------------------------------ samples/specsample.xml | 2 +- 7 files changed, 13 insertions(+), 137 deletions(-) delete mode 100644 samples/extendedtable.xml.no-test diff --git a/Makefile b/Makefile index 959ab51..4367a78 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DOCNAME = VODataService DOCVERSION = 1.3 # Publication date, ISO format; update manually for "releases" -DOCDATE = 2026-06-01 +DOCDATE = 2026-07-15 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN DOCTYPE = PR diff --git a/VODataService-v1.3.xsd b/VODataService-v1.3.xsd index c82ec8f..febf90f 100644 --- a/VODataService-v1.3.xsd +++ b/VODataService-v1.3.xsd @@ -6,7 +6,7 @@ xmlns:stc="http://www.ivoa.net/xml/STC/stc-v1.30.xsd" xmlns:vm="http://www.ivoa.net/xml/VOMetadata/v0.1" elementFormDefault="unqualified" attributeFormDefault="unqualified" - version="1.3-pr1"> + version="1.3-pr2"> diff --git a/VODataService.tex b/VODataService.tex index 451f6a0..a54810a 100644 --- a/VODataService.tex +++ b/VODataService.tex @@ -45,6 +45,7 @@ \editor{Markus Demleitner} \editor{Ray Plante} +\previousversion[https://www.ivoa.net/documents/VODataService/20260601]{PR-1.3-20260601} \previousversion[https://www.ivoa.net/documents/VODataService/20260324]{WD-1.3-20260324} \previousversion[https://www.ivoa.net/documents/VODataService/20241113]{WD-1.3-20241113} \previousversion[https://www.ivoa.net/documents/VODataService/20211102]{REC-1.2} @@ -2930,6 +2931,13 @@ \subsubsection{Table Column Data Types} \section{Changes from previous versions} +\subsection{Changes since PR-1.3-20260601} + +\begin{itemize} +\item Dropping an outdated example for how one would do ADQL functions +in the tableset (which we don't do). +\end{itemize} + \subsection{Changes since WD-1.3-20260324} \begin{itemize} diff --git a/ipac-resource.xml b/ipac-resource.xml index 7a5d81a..64c23d1 100644 --- a/ipac-resource.xml +++ b/ipac-resource.xml @@ -98,7 +98,7 @@ http://nedwww.ipac.caltech.edu/cgi-bin/nph-datasearch?search_type=Redshifts& The radial velocity , derived from derived from the shift of some spectral feature, in km/sec - km/sec + km/s spect.dopplerVeloc int diff --git a/samples/catalogservice.xml b/samples/catalogservice.xml index 098b359..d84cf41 100644 --- a/samples/catalogservice.xml +++ b/samples/catalogservice.xml @@ -99,7 +99,7 @@ The radial velocity , derived from derived from the shift of some spectral feature, in km/sec - km/sec + km/s src.spect.dopplerVeloc int diff --git a/samples/extendedtable.xml.no-test b/samples/extendedtable.xml.no-test deleted file mode 100644 index 6b7c31f..0000000 --- a/samples/extendedtable.xml.no-test +++ /dev/null @@ -1,132 +0,0 @@ - - - The NASA/IPAC Extragalactic Database - NED_redshift - ivo://ned.ipac/Redshift_By_Object_Name - - The NASA/IPAC Extragalactic Database - - Olga Pevunova - contact@datacenter.edu - - - - redshift - galaxies - - NED is built around a master list of extragalactic objects for - which cross-identifications of names have been established, - accurate positions and redshifts entered to the extent possible, - and some basic data collected. This service will return recorded - redshifts for a given object. - - http://nedwww.ipac.caltech.edu/help/data_help.html#zdat - BasicData - Research - - - - http://nedwww.ipac.caltech.edu/cgi-bin/nph-datasearch?search_type=Redshifts& - GET - application/xml+votable - - objname - Name of object - string - - - of - Output format parameter, must be "xml_main" for VOTable output. - string - - - - - - - - - - - - - - Radio - Millimeter - Infrared - Optical - UV - EUV - X-ray - Gamma-ray - - - - - default - - default - - No. - - A sequential data-point number applicable to this list only. - - meta.number - INTEGER - - - Name in Publication - - The object's name in NED's standard format, of the object - to which the data apply. - - meta.id;name - VARCHAR - - - Published Velocity - - The radial velocity , derived from derived from the shift - of some spectral feature, in km/sec - - km/sec - src.spect.dopplerVeloc - INTEGER - -
- - - coord1 - REAL - degrees - - pos - VARCHAR - - - - - area - REAL - degrees - - region - - REGION - - - - - diff --git a/samples/specsample.xml b/samples/specsample.xml index 9bba7cc..0bbda1f 100644 --- a/samples/specsample.xml +++ b/samples/specsample.xml @@ -100,7 +100,7 @@ The radial velocity , derived from derived from the shift of some spectral feature, in km/sec - km/sec + km/s src.spect.dopplerVeloc int From a4e14a11ffb62027506561168f6fd02575d69da0 Mon Sep 17 00:00:00 2001 From: Markus Demleitner Date: Wed, 15 Jul 2026 15:03:54 +0200 Subject: [PATCH 3/4] Half-requiring VOUnits compliance in tablsets. --- VODataService-v1.3.xsd | 2 +- VODataService.tex | 20 ++++++++++++++------ role_diagram.pdf | Bin 32481 -> 36049 bytes role_diagram.svg | 1 + role_diagram.xml | 1 + 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/VODataService-v1.3.xsd b/VODataService-v1.3.xsd index febf90f..6d9d1a9 100644 --- a/VODataService-v1.3.xsd +++ b/VODataService-v1.3.xsd @@ -1004,7 +1004,7 @@ The unit associated with the values in the parameter - or column. + or column. This should use VOUnits syntax. diff --git a/VODataService.tex b/VODataService.tex index a54810a..9190214 100644 --- a/VODataService.tex +++ b/VODataService.tex @@ -193,6 +193,8 @@ \subsection{The Role in the IVOA Architecture} to support the space-time constraints added here. \item[MOC, v2.0 \citep{2022ivoa.spec.0727F}] Multi-Order coverage maps are used by VODataService to communicate spatial coverage. +\item[VOUnits, v1.1 \citep{2023ivoa.spec.1215G}] Tablesets should use +VOUnits syntax. \end{description} \subsection{Purpose} @@ -758,9 +760,9 @@ \subsubsection{DataResource} \url{http://www.ivoa.net/rdf/data-source} contains these terms: % GENERATED: !vocterms data-source -\textsl{artificial}, -\textsl{observation}, -\textsl{theory} +\textsl{abstract-model}, +\textsl{concrete-model}, +\textsl{observation} % /GENERATED Following previous VO practice, resources giving no data source can be @@ -2101,7 +2103,7 @@ \subsection{Data Parameters} \begin{description} \item[Type] string: \xmlel{xs:token} \item[Meaning] The unit associated with the values in the parameter - or column. + or column. This should use VOUnits syntax. \item[Occurrence] optional \end{description} @@ -2226,7 +2228,7 @@ \subsection{Data Parameters} \item[Element \xmlel{percentile97}] \begin{description} \item[Type] floating-point number: \xmlel{xs:double} -\item[Meaning] The 97nd percentile (“2σ”) in a distribution of numbers. +\item[Meaning] The 97th percentile (“2σ”) in a distribution of numbers. \item[Occurrence] optional \end{description} @@ -2730,7 +2732,7 @@ \subsubsection{Table Columns} \item[Type] boolean (true/false): xs:boolean \item[Meaning] If true, the meaning and use of this parameter is reserved and defined by a standard model. If false, - it represents a parameter specific to the data described + it represents a parameter specific to the data described. If not provided, then the value is unknown. \item[Occurrence] optional \end{description} @@ -2787,6 +2789,12 @@ \subsubsection{Table Columns} sect.~\ref{sect:tbldatatypes}, this SHOULD be \xmlel{vs:VOTableType} for VODataService 1.3 table columns. +Units specified for columns and params SHOULD follow the VOUnits grammar +\citep{2023ivoa.spec.1215G}, which is particularly important for clients +obtaining them from VOSI tables endpoint with the intent of using them +for automatic unit conversions. New implementors should consider +VOUnits compliance a MUST rather than a SHOULD. + When the tableset describes a set of TAP-accessible tables, the value of a \xmlel{tableColumn}'s \xmlel{name} child must be in a form immediately usable for use in ADQL or SQL queries. This corresponds to the analogous diff --git a/role_diagram.pdf b/role_diagram.pdf index 41152fb6a90e22a3eb2cf5a6c520369e16e2a3c8..20c74499a9c9a57872c2c406cb5e74584ce922ea 100644 GIT binary patch delta 12427 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 delta 8810 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 Uu#}--I81`(+>vvt7u9I~2RxjXqyPW_ diff --git a/role_diagram.svg b/role_diagram.svg index 2507b93..6f4ae33 100644 --- a/role_diagram.svg +++ b/role_diagram.svg @@ -46,4 +46,5 @@ STC VOSI MOC + VOUnits diff --git a/role_diagram.xml b/role_diagram.xml index ecbbf16..1f94739 100644 --- a/role_diagram.xml +++ b/role_diagram.xml @@ -20,4 +20,5 @@ with missing dependencies. + From 63f665ee511fc275f008fdb2a207e851eb8636aa Mon Sep 17 00:00:00 2001 From: Markus Demleitner Date: Wed, 15 Jul 2026 15:15:24 +0200 Subject: [PATCH 4/4] Dropping vs:StandardSTC. I don't think there have ever been records using this type, and I can't remember why I would have postpone dropping the type. --- VODataService-v1.3.xsd | 43 ---------------------------- VODataService.tex | 21 +++++--------- samples/stc.xml | 63 ------------------------------------------ 3 files changed, 7 insertions(+), 120 deletions(-) delete mode 100644 samples/stc.xml diff --git a/VODataService-v1.3.xsd b/VODataService-v1.3.xsd index 6d9d1a9..57a0062 100644 --- a/VODataService-v1.3.xsd +++ b/VODataService-v1.3.xsd @@ -1472,49 +1472,6 @@ - - - - A description of standard space-time coordinate systems, - positions, and regions. - - - This resource type is deprecated, and no resource records - of this type exist in the Registry. It will be removed - in version 1.3 of VODataService. - - - - - - - - - - - An STC description of coordinate systems, - positions, and/or regions - - - Each system, position, and region description - should have a an XML ID assigned to it. - - - Because the STC schema sets - elementFormDefault="qualified", it is - recommended that this element specify the STC - default namespace via an xmlns namespace. - - - - - - - - - diff --git a/VODataService.tex b/VODataService.tex index 9190214..9028da3 100644 --- a/VODataService.tex +++ b/VODataService.tex @@ -546,11 +546,13 @@ \subsubsection{VODataService Resource Classes} Two further resource classes defined by VODataService 1.1, \xmlel{vs:DataCollection} and \xmlel{vs:StandardSTC}, -are deprecated since version 1.2. +have been deprecated since version 1.2. Resource record authors are requested to migrate or discard resource -records using these deprecated types. If all such records have -disappeared from the VO by version 1.4 of this specification, their -type declarations may be removed from the schema. +records using these deprecated types. \xmlel{vs:StandardSTC} has been +dropped in VODataService 1.3 since there were no resource records using +that type in the VO Registry. We will similarly drop +\xmlel{vs:DataCollection} when the last records using the type have +vanished from the Registry. \subsubsection{Discovering Data Within Other Services} \label{sect:discoverdata} @@ -1017,16 +1019,6 @@ \subsubsection{DataCollection} This type may be removed from the schema when all resource records using it have vanished from the VO Registry. -\subsubsection{StandardSTC} - -The \xmlel{vs:StandardSTC} type is deprecated and should no longer be -used in new resource records. Since the XML serialisation of the STC 1 -data model was never promoted to an IVOA recommendation, there also is -no properly standardised way of creating such records. Since no such -records ever existed in the Registry, this type will probably be removed -from the schema in version 1.4 of this specification. - - \subsection{Coverage in Space, Time, and Spectrum} \label{sect:cover} @@ -2944,6 +2936,7 @@ \subsection{Changes since PR-1.3-20260601} \begin{itemize} \item Dropping an outdated example for how one would do ADQL functions in the tableset (which we don't do). +\item Dropping StandardSTC after all. \end{itemize} \subsection{Changes since WD-1.3-20260324} diff --git a/samples/stc.xml b/samples/stc.xml deleted file mode 100644 index d1856ae..0000000 --- a/samples/stc.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - 4 - Standard Space-time Coordinate Systems - STC - ivo://STClib/CoordSys - - - - Harvard-Smithsonian Center for Astrophysics - - - Arnold Rots - - Dr. Raymond Plante - 2006-06-01 - - Arnold Rots - arots@hea.cfa.harvard.edu - - - - - world coordinate systems - - This represents a set of standard Coordinate Systems that may - be used to referenced in coverage descriptions. This includes - UTC-FK5-TOPO, a common FK5-based system. - - http://hea-www.harvard.edu/~arots/nvometa/v1.30/ - BasicData - University - Research - - - - - - - UTC - - - - - J2000.0 - - - - - - - - -