diff --git a/doc/MANGO.tex b/doc/MANGO.tex
index 4a8e60f..887de28 100644
--- a/doc/MANGO.tex
+++ b/doc/MANGO.tex
@@ -385,8 +385,6 @@ \section{Integrating MANGO with TAP Services}
%\section{Xmatch tool }
%\input{usecase_xmatch.tex}
-\section{Imported Models Instance}
-
\section{Changes from Previous Versions}
No previous versions yet.
diff --git a/doc/model.tex b/doc/model.tex
index b6227d3..8242225 100644
--- a/doc/model.tex
+++ b/doc/model.tex
@@ -506,9 +506,9 @@ \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 UAT 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{DecimalYear}
+ \label{sect:DecimalYear}
+ Fractional number of years AD represented by the date. 2000.0, or equivalently 1999.99recurring, is midnight at the start of the first of January 2000. Because of leap years, the size of a unit depends on what year it is in (see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
\subsection{iso}
\label{sect:iso}
@@ -522,6 +522,14 @@ \section{Model: mango }
\label{sect:jd}
Primitive type for observation dates expressed as a Julian Date (e.g. 2460895.1).
+ \subsection{JulianEpoch}
+ \label{sect:JulianEpoch}
+ A continuous measure based on a Julian year of exactly 365.25 days ($JulianEpoch = 2000 + \frac{jd - 2451545.0}{365.25}$). For approximate purposes this resembles the fractional number of years AD represented by the date. Can be represented by prefixing a 'J'; J2000.0 is defined as 2000 January 1.5 in the TT timescale. (see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
+
+ \subsection{BesselianEpoch}
+ \label{sect:BesselianEpoch}
+ A continuous measure based on a tropical year of about 365.2422 days ($BesselianEpoch = 1900.0 + \frac{jd - 2415020.31352}{365.242198781}$). For approximate purposes this resembles the fractional number of years AD represented by the date. Can be represented by prefixing a 'B'. (see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
+
\subsection{FootprintSerialization}
\label{sect:FootprintSerialization}
diff --git a/doc/model_toc.tex b/doc/model_toc.tex
index fa4e397..bd18c58 100644
--- a/doc/model_toc.tex
+++ b/doc/model_toc.tex
@@ -108,9 +108,17 @@ \section{Date Time Types}
\label{sect:jd}
Primitive type for observation dates expressed as a Julian Date (e.g. 2460895.1).
- \subsection{year}
- \label{sect:year}
- Primitive type for observation dates expressed as a year (e.g. 2015.5).
+ \subsection{DecimalYear}
+ \label{sect:DecimalYear}
+ Fractional number of years AD represented by the date. 2000.0, or equivalently 1999.99recurring, is midnight at the start of the first of January 2000. Because of leap years, the size of a unit depends on what year it is in (see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
+
+ \subsection{JulianEpoch}
+ \label{sect:JulianEpoch}
+ A continuous measure based on a Julian year of exactly 365.25 days ($JulianEpoch = 2000 + \frac{jd - 2451545.0}{365.25}$). For approximate purposes this resembles the fractional number of years AD represented by the date. Can be represented by prefixing a 'J'; J2000.0 is defined as 2000 January 1.5 in the TT timescale. (see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
+
+ \subsection{BesselianEpoch}
+ \label{sect:BesselianEpoch}
+ A continuous measure based on a tropical year of about 365.2422 days ($BesselianEpoch = 1900.0 + \frac{jd - 2415020.31352}{365.242198781}$). For approximate purposes this resembles the fractional number of years AD represented by the date. Can be represented by prefixing a 'B'. (see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
\subsection{iso}
\label{sect:iso}
diff --git a/implementations/vizier_cs_I_239.xml b/implementations/vizier_cs_I_239.xml
index d18a251..96e21ac 100644
--- a/implementations/vizier_cs_I_239.xml
+++ b/implementations/vizier_cs_I_239.xml
@@ -52,10 +52,7 @@
-
-
-
-
+
diff --git a/implementations/xtapdb.xml b/implementations/xtapdb.xml
index 5121b2e..23b1763 100644
--- a/implementations/xtapdb.xml
+++ b/implementations/xtapdb.xml
@@ -290,10 +290,7 @@ FROM mergedentry"/>
-
-
-
-
+
diff --git a/model/date.png b/model/date.png
index c64ba63..9455604 100644
Binary files a/model/date.png and b/model/date.png differ
diff --git a/model/mango.xmi b/model/mango.xmi
index f92784c..b7d30e9 100644
--- a/model/mango.xmi
+++ b/model/mango.xmi
@@ -1,546 +1,552 @@
-
-
-
-
-
+
+
+
+
+
-
+
The purpose of MANGO is to provide a higher level of description for multi-attribute properties.
When used with MIVOT annotations, it enables tabular data to be represented as structured objects.
This enables the metadata representation to be improved and complex quantities to be reconstructed from column values. Modelled properties can be linked to each other. MANGO also enables the origin of the data to be specified.
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
<Enter note text here>
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
Root class of the model. MANGO instances are meant of be Source instances.
A source is something with an identifier and two docks: one for the parameters and one for the associated data.
-
-
+
+
Composition link pointing on all parameters attached to the source.
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
Unique identifier for a Source.
The uniqueness of that identifier is not managed by the model.
The format is free.
-
-
+
+
-
-
+
+
-
-
+
+
Class for associated data referenced by an URL
-
-
-
+
+
+
Mime type of the URL
-
-
+
+
Web endpoint
-
-
+
+
-
-
+
+
Reference to another MANGO instance that is part of the associated data.
-
-
+
+
Composition link pointing on one MANGO instance associated with the source.
-
-
+
+
Reference to a semantic concept giving the nature of the associated data.
As long as the vocabulary is not set, the possible values of this attribute are given by the LinkSemantic enumeration.
-
-
+
+
Free text description of the associated data
-
-
+
+
-
-
+
+
Reference to a particular measure of the Source.
This class is used to specify the type of the measure as well as its role.
-
-
+
+
<Enter note text here>
-
-
+
+
-
-
+
+
Reference to a semantic concept giving the nature of the parameter
As long as the vocabulary is not set, the possible values of this attribute are given by the ParamSemantic enumeration.
-
+
-
-
+
+
Free text description of the measure
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
Class grouping all parameters needed to define an object position at a given epoch. The space coordinate system is common to all attributes to insure the consistance between all of the instance parameters.
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Class for the error attached to a EpochPosition. The component in this class represent the errors of individual parameters as well as errors due to the parameter correlations.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Root (abstract) class of the errors that can be attached to a MA?GO property. The class inherit from \texttt{meas:uncertainty} in order to be usable in the context of properties based on \texttt{Measures} classes.
-
-
+
+
Confidence level of the error, expressed in \sigma.
-
+
-
-
+
+
Symetrical error for 1D parameter.
-
-
-
+
+
+
Error amplitude.
-
-
+
+
Elliptical errror for 2D parameters such as the sky positions.
-
-
-
+
+
+
Half of the ellipse major axis.
-
-
+
+
Half of the ellipse minor axis.
-
-
+
+
Angle between the North Polar Cape (NCP) and the major axis. This angle must be positive taking into account that angles are positive from North to the East. The angle has its own unit.
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
Difference of mangnitudes: typically $M_B - M_v$
-
-
+
+
Normalized ratio of fluxes: $(F_{EB2} - F_{EB1}) / (F_{EB2} + F_{EB1})$
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<Enter note text here>s
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
Reference article for the MANGO source
-
-
+
+
Article editor name
-
-
+
+
Bibcode or DOI of the reference article
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
License or Copyright text
-
-
+
+
Licence URI following the regostry practice. This should come from SPDX \url{https://spdx.org/licenses}. Creatives Commons (\url{https://creativecommons.org}) are also accepted.
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/toc.json b/utils/toc.json
index ad3415c..262b670 100644
--- a/utils/toc.json
+++ b/utils/toc.json
@@ -8,7 +8,9 @@
"Date Time Types (added)": {
"mjd": {},
"jd": {},
- "year": {},
+ "DecimalYear": {},
+ "JulianEpoch": {},
+ "BesselianEpoch": {},
"iso": {}
},
"Epoch Position Properties (added)": {
diff --git a/utils/toc.org.json b/utils/toc.org.json
index 6a15c66..9cc4d83 100644
--- a/utils/toc.org.json
+++ b/utils/toc.org.json
@@ -1 +1 @@
-{"Model: mango": {"content": "", "subsections": {"AssociatedMangoObject": {"content": ""}, "Brightness": {"content": ""}, "Color": {"content": ""}, "ColorDef": {"content": ""}, "DataLink": {"content": ""}, "DateTime": {"content": ""}, "EpochPosition": {"content": ""}, "EpochPositionCorrelations": {"content": ""}, "EpochPositionErrors": {"content": ""}, "Footprint": {"content": ""}, "Label": {"content": ""}, "MangoObject": {"content": ""}, "PhysicalProperty": {"content": ""}, "Property": {"content": ""}, "Status": {"content": ""}, "StatusValue": {"content": ""}, "StatusValues": {"content": ""}, "VocabularyTerm": {"content": ""}, "year": {"content": ""}, "iso": {"content": ""}, "mjd": {"content": ""}, "jd": {"content": ""}, "FootprintSerialization": {"content": ""}, "ColorDefinition": {"content": ""}}}, "Package: error": {"content": "", "subsections": {"PErrorAsym1D": {"content": ""}, "PErrorEllipse": {"content": ""}, "PErrorSym1D": {"content": ""}, "PErrorSym2D": {"content": ""}, "PropertyError (Abstract)": {"content": ""}}}, "Package: origin": {"content": "", "subsections": {"Article": {"content": ""}, "DataOrigin": {"content": ""}, "QueryOrigin": {"content": ""}}}}
\ No newline at end of file
+{"Model: mango": {"content": "", "subsections": {"AssociatedMangoObject": {"content": ""}, "Brightness": {"content": ""}, "Color": {"content": ""}, "ColorDef": {"content": ""}, "DataLink": {"content": ""}, "DateTime": {"content": ""}, "EpochPosition": {"content": ""}, "EpochPositionCorrelations": {"content": ""}, "EpochPositionErrors": {"content": ""}, "Footprint": {"content": ""}, "Label": {"content": ""}, "MangoObject": {"content": ""}, "PhysicalProperty": {"content": ""}, "Property": {"content": ""}, "Status": {"content": ""}, "StatusValue": {"content": ""}, "StatusValues": {"content": ""}, "VocabularyTerm": {"content": ""}, "DecimalYear": {"content": ""}, "iso": {"content": ""}, "mjd": {"content": ""}, "jd": {"content": ""}, "JulianEpoch": {"content": ""}, "BesselianEpoch": {"content": ""}, "FootprintSerialization": {"content": ""}, "ColorDefinition": {"content": ""}}}, "Package: error": {"content": "", "subsections": {"PErrorAsym1D": {"content": ""}, "PErrorEllipse": {"content": ""}, "PErrorSym1D": {"content": ""}, "PErrorSym2D": {"content": ""}, "PropertyError (Abstract)": {"content": ""}}}, "Package: origin": {"content": "", "subsections": {"Article": {"content": ""}, "DataOrigin": {"content": ""}, "QueryOrigin": {"content": ""}}}}
\ No newline at end of file
diff --git a/vo-dml/desc.mango.vo-dml.xml b/vo-dml/desc.mango.vo-dml.xml
index 6e80721..e2d36a0 100644
--- a/vo-dml/desc.mango.vo-dml.xml
+++ b/vo-dml/desc.mango.vo-dml.xml
@@ -9,7 +9,7 @@ This enables the metadata representation to be improved and complex quantities t
Laurent Michel, Fran??ois Bonnarel, Gilles Landais, Mireille Louys, Marco Molinaro, Jesue Salgado
1.0
0.0
- 2026-01-28T13:16:49
+ 2026-02-26T14:48:02
ivoa
http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml
@@ -31,10 +31,12 @@ This enables the metadata representation to be improved and complex quantities t
https://ivoa.net/documents/PHOTDM/20221101/index.html
- year
- year
- Primitive type for observation dates expressed as a year (e.g. 2015.5).
-
+ DecimalYear
+ DecimalYear
+ Fractional number of years AD represented by the date. 2000.0, or equivalently 1999.99recurring,
+is midnight at the start of the first of January 2000. Because of leap years,
+the size of a unit depends on what year it is in
+(see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
ivoa:datetime
@@ -70,6 +72,34 @@ This enables the metadata representation to be improved and complex quantities t
+
+ JulianEpoch
+ JulianEpoch
+ A continuous measure based on a Julian year of exactly 365.25 days
+($JulianEpoch = 2000 + \frac{jd - 2451545.0}{365.25}$).
+For approximate purposes this resembles the fractional number of years AD represented by the date.
+Can be represented by prefixing a 'J'; J2000.0 is defined as 2000 January 1.5 in the
+TT timescale.
+(see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
+
+
+ ivoa:datetime
+
+
+
+
+ BesselianEpoch
+ BesselianEpoch
+ A continuous measure based on a tropical year of about 365.2422 days
+($BesselianEpoch = 1900.0 + \frac{jd - 2415020.31352}{365.242198781}$).
+For approximate purposes this resembles the fractional number of years AD represented by the date.
+Can be represented by prefixing a 'B'.
+(see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
+
+ ivoa:datetime
+
+
+
FootprintSerialization
FootprintSerialization
diff --git a/vo-dml/desc/desc.BesselianEpoch.txt b/vo-dml/desc/desc.BesselianEpoch.txt
new file mode 100644
index 0000000..c71b514
--- /dev/null
+++ b/vo-dml/desc/desc.BesselianEpoch.txt
@@ -0,0 +1,5 @@
+A continuous measure based on a tropical year of about 365.2422 days
+($BesselianEpoch = 1900.0 + \frac{jd - 2415020.31352}{365.242198781}$).
+For approximate purposes this resembles the fractional number of years AD represented by the date.
+Can be represented by prefixing a 'B'.
+(see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
\ No newline at end of file
diff --git a/vo-dml/desc/desc.DecimalYear.txt b/vo-dml/desc/desc.DecimalYear.txt
new file mode 100644
index 0000000..0a7149b
--- /dev/null
+++ b/vo-dml/desc/desc.DecimalYear.txt
@@ -0,0 +1,4 @@
+Fractional number of years AD represented by the date. 2000.0, or equivalently 1999.99recurring,
+is midnight at the start of the first of January 2000. Because of leap years,
+the size of a unit depends on what year it is in
+(see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
\ No newline at end of file
diff --git a/vo-dml/desc/desc.JulianEpoch.txt b/vo-dml/desc/desc.JulianEpoch.txt
new file mode 100644
index 0000000..bacc9c1
--- /dev/null
+++ b/vo-dml/desc/desc.JulianEpoch.txt
@@ -0,0 +1,6 @@
+A continuous measure based on a Julian year of exactly 365.25 days
+($JulianEpoch = 2000 + \frac{jd - 2451545.0}{365.25}$).
+For approximate purposes this resembles the fractional number of years AD represented by the date.
+Can be represented by prefixing a 'J'; J2000.0 is defined as 2000 January 1.5 in the
+TT timescale.
+(see \url{https://www.star.bris.ac.uk/~mbt/topcat/sun253/sun253.html#Times}).
diff --git a/vo-dml/desc/desc.year.txt b/vo-dml/desc/desc.year.txt
deleted file mode 100644
index c14d769..0000000
--- a/vo-dml/desc/desc.year.txt
+++ /dev/null
@@ -1 +0,0 @@
-Primitive type for observation dates expressed as a year (e.g. 2015.5).
diff --git a/vo-dml/mango.png b/vo-dml/mango.png
index 0665cf1..cfbe150 100644
Binary files a/vo-dml/mango.png and b/vo-dml/mango.png differ
diff --git a/vo-dml/mango.vo-dml.xml b/vo-dml/mango.vo-dml.xml
index 89fed73..45eff54 100644
--- a/vo-dml/mango.vo-dml.xml
+++ b/vo-dml/mango.vo-dml.xml
@@ -12,7 +12,7 @@ This enables the metadata representation to be improved and complex quantities t
Laurent Michel, Fran??ois Bonnarel, Gilles Landais, Mireille Louys, Marco Molinaro, Jesue Salgado
1.0
0.0
- 2026-01-28T13:16:49
+ 2026-02-26T14:48:02
ivoa
http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml
@@ -34,8 +34,8 @@ This enables the metadata representation to be improved and complex quantities t
https://ivoa.net/documents/PHOTDM/20221101/index.html
- year
- year
+ DecimalYear
+ DecimalYear
TODO : Missing description : please, update your UML model asap.
@@ -77,6 +77,28 @@ This enables the metadata representation to be improved and complex quantities t
+
+ JulianEpoch
+ JulianEpoch
+
+ TODO : Missing description : please, update your UML model asap.
+
+
+ ivoa:datetime
+
+
+
+
+ BesselianEpoch
+ BesselianEpoch
+
+ TODO : Missing description : please, update your UML model asap.
+
+
+ ivoa:datetime
+
+
+
FootprintSerialization
FootprintSerialization