Skip to content

Commit

Permalink
Merge pull request #62 from tomdonaldson/RFC_Updates
Browse files Browse the repository at this point in the history
Updates based on RFC comments
  • Loading branch information
tomdonaldson authored Nov 25, 2024
2 parents ab828e5 + 8c186a5 commit 5a681b4
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
test -f VOTable.pdf
test -f VOTable.bbl
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v4
with:
name: VOTable.pdf Preview
path: VOTable.pdf
15 changes: 9 additions & 6 deletions VOTable.tex
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,9 @@ \subsection{{\attr{name}, \attr{ID} and \attr{ref} attributes}}
For this reason, earlier versions of VOTable recommended placing
the \attr{ID} attribute before any references to it,
but there may be cases where the opposite is more appropriate.
In practical terms, no requirement has ever been placed on the ordering
of an \attr{ID} and its references, so VOTable creators are free to use either
order and parsers/consumers should handle either order.

While the {\attr{ID}} attribute has to be unique in a VOTable document,
the {\attr{name}} attribute need not. It is however recommended,
Expand Down Expand Up @@ -773,7 +776,7 @@ \subsection{\elem{TIMESYS} Element}
given.
When using calendar epochs written in julian or besselian years, note that
conventionally Julian years are tied to the TDB timescale and Besselian years to
the ET timescale \citep{2015A+A...574A..36R}.
the ET (equivalent to TT) timescale \citep{2015A+A...574A..36R}.

\item[\attr{timescale}] This is the time scale used. Values SHOULD be
taken from the IVOA \emph{timescale} vocabulary (\url{http://www.ivoa.net/rdf/timescale}).
Expand Down Expand Up @@ -863,16 +866,16 @@ \subsection{\elem{RESOURCE} Element}
should exist in any of its sub-elements. A \elem{RESOURCE} without
this attribute {\em may} however have no \elem{DATA} sub-element.

\elem{RESOURCE} elements qualified by
\attrval{type}{meta} are also used to transmit
For example, a \elem{RESOURCE} qualified by
\attrval{type}{meta} can be used to transmit
MIVOT (Model Instances in VOTables) annotations \citep{2023ivoa.spec.0620M}.
MIVOT defines a syntax to map VOTable
contents to any model serizalized in VO-DML \citep{2018ivoa.spec.0910L}.
It operates as a bridge between models and data that associates VOTable
metadata to data model entities, possibly adding advanced metadata not
representable in plain VOTable.
MIVOT annotations have their own XMLnamespace;
they have no impact on the VOTable schema.
MIVOT annotations have their own XMLnamespace. The VOTable schema allows MIVOT,
and any elements from a foreign namespace, in a \elem{RESOURCE}.

Finally, the \elem{RESOURCE} element may have a \attr{utype} attribute
to link the element to some external data model
Expand Down Expand Up @@ -2573,7 +2576,7 @@ \subsection{FIELDs as Data Pointers}
<FIELD name="Spectrum" ucd="meta.ref.url" datatype="float" arraysize="*"
unit="mW/m2/nm" type="location">
<DESCRIPTION>Spectrum absolutely calibrated</DESCRIPTION>
<LINK type="location"
<LINK content-role="location"
href="http://ivoa.spectr/server?obsno="/>
</FIELD>
<DATA><TABLEDATA>
Expand Down
2 changes: 1 addition & 1 deletion ivoatex
Binary file modified role_diagram.pdf
Binary file not shown.
Binary file removed role_diagram.png
Binary file not shown.
99 changes: 48 additions & 51 deletions role_diagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions role_diagram.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ with missing dependencies.
<rec name="UCD" x="200" y="250"/>
<rec name="VOUnits" x="200" y="330"/>

<rec name="MIVOT" x="525" y="330" w="51"/>

</archdiag>

0 comments on commit 5a681b4

Please sign in to comment.