[Volute] r3997 - in trunk/projects/dm/vo-dml/models: cube ds

Volute commit messages volutecommits at g-vo.org
Sat Apr 29 00:50:56 CEST 2017


Author: mdittmar
Date: Sat Apr 29 00:50:55 2017
New Revision: 3997

Log:
migrate alternate model to current - Dataset

Deleted:
   trunk/projects/dm/vo-dml/models/ds/datasetModel_uml2p4p1.xmi
Modified:
   trunk/projects/dm/vo-dml/models/cube/Cube-1.0.html
   trunk/projects/dm/vo-dml/models/cube/Cube-1.0.png
   trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml
   trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml.validation-report.txt
   trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html
   trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.png
   trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml
   trunk/projects/dm/vo-dml/models/ds/vo-dml.properties

Modified: trunk/projects/dm/vo-dml/models/cube/Cube-1.0.html
==============================================================================
--- trunk/projects/dm/vo-dml/models/cube/Cube-1.0.html	Sat Apr 29 00:47:32 2017	(r3996)
+++ trunk/projects/dm/vo-dml/models/cube/Cube-1.0.html	Sat Apr 29 00:50:55 2017	(r3997)
@@ -24,11 +24,11 @@
         </tr>
         <tr>
           <td>2.1.1</td>
-          <td>    <a href="#CoordSys">objectType:CoordSys</a></td>
+          <td>    <a href="#DataAxis">objectType:DataAxis</a></td>
         </tr>
         <tr>
           <td>2.1.2</td>
-          <td>    <a href="#DataAxis">objectType:DataAxis</a></td>
+          <td>    <a href="#DataElement">objectType:DataElement</a></td>
         </tr>
         <tr>
           <td>2.1.3</td>
@@ -36,54 +36,34 @@
         </tr>
         <tr>
           <td>2.1.4</td>
-          <td>    <a href="#DependentAxis">objectType:DependentAxis</a></td>
-        </tr>
-        <tr>
-          <td>2.1.5</td>
-          <td>    <a href="#Mappings">objectType:Mappings</a></td>
-        </tr>
-        <tr>
-          <td>2.1.6</td>
           <td>    <a href="#NDImage">objectType:NDImage</a></td>
         </tr>
         <tr>
-          <td>2.1.7</td>
-          <td>    <a href="#NDImageDataset">objectType:NDImageDataset</a></td>
-        </tr>
-        <tr>
-          <td>2.1.8</td>
+          <td>2.1.5</td>
           <td>    <a href="#NDPoint">objectType:NDPoint</a></td>
         </tr>
         <tr>
-          <td>2.1.9</td>
+          <td>2.1.6</td>
           <td>    <a href="#Observable">objectType:Observable</a></td>
         </tr>
         <tr>
-          <td>2.1.10</td>
+          <td>2.1.7</td>
           <td>    <a href="#PixelAxis">objectType:PixelAxis</a></td>
         </tr>
         <tr>
-          <td>2.1.11</td>
-          <td>    <a href="#PixelCoordSys">objectType:PixelCoordSys</a></td>
-        </tr>
-        <tr>
-          <td>2.1.12</td>
+          <td>2.1.8</td>
           <td>    <a href="#PixelatedDataProduct">objectType:PixelatedDataProduct</a></td>
         </tr>
         <tr>
-          <td>2.1.13</td>
+          <td>2.1.9</td>
           <td>    <a href="#PointDataProduct">objectType:PointDataProduct</a></td>
         </tr>
         <tr>
-          <td>2.1.14</td>
+          <td>2.1.10</td>
           <td>    <a href="#SparseCube">objectType:SparseCube</a></td>
         </tr>
         <tr>
-          <td>2.1.15</td>
-          <td>    <a href="#SparseCubeDataset">objectType:SparseCubeDataset</a></td>
-        </tr>
-        <tr>
-          <td>2.1.16</td>
+          <td>2.1.11</td>
           <td>    <a href="#Voxel">objectType:Voxel</a></td>
         </tr>
         <tr>
@@ -104,17 +84,17 @@
         <tr>
           <td>4.2</td>
           <td>
-                <a href="#coordsys">coordsys</a></td>
+                <a href="#ds">ds</a></td>
         </tr>
         <tr>
           <td>4.3</td>
           <td>
-                <a href="#ds">ds</a></td>
+                <a href="#ivoa">ivoa</a></td>
         </tr>
         <tr>
           <td>4.4</td>
           <td>
-                <a href="#ivoa">ivoa</a></td>
+                <a href="#meas">meas</a></td>
         </tr>
         <tr>
           <td>4.5</td>
@@ -136,7 +116,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2017-02-04T22:23:34</td>
+        <td>2017-04-28T17:28:12</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -164,22 +144,17 @@
         <td colspan="3"></td>
       </tr>
     </table><img src="Cube-1.0.png" usemap="#GVmap"><map id="GVmap" name="GVmap">
-<area shape="rect" id="node2" href="#NDImageDataset" title="{NDImageDataset}" alt="" coords="345,6,444,55"/>
-<area shape="rect" id="node3" href="#NDImage" title="{NDImage}" alt="" coords="292,123,364,173"/>
-<area shape="rect" id="node7" href="#PixelatedDataProduct" title="{PixelatedDataProduct}" alt="" coords="211,241,325,290"/>
-<area shape="rect" id="node12" href="#Voxel" title="{Voxel}" alt="" coords="349,241,421,290"/>
-<area shape="rect" id="node4" href="#SparseCubeDataset" title="{SparseCubeDataset}" alt="" coords="487,6,593,55"/>
-<area shape="rect" id="node5" href="#SparseCube" title="{SparseCube}" alt="" coords="545,123,617,173"/>
-<area shape="rect" id="node8" href="#PointDataProduct" title="{PointDataProduct}" alt="" coords="499,241,597,290"/>
-<area shape="rect" id="node13" href="#NDPoint" title="{NDPoint}" alt="" coords="624,241,696,290"/>
-<area shape="rect" id="node6" href="#DataProduct" title="{DataProduct}" alt="" coords="408,358,483,407"/>
-<area shape="rect" id="node9" href="#CoordSys" title="{CoordSys}" alt="" coords="428,475,500,525"/>
-<area shape="rect" id="node11" href="#Mappings" title="{Mappings}" alt="" coords="328,475,400,525"/>
-<area shape="rect" id="node14" href="#Observable" title="{Observable}" alt="" coords="581,475,653,525"/>
-<area shape="rect" id="node10" href="#PixelCoordSys" title="{PixelCoordSys}" alt="" coords="51,358,136,407"/>
-<area shape="rect" id="node16" href="#PixelAxis" title="{PixelAxis}" alt="" coords="295,358,367,407"/>
-<area shape="rect" id="node17" href="#DependentAxis" title="{DependentAxis}" alt="" coords="515,358,603,407"/>
-<area shape="rect" id="node15" href="#DataAxis" title="{DataAxis}" alt="" coords="631,358,703,407"/>
+<area shape="rect" id="node2" href="#NDImage" title="{NDImage}" alt="" coords="231,6,303,55"/>
+<area shape="rect" id="node5" href="#PixelatedDataProduct" title="{PixelatedDataProduct}" alt="" coords="276,123,391,173"/>
+<area shape="rect" id="node7" href="#Voxel" title="{Voxel}" alt="" coords="180,123,252,173"/>
+<area shape="rect" id="node3" href="#SparseCube" title="{SparseCube}" alt="" coords="496,6,568,55"/>
+<area shape="rect" id="node6" href="#PointDataProduct" title="{PointDataProduct}" alt="" coords="559,123,657,173"/>
+<area shape="rect" id="node8" href="#NDPoint" title="{NDPoint}" alt="" coords="457,123,529,173"/>
+<area shape="rect" id="node4" href="#DataProduct" title="{DataProduct}" alt="" coords="597,241,672,290"/>
+<area shape="rect" id="node11" href="#PixelAxis" title="{PixelAxis|+coord : coords:domain.pixel.PixelIndex\l}" alt="" coords="5,241,200,290"/>
+<area shape="rect" id="node12" href="#DataElement" title="{DataElement}" alt="" coords="379,241,456,290"/>
+<area shape="rect" id="node9" href="#Observable" title="{Observable}" alt="" coords="480,241,552,290"/>
+<area shape="rect" id="node10" href="#DataAxis" title="{DataAxis|+dependent : ivoa:boolean\l}" alt="" coords="304,358,437,407"/>
 </map>
 
     <hr>
@@ -199,17 +174,17 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#CoordSys">CoordSys</a> <a href="#DataAxis">DataAxis</a> <a href="#DataProduct">DataProduct</a> <a href="#DependentAxis">DependentAxis</a> <a href="#Mappings">Mappings</a> <a href="#NDImage">NDImage</a> <a href="#NDImageDataset">NDImageDataset</a> <a href="#NDPoint">NDPoint</a> <a href="#Observable">Observable</a> <a href="#PixelAxis">PixelAxis</a> <a href="#PixelCoordSys">PixelCoordSys</a> <a href="#PixelatedDataProduct">PixelatedDataProduct</a> <a href="#PointDataProduct">PointDataProduct</a> <a href="#SparseCube">SparseCube</a> <a href="#SparseCubeDataset">SparseCubeDataset</a> <a href="#Voxel">Voxel</a> 
+        <td colspan="2" class="feature-detail"><a href="#DataAxis">DataAxis</a> <a href="#DataElement">DataElement</a> <a href="#DataProduct">DataProduct</a> <a href="#NDImage">NDImage</a> <a href="#NDPoint">NDPoint</a> <a href="#Observable">Observable</a> <a href="#PixelAxis">PixelAxis</a> <a href="#PixelatedDataProduct">PixelatedDataProduct</a> <a href="#PointDataProduct">PointDataProduct</a> <a href="#SparseCube">SparseCube</a> <a href="#Voxel">Voxel</a> 
         </td>
       </tr>
     </table>
-    <h3><a name="CoordSys"></a>2.1.1 objectType: CoordSys
+    <h3><a name="DataAxis"></a>2.1.1 objectType: DataAxis
     </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">CoordSys</td>
+          <td class="objecttype-name" colspan="1">DataAxis</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -225,7 +200,12 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td colspan="3" class="info-title">references</td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#Observable">Observable</a> 
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -233,13 +213,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="CoordSys.instref"></a><b>instref</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="DataAxis.dependent"></a><b>dependent</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#CoordSys">CoordSys</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#boolean">boolean</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">CoordSys.instref</td>
+                      <td class="feature-detail">DataAxis.dependent</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -259,13 +239,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="DataAxis"></a>2.1.2 objectType: DataAxis
+    </div><br><h3><a name="DataElement"></a>2.1.2 objectType: DataElement
     </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">DataAxis</td>
+          <td class="objecttype-name" colspan="1">DataElement</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -281,7 +261,12 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td colspan="3" class="info-title">references</td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#NDPoint">NDPoint</a> <a href="#Voxel">Voxel</a> 
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -289,17 +274,21 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="DataAxis.observable"></a><b>observable</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="DataElement.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#Observable">Observable [cube:Observable]</a></td>
+                      <td class="feature-detail"><a href="#DataAxis">DataAxis [cube:DataAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">DataAxis.observable</td>
+                      <td class="feature-detail">DataElement.axis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -352,7 +341,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="DataProduct.coordSys"></a><b>coordSys</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#CoordSys">CoordSys [cube:CoordSys]</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html#CoordSys">CoordSys</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -376,7 +365,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="DataProduct.mappings"></a><b>mappings</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#Mappings">Mappings [cube:Mappings]</a></td>
+                      <td class="feature-detail"><a href="#trans">trans</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.html#Mappings">Mappings</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -397,142 +386,6 @@
                         
                       </td>
                     </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="DataProduct.observable"></a><b>observable</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#Observable">Observable [cube:Observable]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">DataProduct.observable</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="DependentAxis"></a>2.1.4 objectType: DependentAxis
-    </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">DependentAxis</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 colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="DependentAxis.observable"></a><b>observable</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#Observable">Observable [cube:Observable]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">DependentAxis.observable</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="Mappings"></a>2.1.5 objectType: Mappings
-    </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">Mappings</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 colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="Mappings.instref"></a><b>instref</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#trans">trans</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.html#Mappings">Mappings</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">Mappings.instref</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
                   </table>
                 </td>
               </tr>
@@ -540,7 +393,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="NDImage"></a>2.1.6 objectType: NDImage
+    </div><br><h3><a name="NDImage"></a>2.1.4 objectType: NDImage
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -566,11 +419,6 @@
                       <td colspan="3" class="feature-detail"><a href="#PixelatedDataProduct">PixelatedDataProduct [cube:PixelatedDataProduct]</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#NDImageDataset">NDImageDataset</a> 
-                      </td>
-                    </tr>
-                    <tr>
                       <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
@@ -609,13 +457,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="NDImageDataset"></a>2.1.7 objectType: NDImageDataset
+    </div><br><h3><a name="NDPoint"></a>2.1.5 objectType: NDPoint
     </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">NDImageDataset</td>
+          <td class="objecttype-name" colspan="1">NDPoint</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -632,35 +480,7 @@
                   <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="#ds">ds</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html#experiment.ObsDataset">experiment.ObsDataset</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="NDImageDataset.image"></a><b>image</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#NDImage">NDImage [cube:NDImage]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">NDImageDataset.image</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#DataElement">DataElement [cube:DataElement]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -669,13 +489,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="NDPoint"></a>2.1.8 objectType: NDPoint
+    </div><br><h3><a name="Observable"></a>2.1.6 objectType: Observable
     </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">NDPoint</td>
+          <td class="objecttype-name" colspan="1">Observable</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -691,6 +511,10 @@
                 <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="#DataAxis">DataAxis [cube:DataAxis]</a></td>
+                    </tr>
+                    <tr>
                       <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
@@ -699,17 +523,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="NDPoint.axis"></a><b>axis</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="Observable.instance"></a><b>instance</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#DataAxis">DataAxis [cube:DataAxis]</a></td>
+                      <td class="feature-detail"><a href="#meas">meas</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html#CoordMeasure">CoordMeasure</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">NDPoint.axis</td>
+                      <td class="feature-detail">Observable.instance</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">isOrdered</td>
@@ -729,68 +553,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Observable"></a>2.1.9 objectType: Observable
-    </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">Observable</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 class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#DataAxis">DataAxis</a> <a href="#DependentAxis">DependentAxis</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="Observable.instref"></a><b>instref</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html#DerivedCoordinate">DerivedCoordinate</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">Observable.instref</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="PixelAxis"></a>2.1.10 objectType: PixelAxis
+    </div><br><h3><a name="PixelAxis"></a>2.1.7 objectType: PixelAxis
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -812,7 +575,7 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td colspan="3" class="info-title">references</td>
+                      <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -820,13 +583,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="PixelAxis.pixelCoord"></a><b>pixelCoord</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="PixelAxis.coord"></a><b>coord</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html#domain.pixel.Pixel">domain.pixel.Pixel</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html#domain.pixel.PixelIndex">domain.pixel.PixelIndex</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">PixelAxis.pixelCoord</td>
+                      <td class="feature-detail">PixelAxis.coord</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -846,63 +609,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="PixelCoordSys"></a>2.1.11 objectType: PixelCoordSys
-    </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">PixelCoordSys</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 colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="PixelCoordSys.instref"></a><b>instref</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#PixelCoordSystem">PixelCoordSystem</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">PixelCoordSys.instref</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="PixelatedDataProduct"></a>2.1.12 objectType: PixelatedDataProduct
+    </div><br><h3><a name="PixelatedDataProduct"></a>2.1.8 objectType: PixelatedDataProduct
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -943,7 +650,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="PixelatedDataProduct.pixelCoordSys"></a><b>pixelCoordSys</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#PixelCoordSys">PixelCoordSys [cube:PixelCoordSys]</a></td>
+                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html#PixelCoordSystem">PixelCoordSystem</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -971,7 +678,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="PointDataProduct"></a>2.1.13 objectType: PointDataProduct
+    </div><br><h3><a name="PointDataProduct"></a>2.1.9 objectType: PointDataProduct
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1008,7 +715,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="SparseCube"></a>2.1.14 objectType: SparseCube
+    </div><br><h3><a name="SparseCube"></a>2.1.10 objectType: SparseCube
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1034,11 +741,6 @@
                       <td colspan="3" class="feature-detail"><a href="#PointDataProduct">PointDataProduct [cube:PointDataProduct]</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#SparseCubeDataset">SparseCubeDataset</a> 
-                      </td>
-                    </tr>
-                    <tr>
                       <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
@@ -1077,13 +779,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="SparseCubeDataset"></a>2.1.15 objectType: SparseCubeDataset
+    </div><br><h3><a name="Voxel"></a>2.1.11 objectType: Voxel
     </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">SparseCubeDataset</td>
+          <td class="objecttype-name" colspan="1">Voxel</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1100,65 +802,9 @@
                   <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="#ds">ds</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html#experiment.ObsDataset">experiment.ObsDataset</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td colspan="3" class="feature-detail"><a href="#DataElement">DataElement [cube:DataElement]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="SparseCubeDataset.cube"></a><b>cube</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#SparseCube">SparseCube [cube:SparseCube]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">SparseCubeDataset.cube</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="Voxel"></a>2.1.16 objectType: Voxel
-    </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">Voxel</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 colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
@@ -1167,30 +813,6 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="Voxel.dependentAxis"></a><b>dependentAxis</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#DependentAxis">DependentAxis [cube:DependentAxis]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">Voxel.dependentAxis</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="Voxel.pixelAxis"></a><b>pixelAxis</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#PixelAxis">PixelAxis [cube:PixelAxis]</a></td>
@@ -1214,6 +836,12 @@
                         
                       </td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">axis:DataAxis[1]</td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -1243,7 +871,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#CoordSys">CoordSys</a></td>
+        <td class="feature-detail"><a href="#DataAxis">DataAxis</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -1251,15 +879,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#CoordSys.instref">CoordSys.instref</a></td>
-        <td class="feature-detail">reference</td>
+        <td class="feature-detail"><a href="#DataAxis.dependent">DataAxis.dependent</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#DataAxis">DataAxis</a></td>
+        <td class="feature-detail"><a href="#DataElement">DataElement</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -1267,8 +895,8 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#DataAxis.observable">DataAxis.observable</a></td>
-        <td class="feature-detail">reference</td>
+        <td class="feature-detail"><a href="#DataElement.axis">DataElement.axis</a></td>
+        <td class="feature-detail">composition</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -1299,46 +927,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#DataProduct.observable">DataProduct.observable</a></td>
-        <td class="feature-detail">composition</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#DependentAxis">DependentAxis</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="#DependentAxis.observable">DependentAxis.observable</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#Mappings">Mappings</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="#Mappings.instref">Mappings.instref</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#NDImage">NDImage</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
@@ -1355,22 +943,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#NDImageDataset">NDImageDataset</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="#NDImageDataset.image">NDImageDataset.image</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#NDPoint">NDPoint</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
@@ -1379,14 +951,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#NDPoint.axis">NDPoint.axis</a></td>
-        <td class="feature-detail">composition</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#Observable">Observable</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
@@ -1395,8 +959,8 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Observable.instref">Observable.instref</a></td>
-        <td class="feature-detail">reference</td>
+        <td class="feature-detail"><a href="#Observable.instance">Observable.instance</a></td>
+        <td class="feature-detail">composition</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -1411,24 +975,8 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#PixelAxis.pixelCoord">PixelAxis.pixelCoord</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#PixelCoordSys">PixelCoordSys</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="#PixelCoordSys.instref">PixelCoordSys.instref</a></td>
-        <td class="feature-detail">reference</td>
+        <td class="feature-detail"><a href="#PixelAxis.coord">PixelAxis.coord</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -1475,22 +1023,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#SparseCubeDataset">SparseCubeDataset</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="#SparseCubeDataset.cube">SparseCubeDataset.cube</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#Voxel">Voxel</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
@@ -1499,14 +1031,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Voxel.dependentAxis">Voxel.dependentAxis</a></td>
-        <td class="feature-detail">composition</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#Voxel.pixelAxis">Voxel.pixelAxis</a></td>
         <td class="feature-detail">composition</td>
         <td class="feature-detail">
@@ -1530,59 +1054,59 @@
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</a></td>
+        <td><a href="file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml">file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
         <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html</a></td>
       </tr>
     </table>
-    <h2><a name="coordsys"></a>4.2 coordsys
+    <h2><a name="ds"></a>4.2 ds
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">coordsys</td>
+        <td class="objecttype-name">ds</td>
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</a></td>
+        <td><a href="file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml">file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html</a></td>
       </tr>
     </table>
-    <h2><a name="ds"></a>4.3 ds
+    <h2><a name="ivoa"></a>4.3 ivoa
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">ds</td>
+        <td class="objecttype-name">ivoa</td>
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</a></td>
       </tr>
     </table>
-    <h2><a name="ivoa"></a>4.4 ivoa
+    <h2><a name="meas"></a>4.4 meas
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">ivoa</td>
+        <td class="objecttype-name">meas</td>
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</a></td>
+        <td><a href="file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.vo-dml.xml">file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html</a></td>
       </tr>
     </table>
     <h2><a name="trans"></a>4.5 trans

Modified: trunk/projects/dm/vo-dml/models/cube/Cube-1.0.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml	Sat Apr 29 00:47:32 2017	(r3996)
+++ trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml	Sat Apr 29 00:50:55 2017	(r3997)
@@ -9,7 +9,7 @@
   <title>IVOA N-Dimensional Cube Model</title>
   <author>Mark Cresitello-Dittmar, Doug Tody, Francois Bonnarel, Omar Laurino, Mireille Louys, Arnold Rots, Jose Enrique Ruiz, Jesus Salgado, and the IVOA Data Model Working Group</author>
   <version>1.0</version>
-  <lastModified>2017-02-04T22:23:34</lastModified>
+  <lastModified>2017-04-28T17:28:12</lastModified>
   <import>
     <name>ivoa</name>
     <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</url>
@@ -17,50 +17,25 @@
   </import>
   <import>
     <name>ds</name>
-    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml</url>
+    <url>file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml</url>
     <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html</documentationURL>
   </import>
   <import>
-    <name>coordsys</name>
-    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</url>
-    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html</documentationURL>
-  </import>
-  <import>
     <name>coords</name>
-    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</url>
+    <url>file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</url>
     <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html</documentationURL>
   </import>
   <import>
+    <name>meas</name>
+    <url>file:///data/vao/staff/mcd/docs/models/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.vo-dml.xml</url>
+    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html</documentationURL>
+  </import>
+  <import>
     <name>trans</name>
     <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</url>
     <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.html</documentationURL>
   </import>
   <objectType>
-    <vodml-id>NDImageDataset</vodml-id>
-    <name>NDImageDataset</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    <extends>
-      <vodml-ref>ds:experiment.ObsDataset</vodml-ref>
-    </extends>
-    <reference>
-      <vodml-id>NDImageDataset.image</vodml-id>
-      <name>image</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <datatype>
-        <vodml-ref>cube:NDImage</vodml-ref>
-      </datatype>
-      <multiplicity>
-        <minOccurs>1</minOccurs>
-        <maxOccurs>-1</maxOccurs>
-      </multiplicity>
-    </reference>
-  </objectType>
-
-  <objectType>
     <vodml-id>NDImage</vodml-id>
     <name>NDImage</name>
     <description>
@@ -86,31 +61,6 @@
   </objectType>
 
   <objectType>
-    <vodml-id>SparseCubeDataset</vodml-id>
-    <name>SparseCubeDataset</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    <extends>
-      <vodml-ref>ds:experiment.ObsDataset</vodml-ref>
-    </extends>
-    <reference>
-      <vodml-id>SparseCubeDataset.cube</vodml-id>
-      <name>cube</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <datatype>
-        <vodml-ref>cube:SparseCube</vodml-ref>
-      </datatype>
-      <multiplicity>
-        <minOccurs>1</minOccurs>
-        <maxOccurs>-1</maxOccurs>
-      </multiplicity>
-    </reference>
-  </objectType>
-
-  <objectType>
     <vodml-id>SparseCube</vodml-id>
     <name>SparseCube</name>
     <description>
@@ -148,7 +98,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>cube:CoordSys</vodml-ref>
+        <vodml-ref>coords:CoordSys</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
@@ -162,27 +112,13 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>cube:Mappings</vodml-ref>
+        <vodml-ref>trans:Mappings</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>0</minOccurs>
         <maxOccurs>1</maxOccurs>
       </multiplicity>
     </composition>
-    <composition>
-      <vodml-id>DataProduct.observable</vodml-id>
-      <name>observable</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <datatype>
-        <vodml-ref>cube:Observable</vodml-ref>
-      </datatype>
-      <multiplicity>
-        <minOccurs>0</minOccurs>
-        <maxOccurs>-1</maxOccurs>
-      </multiplicity>
-    </composition>
   </objectType>
 
   <objectType abstract="true">
@@ -201,7 +137,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>cube:PixelCoordSys</vodml-ref>
+        <vodml-ref>coords:PixelCoordSystem</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
@@ -222,77 +158,17 @@
   </objectType>
 
   <objectType>
-    <vodml-id>CoordSys</vodml-id>
-    <name>CoordSys</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    <reference>
-      <vodml-id>CoordSys.instref</vodml-id>
-      <name>instref</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <datatype>
-        <vodml-ref>coordsys:CoordSys</vodml-ref>
-      </datatype>
-      <multiplicity>
-        <minOccurs>1</minOccurs>
-        <maxOccurs>1</maxOccurs>
-      </multiplicity>
-    </reference>
-  </objectType>
-
-  <objectType>
-    <vodml-id>PixelCoordSys</vodml-id>
-    <name>PixelCoordSys</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    <reference>
-      <vodml-id>PixelCoordSys.instref</vodml-id>
-      <name>instref</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <datatype>
-        <vodml-ref>coordsys:PixelCoordSystem</vodml-ref>
-      </datatype>
-      <multiplicity>
-        <minOccurs>1</minOccurs>
-        <maxOccurs>1</maxOccurs>
-      </multiplicity>
-    </reference>
-  </objectType>
-
-  <objectType>
-    <vodml-id>Mappings</vodml-id>
-    <name>Mappings</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    <reference>
-      <vodml-id>Mappings.instref</vodml-id>
-      <name>instref</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <datatype>
-        <vodml-ref>trans:Mappings</vodml-ref>
-      </datatype>
-      <multiplicity>
-        <minOccurs>1</minOccurs>
-        <maxOccurs>1</maxOccurs>
-      </multiplicity>
-    </reference>
-  </objectType>
-
-  <objectType>
     <vodml-id>Voxel</vodml-id>
     <name>Voxel</name>
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+    <extends>
+      <vodml-ref>cube:DataElement</vodml-ref>
+    </extends>
+    <constraint>
+      <description>axis:DataAxis[1]</description>
+    </constraint>
     <composition>
       <vodml-id>Voxel.pixelAxis</vodml-id>
       <name>pixelAxis</name>
@@ -307,20 +183,6 @@
         <maxOccurs>-1</maxOccurs>
       </multiplicity>
     </composition>
-    <composition>
-      <vodml-id>Voxel.dependentAxis</vodml-id>
-      <name>dependentAxis</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <datatype>
-        <vodml-ref>cube:DependentAxis</vodml-ref>
-      </datatype>
-      <multiplicity>
-        <minOccurs>1</minOccurs>
-        <maxOccurs>1</maxOccurs>
-      </multiplicity>
-    </composition>
   </objectType>
 
   <objectType>
@@ -329,20 +191,9 @@
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-    <composition>
-      <vodml-id>NDPoint.axis</vodml-id>
-      <name>axis</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <datatype>
-        <vodml-ref>cube:DataAxis</vodml-ref>
-      </datatype>
-      <multiplicity>
-        <minOccurs>0</minOccurs>
-        <maxOccurs>-1</maxOccurs>
-      </multiplicity>
-    </composition>
+    <extends>
+      <vodml-ref>cube:DataElement</vodml-ref>
+    </extends>
   </objectType>
 
   <objectType>
@@ -351,42 +202,45 @@
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-    <reference>
-      <vodml-id>Observable.instref</vodml-id>
-      <name>instref</name>
+    <extends>
+      <vodml-ref>cube:DataAxis</vodml-ref>
+    </extends>
+    <composition>
+      <vodml-id>Observable.instance</vodml-id>
+      <name>instance</name>
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>coords:DerivedCoordinate</vodml-ref>
+        <vodml-ref>meas:CoordMeasure</vodml-ref>
       </datatype>
       <multiplicity>
-        <minOccurs>1</minOccurs>
+        <minOccurs>0</minOccurs>
         <maxOccurs>1</maxOccurs>
       </multiplicity>
-    </reference>
+    </composition>
   </objectType>
 
-  <objectType>
+  <objectType abstract="true">
     <vodml-id>DataAxis</vodml-id>
     <name>DataAxis</name>
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-    <reference>
-      <vodml-id>DataAxis.observable</vodml-id>
-      <name>observable</name>
+    <attribute>
+      <vodml-id>DataAxis.dependent</vodml-id>
+      <name>dependent</name>
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>cube:Observable</vodml-ref>
+        <vodml-ref>ivoa:boolean</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
         <maxOccurs>1</maxOccurs>
       </multiplicity>
-    </reference>
+    </attribute>
   </objectType>
 
   <objectType>
@@ -395,42 +249,42 @@
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-    <reference>
-      <vodml-id>PixelAxis.pixelCoord</vodml-id>
-      <name>pixelCoord</name>
+    <attribute>
+      <vodml-id>PixelAxis.coord</vodml-id>
+      <name>coord</name>
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>coords:domain.pixel.Pixel</vodml-ref>
+        <vodml-ref>coords:domain.pixel.PixelIndex</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
         <maxOccurs>1</maxOccurs>
       </multiplicity>
-    </reference>
+    </attribute>
   </objectType>
 
-  <objectType>
-    <vodml-id>DependentAxis</vodml-id>
-    <name>DependentAxis</name>
+  <objectType abstract="true">
+    <vodml-id>DataElement</vodml-id>
+    <name>DataElement</name>
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-    <reference>
-      <vodml-id>DependentAxis.observable</vodml-id>
-      <name>observable</name>
+    <composition>
+      <vodml-id>DataElement.axis</vodml-id>
+      <name>axis</name>
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>cube:Observable</vodml-ref>
+        <vodml-ref>cube:DataAxis</vodml-ref>
       </datatype>
       <multiplicity>
-        <minOccurs>1</minOccurs>
-        <maxOccurs>1</maxOccurs>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>-1</maxOccurs>
       </multiplicity>
-    </reference>
+    </composition>
   </objectType>
 
-</vo-dml:model>
\ No newline at end of file
+</vo-dml:model>

Modified: trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml.validation-report.txt
==============================================================================
--- trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml.validation-report.txt	Sat Apr 29 00:47:32 2017	(r3996)
+++ trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml.validation-report.txt	Sat Apr 29 00:50:55 2017	(r3997)
@@ -1,11 +1 @@
-
--------
-error:
--------
-Super type ds:ObsDataset of objectType NDImageDataset is not an object type but a ''
-    
--------
-error:
--------
-Super type ds:ObsDataset of objectType SparseCubeDataset is not an object type but a ''
-    
\ No newline at end of file
+No errors found, VO-DML document passes Schematron validation.

Modified: trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html
==============================================================================
--- trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html	Sat Apr 29 00:47:32 2017	(r3996)
+++ trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html	Sat Apr 29 00:50:55 2017	(r3997)
@@ -96,46 +96,42 @@
         </tr>
         <tr>
           <td>2.3.3</td>
-          <td>    <a href="#experiment.Characterisation">objectType: Characterisation</a></td>
-        </tr>
-        <tr>
-          <td>2.3.4</td>
           <td>    <a href="#experiment.Derived">objectType: Derived</a></td>
         </tr>
         <tr>
-          <td>2.3.5</td>
+          <td>2.3.4</td>
           <td>    <a href="#experiment.DerivedElement">objectType: DerivedElement</a></td>
         </tr>
         <tr>
-          <td>2.3.6</td>
+          <td>2.3.5</td>
           <td>    <a href="#experiment.DerivedScalar">objectType: DerivedScalar</a></td>
         </tr>
         <tr>
-          <td>2.3.7</td>
+          <td>2.3.6</td>
           <td>    <a href="#experiment.Facility">objectType: Facility</a></td>
         </tr>
         <tr>
-          <td>2.3.8</td>
+          <td>2.3.7</td>
           <td>    <a href="#experiment.Instrument">objectType: Instrument</a></td>
         </tr>
         <tr>
-          <td>2.3.9</td>
+          <td>2.3.8</td>
           <td>    <a href="#experiment.ObsConfig">objectType: ObsConfig</a></td>
         </tr>
         <tr>
-          <td>2.3.10</td>
+          <td>2.3.9</td>
           <td>    <a href="#experiment.ObsDataset">objectType: ObsDataset</a></td>
         </tr>
         <tr>
-          <td>2.3.11</td>
+          <td>2.3.10</td>
           <td>    <a href="#experiment.Observation">objectType: Observation</a></td>
         </tr>
         <tr>
-          <td>2.3.12</td>
+          <td>2.3.11</td>
           <td>    <a href="#experiment.Proposal">objectType: Proposal</a></td>
         </tr>
         <tr>
-          <td>2.3.13</td>
+          <td>2.3.12</td>
           <td>    <a href="#experiment.Target">objectType: Target</a></td>
         </tr>
         <tr>
@@ -171,22 +167,12 @@
         <tr>
           <td>4.1</td>
           <td>
-                <a href="#char">char</a></td>
+                <a href="#ivoa">ivoa</a></td>
         </tr>
         <tr>
           <td>4.2</td>
           <td>
-                <a href="#coords">coords</a></td>
-        </tr>
-        <tr>
-          <td>4.3</td>
-          <td>
-                <a href="#coordsys">coordsys</a></td>
-        </tr>
-        <tr>
-          <td>4.4</td>
-          <td>
-                <a href="#ivoa">ivoa</a></td>
+                <a href="#meas">meas</a></td>
         </tr>
       </table>
     </div>
@@ -203,7 +189,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2017-01-31T15:56:48</td>
+        <td>2017-04-28T15:13:01</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -239,40 +225,39 @@
         <td colspan="3"></td>
       </tr>
     </table><img src="DatasetMetadata-1.0.png" usemap="#GVmap"><map id="GVmap" name="GVmap">
-<area shape="rect" id="node2" href="#experiment" title="experiment" alt="" coords="359,67,463,115"/>
-<area shape="rect" id="node3" href="#dataset" title="dataset" alt="" coords="263,67,335,115"/>
-<area shape="rect" id="node4" href="#party" title="party" alt="" coords="167,67,239,115"/>
-<area shape="rect" id="node5" href="#experiment.Observation" title="{experiment/Observation|+observationID : ivoa:string\l}" alt="" coords="487,66,629,115"/>
-<area shape="rect" id="node6" href="#experiment.ObsConfig" title="{experiment/ObsConfig|+bandpass : ivoa:string\l+datasource : ivoa:string\l}" alt="" coords="274,401,402,463"/>
-<area shape="rect" id="node7" href="#experiment.BaseTarget" title="{experiment/BaseTarget|+name : ivoa:string\l+description : ivoa:string\l}" alt="" coords="67,401,195,463"/>
-<area shape="rect" id="node12" href="#experiment.Proposal" title="{experiment/Proposal|+identifier : ivoa:string\l}" alt="" coords="1303,407,1426,457"/>
-<area shape="rect" id="node15" href="#experiment.ObsDataset" title="{experiment/ObsDataset|+calibLevel : ivoa:integer\l}" alt="" coords="605,263,738,313"/>
-<area shape="rect" id="node10" href="#experiment.Facility" title="{experiment/Facility}" alt="" coords="343,715,450,765"/>
-<area shape="rect" id="node11" href="#experiment.Instrument" title="{experiment/Instrument|+name : ivoa:string\l}" alt="" coords="231,565,349,614"/>
-<area shape="rect" id="node8" href="#experiment.Target" title="{experiment/Target|+objectClass : ivoa:string\l}" alt="" coords="66,263,197,313"/>
-<area shape="rect" id="node9" href="#experiment.AstroTarget" title="{experiment/AstroTarget|+objectClass : ivoa:string\l+spectralClass : ivoa:string\l+redshift : ivoa:real\l+varAmpl : ivoa:real\l}" alt="" coords="221,243,359,333"/>
-<area shape="rect" id="node33" href="#party.Role" title="{party/Role}" alt="" coords="705,853,777,902"/>
-<area shape="rect" id="node35" href="#party.Organization" title="{party/Organization|+address : ivoa:string\l+phone : ivoa:string\l+email : ivoa:string\l+logo : ivoa:anyURI\l}" alt="" coords="403,833,518,922"/>
-<area shape="rect" id="node13" href="#experiment.Characterisation" title="{experiment/Characterisation}" alt="" coords="426,407,570,457"/>
-<area shape="rect" id="node14" href="#experiment.Derived" title="{experiment/Derived}" alt="" coords="1173,407,1279,457"/>
-<area shape="rect" id="node16" href="#experiment.DerivedElement" title="{experiment/DerivedElement}" alt="" coords="1119,565,1263,614"/>
-<area shape="rect" id="node23" href="#dataset.Dataset" title="{dataset/Dataset|+dataProductType : ds:dataset.DataProductType\l+dataProductSubtype : ivoa:string\l}" alt="" coords="594,401,823,463"/>
-<area shape="rect" id="node17" href="#experiment.DerivedScalar" title="{experiment/DerivedScalar|+name : ivoa:string\l+value : ivoa:Quantity\l}" alt="" coords="1013,401,1149,463"/>
-<area shape="rect" id="node18" href="#dataset.DataProductType" title="{<<enumeration>>\ldataset/DataProductType|+CUBE\l+IMAGE\l+PHOTOMETRY\l+SPECTRUM\l+TIMESERIES\l+SED\l+VISIBILITY\l+EVENT\l+CATALOG\l}" alt="" coords="653,6,783,175"/>
-<area shape="rect" id="node19" href="#dataset.CreationType" title="{<<enumeration>>\ldataset/CreationType|+ARCHIVAL\l+CUTOUT\l+FILTERED\l+MOSAIC\l+SPECTRAL_EXTRACTION\l+CATALOG_EXTRACTION\l}" alt="" coords="807,26,965,155"/>
-<area shape="rect" id="node20" href="#dataset.RightsType" title="{<<enumeration>>\ldataset/RightsType|+PUBLIC\l+PROPRIETARY\l+SECURE\l}" alt="" coords="989,46,1093,135"/>
-<area shape="rect" id="node21" href="#dataset.SpectralBandType" title="{<<enumeration>>\ldataset/SpectralBandType|+RADIO\l+MILLIMETER\l+INFRARED\l+OPTICAL\l+ULTRAVIOLET\l+XRAY\l+GAMMARAY\l}" alt="" coords="1117,19,1250,162"/>
-<area shape="rect" id="node22" href="#dataset.DataModel" title="{dataset/DataModel|+name : ivoa:string\l+prefix : ivoa:string\l+URL : ivoa:anyURI\l}" alt="" coords="1274,53,1389,129"/>
-<area shape="rect" id="node24" href="#dataset.DataID" title="{dataset/DataID|+title : ivoa:string\l+datasetID : ivoa:anyURI\l+creatorDID : ivoa:anyURI\l+version : ivoa:string\l+date : ivoa:datetime\l+creationType : ds:dataset.CreationType\l}" alt="" coords="883,531,1081,647"/>
-<area shape="rect" id="node25" href="#dataset.Curation" title="{dataset/Curation|+publisherDID : ivoa:anyURI\l+version : ivoa:string\l+releaseDate : ivoa:datetime\l+rights : ds:dataset.RightsType\l}" alt="" coords="623,545,778,634"/>
-<area shape="rect" id="node28" href="#dataset.Creator" title="{dataset/Creator}" alt="" coords="1199,715,1287,765"/>
-<area shape="rect" id="node29" href="#dataset.Contributor" title="{dataset/Contributor|+acknowledgment : ivoa:string\l}" alt="" coords="893,715,1047,765"/>
-<area shape="rect" id="node31" href="#dataset.Collection" title="{dataset/Collection|+name : ivoa:string\l}" alt="" coords="1071,715,1175,765"/>
-<area shape="rect" id="node26" href="#dataset.Publisher" title="{dataset/Publisher|+publisherID : ivoa:anyURI\l}" alt="" coords="474,715,615,765"/>
-<area shape="rect" id="node27" href="#dataset.Contact" title="{dataset/Contact}" alt="" coords="781,715,869,765"/>
-<area shape="rect" id="node30" href="#dataset.Publication" title="{dataset/Publication|+refCode : ivoa:string\l}" alt="" coords="639,715,757,765"/>
-<area shape="rect" id="node32" href="#party.Party" title="{party/Party|+name : ivoa:string\l}" alt="" coords="563,990,667,1039"/>
-<area shape="rect" id="node34" href="#party.Individual" title="{party/Individual|+address : ivoa:string\l+phone : ivoa:string\l+email : ivoa:string\l}" alt="" coords="558,839,673,915"/>
+<area shape="rect" id="node2" href="#experiment" title="experiment" alt="" coords="219,67,323,115"/>
+<area shape="rect" id="node3" href="#dataset" title="dataset" alt="" coords="123,67,195,115"/>
+<area shape="rect" id="node4" href="#party" title="party" alt="" coords="27,67,99,115"/>
+<area shape="rect" id="node5" href="#experiment.Observation" title="{experiment/Observation|+observationID : ivoa:string\l}" alt="" coords="347,66,488,115"/>
+<area shape="rect" id="node6" href="#experiment.ObsConfig" title="{experiment/ObsConfig|+bandpass : ivoa:string\l+datasource : ivoa:string\l}" alt="" coords="116,401,244,463"/>
+<area shape="rect" id="node7" href="#experiment.BaseTarget" title="{experiment/BaseTarget|+name : ivoa:string\l+description : ivoa:string\l}" alt="" coords="959,401,1087,463"/>
+<area shape="rect" id="node12" href="#experiment.Proposal" title="{experiment/Proposal|+identifier : ivoa:string\l}" alt="" coords="268,407,391,457"/>
+<area shape="rect" id="node14" href="#experiment.ObsDataset" title="{experiment/ObsDataset|+calibLevel : ivoa:integer\l}" alt="" coords="517,263,651,313"/>
+<area shape="rect" id="node10" href="#experiment.Facility" title="{experiment/Facility}" alt="" coords="127,565,233,614"/>
+<area shape="rect" id="node11" href="#experiment.Instrument" title="{experiment/Instrument|+name : ivoa:string\l}" alt="" coords="257,565,375,614"/>
+<area shape="rect" id="node8" href="#experiment.Target" title="{experiment/Target|+objectClass : ivoa:string\l}" alt="" coords="877,263,1008,313"/>
+<area shape="rect" id="node9" href="#experiment.AstroTarget" title="{experiment/AstroTarget|+objectClass : ivoa:string\l+spectralClass : ivoa:string\l+redshift : ivoa:real\l+varAmpl : ivoa:real\l}" alt="" coords="1032,243,1171,333"/>
+<area shape="rect" id="node32" href="#party.Role" title="{party/Role}" alt="" coords="521,837,593,886"/>
+<area shape="rect" id="node13" href="#experiment.Derived" title="{experiment/Derived}" alt="" coords="575,407,681,457"/>
+<area shape="rect" id="node15" href="#experiment.DerivedElement" title="{experiment/DerivedElement}" alt="" coords="411,565,555,614"/>
+<area shape="rect" id="node22" href="#dataset.Dataset" title="{dataset/Dataset|+dataProductType : ds:dataset.DataProductType\l+dataProductSubtype : ivoa:string\l}" alt="" coords="705,401,935,463"/>
+<area shape="rect" id="node16" href="#experiment.DerivedScalar" title="{experiment/DerivedScalar|+name : ivoa:string\l+value : ivoa:Quantity\l}" alt="" coords="415,401,551,463"/>
+<area shape="rect" id="node17" href="#dataset.DataProductType" title="{<<enumeration>>\ldataset/DataProductType|+CUBE\l+IMAGE\l+PHOTOMETRY\l+SPECTRUM\l+TIMESERIES\l+SED\l+VISIBILITY\l+EVENT\l+CATALOG\l}" alt="" coords="512,6,643,175"/>
+<area shape="rect" id="node18" href="#dataset.CreationType" title="{<<enumeration>>\ldataset/CreationType|+ARCHIVAL\l+CUTOUT\l+FILTERED\l+MOSAIC\l+SPECTRAL_EXTRACTION\l+CATALOG_EXTRACTION\l}" alt="" coords="667,26,824,155"/>
+<area shape="rect" id="node19" href="#dataset.RightsType" title="{<<enumeration>>\ldataset/RightsType|+PUBLIC\l+PROPRIETARY\l+SECURE\l}" alt="" coords="848,46,952,135"/>
+<area shape="rect" id="node20" href="#dataset.SpectralBandType" title="{<<enumeration>>\ldataset/SpectralBandType|+RADIO\l+MILLIMETER\l+INFRARED\l+OPTICAL\l+ULTRAVIOLET\l+XRAY\l+GAMMARAY\l}" alt="" coords="976,19,1109,162"/>
+<area shape="rect" id="node21" href="#dataset.DataModel" title="{dataset/DataModel|+name : ivoa:string\l+prefix : ivoa:string\l+URL : ivoa:anyURI\l}" alt="" coords="1133,53,1248,129"/>
+<area shape="rect" id="node23" href="#dataset.DataID" title="{dataset/DataID|+title : ivoa:string\l+datasetID : ivoa:anyURI\l+creatorDID : ivoa:anyURI\l+version : ivoa:string\l+date : ivoa:datetime\l+creationType : ds:dataset.CreationType\l}" alt="" coords="579,531,776,647"/>
+<area shape="rect" id="node24" href="#dataset.Curation" title="{dataset/Curation|+publisherDID : ivoa:anyURI\l+version : ivoa:string\l+releaseDate : ivoa:datetime\l+rights : ds:dataset.RightsType\l}" alt="" coords="803,545,957,634"/>
+<area shape="rect" id="node27" href="#dataset.Creator" title="{dataset/Creator}" alt="" coords="513,715,601,765"/>
+<area shape="rect" id="node28" href="#dataset.Contributor" title="{dataset/Contributor|+acknowledgment : ivoa:string\l}" alt="" coords="335,715,489,765"/>
+<area shape="rect" id="node30" href="#dataset.Collection" title="{dataset/Collection|+name : ivoa:string\l}" alt="" coords="625,715,729,765"/>
+<area shape="rect" id="node25" href="#dataset.Publisher" title="{dataset/Publisher|+publisherID : ivoa:anyURI\l}" alt="" coords="753,715,895,765"/>
+<area shape="rect" id="node26" href="#dataset.Contact" title="{dataset/Contact}" alt="" coords="919,715,1007,765"/>
+<area shape="rect" id="node29" href="#dataset.Publication" title="{dataset/Publication|+refCode : ivoa:string\l}" alt="" coords="1031,715,1148,765"/>
+<area shape="rect" id="node31" href="#party.Party" title="{party/Party|+name : ivoa:string\l}" alt="" coords="623,974,727,1023"/>
+<area shape="rect" id="node33" href="#party.Individual" title="{party/Individual|+address : ivoa:string\l+phone : ivoa:string\l+email : ivoa:string\l}" alt="" coords="617,823,732,899"/>
+<area shape="rect" id="node34" href="#party.Organization" title="{party/Organization|+address : ivoa:string\l+phone : ivoa:string\l+email : ivoa:string\l+logo : ivoa:anyURI\l}" alt="" coords="756,817,871,906"/>
 </map>
 
     <hr>
@@ -1716,7 +1701,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#experiment.AstroTarget">AstroTarget</a> <a href="#experiment.BaseTarget">BaseTarget</a> <a href="#experiment.Characterisation">Characterisation</a> <a href="#experiment.Derived">Derived</a> <a href="#experiment.DerivedElement">DerivedElement</a> <a href="#experiment.DerivedScalar">DerivedScalar</a> <a href="#experiment.Facility">Facility</a> <a href="#experiment.Instrument">Instrument</a> <a href="#experiment.ObsConfig">ObsConfig</a> <a href="#experiment.ObsDataset">ObsDataset</a> <a href="#experiment.Observation">Observation</a> <a href="#experiment.Proposal">Proposal</a> <a href="#experiment.Target">Target</a> 
+        <td colspan="2" class="feature-detail"><a href="#experiment.AstroTarget">AstroTarget</a> <a href="#experiment.BaseTarget">BaseTarget</a> <a href="#experiment.Derived">Derived</a> <a href="#experiment.DerivedElement">DerivedElement</a> <a href="#experiment.DerivedScalar">DerivedScalar</a> <a href="#experiment.Facility">Facility</a> <a href="#experiment.Instrument">Instrument</a> <a href="#experiment.ObsConfig">ObsConfig</a> <a href="#experiment.ObsDataset">ObsDataset</a> <a href="#experiment.Observation">Observation</a> <a href="#experiment.Proposal">Proposal</a> <a href="#experiment.Target">Target</a> 
         </td>
       </tr>
     </table>
@@ -1943,7 +1928,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.BaseTarget.position"></a><b>position</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coords">coords</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html#domain.spatial.Position">domain.spatial.Position</a></td>
+                      <td class="feature-detail"><a href="#meas">meas</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html#Position">Position</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1967,48 +1952,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Characterisation"></a>2.3.3 objectType: Characterisation
-    </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">experiment.Characterisation</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">This Characterisation object is a direct extension of the Characterisation object from the IVOA Characterisation Data Model
-            Standard.  This provides a local object which may be contained in a 'composition' relation to other objects of this model
-            (specifically ObsDataset).  This object may be extended and/or modified by specific Dataset models as needed.
-            	Characterisation provides a broad scale description of the coordinate space occupied by the dataset in each of the axis domains.
-            This includes axes not directly represented in the dataset 'data', for example, the Time axis of a 2D special image.  As such,
-            there is a strong correlation between Characterisation and Data objects.  In some cases, the values may be directly derived
-            from the Data, in others, they provide supporting metadata about the broader domain.  For example, the Accuracy fields in
-            Characterisation represent typical accuracy for the dataset, while those within Data provide per-data-point errors.   
-          </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">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#char">char</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.html#Char">Char</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="experiment.Derived"></a>2.3.4 objectType: Derived
+    </div><br><h3><a name="experiment.Derived"></a>2.3.3 objectType: Derived
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2076,7 +2020,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.DerivedElement"></a>2.3.5 objectType: DerivedElement
+    </div><br><h3><a name="experiment.DerivedElement"></a>2.3.4 objectType: DerivedElement
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2116,7 +2060,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.DerivedScalar"></a>2.3.6 objectType: DerivedScalar
+    </div><br><h3><a name="experiment.DerivedScalar"></a>2.3.5 objectType: DerivedScalar
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2196,7 +2140,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Facility"></a>2.3.7 objectType: Facility
+    </div><br><h3><a name="experiment.Facility"></a>2.3.6 objectType: Facility
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2225,31 +2169,6 @@
                       <td colspan="3" class="feature-detail"><a href="#party.Role">Role [ds:party.Role]</a></td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.Facility.party"></a><b>party</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#party.Organization">Organization [ds:party.Organization]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Facility.party</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Reference to the Party or Entity which is associated with this role.</td>
-                    </tr>
-                    <tr>
                       <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
@@ -2262,7 +2181,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Instrument"></a>2.3.8 objectType: Instrument
+    </div><br><h3><a name="experiment.Instrument"></a>2.3.7 objectType: Instrument
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2320,7 +2239,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.ObsConfig"></a>2.3.9 objectType: ObsConfig
+    </div><br><h3><a name="experiment.ObsConfig"></a>2.3.8 objectType: ObsConfig
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2468,7 +2387,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.ObsDataset"></a>2.3.10 objectType: ObsDataset
+    </div><br><h3><a name="experiment.ObsDataset"></a>2.3.9 objectType: ObsDataset
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2540,27 +2459,6 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsDataset.coordSys"></a><b>coordSys</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#AstroCoordSystem">AstroCoordSystem</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.coordSys</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Zero or more references to coordinate system defintions associated with the dataset.  Since multiple data products may contibute
-                        to the content of a dataset, this element provides convenient, high-level access to definitions which may be distributed among
-                        lower-level objects.  
-                        
-                      </td>
-                    </tr>
-                    <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsDataset.obsConfig"></a><b>obsConfig</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#experiment.ObsConfig">ObsConfig [ds:experiment.ObsConfig]</a></td>
@@ -2624,30 +2522,6 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.ObsDataset.characterisation"></a><b>characterisation</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.Characterisation">Characterisation [ds:experiment.Characterisation]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.characterisation</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Characterisation provides a 'characteristic' view of the dataset coordinate space.  For each represented domain (spatial,
-                        spectral, temporal, etc), characterisation provides metadata summarizing the coverage, resolution, representative accuracies,
-                        etc. for the dataset asa a whole.
-                      </td>
-                    </tr>
-                    <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.ObsDataset.derived"></a><b>derived</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#experiment.Derived">Derived [ds:experiment.Derived]</a></td>
@@ -2678,7 +2552,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Observation"></a>2.3.11 objectType: Observation
+    </div><br><h3><a name="experiment.Observation"></a>2.3.10 objectType: Observation
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2843,7 +2717,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Proposal"></a>2.3.12 objectType: Proposal
+    </div><br><h3><a name="experiment.Proposal"></a>2.3.11 objectType: Proposal
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2906,7 +2780,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Target"></a>2.3.13 objectType: Target
+    </div><br><h3><a name="experiment.Target"></a>2.3.12 objectType: Target
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3109,11 +2983,6 @@
                       <td colspan="3" class="feature-detail"><a href="#party.Party">Party [ds:party.Party]</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.Facility">Facility</a> 
-                      </td>
-                    </tr>
-                    <tr>
                       <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
@@ -3904,19 +3773,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#experiment.Characterisation">experiment.Characterisation</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">This Characterisation object is a direct extension of the Characterisation object from the IVOA Characterisation Data Model
-          Standard.  This provides a local object which may be contained in a 'composition' relation to other objects of this model
-          (specifically ObsDataset).  This object may be extended and/or modified by specific Dataset models as needed.
-          	Characterisation provides a broad scale description of the coordinate space occupied by the dataset in each of the axis domains.
-          This includes axes not directly represented in the dataset 'data', for example, the Time axis of a 2D special image.  As such,
-          there is a strong correlation between Characterisation and Data objects.  In some cases, the values may be directly derived
-          from the Data, in others, they provide supporting metadata about the broader domain.  For example, the Accuracy fields in
-          Characterisation represent typical accuracy for the dataset, while those within Data provide per-data-point errors.   
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#experiment.Derived">experiment.Derived</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">The Derived (short for Derived Data) object holds derived information obtained by evaluating or analyzing the contents of
@@ -3975,11 +3831,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#experiment.Facility.party">experiment.Facility.party</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Reference to the Party or Entity which is associated with this role.</td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#experiment.Instrument">experiment.Instrument</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">Identifies the instrument used to create the data.  This can be a specific instrument name, general type or something else,
@@ -4063,23 +3914,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.characterisation">experiment.ObsDataset.characterisation</a></td>
-        <td class="feature-detail">composition</td>
-        <td class="feature-detail">Characterisation provides a 'characteristic' view of the dataset coordinate space.  For each represented domain (spatial,
-          spectral, temporal, etc), characterisation provides metadata summarizing the coverage, resolution, representative accuracies,
-          etc. for the dataset asa a whole.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.coordSys">experiment.ObsDataset.coordSys</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Zero or more references to coordinate system defintions associated with the dataset.  Since multiple data products may contibute
-          to the content of a dataset, this element provides convenient, high-level access to definitions which may be distributed among
-          lower-level objects.  
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#experiment.ObsDataset.derived">experiment.ObsDataset.derived</a></td>
         <td class="feature-detail">composition</td>
         <td class="feature-detail">Provides a high level summary of certain properties of the dataset.  Its primary purpose is to support high level filtering
@@ -4265,68 +4099,36 @@
       For each imported model we list URLs to the VO-DML and HTML representations and the prefix used for vodml-ids from inside
       the model.
     </p>
-    <h2><a name="char"></a>4.1 char
+    <h2><a name="ivoa"></a>4.1 ivoa
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">char</td>
-      </tr>
-      <tr>
-        <td width="30%" class="info-title">url</td>
-        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.vo-dml.xml">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.vo-dml.xml</a></td>
-      </tr>
-      <tr>
-        <td width="30%" class="info-title">documentation url</td>
-        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.html">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.html</a></td>
-      </tr>
-    </table>
-    <h2><a name="coords"></a>4.2 coords
-    </h2>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">coords</td>
-      </tr>
-      <tr>
-        <td width="30%" class="info-title">url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</a></td>
-      </tr>
-      <tr>
-        <td width="30%" class="info-title">documentation url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html</a></td>
-      </tr>
-    </table>
-    <h2><a name="coordsys"></a>4.3 coordsys
-    </h2>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">coordsys</td>
+        <td class="objecttype-name">ivoa</td>
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</a></td>
+        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
-        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html</a></td>
+        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</a></td>
       </tr>
     </table>
-    <h2><a name="ivoa"></a>4.4 ivoa
+    <h2><a name="meas"></a>4.2 meas
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">ivoa</td>
+        <td class="objecttype-name">meas</td>
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
-        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html</a></td>
       </tr>
     </table>
   </body>

Modified: trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml	Sat Apr 29 00:47:32 2017	(r3996)
+++ trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml	Sat Apr 29 00:50:55 2017	(r3997)
@@ -9,26 +9,16 @@
   <author>Mark Cresitello-Dittmar, Francois Bonnarel, Omar Laurino, Gerard Lemson, Mireille Louys, Arnold Rots, Doug Tody, and the IVOA Data Model Working Group.</author>
   <version>1.0</version>
   <previousVersion>0.x</previousVersion>
-  <lastModified>2017-01-31T15:56:48</lastModified>
+  <lastModified>2017-04-28T15:13:01</lastModified>
   <import>
     <name>ivoa</name>
     <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</url>
     <documentationURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</documentationURL>
   </import>
   <import>
-    <name>char</name>
-    <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.vo-dml.xml</url>
-    <documentationURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.html</documentationURL>
-  </import>
-  <import>
-    <name>coordsys</name>
-    <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</url>
-    <documentationURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html</documentationURL>
-  </import>
-  <import>
-    <name>coords</name>
-    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</url>
-    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html</documentationURL>
+    <name>meas</name>
+    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.vo-dml.xml</url>
+    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html</documentationURL>
   </import>
 
   <package>
@@ -211,7 +201,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <datatype>
-          <vodml-ref>coords:domain.spatial.Position</vodml-ref>
+          <vodml-ref>meas:Position</vodml-ref>
         </datatype>
         <multiplicity>
           <minOccurs>0</minOccurs>
@@ -313,18 +303,6 @@
       <constraint>
         <description>party.Role.party:Organization[1]</description>
       </constraint>
-      <reference>
-        <vodml-id>experiment.Facility.party</vodml-id>
-        <name>party</name>
-        <description>Reference to the Party or Entity which is associated with this role.</description>
-        <datatype>
-          <vodml-ref>ds:party.Organization</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </reference>
     </objectType>
 
     <objectType>
@@ -367,16 +345,6 @@
     </objectType>
 
     <objectType>
-      <vodml-id>experiment.Characterisation</vodml-id>
-      <name>Characterisation</name>
-      <description>This Characterisation object is a direct extension of the Characterisation object from the IVOA Characterisation Data Model Standard.  This provides a local object which may be contained in a 'composition' relation to other objects of this model (specifically ObsDataset).  This object may be extended and/or modified by specific Dataset models as needed.
-	Characterisation provides a broad scale description of the coordinate space occupied by the dataset in each of the axis domains.  This includes axes not directly represented in the dataset 'data', for example, the Time axis of a 2D special image.  As such, there is a strong correlation between Characterisation and Data objects.  In some cases, the values may be directly derived from the Data, in others, they provide supporting metadata about the broader domain.  For example, the Accuracy fields in Characterisation represent typical accuracy for the dataset, while those within Data provide per-data-point errors.   </description>
-      <extends>
-        <vodml-ref>char:Char</vodml-ref>
-      </extends>
-    </objectType>
-
-    <objectType>
       <vodml-id>experiment.Derived</vodml-id>
       <name>Derived</name>
       <description>The Derived (short for Derived Data) object holds derived information obtained by evaluating or analyzing the contents of the dataset.  The specific content of this object is strongly dependent on the specific type of dataset, so we provide a generic model which may be specialized in other models to define elements appropriate for that type of dataset.
@@ -425,18 +393,6 @@
         </multiplicity>
       </attribute>
       <composition>
-        <vodml-id>experiment.ObsDataset.characterisation</vodml-id>
-        <name>characterisation</name>
-        <description>Characterisation provides a 'characteristic' view of the dataset coordinate space.  For each represented domain (spatial, spectral, temporal, etc), characterisation provides metadata summarizing the coverage, resolution, representative accuracies, etc. for the dataset asa a whole.</description>
-        <datatype>
-          <vodml-ref>ds:experiment.Characterisation</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </composition>
-      <composition>
         <vodml-id>experiment.ObsDataset.derived</vodml-id>
         <name>derived</name>
         <description>Provides a high level summary of certain properties of the dataset.  Its primary purpose is to support high level filtering of datasets during data discovery.
@@ -485,19 +441,6 @@
           <maxOccurs>1</maxOccurs>
         </multiplicity>
       </reference>
-      <reference>
-        <vodml-id>experiment.ObsDataset.coordSys</vodml-id>
-        <name>coordSys</name>
-        <description>Zero or more references to coordinate system defintions associated with the dataset.  Since multiple data products may contibute to the content of a dataset, this element provides convenient, high-level access to definitions which may be distributed among lower-level objects.  
-</description>
-        <datatype>
-          <vodml-ref>coordsys:AstroCoordSystem</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>-1</maxOccurs>
-        </multiplicity>
-      </reference>
     </objectType>
 
     <objectType abstract="true">

Modified: trunk/projects/dm/vo-dml/models/ds/vo-dml.properties
==============================================================================
--- trunk/projects/dm/vo-dml/models/ds/vo-dml.properties	Sat Apr 29 00:47:32 2017	(r3996)
+++ trunk/projects/dm/vo-dml/models/ds/vo-dml.properties	Sat Apr 29 00:50:55 2017	(r3997)
@@ -11,7 +11,7 @@
 dm.filename.prefix = DatasetMetadata-1.0
 #
 # data model XMI source file.  used only in xmi2vo-dml 
-xmi.source          = datasetModel_uml2p4p1.xmi
+xmi.source          = ../../../DatasetMetadata-1.0/model/datasetModel_uml2p4p1.xmi
 # 
 # the "profile" according to which the XMI is built. 
 # MUST be one of:


More information about the Volutecommits mailing list