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

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


Author: mdittmar
Date: Fri Apr  6 21:01:59 2018
New Revision: 4897

Log:
update vo-dml products for coords object reduction

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

Modified: trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html
==============================================================================
--- trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html	Fri Apr  6 20:57:25 2018	(r4896)
+++ trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html	Fri Apr  6 21:01:59 2018	(r4897)
@@ -40,50 +40,58 @@
         </tr>
         <tr>
           <td>2.1.5</td>
-          <td>    <a href="#CompositeCoordinate">dataType:CompositeCoordinate</a></td>
+          <td>    <a href="#CompositeCoord1D">dataType:CompositeCoord1D</a></td>
         </tr>
         <tr>
           <td>2.1.6</td>
-          <td>    <a href="#ContinuousAxis">objectType:ContinuousAxis</a></td>
+          <td>    <a href="#CompositeCoord2D">dataType:CompositeCoord2D</a></td>
         </tr>
         <tr>
           <td>2.1.7</td>
-          <td>    <a href="#CoordFrame">objectType:CoordFrame</a></td>
+          <td>    <a href="#CompositeCoord3D">dataType:CompositeCoord3D</a></td>
         </tr>
         <tr>
           <td>2.1.8</td>
-          <td>    <a href="#CoordSpace">objectType:CoordSpace</a></td>
+          <td>    <a href="#CompositeCoordinate">dataType:CompositeCoordinate</a></td>
         </tr>
         <tr>
           <td>2.1.9</td>
-          <td>    <a href="#CoordSys">objectType:CoordSys</a></td>
+          <td>    <a href="#ContinuousAxis">objectType:ContinuousAxis</a></td>
         </tr>
         <tr>
           <td>2.1.10</td>
-          <td>    <a href="#CoordValue">dataType:CoordValue</a></td>
+          <td>    <a href="#CoordFrame">objectType:CoordFrame</a></td>
         </tr>
         <tr>
           <td>2.1.11</td>
-          <td>    <a href="#Coordinate">dataType:Coordinate</a></td>
+          <td>    <a href="#CoordSpace">objectType:CoordSpace</a></td>
         </tr>
         <tr>
           <td>2.1.12</td>
-          <td>    <a href="#DiscreteSetAxis">objectType:DiscreteSetAxis</a></td>
+          <td>    <a href="#CoordSys">objectType:CoordSys</a></td>
         </tr>
         <tr>
           <td>2.1.13</td>
-          <td>    <a href="#GenericCoordFrame">objectType:GenericCoordFrame</a></td>
+          <td>    <a href="#CoordValue">dataType:CoordValue</a></td>
         </tr>
         <tr>
           <td>2.1.14</td>
-          <td>    <a href="#GenericCoordValue">dataType:GenericCoordValue</a></td>
+          <td>    <a href="#Coordinate">dataType:Coordinate</a></td>
         </tr>
         <tr>
           <td>2.1.15</td>
-          <td>    <a href="#Handedness">enumeration:Handedness</a></td>
+          <td>    <a href="#DiscreteSetAxis">objectType:DiscreteSetAxis</a></td>
         </tr>
         <tr>
           <td>2.1.16</td>
+          <td>    <a href="#GenericCoordFrame">objectType:GenericCoordFrame</a></td>
+        </tr>
+        <tr>
+          <td>2.1.17</td>
+          <td>    <a href="#Handedness">enumeration:Handedness</a></td>
+        </tr>
+        <tr>
+          <td>2.1.18</td>
           <td>    <a href="#PhysicalCoordValue">dataType:PhysicalCoordValue</a></td>
         </tr>
         <tr>
@@ -148,158 +156,90 @@
         </tr>
         <tr>
           <td>2.5</td>
-          <td>    <a href="#domain.redshift">package: redshift</a></td>
-        </tr>
-        <tr>
-          <td>2.5.1</td>
-          <td>    <a href="#domain.redshift.DopplerDefinition">enumeration: DopplerDefinition</a></td>
-        </tr>
-        <tr>
-          <td>2.5.2</td>
-          <td>    <a href="#domain.redshift.DopplerVelocity">dataType: DopplerVelocity</a></td>
-        </tr>
-        <tr>
-          <td>2.5.3</td>
-          <td>    <a href="#domain.redshift.Redshift">dataType: Redshift</a></td>
-        </tr>
-        <tr>
-          <td>2.5.4</td>
-          <td>    <a href="#domain.redshift.RedshiftValue">dataType: RedshiftValue</a></td>
-        </tr>
-        <tr>
-          <td>2.6</td>
           <td>    <a href="#domain.space">package: space</a></td>
         </tr>
         <tr>
-          <td>2.6.1</td>
+          <td>2.5.1</td>
           <td>    <a href="#domain.space.CartesianCoord">dataType: CartesianCoord</a></td>
         </tr>
         <tr>
-          <td>2.6.2</td>
+          <td>2.5.2</td>
           <td>    <a href="#domain.space.CustomRefLocation">dataType: CustomRefLocation</a></td>
         </tr>
         <tr>
-          <td>2.6.3</td>
+          <td>2.5.3</td>
           <td>    <a href="#domain.space.EclipticCoord">dataType: EclipticCoord</a></td>
         </tr>
         <tr>
-          <td>2.6.4</td>
+          <td>2.5.4</td>
           <td>    <a href="#domain.space.Epoch">primitiveType: Epoch</a></td>
         </tr>
         <tr>
-          <td>2.6.5</td>
+          <td>2.5.5</td>
           <td>    <a href="#domain.space.EquatorialCoord">dataType: EquatorialCoord</a></td>
         </tr>
         <tr>
-          <td>2.6.6</td>
+          <td>2.5.6</td>
           <td>    <a href="#domain.space.GalacticCoord">dataType: GalacticCoord</a></td>
         </tr>
         <tr>
-          <td>2.6.7</td>
+          <td>2.5.7</td>
           <td>    <a href="#domain.space.LongLatCoord">dataType: LongLatCoord</a></td>
         </tr>
         <tr>
-          <td>2.6.8</td>
+          <td>2.5.8</td>
           <td>    <a href="#domain.space.RefLocation">dataType: RefLocation</a></td>
         </tr>
         <tr>
-          <td>2.6.9</td>
-          <td>    <a href="#domain.space.SkyCoord">dataType: SkyCoord</a></td>
+          <td>2.5.9</td>
+          <td>    <a href="#domain.space.SpaceCoord">dataType: SpaceCoord</a></td>
         </tr>
         <tr>
-          <td>2.6.10</td>
+          <td>2.5.10</td>
           <td>    <a href="#domain.space.SpaceFrame">objectType: SpaceFrame</a></td>
         </tr>
         <tr>
-          <td>2.6.11</td>
-          <td>    <a href="#domain.space.SpatialCoord">dataType: SpatialCoord</a></td>
-        </tr>
-        <tr>
-          <td>2.6.12</td>
-          <td>    <a href="#domain.space.SpatialCoord1D">dataType: SpatialCoord1D</a></td>
-        </tr>
-        <tr>
-          <td>2.6.13</td>
-          <td>    <a href="#domain.space.SpatialCoord2D">dataType: SpatialCoord2D</a></td>
-        </tr>
-        <tr>
-          <td>2.6.14</td>
-          <td>    <a href="#domain.space.SpatialCoord3D">dataType: SpatialCoord3D</a></td>
-        </tr>
-        <tr>
-          <td>2.6.15</td>
-          <td>    <a href="#domain.space.SpatialCoordValue">dataType: SpatialCoordValue</a></td>
-        </tr>
-        <tr>
-          <td>2.6.16</td>
+          <td>2.5.11</td>
           <td>    <a href="#domain.space.StdRefFrame">enumeration: StdRefFrame</a></td>
         </tr>
         <tr>
-          <td>2.6.17</td>
+          <td>2.5.12</td>
           <td>    <a href="#domain.space.StdRefLocation">dataType: StdRefLocation</a></td>
         </tr>
         <tr>
-          <td>2.6.18</td>
+          <td>2.5.13</td>
           <td>    <a href="#domain.space.StdRefPosition">enumeration: StdRefPosition</a></td>
         </tr>
         <tr>
-          <td>2.6.19</td>
-          <td>    <a href="#domain.space.UnitSphereCoord">dataType: UnitSphereCoord</a></td>
-        </tr>
-        <tr>
-          <td>2.7</td>
-          <td>    <a href="#domain.spectral">package: spectral</a></td>
-        </tr>
-        <tr>
-          <td>2.7.1</td>
-          <td>    <a href="#domain.spectral.Energy">dataType: Energy</a></td>
-        </tr>
-        <tr>
-          <td>2.7.2</td>
-          <td>    <a href="#domain.spectral.Frequency">dataType: Frequency</a></td>
-        </tr>
-        <tr>
-          <td>2.7.3</td>
-          <td>    <a href="#domain.spectral.SpectralValue">dataType: SpectralValue</a></td>
-        </tr>
-        <tr>
-          <td>2.7.4</td>
-          <td>    <a href="#domain.spectral.Wavelength">dataType: Wavelength</a></td>
-        </tr>
-        <tr>
-          <td>2.8</td>
+          <td>2.6</td>
           <td>    <a href="#domain.time">package: time</a></td>
         </tr>
         <tr>
-          <td>2.8.1</td>
+          <td>2.6.1</td>
           <td>    <a href="#domain.time.ISOTime">dataType: ISOTime</a></td>
         </tr>
         <tr>
-          <td>2.8.2</td>
+          <td>2.6.2</td>
           <td>    <a href="#domain.time.JD">dataType: JD</a></td>
         </tr>
         <tr>
-          <td>2.8.3</td>
-          <td>    <a href="#domain.time.MET">dataType: MET</a></td>
-        </tr>
-        <tr>
-          <td>2.8.4</td>
+          <td>2.6.3</td>
           <td>    <a href="#domain.time.MJD">dataType: MJD</a></td>
         </tr>
         <tr>
-          <td>2.8.5</td>
+          <td>2.6.4</td>
           <td>    <a href="#domain.time.TimeFrame">objectType: TimeFrame</a></td>
         </tr>
         <tr>
-          <td>2.8.6</td>
+          <td>2.6.5</td>
           <td>    <a href="#domain.time.TimeOffset">dataType: TimeOffset</a></td>
         </tr>
         <tr>
-          <td>2.8.7</td>
+          <td>2.6.6</td>
           <td>    <a href="#domain.time.TimeScale">enumeration: TimeScale</a></td>
         </tr>
         <tr>
-          <td>2.8.8</td>
+          <td>2.6.7</td>
           <td>    <a href="#domain.time.TimeStamp">dataType: TimeStamp</a></td>
         </tr>
         <tr>
@@ -330,7 +270,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2018-02-23T17:34:12</td>
+        <td>2018-04-06T14:59:37</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -366,76 +306,61 @@
         <td colspan="3"></td>
       </tr>
     </table><img src="STC_coords-v2.0.png" usemap="#GVmap"><map id="GVmap" name="GVmap">
-<area shape="rect" id="node2" href="#domain" title="domain" alt="" coords="461,273,539,321"/>
-<area shape="rect" id="node4" href="#domain.pixel" title="pixel" alt="" coords="1088,273,1160,321"/>
-<area shape="rect" id="node5" href="#domain.space" title="space" alt="" coords="992,273,1064,321"/>
-<area shape="rect" id="node6" href="#domain.spectral" title="spectral" alt="" coords="891,273,968,321"/>
-<area shape="rect" id="node7" href="#domain.time" title="time" alt="" coords="795,273,867,321"/>
-<area shape="rect" id="node8" href="#domain.redshift" title="redshift" alt="" coords="693,273,771,321"/>
-<area shape="rect" id="node9" href="#domain.polarization" title="polarization" alt="" coords="563,273,669,321"/>
-<area shape="rect" id="node10" href="#Handedness" title="{<<enumeration>>\nHandedness|+left\l+right\l}" alt="" coords="1192,259,1291,335"/>
-<area shape="rect" id="node11" href="#Coordinate" title="{<<datatype>>\nCoordinate}" alt="" coords="2283,1077,2365,1126"/>
-<area shape="rect" id="node17" href="#CoordFrame" title="{CoordFrame}" alt="" coords="2467,1214,2541,1263"/>
-<area shape="rect" id="node12" href="#CoordValue" title="{<<datatype>>\nCoordValue}" alt="" coords="940,926,1023,975"/>
-<area shape="rect" id="node21" href="#Axis" title="{Axis|+name : ivoa:string\l}" alt="" coords="576,1077,680,1126"/>
-<area shape="rect" id="node13" href="#CompositeCoordinate" title="{<<datatype>>\nCompositeCoordinate|+cmpt : coords:CoordValue\l}" alt="" coords="3309,919,3451,982"/>
-<area shape="rect" id="node14" href="#PhysicalCoordValue" title="{<<datatype>>\nPhysicalCoordValue|+cval : ivoa:Quantity\l}" alt="" coords="1676,785,1788,847"/>
-<area shape="rect" id="node15" href="#BinnedCoordValue" title="{<<datatype>>\nBinnedCoordValue|+cval : ivoa:integer\l}" alt="" coords="696,785,803,847"/>
-<area shape="rect" id="node16" href="#GenericCoordValue" title="{<<datatype>>\nGenericCoordValue}" alt="" coords="2040,647,2149,697"/>
-<area shape="rect" id="node18" href="#CoordSys" title="{CoordSys}" alt="" coords="124,791,196,841"/>
-<area shape="rect" id="node19" href="#AstroCoordSystem" title="{AstroCoordSystem}" alt="" coords="5,647,107,697"/>
-<area shape="rect" id="node20" href="#CoordSpace" title="{CoordSpace}" alt="" coords="457,926,532,975"/>
-<area shape="rect" id="node22" href="#ContinuousAxis" title="{ContinuousAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l+cyclic : ivoa:boolean\l}" alt="" coords="556,913,700,989"/>
-<area shape="rect" id="node23" href="#BinnedAxis" title="{BinnedAxis|+length : ivoa:nonnegativeInteger\l}" alt="" coords="724,926,889,975"/>
-<area shape="rect" id="node24" href="#DiscreteSetAxis" title="{DiscreteSetAxis}" alt="" coords="340,926,433,975"/>
-<area shape="rect" id="node25" href="#GenericCoordFrame" title="{GenericCoordFrame|+refPosition : coords:domain.space.RefLocation\l+planetaryEphem : ivoa:string\l}" alt="" coords="2389,1070,2619,1133"/>
-<area shape="rect" id="node26" href="#domain.pixel.PixelIndex" title="{<<datatype>>\ndomain/pixel/PixelIndex}" alt="" coords="312,647,437,697"/>
-<area shape="rect" id="node27" href="#domain.pixel.PixelCoordSystem" title="{domain/pixel/PixelCoordSystem}" alt="" coords="131,647,288,697"/>
-<area shape="rect" id="node28" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace|+handedness : coords:Handedness\l}" alt="" coords="248,791,413,841"/>
-<area shape="rect" id="node29" href="#domain.space.Epoch" title="{<<primitive type>>\ndomain/space/Epoch}" alt="" coords="2589,273,2699,322"/>
-<area shape="rect" id="node30" href="#domain.space.StdRefPosition" title="{<<enumeration>>\ndomain/space/StdRefPosition|+TOPOCENTER\l+BARYCENTER\l+HELIOCENTER\l+GEOCENTER\l+GALACTIC_CENTER\l+LOCAL_GROUP_CENTER\l+MOON\l+EMBARYCENTER\l+MERCURY\l+VENUS\l+MARS\l+JUPITER\l+SATURN\l+URANUS\l+NEPTUNE\l+PLUTO\l+RELOCATABLE\l+LSR\l+LSRK\l+LSRD\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="3045,126,3200,469"/>
-<area shape="rect" id="node31" href="#domain.space.StdRefFrame" title="{<<enumeration>>\ndomain/space/StdRefFrame|+ICRS\l+FK4\l+FK5\l+ECLIPTIC\l+GALACTIC_I\l+GALACTIC_II\l+SUPER_GALACTIC\l+AZ_EL\l+BODY\l+GEO_C\l+GEO_D\l+MAG\l+GSE\l+GSM\l+SM\l+HGC\l+HEE\l+HEEQ\l+HCI\l+HCD\l+MERCURY_C\l+VENUS_C\l+LUNA_C\l+MARS_C\l+JUPITER_C_III\l+SATURN_C_III\l+URANUS_C_III\l+NEPTUNE_C_III\l+PLUTO_C\l+MERCURY_G\l+VENUS_G\l+LUNA_G\l+MARS_G\l+JUPITER_G_III\l+SATURN_G_III\l+URANUS_G_III\l+NEPTUNE_G_III\l+PLUTO_G\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="3385,6,3527,589"/>
-<area shape="rect" id="node32" href="#domain.space.SpatialCoordValue" title="{<<datatype>>\ndomain/space/SpatialCoordValue}" alt="" coords="2173,647,2339,697"/>
-<area shape="rect" id="node33" href="#domain.space.RefLocation" title="{<<datatype>>\ndomain/space/RefLocation}" alt="" coords="3800,647,3936,697"/>
-<area shape="rect" id="node34" href="#domain.space.StdRefLocation" title="{<<datatype>>\ndomain/space/StdRefLocation|+position : coords:domain.space.StdRefPosition\l}" alt="" coords="3631,266,3857,329"/>
-<area shape="rect" id="node35" href="#domain.space.CustomRefLocation" title="{<<datatype>>\ndomain/space/CustomRefLocation|+epoch : coords:domain.space.Epoch\l+position : coords:domain.space.SpatialCoord\l+velocity : coords:domain.space.SpatialCoord\l}" alt="" coords="3881,253,4100,342"/>
-<area shape="rect" id="node36" href="#domain.space.SpatialCoord" title="{<<datatype>>\ndomain/space/SpatialCoord}" alt="" coords="3455,791,3593,841"/>
-<area shape="rect" id="node37" href="#domain.space.SpatialCoord1D" title="{<<datatype>>\ndomain/space/SpatialCoord1D}" alt="" coords="3448,647,3600,697"/>
-<area shape="rect" id="node38" href="#domain.space.SpatialCoord2D" title="{<<datatype>>\ndomain/space/SpatialCoord2D}" alt="" coords="3624,647,3776,697"/>
-<area shape="rect" id="node39" href="#domain.space.SpatialCoord3D" title="{<<datatype>>\ndomain/space/SpatialCoord3D}" alt="" coords="3272,647,3424,697"/>
-<area shape="rect" id="node40" href="#domain.space.SkyCoord" title="{<<datatype>>\ndomain/space/SkyCoord}" alt="" coords="2261,926,2387,975"/>
-<area shape="rect" id="node41" href="#domain.space.EquatorialCoord" title="{<<datatype>>\ndomain/space/EquatorialCoord|+ra : ivoa:RealQuantity\l+dec : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="2337,771,2492,861"/>
-<area shape="rect" id="node42" href="#domain.space.GalacticCoord" title="{<<datatype>>\ndomain/space/GalacticCoord|+l : ivoa:RealQuantity\l+b : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="2516,771,2663,861"/>
-<area shape="rect" id="node43" href="#domain.space.EclipticCoord" title="{<<datatype>>\ndomain/space/EclipticCoord|+elong : ivoa:RealQuantity\l+elat : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="2687,771,2828,861"/>
-<area shape="rect" id="node44" href="#domain.space.CartesianCoord" title="{<<datatype>>\ndomain/space/CartesianCoord|+x : ivoa:RealQuantity\l+y : ivoa:RealQuantity\l+z : ivoa:RealQuantity\l}" alt="" coords="1812,771,1961,861"/>
-<area shape="rect" id="node45" href="#domain.space.LongLatCoord" title="{<<datatype>>\ndomain/space/LongLatCoord|+long : ivoa:RealQuantity\l+lat : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="1985,771,2132,861"/>
-<area shape="rect" id="node46" href="#domain.space.UnitSphereCoord" title="{<<datatype>>\ndomain/space/UnitSphereCoord|+dircosx : ivoa:RealQuantity\l+dircosy : ivoa:RealQuantity\l+dircosz : ivoa:RealQuantity\l}" alt="" coords="2156,771,2313,861"/>
-<area shape="rect" id="node47" href="#domain.space.SpaceFrame" title="{domain/space/SpaceFrame|+refPosition : coords:domain.space.RefLocation\l+spaceRefFrame : coords:domain.space.StdRefFrame\l+equinox : coords:domain.space.Epoch\l+planetaryEphem : ivoa:string\l}" alt="" coords="2643,1057,2896,1146"/>
-<area shape="rect" id="node48" href="#domain.spectral.SpectralValue" title="{<<datatype>>\ndomain/spectral/SpectralValue}" alt="" coords="1531,647,1685,697"/>
-<area shape="rect" id="node49" href="#domain.spectral.Wavelength" title="{<<datatype>>\ndomain/spectral/Wavelength}" alt="" coords="1461,273,1605,322"/>
-<area shape="rect" id="node50" href="#domain.spectral.Frequency" title="{<<datatype>>\ndomain/spectral/Frequency}" alt="" coords="1629,273,1768,322"/>
-<area shape="rect" id="node51" href="#domain.spectral.Energy" title="{<<datatype>>\ndomain/spectral/Energy}" alt="" coords="1315,273,1437,322"/>
-<area shape="rect" id="node52" href="#domain.time.TimeScale" title="{<<enumeration>>\ndomain/time/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="4124,213,4249,382"/>
-<area shape="rect" id="node53" href="#domain.time.TimeOffset" title="{<<datatype>>\ndomain/time/TimeOffset}" alt="" coords="1709,647,1837,697"/>
-<area shape="rect" id="node54" href="#domain.time.ISOTime" title="{<<datatype>>\ndomain/time/ISOTime|+date : ivoa:datetime\l}" alt="" coords="3073,785,3191,847"/>
-<area shape="rect" id="node55" href="#domain.time.TimeStamp" title="{<<datatype>>\ndomain/time/TimeStamp}" alt="" coords="3068,926,3196,975"/>
-<area shape="rect" id="node56" href="#domain.time.JD" title="{<<datatype>>\ndomain/time/JD|+date : ivoa:real\l}" alt="" coords="3215,785,3308,847"/>
-<area shape="rect" id="node57" href="#domain.time.MJD" title="{<<datatype>>\ndomain/time/MJD|+date : ivoa:real\l}" alt="" coords="3332,785,3431,847"/>
-<area shape="rect" id="node58" href="#domain.time.MET" title="{<<datatype>>\ndomain/time/MET|+time : ivoa:RealQuantity\l+time0 : coords:domain.time.TimeStamp\l}" alt="" coords="2852,778,3049,854"/>
-<area shape="rect" id="node59" href="#domain.time.TimeFrame" title="{domain/time/TimeFrame|+refPosition : coords:domain.space.RefLocation\l+timescale : coords:domain.time.TimeScale\l+refDirection : coords:domain.space.RefLocation\l+time0 : coords:domain.time.TimeStamp\l}" alt="" coords="2920,1057,3157,1146"/>
-<area shape="rect" id="node60" href="#domain.redshift.DopplerDefinition" title="{<<enumeration>>\ndomain/redshift/DopplerDefinition|+optical\l+radio\l+relativistic\l}" alt="" coords="4273,253,4444,342"/>
-<area shape="rect" id="node61" href="#domain.redshift.RedshiftValue" title="{<<datatype>>\ndomain/redshift/RedshiftValue}" alt="" coords="1861,647,2016,697"/>
-<area shape="rect" id="node62" href="#domain.redshift.Redshift" title="{<<datatype>>\ndomain/redshift/Redshift}" alt="" coords="2109,273,2237,322"/>
-<area shape="rect" id="node63" href="#domain.redshift.DopplerVelocity" title="{<<datatype>>\ndomain/redshift/DopplerVelocity|+dopplerDefinition : coords:domain.redshift.DopplerDefinition\l}" alt="" coords="1792,266,2085,329"/>
-<area shape="rect" id="node64" href="#domain.polarization.PolStokesEnum" title="{<<enumeration>>\ndomain/polarization/PolStokesEnum|+I\l+Q\l+U\l+V\l}" alt="" coords="4468,246,4644,349"/>
-<area shape="rect" id="node65" href="#domain.polarization.PolCircularEnum" title="{<<enumeration>>\ndomain/polarization/PolCircularEnum|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="4668,246,4852,349"/>
-<area shape="rect" id="node66" href="#domain.polarization.PolLinearEnum" title="{<<enumeration>>\ndomain/polarization/PolLinearEnum|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="4876,246,5055,349"/>
-<area shape="rect" id="node67" href="#domain.polarization.PolVectorEnum" title="{<<enumeration>>\ndomain/polarization/PolVectorEnum|+I\l+PF\l+PP\l+PA\l}" alt="" coords="5079,246,5257,349"/>
-<area shape="rect" id="node68" href="#domain.polarization.PolCoordValue" title="{<<datatype>>\ndomain/polarization/PolCoordValue}" alt="" coords="893,791,1069,841"/>
-<area shape="rect" id="node69" href="#domain.polarization.PolLinear" title="{<<datatype>>\ndomain/polarization/PolLinear|+cval : coords:domain.polarization.PolLinearEnum\l}" alt="" coords="461,641,704,703"/>
-<area shape="rect" id="node70" href="#domain.polarization.PolVector" title="{<<datatype>>\ndomain/polarization/PolVector|+cval : coords:domain.polarization.PolVectorEnum\l}" alt="" coords="728,641,971,703"/>
-<area shape="rect" id="node71" href="#domain.polarization.PolStokes" title="{<<datatype>>\ndomain/polarization/PolStokes|+cval : coords:domain.polarization.PolStokesEnum\l}" alt="" coords="995,641,1235,703"/>
-<area shape="rect" id="node72" href="#domain.polarization.PolCircular" title="{<<datatype>>\ndomain/polarization/PolCircular|+cval : coords:domain.polarization.PolCircularEnum\l}" alt="" coords="1259,641,1507,703"/>
+<area shape="rect" id="node2" href="#domain" title="domain" alt="" coords="27,273,104,321"/>
+<area shape="rect" id="node4" href="#domain.pixel" title="pixel" alt="" coords="451,273,523,321"/>
+<area shape="rect" id="node5" href="#domain.space" title="space" alt="" coords="355,273,427,321"/>
+<area shape="rect" id="node6" href="#domain.time" title="time" alt="" coords="259,273,331,321"/>
+<area shape="rect" id="node7" href="#domain.polarization" title="polarization" alt="" coords="128,273,235,321"/>
+<area shape="rect" id="node8" href="#Handedness" title="{<<enumeration>>\nHandedness|+left\l+right\l}" alt="" coords="555,259,653,335"/>
+<area shape="rect" id="node9" href="#Coordinate" title="{<<datatype>>\nCoordinate}" alt="" coords="2128,962,2211,1011"/>
+<area shape="rect" id="node17" href="#CoordFrame" title="{CoordFrame}" alt="" coords="2312,1099,2387,1149"/>
+<area shape="rect" id="node10" href="#CoordValue" title="{<<datatype>>\nCoordValue}" alt="" coords="1499,811,1581,861"/>
+<area shape="rect" id="node21" href="#Axis" title="{Axis|+name : ivoa:string\l}" alt="" coords="1147,962,1251,1011"/>
+<area shape="rect" id="node11" href="#CompositeCoordinate" title="{<<datatype>>\nCompositeCoordinate|+cmpt : coords:CoordValue\l}" alt="" coords="3260,805,3401,867"/>
+<area shape="rect" id="node12" href="#PhysicalCoordValue" title="{<<datatype>>\nPhysicalCoordValue|+cval : ivoa:Quantity\l}" alt="" coords="1484,670,1596,733"/>
+<area shape="rect" id="node13" href="#BinnedCoordValue" title="{<<datatype>>\nBinnedCoordValue|+cval : ivoa:integer\l}" alt="" coords="1620,670,1727,733"/>
+<area shape="rect" id="node14" href="#CompositeCoord1D" title="{<<datatype>>\nCompositeCoord1D}" alt="" coords="3343,677,3449,726"/>
+<area shape="rect" id="node15" href="#CompositeCoord2D" title="{<<datatype>>\nCompositeCoord2D}" alt="" coords="3473,677,3580,726"/>
+<area shape="rect" id="node16" href="#CompositeCoord3D" title="{<<datatype>>\nCompositeCoord3D}" alt="" coords="3212,677,3319,726"/>
+<area shape="rect" id="node18" href="#CoordSys" title="{CoordSys}" alt="" coords="788,677,860,726"/>
+<area shape="rect" id="node19" href="#AstroCoordSystem" title="{AstroCoordSystem}" alt="" coords="677,273,779,322"/>
+<area shape="rect" id="node20" href="#CoordSpace" title="{CoordSpace}" alt="" coords="1028,811,1103,861"/>
+<area shape="rect" id="node22" href="#ContinuousAxis" title="{ContinuousAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l+cyclic : ivoa:boolean\l}" alt="" coords="1127,798,1271,874"/>
+<area shape="rect" id="node23" href="#BinnedAxis" title="{BinnedAxis|+length : ivoa:nonnegativeInteger\l}" alt="" coords="1295,811,1460,861"/>
+<area shape="rect" id="node24" href="#DiscreteSetAxis" title="{DiscreteSetAxis}" alt="" coords="911,811,1004,861"/>
+<area shape="rect" id="node25" href="#GenericCoordFrame" title="{GenericCoordFrame|+refPosition : coords:domain.space.RefLocation\l+planetaryEphem : ivoa:string\l}" alt="" coords="2235,955,2464,1018"/>
+<area shape="rect" id="node26" href="#domain.pixel.PixelIndex" title="{<<datatype>>\ndomain/pixel/PixelIndex}" alt="" coords="2053,273,2179,322"/>
+<area shape="rect" id="node27" href="#domain.pixel.PixelCoordSystem" title="{domain/pixel/PixelCoordSystem}" alt="" coords="803,273,960,322"/>
+<area shape="rect" id="node28" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace|+handedness : coords:Handedness\l}" alt="" coords="940,677,1105,726"/>
+<area shape="rect" id="node29" href="#domain.space.Epoch" title="{<<primitive type>>\ndomain/space/Epoch}" alt="" coords="2401,273,2511,322"/>
+<area shape="rect" id="node30" href="#domain.space.StdRefPosition" title="{<<enumeration>>\ndomain/space/StdRefPosition|+TOPOCENTER\l+BARYCENTER\l+HELIOCENTER\l+GEOCENTER\l+GALACTIC_CENTER\l+LOCAL_GROUP_CENTER\l+MOON\l+EMBARYCENTER\l+MERCURY\l+VENUS\l+MARS\l+JUPITER\l+SATURN\l+URANUS\l+NEPTUNE\l+PLUTO\l+RELOCATABLE\l+LSR\l+LSRK\l+LSRD\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="2856,126,3011,469"/>
+<area shape="rect" id="node31" href="#domain.space.StdRefFrame" title="{<<enumeration>>\ndomain/space/StdRefFrame|+ICRS\l+FK4\l+FK5\l+ECLIPTIC\l+GALACTIC_I\l+GALACTIC_II\l+SUPER_GALACTIC\l+AZ_EL\l+BODY\l+GEO_C\l+GEO_D\l+MAG\l+GSE\l+GSM\l+SM\l+HGC\l+HEE\l+HEEQ\l+HCI\l+HCD\l+MERCURY_C\l+VENUS_C\l+LUNA_C\l+MARS_C\l+JUPITER_C_III\l+SATURN_C_III\l+URANUS_C_III\l+NEPTUNE_C_III\l+PLUTO_C\l+MERCURY_G\l+VENUS_G\l+LUNA_G\l+MARS_G\l+JUPITER_G_III\l+SATURN_G_III\l+URANUS_G_III\l+NEPTUNE_G_III\l+PLUTO_G\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="3196,6,3337,589"/>
+<area shape="rect" id="node32" href="#domain.space.RefLocation" title="{<<datatype>>\ndomain/space/RefLocation}" alt="" coords="3604,677,3740,726"/>
+<area shape="rect" id="node33" href="#domain.space.StdRefLocation" title="{<<datatype>>\ndomain/space/StdRefLocation|+position : coords:domain.space.StdRefPosition\l}" alt="" coords="3441,266,3668,329"/>
+<area shape="rect" id="node34" href="#domain.space.CustomRefLocation" title="{<<datatype>>\ndomain/space/CustomRefLocation|+epoch : coords:domain.space.Epoch\l+position : coords:CompositeCoordinate\l+velocity : coords:CompositeCoordinate\l}" alt="" coords="3692,253,3887,342"/>
+<area shape="rect" id="node35" href="#domain.space.EquatorialCoord" title="{<<datatype>>\ndomain/space/EquatorialCoord|+ra : ivoa:RealQuantity\l+dec : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="1916,657,2071,746"/>
+<area shape="rect" id="node36" href="#domain.space.SpaceCoord" title="{<<datatype>>\ndomain/space/SpaceCoord}" alt="" coords="2103,811,2236,861"/>
+<area shape="rect" id="node37" href="#domain.space.CartesianCoord" title="{<<datatype>>\ndomain/space/CartesianCoord|+x : ivoa:RealQuantity\l+y : ivoa:RealQuantity\l+z : ivoa:RealQuantity\l}" alt="" coords="2095,657,2244,746"/>
+<area shape="rect" id="node38" href="#domain.space.LongLatCoord" title="{<<datatype>>\ndomain/space/LongLatCoord|+long : ivoa:RealQuantity\l+lat : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="2268,657,2415,746"/>
+<area shape="rect" id="node39" href="#domain.space.GalacticCoord" title="{<<datatype>>\ndomain/space/GalacticCoord|+l : ivoa:RealQuantity\l+b : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="2439,657,2585,746"/>
+<area shape="rect" id="node40" href="#domain.space.EclipticCoord" title="{<<datatype>>\ndomain/space/EclipticCoord|+elong : ivoa:RealQuantity\l+elat : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="1751,657,1892,746"/>
+<area shape="rect" id="node41" href="#domain.space.SpaceFrame" title="{domain/space/SpaceFrame|+refPosition : coords:domain.space.RefLocation\l+spaceRefFrame : coords:domain.space.StdRefFrame\l+equinox : coords:domain.space.Epoch\l+planetaryEphem : ivoa:string\l}" alt="" coords="2488,942,2741,1031"/>
+<area shape="rect" id="node42" href="#domain.time.TimeScale" title="{<<enumeration>>\ndomain/time/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="3911,213,4036,382"/>
+<area shape="rect" id="node43" href="#domain.time.ISOTime" title="{<<datatype>>\ndomain/time/ISOTime|+date : ivoa:datetime\l}" alt="" coords="2953,670,3071,733"/>
+<area shape="rect" id="node44" href="#domain.time.TimeStamp" title="{<<datatype>>\ndomain/time/TimeStamp}" alt="" coords="2767,811,2895,861"/>
+<area shape="rect" id="node45" href="#domain.time.JD" title="{<<datatype>>\ndomain/time/JD|+date : ivoa:real\l}" alt="" coords="3095,670,3188,733"/>
+<area shape="rect" id="node46" href="#domain.time.MJD" title="{<<datatype>>\ndomain/time/MJD|+date : ivoa:real\l}" alt="" coords="2609,670,2708,733"/>
+<area shape="rect" id="node47" href="#domain.time.TimeOffset" title="{<<datatype>>\ndomain/time/TimeOffset|+time : ivoa:RealQuantity\l+time0 : coords:domain.time.TimeStamp\l}" alt="" coords="2732,663,2929,739"/>
+<area shape="rect" id="node48" href="#domain.time.TimeFrame" title="{domain/time/TimeFrame|+refPosition : coords:domain.space.RefLocation\l+timescale : coords:domain.time.TimeScale\l+refDirection : coords:domain.space.RefLocation\l+time0 : coords:domain.time.TimeStamp\l}" alt="" coords="2765,942,3003,1031"/>
+<area shape="rect" id="node49" href="#domain.polarization.PolStokesEnum" title="{<<enumeration>>\ndomain/polarization/PolStokesEnum|+I\l+Q\l+U\l+V\l}" alt="" coords="4060,246,4236,349"/>
+<area shape="rect" id="node50" href="#domain.polarization.PolCircularEnum" title="{<<enumeration>>\ndomain/polarization/PolCircularEnum|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="4260,246,4444,349"/>
+<area shape="rect" id="node51" href="#domain.polarization.PolLinearEnum" title="{<<enumeration>>\ndomain/polarization/PolLinearEnum|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="4468,246,4647,349"/>
+<area shape="rect" id="node52" href="#domain.polarization.PolVectorEnum" title="{<<enumeration>>\ndomain/polarization/PolVectorEnum|+I\l+PF\l+PP\l+PA\l}" alt="" coords="4671,246,4849,349"/>
+<area shape="rect" id="node53" href="#domain.polarization.PolCoordValue" title="{<<datatype>>\ndomain/polarization/PolCoordValue}" alt="" coords="1284,677,1460,726"/>
+<area shape="rect" id="node54" href="#domain.polarization.PolLinear" title="{<<datatype>>\ndomain/polarization/PolLinear|+cval : coords:domain.polarization.PolLinearEnum\l}" alt="" coords="984,266,1227,329"/>
+<area shape="rect" id="node55" href="#domain.polarization.PolVector" title="{<<datatype>>\ndomain/polarization/PolVector|+cval : coords:domain.polarization.PolVectorEnum\l}" alt="" coords="1251,266,1493,329"/>
+<area shape="rect" id="node56" href="#domain.polarization.PolStokes" title="{<<datatype>>\ndomain/polarization/PolStokes|+cval : coords:domain.polarization.PolStokesEnum\l}" alt="" coords="1517,266,1757,329"/>
+<area shape="rect" id="node57" href="#domain.polarization.PolCircular" title="{<<datatype>>\ndomain/polarization/PolCircular|+cval : coords:domain.polarization.PolCircularEnum\l}" alt="" coords="1781,266,2029,329"/>
 </map>
 
     <hr>
@@ -465,7 +390,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#BinnedCoordValue">BinnedCoordValue</a> <a href="#CompositeCoordinate">CompositeCoordinate</a> <a href="#CoordValue">CoordValue</a> <a href="#Coordinate">Coordinate</a> <a href="#GenericCoordValue">GenericCoordValue</a> <a href="#PhysicalCoordValue">PhysicalCoordValue</a> 
+        <td colspan="2" class="feature-detail"><a href="#BinnedCoordValue">BinnedCoordValue</a> <a href="#CompositeCoord1D">CompositeCoord1D</a> <a href="#CompositeCoord2D">CompositeCoord2D</a> <a href="#CompositeCoord3D">CompositeCoord3D</a> <a href="#CompositeCoordinate">CompositeCoordinate</a> <a href="#CoordValue">CoordValue</a> <a href="#Coordinate">Coordinate</a> <a href="#PhysicalCoordValue">PhysicalCoordValue</a> 
         </td>
       </tr>
       <tr>
@@ -690,10 +615,6 @@
                       <td colspan="3" class="feature-detail"><a href="#CoordValue">CoordValue [coords:CoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title" width="20%">abstract</td>
-                      <td class="feature-detail" colspan="3">True</td>
-                    </tr>
-                    <tr>
                       <td class="info-title" width="20%">Subclasses in this model</td>
                       <td class="feature-detail" colspan="3"><a href="#domain.pixel.PixelIndex">PixelIndex</a> 
                       </td>
@@ -751,7 +672,121 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="CompositeCoordinate"></a>2.1.5 dataType: CompositeCoordinate
+    </div><br><h3><a name="CompositeCoord1D"></a>2.1.5 dataType: CompositeCoord1D
+    </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">CompositeCoord1D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CompositeCoordinate">CompositeCoordinate [coords:CompositeCoordinate]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">cmpt:CoordValue[1]</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="CompositeCoord2D"></a>2.1.6 dataType: CompositeCoord2D
+    </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">CompositeCoord2D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CompositeCoordinate">CompositeCoordinate [coords:CompositeCoordinate]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">cmpt:CoordValue[2]</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="CompositeCoord3D"></a>2.1.7 dataType: CompositeCoord3D
+    </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">CompositeCoord3D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CompositeCoordinate">CompositeCoordinate [coords:CompositeCoordinate]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">cmpt:CoordValue[3]</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="CompositeCoordinate"></a>2.1.8 dataType: CompositeCoordinate
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -782,7 +817,7 @@
                     </tr>
                     <tr>
                       <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.space.SpatialCoord">SpatialCoord</a> 
+                      <td class="feature-detail" colspan="3"><a href="#CompositeCoord1D">CompositeCoord1D</a> <a href="#CompositeCoord2D">CompositeCoord2D</a> <a href="#CompositeCoord3D">CompositeCoord3D</a> 
                       </td>
                     </tr>
                     <tr>
@@ -820,7 +855,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="ContinuousAxis"></a>2.1.6 objectType: ContinuousAxis
+    </div><br><h3><a name="ContinuousAxis"></a>2.1.9 objectType: ContinuousAxis
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -920,7 +955,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="CoordFrame"></a>2.1.7 objectType: CoordFrame
+    </div><br><h3><a name="CoordFrame"></a>2.1.10 objectType: CoordFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -962,7 +997,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="CoordSpace"></a>2.1.8 objectType: CoordSpace
+    </div><br><h3><a name="CoordSpace"></a>2.1.11 objectType: CoordSpace
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1027,7 +1062,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="CoordSys"></a>2.1.9 objectType: CoordSys
+    </div><br><h3><a name="CoordSys"></a>2.1.12 objectType: CoordSys
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1063,7 +1098,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="CoordValue"></a>2.1.10 dataType: CoordValue
+    </div><br><h3><a name="CoordValue"></a>2.1.13 dataType: CoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1132,7 +1167,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Coordinate"></a>2.1.11 dataType: Coordinate
+    </div><br><h3><a name="Coordinate"></a>2.1.14 dataType: Coordinate
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1159,7 +1194,7 @@
                     </tr>
                     <tr>
                       <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#CompositeCoordinate">CompositeCoordinate</a> <a href="#CoordValue">CoordValue</a> <a href="#domain.space.SkyCoord">SkyCoord</a> <a href="#domain.time.TimeStamp">TimeStamp</a> 
+                      <td class="feature-detail" colspan="3"><a href="#CompositeCoordinate">CompositeCoordinate</a> <a href="#CoordValue">CoordValue</a> <a href="#domain.space.SpaceCoord">SpaceCoord</a> <a href="#domain.time.TimeStamp">TimeStamp</a> 
                       </td>
                     </tr>
                     <tr>
@@ -1197,7 +1232,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="DiscreteSetAxis"></a>2.1.12 objectType: DiscreteSetAxis
+    </div><br><h3><a name="DiscreteSetAxis"></a>2.1.15 objectType: DiscreteSetAxis
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1229,7 +1264,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="GenericCoordFrame"></a>2.1.13 objectType: GenericCoordFrame
+    </div><br><h3><a name="GenericCoordFrame"></a>2.1.16 objectType: GenericCoordFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1309,39 +1344,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="GenericCoordValue"></a>2.1.14 dataType: GenericCoordValue
-    </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">GenericCoordValue</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="Handedness"></a>2.1.15 enumeration: Handedness
+    </div><br><h3><a name="Handedness"></a>2.1.17 enumeration: Handedness
     </h3>
     <table border="1" width="100%" cellspacing="2">
       <tr>
@@ -1389,7 +1392,7 @@
           
         </td>
       </tr>
-    </table><br><h3><a name="PhysicalCoordValue"></a>2.1.16 dataType: PhysicalCoordValue
+    </table><br><h3><a name="PhysicalCoordValue"></a>2.1.18 dataType: PhysicalCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1415,15 +1418,6 @@
                       <td colspan="3" class="feature-detail"><a href="#CoordValue">CoordValue [coords:CoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title" width="20%">abstract</td>
-                      <td class="feature-detail" colspan="3">True</td>
-                    </tr>
-                    <tr>
-                      <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#GenericCoordValue">GenericCoordValue</a> <a href="#domain.redshift.RedshiftValue">RedshiftValue</a> <a href="#domain.space.SpatialCoordValue">SpatialCoordValue</a> <a href="#domain.spectral.SpectralValue">SpectralValue</a> <a href="#domain.time.TimeOffset">TimeOffset</a> 
-                      </td>
-                    </tr>
-                    <tr>
                       <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
@@ -1498,7 +1492,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">child package(s)</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.pixel">pixel</a> <a href="#domain.polarization">polarization</a> <a href="#domain.redshift">redshift</a> <a href="#domain.space">space</a> <a href="#domain.spectral">spectral</a> <a href="#domain.time">time</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.pixel">pixel</a> <a href="#domain.polarization">polarization</a> <a href="#domain.space">space</a> <a href="#domain.time">time</a> 
         </td>
       </tr>
     </table>
@@ -2399,268 +2393,7 @@
           
         </td>
       </tr>
-    </table><br><h3><a name="domain.redshift"></a>2.5 package: redshift
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.redshift</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">Implementation of the Coordinate Frame pattern for the Redshift domain.
-          This is a basic 1-Dimensional coordinate space.
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.redshift.DopplerVelocity">DopplerVelocity</a> <a href="#domain.redshift.Redshift">Redshift</a> <a href="#domain.redshift.RedshiftValue">RedshiftValue</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Enumerations</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.redshift.DopplerDefinition">DopplerDefinition</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Parent package</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="domain.redshift.DopplerDefinition"></a>2.5.1 enumeration: DopplerDefinition
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="2">domain.redshift.DopplerDefinition</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="2">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#domain.redshift">redshift</a></td>
-      </tr>
-      <tr>
-        <td colspan="3" class="info-title" align="center">literals</td>
-      </tr>
-      <tr>
-        <td class="feature-heading" width="25%">name</td>
-        <td class="feature-heading" width="25%">feature</td>
-        <td class="feature-heading" width="50%">value</td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.redshift.DopplerDefinition.optical"></a>optical
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">domain.redshift.DopplerDefinition.optical</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" rowspan="2" valign="top"><a name="domain.redshift.DopplerDefinition.radio"></a>radio
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">domain.redshift.DopplerDefinition.radio</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" rowspan="2" valign="top"><a name="domain.redshift.DopplerDefinition.relativistic"></a>relativistic
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">domain.redshift.DopplerDefinition.relativistic</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><br><h3><a name="domain.redshift.DopplerVelocity"></a>2.5.2 dataType: DopplerVelocity
-    </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">domain.redshift.DopplerVelocity</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.redshift">redshift</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.redshift.RedshiftValue">RedshiftValue [coords:domain.redshift.RedshiftValue]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</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="domain.redshift.DopplerVelocity.dopplerDefinition"></a><b>dopplerDefinition</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.redshift.DopplerDefinition">DopplerDefinition [coords:domain.redshift.DopplerDefinition]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.redshift.DopplerVelocity.dopplerDefinition</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="domain.redshift.Redshift"></a>2.5.3 dataType: Redshift
-    </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">domain.redshift.Redshift</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.redshift">redshift</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.redshift.RedshiftValue">RedshiftValue [coords:domain.redshift.RedshiftValue]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.redshift.RedshiftValue"></a>2.5.4 dataType: RedshiftValue
-    </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">domain.redshift.RedshiftValue</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.redshift">redshift</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title" width="20%">abstract</td>
-                      <td class="feature-detail" colspan="3">True</td>
-                    </tr>
-                    <tr>
-                      <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.redshift.DopplerVelocity">DopplerVelocity</a> <a href="#domain.redshift.Redshift">Redshift</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#Coordinate.frame">frame [coords:Coordinate.frame]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#GenericCoordFrame">GenericCoordFrame [coords:GenericCoordFrame]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.space"></a>2.6 package: space
+    </table><br><h3><a name="domain.space"></a>2.5 package: space
     </h3>
     <table border="1" cellspacing="2" width="100%">
       <tr>
@@ -2686,7 +2419,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.space.CartesianCoord">CartesianCoord</a> <a href="#domain.space.CustomRefLocation">CustomRefLocation</a> <a href="#domain.space.EclipticCoord">EclipticCoord</a> <a href="#domain.space.EquatorialCoord">EquatorialCoord</a> <a href="#domain.space.GalacticCoord">GalacticCoord</a> <a href="#domain.space.LongLatCoord">LongLatCoord</a> <a href="#domain.space.RefLocation">RefLocation</a> <a href="#domain.space.SkyCoord">SkyCoord</a> <a href="#domain.space.SpatialCoord">SpatialCoord</a> <a href="#domain.space.SpatialCoord1D">SpatialCoord1D</a> <a href="#domain.space.SpatialCoord2D">SpatialCoord2D</a> <a href="#domain.space.SpatialCoord3D">SpatialCoord3D</a> <a href="#domain.space.SpatialCoordValue">SpatialCoordValue</a> <a href="#domain.space.StdRefLocation">StdRefLocation</a> <a href="#domain.space.UnitSphereCoord">UnitSphereCoord</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.space.CartesianCoord">CartesianCoord</a> <a href="#domain.space.CustomRefLocation">CustomRefLocation</a> <a href="#domain.space.EclipticCoord">EclipticCoord</a> <a href="#domain.space.EquatorialCoord">EquatorialCoord</a> <a href="#domain.space.GalacticCoord">GalacticCoord</a> <a href="#domain.space.LongLatCoord">LongLatCoord</a> <a href="#domain.space.RefLocation">RefLocation</a> <a href="#domain.space.SpaceCoord">SpaceCoord</a> <a href="#domain.space.StdRefLocation">StdRefLocation</a> 
         </td>
       </tr>
       <tr>
@@ -2705,7 +2438,7 @@
         </td>
       </tr>
     </table>
-    <h3><a name="domain.space.CartesianCoord"></a>2.6.1 dataType: CartesianCoord
+    <h3><a name="domain.space.CartesianCoord"></a>2.5.1 dataType: CartesianCoord
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2732,7 +2465,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SkyCoord">SkyCoord [coords:domain.space.SkyCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.space.SpaceCoord">SpaceCoord [coords:domain.space.SpaceCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2809,7 +2542,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.CustomRefLocation"></a>2.6.2 dataType: CustomRefLocation
+    </div><br><h3><a name="domain.space.CustomRefLocation"></a>2.5.2 dataType: CustomRefLocation
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2869,7 +2602,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.space.CustomRefLocation.position"></a><b>position</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.space.SpatialCoord">SpatialCoord [coords:domain.space.SpatialCoord]</a></td>
+                      <td class="feature-detail"><a href="#CompositeCoordinate">CompositeCoordinate [coords:CompositeCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2889,7 +2622,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.space.CustomRefLocation.velocity"></a><b>velocity</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.space.SpatialCoord">SpatialCoord [coords:domain.space.SpatialCoord]</a></td>
+                      <td class="feature-detail"><a href="#CompositeCoordinate">CompositeCoordinate [coords:CompositeCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2913,7 +2646,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.EclipticCoord"></a>2.6.3 dataType: EclipticCoord
+    </div><br><h3><a name="domain.space.EclipticCoord"></a>2.5.3 dataType: EclipticCoord
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2940,7 +2673,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SkyCoord">SkyCoord [coords:domain.space.SkyCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.space.SpaceCoord">SpaceCoord [coords:domain.space.SpaceCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3017,7 +2750,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.Epoch"></a>2.6.4 primitiveType: Epoch
+    </div><br><h3><a name="domain.space.Epoch"></a>2.5.4 primitiveType: Epoch
     </h3>
     <table border="1" width="100%" cellspacing="2">
       <tr>
@@ -3035,7 +2768,7 @@
         <td width="20%" class="info-title">package</td>
         <td colspan="3" class="feature-detail"><a href="#domain.space">space</a></td>
       </tr>
-    </table><br><h3><a name="domain.space.EquatorialCoord"></a>2.6.5 dataType: EquatorialCoord
+    </table><br><h3><a name="domain.space.EquatorialCoord"></a>2.5.5 dataType: EquatorialCoord
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3062,7 +2795,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SkyCoord">SkyCoord [coords:domain.space.SkyCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.space.SpaceCoord">SpaceCoord [coords:domain.space.SpaceCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3139,7 +2872,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.GalacticCoord"></a>2.6.6 dataType: GalacticCoord
+    </div><br><h3><a name="domain.space.GalacticCoord"></a>2.5.6 dataType: GalacticCoord
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3166,7 +2899,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SkyCoord">SkyCoord [coords:domain.space.SkyCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.space.SpaceCoord">SpaceCoord [coords:domain.space.SpaceCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3243,7 +2976,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.LongLatCoord"></a>2.6.7 dataType: LongLatCoord
+    </div><br><h3><a name="domain.space.LongLatCoord"></a>2.5.7 dataType: LongLatCoord
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3270,7 +3003,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SkyCoord">SkyCoord [coords:domain.space.SkyCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.space.SpaceCoord">SpaceCoord [coords:domain.space.SpaceCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3347,7 +3080,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.RefLocation"></a>2.6.8 dataType: RefLocation
+    </div><br><h3><a name="domain.space.RefLocation"></a>2.5.8 dataType: RefLocation
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3391,13 +3124,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.SkyCoord"></a>2.6.9 dataType: SkyCoord
+    </div><br><h3><a name="domain.space.SpaceCoord"></a>2.5.9 dataType: SpaceCoord
     </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">domain.space.SkyCoord</td>
+          <td class="objecttype-name" colspan="1">domain.space.SpaceCoord</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3426,27 +3159,9 @@
                     </tr>
                     <tr>
                       <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.space.CartesianCoord">CartesianCoord</a> <a href="#domain.space.EclipticCoord">EclipticCoord</a> <a href="#domain.space.EquatorialCoord">EquatorialCoord</a> <a href="#domain.space.GalacticCoord">GalacticCoord</a> <a href="#domain.space.LongLatCoord">LongLatCoord</a> <a href="#domain.space.UnitSphereCoord">UnitSphereCoord</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.space.CartesianCoord">CartesianCoord</a> <a href="#domain.space.EclipticCoord">EclipticCoord</a> <a href="#domain.space.EquatorialCoord">EquatorialCoord</a> <a href="#domain.space.GalacticCoord">GalacticCoord</a> <a href="#domain.space.LongLatCoord">LongLatCoord</a> 
                       </td>
                     </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#Coordinate.frame">frame [coords:Coordinate.frame]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#domain.space.SpaceFrame">SpaceFrame [coords:domain.space.SpaceFrame]</a></td>
-                    </tr>
                   </table>
                 </td>
               </tr>
@@ -3454,7 +3169,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.SpaceFrame"></a>2.6.10 objectType: SpaceFrame
+    </div><br><h3><a name="domain.space.SpaceFrame"></a>2.5.10 objectType: SpaceFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3578,304 +3293,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.SpatialCoord"></a>2.6.11 dataType: SpatialCoord
-    </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">domain.space.SpatialCoord</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space">space</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CompositeCoordinate">CompositeCoordinate [coords:CompositeCoordinate]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title" width="20%">abstract</td>
-                      <td class="feature-detail" colspan="3">True</td>
-                    </tr>
-                    <tr>
-                      <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.space.SpatialCoord1D">SpatialCoord1D</a> <a href="#domain.space.SpatialCoord2D">SpatialCoord2D</a> <a href="#domain.space.SpatialCoord3D">SpatialCoord3D</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#Coordinate.frame">frame [coords:Coordinate.frame]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#domain.space.SpaceFrame">SpaceFrame [coords:domain.space.SpaceFrame]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.space.SpatialCoord1D"></a>2.6.12 dataType: SpatialCoord1D
-    </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">domain.space.SpatialCoord1D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space">space</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SpatialCoord">SpatialCoord [coords:domain.space.SpatialCoord]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" colspan="3">cmpt:SpatialCoordValue[1]</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#CompositeCoordinate.cmpt">cmpt [coords:CompositeCoordinate.cmpt]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#domain.space.SpatialCoordValue">SpatialCoordValue [coords:domain.space.SpatialCoordValue]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.space.SpatialCoord2D"></a>2.6.13 dataType: SpatialCoord2D
-    </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">domain.space.SpatialCoord2D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space">space</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SpatialCoord">SpatialCoord [coords:domain.space.SpatialCoord]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" colspan="3">cmpt:SpatialCoordValue[2]</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#CompositeCoordinate.cmpt">cmpt [coords:CompositeCoordinate.cmpt]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#domain.space.SpatialCoordValue">SpatialCoordValue [coords:domain.space.SpatialCoordValue]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.space.SpatialCoord3D"></a>2.6.14 dataType: SpatialCoord3D
-    </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">domain.space.SpatialCoord3D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space">space</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SpatialCoord">SpatialCoord [coords:domain.space.SpatialCoord]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" colspan="3">cmpt:SpatialCoordValue[3]</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#CompositeCoordinate.cmpt">cmpt [coords:CompositeCoordinate.cmpt]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#domain.space.SpatialCoordValue">SpatialCoordValue [coords:domain.space.SpatialCoordValue]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.space.SpatialCoordValue"></a>2.6.15 dataType: SpatialCoordValue
-    </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">domain.space.SpatialCoordValue</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">An instance of a point along the associated axis.
-            NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords
-            model.
-          </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="#domain.space">space</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#Coordinate.frame">frame [coords:Coordinate.frame]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#domain.space.SpaceFrame">SpaceFrame [coords:domain.space.SpaceFrame]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.space.StdRefFrame"></a>2.6.16 enumeration: StdRefFrame
+    </div><br><h3><a name="domain.space.StdRefFrame"></a>2.5.11 enumeration: StdRefFrame
     </h3>
     <table border="1" width="100%" cellspacing="2">
       <tr>
@@ -4421,7 +3839,7 @@
           
         </td>
       </tr>
-    </table><br><h3><a name="domain.space.StdRefLocation"></a>2.6.17 dataType: StdRefLocation
+    </table><br><h3><a name="domain.space.StdRefLocation"></a>2.5.12 dataType: StdRefLocation
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -4485,7 +3903,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.space.StdRefPosition"></a>2.6.18 enumeration: StdRefPosition
+    </div><br><h3><a name="domain.space.StdRefPosition"></a>2.5.13 enumeration: StdRefPosition
     </h3>
     <table border="1" width="100%" cellspacing="2">
       <tr>
@@ -4797,310 +4215,7 @@
           
         </td>
       </tr>
-    </table><br><h3><a name="domain.space.UnitSphereCoord"></a>2.6.19 dataType: UnitSphereCoord
-    </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">domain.space.UnitSphereCoord</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space">space</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.space.SkyCoord">SkyCoord [coords:domain.space.SkyCoord]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</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="domain.space.UnitSphereCoord.dircosx"></a><b>dircosx</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.space.UnitSphereCoord.dircosx</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..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>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.space.UnitSphereCoord.dircosy"></a><b>dircosy</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.space.UnitSphereCoord.dircosy</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..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>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.space.UnitSphereCoord.dircosz"></a><b>dircosz</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.space.UnitSphereCoord.dircosz</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..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="domain.spectral"></a>2.7 package: spectral
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.spectral</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">Implementation of the Coordinate Frame pattern for the Spectral domain.
-          This is a basic 1-Dimensional coordinate space.
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.spectral.Energy">Energy</a> <a href="#domain.spectral.Frequency">Frequency</a> <a href="#domain.spectral.SpectralValue">SpectralValue</a> <a href="#domain.spectral.Wavelength">Wavelength</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Parent package</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="domain.spectral.Energy"></a>2.7.1 dataType: Energy
-    </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">domain.spectral.Energy</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.SpectralValue">SpectralValue [coords:domain.spectral.SpectralValue]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.spectral.Frequency"></a>2.7.2 dataType: Frequency
-    </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">domain.spectral.Frequency</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.SpectralValue">SpectralValue [coords:domain.spectral.SpectralValue]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.spectral.SpectralValue"></a>2.7.3 dataType: SpectralValue
-    </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">domain.spectral.SpectralValue</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title" width="20%">abstract</td>
-                      <td class="feature-detail" colspan="3">True</td>
-                    </tr>
-                    <tr>
-                      <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spectral.Energy">Energy</a> <a href="#domain.spectral.Frequency">Frequency</a> <a href="#domain.spectral.Wavelength">Wavelength</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="feature-detail" valign="top"><a href="#Coordinate.frame">frame [coords:Coordinate.frame]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
-                      </td>
-                      <td class="feature-detail"><a href="#GenericCoordFrame">GenericCoordFrame [coords:GenericCoordFrame]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.spectral.Wavelength"></a>2.7.4 dataType: Wavelength
-    </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">domain.spectral.Wavelength</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.SpectralValue">SpectralValue [coords:domain.spectral.SpectralValue]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.time"></a>2.8 package: time
+    </table><br><h3><a name="domain.time"></a>2.6 package: time
     </h3>
     <table border="1" cellspacing="2" width="100%">
       <tr>
@@ -5124,7 +4239,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.time.ISOTime">ISOTime</a> <a href="#domain.time.JD">JD</a> <a href="#domain.time.MET">MET</a> <a href="#domain.time.MJD">MJD</a> <a href="#domain.time.TimeOffset">TimeOffset</a> <a href="#domain.time.TimeStamp">TimeStamp</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.time.ISOTime">ISOTime</a> <a href="#domain.time.JD">JD</a> <a href="#domain.time.MJD">MJD</a> <a href="#domain.time.TimeOffset">TimeOffset</a> <a href="#domain.time.TimeStamp">TimeStamp</a> 
         </td>
       </tr>
       <tr>
@@ -5138,7 +4253,7 @@
         </td>
       </tr>
     </table>
-    <h3><a name="domain.time.ISOTime"></a>2.8.1 dataType: ISOTime
+    <h3><a name="domain.time.ISOTime"></a>2.6.1 dataType: ISOTime
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -5201,7 +4316,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.time.JD"></a>2.8.2 dataType: JD
+    </div><br><h3><a name="domain.time.JD"></a>2.6.2 dataType: JD
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -5265,91 +4380,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.time.MET"></a>2.8.3 dataType: MET
-    </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">domain.time.MET</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.time">time</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</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="domain.time.MET.time"></a><b>time</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.time.MET.time</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>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.time.MET.time0"></a><b>time0</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.time.MET.time0</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="domain.time.MJD"></a>2.8.4 dataType: MJD
+    </div><br><h3><a name="domain.time.MJD"></a>2.6.3 dataType: MJD
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -5413,7 +4444,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.time.TimeFrame"></a>2.8.5 objectType: TimeFrame
+    </div><br><h3><a name="domain.time.TimeFrame"></a>2.6.4 objectType: TimeFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -5538,7 +4569,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.time.TimeOffset"></a>2.8.6 dataType: TimeOffset
+    </div><br><h3><a name="domain.time.TimeOffset"></a>2.6.5 dataType: TimeOffset
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -5548,7 +4579,10 @@
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">The time coordinate is represented as an offset from the origin.</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
         </tr>
         <tr>
           <td colspan="2">
@@ -5562,25 +4596,55 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">role constraints</td>
+                      <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="30%">Constrained Role</td>
-                      <td class="feature-heading" width="20%">Constraint Feature</td>
-                      <td class="feature-heading" width="50%">Constraint Value</td>
+                      <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 colspan="3" class="feature-detail" valign="top"><a href="#Coordinate.frame">frame [coords:Coordinate.frame]</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.time.TimeOffset.time"></a><b>time</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.html#RealQuantity">RealQuantity</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-detail"></td>
-                      <td class="feature-heading" valign="top">
-                        	  datatype
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.time.TimeOffset.time</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>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.time.TimeOffset.time0"></a><b>time0</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.time.TimeOffset.time0</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 class="feature-detail"><a href="#domain.time.TimeFrame">TimeFrame [coords:domain.time.TimeFrame]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -5589,7 +4653,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.time.TimeScale"></a>2.8.7 enumeration: TimeScale
+    </div><br><h3><a name="domain.time.TimeScale"></a>2.6.6 enumeration: TimeScale
     </h3>
     <table border="1" width="100%" cellspacing="2">
       <tr>
@@ -5732,7 +4796,7 @@
           
         </td>
       </tr>
-    </table><br><h3><a name="domain.time.TimeStamp"></a>2.8.8 dataType: TimeStamp
+    </table><br><h3><a name="domain.time.TimeStamp"></a>2.6.7 dataType: TimeStamp
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -5767,7 +4831,7 @@
                     </tr>
                     <tr>
                       <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.time.ISOTime">ISOTime</a> <a href="#domain.time.JD">JD</a> <a href="#domain.time.MET">MET</a> <a href="#domain.time.MJD">MJD</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.time.ISOTime">ISOTime</a> <a href="#domain.time.JD">JD</a> <a href="#domain.time.MJD">MJD</a> <a href="#domain.time.TimeOffset">TimeOffset</a> 
                       </td>
                     </tr>
                     <tr>
@@ -5884,6 +4948,30 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#CompositeCoord1D">CompositeCoord1D</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CompositeCoord2D">CompositeCoord2D</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CompositeCoord3D">CompositeCoord3D</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#CompositeCoordinate">CompositeCoordinate</a></td>
         <td class="feature-detail">dataType</td>
         <td class="feature-detail">
@@ -6027,14 +5115,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#GenericCoordValue">GenericCoordValue</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#Handedness">Handedness</a></td>
         <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
@@ -6373,77 +5453,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.redshift">domain.redshift</a></td>
-        <td class="feature-detail">package</td>
-        <td class="feature-detail">Implementation of the Coordinate Frame pattern for the Redshift domain.
-          This is a basic 1-Dimensional coordinate space.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.redshift.DopplerDefinition">domain.redshift.DopplerDefinition</a></td>
-        <td class="feature-detail">enumeration</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.redshift.DopplerDefinition.optical">domain.redshift.DopplerDefinition.optical</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.redshift.DopplerDefinition.radio">domain.redshift.DopplerDefinition.radio</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.redshift.DopplerDefinition.relativistic">domain.redshift.DopplerDefinition.relativistic</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.redshift.DopplerVelocity">domain.redshift.DopplerVelocity</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.redshift.DopplerVelocity.dopplerDefinition">domain.redshift.DopplerVelocity.dopplerDefinition</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="#domain.redshift.Redshift">domain.redshift.Redshift</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.redshift.RedshiftValue">domain.redshift.RedshiftValue</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#domain.space">domain.space</a></td>
         <td class="feature-detail">package</td>
         <td class="feature-detail">Implementation of the Coordinate Frame pattern for the Spatial domain.
@@ -6664,7 +5673,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.space.SkyCoord">domain.space.SkyCoord</a></td>
+        <td class="feature-detail"><a href="#domain.space.SpaceCoord">domain.space.SpaceCoord</a></td>
         <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -6712,46 +5721,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.space.SpatialCoord">domain.space.SpatialCoord</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.space.SpatialCoord1D">domain.space.SpatialCoord1D</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.space.SpatialCoord2D">domain.space.SpatialCoord2D</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.space.SpatialCoord3D">domain.space.SpatialCoord3D</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.space.SpatialCoordValue">domain.space.SpatialCoordValue</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">An instance of a point along the associated axis.
-          NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords
-          model.
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#domain.space.StdRefFrame">domain.space.StdRefFrame</a></td>
         <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
@@ -7280,77 +6249,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.space.UnitSphereCoord">domain.space.UnitSphereCoord</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.space.UnitSphereCoord.dircosx">domain.space.UnitSphereCoord.dircosx</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="#domain.space.UnitSphereCoord.dircosy">domain.space.UnitSphereCoord.dircosy</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="#domain.space.UnitSphereCoord.dircosz">domain.space.UnitSphereCoord.dircosz</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="#domain.spectral">domain.spectral</a></td>
-        <td class="feature-detail">package</td>
-        <td class="feature-detail">Implementation of the Coordinate Frame pattern for the Spectral domain.
-          This is a basic 1-Dimensional coordinate space.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Energy">domain.spectral.Energy</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Frequency">domain.spectral.Frequency</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.spectral.SpectralValue">domain.spectral.SpectralValue</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Wavelength">domain.spectral.Wavelength</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#domain.time">domain.time</a></td>
         <td class="feature-detail">package</td>
         <td class="feature-detail">Implementation of the Coordinate Frame pattern for the Time domain.
@@ -7389,7 +6287,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.MET">domain.time.MET</a></td>
+        <td class="feature-detail"><a href="#domain.time.MJD">domain.time.MJD</a></td>
         <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7397,7 +6295,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.MET.time">domain.time.MET.time</a></td>
+        <td class="feature-detail"><a href="#domain.time.MJD.date">domain.time.MJD.date</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7405,23 +6303,24 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.MET.time0">domain.time.MET.time0</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
+        <td class="feature-detail"><a href="#domain.time.TimeFrame">domain.time.TimeFrame</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">origin: implied
+          dimensionality: 1D
+          orientation: n/a
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.MJD">domain.time.MJD</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.time.TimeFrame.refDirection">domain.time.TimeFrame.refDirection</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="#domain.time.MJD.date">domain.time.MJD.date</a></td>
+        <td class="feature-detail"><a href="#domain.time.TimeFrame.refPosition">domain.time.TimeFrame.refPosition</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7429,16 +6328,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.TimeFrame">domain.time.TimeFrame</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">origin: implied
-          dimensionality: 1D
-          orientation: n/a
+        <td class="feature-detail"><a href="#domain.time.TimeFrame.time0">domain.time.TimeFrame.time0</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="#domain.time.TimeFrame.refDirection">domain.time.TimeFrame.refDirection</a></td>
+        <td class="feature-detail"><a href="#domain.time.TimeFrame.timescale">domain.time.TimeFrame.timescale</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7446,15 +6344,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.TimeFrame.refPosition">domain.time.TimeFrame.refPosition</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.time.TimeOffset">domain.time.TimeOffset</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.TimeFrame.time0">domain.time.TimeFrame.time0</a></td>
+        <td class="feature-detail"><a href="#domain.time.TimeOffset.time">domain.time.TimeOffset.time</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7462,7 +6360,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.TimeFrame.timescale">domain.time.TimeFrame.timescale</a></td>
+        <td class="feature-detail"><a href="#domain.time.TimeOffset.time0">domain.time.TimeOffset.time0</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7470,11 +6368,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.TimeOffset">domain.time.TimeOffset</a></td>
-        <td class="feature-detail">dataType</td>
-        <td class="feature-detail">The time coordinate is represented as an offset from the origin.</td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#domain.time.TimeScale">domain.time.TimeScale</a></td>
         <td class="feature-detail">enumeration</td>
         <td class="feature-detail">

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

Modified: trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.vo-dml.xml
==============================================================================
--- trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.vo-dml.xml	Fri Apr  6 20:57:25 2018	(r4896)
+++ trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.vo-dml.xml	Fri Apr  6 21:01:59 2018	(r4897)
@@ -10,7 +10,7 @@
   <author>Arnold Rots, Mark Cresitello-Dittmar, Omar Laurino</author>
   <version>2.0</version>
   <previousVersion>0.x</previousVersion>
-  <lastModified>2018-02-23T17:34:12</lastModified>
+  <lastModified>2018-04-06T14:59:37</lastModified>
   <import>
     <name>ivoa</name>
     <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.vo-dml.xml</url>
@@ -110,7 +110,7 @@
     </attribute>
   </dataType>
 
-  <dataType abstract="true">
+  <dataType>
     <vodml-id>PhysicalCoordValue</vodml-id>
     <name>PhysicalCoordValue</name>
     <description>
@@ -143,7 +143,7 @@
     </attribute>
   </dataType>
 
-  <dataType abstract="true">
+  <dataType>
     <vodml-id>BinnedCoordValue</vodml-id>
     <name>BinnedCoordValue</name>
     <description>
@@ -177,14 +177,45 @@
   </dataType>
 
   <dataType>
-    <vodml-id>GenericCoordValue</vodml-id>
-    <name>GenericCoordValue</name>
+    <vodml-id>CompositeCoord1D</vodml-id>
+    <name>CompositeCoord1D</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <extends>
+      <vodml-ref>coords:CompositeCoordinate</vodml-ref>
+    </extends>
+    <constraint>
+      <description>cmpt:CoordValue[1]</description>
+    </constraint>
+  </dataType>
+
+  <dataType>
+    <vodml-id>CompositeCoord2D</vodml-id>
+    <name>CompositeCoord2D</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <extends>
+      <vodml-ref>coords:CompositeCoordinate</vodml-ref>
+    </extends>
+    <constraint>
+      <description>cmpt:CoordValue[2]</description>
+    </constraint>
+  </dataType>
+
+  <dataType>
+    <vodml-id>CompositeCoord3D</vodml-id>
+    <name>CompositeCoord3D</name>
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
     <extends>
-      <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
+      <vodml-ref>coords:CompositeCoordinate</vodml-ref>
     </extends>
+    <constraint>
+      <description>cmpt:CoordValue[3]</description>
+    </constraint>
   </dataType>
 
   <objectType abstract="true">
@@ -947,24 +978,6 @@
         </literal>
       </enumeration>
 
-      <dataType>
-        <vodml-id>domain.space.SpatialCoordValue</vodml-id>
-        <name>SpatialCoordValue</name>
-        <description>An instance of a point along the associated axis.
-NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords model.</description>
-        <extends>
-          <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
-        </extends>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:Coordinate.frame</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:domain.space.SpaceFrame</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
       <dataType abstract="true">
         <vodml-id>domain.space.RefLocation</vodml-id>
         <name>RefLocation</name>
@@ -1027,7 +1040,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.space.SpatialCoord</vodml-ref>
+            <vodml-ref>coords:CompositeCoordinate</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1041,7 +1054,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.space.SpatialCoord</vodml-ref>
+            <vodml-ref>coords:CompositeCoordinate</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -1050,110 +1063,6 @@
         </attribute>
       </dataType>
 
-      <dataType abstract="true">
-        <vodml-id>domain.space.SpatialCoord</vodml-id>
-        <name>SpatialCoord</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:CompositeCoordinate</vodml-ref>
-        </extends>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:Coordinate.frame</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:domain.space.SpaceFrame</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.space.SpatialCoord1D</vodml-id>
-        <name>SpatialCoord1D</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.space.SpatialCoord</vodml-ref>
-        </extends>
-        <constraint>
-          <description>cmpt:SpatialCoordValue[1]</description>
-        </constraint>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:CompositeCoordinate.cmpt</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:domain.space.SpatialCoordValue</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.space.SpatialCoord2D</vodml-id>
-        <name>SpatialCoord2D</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.space.SpatialCoord</vodml-ref>
-        </extends>
-        <constraint>
-          <description>cmpt:SpatialCoordValue[2]</description>
-        </constraint>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:CompositeCoordinate.cmpt</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:domain.space.SpatialCoordValue</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.space.SpatialCoord3D</vodml-id>
-        <name>SpatialCoord3D</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.space.SpatialCoord</vodml-ref>
-        </extends>
-        <constraint>
-          <description>cmpt:SpatialCoordValue[3]</description>
-        </constraint>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:CompositeCoordinate.cmpt</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:domain.space.SpatialCoordValue</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
-      <dataType abstract="true">
-        <vodml-id>domain.space.SkyCoord</vodml-id>
-        <name>SkyCoord</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:Coordinate</vodml-ref>
-        </extends>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:Coordinate.frame</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:domain.space.SpaceFrame</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
       <dataType>
         <vodml-id>domain.space.EquatorialCoord</vodml-id>
         <name>EquatorialCoord</name>
@@ -1161,7 +1070,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.space.SkyCoord</vodml-ref>
+          <vodml-ref>coords:domain.space.SpaceCoord</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.space.EquatorialCoord.ra</vodml-id>
@@ -1207,71 +1116,29 @@
         </attribute>
       </dataType>
 
-      <dataType>
-        <vodml-id>domain.space.GalacticCoord</vodml-id>
-        <name>GalacticCoord</name>
+      <dataType abstract="true">
+        <vodml-id>domain.space.SpaceCoord</vodml-id>
+        <name>SpaceCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.space.SkyCoord</vodml-ref>
+          <vodml-ref>coords:Coordinate</vodml-ref>
         </extends>
-        <attribute>
-          <vodml-id>domain.space.GalacticCoord.l</vodml-id>
-          <name>l</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <attribute>
-          <vodml-id>domain.space.GalacticCoord.b</vodml-id>
-          <name>b</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <attribute>
-          <vodml-id>domain.space.GalacticCoord.r</vodml-id>
-          <name>r</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
       </dataType>
 
       <dataType>
-        <vodml-id>domain.space.EclipticCoord</vodml-id>
-        <name>EclipticCoord</name>
+        <vodml-id>domain.space.CartesianCoord</vodml-id>
+        <name>CartesianCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.space.SkyCoord</vodml-ref>
+          <vodml-ref>coords:domain.space.SpaceCoord</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.space.EclipticCoord.elong</vodml-id>
-          <name>elong</name>
+          <vodml-id>domain.space.CartesianCoord.x</vodml-id>
+          <name>x</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1284,8 +1151,8 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.space.EclipticCoord.elat</vodml-id>
-          <name>elat</name>
+          <vodml-id>domain.space.CartesianCoord.y</vodml-id>
+          <name>y</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1298,8 +1165,8 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.space.EclipticCoord.r</vodml-id>
-          <name>r</name>
+          <vodml-id>domain.space.CartesianCoord.z</vodml-id>
+          <name>z</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1314,17 +1181,17 @@
       </dataType>
 
       <dataType>
-        <vodml-id>domain.space.CartesianCoord</vodml-id>
-        <name>CartesianCoord</name>
+        <vodml-id>domain.space.LongLatCoord</vodml-id>
+        <name>LongLatCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.space.SkyCoord</vodml-ref>
+          <vodml-ref>coords:domain.space.SpaceCoord</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.space.CartesianCoord.x</vodml-id>
-          <name>x</name>
+          <vodml-id>domain.space.LongLatCoord.long</vodml-id>
+          <name>long</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1337,8 +1204,8 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.space.CartesianCoord.y</vodml-id>
-          <name>y</name>
+          <vodml-id>domain.space.LongLatCoord.lat</vodml-id>
+          <name>lat</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1351,8 +1218,8 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.space.CartesianCoord.z</vodml-id>
-          <name>z</name>
+          <vodml-id>domain.space.LongLatCoord.r</vodml-id>
+          <name>r</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1367,17 +1234,17 @@
       </dataType>
 
       <dataType>
-        <vodml-id>domain.space.LongLatCoord</vodml-id>
-        <name>LongLatCoord</name>
+        <vodml-id>domain.space.GalacticCoord</vodml-id>
+        <name>GalacticCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.space.SkyCoord</vodml-ref>
+          <vodml-ref>coords:domain.space.SpaceCoord</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.space.LongLatCoord.long</vodml-id>
-          <name>long</name>
+          <vodml-id>domain.space.GalacticCoord.l</vodml-id>
+          <name>l</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1390,8 +1257,8 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.space.LongLatCoord.lat</vodml-id>
-          <name>lat</name>
+          <vodml-id>domain.space.GalacticCoord.b</vodml-id>
+          <name>b</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1404,7 +1271,7 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.space.LongLatCoord.r</vodml-id>
+          <vodml-id>domain.space.GalacticCoord.r</vodml-id>
           <name>r</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
@@ -1420,17 +1287,17 @@
       </dataType>
 
       <dataType>
-        <vodml-id>domain.space.UnitSphereCoord</vodml-id>
-        <name>UnitSphereCoord</name>
+        <vodml-id>domain.space.EclipticCoord</vodml-id>
+        <name>EclipticCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.space.SkyCoord</vodml-ref>
+          <vodml-ref>coords:domain.space.SpaceCoord</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.space.UnitSphereCoord.dircosx</vodml-id>
-          <name>dircosx</name>
+          <vodml-id>domain.space.EclipticCoord.elong</vodml-id>
+          <name>elong</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1443,8 +1310,8 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.space.UnitSphereCoord.dircosy</vodml-id>
-          <name>dircosy</name>
+          <vodml-id>domain.space.EclipticCoord.elat</vodml-id>
+          <name>elat</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1457,8 +1324,8 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.space.UnitSphereCoord.dircosz</vodml-id>
-          <name>dircosz</name>
+          <vodml-id>domain.space.EclipticCoord.r</vodml-id>
+          <name>r</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1544,67 +1411,6 @@
 
 
     <package>
-      <vodml-id>domain.spectral</vodml-id>
-      <name>spectral</name>
-      <description>Implementation of the Coordinate Frame pattern for the Spectral domain.
-This is a basic 1-Dimensional coordinate space.</description>
-      <dataType abstract="true">
-        <vodml-id>domain.spectral.SpectralValue</vodml-id>
-        <name>SpectralValue</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
-        </extends>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:Coordinate.frame</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:GenericCoordFrame</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.spectral.Wavelength</vodml-id>
-        <name>Wavelength</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.spectral.SpectralValue</vodml-ref>
-        </extends>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.spectral.Frequency</vodml-id>
-        <name>Frequency</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.spectral.SpectralValue</vodml-ref>
-        </extends>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.spectral.Energy</vodml-id>
-        <name>Energy</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.spectral.SpectralValue</vodml-ref>
-        </extends>
-      </dataType>
-
-    </package>
-
-
-
-    <package>
       <vodml-id>domain.time</vodml-id>
       <name>time</name>
       <description>Implementation of the Coordinate Frame pattern for the Time domain.
@@ -1681,23 +1487,6 @@
       </enumeration>
 
       <dataType>
-        <vodml-id>domain.time.TimeOffset</vodml-id>
-        <name>TimeOffset</name>
-        <description>The time coordinate is represented as an offset from the origin.</description>
-        <extends>
-          <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
-        </extends>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:Coordinate.frame</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:domain.time.TimeFrame</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
-      <dataType>
         <vodml-id>domain.time.ISOTime</vodml-id>
         <name>ISOTime</name>
         <description>The time is represented as a particular instant.  While interchangable with the TimeOffset, this form typically has a defined structure in representation.</description>
@@ -1790,8 +1579,8 @@
       </dataType>
 
       <dataType>
-        <vodml-id>domain.time.MET</vodml-id>
-        <name>MET</name>
+        <vodml-id>domain.time.TimeOffset</vodml-id>
+        <name>TimeOffset</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1799,7 +1588,7 @@
           <vodml-ref>coords:domain.time.TimeStamp</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.time.MET.time</vodml-id>
+          <vodml-id>domain.time.TimeOffset.time</vodml-id>
           <name>time</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
@@ -1813,7 +1602,7 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.time.MET.time0</vodml-id>
+          <vodml-id>domain.time.TimeOffset.time0</vodml-id>
           <name>time0</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
@@ -1898,99 +1687,6 @@
 
     </package>
 
-
-
-    <package>
-      <vodml-id>domain.redshift</vodml-id>
-      <name>redshift</name>
-      <description>Implementation of the Coordinate Frame pattern for the Redshift domain.
-This is a basic 1-Dimensional coordinate space.</description>
-      <enumeration>
-        <vodml-id>domain.redshift.DopplerDefinition</vodml-id>
-        <name>DopplerDefinition</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <literal>
-          <vodml-id>domain.redshift.DopplerDefinition.optical</vodml-id>
-          <name>optical</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        </literal>
-        <literal>
-          <vodml-id>domain.redshift.DopplerDefinition.radio</vodml-id>
-          <name>radio</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        </literal>
-        <literal>
-          <vodml-id>domain.redshift.DopplerDefinition.relativistic</vodml-id>
-          <name>relativistic</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        </literal>
-      </enumeration>
-
-      <dataType abstract="true">
-        <vodml-id>domain.redshift.RedshiftValue</vodml-id>
-        <name>RedshiftValue</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
-        </extends>
-        <constraint xsi:type="vo-dml:SubsettedRole">
-          <role>
-            <vodml-ref>coords:Coordinate.frame</vodml-ref>
-          </role>
-          <datatype>
-            <vodml-ref>coords:GenericCoordFrame</vodml-ref>
-          </datatype>
-        </constraint>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.redshift.Redshift</vodml-id>
-        <name>Redshift</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.redshift.RedshiftValue</vodml-ref>
-        </extends>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.redshift.DopplerVelocity</vodml-id>
-        <name>DopplerVelocity</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.redshift.RedshiftValue</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.redshift.DopplerVelocity.dopplerDefinition</vodml-id>
-          <name>dopplerDefinition</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>coords:domain.redshift.DopplerDefinition</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </dataType>
-
-    </package>
-
 
 
     <package>

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


More information about the Volutecommits mailing list