Merge pull request #100 from lmichel/primitive-datetime

Primitive datetime

Author: lmichel

.gitignore

@@ -58,4 +58,5 @@ pom.xml.tag
 *.html
 
 trash/*
-exercise*
+exercise*
+test-date

doc/Makefile

@@ -7,7 +7,7 @@ DOCNAME = MANGO
 DOCVERSION = 1.0
 
 # Publication date, ISO format; update manually for "releases"
-DOCDATE = 2025-06-20
+DOCDATE = 2025-08-07
 
 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
 DOCTYPE = PR

doc/ivoatexmeta.tex

@@ -1,7 +1,7 @@
 % GENERATED FILE -- edit this in the Makefile
 \newcommand{\ivoaDocversion}{1.0}
-\newcommand{\ivoaDocdate}{2025-06-20}
-\newcommand{\ivoaDocdatecode}{20250620}
+\newcommand{\ivoaDocdate}{2025-08-07}
+\newcommand{\ivoaDocdatecode}{20250807}
 \newcommand{\ivoaDoctype}{PR}
 \newcommand{\ivoaDocname}{MANGO}
 \renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO}

doc/model.tex

@@ -218,9 +218,9 @@ \section{Model: mango }
 
     \subsubsection{EpochPosition.obsDate}
       \textbf{vodml-id: EpochPosition.obsDate} \newline
-      \textbf{type: \hyperref[sect:DateTime]{mango:DateTime}} \newline
-      \textbf{multiplicity: 0..1} \newline
-      Observation date expressed within the common time system if present. This attribute, if set, supersedes the epoch possibly given with the spatial coordinate system(see the above).
+      \textbf{type: \hyperref[sect:ivoa]{ivoa:datetime}} \newline
+      \textbf{multiplicity: 1} \newline
+      Observation date expressed within the common time system if present. This attribute, if set, supersedes the epoch possibly given with the spatial coordinate system (see the above). Figure \ref{datetime} shows up the hierarchy of the primitive types representing the observation dates.
 
     \subsubsection{EpochPosition.pmCosLat\_applied}
       \textbf{vodml-id: EpochPosition.pmCosLat\_applied} \newline
@@ -511,6 +511,22 @@ \section{Model: mango }
       \textbf{multiplicity: 0..1} \newline
       Label attached to the vocabulary term. This is necessary because the URI may not contain any explicit label. This was the case for the IUA vocabulary until the Registry WG introduced rewriting rules that fix the issue.
 
+  \subsection{year}
+  \label{sect:year}
+  Primitive type for observation dates expressed as a year (e.g. 2015.5).
+
+  \subsection{iso}
+  \label{sect:iso}
+  Primitive type for observation dates expressed as an ISO Date (e.g. "2025-08-07T09:29:14").
+
+  \subsection{mjd}
+  \label{sect:mjd}
+  Primitive type for observation dates expressed as a Modified Julian Date (e.g. 60288.8).
+
+  \subsection{jd}
+  \label{sect:jd}
+  Primitive type for observation dates expressed as a Julian Date (e.g. 25213).
+
   \subsection{FootprintSerialization}
   \label{sect:FootprintSerialization}
 

doc/model_toc.tex

@@ -94,7 +94,33 @@ \section{Model: mango}
     \textbf{multiplicity: 0..1} \newline
     Label attached to the vocabulary term. This is necessary because the URI may not contain any explicit label. This was the case for the IUA vocabulary until the Registry WG introduced rewriting rules that fix the issue.
 
-\section{Epoch Position Properties}
+\section{Date Time Types}
+The abstract primitive type \texttt{ivoa:datetime} has been extended to include:
+types that cover the most commonly used serialisations of observation dates (see figure \ref{datetime}).
+
+\begin{figure}
+     \includegraphics[width=0.7\textwidth]{../model/date.png}
+     \caption{datetime}
+     \label{datetime}
+\end{figure}
+
+  \subsection{mjd}
+    \label{sect:mjd}
+    Primitive type for observation dates expressed as a Modified Julian Date (e.g. 60288.8).
+
+  \subsection{jd}
+    \label{sect:jd}
+    Primitive type for observation dates expressed as a Julian Date (e.g. 25213).
+
+  \subsection{year}
+    \label{sect:year}
+    Primitive type for observation dates expressed as a year (e.g. 2015.5).
+
+  \subsection{iso}
+    \label{sect:iso}
+    Primitive type for observation dates expressed as an ISO Date (e.g. "2025-08-07T09:29:14").
+
+\section{Epoch Position Property}
 The emergence of missions such as Gaia \citep{2018A&A...616A...1G}, which are capable of 
 observing objects over long periods of time with very high astrometric accuracy,
 combined with great spectroscopic capabilities, making it possible to link star 3D positions
@@ -156,9 +182,9 @@ \section{Epoch Position Properties}
 
     \subsubsection{EpochPosition.obsDate}
     \textbf{vodml-id: EpochPosition.obsDate} \newline
-    \textbf{type: \hyperref[sect:DateTime]{mango:DateTime}} \newline
-    \textbf{multiplicity: 0..1} \newline
-    Observation date expressed within the common time system if present. This attribute, if set, supersedes the epoch possibly given with the spatial coordinate system(see the above).
+    \textbf{type: \hyperref[sect:ivoa]{ivoa:datetime}} \newline
+    \textbf{multiplicity: 1} \newline
+    Observation date expressed within the common time system if present. This attribute, if set, supersedes the epoch possibly given with the spatial coordinate system (see the above). Figure \ref{datetime} shows up the hierarchy of the primitive types representing the observation dates.
 
     \subsubsection{EpochPosition.pmCosLat\_applied}
     \textbf{vodml-id: EpochPosition.pmCosLat\_applied} \newline
@@ -288,22 +314,6 @@ \section{Epoch Position Properties}
     \textbf{multiplicity: 1} \newline
     Position error; can be an \texttt{Ellipse} or a \texttt{Symmetrical2D}.
 
-  \subsection{DateTime}
-    \label{sect:DateTime}
-    Data type for timestamps and their representation. Timestamps are modeled by a single value and a representation mode. There is no time scale associated with \texttt{mango:DateTime}. The scale is either imposed by the representation mode or defined by the time coordinate system relevant for the host object, usually an instance of \texttt{mango:EpochPosition}.
-
-    \subsubsection{DateTime.representation}
-    \textbf{vodml-id: DateTime.representation} \newline
-    \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
-    \textbf{multiplicity: 1} \newline
-    Define the representation mode. The supported values are \texttt{iso} or \texttt{dateformat} for ISO dates, \texttt{year}, \texttt{jd} or \texttt{mjd}. The list of supported values could be extended in the future with new endorsed \texttt{xtype} values.
-
-    \subsubsection{DateTime.dateTime}
-    \textbf{vodml-id: DateTime.dateTime} \newline
-    \textbf{type: \hyperref[sect:ivoa]{ivoa:datetime}} \newline
-    \textbf{multiplicity: 1} \newline
-    The timestamp value is always given as a string. The way to process this string is given by the representation mode. It can represent an ISO date or a real value (e.g. for MJD mjd timestamps).
-
 \section{Photometric and Spectroscopic Properties}
 
   \subsection{Brightness}

doc/usecases.tex

@@ -237,4 +237,4 @@ \subsubsection{Xmatch tool }
 
 UCDs may help in identifying the errors associated to positional columns, 
 %as shown in table
-but this is not sufficient for tables with more complex cases based on multi-parameter cases.
+but this is not sufficient for tables with more complex cases based on multi-parameter cases.

mivot/mango/mango.EpochPosition.xml

@@ -67,17 +67,7 @@ In some cases the errors might conflict with the correlations:
    <ATTRIBUTE dmrole="mango:EpochPosition.radialVelocity" dmtype="ivoa:RealQuantity" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:EpochPosition.pmLongitude" dmtype="ivoa:RealQuantity" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:EpochPosition.pmLatitude" dmtype="ivoa:RealQuantity" unit="" ref="@@@@@" value=""/>
-   <INSTANCE dmrole="mango:EpochPosition.obsDate" dmtype="mango:DateTime">
-      <!-- Data type for timestamps and their representation. 
-Timestamps are modeled by a single value and a representation mode.
-There is no time scale associated with \texttt{mango:DateTime}. 
-The scale is either imposed by the representation mode or defined by the
-time coordinate system relevant for the host object,
-usually an instance of \texttt{mango:EpochPosition}.
-" -->
-      <ATTRIBUTE dmrole="mango:DateTime.representation" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <ATTRIBUTE dmrole="mango:DateTime.dateTime" dmtype="ivoa:datetime" unit="" ref="@@@@@" value=""/>
-   </INSTANCE>
+   <ATTRIBUTE dmrole="mango:EpochPosition.obsDate" dmtype="ivoa:datetime" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:EpochPosition.pmCosLat_applied" dmtype="ivoa:boolean" unit="" ref="@@@@@" value=""/>
    <INSTANCE dmrole="mango:EpochPosition.errors" dmtype="mango:EpochPositionErrors">
       <!-- Class holder for the errors of the EpochPosition attributes" -->

mivot/mango/mango.Footprint.xml

@@ -2,7 +2,7 @@
    <!-- Description of the spatial extent of the MANGO object (e.g. for dust clouds).
 Footprint is serialized as a string. 
 \begin{itemize}
-   \item The supported serialization modes are listed in the \texttt{ShapeSerialization} enumeration.
+   \item The supported serialization modes are listed in the \texttt{FootprintSerialization} enumeration.
    \item If the space coordinate system is not embedded in the serialization mode, it can be defined by the \texttt{spaceSys} reference.
 \end{itemize}" -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">