[Volute] r4898 - trunk/projects/dm/STC/vo-dml

Volute commit messages volutecommits at g-vo.org
Fri Apr 6 21:03:13 CEST 2018


Author: mdittmar
Date: Fri Apr  6 21:03:13 2018
New Revision: 4898

Log:
update vo-dml products for coords object reduction

Modified:
   trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.html
   trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.png
   trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.vo-dml.xml
   trunk/projects/dm/STC/vo-dml/vo-dml.properties

Modified: trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.html
==============================================================================
--- trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.html	Fri Apr  6 21:01:59 2018	(r4897)
+++ trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.html	Fri Apr  6 21:03:13 2018	(r4898)
@@ -128,50 +128,46 @@
         </tr>
         <tr>
           <td>2.1.27</td>
-          <td>    <a href="#RedshiftCoordMeasure">objectType:RedshiftCoordMeasure</a></td>
+          <td>    <a href="#SpectralCoordMeasure">objectType:SpectralCoordMeasure</a></td>
         </tr>
         <tr>
           <td>2.1.28</td>
-          <td>    <a href="#SkyPosition">objectType:SkyPosition</a></td>
+          <td>    <a href="#StdPosition">objectType:StdPosition</a></td>
         </tr>
         <tr>
           <td>2.1.29</td>
-          <td>    <a href="#SpectralCoordMeasure">objectType:SpectralCoordMeasure</a></td>
-        </tr>
-        <tr>
-          <td>2.1.30</td>
           <td>    <a href="#StdTimeMeasure">objectType:StdTimeMeasure</a></td>
         </tr>
         <tr>
-          <td>2.1.31</td>
+          <td>2.1.30</td>
           <td>    <a href="#Symmetrical1D">dataType:Symmetrical1D</a></td>
         </tr>
         <tr>
-          <td>2.1.32</td>
+          <td>2.1.31</td>
           <td>    <a href="#Symmetrical2D">dataType:Symmetrical2D</a></td>
         </tr>
         <tr>
-          <td>2.1.33</td>
+          <td>2.1.32</td>
           <td>    <a href="#Symmetrical3D">dataType:Symmetrical3D</a></td>
         </tr>
         <tr>
-          <td>2.1.34</td>
+          <td>2.1.33</td>
           <td>    <a href="#TimeMeasure">objectType:TimeMeasure</a></td>
         </tr>
         <tr>
-          <td>2.1.35</td>
+          <td>2.1.34</td>
           <td>    <a href="#Uncertainty">dataType:Uncertainty</a></td>
         </tr>
         <tr>
-          <td>2.1.36</td>
+          <td>2.1.35</td>
           <td>    <a href="#Uncertainty1D">dataType:Uncertainty1D</a></td>
         </tr>
         <tr>
-          <td>2.1.37</td>
+          <td>2.1.36</td>
           <td>    <a href="#Uncertainty2D">dataType:Uncertainty2D</a></td>
         </tr>
         <tr>
-          <td>2.1.38</td>
+          <td>2.1.37</td>
           <td>    <a href="#Uncertainty3D">dataType:Uncertainty3D</a></td>
         </tr>
         <tr>
@@ -207,7 +203,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2018-02-23T17:34:11</td>
+        <td>2018-04-06T14:59:38</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -243,7 +239,7 @@
 <area shape="rect" id="node2" href="#Uncertainty" title="{<<datatype>>\nUncertainty}" alt="" coords="864,342,947,391"/>
 <area shape="rect" id="node3" href="#Uncertainty1D" title="{<<datatype>>\nUncertainty1D}" alt="" coords="281,227,367,277"/>
 <area shape="rect" id="node4" href="#Uncertainty2D" title="{<<datatype>>\nUncertainty2D}" alt="" coords="863,227,948,277"/>
-<area shape="rect" id="node5" href="#Uncertainty3D" title="{<<datatype>>\nUncertainty3D}" alt="" coords="1613,227,1699,277"/>
+<area shape="rect" id="node5" href="#Uncertainty3D" title="{<<datatype>>\nUncertainty3D}" alt="" coords="1615,227,1700,277"/>
 <area shape="rect" id="node6" href="#Symmetrical1D" title="{<<datatype>>\nSymmetrical1D|+radius : ivoa:RealQuantity\l}" alt="" coords="5,59,147,122"/>
 <area shape="rect" id="node7" href="#Asymmetrical1D" title="{<<datatype>>\nAsymmetrical1D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="171,53,309,129"/>
 <area shape="rect" id="node8" href="#Bounds1D" title="{<<datatype>>\nBounds1D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="333,53,480,129"/>
@@ -260,12 +256,12 @@
 <area shape="rect" id="node19" href="#Matrix3x3" title="{<<datatype>>\nMatrix3x3|+m11 : ivoa:real\l+m12 : ivoa:real\l+m13 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l+m23 : ivoa:real\l+m31 : ivoa:real\l+m32 : ivoa:real\l+m33 : ivoa:real\l}" alt="" coords="2291,6,2384,175"/>
 <area shape="rect" id="node20" href="#CovarianceMatrix2D" title="{<<datatype>>\nCovarianceMatrix2D|+matrix : meas:Matrix2x2\l}" alt="" coords="1181,59,1315,122"/>
 <area shape="rect" id="node21" href="#CovarianceMatrix3D" title="{<<datatype>>\nCovarianceMatrix3D|+matrix : meas:Matrix3x3\l}" alt="" coords="2016,59,2149,122"/>
-<area shape="rect" id="node22" href="#CoordMeasure" title="{CoordMeasure|+coord : coords:Coordinate\l}" alt="" coords="2676,342,2815,391"/>
-<area shape="rect" id="node23" href="#Error" title="{Error}" alt="" coords="2439,473,2511,522"/>
-<area shape="rect" id="node39" href="#Measure" title="{Measure}" alt="" coords="2839,473,2911,522"/>
-<area shape="rect" id="node24" href="#Error1D" title="{Error1D|+statError : meas:Uncertainty1D\l+sysError : meas:Uncertainty1D\l+ranError : meas:Uncertainty1D\l}" alt="" coords="2297,329,2463,405"/>
-<area shape="rect" id="node25" href="#Error2D" title="{Error2D|+statError : meas:Uncertainty2D\l+sysError : meas:Uncertainty2D\l+ranError : meas:Uncertainty2D\l}" alt="" coords="2487,329,2652,405"/>
-<area shape="rect" id="node26" href="#Error3D" title="{Error3D|+statError : meas:Uncertainty3D\l+sysError : meas:Uncertainty3D\l+ranError : meas:Uncertainty3D\l}" alt="" coords="2108,329,2273,405"/>
+<area shape="rect" id="node22" href="#CoordMeasure" title="{CoordMeasure|+coord : coords:Coordinate\l}" alt="" coords="2645,342,2784,391"/>
+<area shape="rect" id="node23" href="#Error" title="{Error}" alt="" coords="2408,473,2480,522"/>
+<area shape="rect" id="node38" href="#Measure" title="{Measure}" alt="" coords="2808,473,2880,522"/>
+<area shape="rect" id="node24" href="#Error1D" title="{Error1D|+statError : meas:Uncertainty1D\l+sysError : meas:Uncertainty1D\l+ranError : meas:Uncertainty1D\l}" alt="" coords="2267,329,2432,405"/>
+<area shape="rect" id="node25" href="#Error2D" title="{Error2D|+statError : meas:Uncertainty2D\l+sysError : meas:Uncertainty2D\l+ranError : meas:Uncertainty2D\l}" alt="" coords="2456,329,2621,405"/>
+<area shape="rect" id="node26" href="#Error3D" title="{Error3D|+statError : meas:Uncertainty3D\l+sysError : meas:Uncertainty3D\l+ranError : meas:Uncertainty3D\l}" alt="" coords="2077,329,2243,405"/>
 <area shape="rect" id="node27" href="#GenericCoordMeasure" title="{GenericCoordMeasure}" alt="" coords="2445,227,2565,277"/>
 <area shape="rect" id="node28" href="#Position" title="{Position}" alt="" coords="2589,227,2661,277"/>
 <area shape="rect" id="node29" href="#Position1D" title="{Position1D}" alt="" coords="2600,66,2672,115"/>
@@ -273,11 +269,10 @@
 <area shape="rect" id="node31" href="#Position3D" title="{Position3D}" alt="" coords="2408,66,2480,115"/>
 <area shape="rect" id="node32" href="#SpectralCoordMeasure" title="{SpectralCoordMeasure}" alt="" coords="2685,227,2805,277"/>
 <area shape="rect" id="node33" href="#TimeMeasure" title="{TimeMeasure}" alt="" coords="2829,227,2912,277"/>
-<area shape="rect" id="node34" href="#Polarization" title="{Polarization|+coord : coords:domain.polarization.PolCoordValue\l}" alt="" coords="2839,342,3084,391"/>
-<area shape="rect" id="node35" href="#RedshiftCoordMeasure" title="{RedshiftCoordMeasure}" alt="" coords="2936,227,3056,277"/>
-<area shape="rect" id="node36" href="#SkyPosition" title="{SkyPosition}" alt="" coords="2504,66,2576,115"/>
-<area shape="rect" id="node37" href="#GenTimeMeasure" title="{GenTimeMeasure}" alt="" coords="2801,66,2900,115"/>
-<area shape="rect" id="node38" href="#StdTimeMeasure" title="{StdTimeMeasure}" alt="" coords="2924,66,3020,115"/>
+<area shape="rect" id="node34" href="#Polarization" title="{Polarization|+coord : coords:domain.polarization.PolCoordValue\l}" alt="" coords="2808,342,3053,391"/>
+<area shape="rect" id="node35" href="#StdPosition" title="{StdPosition}" alt="" coords="2504,66,2576,115"/>
+<area shape="rect" id="node36" href="#GenTimeMeasure" title="{GenTimeMeasure}" alt="" coords="2812,66,2911,115"/>
+<area shape="rect" id="node37" href="#StdTimeMeasure" title="{StdTimeMeasure}" alt="" coords="2935,66,3031,115"/>
 </map>
 
     <hr>
@@ -297,7 +292,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#CoordMeasure">CoordMeasure</a> <a href="#Error">Error</a> <a href="#Error1D">Error1D</a> <a href="#Error2D">Error2D</a> <a href="#Error3D">Error3D</a> <a href="#GenTimeMeasure">GenTimeMeasure</a> <a href="#GenericCoordMeasure">GenericCoordMeasure</a> <a href="#Measure">Measure</a> <a href="#Polarization">Polarization</a> <a href="#Position">Position</a> <a href="#Position1D">Position1D</a> <a href="#Position2D">Position2D</a> <a href="#Position3D">Position3D</a> <a href="#RedshiftCoordMeasure">RedshiftCoordMeasure</a> <a href="#SkyPosition">SkyPosition</a> <a href="#SpectralCoordMeasure">SpectralCoordMeasure</a> <a href="#StdTimeMeasure">StdTimeMeasure</a> <a href="#TimeMeasure">TimeMeasure</a> 
+        <td colspan="2" class="feature-detail"><a href="#CoordMeasure">CoordMeasure</a> <a href="#Error">Error</a> <a href="#Error1D">Error1D</a> <a href="#Error2D">Error2D</a> <a href="#Error3D">Error3D</a> <a href="#GenTimeMeasure">GenTimeMeasure</a> <a href="#GenericCoordMeasure">GenericCoordMeasure</a> <a href="#Measure">Measure</a> <a href="#Polarization">Polarization</a> <a href="#Position">Position</a> <a href="#Position1D">Position1D</a> <a href="#Position2D">Position2D</a> <a href="#Position3D">Position3D</a> <a href="#SpectralCoordMeasure">SpectralCoordMeasure</a> <a href="#StdPosition">StdPosition</a> <a href="#StdTimeMeasure">StdTimeMeasure</a> <a href="#TimeMeasure">TimeMeasure</a> 
         </td>
       </tr>
       <tr>
@@ -817,7 +812,7 @@
                     </tr>
                     <tr>
                       <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#GenericCoordMeasure">GenericCoordMeasure</a> <a href="#Position">Position</a> <a href="#RedshiftCoordMeasure">RedshiftCoordMeasure</a> <a href="#SpectralCoordMeasure">SpectralCoordMeasure</a> <a href="#TimeMeasure">TimeMeasure</a> 
+                      <td class="feature-detail" colspan="3"><a href="#GenericCoordMeasure">GenericCoordMeasure</a> <a href="#Position">Position</a> <a href="#SpectralCoordMeasure">SpectralCoordMeasure</a> <a href="#TimeMeasure">TimeMeasure</a> 
                       </td>
                     </tr>
                     <tr>
@@ -1557,7 +1552,7 @@
                       <td class="feature-heading" valign="top">
                         	  datatype
                       </td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#domain.time.TimeOffset">domain.time.TimeOffset</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#PhysicalCoordValue">PhysicalCoordValue</a></td>
                     </tr>
                   </table>
                 </td>
@@ -1607,7 +1602,7 @@
                       <td class="feature-heading" valign="top">
                         	  datatype
                       </td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#GenericCoordValue">GenericCoordValue</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#PhysicalCoordValue">PhysicalCoordValue</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="feature-detail" valign="top"><a href="#CoordMeasure.error">error [meas:CoordMeasure.error]</a></td>
@@ -2131,7 +2126,7 @@
                     </tr>
                     <tr>
                       <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#Position1D">Position1D</a> <a href="#Position2D">Position2D</a> <a href="#Position3D">Position3D</a> <a href="#SkyPosition">SkyPosition</a> 
+                      <td class="feature-detail" colspan="3"><a href="#Position1D">Position1D</a> <a href="#Position2D">Position2D</a> <a href="#Position3D">Position3D</a> <a href="#StdPosition">StdPosition</a> 
                       </td>
                     </tr>
                   </table>
@@ -2182,7 +2177,7 @@
                       <td class="feature-heading" valign="top">
                         	  datatype
                       </td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#domain.space.SpatialCoordValue">domain.space.SpatialCoordValue</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#PhysicalCoordValue">PhysicalCoordValue</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="feature-detail" valign="top"><a href="#CoordMeasure.error">error [meas:CoordMeasure.error]</a></td>
@@ -2252,7 +2247,7 @@
                       <td class="feature-heading" valign="top">
                         	  datatype
                       </td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#domain.space.SpatialCoord2D">domain.space.SpatialCoord2D</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#CompositeCoord2D">CompositeCoord2D</a></td>
                     </tr>
                   </table>
                 </td>
@@ -2302,7 +2297,7 @@
                       <td class="feature-heading" valign="top">
                         	  datatype
                       </td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#domain.space.SpatialCoord3D">domain.space.SpatialCoord3D</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#CompositeCoord3D">CompositeCoord3D</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="feature-detail" valign="top"><a href="#CoordMeasure.error">error [meas:CoordMeasure.error]</a></td>
@@ -2321,13 +2316,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="RedshiftCoordMeasure"></a>2.1.27 objectType: RedshiftCoordMeasure
+    </div><br><h3><a name="SpectralCoordMeasure"></a>2.1.27 objectType: SpectralCoordMeasure
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">RedshiftCoordMeasure</td>
+          <td class="objecttype-name" colspan="1">SpectralCoordMeasure</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2362,7 +2357,7 @@
                       <td class="feature-heading" valign="top">
                         	  datatype
                       </td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#domain.redshift.RedshiftValue">domain.redshift.RedshiftValue</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#PhysicalCoordValue">PhysicalCoordValue</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="feature-detail" valign="top"><a href="#CoordMeasure.error">error [meas:CoordMeasure.error]</a></td>
@@ -2381,13 +2376,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="SkyPosition"></a>2.1.28 objectType: SkyPosition
+    </div><br><h3><a name="StdPosition"></a>2.1.28 objectType: StdPosition
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">SkyPosition</td>
+          <td class="objecttype-name" colspan="1">StdPosition</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2422,67 +2417,7 @@
                       <td class="feature-heading" valign="top">
                         	  datatype
                       </td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#domain.space.SkyCoord">domain.space.SkyCoord</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="SpectralCoordMeasure"></a>2.1.29 objectType: SpectralCoordMeasure
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">SpectralCoordMeasure</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CoordMeasure">CoordMeasure [meas:CoordMeasure]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#CoordMeasure.coord">coord [meas:CoordMeasure.coord]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#domain.spectral.SpectralValue">domain.spectral.SpectralValue</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#CoordMeasure.error">error [meas:CoordMeasure.error]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#Error1D">Error1D [meas:Error1D]</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html#domain.space.SpaceCoord">domain.space.SpaceCoord</a></td>
                     </tr>
                   </table>
                 </td>
@@ -2491,7 +2426,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="StdTimeMeasure"></a>2.1.30 objectType: StdTimeMeasure
+    </div><br><h3><a name="StdTimeMeasure"></a>2.1.29 objectType: StdTimeMeasure
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2541,7 +2476,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Symmetrical1D"></a>2.1.31 dataType: Symmetrical1D
+    </div><br><h3><a name="Symmetrical1D"></a>2.1.30 dataType: Symmetrical1D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2601,7 +2536,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Symmetrical2D"></a>2.1.32 dataType: Symmetrical2D
+    </div><br><h3><a name="Symmetrical2D"></a>2.1.31 dataType: Symmetrical2D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2661,7 +2596,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Symmetrical3D"></a>2.1.33 dataType: Symmetrical3D
+    </div><br><h3><a name="Symmetrical3D"></a>2.1.32 dataType: Symmetrical3D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2721,7 +2656,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TimeMeasure"></a>2.1.34 objectType: TimeMeasure
+    </div><br><h3><a name="TimeMeasure"></a>2.1.33 objectType: TimeMeasure
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2776,7 +2711,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Uncertainty"></a>2.1.35 dataType: Uncertainty
+    </div><br><h3><a name="Uncertainty"></a>2.1.34 dataType: Uncertainty
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2813,7 +2748,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Uncertainty1D"></a>2.1.36 dataType: Uncertainty1D
+    </div><br><h3><a name="Uncertainty1D"></a>2.1.35 dataType: Uncertainty1D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2854,7 +2789,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Uncertainty2D"></a>2.1.37 dataType: Uncertainty2D
+    </div><br><h3><a name="Uncertainty2D"></a>2.1.36 dataType: Uncertainty2D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2895,7 +2830,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Uncertainty3D"></a>2.1.38 dataType: Uncertainty3D
+    </div><br><h3><a name="Uncertainty3D"></a>2.1.37 dataType: Uncertainty3D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3510,15 +3445,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#RedshiftCoordMeasure">RedshiftCoordMeasure</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#SkyPosition">SkyPosition</a></td>
+        <td class="feature-detail"><a href="#SpectralCoordMeasure">SpectralCoordMeasure</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -3526,7 +3453,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#SpectralCoordMeasure">SpectralCoordMeasure</a></td>
+        <td class="feature-detail"><a href="#StdPosition">StdPosition</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.

Modified: trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.vo-dml.xml
==============================================================================
--- trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.vo-dml.xml	Fri Apr  6 21:01:59 2018	(r4897)
+++ trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.vo-dml.xml	Fri Apr  6 21:03:13 2018	(r4898)
@@ -11,7 +11,7 @@
   <author>Arnold Rots, Mark Cresitello-Dittmar, Omar Laurino</author>
   <version>2.0</version>
   <previousVersion>0.x</previousVersion>
-  <lastModified>2018-02-23T17:34:11</lastModified>
+  <lastModified>2018-04-06T14:59:38</lastModified>
   <import>
     <name>ivoa</name>
     <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.vo-dml.xml</url>
@@ -932,7 +932,7 @@
         <vodml-ref>meas:CoordMeasure.coord</vodml-ref>
       </role>
       <datatype>
-        <vodml-ref>coords:GenericCoordValue</vodml-ref>
+        <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
       </datatype>
     </constraint>
     <constraint xsi:type="vo-dml:SubsettedRole">
@@ -970,7 +970,7 @@
         <vodml-ref>meas:CoordMeasure.coord</vodml-ref>
       </role>
       <datatype>
-        <vodml-ref>coords:domain.space.SpatialCoordValue</vodml-ref>
+        <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
       </datatype>
     </constraint>
     <constraint xsi:type="vo-dml:SubsettedRole">
@@ -1005,7 +1005,7 @@
         <vodml-ref>meas:CoordMeasure.coord</vodml-ref>
       </role>
       <datatype>
-        <vodml-ref>coords:domain.space.SpatialCoord2D</vodml-ref>
+        <vodml-ref>coords:CompositeCoord2D</vodml-ref>
       </datatype>
     </constraint>
   </objectType>
@@ -1024,7 +1024,7 @@
         <vodml-ref>meas:CoordMeasure.coord</vodml-ref>
       </role>
       <datatype>
-        <vodml-ref>coords:domain.space.SpatialCoord3D</vodml-ref>
+        <vodml-ref>coords:CompositeCoord3D</vodml-ref>
       </datatype>
     </constraint>
     <constraint xsi:type="vo-dml:SubsettedRole">
@@ -1051,7 +1051,7 @@
         <vodml-ref>meas:CoordMeasure.coord</vodml-ref>
       </role>
       <datatype>
-        <vodml-ref>coords:domain.spectral.SpectralValue</vodml-ref>
+        <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
       </datatype>
     </constraint>
     <constraint xsi:type="vo-dml:SubsettedRole">
@@ -1109,35 +1109,8 @@
   </objectType>
 
   <objectType>
-    <vodml-id>RedshiftCoordMeasure</vodml-id>
-    <name>RedshiftCoordMeasure</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    <extends>
-      <vodml-ref>meas:CoordMeasure</vodml-ref>
-    </extends>
-    <constraint xsi:type="vo-dml:SubsettedRole">
-      <role>
-        <vodml-ref>meas:CoordMeasure.coord</vodml-ref>
-      </role>
-      <datatype>
-        <vodml-ref>coords:domain.redshift.RedshiftValue</vodml-ref>
-      </datatype>
-    </constraint>
-    <constraint xsi:type="vo-dml:SubsettedRole">
-      <role>
-        <vodml-ref>meas:CoordMeasure.error</vodml-ref>
-      </role>
-      <datatype>
-        <vodml-ref>meas:Error1D</vodml-ref>
-      </datatype>
-    </constraint>
-  </objectType>
-
-  <objectType>
-    <vodml-id>SkyPosition</vodml-id>
-    <name>SkyPosition</name>
+    <vodml-id>StdPosition</vodml-id>
+    <name>StdPosition</name>
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1149,7 +1122,7 @@
         <vodml-ref>meas:CoordMeasure.coord</vodml-ref>
       </role>
       <datatype>
-        <vodml-ref>coords:domain.space.SkyCoord</vodml-ref>
+        <vodml-ref>coords:domain.space.SpaceCoord</vodml-ref>
       </datatype>
     </constraint>
   </objectType>
@@ -1168,7 +1141,7 @@
         <vodml-ref>meas:CoordMeasure.coord</vodml-ref>
       </role>
       <datatype>
-        <vodml-ref>coords:domain.time.TimeOffset</vodml-ref>
+        <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
       </datatype>
     </constraint>
   </objectType>

Modified: trunk/projects/dm/STC/vo-dml/vo-dml.properties
==============================================================================
--- trunk/projects/dm/STC/vo-dml/vo-dml.properties	Fri Apr  6 21:01:59 2018	(r4897)
+++ trunk/projects/dm/STC/vo-dml/vo-dml.properties	Fri Apr  6 21:03:13 2018	(r4898)
@@ -6,14 +6,14 @@
 # prefix used in all generated file names
 # vo-dml target = ${dm.file.name}.vo-dml.xml
 # html target = ${dm.file.name}.html
-dm.filename.prefix = STC_coords-v2.0
-#dm.filename.prefix = STC_meas-v2.0
+#dm.filename.prefix = STC_coords-v2.0
+dm.filename.prefix = STC_meas-v2.0
 #dm.filename.prefix = STC_trans-v2.0
 
 
 # Model in XMI format
-xmi.source = ../model/coords/stc_coords_2.0_uml2p4p1.xmi
-#xmi.source = ../model/meas/stc_meas_2.0_uml2p4p1.xmi
+#xmi.source = ../model/coords/stc_coords_2.0_uml2p4p1.xmi
+xmi.source = ../model/meas/stc_meas_2.0_uml2p4p1.xmi
 #xmi.source = ../model/trans/stc_trans_2.0_uml2p4p1.xmi
 #
 # AR UModel versions


More information about the Volutecommits mailing list