[Volute] r3935 - trunk/projects/dm/vo-dml/models/tesselation

Volute commit messages volutecommits at g-vo.org
Wed Apr 12 09:18:18 CEST 2017


Author: lmichel
Date: Wed Apr 12 09:18:17 2017
New Revision: 3935

Log:
Step toward a comprehensive testbench for the VODML mapping in VOTables

Added:
   trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.diagram.png   (contents, props changed)
   trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel_diagram.png   (contents, props changed)
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy
      - copied, changed from r3925, trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.groovy
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy.output.xml   (contents, props changed)
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml   (contents, props changed)
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.xml   (contents, props changed)
   trunk/projects/dm/vo-dml/models/tesselation/lmsource_diagram.png   (contents, props changed)
Deleted:
   trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.groovy
Modified:
   trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.gvd
   trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html
   trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.map
   trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.png
   trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml
   trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.xmi
   trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.gvd
   trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html
   trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.map
   trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.png
   trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml
   trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.xmi
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.gvd
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.html
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.map
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.png
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.vo-dml.xml
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.xmi

Added: trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.diagram.png
==============================================================================
Binary file. No diff available.

Modified: trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.gvd
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.gvd	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.gvd	Wed Apr 12 09:18:17 2017	(r3935)
@@ -1,6 +1,6 @@
 
 digraph GVmap {  
-	label = "\n\ncoords data model"
+	label = "\n\ncoords_tessel data model"
 	rankdir=TB
 	
 	node [ 
@@ -68,411 +68,411 @@
 	shape=record
 	fontsize=8
 	style=filled] 
-	"coords:DerivedCoordinate" [
+	"coords_tessel:DerivedCoordinate" [
     URL="#DerivedCoordinate"
     label = "{DerivedCoordinate}"
     fillcolor="/set312/1"
     ] ;
-  "coords:domain.generic.Measurement" [
+  "coords_tessel:domain.generic.Measurement" [
     URL="#domain.generic.Measurement"
     label = "{domain/generic/Measurement|+coord : coordsys:domain.generic.GenericCoord\l}"
     fillcolor="/set312/3"
     ] ;
-  "coords:domain.generic.Error" [
+  "coords_tessel:domain.generic.Error" [
     URL="#domain.generic.Error"
     label = "{domain/generic/Error}"
     fillcolor="/set312/3"
     ] ;
-  "coords:domain.generic.StatisticalError" [
+  "coords_tessel:domain.generic.StatisticalError" [
     URL="#domain.generic.StatisticalError"
-    label = "{domain/generic/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/generic/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/3"
     ] ;
-  "coords:domain.generic.SystematicError" [
+  "coords_tessel:domain.generic.SystematicError" [
     URL="#domain.generic.SystematicError"
-    label = "{domain/generic/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/generic/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/3"
     ] ;
-  "coords:domain.generic.RandomError" [
+  "coords_tessel:domain.generic.RandomError" [
     URL="#domain.generic.RandomError"
-    label = "{domain/generic/RandomError|+randError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/generic/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/3"
     ] ;
-  "coords:domain.generic.Resolution" [
+  "coords_tessel:domain.generic.Resolution" [
     URL="#domain.generic.Resolution"
-    label = "{domain/generic/Resolution|+res : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/generic/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/3"
     ] ;
-  "coords:domain.spatial.Position" [
+  "coords_tessel:domain.spatial.Position" [
     URL="#domain.spatial.Position"
     label = "{domain/spatial/Position}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Position1D" [
+  "coords_tessel:domain.spatial.Position1D" [
     URL="#domain.spatial.Position1D"
     label = "{domain/spatial/Position1D|+coord : coordsys:domain.spatial.SpatialCoord\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Position2D" [
+  "coords_tessel:domain.spatial.Position2D" [
     URL="#domain.spatial.Position2D"
     label = "{domain/spatial/Position2D|+coord : coordsys:domain.spatial.SpatialCoord\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Position3D" [
+  "coords_tessel:domain.spatial.Position3D" [
     URL="#domain.spatial.Position3D"
     label = "{domain/spatial/Position3D|+coord : coordsys:domain.spatial.SpatialCoord\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Error1D" [
+  "coords_tessel:domain.spatial.Error1D" [
     URL="#domain.spatial.Error1D"
     label = "{domain/spatial/Error1D}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.StatisticalError1D" [
+  "coords_tessel:domain.spatial.StatisticalError1D" [
     URL="#domain.spatial.StatisticalError1D"
-    label = "{domain/spatial/StatisticalError1D|+statError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/spatial/StatisticalError1D|+statError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.SystematicError1D" [
+  "coords_tessel:domain.spatial.SystematicError1D" [
     URL="#domain.spatial.SystematicError1D"
-    label = "{domain/spatial/SystematicError1D|+sysError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/spatial/SystematicError1D|+sysError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.RandomError1D" [
+  "coords_tessel:domain.spatial.RandomError1D" [
     URL="#domain.spatial.RandomError1D"
-    label = "{domain/spatial/RandomError1D|+randError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/spatial/RandomError1D|+randError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Resolution1D" [
+  "coords_tessel:domain.spatial.Resolution1D" [
     URL="#domain.spatial.Resolution1D"
-    label = "{domain/spatial/Resolution1D|+res : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/spatial/Resolution1D|+res : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Error2D" [
+  "coords_tessel:domain.spatial.Error2D" [
     URL="#domain.spatial.Error2D"
     label = "{domain/spatial/Error2D}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.StatisticalError2D" [
+  "coords_tessel:domain.spatial.StatisticalError2D" [
     URL="#domain.spatial.StatisticalError2D"
-    label = "{domain/spatial/StatisticalError2D|+statError : coords:dtypes.Uncertainty2D\l}"
+    label = "{domain/spatial/StatisticalError2D|+statError : coords_tessel:dtypes.Uncertainty2D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.SystematicError2D" [
+  "coords_tessel:domain.spatial.SystematicError2D" [
     URL="#domain.spatial.SystematicError2D"
-    label = "{domain/spatial/SystematicError2D|+sysError : coords:dtypes.Uncertainty2D\l}"
+    label = "{domain/spatial/SystematicError2D|+sysError : coords_tessel:dtypes.Uncertainty2D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.RandomError2D" [
+  "coords_tessel:domain.spatial.RandomError2D" [
     URL="#domain.spatial.RandomError2D"
-    label = "{domain/spatial/RandomError2D|+randError : coords:dtypes.Uncertainty2D\l}"
+    label = "{domain/spatial/RandomError2D|+randError : coords_tessel:dtypes.Uncertainty2D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Resolution2D" [
+  "coords_tessel:domain.spatial.Resolution2D" [
     URL="#domain.spatial.Resolution2D"
-    label = "{domain/spatial/Resolution2D|+res : coords:dtypes.Uncertainty2D\l}"
+    label = "{domain/spatial/Resolution2D|+res : coords_tessel:dtypes.Uncertainty2D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Error3D" [
+  "coords_tessel:domain.spatial.Error3D" [
     URL="#domain.spatial.Error3D"
     label = "{domain/spatial/Error3D}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.StatisticalError3D" [
+  "coords_tessel:domain.spatial.StatisticalError3D" [
     URL="#domain.spatial.StatisticalError3D"
-    label = "{domain/spatial/StatisticalError3D|+statError : coords:dtypes.Uncertainty3D\l}"
+    label = "{domain/spatial/StatisticalError3D|+statError : coords_tessel:dtypes.Uncertainty3D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.SystematicError3D" [
+  "coords_tessel:domain.spatial.SystematicError3D" [
     URL="#domain.spatial.SystematicError3D"
-    label = "{domain/spatial/SystematicError3D|+sysError : coords:dtypes.Uncertainty3D\l}"
+    label = "{domain/spatial/SystematicError3D|+sysError : coords_tessel:dtypes.Uncertainty3D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.RandomError3D" [
+  "coords_tessel:domain.spatial.RandomError3D" [
     URL="#domain.spatial.RandomError3D"
-    label = "{domain/spatial/RandomError3D|+randError : coords:dtypes.Uncertainty3D\l}"
+    label = "{domain/spatial/RandomError3D|+randError : coords_tessel:dtypes.Uncertainty3D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Resolution3D" [
+  "coords_tessel:domain.spatial.Resolution3D" [
     URL="#domain.spatial.Resolution3D"
-    label = "{domain/spatial/Resolution3D|+res : coords:dtypes.Uncertainty3D\l}"
+    label = "{domain/spatial/Resolution3D|+res : coords_tessel:dtypes.Uncertainty3D\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spatial.Tile" [
+  "coords_tessel:domain.spatial.Tile" [
     URL="#domain.spatial.Tile"
     label = "{domain/spatial/Tile|+skyindex : coordsys:SkyIndex\l}"
     fillcolor="/set312/4"
     ] ;
-  "coords:domain.spectral.DerivedSpectralCoordinate" [
+  "coords_tessel:domain.spectral.DerivedSpectralCoordinate" [
     URL="#domain.spectral.DerivedSpectralCoordinate"
     label = "{domain/spectral/DerivedSpectralCoordinate|+coord : coordsys:domain.spectral.SpectralCoord\l}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.spectral.Energy" [
+  "coords_tessel:domain.spectral.Energy" [
     URL="#domain.spectral.Energy"
     label = "{domain/spectral/Energy}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.spectral.Frequency" [
+  "coords_tessel:domain.spectral.Frequency" [
     URL="#domain.spectral.Frequency"
     label = "{domain/spectral/Frequency}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.spectral.Wavelength" [
+  "coords_tessel:domain.spectral.Wavelength" [
     URL="#domain.spectral.Wavelength"
     label = "{domain/spectral/Wavelength}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.spectral.Error" [
+  "coords_tessel:domain.spectral.Error" [
     URL="#domain.spectral.Error"
     label = "{domain/spectral/Error}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.spectral.StatisticalError" [
+  "coords_tessel:domain.spectral.StatisticalError" [
     URL="#domain.spectral.StatisticalError"
-    label = "{domain/spectral/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/spectral/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.spectral.SystematicError" [
+  "coords_tessel:domain.spectral.SystematicError" [
     URL="#domain.spectral.SystematicError"
-    label = "{domain/spectral/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/spectral/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.spectral.RandomError" [
+  "coords_tessel:domain.spectral.RandomError" [
     URL="#domain.spectral.RandomError"
-    label = "{domain/spectral/RandomError|+randError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/spectral/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.spectral.Resolution" [
+  "coords_tessel:domain.spectral.Resolution" [
     URL="#domain.spectral.Resolution"
-    label = "{domain/spectral/Resolution|+res : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/spectral/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/5"
     ] ;
-  "coords:domain.temporal.Time" [
+  "coords_tessel:domain.temporal.Time" [
     URL="#domain.temporal.Time"
     label = "{domain/temporal/Time|+coord : coordsys:domain.temporal.TimeCoord\l}"
     fillcolor="/set312/6"
     ] ;
-  "coords:domain.temporal.Error" [
+  "coords_tessel:domain.temporal.Error" [
     URL="#domain.temporal.Error"
     label = "{domain/temporal/Error}"
     fillcolor="/set312/6"
     ] ;
-  "coords:domain.temporal.StatisticalError" [
+  "coords_tessel:domain.temporal.StatisticalError" [
     URL="#domain.temporal.StatisticalError"
-    label = "{domain/temporal/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/temporal/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/6"
     ] ;
-  "coords:domain.temporal.SystematicError" [
+  "coords_tessel:domain.temporal.SystematicError" [
     URL="#domain.temporal.SystematicError"
-    label = "{domain/temporal/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/temporal/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/6"
     ] ;
-  "coords:domain.temporal.RandomError" [
+  "coords_tessel:domain.temporal.RandomError" [
     URL="#domain.temporal.RandomError"
-    label = "{domain/temporal/RandomError|+randError : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/temporal/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/6"
     ] ;
-  "coords:domain.temporal.Resolution" [
+  "coords_tessel:domain.temporal.Resolution" [
     URL="#domain.temporal.Resolution"
-    label = "{domain/temporal/Resolution|+res : coords:dtypes.Uncertainty1D\l}"
+    label = "{domain/temporal/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}"
     fillcolor="/set312/6"
     ] ;
-  "coords:domain.polarization.DerivedPolarizationCoordinate" [
+  "coords_tessel:domain.polarization.DerivedPolarizationCoordinate" [
     URL="#domain.polarization.DerivedPolarizationCoordinate"
     label = "{domain/polarization/DerivedPolarizationCoordinate}"
     fillcolor="/set312/7"
     ] ;
-  "coords:domain.polarization.Stokes" [
+  "coords_tessel:domain.polarization.Stokes" [
     URL="#domain.polarization.Stokes"
     label = "{domain/polarization/Stokes|+coord : coordsys:domain.polarization.PolStokesCoord\l}"
     fillcolor="/set312/7"
     ] ;
-  "coords:domain.polarization.Circular" [
+  "coords_tessel:domain.polarization.Circular" [
     URL="#domain.polarization.Circular"
     label = "{domain/polarization/Circular|+coord : coordsys:domain.polarization.PolCircularCoord\l}"
     fillcolor="/set312/7"
     ] ;
-  "coords:domain.polarization.Linear" [
+  "coords_tessel:domain.polarization.Linear" [
     URL="#domain.polarization.Linear"
     label = "{domain/polarization/Linear|+coord : coordsys:domain.polarization.PolLinearCoord\l}"
     fillcolor="/set312/7"
     ] ;
-  "coords:domain.polarization.Vector" [
+  "coords_tessel:domain.polarization.Vector" [
     URL="#domain.polarization.Vector"
     label = "{domain/polarization/Vector|+coord : coordsys:domain.polarization.PolVectorCoord\l}"
     fillcolor="/set312/7"
     ] ;
-  "coords:dtypes.Uncertainty" [
+  "coords_tessel:dtypes.Uncertainty" [
     URL="#dtypes.Uncertainty"
     label = "{<<datatype>>\ndtypes/Uncertainty}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Uncertainty1D" [
+  "coords_tessel:dtypes.Uncertainty1D" [
     URL="#dtypes.Uncertainty1D"
     label = "{<<datatype>>\ndtypes/Uncertainty1D}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Uncertainty2D" [
+  "coords_tessel:dtypes.Uncertainty2D" [
     URL="#dtypes.Uncertainty2D"
     label = "{<<datatype>>\ndtypes/Uncertainty2D}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Uncertainty3D" [
+  "coords_tessel:dtypes.Uncertainty3D" [
     URL="#dtypes.Uncertainty3D"
     label = "{<<datatype>>\ndtypes/Uncertainty3D}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Symmetrical1D" [
+  "coords_tessel:dtypes.Symmetrical1D" [
     URL="#dtypes.Symmetrical1D"
     label = "{<<datatype>>\ndtypes/Symmetrical1D|+radius : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Asymmetrical1D" [
+  "coords_tessel:dtypes.Asymmetrical1D" [
     URL="#dtypes.Asymmetrical1D"
     label = "{<<datatype>>\ndtypes/Asymmetrical1D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Bounds1D" [
+  "coords_tessel:dtypes.Bounds1D" [
     URL="#dtypes.Bounds1D"
     label = "{<<datatype>>\ndtypes/Bounds1D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Symmetrical2D" [
+  "coords_tessel:dtypes.Symmetrical2D" [
     URL="#dtypes.Symmetrical2D"
     label = "{<<datatype>>\ndtypes/Symmetrical2D|+radius : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Asymmetrical2D" [
+  "coords_tessel:dtypes.Asymmetrical2D" [
     URL="#dtypes.Asymmetrical2D"
     label = "{<<datatype>>\ndtypes/Asymmetrical2D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Bounds2D" [
+  "coords_tessel:dtypes.Bounds2D" [
     URL="#dtypes.Bounds2D"
     label = "{<<datatype>>\ndtypes/Bounds2D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Symmetrical3D" [
+  "coords_tessel:dtypes.Symmetrical3D" [
     URL="#dtypes.Symmetrical3D"
     label = "{<<datatype>>\ndtypes/Symmetrical3D|+radius : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Asymmetrical3D" [
+  "coords_tessel:dtypes.Asymmetrical3D" [
     URL="#dtypes.Asymmetrical3D"
     label = "{<<datatype>>\ndtypes/Asymmetrical3D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Bounds3D" [
+  "coords_tessel:dtypes.Bounds3D" [
     URL="#dtypes.Bounds3D"
     label = "{<<datatype>>\ndtypes/Bounds3D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Ellipse" [
+  "coords_tessel:dtypes.Ellipse" [
     URL="#dtypes.Ellipse"
     label = "{<<datatype>>\ndtypes/Ellipse|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Ellipsoid" [
+  "coords_tessel:dtypes.Ellipsoid" [
     URL="#dtypes.Ellipsoid"
     label = "{<<datatype>>\ndtypes/Ellipsoid|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Matrix" [
+  "coords_tessel:dtypes.Matrix" [
     URL="#dtypes.Matrix"
     label = "{<<datatype>>\ndtypes/Matrix}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Matrix2x2" [
+  "coords_tessel:dtypes.Matrix2x2" [
     URL="#dtypes.Matrix2x2"
     label = "{<<datatype>>\ndtypes/Matrix2x2|+m11 : ivoa:real\l+m12 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.Matrix3x3" [
+  "coords_tessel:dtypes.Matrix3x3" [
     URL="#dtypes.Matrix3x3"
     label = "{<<datatype>>\ndtypes/Matrix3x3|+m11 : ivoa:real\l+m12 : ivoa:real\l+m13 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l+m23 : ivoa:real\l+m31 : ivoa:real\l+m32 : ivoa:real\l+m33 : ivoa:real\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.CovarianceMatrix2D" [
+  "coords_tessel:dtypes.CovarianceMatrix2D" [
     URL="#dtypes.CovarianceMatrix2D"
-    label = "{<<datatype>>\ndtypes/CovarianceMatrix2D|+matrix : coords:dtypes.Matrix2x2\l}"
+    label = "{<<datatype>>\ndtypes/CovarianceMatrix2D|+matrix : coords_tessel:dtypes.Matrix2x2\l}"
     fillcolor="/set312/8"
     ] ;
-  "coords:dtypes.CovarianceMatrix3D" [
+  "coords_tessel:dtypes.CovarianceMatrix3D" [
     URL="#dtypes.CovarianceMatrix3D"
-    label = "{<<datatype>>\ndtypes/CovarianceMatrix3D|+matrix : coords:dtypes.Matrix3x3\l}"
+    label = "{<<datatype>>\ndtypes/CovarianceMatrix3D|+matrix : coords_tessel:dtypes.Matrix3x3\l}"
     fillcolor="/set312/8"
     ] ;
   
  
     edge [color="red", arrowtail="none", arrowhead="empty"]
-    "coords:domain.generic.Measurement" -> "coords:DerivedCoordinate" ;
-  "coords:domain.generic.StatisticalError" -> "coords:domain.generic.Error" ;
-  "coords:domain.generic.SystematicError" -> "coords:domain.generic.Error" ;
-  "coords:domain.generic.RandomError" -> "coords:domain.generic.Error" ;
-  "coords:domain.generic.Resolution" -> "coords:domain.generic.Error" ;
-  "coords:domain.spatial.Position" -> "coords:DerivedCoordinate" ;
-  "coords:domain.spatial.Position1D" -> "coords:domain.spatial.Position" ;
-  "coords:domain.spatial.Position2D" -> "coords:domain.spatial.Position" ;
-  "coords:domain.spatial.Position3D" -> "coords:domain.spatial.Position" ;
-  "coords:domain.spatial.StatisticalError1D" -> "coords:domain.spatial.Error1D" ;
-  "coords:domain.spatial.SystematicError1D" -> "coords:domain.spatial.Error1D" ;
-  "coords:domain.spatial.RandomError1D" -> "coords:domain.spatial.Error1D" ;
-  "coords:domain.spatial.Resolution1D" -> "coords:domain.spatial.Error1D" ;
-  "coords:domain.spatial.StatisticalError2D" -> "coords:domain.spatial.Error2D" ;
-  "coords:domain.spatial.SystematicError2D" -> "coords:domain.spatial.Error2D" ;
-  "coords:domain.spatial.RandomError2D" -> "coords:domain.spatial.Error2D" ;
-  "coords:domain.spatial.Resolution2D" -> "coords:domain.spatial.Error2D" ;
-  "coords:domain.spatial.StatisticalError3D" -> "coords:domain.spatial.Error3D" ;
-  "coords:domain.spatial.SystematicError3D" -> "coords:domain.spatial.Error3D" ;
-  "coords:domain.spatial.RandomError3D" -> "coords:domain.spatial.Error3D" ;
-  "coords:domain.spatial.Resolution3D" -> "coords:domain.spatial.Error3D" ;
-  "coords:domain.spectral.DerivedSpectralCoordinate" -> "coords:DerivedCoordinate" ;
-  "coords:domain.spectral.Energy" -> "coords:domain.spectral.DerivedSpectralCoordinate" ;
-  "coords:domain.spectral.Frequency" -> "coords:domain.spectral.DerivedSpectralCoordinate" ;
-  "coords:domain.spectral.Wavelength" -> "coords:domain.spectral.DerivedSpectralCoordinate" ;
-  "coords:domain.spectral.StatisticalError" -> "coords:domain.spectral.Error" ;
-  "coords:domain.spectral.SystematicError" -> "coords:domain.spectral.Error" ;
-  "coords:domain.spectral.RandomError" -> "coords:domain.spectral.Error" ;
-  "coords:domain.spectral.Resolution" -> "coords:domain.spectral.Error" ;
-  "coords:domain.temporal.Time" -> "coords:DerivedCoordinate" ;
-  "coords:domain.temporal.StatisticalError" -> "coords:domain.temporal.Error" ;
-  "coords:domain.temporal.SystematicError" -> "coords:domain.temporal.Error" ;
-  "coords:domain.temporal.RandomError" -> "coords:domain.temporal.Error" ;
-  "coords:domain.temporal.Resolution" -> "coords:domain.temporal.Error" ;
-  "coords:domain.polarization.DerivedPolarizationCoordinate" -> "coords:DerivedCoordinate" ;
-  "coords:domain.polarization.Stokes" -> "coords:domain.polarization.DerivedPolarizationCoordinate" ;
-  "coords:domain.polarization.Circular" -> "coords:domain.polarization.DerivedPolarizationCoordinate" ;
-  "coords:domain.polarization.Linear" -> "coords:domain.polarization.DerivedPolarizationCoordinate" ;
-  "coords:domain.polarization.Vector" -> "coords:domain.polarization.DerivedPolarizationCoordinate" ;
-  "coords:dtypes.Uncertainty1D" -> "coords:dtypes.Uncertainty" ;
-  "coords:dtypes.Uncertainty2D" -> "coords:dtypes.Uncertainty" ;
-  "coords:dtypes.Uncertainty3D" -> "coords:dtypes.Uncertainty" ;
-  "coords:dtypes.Symmetrical1D" -> "coords:dtypes.Uncertainty1D" ;
-  "coords:dtypes.Asymmetrical1D" -> "coords:dtypes.Uncertainty1D" ;
-  "coords:dtypes.Bounds1D" -> "coords:dtypes.Uncertainty1D" ;
-  "coords:dtypes.Symmetrical2D" -> "coords:dtypes.Uncertainty2D" ;
-  "coords:dtypes.Asymmetrical2D" -> "coords:dtypes.Uncertainty2D" ;
-  "coords:dtypes.Bounds2D" -> "coords:dtypes.Uncertainty2D" ;
-  "coords:dtypes.Symmetrical3D" -> "coords:dtypes.Uncertainty3D" ;
-  "coords:dtypes.Asymmetrical3D" -> "coords:dtypes.Uncertainty3D" ;
-  "coords:dtypes.Bounds3D" -> "coords:dtypes.Uncertainty3D" ;
-  "coords:dtypes.Ellipse" -> "coords:dtypes.Uncertainty2D" ;
-  "coords:dtypes.Ellipsoid" -> "coords:dtypes.Uncertainty3D" ;
-  "coords:dtypes.Matrix2x2" -> "coords:dtypes.Matrix" ;
-  "coords:dtypes.Matrix3x3" -> "coords:dtypes.Matrix" ;
-  "coords:dtypes.CovarianceMatrix2D" -> "coords:dtypes.Uncertainty2D" ;
-  "coords:dtypes.CovarianceMatrix3D" -> "coords:dtypes.Uncertainty3D" ;
+    "coords_tessel:domain.generic.Measurement" -> "coords_tessel:DerivedCoordinate" ;
+  "coords_tessel:domain.generic.StatisticalError" -> "coords_tessel:domain.generic.Error" ;
+  "coords_tessel:domain.generic.SystematicError" -> "coords_tessel:domain.generic.Error" ;
+  "coords_tessel:domain.generic.RandomError" -> "coords_tessel:domain.generic.Error" ;
+  "coords_tessel:domain.generic.Resolution" -> "coords_tessel:domain.generic.Error" ;
+  "coords_tessel:domain.spatial.Position" -> "coords_tessel:DerivedCoordinate" ;
+  "coords_tessel:domain.spatial.Position1D" -> "coords_tessel:domain.spatial.Position" ;
+  "coords_tessel:domain.spatial.Position2D" -> "coords_tessel:domain.spatial.Position" ;
+  "coords_tessel:domain.spatial.Position3D" -> "coords_tessel:domain.spatial.Position" ;
+  "coords_tessel:domain.spatial.StatisticalError1D" -> "coords_tessel:domain.spatial.Error1D" ;
+  "coords_tessel:domain.spatial.SystematicError1D" -> "coords_tessel:domain.spatial.Error1D" ;
+  "coords_tessel:domain.spatial.RandomError1D" -> "coords_tessel:domain.spatial.Error1D" ;
+  "coords_tessel:domain.spatial.Resolution1D" -> "coords_tessel:domain.spatial.Error1D" ;
+  "coords_tessel:domain.spatial.StatisticalError2D" -> "coords_tessel:domain.spatial.Error2D" ;
+  "coords_tessel:domain.spatial.SystematicError2D" -> "coords_tessel:domain.spatial.Error2D" ;
+  "coords_tessel:domain.spatial.RandomError2D" -> "coords_tessel:domain.spatial.Error2D" ;
+  "coords_tessel:domain.spatial.Resolution2D" -> "coords_tessel:domain.spatial.Error2D" ;
+  "coords_tessel:domain.spatial.StatisticalError3D" -> "coords_tessel:domain.spatial.Error3D" ;
+  "coords_tessel:domain.spatial.SystematicError3D" -> "coords_tessel:domain.spatial.Error3D" ;
+  "coords_tessel:domain.spatial.RandomError3D" -> "coords_tessel:domain.spatial.Error3D" ;
+  "coords_tessel:domain.spatial.Resolution3D" -> "coords_tessel:domain.spatial.Error3D" ;
+  "coords_tessel:domain.spectral.DerivedSpectralCoordinate" -> "coords_tessel:DerivedCoordinate" ;
+  "coords_tessel:domain.spectral.Energy" -> "coords_tessel:domain.spectral.DerivedSpectralCoordinate" ;
+  "coords_tessel:domain.spectral.Frequency" -> "coords_tessel:domain.spectral.DerivedSpectralCoordinate" ;
+  "coords_tessel:domain.spectral.Wavelength" -> "coords_tessel:domain.spectral.DerivedSpectralCoordinate" ;
+  "coords_tessel:domain.spectral.StatisticalError" -> "coords_tessel:domain.spectral.Error" ;
+  "coords_tessel:domain.spectral.SystematicError" -> "coords_tessel:domain.spectral.Error" ;
+  "coords_tessel:domain.spectral.RandomError" -> "coords_tessel:domain.spectral.Error" ;
+  "coords_tessel:domain.spectral.Resolution" -> "coords_tessel:domain.spectral.Error" ;
+  "coords_tessel:domain.temporal.Time" -> "coords_tessel:DerivedCoordinate" ;
+  "coords_tessel:domain.temporal.StatisticalError" -> "coords_tessel:domain.temporal.Error" ;
+  "coords_tessel:domain.temporal.SystematicError" -> "coords_tessel:domain.temporal.Error" ;
+  "coords_tessel:domain.temporal.RandomError" -> "coords_tessel:domain.temporal.Error" ;
+  "coords_tessel:domain.temporal.Resolution" -> "coords_tessel:domain.temporal.Error" ;
+  "coords_tessel:domain.polarization.DerivedPolarizationCoordinate" -> "coords_tessel:DerivedCoordinate" ;
+  "coords_tessel:domain.polarization.Stokes" -> "coords_tessel:domain.polarization.DerivedPolarizationCoordinate" ;
+  "coords_tessel:domain.polarization.Circular" -> "coords_tessel:domain.polarization.DerivedPolarizationCoordinate" ;
+  "coords_tessel:domain.polarization.Linear" -> "coords_tessel:domain.polarization.DerivedPolarizationCoordinate" ;
+  "coords_tessel:domain.polarization.Vector" -> "coords_tessel:domain.polarization.DerivedPolarizationCoordinate" ;
+  "coords_tessel:dtypes.Uncertainty1D" -> "coords_tessel:dtypes.Uncertainty" ;
+  "coords_tessel:dtypes.Uncertainty2D" -> "coords_tessel:dtypes.Uncertainty" ;
+  "coords_tessel:dtypes.Uncertainty3D" -> "coords_tessel:dtypes.Uncertainty" ;
+  "coords_tessel:dtypes.Symmetrical1D" -> "coords_tessel:dtypes.Uncertainty1D" ;
+  "coords_tessel:dtypes.Asymmetrical1D" -> "coords_tessel:dtypes.Uncertainty1D" ;
+  "coords_tessel:dtypes.Bounds1D" -> "coords_tessel:dtypes.Uncertainty1D" ;
+  "coords_tessel:dtypes.Symmetrical2D" -> "coords_tessel:dtypes.Uncertainty2D" ;
+  "coords_tessel:dtypes.Asymmetrical2D" -> "coords_tessel:dtypes.Uncertainty2D" ;
+  "coords_tessel:dtypes.Bounds2D" -> "coords_tessel:dtypes.Uncertainty2D" ;
+  "coords_tessel:dtypes.Symmetrical3D" -> "coords_tessel:dtypes.Uncertainty3D" ;
+  "coords_tessel:dtypes.Asymmetrical3D" -> "coords_tessel:dtypes.Uncertainty3D" ;
+  "coords_tessel:dtypes.Bounds3D" -> "coords_tessel:dtypes.Uncertainty3D" ;
+  "coords_tessel:dtypes.Ellipse" -> "coords_tessel:dtypes.Uncertainty2D" ;
+  "coords_tessel:dtypes.Ellipsoid" -> "coords_tessel:dtypes.Uncertainty3D" ;
+  "coords_tessel:dtypes.Matrix2x2" -> "coords_tessel:dtypes.Matrix" ;
+  "coords_tessel:dtypes.Matrix3x3" -> "coords_tessel:dtypes.Matrix" ;
+  "coords_tessel:dtypes.CovarianceMatrix2D" -> "coords_tessel:dtypes.Uncertainty2D" ;
+  "coords_tessel:dtypes.CovarianceMatrix3D" -> "coords_tessel:dtypes.Uncertainty3D" ;
   
  
     edge [color="blue", arrowhead="open", arrowtail="diamond",dir="both",fontsize="10"]
-    "coords:domain.generic.Measurement" -> "coords:domain.generic.Error" [headlabel="0..*",label="error",labelfontsize=10] ;
-  "coords:domain.spatial.Position" -> "coords:domain.spatial.Tile" [headlabel="0..1",label="tile",labelfontsize=10] ;
-  "coords:domain.spatial.Position1D" -> "coords:domain.spatial.Error1D" [headlabel="0..*",label="error",labelfontsize=10] ;
-  "coords:domain.spatial.Position2D" -> "coords:domain.spatial.Error2D" [headlabel="0..*",label="error",labelfontsize=10] ;
-  "coords:domain.spatial.Position3D" -> "coords:domain.spatial.Error3D" [headlabel="0..*",label="error",labelfontsize=10] ;
-  "coords:domain.spectral.DerivedSpectralCoordinate" -> "coords:domain.spectral.Error" [headlabel="0..*",label="error",labelfontsize=10] ;
-  "coords:domain.temporal.Time" -> "coords:domain.temporal.Error" [headlabel="0..*",label="error",labelfontsize=10] ;
+    "coords_tessel:domain.generic.Measurement" -> "coords_tessel:domain.generic.Error" [headlabel="0..*",label="error",labelfontsize=10] ;
+  "coords_tessel:domain.spatial.Position" -> "coords_tessel:domain.spatial.Tile" [headlabel="0..1",label="tile",labelfontsize=10] ;
+  "coords_tessel:domain.spatial.Position1D" -> "coords_tessel:domain.spatial.Error1D" [headlabel="0..*",label="error",labelfontsize=10] ;
+  "coords_tessel:domain.spatial.Position2D" -> "coords_tessel:domain.spatial.Error2D" [headlabel="0..*",label="error",labelfontsize=10] ;
+  "coords_tessel:domain.spatial.Position3D" -> "coords_tessel:domain.spatial.Error3D" [headlabel="0..*",label="error",labelfontsize=10] ;
+  "coords_tessel:domain.spectral.DerivedSpectralCoordinate" -> "coords_tessel:domain.spectral.Error" [headlabel="0..*",label="error",labelfontsize=10] ;
+  "coords_tessel:domain.temporal.Time" -> "coords_tessel:domain.temporal.Error" [headlabel="0..*",label="error",labelfontsize=10] ;
     
 }
   
\ No newline at end of file

Modified: trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html	Wed Apr 12 09:18:17 2017	(r3935)
@@ -12,7 +12,7 @@
       <table class=".toc">
         <tr>
           <td>1.</td>
-          <td>    <a href="#model_section">model: coords</a></td>
+          <td>    <a href="#model_section">model: coords_tessel</a></td>
         </tr>
         <tr>
           <td>2.</td>
@@ -341,17 +341,17 @@
       </table>
     </div>
     <hr>
-    <h1><a name="model_section">1. Model: STC2 Coordinates Model (coords)</a></h1>
+    <h1><a name="model_section">1. Model: STC2 Coordinates Model (coords_tessel)</a></h1>
     <table>
       <tr>
         <td align="right"><b>Authors</b></td>
         <td> : </td>
-        <td>Arnold Rots, Mark Cresitello-Dittmar</td>
+        <td>Arnold Rots, Mark Cresitello-Dittmar, L. Michel</td>
       </tr>
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2017-03-30T12:59:40</td>
+        <td>2017-04-11T16:01:46</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -391,73 +391,73 @@
 <area shape="rect" id="node5" href="#domain.temporal" title="temporal" alt="" coords="357,99,443,147"/>
 <area shape="rect" id="node6" href="#domain.polarization" title="polarization" alt="" coords="225,99,333,147"/>
 <area shape="rect" id="node7" href="#dtypes" title="dtypes" alt="" coords="27,99,99,147"/>
-<area shape="rect" id="node8" href="#DerivedCoordinate" title="{DerivedCoordinate}" alt="" coords="4245,375,4349,424"/>
-<area shape="rect" id="node9" href="#domain.generic.Measurement" title="{domain/generic/Measurement|+coord : coordsys:domain.generic.GenericCoord\l}" alt="" coords="3430,263,3661,312"/>
-<area shape="rect" id="node10" href="#domain.generic.Error" title="{domain/generic/Error}" alt="" coords="860,375,975,424"/>
-<area shape="rect" id="node11" href="#domain.generic.StatisticalError" title="{domain/generic/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="817,263,1018,312"/>
-<area shape="rect" id="node12" href="#domain.generic.SystematicError" title="{domain/generic/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="1042,263,1241,312"/>
-<area shape="rect" id="node13" href="#domain.generic.RandomError" title="{domain/generic/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="388,263,593,312"/>
-<area shape="rect" id="node14" href="#domain.generic.Resolution" title="{domain/generic/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="618,263,793,312"/>
-<area shape="rect" id="node15" href="#domain.spatial.Position" title="{domain/spatial/Position}" alt="" coords="3835,263,3957,312"/>
-<area shape="rect" id="node34" href="#domain.spatial.Tile" title="{domain/spatial/Tile|+skyindex : coordsys:SkyIndex\l}" alt="" coords="3819,375,3973,424"/>
-<area shape="rect" id="node16" href="#domain.spatial.Position1D" title="{domain/spatial/Position1D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2981,98,3203,147"/>
-<area shape="rect" id="node19" href="#domain.spatial.Error1D" title="{domain/spatial/Error1D}" alt="" coords="1463,263,1587,312"/>
-<area shape="rect" id="node17" href="#domain.spatial.Position2D" title="{domain/spatial/Position2D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="3651,98,3874,147"/>
-<area shape="rect" id="node24" href="#domain.spatial.Error2D" title="{domain/spatial/Error2D}" alt="" coords="2234,263,2358,312"/>
-<area shape="rect" id="node18" href="#domain.spatial.Position3D" title="{domain/spatial/Position3D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="3898,98,4121,147"/>
-<area shape="rect" id="node29" href="#domain.spatial.Error3D" title="{domain/spatial/Error3D}" alt="" coords="2815,263,2939,312"/>
-<area shape="rect" id="node20" href="#domain.spatial.StatisticalError1D" title="{domain/spatial/StatisticalError1D|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="1425,98,1626,147"/>
-<area shape="rect" id="node21" href="#domain.spatial.SystematicError1D" title="{domain/spatial/SystematicError1D|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="773,98,971,147"/>
-<area shape="rect" id="node22" href="#domain.spatial.RandomError1D" title="{domain/spatial/RandomError1D|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="996,98,1201,147"/>
-<area shape="rect" id="node23" href="#domain.spatial.Resolution1D" title="{domain/spatial/Resolution1D|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="1226,98,1401,147"/>
-<area shape="rect" id="node25" href="#domain.spatial.StatisticalError2D" title="{domain/spatial/StatisticalError2D|+statError : coords:dtypes.Uncertainty2D\l}" alt="" coords="2302,98,2503,147"/>
-<area shape="rect" id="node26" href="#domain.spatial.SystematicError2D" title="{domain/spatial/SystematicError2D|+sysError : coords:dtypes.Uncertainty2D\l}" alt="" coords="1650,98,1849,147"/>
-<area shape="rect" id="node27" href="#domain.spatial.RandomError2D" title="{domain/spatial/RandomError2D|+randError : coords:dtypes.Uncertainty2D\l}" alt="" coords="1873,98,2079,147"/>
-<area shape="rect" id="node28" href="#domain.spatial.Resolution2D" title="{domain/spatial/Resolution2D|+res : coords:dtypes.Uncertainty2D\l}" alt="" coords="2103,98,2278,147"/>
-<area shape="rect" id="node30" href="#domain.spatial.StatisticalError3D" title="{domain/spatial/StatisticalError3D|+statError : coords:dtypes.Uncertainty3D\l}" alt="" coords="3426,98,3627,147"/>
-<area shape="rect" id="node31" href="#domain.spatial.SystematicError3D" title="{domain/spatial/SystematicError3D|+sysError : coords:dtypes.Uncertainty3D\l}" alt="" coords="2758,98,2957,147"/>
-<area shape="rect" id="node32" href="#domain.spatial.RandomError3D" title="{domain/spatial/RandomError3D|+randError : coords:dtypes.Uncertainty3D\l}" alt="" coords="2528,98,2733,147"/>
-<area shape="rect" id="node33" href="#domain.spatial.Resolution3D" title="{domain/spatial/Resolution3D|+res : coords:dtypes.Uncertainty3D\l}" alt="" coords="3227,98,3402,147"/>
-<area shape="rect" id="node35" href="#domain.spectral.DerivedSpectralCoordinate" title="{domain/spectral/DerivedSpectralCoordinate|+coord : coordsys:domain.spectral.SpectralCoord\l}" alt="" coords="4180,263,4415,312"/>
-<area shape="rect" id="node39" href="#domain.spectral.Error" title="{domain/spectral/Error}" alt="" coords="3004,375,3121,424"/>
-<area shape="rect" id="node36" href="#domain.spectral.Energy" title="{domain/spectral/Energy}" alt="" coords="4477,98,4601,147"/>
-<area shape="rect" id="node37" href="#domain.spectral.Frequency" title="{domain/spectral/Frequency}" alt="" coords="4145,98,4284,147"/>
-<area shape="rect" id="node38" href="#domain.spectral.Wavelength" title="{domain/spectral/Wavelength}" alt="" coords="4308,98,4452,147"/>
-<area shape="rect" id="node40" href="#domain.spectral.StatisticalError" title="{domain/spectral/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="3186,263,3387,312"/>
-<area shape="rect" id="node41" href="#domain.spectral.SystematicError" title="{domain/spectral/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="2963,263,3162,312"/>
-<area shape="rect" id="node42" href="#domain.spectral.RandomError" title="{domain/spectral/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="2004,263,2209,312"/>
-<area shape="rect" id="node43" href="#domain.spectral.Resolution" title="{domain/spectral/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="1265,263,1439,312"/>
-<area shape="rect" id="node44" href="#domain.temporal.Time" title="{domain/temporal/Time|+coord : coordsys:domain.temporal.TimeCoord\l}" alt="" coords="4939,263,5165,312"/>
-<area shape="rect" id="node45" href="#domain.temporal.Error" title="{domain/temporal/Error}" alt="" coords="5453,375,5574,424"/>
-<area shape="rect" id="node46" href="#domain.temporal.StatisticalError" title="{domain/temporal/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5189,263,5390,312"/>
-<area shape="rect" id="node47" href="#domain.temporal.SystematicError" title="{domain/temporal/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5414,263,5613,312"/>
-<area shape="rect" id="node48" href="#domain.temporal.RandomError" title="{domain/temporal/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5637,263,5843,312"/>
-<area shape="rect" id="node49" href="#domain.temporal.Resolution" title="{domain/temporal/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="5867,263,6042,312"/>
-<area shape="rect" id="node50" href="#domain.polarization.DerivedPolarizationCoordinate" title="{domain/polarization/DerivedPolarizationCoordinate}" alt="" coords="4671,263,4915,312"/>
-<area shape="rect" id="node51" href="#domain.polarization.Stokes" title="{domain/polarization/Stokes|+coord : coordsys:domain.polarization.PolStokesCoord\l}" alt="" coords="4625,98,4882,147"/>
-<area shape="rect" id="node52" href="#domain.polarization.Circular" title="{domain/polarization/Circular|+coord : coordsys:domain.polarization.PolCircularCoord\l}" alt="" coords="4906,98,5171,147"/>
-<area shape="rect" id="node53" href="#domain.polarization.Linear" title="{domain/polarization/Linear|+coord : coordsys:domain.polarization.PolLinearCoord\l}" alt="" coords="5196,98,5455,147"/>
-<area shape="rect" id="node54" href="#domain.polarization.Vector" title="{domain/polarization/Vector|+coord : coordsys:domain.polarization.PolVectorCoord\l}" alt="" coords="5479,98,5737,147"/>
-<area shape="rect" id="node55" href="#dtypes.Uncertainty" title="{<<datatype>>\ndtypes/Uncertainty}" alt="" coords="6615,375,6718,424"/>
-<area shape="rect" id="node56" href="#dtypes.Uncertainty1D" title="{<<datatype>>\ndtypes/Uncertainty1D}" alt="" coords="6087,263,6203,312"/>
-<area shape="rect" id="node57" href="#dtypes.Uncertainty2D" title="{<<datatype>>\ndtypes/Uncertainty2D}" alt="" coords="6609,263,6725,312"/>
-<area shape="rect" id="node58" href="#dtypes.Uncertainty3D" title="{<<datatype>>\ndtypes/Uncertainty3D}" alt="" coords="7399,263,7515,312"/>
-<area shape="rect" id="node59" href="#dtypes.Symmetrical1D" title="{<<datatype>>\ndtypes/Symmetrical1D|+radius : ivoa:RealQuantity\l}" alt="" coords="5761,93,5903,152"/>
-<area shape="rect" id="node60" href="#dtypes.Asymmetrical1D" title="{<<datatype>>\ndtypes/Asymmetrical1D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="5927,87,6067,158"/>
-<area shape="rect" id="node61" href="#dtypes.Bounds1D" title="{<<datatype>>\ndtypes/Bounds1D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="6092,87,6239,158"/>
-<area shape="rect" id="node62" href="#dtypes.Symmetrical2D" title="{<<datatype>>\ndtypes/Symmetrical2D|+radius : ivoa:RealQuantity\l}" alt="" coords="6263,93,6404,152"/>
-<area shape="rect" id="node63" href="#dtypes.Asymmetrical2D" title="{<<datatype>>\ndtypes/Asymmetrical2D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="6429,87,6569,158"/>
-<area shape="rect" id="node64" href="#dtypes.Bounds2D" title="{<<datatype>>\ndtypes/Bounds2D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="6593,87,6740,158"/>
-<area shape="rect" id="node65" href="#dtypes.Symmetrical3D" title="{<<datatype>>\ndtypes/Symmetrical3D|+radius : ivoa:RealQuantity\l}" alt="" coords="7137,93,7279,152"/>
-<area shape="rect" id="node66" href="#dtypes.Asymmetrical3D" title="{<<datatype>>\ndtypes/Asymmetrical3D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="7303,87,7443,158"/>
-<area shape="rect" id="node67" href="#dtypes.Bounds3D" title="{<<datatype>>\ndtypes/Bounds3D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="7468,87,7615,158"/>
-<area shape="rect" id="node68" href="#dtypes.Ellipse" title="{<<datatype>>\ndtypes/Ellipse|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="6764,87,6919,158"/>
-<area shape="rect" id="node69" href="#dtypes.Ellipsoid" title="{<<datatype>>\ndtypes/Ellipsoid|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="7639,87,7793,158"/>
-<area shape="rect" id="node70" href="#dtypes.Matrix" title="{<<datatype>>\ndtypes/Matrix}" alt="" coords="8079,263,8161,312"/>
-<area shape="rect" id="node71" href="#dtypes.Matrix2x2" title="{<<datatype>>\ndtypes/Matrix2x2|+m11 : ivoa:real\l+m12 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l}" alt="" coords="8012,75,8108,170"/>
-<area shape="rect" id="node72" href="#dtypes.Matrix3x3" title="{<<datatype>>\ndtypes/Matrix3x3|+m11 : ivoa:real\l+m12 : ivoa:real\l+m13 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l+m23 : ivoa:real\l+m31 : ivoa:real\l+m32 : ivoa:real\l+m33 : ivoa:real\l}" alt="" coords="8132,45,8228,200"/>
-<area shape="rect" id="node73" href="#dtypes.CovarianceMatrix2D" title="{<<datatype>>\ndtypes/CovarianceMatrix2D|+matrix : coords:dtypes.Matrix2x2\l}" alt="" coords="6943,93,7113,152"/>
-<area shape="rect" id="node74" href="#dtypes.CovarianceMatrix3D" title="{<<datatype>>\ndtypes/CovarianceMatrix3D|+matrix : coords:dtypes.Matrix3x3\l}" alt="" coords="7817,93,7988,152"/>
+<area shape="rect" id="node8" href="#DerivedCoordinate" title="{DerivedCoordinate}" alt="" coords="4599,375,4703,424"/>
+<area shape="rect" id="node9" href="#domain.generic.Measurement" title="{domain/generic/Measurement|+coord : coordsys:domain.generic.GenericCoord\l}" alt="" coords="3909,263,4139,312"/>
+<area shape="rect" id="node10" href="#domain.generic.Error" title="{domain/generic/Error}" alt="" coords="891,375,1005,424"/>
+<area shape="rect" id="node11" href="#domain.generic.StatisticalError" title="{domain/generic/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="833,263,1063,312"/>
+<area shape="rect" id="node12" href="#domain.generic.SystematicError" title="{domain/generic/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1087,263,1315,312"/>
+<area shape="rect" id="node13" href="#domain.generic.RandomError" title="{domain/generic/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="345,263,580,312"/>
+<area shape="rect" id="node14" href="#domain.generic.Resolution" title="{domain/generic/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="605,263,809,312"/>
+<area shape="rect" id="node15" href="#domain.spatial.Position" title="{domain/spatial/Position}" alt="" coords="4183,263,4305,312"/>
+<area shape="rect" id="node34" href="#domain.spatial.Tile" title="{domain/spatial/Tile|+skyindex : coordsys:SkyIndex\l}" alt="" coords="4167,375,4321,424"/>
+<area shape="rect" id="node16" href="#domain.spatial.Position1D" title="{domain/spatial/Position1D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="3275,98,3498,147"/>
+<area shape="rect" id="node19" href="#domain.spatial.Error1D" title="{domain/spatial/Error1D}" alt="" coords="1567,263,1691,312"/>
+<area shape="rect" id="node17" href="#domain.spatial.Position2D" title="{domain/spatial/Position2D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="4005,98,4227,147"/>
+<area shape="rect" id="node24" href="#domain.spatial.Error2D" title="{domain/spatial/Error2D}" alt="" coords="2441,263,2565,312"/>
+<area shape="rect" id="node18" href="#domain.spatial.Position3D" title="{domain/spatial/Position3D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="4251,98,4474,147"/>
+<area shape="rect" id="node29" href="#domain.spatial.Error3D" title="{domain/spatial/Error3D}" alt="" coords="3234,263,3358,312"/>
+<area shape="rect" id="node20" href="#domain.spatial.StatisticalError1D" title="{domain/spatial/StatisticalError1D|+statError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1514,98,1745,147"/>
+<area shape="rect" id="node21" href="#domain.spatial.SystematicError1D" title="{domain/spatial/SystematicError1D|+sysError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="774,98,1002,147"/>
+<area shape="rect" id="node22" href="#domain.spatial.RandomError1D" title="{domain/spatial/RandomError1D|+randError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1027,98,1261,147"/>
+<area shape="rect" id="node23" href="#domain.spatial.Resolution1D" title="{domain/spatial/Resolution1D|+res : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1286,98,1490,147"/>
+<area shape="rect" id="node25" href="#domain.spatial.StatisticalError2D" title="{domain/spatial/StatisticalError2D|+statError : coords_tessel:dtypes.Uncertainty2D\l}" alt="" coords="2509,98,2739,147"/>
+<area shape="rect" id="node26" href="#domain.spatial.SystematicError2D" title="{domain/spatial/SystematicError2D|+sysError : coords_tessel:dtypes.Uncertainty2D\l}" alt="" coords="1769,98,1997,147"/>
+<area shape="rect" id="node27" href="#domain.spatial.RandomError2D" title="{domain/spatial/RandomError2D|+randError : coords_tessel:dtypes.Uncertainty2D\l}" alt="" coords="2021,98,2256,147"/>
+<area shape="rect" id="node28" href="#domain.spatial.Resolution2D" title="{domain/spatial/Resolution2D|+res : coords_tessel:dtypes.Uncertainty2D\l}" alt="" coords="2281,98,2485,147"/>
+<area shape="rect" id="node30" href="#domain.spatial.StatisticalError3D" title="{domain/spatial/StatisticalError3D|+statError : coords_tessel:dtypes.Uncertainty3D\l}" alt="" coords="3750,98,3981,147"/>
+<area shape="rect" id="node31" href="#domain.spatial.SystematicError3D" title="{domain/spatial/SystematicError3D|+sysError : coords_tessel:dtypes.Uncertainty3D\l}" alt="" coords="3023,98,3251,147"/>
+<area shape="rect" id="node32" href="#domain.spatial.RandomError3D" title="{domain/spatial/RandomError3D|+randError : coords_tessel:dtypes.Uncertainty3D\l}" alt="" coords="2764,98,2999,147"/>
+<area shape="rect" id="node33" href="#domain.spatial.Resolution3D" title="{domain/spatial/Resolution3D|+res : coords_tessel:dtypes.Uncertainty3D\l}" alt="" coords="3522,98,3726,147"/>
+<area shape="rect" id="node35" href="#domain.spectral.DerivedSpectralCoordinate" title="{domain/spectral/DerivedSpectralCoordinate|+coord : coordsys:domain.spectral.SpectralCoord\l}" alt="" coords="4533,263,4768,312"/>
+<area shape="rect" id="node39" href="#domain.spectral.Error" title="{domain/spectral/Error}" alt="" coords="3437,375,3555,424"/>
+<area shape="rect" id="node36" href="#domain.spectral.Energy" title="{domain/spectral/Energy}" alt="" coords="4830,98,4954,147"/>
+<area shape="rect" id="node37" href="#domain.spectral.Frequency" title="{domain/spectral/Frequency}" alt="" coords="4499,98,4637,147"/>
+<area shape="rect" id="node38" href="#domain.spectral.Wavelength" title="{domain/spectral/Wavelength}" alt="" coords="4661,98,4805,147"/>
+<area shape="rect" id="node40" href="#domain.spectral.StatisticalError" title="{domain/spectral/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="3634,263,3865,312"/>
+<area shape="rect" id="node41" href="#domain.spectral.SystematicError" title="{domain/spectral/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="3382,263,3610,312"/>
+<area shape="rect" id="node42" href="#domain.spectral.RandomError" title="{domain/spectral/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="2183,263,2417,312"/>
+<area shape="rect" id="node43" href="#domain.spectral.Resolution" title="{domain/spectral/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1339,263,1543,312"/>
+<area shape="rect" id="node44" href="#domain.temporal.Time" title="{domain/temporal/Time|+coord : coordsys:domain.temporal.TimeCoord\l}" alt="" coords="5395,263,5621,312"/>
+<area shape="rect" id="node45" href="#domain.temporal.Error" title="{domain/temporal/Error}" alt="" coords="5953,375,6074,424"/>
+<area shape="rect" id="node46" href="#domain.temporal.StatisticalError" title="{domain/temporal/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="5645,263,5875,312"/>
+<area shape="rect" id="node47" href="#domain.temporal.SystematicError" title="{domain/temporal/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="5899,263,6127,312"/>
+<area shape="rect" id="node48" href="#domain.temporal.RandomError" title="{domain/temporal/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="6152,263,6387,312"/>
+<area shape="rect" id="node49" href="#domain.temporal.Resolution" title="{domain/temporal/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="6411,263,6615,312"/>
+<area shape="rect" id="node50" href="#domain.polarization.DerivedPolarizationCoordinate" title="{domain/polarization/DerivedPolarizationCoordinate}" alt="" coords="5127,263,5371,312"/>
+<area shape="rect" id="node51" href="#domain.polarization.Stokes" title="{domain/polarization/Stokes|+coord : coordsys:domain.polarization.PolStokesCoord\l}" alt="" coords="4978,98,5235,147"/>
+<area shape="rect" id="node52" href="#domain.polarization.Circular" title="{domain/polarization/Circular|+coord : coordsys:domain.polarization.PolCircularCoord\l}" alt="" coords="5259,98,5525,147"/>
+<area shape="rect" id="node53" href="#domain.polarization.Linear" title="{domain/polarization/Linear|+coord : coordsys:domain.polarization.PolLinearCoord\l}" alt="" coords="5549,98,5808,147"/>
+<area shape="rect" id="node54" href="#domain.polarization.Vector" title="{domain/polarization/Vector|+coord : coordsys:domain.polarization.PolVectorCoord\l}" alt="" coords="5832,98,6091,147"/>
+<area shape="rect" id="node55" href="#dtypes.Uncertainty" title="{<<datatype>>\ndtypes/Uncertainty}" alt="" coords="7231,375,7334,424"/>
+<area shape="rect" id="node56" href="#dtypes.Uncertainty1D" title="{<<datatype>>\ndtypes/Uncertainty1D}" alt="" coords="6639,263,6755,312"/>
+<area shape="rect" id="node57" href="#dtypes.Uncertainty2D" title="{<<datatype>>\ndtypes/Uncertainty2D}" alt="" coords="7225,263,7341,312"/>
+<area shape="rect" id="node58" href="#dtypes.Uncertainty3D" title="{<<datatype>>\ndtypes/Uncertainty3D}" alt="" coords="8042,263,8158,312"/>
+<area shape="rect" id="node59" href="#dtypes.Symmetrical1D" title="{<<datatype>>\ndtypes/Symmetrical1D|+radius : ivoa:RealQuantity\l}" alt="" coords="6377,93,6519,152"/>
+<area shape="rect" id="node60" href="#dtypes.Asymmetrical1D" title="{<<datatype>>\ndtypes/Asymmetrical1D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="6543,87,6683,158"/>
+<area shape="rect" id="node61" href="#dtypes.Bounds1D" title="{<<datatype>>\ndtypes/Bounds1D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="6708,87,6855,158"/>
+<area shape="rect" id="node62" href="#dtypes.Symmetrical2D" title="{<<datatype>>\ndtypes/Symmetrical2D|+radius : ivoa:RealQuantity\l}" alt="" coords="6879,93,7020,152"/>
+<area shape="rect" id="node63" href="#dtypes.Asymmetrical2D" title="{<<datatype>>\ndtypes/Asymmetrical2D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="7045,87,7185,158"/>
+<area shape="rect" id="node64" href="#dtypes.Bounds2D" title="{<<datatype>>\ndtypes/Bounds2D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="7209,87,7356,158"/>
+<area shape="rect" id="node65" href="#dtypes.Symmetrical3D" title="{<<datatype>>\ndtypes/Symmetrical3D|+radius : ivoa:RealQuantity\l}" alt="" coords="7780,93,7921,152"/>
+<area shape="rect" id="node66" href="#dtypes.Asymmetrical3D" title="{<<datatype>>\ndtypes/Asymmetrical3D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="7946,87,8086,158"/>
+<area shape="rect" id="node67" href="#dtypes.Bounds3D" title="{<<datatype>>\ndtypes/Bounds3D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="8111,87,8257,158"/>
+<area shape="rect" id="node68" href="#dtypes.Ellipse" title="{<<datatype>>\ndtypes/Ellipse|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="7380,87,7535,158"/>
+<area shape="rect" id="node69" href="#dtypes.Ellipsoid" title="{<<datatype>>\ndtypes/Ellipsoid|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="8281,87,8436,158"/>
+<area shape="rect" id="node70" href="#dtypes.Matrix" title="{<<datatype>>\ndtypes/Matrix}" alt="" coords="8749,263,8832,312"/>
+<area shape="rect" id="node71" href="#dtypes.Matrix2x2" title="{<<datatype>>\ndtypes/Matrix2x2|+m11 : ivoa:real\l+m12 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l}" alt="" coords="8683,75,8779,170"/>
+<area shape="rect" id="node72" href="#dtypes.Matrix3x3" title="{<<datatype>>\ndtypes/Matrix3x3|+m11 : ivoa:real\l+m12 : ivoa:real\l+m13 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l+m23 : ivoa:real\l+m31 : ivoa:real\l+m32 : ivoa:real\l+m33 : ivoa:real\l}" alt="" coords="8803,45,8899,200"/>
+<area shape="rect" id="node73" href="#dtypes.CovarianceMatrix2D" title="{<<datatype>>\ndtypes/CovarianceMatrix2D|+matrix : coords_tessel:dtypes.Matrix2x2\l}" alt="" coords="7558,93,7757,152"/>
+<area shape="rect" id="node74" href="#dtypes.CovarianceMatrix3D" title="{<<datatype>>\ndtypes/CovarianceMatrix3D|+matrix : coords_tessel:dtypes.Matrix3x3\l}" alt="" coords="8459,93,8658,152"/>
 </map>
 
     <hr>
@@ -473,7 +473,7 @@
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model</td>
-        <td class="objecttype-name">coords</td>
+        <td class="objecttype-name">coords_tessel</td>
       </tr>
       <tr>
         <td width="20%" class="info-title">child package(s)</td>
@@ -535,7 +535,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">coords</a></td>
+        <td colspan="2" class="feature-detail"><a href="#model_section">coords_tessel</a></td>
       </tr>
       <tr>
         <td width="20%" class="info-title">child package(s)</td>
@@ -636,7 +636,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords_tessel:DerivedCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -677,7 +677,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.generic.Measurement.error"></a><b>error</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td class="feature-detail"><a href="#domain.generic.Error">Error [coords_tessel:domain.generic.Error]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -732,7 +732,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords_tessel:domain.generic.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -745,7 +745,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.RandomError.randError"></a><b>randError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -796,7 +796,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords_tessel:domain.generic.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -809,7 +809,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.Resolution.res"></a><b>res</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -860,7 +860,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords_tessel:domain.generic.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -873,7 +873,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.StatisticalError.statError"></a><b>statError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -924,7 +924,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords_tessel:domain.generic.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -937,7 +937,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.SystematicError.sysError"></a><b>sysError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1017,7 +1017,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords:domain.polarization.DerivedPolarizationCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords_tessel:domain.polarization.DerivedPolarizationCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1081,7 +1081,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords_tessel:DerivedCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
@@ -1122,7 +1122,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords:domain.polarization.DerivedPolarizationCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords_tessel:domain.polarization.DerivedPolarizationCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1186,7 +1186,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords:domain.polarization.DerivedPolarizationCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords_tessel:domain.polarization.DerivedPolarizationCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1250,7 +1250,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords:domain.polarization.DerivedPolarizationCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords_tessel:domain.polarization.DerivedPolarizationCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1454,7 +1454,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords_tessel:DerivedCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
@@ -1472,7 +1472,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spatial.Position.tile"></a><b>tile</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Tile">Tile [coords:domain.spatial.Tile]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.Tile">Tile [coords_tessel:domain.spatial.Tile]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1527,7 +1527,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords:domain.spatial.Position]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords_tessel:domain.spatial.Position]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1568,7 +1568,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spatial.Position1D.error"></a><b>error</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords_tessel:domain.spatial.Error1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1623,7 +1623,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords:domain.spatial.Position]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords_tessel:domain.spatial.Position]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1664,7 +1664,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spatial.Position2D.error"></a><b>error</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords_tessel:domain.spatial.Error2D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1719,7 +1719,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords:domain.spatial.Position]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords_tessel:domain.spatial.Position]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1760,7 +1760,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spatial.Position3D.error"></a><b>error</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords_tessel:domain.spatial.Error3D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1815,7 +1815,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords_tessel:domain.spatial.Error1D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1828,7 +1828,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.RandomError1D.randError"></a><b>randError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1879,7 +1879,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords_tessel:domain.spatial.Error2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1892,7 +1892,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.RandomError2D.randError"></a><b>randError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1943,7 +1943,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords_tessel:domain.spatial.Error3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1956,7 +1956,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.RandomError3D.randError"></a><b>randError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2007,7 +2007,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords_tessel:domain.spatial.Error1D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2020,7 +2020,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Resolution1D.res"></a><b>res</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2071,7 +2071,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords_tessel:domain.spatial.Error2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2084,7 +2084,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Resolution2D.res"></a><b>res</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2135,7 +2135,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords_tessel:domain.spatial.Error3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2148,7 +2148,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Resolution3D.res"></a><b>res</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2199,7 +2199,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords_tessel:domain.spatial.Error1D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2212,7 +2212,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.StatisticalError1D.statError"></a><b>statError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2263,7 +2263,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords_tessel:domain.spatial.Error2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2276,7 +2276,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.StatisticalError2D.statError"></a><b>statError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2327,7 +2327,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords_tessel:domain.spatial.Error3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2340,7 +2340,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.StatisticalError3D.statError"></a><b>statError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2391,7 +2391,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords_tessel:domain.spatial.Error1D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2404,7 +2404,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SystematicError1D.sysError"></a><b>sysError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2455,7 +2455,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords_tessel:domain.spatial.Error2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2468,7 +2468,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SystematicError2D.sysError"></a><b>sysError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2519,7 +2519,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords_tessel:domain.spatial.Error3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2532,7 +2532,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SystematicError3D.sysError"></a><b>sysError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2672,7 +2672,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords_tessel:DerivedCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
@@ -2718,7 +2718,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spectral.DerivedSpectralCoordinate.error"></a><b>error</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td class="feature-detail"><a href="#domain.spectral.Error">Error [coords_tessel:domain.spectral.Error]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2773,7 +2773,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords:domain.spectral.DerivedSpectralCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords_tessel:domain.spectral.DerivedSpectralCoordinate]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -2846,7 +2846,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords:domain.spectral.DerivedSpectralCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords_tessel:domain.spectral.DerivedSpectralCoordinate]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -2882,7 +2882,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords_tessel:domain.spectral.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2895,7 +2895,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.RandomError.randError"></a><b>randError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2946,7 +2946,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords_tessel:domain.spectral.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2959,7 +2959,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.Resolution.res"></a><b>res</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3010,7 +3010,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords_tessel:domain.spectral.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3023,7 +3023,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.StatisticalError.statError"></a><b>statError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3074,7 +3074,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords_tessel:domain.spectral.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3087,7 +3087,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.SystematicError.sysError"></a><b>sysError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3138,7 +3138,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords:domain.spectral.DerivedSpectralCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords_tessel:domain.spectral.DerivedSpectralCoordinate]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -3240,7 +3240,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords_tessel:domain.temporal.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3253,7 +3253,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.RandomError.randError"></a><b>randError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3304,7 +3304,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords_tessel:domain.temporal.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3317,7 +3317,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.Resolution.res"></a><b>res</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3368,7 +3368,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords_tessel:domain.temporal.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3381,7 +3381,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.StatisticalError.statError"></a><b>statError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3432,7 +3432,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords_tessel:domain.temporal.Error]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3445,7 +3445,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.SystematicError.sysError"></a><b>sysError</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3496,7 +3496,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords_tessel:DerivedCoordinate]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3537,7 +3537,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.temporal.Time.error"></a><b>error</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.Error">Error [coords_tessel:domain.temporal.Error]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3581,7 +3581,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">coords</a></td>
+        <td colspan="2" class="feature-detail"><a href="#model_section">coords_tessel</a></td>
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
@@ -3616,7 +3616,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3700,7 +3700,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3784,7 +3784,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3868,7 +3868,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3952,7 +3952,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4036,7 +4036,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4120,7 +4120,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4133,7 +4133,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.CovarianceMatrix2D.matrix"></a><b>matrix</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Matrix2x2">Matrix2x2 [coords:dtypes.Matrix2x2]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Matrix2x2">Matrix2x2 [coords_tessel:dtypes.Matrix2x2]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -4184,7 +4184,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4197,7 +4197,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.CovarianceMatrix3D.matrix"></a><b>matrix</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Matrix3x3">Matrix3x3 [coords:dtypes.Matrix3x3]</a></td>
+                      <td class="feature-detail"><a href="#dtypes.Matrix3x3">Matrix3x3 [coords_tessel:dtypes.Matrix3x3]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -4248,7 +4248,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4332,7 +4332,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4453,7 +4453,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Matrix">Matrix [coords:dtypes.Matrix]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Matrix">Matrix [coords_tessel:dtypes.Matrix]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4577,7 +4577,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Matrix">Matrix [coords:dtypes.Matrix]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Matrix">Matrix [coords_tessel:dtypes.Matrix]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4801,7 +4801,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords_tessel:dtypes.Uncertainty1D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4865,7 +4865,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords_tessel:dtypes.Uncertainty2D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4929,7 +4929,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords_tessel:dtypes.Uncertainty3D]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -5030,7 +5030,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords:dtypes.Uncertainty]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords_tessel:dtypes.Uncertainty]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
@@ -5071,7 +5071,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords:dtypes.Uncertainty]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords_tessel:dtypes.Uncertainty]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
@@ -5112,7 +5112,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords:dtypes.Uncertainty]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords_tessel:dtypes.Uncertainty]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>

Modified: trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.map
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.map	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.map	Wed Apr 12 09:18:17 2017	(r3935)
@@ -6,71 +6,71 @@
 <area shape="rect" id="node5" href="#domain.temporal" title="temporal" alt="" coords="357,99,443,147"/>
 <area shape="rect" id="node6" href="#domain.polarization" title="polarization" alt="" coords="225,99,333,147"/>
 <area shape="rect" id="node7" href="#dtypes" title="dtypes" alt="" coords="27,99,99,147"/>
-<area shape="rect" id="node8" href="#DerivedCoordinate" title="{DerivedCoordinate}" alt="" coords="4245,375,4349,424"/>
-<area shape="rect" id="node9" href="#domain.generic.Measurement" title="{domain/generic/Measurement|+coord : coordsys:domain.generic.GenericCoord\l}" alt="" coords="3430,263,3661,312"/>
-<area shape="rect" id="node10" href="#domain.generic.Error" title="{domain/generic/Error}" alt="" coords="860,375,975,424"/>
-<area shape="rect" id="node11" href="#domain.generic.StatisticalError" title="{domain/generic/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="817,263,1018,312"/>
-<area shape="rect" id="node12" href="#domain.generic.SystematicError" title="{domain/generic/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="1042,263,1241,312"/>
-<area shape="rect" id="node13" href="#domain.generic.RandomError" title="{domain/generic/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="388,263,593,312"/>
-<area shape="rect" id="node14" href="#domain.generic.Resolution" title="{domain/generic/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="618,263,793,312"/>
-<area shape="rect" id="node15" href="#domain.spatial.Position" title="{domain/spatial/Position}" alt="" coords="3835,263,3957,312"/>
-<area shape="rect" id="node34" href="#domain.spatial.Tile" title="{domain/spatial/Tile|+skyindex : coordsys:SkyIndex\l}" alt="" coords="3819,375,3973,424"/>
-<area shape="rect" id="node16" href="#domain.spatial.Position1D" title="{domain/spatial/Position1D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2981,98,3203,147"/>
-<area shape="rect" id="node19" href="#domain.spatial.Error1D" title="{domain/spatial/Error1D}" alt="" coords="1463,263,1587,312"/>
-<area shape="rect" id="node17" href="#domain.spatial.Position2D" title="{domain/spatial/Position2D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="3651,98,3874,147"/>
-<area shape="rect" id="node24" href="#domain.spatial.Error2D" title="{domain/spatial/Error2D}" alt="" coords="2234,263,2358,312"/>
-<area shape="rect" id="node18" href="#domain.spatial.Position3D" title="{domain/spatial/Position3D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="3898,98,4121,147"/>
-<area shape="rect" id="node29" href="#domain.spatial.Error3D" title="{domain/spatial/Error3D}" alt="" coords="2815,263,2939,312"/>
-<area shape="rect" id="node20" href="#domain.spatial.StatisticalError1D" title="{domain/spatial/StatisticalError1D|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="1425,98,1626,147"/>
-<area shape="rect" id="node21" href="#domain.spatial.SystematicError1D" title="{domain/spatial/SystematicError1D|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="773,98,971,147"/>
-<area shape="rect" id="node22" href="#domain.spatial.RandomError1D" title="{domain/spatial/RandomError1D|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="996,98,1201,147"/>
-<area shape="rect" id="node23" href="#domain.spatial.Resolution1D" title="{domain/spatial/Resolution1D|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="1226,98,1401,147"/>
-<area shape="rect" id="node25" href="#domain.spatial.StatisticalError2D" title="{domain/spatial/StatisticalError2D|+statError : coords:dtypes.Uncertainty2D\l}" alt="" coords="2302,98,2503,147"/>
-<area shape="rect" id="node26" href="#domain.spatial.SystematicError2D" title="{domain/spatial/SystematicError2D|+sysError : coords:dtypes.Uncertainty2D\l}" alt="" coords="1650,98,1849,147"/>
-<area shape="rect" id="node27" href="#domain.spatial.RandomError2D" title="{domain/spatial/RandomError2D|+randError : coords:dtypes.Uncertainty2D\l}" alt="" coords="1873,98,2079,147"/>
-<area shape="rect" id="node28" href="#domain.spatial.Resolution2D" title="{domain/spatial/Resolution2D|+res : coords:dtypes.Uncertainty2D\l}" alt="" coords="2103,98,2278,147"/>
-<area shape="rect" id="node30" href="#domain.spatial.StatisticalError3D" title="{domain/spatial/StatisticalError3D|+statError : coords:dtypes.Uncertainty3D\l}" alt="" coords="3426,98,3627,147"/>
-<area shape="rect" id="node31" href="#domain.spatial.SystematicError3D" title="{domain/spatial/SystematicError3D|+sysError : coords:dtypes.Uncertainty3D\l}" alt="" coords="2758,98,2957,147"/>
-<area shape="rect" id="node32" href="#domain.spatial.RandomError3D" title="{domain/spatial/RandomError3D|+randError : coords:dtypes.Uncertainty3D\l}" alt="" coords="2528,98,2733,147"/>
-<area shape="rect" id="node33" href="#domain.spatial.Resolution3D" title="{domain/spatial/Resolution3D|+res : coords:dtypes.Uncertainty3D\l}" alt="" coords="3227,98,3402,147"/>
-<area shape="rect" id="node35" href="#domain.spectral.DerivedSpectralCoordinate" title="{domain/spectral/DerivedSpectralCoordinate|+coord : coordsys:domain.spectral.SpectralCoord\l}" alt="" coords="4180,263,4415,312"/>
-<area shape="rect" id="node39" href="#domain.spectral.Error" title="{domain/spectral/Error}" alt="" coords="3004,375,3121,424"/>
-<area shape="rect" id="node36" href="#domain.spectral.Energy" title="{domain/spectral/Energy}" alt="" coords="4477,98,4601,147"/>
-<area shape="rect" id="node37" href="#domain.spectral.Frequency" title="{domain/spectral/Frequency}" alt="" coords="4145,98,4284,147"/>
-<area shape="rect" id="node38" href="#domain.spectral.Wavelength" title="{domain/spectral/Wavelength}" alt="" coords="4308,98,4452,147"/>
-<area shape="rect" id="node40" href="#domain.spectral.StatisticalError" title="{domain/spectral/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="3186,263,3387,312"/>
-<area shape="rect" id="node41" href="#domain.spectral.SystematicError" title="{domain/spectral/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="2963,263,3162,312"/>
-<area shape="rect" id="node42" href="#domain.spectral.RandomError" title="{domain/spectral/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="2004,263,2209,312"/>
-<area shape="rect" id="node43" href="#domain.spectral.Resolution" title="{domain/spectral/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="1265,263,1439,312"/>
-<area shape="rect" id="node44" href="#domain.temporal.Time" title="{domain/temporal/Time|+coord : coordsys:domain.temporal.TimeCoord\l}" alt="" coords="4939,263,5165,312"/>
-<area shape="rect" id="node45" href="#domain.temporal.Error" title="{domain/temporal/Error}" alt="" coords="5453,375,5574,424"/>
-<area shape="rect" id="node46" href="#domain.temporal.StatisticalError" title="{domain/temporal/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5189,263,5390,312"/>
-<area shape="rect" id="node47" href="#domain.temporal.SystematicError" title="{domain/temporal/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5414,263,5613,312"/>
-<area shape="rect" id="node48" href="#domain.temporal.RandomError" title="{domain/temporal/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5637,263,5843,312"/>
-<area shape="rect" id="node49" href="#domain.temporal.Resolution" title="{domain/temporal/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="5867,263,6042,312"/>
-<area shape="rect" id="node50" href="#domain.polarization.DerivedPolarizationCoordinate" title="{domain/polarization/DerivedPolarizationCoordinate}" alt="" coords="4671,263,4915,312"/>
-<area shape="rect" id="node51" href="#domain.polarization.Stokes" title="{domain/polarization/Stokes|+coord : coordsys:domain.polarization.PolStokesCoord\l}" alt="" coords="4625,98,4882,147"/>
-<area shape="rect" id="node52" href="#domain.polarization.Circular" title="{domain/polarization/Circular|+coord : coordsys:domain.polarization.PolCircularCoord\l}" alt="" coords="4906,98,5171,147"/>
-<area shape="rect" id="node53" href="#domain.polarization.Linear" title="{domain/polarization/Linear|+coord : coordsys:domain.polarization.PolLinearCoord\l}" alt="" coords="5196,98,5455,147"/>
-<area shape="rect" id="node54" href="#domain.polarization.Vector" title="{domain/polarization/Vector|+coord : coordsys:domain.polarization.PolVectorCoord\l}" alt="" coords="5479,98,5737,147"/>
-<area shape="rect" id="node55" href="#dtypes.Uncertainty" title="{<<datatype>>\ndtypes/Uncertainty}" alt="" coords="6615,375,6718,424"/>
-<area shape="rect" id="node56" href="#dtypes.Uncertainty1D" title="{<<datatype>>\ndtypes/Uncertainty1D}" alt="" coords="6087,263,6203,312"/>
-<area shape="rect" id="node57" href="#dtypes.Uncertainty2D" title="{<<datatype>>\ndtypes/Uncertainty2D}" alt="" coords="6609,263,6725,312"/>
-<area shape="rect" id="node58" href="#dtypes.Uncertainty3D" title="{<<datatype>>\ndtypes/Uncertainty3D}" alt="" coords="7399,263,7515,312"/>
-<area shape="rect" id="node59" href="#dtypes.Symmetrical1D" title="{<<datatype>>\ndtypes/Symmetrical1D|+radius : ivoa:RealQuantity\l}" alt="" coords="5761,93,5903,152"/>
-<area shape="rect" id="node60" href="#dtypes.Asymmetrical1D" title="{<<datatype>>\ndtypes/Asymmetrical1D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="5927,87,6067,158"/>
-<area shape="rect" id="node61" href="#dtypes.Bounds1D" title="{<<datatype>>\ndtypes/Bounds1D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="6092,87,6239,158"/>
-<area shape="rect" id="node62" href="#dtypes.Symmetrical2D" title="{<<datatype>>\ndtypes/Symmetrical2D|+radius : ivoa:RealQuantity\l}" alt="" coords="6263,93,6404,152"/>
-<area shape="rect" id="node63" href="#dtypes.Asymmetrical2D" title="{<<datatype>>\ndtypes/Asymmetrical2D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="6429,87,6569,158"/>
-<area shape="rect" id="node64" href="#dtypes.Bounds2D" title="{<<datatype>>\ndtypes/Bounds2D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="6593,87,6740,158"/>
-<area shape="rect" id="node65" href="#dtypes.Symmetrical3D" title="{<<datatype>>\ndtypes/Symmetrical3D|+radius : ivoa:RealQuantity\l}" alt="" coords="7137,93,7279,152"/>
-<area shape="rect" id="node66" href="#dtypes.Asymmetrical3D" title="{<<datatype>>\ndtypes/Asymmetrical3D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="7303,87,7443,158"/>
-<area shape="rect" id="node67" href="#dtypes.Bounds3D" title="{<<datatype>>\ndtypes/Bounds3D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="7468,87,7615,158"/>
-<area shape="rect" id="node68" href="#dtypes.Ellipse" title="{<<datatype>>\ndtypes/Ellipse|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="6764,87,6919,158"/>
-<area shape="rect" id="node69" href="#dtypes.Ellipsoid" title="{<<datatype>>\ndtypes/Ellipsoid|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="7639,87,7793,158"/>
-<area shape="rect" id="node70" href="#dtypes.Matrix" title="{<<datatype>>\ndtypes/Matrix}" alt="" coords="8079,263,8161,312"/>
-<area shape="rect" id="node71" href="#dtypes.Matrix2x2" title="{<<datatype>>\ndtypes/Matrix2x2|+m11 : ivoa:real\l+m12 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l}" alt="" coords="8012,75,8108,170"/>
-<area shape="rect" id="node72" href="#dtypes.Matrix3x3" title="{<<datatype>>\ndtypes/Matrix3x3|+m11 : ivoa:real\l+m12 : ivoa:real\l+m13 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l+m23 : ivoa:real\l+m31 : ivoa:real\l+m32 : ivoa:real\l+m33 : ivoa:real\l}" alt="" coords="8132,45,8228,200"/>
-<area shape="rect" id="node73" href="#dtypes.CovarianceMatrix2D" title="{<<datatype>>\ndtypes/CovarianceMatrix2D|+matrix : coords:dtypes.Matrix2x2\l}" alt="" coords="6943,93,7113,152"/>
-<area shape="rect" id="node74" href="#dtypes.CovarianceMatrix3D" title="{<<datatype>>\ndtypes/CovarianceMatrix3D|+matrix : coords:dtypes.Matrix3x3\l}" alt="" coords="7817,93,7988,152"/>
+<area shape="rect" id="node8" href="#DerivedCoordinate" title="{DerivedCoordinate}" alt="" coords="4599,375,4703,424"/>
+<area shape="rect" id="node9" href="#domain.generic.Measurement" title="{domain/generic/Measurement|+coord : coordsys:domain.generic.GenericCoord\l}" alt="" coords="3909,263,4139,312"/>
+<area shape="rect" id="node10" href="#domain.generic.Error" title="{domain/generic/Error}" alt="" coords="891,375,1005,424"/>
+<area shape="rect" id="node11" href="#domain.generic.StatisticalError" title="{domain/generic/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="833,263,1063,312"/>
+<area shape="rect" id="node12" href="#domain.generic.SystematicError" title="{domain/generic/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1087,263,1315,312"/>
+<area shape="rect" id="node13" href="#domain.generic.RandomError" title="{domain/generic/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="345,263,580,312"/>
+<area shape="rect" id="node14" href="#domain.generic.Resolution" title="{domain/generic/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="605,263,809,312"/>
+<area shape="rect" id="node15" href="#domain.spatial.Position" title="{domain/spatial/Position}" alt="" coords="4183,263,4305,312"/>
+<area shape="rect" id="node34" href="#domain.spatial.Tile" title="{domain/spatial/Tile|+skyindex : coordsys:SkyIndex\l}" alt="" coords="4167,375,4321,424"/>
+<area shape="rect" id="node16" href="#domain.spatial.Position1D" title="{domain/spatial/Position1D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="3275,98,3498,147"/>
+<area shape="rect" id="node19" href="#domain.spatial.Error1D" title="{domain/spatial/Error1D}" alt="" coords="1567,263,1691,312"/>
+<area shape="rect" id="node17" href="#domain.spatial.Position2D" title="{domain/spatial/Position2D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="4005,98,4227,147"/>
+<area shape="rect" id="node24" href="#domain.spatial.Error2D" title="{domain/spatial/Error2D}" alt="" coords="2441,263,2565,312"/>
+<area shape="rect" id="node18" href="#domain.spatial.Position3D" title="{domain/spatial/Position3D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="4251,98,4474,147"/>
+<area shape="rect" id="node29" href="#domain.spatial.Error3D" title="{domain/spatial/Error3D}" alt="" coords="3234,263,3358,312"/>
+<area shape="rect" id="node20" href="#domain.spatial.StatisticalError1D" title="{domain/spatial/StatisticalError1D|+statError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1514,98,1745,147"/>
+<area shape="rect" id="node21" href="#domain.spatial.SystematicError1D" title="{domain/spatial/SystematicError1D|+sysError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="774,98,1002,147"/>
+<area shape="rect" id="node22" href="#domain.spatial.RandomError1D" title="{domain/spatial/RandomError1D|+randError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1027,98,1261,147"/>
+<area shape="rect" id="node23" href="#domain.spatial.Resolution1D" title="{domain/spatial/Resolution1D|+res : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1286,98,1490,147"/>
+<area shape="rect" id="node25" href="#domain.spatial.StatisticalError2D" title="{domain/spatial/StatisticalError2D|+statError : coords_tessel:dtypes.Uncertainty2D\l}" alt="" coords="2509,98,2739,147"/>
+<area shape="rect" id="node26" href="#domain.spatial.SystematicError2D" title="{domain/spatial/SystematicError2D|+sysError : coords_tessel:dtypes.Uncertainty2D\l}" alt="" coords="1769,98,1997,147"/>
+<area shape="rect" id="node27" href="#domain.spatial.RandomError2D" title="{domain/spatial/RandomError2D|+randError : coords_tessel:dtypes.Uncertainty2D\l}" alt="" coords="2021,98,2256,147"/>
+<area shape="rect" id="node28" href="#domain.spatial.Resolution2D" title="{domain/spatial/Resolution2D|+res : coords_tessel:dtypes.Uncertainty2D\l}" alt="" coords="2281,98,2485,147"/>
+<area shape="rect" id="node30" href="#domain.spatial.StatisticalError3D" title="{domain/spatial/StatisticalError3D|+statError : coords_tessel:dtypes.Uncertainty3D\l}" alt="" coords="3750,98,3981,147"/>
+<area shape="rect" id="node31" href="#domain.spatial.SystematicError3D" title="{domain/spatial/SystematicError3D|+sysError : coords_tessel:dtypes.Uncertainty3D\l}" alt="" coords="3023,98,3251,147"/>
+<area shape="rect" id="node32" href="#domain.spatial.RandomError3D" title="{domain/spatial/RandomError3D|+randError : coords_tessel:dtypes.Uncertainty3D\l}" alt="" coords="2764,98,2999,147"/>
+<area shape="rect" id="node33" href="#domain.spatial.Resolution3D" title="{domain/spatial/Resolution3D|+res : coords_tessel:dtypes.Uncertainty3D\l}" alt="" coords="3522,98,3726,147"/>
+<area shape="rect" id="node35" href="#domain.spectral.DerivedSpectralCoordinate" title="{domain/spectral/DerivedSpectralCoordinate|+coord : coordsys:domain.spectral.SpectralCoord\l}" alt="" coords="4533,263,4768,312"/>
+<area shape="rect" id="node39" href="#domain.spectral.Error" title="{domain/spectral/Error}" alt="" coords="3437,375,3555,424"/>
+<area shape="rect" id="node36" href="#domain.spectral.Energy" title="{domain/spectral/Energy}" alt="" coords="4830,98,4954,147"/>
+<area shape="rect" id="node37" href="#domain.spectral.Frequency" title="{domain/spectral/Frequency}" alt="" coords="4499,98,4637,147"/>
+<area shape="rect" id="node38" href="#domain.spectral.Wavelength" title="{domain/spectral/Wavelength}" alt="" coords="4661,98,4805,147"/>
+<area shape="rect" id="node40" href="#domain.spectral.StatisticalError" title="{domain/spectral/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="3634,263,3865,312"/>
+<area shape="rect" id="node41" href="#domain.spectral.SystematicError" title="{domain/spectral/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="3382,263,3610,312"/>
+<area shape="rect" id="node42" href="#domain.spectral.RandomError" title="{domain/spectral/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="2183,263,2417,312"/>
+<area shape="rect" id="node43" href="#domain.spectral.Resolution" title="{domain/spectral/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="1339,263,1543,312"/>
+<area shape="rect" id="node44" href="#domain.temporal.Time" title="{domain/temporal/Time|+coord : coordsys:domain.temporal.TimeCoord\l}" alt="" coords="5395,263,5621,312"/>
+<area shape="rect" id="node45" href="#domain.temporal.Error" title="{domain/temporal/Error}" alt="" coords="5953,375,6074,424"/>
+<area shape="rect" id="node46" href="#domain.temporal.StatisticalError" title="{domain/temporal/StatisticalError|+statError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="5645,263,5875,312"/>
+<area shape="rect" id="node47" href="#domain.temporal.SystematicError" title="{domain/temporal/SystematicError|+sysError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="5899,263,6127,312"/>
+<area shape="rect" id="node48" href="#domain.temporal.RandomError" title="{domain/temporal/RandomError|+randError : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="6152,263,6387,312"/>
+<area shape="rect" id="node49" href="#domain.temporal.Resolution" title="{domain/temporal/Resolution|+res : coords_tessel:dtypes.Uncertainty1D\l}" alt="" coords="6411,263,6615,312"/>
+<area shape="rect" id="node50" href="#domain.polarization.DerivedPolarizationCoordinate" title="{domain/polarization/DerivedPolarizationCoordinate}" alt="" coords="5127,263,5371,312"/>
+<area shape="rect" id="node51" href="#domain.polarization.Stokes" title="{domain/polarization/Stokes|+coord : coordsys:domain.polarization.PolStokesCoord\l}" alt="" coords="4978,98,5235,147"/>
+<area shape="rect" id="node52" href="#domain.polarization.Circular" title="{domain/polarization/Circular|+coord : coordsys:domain.polarization.PolCircularCoord\l}" alt="" coords="5259,98,5525,147"/>
+<area shape="rect" id="node53" href="#domain.polarization.Linear" title="{domain/polarization/Linear|+coord : coordsys:domain.polarization.PolLinearCoord\l}" alt="" coords="5549,98,5808,147"/>
+<area shape="rect" id="node54" href="#domain.polarization.Vector" title="{domain/polarization/Vector|+coord : coordsys:domain.polarization.PolVectorCoord\l}" alt="" coords="5832,98,6091,147"/>
+<area shape="rect" id="node55" href="#dtypes.Uncertainty" title="{<<datatype>>\ndtypes/Uncertainty}" alt="" coords="7231,375,7334,424"/>
+<area shape="rect" id="node56" href="#dtypes.Uncertainty1D" title="{<<datatype>>\ndtypes/Uncertainty1D}" alt="" coords="6639,263,6755,312"/>
+<area shape="rect" id="node57" href="#dtypes.Uncertainty2D" title="{<<datatype>>\ndtypes/Uncertainty2D}" alt="" coords="7225,263,7341,312"/>
+<area shape="rect" id="node58" href="#dtypes.Uncertainty3D" title="{<<datatype>>\ndtypes/Uncertainty3D}" alt="" coords="8042,263,8158,312"/>
+<area shape="rect" id="node59" href="#dtypes.Symmetrical1D" title="{<<datatype>>\ndtypes/Symmetrical1D|+radius : ivoa:RealQuantity\l}" alt="" coords="6377,93,6519,152"/>
+<area shape="rect" id="node60" href="#dtypes.Asymmetrical1D" title="{<<datatype>>\ndtypes/Asymmetrical1D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="6543,87,6683,158"/>
+<area shape="rect" id="node61" href="#dtypes.Bounds1D" title="{<<datatype>>\ndtypes/Bounds1D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="6708,87,6855,158"/>
+<area shape="rect" id="node62" href="#dtypes.Symmetrical2D" title="{<<datatype>>\ndtypes/Symmetrical2D|+radius : ivoa:RealQuantity\l}" alt="" coords="6879,93,7020,152"/>
+<area shape="rect" id="node63" href="#dtypes.Asymmetrical2D" title="{<<datatype>>\ndtypes/Asymmetrical2D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="7045,87,7185,158"/>
+<area shape="rect" id="node64" href="#dtypes.Bounds2D" title="{<<datatype>>\ndtypes/Bounds2D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="7209,87,7356,158"/>
+<area shape="rect" id="node65" href="#dtypes.Symmetrical3D" title="{<<datatype>>\ndtypes/Symmetrical3D|+radius : ivoa:RealQuantity\l}" alt="" coords="7780,93,7921,152"/>
+<area shape="rect" id="node66" href="#dtypes.Asymmetrical3D" title="{<<datatype>>\ndtypes/Asymmetrical3D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="7946,87,8086,158"/>
+<area shape="rect" id="node67" href="#dtypes.Bounds3D" title="{<<datatype>>\ndtypes/Bounds3D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="8111,87,8257,158"/>
+<area shape="rect" id="node68" href="#dtypes.Ellipse" title="{<<datatype>>\ndtypes/Ellipse|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="7380,87,7535,158"/>
+<area shape="rect" id="node69" href="#dtypes.Ellipsoid" title="{<<datatype>>\ndtypes/Ellipsoid|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="8281,87,8436,158"/>
+<area shape="rect" id="node70" href="#dtypes.Matrix" title="{<<datatype>>\ndtypes/Matrix}" alt="" coords="8749,263,8832,312"/>
+<area shape="rect" id="node71" href="#dtypes.Matrix2x2" title="{<<datatype>>\ndtypes/Matrix2x2|+m11 : ivoa:real\l+m12 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l}" alt="" coords="8683,75,8779,170"/>
+<area shape="rect" id="node72" href="#dtypes.Matrix3x3" title="{<<datatype>>\ndtypes/Matrix3x3|+m11 : ivoa:real\l+m12 : ivoa:real\l+m13 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l+m23 : ivoa:real\l+m31 : ivoa:real\l+m32 : ivoa:real\l+m33 : ivoa:real\l}" alt="" coords="8803,45,8899,200"/>
+<area shape="rect" id="node73" href="#dtypes.CovarianceMatrix2D" title="{<<datatype>>\ndtypes/CovarianceMatrix2D|+matrix : coords_tessel:dtypes.Matrix2x2\l}" alt="" coords="7558,93,7757,152"/>
+<area shape="rect" id="node74" href="#dtypes.CovarianceMatrix3D" title="{<<datatype>>\ndtypes/CovarianceMatrix3D|+matrix : coords_tessel:dtypes.Matrix3x3\l}" alt="" coords="8459,93,8658,152"/>
 </map>

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

Modified: trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml	Wed Apr 12 09:18:17 2017	(r3935)
@@ -2,15 +2,15 @@
 <vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1.0"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.ivoa.net/xml/VODML/v1.0 http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/xsd/vo-dml-v1.0.xsd">
-  <name>coords</name>
+  <name>coords_tessel</name>
   <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
   <title>STC2 Coordinates Model</title>
-  <author>Arnold Rots, Mark Cresitello-Dittmar</author>
+  <author>Arnold Rots, Mark Cresitello-Dittmar, L. Michel</author>
   <version>2.0</version>
   <previousVersion>0.x</previousVersion>
-  <lastModified>2017-03-30T12:59:40</lastModified>
+  <lastModified>2017-04-11T16:01:46</lastModified>
   <import>
     <name>ivoa</name>
     <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</url>
@@ -52,7 +52,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:DerivedCoordinate</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.generic.Measurement.coord</vodml-id>
@@ -75,7 +75,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.generic.Error</vodml-ref>
+            <vodml-ref>coords_tessel:domain.generic.Error</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -99,7 +99,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.generic.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.generic.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.generic.StatisticalError.statError</vodml-id>
@@ -108,7 +108,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -124,7 +124,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.generic.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.generic.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.generic.SystematicError.sysError</vodml-id>
@@ -133,7 +133,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -149,7 +149,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.generic.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.generic.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.generic.RandomError.randError</vodml-id>
@@ -158,7 +158,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -174,7 +174,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.generic.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.generic.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.generic.Resolution.res</vodml-id>
@@ -183,7 +183,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -209,7 +209,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:DerivedCoordinate</vodml-ref>
         </extends>
         <composition>
           <vodml-id>domain.spatial.Position.tile</vodml-id>
@@ -218,7 +218,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.spatial.Tile</vodml-ref>
+            <vodml-ref>coords_tessel:domain.spatial.Tile</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -234,7 +234,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Position</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Position</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.Position1D.coord</vodml-id>
@@ -257,7 +257,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
+            <vodml-ref>coords_tessel:domain.spatial.Error1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -273,7 +273,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Position</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Position</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.Position2D.coord</vodml-id>
@@ -296,7 +296,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
+            <vodml-ref>coords_tessel:domain.spatial.Error2D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -312,7 +312,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Position</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Position</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.Position3D.coord</vodml-id>
@@ -335,7 +335,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
+            <vodml-ref>coords_tessel:domain.spatial.Error3D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -359,7 +359,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error1D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.StatisticalError1D.statError</vodml-id>
@@ -368,7 +368,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -384,7 +384,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error1D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.SystematicError1D.sysError</vodml-id>
@@ -393,7 +393,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -409,7 +409,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error1D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.RandomError1D.randError</vodml-id>
@@ -418,7 +418,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -434,7 +434,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error1D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.Resolution1D.res</vodml-id>
@@ -443,7 +443,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -467,7 +467,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error2D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.StatisticalError2D.statError</vodml-id>
@@ -476,7 +476,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -492,7 +492,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error2D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.SystematicError2D.sysError</vodml-id>
@@ -501,7 +501,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -517,7 +517,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error2D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.RandomError2D.randError</vodml-id>
@@ -526,7 +526,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -542,7 +542,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error2D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.Resolution2D.res</vodml-id>
@@ -551,7 +551,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -575,7 +575,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error3D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.StatisticalError3D.statError</vodml-id>
@@ -584,7 +584,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -600,7 +600,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error3D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.SystematicError3D.sysError</vodml-id>
@@ -609,7 +609,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -625,7 +625,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error3D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.RandomError3D.randError</vodml-id>
@@ -634,7 +634,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -650,7 +650,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Error3D</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.Resolution3D.res</vodml-id>
@@ -659,7 +659,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -707,7 +707,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:DerivedCoordinate</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spectral.DerivedSpectralCoordinate.coord</vodml-id>
@@ -730,7 +730,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.spectral.Error</vodml-ref>
+            <vodml-ref>coords_tessel:domain.spectral.Error</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -746,7 +746,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
         </extends>
       </objectType>
 
@@ -757,7 +757,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
         </extends>
       </objectType>
 
@@ -768,7 +768,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
         </extends>
       </objectType>
 
@@ -787,7 +787,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spectral.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spectral.StatisticalError.statError</vodml-id>
@@ -796,7 +796,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -812,7 +812,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spectral.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spectral.SystematicError.sysError</vodml-id>
@@ -821,7 +821,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -837,7 +837,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spectral.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spectral.RandomError.randError</vodml-id>
@@ -846,7 +846,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -862,7 +862,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spectral.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spectral.Resolution.res</vodml-id>
@@ -871,7 +871,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -897,7 +897,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:DerivedCoordinate</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.Time.coord</vodml-id>
@@ -920,7 +920,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+            <vodml-ref>coords_tessel:domain.temporal.Error</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -944,7 +944,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.temporal.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.StatisticalError.statError</vodml-id>
@@ -953,7 +953,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -969,7 +969,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.temporal.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.SystematicError.sysError</vodml-id>
@@ -978,7 +978,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -994,7 +994,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.temporal.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.RandomError.randError</vodml-id>
@@ -1003,7 +1003,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1019,7 +1019,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+          <vodml-ref>coords_tessel:domain.temporal.Error</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.Resolution.res</vodml-id>
@@ -1028,7 +1028,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1054,7 +1054,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:DerivedCoordinate</vodml-ref>
         </extends>
       </objectType>
 
@@ -1065,7 +1065,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.polarization.Stokes.coord</vodml-id>
@@ -1090,7 +1090,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.polarization.Circular.coord</vodml-id>
@@ -1115,7 +1115,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.polarization.Linear.coord</vodml-id>
@@ -1140,7 +1140,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
+          <vodml-ref>coords_tessel:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.polarization.Vector.coord</vodml-id>
@@ -1185,7 +1185,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty</vodml-ref>
       </extends>
     </dataType>
 
@@ -1196,7 +1196,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty</vodml-ref>
       </extends>
     </dataType>
 
@@ -1207,7 +1207,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty</vodml-ref>
       </extends>
     </dataType>
 
@@ -1218,7 +1218,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Symmetrical1D.radius</vodml-id>
@@ -1243,7 +1243,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Asymmetrical1D.plus</vodml-id>
@@ -1282,7 +1282,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty1D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Bounds1D.loLimit</vodml-id>
@@ -1321,7 +1321,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Symmetrical2D.radius</vodml-id>
@@ -1346,7 +1346,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Asymmetrical2D.plus</vodml-id>
@@ -1385,7 +1385,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Bounds2D.loLimit</vodml-id>
@@ -1424,7 +1424,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Symmetrical3D.radius</vodml-id>
@@ -1449,7 +1449,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Asymmetrical3D.plus</vodml-id>
@@ -1488,7 +1488,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Bounds3D.loLimit</vodml-id>
@@ -1527,7 +1527,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Ellipse.semiAxis</vodml-id>
@@ -1566,7 +1566,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Ellipsoid.semiAxis</vodml-id>
@@ -1613,7 +1613,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Matrix</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Matrix</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Matrix2x2.m11</vodml-id>
@@ -1680,7 +1680,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Matrix</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Matrix</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.Matrix3x3.m11</vodml-id>
@@ -1817,7 +1817,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty2D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.CovarianceMatrix2D.matrix</vodml-id>
@@ -1826,7 +1826,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <datatype>
-          <vodml-ref>coords:dtypes.Matrix2x2</vodml-ref>
+          <vodml-ref>coords_tessel:dtypes.Matrix2x2</vodml-ref>
         </datatype>
         <multiplicity>
           <minOccurs>1</minOccurs>
@@ -1842,7 +1842,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
+        <vodml-ref>coords_tessel:dtypes.Uncertainty3D</vodml-ref>
       </extends>
       <attribute>
         <vodml-id>dtypes.CovarianceMatrix3D.matrix</vodml-id>
@@ -1851,7 +1851,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <datatype>
-          <vodml-ref>coords:dtypes.Matrix3x3</vodml-ref>
+          <vodml-ref>coords_tessel:dtypes.Matrix3x3</vodml-ref>
         </datatype>
         <multiplicity>
           <minOccurs>1</minOccurs>

Modified: trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.xmi
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.xmi	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.xmi	Wed Apr 12 09:18:17 2017	(r3935)
@@ -1,464 +1,464 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_4F7AIBU3EeeZh9zsKpIhxg/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20100901 http:///schemas/IVOA_UML_Profile/_4F7AIBU3EeeZh9zsKpIhxg/0 IVOA_UML_Profile.profile.xmi#_4F8ORxU3EeeZh9zsKpIhxg">
-  <uml:Model xmi:id="_4F3VwBU3EeeZh9zsKpIhxg" name="coords">
-    <eAnnotations xmi:id="_4F3VwRU3EeeZh9zsKpIhxg" source="Objing">
-      <contents xmi:type="uml:Property" xmi:id="_4F3VwhU3EeeZh9zsKpIhxg" name="exporterVersion">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_4F3VwxU3EeeZh9zsKpIhxg" value="3.0.0"/>
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_P6VkQB6_Eeel5txBxgvIkw/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20100901 http:///schemas/IVOA_UML_Profile/_P6VkQB6_Eeel5txBxgvIkw/0 IVOA_UML_Profile.profile.xmi#_P6WyZx6_Eeel5txBxgvIkw">
+  <uml:Model xmi:id="_P6TvEB6_Eeel5txBxgvIkw" name="coords_tessel">
+    <eAnnotations xmi:id="_P6TvER6_Eeel5txBxgvIkw" source="Objing">
+      <contents xmi:type="uml:Property" xmi:id="_P6TvEh6_Eeel5txBxgvIkw" name="exporterVersion">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_P6TvEx6_Eeel5txBxgvIkw" value="3.0.0"/>
       </contents>
     </eAnnotations>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_4F3VxBU3EeeZh9zsKpIhxg" name="STC Coordinates Model V2.0 (2016)"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_4F3VxRU3EeeZh9zsKpIhxg" name="ivoa">
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3VxhU3EeeZh9zsKpIhxg" name="real"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3VxxU3EeeZh9zsKpIhxg" name="datetime"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3VyBU3EeeZh9zsKpIhxg" name="anyURI">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3VyRU3EeeZh9zsKpIhxg" general="_4F3VyhU3EeeZh9zsKpIhxg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3VyhU3EeeZh9zsKpIhxg" name="string"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3VyxU3EeeZh9zsKpIhxg" name="nonnegativeInteger"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3VzBU3EeeZh9zsKpIhxg" name="boolean"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3VzRU3EeeZh9zsKpIhxg" name="integer"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3VzhU3EeeZh9zsKpIhxg" name="rational">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3VzxU3EeeZh9zsKpIhxg" name="numerator" visibility="public" type="_4F3VzRU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V0BU3EeeZh9zsKpIhxg" name="denominator" visibility="public" type="_4F3VyxU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V0RU3EeeZh9zsKpIhxg" name="complex">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V0hU3EeeZh9zsKpIhxg" name="re" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V0xU3EeeZh9zsKpIhxg" name="im" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_4F3V1BU3EeeZh9zsKpIhxg" name="IVOA Base Types V1.0 (2016)"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V1RU3EeeZh9zsKpIhxg" name="Unit">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3V1hU3EeeZh9zsKpIhxg" general="_4F3VyhU3EeeZh9zsKpIhxg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3V1xU3EeeZh9zsKpIhxg" name="Quantity" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V2BU3EeeZh9zsKpIhxg" name="unit" visibility="public" type="_4F3V1RU3EeeZh9zsKpIhxg" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3V2RU3EeeZh9zsKpIhxg"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3V2hU3EeeZh9zsKpIhxg" name="IntegerQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3V2xU3EeeZh9zsKpIhxg" general="_4F3V1xU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V3BU3EeeZh9zsKpIhxg" name="value" visibility="public" type="_4F3VzRU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V3RU3EeeZh9zsKpIhxg" name="RealQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3V3hU3EeeZh9zsKpIhxg" general="_4F3V1xU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V3xU3EeeZh9zsKpIhxg" name="value" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_P6TvFB6_Eeel5txBxgvIkw" name="STC Coordinates Model V2.0 (2016)"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_P6TvFR6_Eeel5txBxgvIkw" name="ivoa">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvFh6_Eeel5txBxgvIkw" name="real"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvFx6_Eeel5txBxgvIkw" name="datetime"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvGB6_Eeel5txBxgvIkw" name="anyURI">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6TvGR6_Eeel5txBxgvIkw" general="_P6TvGh6_Eeel5txBxgvIkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvGh6_Eeel5txBxgvIkw" name="string"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvGx6_Eeel5txBxgvIkw" name="nonnegativeInteger"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvHB6_Eeel5txBxgvIkw" name="boolean"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvHR6_Eeel5txBxgvIkw" name="integer"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvHh6_Eeel5txBxgvIkw" name="rational">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvHx6_Eeel5txBxgvIkw" name="numerator" visibility="public" type="_P6TvHR6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvIB6_Eeel5txBxgvIkw" name="denominator" visibility="public" type="_P6TvGx6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvIR6_Eeel5txBxgvIkw" name="complex">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvIh6_Eeel5txBxgvIkw" name="re" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvIx6_Eeel5txBxgvIkw" name="im" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_P6TvJB6_Eeel5txBxgvIkw" name="IVOA Base Types V1.0 (2016)"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvJR6_Eeel5txBxgvIkw" name="Unit">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6TvJh6_Eeel5txBxgvIkw" general="_P6TvGh6_Eeel5txBxgvIkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6TvJx6_Eeel5txBxgvIkw" name="Quantity" isAbstract="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvKB6_Eeel5txBxgvIkw" name="unit" visibility="public" type="_P6TvJR6_Eeel5txBxgvIkw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6TvKR6_Eeel5txBxgvIkw"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6TvKh6_Eeel5txBxgvIkw" name="IntegerQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6TvKx6_Eeel5txBxgvIkw" general="_P6TvJx6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvLB6_Eeel5txBxgvIkw" name="value" visibility="public" type="_P6TvHR6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvLR6_Eeel5txBxgvIkw" name="RealQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6TvLh6_Eeel5txBxgvIkw" general="_P6TvJx6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvLx6_Eeel5txBxgvIkw" name="value" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_4F3V4BU3EeeZh9zsKpIhxg" name="coordsys">
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V4RU3EeeZh9zsKpIhxg" name="PixelCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V4hU3EeeZh9zsKpIhxg" name="SpatialCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V4xU3EeeZh9zsKpIhxg" name="SpectralCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V5BU3EeeZh9zsKpIhxg" name="TimeCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V5RU3EeeZh9zsKpIhxg" name="PolStokesCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V5hU3EeeZh9zsKpIhxg" name="PolCircularCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V5xU3EeeZh9zsKpIhxg" name="PolLinearCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V6BU3EeeZh9zsKpIhxg" name="PolVectorCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V6RU3EeeZh9zsKpIhxg" name="GenericCoord"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V6hU3EeeZh9zsKpIhxg" name="RedshiftCoord"/>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_4F3V6xU3EeeZh9zsKpIhxg" name="STC coordsys model V2.0 (2016)"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V7BU3EeeZh9zsKpIhxg" name="AbsoluteCoordinate"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_4F3V7RU3EeeZh9zsKpIhxg" name="SkyIndex">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V7hU3EeeZh9zsKpIhxg" name="loc" visibility="public" isUnique="false">
+    <packagedElement xmi:type="uml:Package" xmi:id="_P6TvMB6_Eeel5txBxgvIkw" name="coordsys">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvMR6_Eeel5txBxgvIkw" name="PixelCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvMh6_Eeel5txBxgvIkw" name="SpatialCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvMx6_Eeel5txBxgvIkw" name="SpectralCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvNB6_Eeel5txBxgvIkw" name="TimeCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvNR6_Eeel5txBxgvIkw" name="PolStokesCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvNh6_Eeel5txBxgvIkw" name="PolCircularCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvNx6_Eeel5txBxgvIkw" name="PolLinearCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvOB6_Eeel5txBxgvIkw" name="PolVectorCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvOR6_Eeel5txBxgvIkw" name="GenericCoord"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvOh6_Eeel5txBxgvIkw" name="RedshiftCoord"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_P6TvOx6_Eeel5txBxgvIkw" name="STC coordsys model V2.0 (2016)"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvPB6_Eeel5txBxgvIkw" name="AbsoluteCoordinate"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P6TvPR6_Eeel5txBxgvIkw" name="SkyIndex">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvPh6_Eeel5txBxgvIkw" name="loc" visibility="public" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#Integer"/>
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_4F3V7xU3EeeZh9zsKpIhxg" name="domain">
-      <packagedElement xmi:type="uml:Package" xmi:id="_4F3V8BU3EeeZh9zsKpIhxg" name="generic">
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3V8RU3EeeZh9zsKpIhxg" name="Measurement">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3V8hU3EeeZh9zsKpIhxg" general="_4F3WmBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V8xU3EeeZh9zsKpIhxg" name="error" visibility="public" type="_4F3V-hU3EeeZh9zsKpIhxg" aggregation="composite" association="_4F3V9xU3EeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3V9BU3EeeZh9zsKpIhxg" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3V9RU3EeeZh9zsKpIhxg"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_P6TvPx6_Eeel5txBxgvIkw" name="domain">
+      <packagedElement xmi:type="uml:Package" xmi:id="_P6TvQB6_Eeel5txBxgvIkw" name="generic">
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvQR6_Eeel5txBxgvIkw" name="Measurement">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvQh6_Eeel5txBxgvIkw" general="_P6UWZB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvQx6_Eeel5txBxgvIkw" name="error" visibility="public" type="_P6TvSh6_Eeel5txBxgvIkw" aggregation="composite" association="_P6TvRx6_Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6TvRB6_Eeel5txBxgvIkw" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6TvRR6_Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V9hU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V6RU3EeeZh9zsKpIhxg" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvRh6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvOR6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_4F3V9xU3EeeZh9zsKpIhxg" memberEnd="_4F3V8xU3EeeZh9zsKpIhxg _4F3V-BU3EeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_4F3V-BU3EeeZh9zsKpIhxg" visibility="public" type="_4F3V8RU3EeeZh9zsKpIhxg" association="_4F3V9xU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_P6TvRx6_Eeel5txBxgvIkw" memberEnd="_P6TvQx6_Eeel5txBxgvIkw _P6TvSB6_Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_P6TvSB6_Eeel5txBxgvIkw" visibility="public" type="_P6TvQR6_Eeel5txBxgvIkw" association="_P6TvRx6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_4F3V-RU3EeeZh9zsKpIhxg" name="Generic Domain Package"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3V-hU3EeeZh9zsKpIhxg" name="Error" isAbstract="true"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3V-xU3EeeZh9zsKpIhxg" name="StatisticalError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3V_BU3EeeZh9zsKpIhxg" general="_4F3V-hU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3V_RU3EeeZh9zsKpIhxg" name="statError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3V_hU3EeeZh9zsKpIhxg" name="SystematicError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3V_xU3EeeZh9zsKpIhxg" general="_4F3V-hU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WABU3EeeZh9zsKpIhxg" name="sysError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WARU3EeeZh9zsKpIhxg" name="RandomError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WAhU3EeeZh9zsKpIhxg" general="_4F3V-hU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WAxU3EeeZh9zsKpIhxg" name="randError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WBBU3EeeZh9zsKpIhxg" name="Resolution">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WBRU3EeeZh9zsKpIhxg" general="_4F3V-hU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WBhU3EeeZh9zsKpIhxg" name="res" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_4F3WBxU3EeeZh9zsKpIhxg" name="spatial">
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WCBU3EeeZh9zsKpIhxg" name="Position" isAbstract="true">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WCRU3EeeZh9zsKpIhxg" general="_4F3WmBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WChU3EeeZh9zsKpIhxg" name="tile" visibility="public" type="_4F3WUhU3EeeZh9zsKpIhxg" aggregation="composite" association="_4F3WDBU3EeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WCxU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_P6TvSR6_Eeel5txBxgvIkw" name="Generic Domain Package"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvSh6_Eeel5txBxgvIkw" name="Error" isAbstract="true"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvSx6_Eeel5txBxgvIkw" name="StatisticalError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvTB6_Eeel5txBxgvIkw" general="_P6TvSh6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvTR6_Eeel5txBxgvIkw" name="statError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvTh6_Eeel5txBxgvIkw" name="SystematicError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvTx6_Eeel5txBxgvIkw" general="_P6TvSh6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvUB6_Eeel5txBxgvIkw" name="sysError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvUR6_Eeel5txBxgvIkw" name="RandomError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvUh6_Eeel5txBxgvIkw" general="_P6TvSh6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvUx6_Eeel5txBxgvIkw" name="randError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvVB6_Eeel5txBxgvIkw" name="Resolution">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvVR6_Eeel5txBxgvIkw" general="_P6TvSh6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvVh6_Eeel5txBxgvIkw" name="res" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_P6TvVx6_Eeel5txBxgvIkw" name="spatial">
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvWB6_Eeel5txBxgvIkw" name="Position" isAbstract="true">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvWR6_Eeel5txBxgvIkw" general="_P6UWZB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvWh6_Eeel5txBxgvIkw" name="tile" visibility="public" type="_P6Tvoh6_Eeel5txBxgvIkw" aggregation="composite" association="_P6TvXB6_Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6TvWx6_Eeel5txBxgvIkw"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_4F3WDBU3EeeZh9zsKpIhxg" memberEnd="_4F3WChU3EeeZh9zsKpIhxg _4F3WDRU3EeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_4F3WDRU3EeeZh9zsKpIhxg" visibility="public" type="_4F3WCBU3EeeZh9zsKpIhxg" association="_4F3WDBU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_P6TvXB6_Eeel5txBxgvIkw" memberEnd="_P6TvWh6_Eeel5txBxgvIkw _P6TvXR6_Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_P6TvXR6_Eeel5txBxgvIkw" visibility="public" type="_P6TvWB6_Eeel5txBxgvIkw" association="_P6TvXB6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WDhU3EeeZh9zsKpIhxg" name="Position1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WDxU3EeeZh9zsKpIhxg" general="_4F3WCBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WEBU3EeeZh9zsKpIhxg" name="error" visibility="public" type="_4F3WKxU3EeeZh9zsKpIhxg" aggregation="composite" association="_4F3WFBU3EeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WERU3EeeZh9zsKpIhxg" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WEhU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvXh6_Eeel5txBxgvIkw" name="Position1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvXx6_Eeel5txBxgvIkw" general="_P6TvWB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvYB6_Eeel5txBxgvIkw" name="error" visibility="public" type="_P6Tvex6_Eeel5txBxgvIkw" aggregation="composite" association="_P6TvZB6_Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6TvYR6_Eeel5txBxgvIkw" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6TvYh6_Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WExU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V4hU3EeeZh9zsKpIhxg" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvYx6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvMh6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_4F3WFBU3EeeZh9zsKpIhxg" memberEnd="_4F3WEBU3EeeZh9zsKpIhxg _4F3WFRU3EeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_4F3WFRU3EeeZh9zsKpIhxg" visibility="public" type="_4F3WDhU3EeeZh9zsKpIhxg" association="_4F3WFBU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_P6TvZB6_Eeel5txBxgvIkw" memberEnd="_P6TvYB6_Eeel5txBxgvIkw _P6TvZR6_Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_P6TvZR6_Eeel5txBxgvIkw" visibility="public" type="_P6TvXh6_Eeel5txBxgvIkw" association="_P6TvZB6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WFhU3EeeZh9zsKpIhxg" name="Position2D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WFxU3EeeZh9zsKpIhxg" general="_4F3WCBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WGBU3EeeZh9zsKpIhxg" name="error" visibility="public" type="_4F3WOBU3EeeZh9zsKpIhxg" aggregation="composite" association="_4F3WHhU3EeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WGRU3EeeZh9zsKpIhxg" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WGhU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvZh6_Eeel5txBxgvIkw" name="Position2D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvZx6_Eeel5txBxgvIkw" general="_P6TvWB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvaB6_Eeel5txBxgvIkw" name="error" visibility="public" type="_P6TviB6_Eeel5txBxgvIkw" aggregation="composite" association="_P6Tvbh6_Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6TvaR6_Eeel5txBxgvIkw" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6Tvah6_Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WGxU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V4hU3EeeZh9zsKpIhxg" isUnique="false">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WHBU3EeeZh9zsKpIhxg" value="2"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WHRU3EeeZh9zsKpIhxg" value="2"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvax6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvMh6_Eeel5txBxgvIkw" isUnique="false">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6TvbB6_Eeel5txBxgvIkw" value="2"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6TvbR6_Eeel5txBxgvIkw" value="2"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_4F3WHhU3EeeZh9zsKpIhxg" memberEnd="_4F3WGBU3EeeZh9zsKpIhxg _4F3WHxU3EeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_4F3WHxU3EeeZh9zsKpIhxg" visibility="public" type="_4F3WFhU3EeeZh9zsKpIhxg" association="_4F3WHhU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_P6Tvbh6_Eeel5txBxgvIkw" memberEnd="_P6TvaB6_Eeel5txBxgvIkw _P6Tvbx6_Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_P6Tvbx6_Eeel5txBxgvIkw" visibility="public" type="_P6TvZh6_Eeel5txBxgvIkw" association="_P6Tvbh6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WIBU3EeeZh9zsKpIhxg" name="Position3D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WIRU3EeeZh9zsKpIhxg" general="_4F3WCBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WIhU3EeeZh9zsKpIhxg" name="error" visibility="public" type="_4F3WRRU3EeeZh9zsKpIhxg" aggregation="composite" association="_4F3WKBU3EeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WIxU3EeeZh9zsKpIhxg" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WJBU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvcB6_Eeel5txBxgvIkw" name="Position3D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvcR6_Eeel5txBxgvIkw" general="_P6TvWB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvch6_Eeel5txBxgvIkw" name="error" visibility="public" type="_P6TvlR6_Eeel5txBxgvIkw" aggregation="composite" association="_P6TveB6_Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6Tvcx6_Eeel5txBxgvIkw" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6TvdB6_Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WJRU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V4hU3EeeZh9zsKpIhxg" isUnique="false">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WJhU3EeeZh9zsKpIhxg" value="3"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WJxU3EeeZh9zsKpIhxg" value="3"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvdR6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvMh6_Eeel5txBxgvIkw" isUnique="false">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6Tvdh6_Eeel5txBxgvIkw" value="3"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6Tvdx6_Eeel5txBxgvIkw" value="3"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_4F3WKBU3EeeZh9zsKpIhxg" memberEnd="_4F3WIhU3EeeZh9zsKpIhxg _4F3WKRU3EeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_4F3WKRU3EeeZh9zsKpIhxg" visibility="public" type="_4F3WIBU3EeeZh9zsKpIhxg" association="_4F3WKBU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_P6TveB6_Eeel5txBxgvIkw" memberEnd="_P6Tvch6_Eeel5txBxgvIkw _P6TveR6_Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_P6TveR6_Eeel5txBxgvIkw" visibility="public" type="_P6TvcB6_Eeel5txBxgvIkw" association="_P6TveB6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_4F3WKhU3EeeZh9zsKpIhxg" name="Spatial Domain Package"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WKxU3EeeZh9zsKpIhxg" name="Error1D" isAbstract="true"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WLBU3EeeZh9zsKpIhxg" name="StatisticalError1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WLRU3EeeZh9zsKpIhxg" general="_4F3WKxU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WLhU3EeeZh9zsKpIhxg" name="statError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WLxU3EeeZh9zsKpIhxg" name="SystematicError1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WMBU3EeeZh9zsKpIhxg" general="_4F3WKxU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WMRU3EeeZh9zsKpIhxg" name="sysError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WMhU3EeeZh9zsKpIhxg" name="RandomError1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WMxU3EeeZh9zsKpIhxg" general="_4F3WKxU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WNBU3EeeZh9zsKpIhxg" name="randError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WNRU3EeeZh9zsKpIhxg" name="Resolution1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WNhU3EeeZh9zsKpIhxg" general="_4F3WKxU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WNxU3EeeZh9zsKpIhxg" name="res" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WOBU3EeeZh9zsKpIhxg" name="Error2D" isAbstract="true"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WORU3EeeZh9zsKpIhxg" name="StatisticalError2D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WOhU3EeeZh9zsKpIhxg" general="_4F3WOBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WOxU3EeeZh9zsKpIhxg" name="statError" visibility="public" type="_4F3WnRU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WPBU3EeeZh9zsKpIhxg" name="SystematicError2D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WPRU3EeeZh9zsKpIhxg" general="_4F3WOBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WPhU3EeeZh9zsKpIhxg" name="sysError" visibility="public" type="_4F3WnRU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WPxU3EeeZh9zsKpIhxg" name="RandomError2D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WQBU3EeeZh9zsKpIhxg" general="_4F3WOBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WQRU3EeeZh9zsKpIhxg" name="randError" visibility="public" type="_4F3WnRU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WQhU3EeeZh9zsKpIhxg" name="Resolution2D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WQxU3EeeZh9zsKpIhxg" general="_4F3WOBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WRBU3EeeZh9zsKpIhxg" name="res" visibility="public" type="_4F3WnRU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WRRU3EeeZh9zsKpIhxg" name="Error3D" isAbstract="true"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WRhU3EeeZh9zsKpIhxg" name="StatisticalError3D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WRxU3EeeZh9zsKpIhxg" general="_4F3WRRU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WSBU3EeeZh9zsKpIhxg" name="statError" visibility="public" type="_4F3WnxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WSRU3EeeZh9zsKpIhxg" name="SystematicError3D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WShU3EeeZh9zsKpIhxg" general="_4F3WRRU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WSxU3EeeZh9zsKpIhxg" name="sysError" visibility="public" type="_4F3WnxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WTBU3EeeZh9zsKpIhxg" name="RandomError3D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WTRU3EeeZh9zsKpIhxg" general="_4F3WRRU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WThU3EeeZh9zsKpIhxg" name="randError" visibility="public" type="_4F3WnxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WTxU3EeeZh9zsKpIhxg" name="Resolution3D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WUBU3EeeZh9zsKpIhxg" general="_4F3WRRU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WURU3EeeZh9zsKpIhxg" name="res" visibility="public" type="_4F3WnxU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WUhU3EeeZh9zsKpIhxg" name="Tile">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WUxU3EeeZh9zsKpIhxg" name="skyindex" visibility="public" type="_4F3V7RU3EeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_4F3WVBU3EeeZh9zsKpIhxg" name="spectral">
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WVRU3EeeZh9zsKpIhxg" name="DerivedSpectralCoordinate" isAbstract="true">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WVhU3EeeZh9zsKpIhxg" general="_4F3WmBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WVxU3EeeZh9zsKpIhxg" name="error" visibility="public" type="_4F3WZBU3EeeZh9zsKpIhxg" aggregation="composite" association="_4F3WWxU3EeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WWBU3EeeZh9zsKpIhxg" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WWRU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_P6Tveh6_Eeel5txBxgvIkw" name="Spatial Domain Package"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6Tvex6_Eeel5txBxgvIkw" name="Error1D" isAbstract="true"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvfB6_Eeel5txBxgvIkw" name="StatisticalError1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvfR6_Eeel5txBxgvIkw" general="_P6Tvex6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvfh6_Eeel5txBxgvIkw" name="statError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6Tvfx6_Eeel5txBxgvIkw" name="SystematicError1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvgB6_Eeel5txBxgvIkw" general="_P6Tvex6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvgR6_Eeel5txBxgvIkw" name="sysError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6Tvgh6_Eeel5txBxgvIkw" name="RandomError1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6Tvgx6_Eeel5txBxgvIkw" general="_P6Tvex6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvhB6_Eeel5txBxgvIkw" name="randError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvhR6_Eeel5txBxgvIkw" name="Resolution1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6Tvhh6_Eeel5txBxgvIkw" general="_P6Tvex6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvhx6_Eeel5txBxgvIkw" name="res" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TviB6_Eeel5txBxgvIkw" name="Error2D" isAbstract="true"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TviR6_Eeel5txBxgvIkw" name="StatisticalError2D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6Tvih6_Eeel5txBxgvIkw" general="_P6TviB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvix6_Eeel5txBxgvIkw" name="statError" visibility="public" type="_P6UWaR6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvjB6_Eeel5txBxgvIkw" name="SystematicError2D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvjR6_Eeel5txBxgvIkw" general="_P6TviB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvjh6_Eeel5txBxgvIkw" name="sysError" visibility="public" type="_P6UWaR6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6Tvjx6_Eeel5txBxgvIkw" name="RandomError2D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvkB6_Eeel5txBxgvIkw" general="_P6TviB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvkR6_Eeel5txBxgvIkw" name="randError" visibility="public" type="_P6UWaR6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6Tvkh6_Eeel5txBxgvIkw" name="Resolution2D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6Tvkx6_Eeel5txBxgvIkw" general="_P6TviB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvlB6_Eeel5txBxgvIkw" name="res" visibility="public" type="_P6UWaR6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvlR6_Eeel5txBxgvIkw" name="Error3D" isAbstract="true"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6Tvlh6_Eeel5txBxgvIkw" name="StatisticalError3D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6Tvlx6_Eeel5txBxgvIkw" general="_P6TvlR6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvmB6_Eeel5txBxgvIkw" name="statError" visibility="public" type="_P6UWax6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvmR6_Eeel5txBxgvIkw" name="SystematicError3D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6Tvmh6_Eeel5txBxgvIkw" general="_P6TvlR6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvmx6_Eeel5txBxgvIkw" name="sysError" visibility="public" type="_P6UWax6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6TvnB6_Eeel5txBxgvIkw" name="RandomError3D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvnR6_Eeel5txBxgvIkw" general="_P6TvlR6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvnh6_Eeel5txBxgvIkw" name="randError" visibility="public" type="_P6UWax6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6Tvnx6_Eeel5txBxgvIkw" name="Resolution3D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6TvoB6_Eeel5txBxgvIkw" general="_P6TvlR6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6TvoR6_Eeel5txBxgvIkw" name="res" visibility="public" type="_P6UWax6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6Tvoh6_Eeel5txBxgvIkw" name="Tile">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6Tvox6_Eeel5txBxgvIkw" name="skyindex" visibility="public" type="_P6TvPR6_Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_P6UWIB6_Eeel5txBxgvIkw" name="spectral">
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWIR6_Eeel5txBxgvIkw" name="DerivedSpectralCoordinate" isAbstract="true">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWIh6_Eeel5txBxgvIkw" general="_P6UWZB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWIx6_Eeel5txBxgvIkw" name="error" visibility="public" type="_P6UWMB6_Eeel5txBxgvIkw" aggregation="composite" association="_P6UWJx6_Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWJB6_Eeel5txBxgvIkw" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWJR6_Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WWhU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V4xU3EeeZh9zsKpIhxg" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWJh6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvMx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_4F3WWxU3EeeZh9zsKpIhxg" memberEnd="_4F3WVxU3EeeZh9zsKpIhxg _4F3WXBU3EeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_4F3WXBU3EeeZh9zsKpIhxg" visibility="public" type="_4F3WVRU3EeeZh9zsKpIhxg" association="_4F3WWxU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_P6UWJx6_Eeel5txBxgvIkw" memberEnd="_P6UWIx6_Eeel5txBxgvIkw _P6UWKB6_Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_P6UWKB6_Eeel5txBxgvIkw" visibility="public" type="_P6UWIR6_Eeel5txBxgvIkw" association="_P6UWJx6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WXRU3EeeZh9zsKpIhxg" name="Energy">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WXhU3EeeZh9zsKpIhxg" general="_4F3WVRU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWKR6_Eeel5txBxgvIkw" name="Energy">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWKh6_Eeel5txBxgvIkw" general="_P6UWIR6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WXxU3EeeZh9zsKpIhxg" name="Frequency">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WYBU3EeeZh9zsKpIhxg" general="_4F3WVRU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWKx6_Eeel5txBxgvIkw" name="Frequency">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWLB6_Eeel5txBxgvIkw" general="_P6UWIR6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WYRU3EeeZh9zsKpIhxg" name="Wavelength">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WYhU3EeeZh9zsKpIhxg" general="_4F3WVRU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWLR6_Eeel5txBxgvIkw" name="Wavelength">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWLh6_Eeel5txBxgvIkw" general="_P6UWIR6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_4F3WYxU3EeeZh9zsKpIhxg" name="Spectral Domain Package"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WZBU3EeeZh9zsKpIhxg" name="Error" isAbstract="true"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WZRU3EeeZh9zsKpIhxg" name="StatisticalError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WZhU3EeeZh9zsKpIhxg" general="_4F3WZBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WZxU3EeeZh9zsKpIhxg" name="statError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_P6UWLx6_Eeel5txBxgvIkw" name="Spectral Domain Package"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWMB6_Eeel5txBxgvIkw" name="Error" isAbstract="true"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWMR6_Eeel5txBxgvIkw" name="StatisticalError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWMh6_Eeel5txBxgvIkw" general="_P6UWMB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWMx6_Eeel5txBxgvIkw" name="statError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WaBU3EeeZh9zsKpIhxg" name="SystematicError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WaRU3EeeZh9zsKpIhxg" general="_4F3WZBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WahU3EeeZh9zsKpIhxg" name="sysError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWNB6_Eeel5txBxgvIkw" name="SystematicError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWNR6_Eeel5txBxgvIkw" general="_P6UWMB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWNh6_Eeel5txBxgvIkw" name="sysError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WaxU3EeeZh9zsKpIhxg" name="RandomError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WbBU3EeeZh9zsKpIhxg" general="_4F3WZBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WbRU3EeeZh9zsKpIhxg" name="randError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWNx6_Eeel5txBxgvIkw" name="RandomError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWOB6_Eeel5txBxgvIkw" general="_P6UWMB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWOR6_Eeel5txBxgvIkw" name="randError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WbhU3EeeZh9zsKpIhxg" name="Resolution">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WbxU3EeeZh9zsKpIhxg" general="_4F3WZBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WcBU3EeeZh9zsKpIhxg" name="res" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWOh6_Eeel5txBxgvIkw" name="Resolution">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWOx6_Eeel5txBxgvIkw" general="_P6UWMB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWPB6_Eeel5txBxgvIkw" name="res" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_4F3WcRU3EeeZh9zsKpIhxg" name="temporal">
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WchU3EeeZh9zsKpIhxg" name="Time">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WcxU3EeeZh9zsKpIhxg" general="_4F3WmBU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WdBU3EeeZh9zsKpIhxg" name="error" visibility="public" type="_4F3WexU3EeeZh9zsKpIhxg" aggregation="composite" association="_4F3WeBU3EeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WdRU3EeeZh9zsKpIhxg" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WdhU3EeeZh9zsKpIhxg"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="_P6UWPR6_Eeel5txBxgvIkw" name="temporal">
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWPh6_Eeel5txBxgvIkw" name="Time">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWPx6_Eeel5txBxgvIkw" general="_P6UWZB6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWQB6_Eeel5txBxgvIkw" name="error" visibility="public" type="_P6UWRx6_Eeel5txBxgvIkw" aggregation="composite" association="_P6UWRB6_Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWQR6_Eeel5txBxgvIkw" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWQh6_Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WdxU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V5BU3EeeZh9zsKpIhxg" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWQx6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvNB6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_4F3WeBU3EeeZh9zsKpIhxg" memberEnd="_4F3WdBU3EeeZh9zsKpIhxg _4F3WeRU3EeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_4F3WeRU3EeeZh9zsKpIhxg" visibility="public" type="_4F3WchU3EeeZh9zsKpIhxg" association="_4F3WeBU3EeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_P6UWRB6_Eeel5txBxgvIkw" memberEnd="_P6UWQB6_Eeel5txBxgvIkw _P6UWRR6_Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_P6UWRR6_Eeel5txBxgvIkw" visibility="public" type="_P6UWPh6_Eeel5txBxgvIkw" association="_P6UWRB6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_4F3WehU3EeeZh9zsKpIhxg" name="Temporal Domain Package"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WexU3EeeZh9zsKpIhxg" name="Error" isAbstract="true"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WfBU3EeeZh9zsKpIhxg" name="StatisticalError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WfRU3EeeZh9zsKpIhxg" general="_4F3WexU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WfhU3EeeZh9zsKpIhxg" name="statError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_P6UWRh6_Eeel5txBxgvIkw" name="Temporal Domain Package"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWRx6_Eeel5txBxgvIkw" name="Error" isAbstract="true"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWSB6_Eeel5txBxgvIkw" name="StatisticalError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWSR6_Eeel5txBxgvIkw" general="_P6UWRx6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWSh6_Eeel5txBxgvIkw" name="statError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WfxU3EeeZh9zsKpIhxg" name="SystematicError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WgBU3EeeZh9zsKpIhxg" general="_4F3WexU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WgRU3EeeZh9zsKpIhxg" name="sysError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWSx6_Eeel5txBxgvIkw" name="SystematicError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWTB6_Eeel5txBxgvIkw" general="_P6UWRx6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWTR6_Eeel5txBxgvIkw" name="sysError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WghU3EeeZh9zsKpIhxg" name="RandomError">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WgxU3EeeZh9zsKpIhxg" general="_4F3WexU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WhBU3EeeZh9zsKpIhxg" name="randError" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWTh6_Eeel5txBxgvIkw" name="RandomError">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWTx6_Eeel5txBxgvIkw" general="_P6UWRx6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWUB6_Eeel5txBxgvIkw" name="randError" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WhRU3EeeZh9zsKpIhxg" name="Resolution">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WhhU3EeeZh9zsKpIhxg" general="_4F3WexU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WhxU3EeeZh9zsKpIhxg" name="res" visibility="public" type="_4F3WmxU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWUR6_Eeel5txBxgvIkw" name="Resolution">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWUh6_Eeel5txBxgvIkw" general="_P6UWRx6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWUx6_Eeel5txBxgvIkw" name="res" visibility="public" type="_P6UWZx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_4F3WiBU3EeeZh9zsKpIhxg" name="polarization">
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WiRU3EeeZh9zsKpIhxg" name="DerivedPolarizationCoordinate" isAbstract="true">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WihU3EeeZh9zsKpIhxg" general="_4F3WmBU3EeeZh9zsKpIhxg"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="_P6UWVB6_Eeel5txBxgvIkw" name="polarization">
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWVR6_Eeel5txBxgvIkw" name="DerivedPolarizationCoordinate" isAbstract="true">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWVh6_Eeel5txBxgvIkw" general="_P6UWZB6_Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WixU3EeeZh9zsKpIhxg" name="Stokes">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WjBU3EeeZh9zsKpIhxg" general="_4F3WiRU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WjRU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V5RU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWVx6_Eeel5txBxgvIkw" name="Stokes">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWWB6_Eeel5txBxgvIkw" general="_P6UWVR6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWWR6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvNR6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WjhU3EeeZh9zsKpIhxg" name="Circular">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WjxU3EeeZh9zsKpIhxg" general="_4F3WiRU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WkBU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V5hU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWWh6_Eeel5txBxgvIkw" name="Circular">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWWx6_Eeel5txBxgvIkw" general="_P6UWVR6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWXB6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvNh6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WkRU3EeeZh9zsKpIhxg" name="Linear">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WkhU3EeeZh9zsKpIhxg" general="_4F3WiRU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WkxU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V5xU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWXR6_Eeel5txBxgvIkw" name="Linear">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWXh6_Eeel5txBxgvIkw" general="_P6UWVR6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWXx6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvNx6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_4F3WlBU3EeeZh9zsKpIhxg" name="Vector">
-          <generalization xmi:type="uml:Generalization" xmi:id="_4F3WlRU3EeeZh9zsKpIhxg" general="_4F3WiRU3EeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WlhU3EeeZh9zsKpIhxg" name="coord" visibility="public" type="_4F3V6BU3EeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_P6UWYB6_Eeel5txBxgvIkw" name="Vector">
+          <generalization xmi:type="uml:Generalization" xmi:id="_P6UWYR6_Eeel5txBxgvIkw" general="_P6UWVR6_Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWYh6_Eeel5txBxgvIkw" name="coord" visibility="public" type="_P6TvOB6_Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_4F3WlxU3EeeZh9zsKpIhxg" name="Polarization Domain Package"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_P6UWYx6_Eeel5txBxgvIkw" name="Polarization Domain Package"/>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_4F3WmBU3EeeZh9zsKpIhxg" name="DerivedCoordinate" isAbstract="true"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_4F3WmRU3EeeZh9zsKpIhxg" name="dtypes">
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WmhU3EeeZh9zsKpIhxg" name="Uncertainty" isAbstract="true"/>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WmxU3EeeZh9zsKpIhxg" name="Uncertainty1D" isAbstract="true">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WnBU3EeeZh9zsKpIhxg" general="_4F3WmhU3EeeZh9zsKpIhxg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WnRU3EeeZh9zsKpIhxg" name="Uncertainty2D" isAbstract="true">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WnhU3EeeZh9zsKpIhxg" general="_4F3WmhU3EeeZh9zsKpIhxg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WnxU3EeeZh9zsKpIhxg" name="Uncertainty3D" isAbstract="true">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WoBU3EeeZh9zsKpIhxg" general="_4F3WmhU3EeeZh9zsKpIhxg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WoRU3EeeZh9zsKpIhxg" name="Symmetrical1D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WohU3EeeZh9zsKpIhxg" general="_4F3WmxU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WoxU3EeeZh9zsKpIhxg" name="radius" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WpBU3EeeZh9zsKpIhxg" name="Asymmetrical1D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WpRU3EeeZh9zsKpIhxg" general="_4F3WmxU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WphU3EeeZh9zsKpIhxg" name="plus" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WpxU3EeeZh9zsKpIhxg" name="minus" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WqBU3EeeZh9zsKpIhxg" name="Bounds1D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WqRU3EeeZh9zsKpIhxg" general="_4F3WmxU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WqhU3EeeZh9zsKpIhxg" name="loLimit" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WqxU3EeeZh9zsKpIhxg" name="hiLimit" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WrBU3EeeZh9zsKpIhxg" name="Symmetrical2D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WrRU3EeeZh9zsKpIhxg" general="_4F3WnRU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WrhU3EeeZh9zsKpIhxg" name="radius" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WrxU3EeeZh9zsKpIhxg" name="Asymmetrical2D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WsBU3EeeZh9zsKpIhxg" general="_4F3WnRU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WsRU3EeeZh9zsKpIhxg" name="plus" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WshU3EeeZh9zsKpIhxg" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WsxU3EeeZh9zsKpIhxg" value="2"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WtBU3EeeZh9zsKpIhxg" name="minus" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WtRU3EeeZh9zsKpIhxg" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WthU3EeeZh9zsKpIhxg" value="2"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WtxU3EeeZh9zsKpIhxg" name="Bounds2D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WuBU3EeeZh9zsKpIhxg" general="_4F3WnRU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WuRU3EeeZh9zsKpIhxg" name="loLimit" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WuhU3EeeZh9zsKpIhxg" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WuxU3EeeZh9zsKpIhxg" value="2"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WvBU3EeeZh9zsKpIhxg" name="hiLimit" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WvRU3EeeZh9zsKpIhxg" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WvhU3EeeZh9zsKpIhxg" value="2"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WvxU3EeeZh9zsKpIhxg" name="Symmetrical3D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WwBU3EeeZh9zsKpIhxg" general="_4F3WnxU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WwRU3EeeZh9zsKpIhxg" name="radius" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WwhU3EeeZh9zsKpIhxg" name="Asymmetrical3D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WwxU3EeeZh9zsKpIhxg" general="_4F3WnxU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WxBU3EeeZh9zsKpIhxg" name="plus" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WxRU3EeeZh9zsKpIhxg" value="3"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WxhU3EeeZh9zsKpIhxg" value="3"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WxxU3EeeZh9zsKpIhxg" name="minus" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WyBU3EeeZh9zsKpIhxg" value="3"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WyRU3EeeZh9zsKpIhxg" value="3"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3WyhU3EeeZh9zsKpIhxg" name="Bounds3D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3WyxU3EeeZh9zsKpIhxg" general="_4F3WnxU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WzBU3EeeZh9zsKpIhxg" name="loLimit" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3WzRU3EeeZh9zsKpIhxg" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3WzhU3EeeZh9zsKpIhxg" value="2"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3WzxU3EeeZh9zsKpIhxg" name="hiLimit" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3W0BU3EeeZh9zsKpIhxg" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3W0RU3EeeZh9zsKpIhxg" value="2"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3W0hU3EeeZh9zsKpIhxg" name="Ellipse">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3W0xU3EeeZh9zsKpIhxg" general="_4F3WnRU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W1BU3EeeZh9zsKpIhxg" name="semiAxis" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3W1RU3EeeZh9zsKpIhxg" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3W1hU3EeeZh9zsKpIhxg" value="2"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W1xU3EeeZh9zsKpIhxg" name="posAngle" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3W2BU3EeeZh9zsKpIhxg" name="Ellipsoid">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3W2RU3EeeZh9zsKpIhxg" general="_4F3WnxU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W2hU3EeeZh9zsKpIhxg" name="semiAxis" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3W2xU3EeeZh9zsKpIhxg" value="3"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3W3BU3EeeZh9zsKpIhxg" value="3"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W3RU3EeeZh9zsKpIhxg" name="posAngle" visibility="public" type="_4F3V3RU3EeeZh9zsKpIhxg" isUnique="false">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4F3W3hU3EeeZh9zsKpIhxg" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4F3W3xU3EeeZh9zsKpIhxg" value="2"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3W4BU3EeeZh9zsKpIhxg" name="Matrix" isAbstract="true"/>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3W4RU3EeeZh9zsKpIhxg" name="Matrix2x2">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3W4hU3EeeZh9zsKpIhxg" general="_4F3W4BU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W4xU3EeeZh9zsKpIhxg" name="m11" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W5BU3EeeZh9zsKpIhxg" name="m12" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W5RU3EeeZh9zsKpIhxg" name="m21" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W5hU3EeeZh9zsKpIhxg" name="m22" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3W5xU3EeeZh9zsKpIhxg" name="Matrix3x3">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3W6BU3EeeZh9zsKpIhxg" general="_4F3W4BU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W6RU3EeeZh9zsKpIhxg" name="m11" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W6hU3EeeZh9zsKpIhxg" name="m12" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W6xU3EeeZh9zsKpIhxg" name="m13" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W7BU3EeeZh9zsKpIhxg" name="m21" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W7RU3EeeZh9zsKpIhxg" name="m22" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W7hU3EeeZh9zsKpIhxg" name="m23" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W7xU3EeeZh9zsKpIhxg" name="m31" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W8BU3EeeZh9zsKpIhxg" name="m32" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W8RU3EeeZh9zsKpIhxg" name="m33" visibility="public" type="_4F3VxhU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3W8hU3EeeZh9zsKpIhxg" name="CovarianceMatrix2D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3W8xU3EeeZh9zsKpIhxg" general="_4F3WnRU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W9BU3EeeZh9zsKpIhxg" name="matrix" visibility="public" type="_4F3W4RU3EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_4F3W9RU3EeeZh9zsKpIhxg" name="CovarianceMatrix3D">
-        <generalization xmi:type="uml:Generalization" xmi:id="_4F3W9hU3EeeZh9zsKpIhxg" general="_4F3WnxU3EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4F3W9xU3EeeZh9zsKpIhxg" name="matrix" visibility="public" type="_4F3W5xU3EeeZh9zsKpIhxg" isUnique="false"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_P6UWZB6_Eeel5txBxgvIkw" name="DerivedCoordinate" isAbstract="true"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_P6UWZR6_Eeel5txBxgvIkw" name="dtypes">
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWZh6_Eeel5txBxgvIkw" name="Uncertainty" isAbstract="true"/>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWZx6_Eeel5txBxgvIkw" name="Uncertainty1D" isAbstract="true">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWaB6_Eeel5txBxgvIkw" general="_P6UWZh6_Eeel5txBxgvIkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWaR6_Eeel5txBxgvIkw" name="Uncertainty2D" isAbstract="true">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWah6_Eeel5txBxgvIkw" general="_P6UWZh6_Eeel5txBxgvIkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWax6_Eeel5txBxgvIkw" name="Uncertainty3D" isAbstract="true">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWbB6_Eeel5txBxgvIkw" general="_P6UWZh6_Eeel5txBxgvIkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWbR6_Eeel5txBxgvIkw" name="Symmetrical1D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWbh6_Eeel5txBxgvIkw" general="_P6UWZx6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWbx6_Eeel5txBxgvIkw" name="radius" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWcB6_Eeel5txBxgvIkw" name="Asymmetrical1D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWcR6_Eeel5txBxgvIkw" general="_P6UWZx6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWch6_Eeel5txBxgvIkw" name="plus" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWcx6_Eeel5txBxgvIkw" name="minus" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWdB6_Eeel5txBxgvIkw" name="Bounds1D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWdR6_Eeel5txBxgvIkw" general="_P6UWZx6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWdh6_Eeel5txBxgvIkw" name="loLimit" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWdx6_Eeel5txBxgvIkw" name="hiLimit" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWeB6_Eeel5txBxgvIkw" name="Symmetrical2D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWeR6_Eeel5txBxgvIkw" general="_P6UWaR6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWeh6_Eeel5txBxgvIkw" name="radius" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWex6_Eeel5txBxgvIkw" name="Asymmetrical2D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWfB6_Eeel5txBxgvIkw" general="_P6UWaR6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWfR6_Eeel5txBxgvIkw" name="plus" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWfh6_Eeel5txBxgvIkw" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWfx6_Eeel5txBxgvIkw" value="2"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWgB6_Eeel5txBxgvIkw" name="minus" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWgR6_Eeel5txBxgvIkw" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWgh6_Eeel5txBxgvIkw" value="2"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWgx6_Eeel5txBxgvIkw" name="Bounds2D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWhB6_Eeel5txBxgvIkw" general="_P6UWaR6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWhR6_Eeel5txBxgvIkw" name="loLimit" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWhh6_Eeel5txBxgvIkw" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWhx6_Eeel5txBxgvIkw" value="2"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWiB6_Eeel5txBxgvIkw" name="hiLimit" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWiR6_Eeel5txBxgvIkw" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWih6_Eeel5txBxgvIkw" value="2"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWix6_Eeel5txBxgvIkw" name="Symmetrical3D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWjB6_Eeel5txBxgvIkw" general="_P6UWax6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWjR6_Eeel5txBxgvIkw" name="radius" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWjh6_Eeel5txBxgvIkw" name="Asymmetrical3D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWjx6_Eeel5txBxgvIkw" general="_P6UWax6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWkB6_Eeel5txBxgvIkw" name="plus" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWkR6_Eeel5txBxgvIkw" value="3"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWkh6_Eeel5txBxgvIkw" value="3"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWkx6_Eeel5txBxgvIkw" name="minus" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWlB6_Eeel5txBxgvIkw" value="3"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWlR6_Eeel5txBxgvIkw" value="3"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWlh6_Eeel5txBxgvIkw" name="Bounds3D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWlx6_Eeel5txBxgvIkw" general="_P6UWax6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWmB6_Eeel5txBxgvIkw" name="loLimit" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWmR6_Eeel5txBxgvIkw" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWmh6_Eeel5txBxgvIkw" value="2"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWmx6_Eeel5txBxgvIkw" name="hiLimit" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWnB6_Eeel5txBxgvIkw" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWnR6_Eeel5txBxgvIkw" value="2"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWnh6_Eeel5txBxgvIkw" name="Ellipse">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWnx6_Eeel5txBxgvIkw" general="_P6UWaR6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWoB6_Eeel5txBxgvIkw" name="semiAxis" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWoR6_Eeel5txBxgvIkw" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWoh6_Eeel5txBxgvIkw" value="2"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWox6_Eeel5txBxgvIkw" name="posAngle" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWpB6_Eeel5txBxgvIkw" name="Ellipsoid">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWpR6_Eeel5txBxgvIkw" general="_P6UWax6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWph6_Eeel5txBxgvIkw" name="semiAxis" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWpx6_Eeel5txBxgvIkw" value="3"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWqB6_Eeel5txBxgvIkw" value="3"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWqR6_Eeel5txBxgvIkw" name="posAngle" visibility="public" type="_P6TvLR6_Eeel5txBxgvIkw" isUnique="false">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P6UWqh6_Eeel5txBxgvIkw" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P6UWqx6_Eeel5txBxgvIkw" value="2"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWrB6_Eeel5txBxgvIkw" name="Matrix" isAbstract="true"/>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWrR6_Eeel5txBxgvIkw" name="Matrix2x2">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWrh6_Eeel5txBxgvIkw" general="_P6UWrB6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWrx6_Eeel5txBxgvIkw" name="m11" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWsB6_Eeel5txBxgvIkw" name="m12" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWsR6_Eeel5txBxgvIkw" name="m21" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWsh6_Eeel5txBxgvIkw" name="m22" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWsx6_Eeel5txBxgvIkw" name="Matrix3x3">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWtB6_Eeel5txBxgvIkw" general="_P6UWrB6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWtR6_Eeel5txBxgvIkw" name="m11" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWth6_Eeel5txBxgvIkw" name="m12" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWtx6_Eeel5txBxgvIkw" name="m13" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWuB6_Eeel5txBxgvIkw" name="m21" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWuR6_Eeel5txBxgvIkw" name="m22" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWuh6_Eeel5txBxgvIkw" name="m23" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWux6_Eeel5txBxgvIkw" name="m31" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWvB6_Eeel5txBxgvIkw" name="m32" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWvR6_Eeel5txBxgvIkw" name="m33" visibility="public" type="_P6TvFh6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWvh6_Eeel5txBxgvIkw" name="CovarianceMatrix2D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWvx6_Eeel5txBxgvIkw" general="_P6UWaR6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWwB6_Eeel5txBxgvIkw" name="matrix" visibility="public" type="_P6UWrR6_Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_P6UWwR6_Eeel5txBxgvIkw" name="CovarianceMatrix3D">
+        <generalization xmi:type="uml:Generalization" xmi:id="_P6UWwh6_Eeel5txBxgvIkw" general="_P6UWax6_Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_P6UWwx6_Eeel5txBxgvIkw" name="matrix" visibility="public" type="_P6UWsx6_Eeel5txBxgvIkw" isUnique="false"/>
       </packagedElement>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_4F3VwBU3EeeZh9zsKpIhxg" xmi:id="_4GuRYBU3EeeZh9zsKpIhxg">
-      <eAnnotations xmi:id="_4GuRYRU3EeeZh9zsKpIhxg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_4F8ORxU3EeeZh9zsKpIhxg"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_P6TvEB6_Eeel5txBxgvIkw" xmi:id="_P6y3QB6_Eeel5txBxgvIkw">
+      <eAnnotations xmi:id="_P6y3QR6_Eeel5txBxgvIkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_P6WyZx6_Eeel5txBxgvIkw"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_4GuRYBU3EeeZh9zsKpIhxg" href="IVOA_UML_Profile.profile.xmi#_4F8OQBU3EeeZh9zsKpIhxg"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_P6y3QB6_Eeel5txBxgvIkw" href="IVOA_UML_Profile.profile.xmi#_P6WyYB6_Eeel5txBxgvIkw"/>
     </profileApplication>
   </uml:Model>
-  <IVOA_UML_Profile:model xmi:id="_4G0_EBU3EeeZh9zsKpIhxg" base_Package="_4F3VwBU3EeeZh9zsKpIhxg" title="STC2 Coordinates Model" version="2.0" authors="Arnold Rots, Mark Cresitello-Dittmar" previousVersion="0.x"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_4G20QBU3EeeZh9zsKpIhxg" base_Package="_4F3VxRU3EeeZh9zsKpIhxg" name="ivoa" version="1.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G3bUBU3EeeZh9zsKpIhxg" base_DataType="_4F3VxhU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3VxhU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G3bURU3EeeZh9zsKpIhxg" base_NamedElement="_4F3VxhU3EeeZh9zsKpIhxg" vodmlid="real"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G3bUhU3EeeZh9zsKpIhxg" base_DataType="_4F3VxxU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3VxxU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G4CYBU3EeeZh9zsKpIhxg" base_NamedElement="_4F3VxxU3EeeZh9zsKpIhxg" vodmlid="datetime"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G4CYRU3EeeZh9zsKpIhxg" base_DataType="_4F3VyBU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3VyBU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G4CYhU3EeeZh9zsKpIhxg" base_NamedElement="_4F3VyBU3EeeZh9zsKpIhxg" vodmlid="anyURI"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G4CYxU3EeeZh9zsKpIhxg" base_DataType="_4F3VyhU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3VyhU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G4pcBU3EeeZh9zsKpIhxg" base_NamedElement="_4F3VyhU3EeeZh9zsKpIhxg" vodmlid="string"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G4pcRU3EeeZh9zsKpIhxg" base_DataType="_4F3VyxU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3VyxU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G4pchU3EeeZh9zsKpIhxg" base_NamedElement="_4F3VyxU3EeeZh9zsKpIhxg" vodmlid="nonnegativeInteger"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G5QgBU3EeeZh9zsKpIhxg" base_DataType="_4F3VzBU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3VzBU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G5QgRU3EeeZh9zsKpIhxg" base_NamedElement="_4F3VzBU3EeeZh9zsKpIhxg" vodmlid="boolean"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G5QghU3EeeZh9zsKpIhxg" base_DataType="_4F3VzRU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3VzRU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G5QgxU3EeeZh9zsKpIhxg" base_NamedElement="_4F3VzRU3EeeZh9zsKpIhxg" vodmlid="integer"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G53kBU3EeeZh9zsKpIhxg" base_DataType="_4F3VzhU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3VzhU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G53kRU3EeeZh9zsKpIhxg" base_NamedElement="_4F3VzhU3EeeZh9zsKpIhxg" vodmlid="rational"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G53khU3EeeZh9zsKpIhxg" base_DataType="_4F3V0RU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3V0RU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G53kxU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V0RU3EeeZh9zsKpIhxg" vodmlid="complex"/>
-  <IVOA_UML_Profile:primitive xmi:id="_4G7swBU3EeeZh9zsKpIhxg" base_DataType="_4F3V1RU3EeeZh9zsKpIhxg" base_PrimitiveType="_4F3V1RU3EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G8T0BU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V1RU3EeeZh9zsKpIhxg" vodmlid="quantity.Unit"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G8T0RU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V1xU3EeeZh9zsKpIhxg" vodmlid="Quantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G8T0hU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V2hU3EeeZh9zsKpIhxg" vodmlid="IntegerQuantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G-JABU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V3RU3EeeZh9zsKpIhxg" vodmlid="RealQuantity"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_4G-JARU3EeeZh9zsKpIhxg" base_Package="_4F3V4BU3EeeZh9zsKpIhxg" name="coordsys" version="2.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G-wEBU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V4RU3EeeZh9zsKpIhxg" vodmlid="domain.pixel.PixelCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G-wERU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V4hU3EeeZh9zsKpIhxg" vodmlid="domain.spatial.SpatialCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G-wEhU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V4xU3EeeZh9zsKpIhxg" vodmlid="domain.spectral.SpectralCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G_XIBU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V5BU3EeeZh9zsKpIhxg" vodmlid="domain.temporal.TimeCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G_XIRU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V5RU3EeeZh9zsKpIhxg" vodmlid="domain.polarization.PolStokesCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G_XIhU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V5hU3EeeZh9zsKpIhxg" vodmlid="domain.polarization.PolCircularCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G_XIxU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V5xU3EeeZh9zsKpIhxg" vodmlid="domain.polarization.PolLinearCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G_-MBU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V6BU3EeeZh9zsKpIhxg" vodmlid="domain.polarization.PolVectorCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G_-MRU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V6RU3EeeZh9zsKpIhxg" vodmlid="domain.generic.GenericCoord"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_4G_-MhU3EeeZh9zsKpIhxg" base_NamedElement="_4F3V6hU3EeeZh9zsKpIhxg" vodmlid="domain.redshift.RedshiftCoord"/>
+  <IVOA_UML_Profile:model xmi:id="_P616kB6_Eeel5txBxgvIkw" base_Package="_P6TvEB6_Eeel5txBxgvIkw" title="STC2 Coordinates Model" version="2.0" authors="Arnold Rots, Mark Cresitello-Dittmar, L. Michel" previousVersion="0.x"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_P63IsB6_Eeel5txBxgvIkw" base_Package="_P6TvFR6_Eeel5txBxgvIkw" name="ivoa" version="1.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P63IsR6_Eeel5txBxgvIkw" base_DataType="_P6TvFh6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvFh6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P63vwB6_Eeel5txBxgvIkw" base_NamedElement="_P6TvFh6_Eeel5txBxgvIkw" vodmlid="real"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P63vwR6_Eeel5txBxgvIkw" base_DataType="_P6TvFx6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvFx6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P63vwh6_Eeel5txBxgvIkw" base_NamedElement="_P6TvFx6_Eeel5txBxgvIkw" vodmlid="datetime"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P63vwx6_Eeel5txBxgvIkw" base_DataType="_P6TvGB6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvGB6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P63vxB6_Eeel5txBxgvIkw" base_NamedElement="_P6TvGB6_Eeel5txBxgvIkw" vodmlid="anyURI"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P63vxR6_Eeel5txBxgvIkw" base_DataType="_P6TvGh6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvGh6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P64W0B6_Eeel5txBxgvIkw" base_NamedElement="_P6TvGh6_Eeel5txBxgvIkw" vodmlid="string"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P64W0R6_Eeel5txBxgvIkw" base_DataType="_P6TvGx6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvGx6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P64W0h6_Eeel5txBxgvIkw" base_NamedElement="_P6TvGx6_Eeel5txBxgvIkw" vodmlid="nonnegativeInteger"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P6_EgB6_Eeel5txBxgvIkw" base_DataType="_P6TvHB6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvHB6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P6_rkB6_Eeel5txBxgvIkw" base_NamedElement="_P6TvHB6_Eeel5txBxgvIkw" vodmlid="boolean"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P7CH0B6_Eeel5txBxgvIkw" base_DataType="_P6TvHR6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvHR6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7DV8B6_Eeel5txBxgvIkw" base_NamedElement="_P6TvHR6_Eeel5txBxgvIkw" vodmlid="integer"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P7DV8R6_Eeel5txBxgvIkw" base_DataType="_P6TvHh6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvHh6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7DV8h6_Eeel5txBxgvIkw" base_NamedElement="_P6TvHh6_Eeel5txBxgvIkw" vodmlid="rational"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P7EkEB6_Eeel5txBxgvIkw" base_DataType="_P6TvIR6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvIR6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7EkER6_Eeel5txBxgvIkw" base_NamedElement="_P6TvIR6_Eeel5txBxgvIkw" vodmlid="complex"/>
+  <IVOA_UML_Profile:primitive xmi:id="_P7EkEh6_Eeel5txBxgvIkw" base_DataType="_P6TvJR6_Eeel5txBxgvIkw" base_PrimitiveType="_P6TvJR6_Eeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7FLIB6_Eeel5txBxgvIkw" base_NamedElement="_P6TvJR6_Eeel5txBxgvIkw" vodmlid="quantity.Unit"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7FLIR6_Eeel5txBxgvIkw" base_NamedElement="_P6TvJx6_Eeel5txBxgvIkw" vodmlid="Quantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7FLIh6_Eeel5txBxgvIkw" base_NamedElement="_P6TvKh6_Eeel5txBxgvIkw" vodmlid="IntegerQuantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7FyMB6_Eeel5txBxgvIkw" base_NamedElement="_P6TvLR6_Eeel5txBxgvIkw" vodmlid="RealQuantity"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_P7GZQB6_Eeel5txBxgvIkw" base_Package="_P6TvMB6_Eeel5txBxgvIkw" name="coordsys" version="2.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7GZQR6_Eeel5txBxgvIkw" base_NamedElement="_P6TvMR6_Eeel5txBxgvIkw" vodmlid="domain.pixel.PixelCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7GZQh6_Eeel5txBxgvIkw" base_NamedElement="_P6TvMh6_Eeel5txBxgvIkw" vodmlid="domain.spatial.SpatialCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7HAUB6_Eeel5txBxgvIkw" base_NamedElement="_P6TvMx6_Eeel5txBxgvIkw" vodmlid="domain.spectral.SpectralCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7HAUR6_Eeel5txBxgvIkw" base_NamedElement="_P6TvNB6_Eeel5txBxgvIkw" vodmlid="domain.temporal.TimeCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7HAUh6_Eeel5txBxgvIkw" base_NamedElement="_P6TvNR6_Eeel5txBxgvIkw" vodmlid="domain.polarization.PolStokesCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7HAUx6_Eeel5txBxgvIkw" base_NamedElement="_P6TvNh6_Eeel5txBxgvIkw" vodmlid="domain.polarization.PolCircularCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7HAVB6_Eeel5txBxgvIkw" base_NamedElement="_P6TvNx6_Eeel5txBxgvIkw" vodmlid="domain.polarization.PolLinearCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7HnYB6_Eeel5txBxgvIkw" base_NamedElement="_P6TvOB6_Eeel5txBxgvIkw" vodmlid="domain.polarization.PolVectorCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7HnYR6_Eeel5txBxgvIkw" base_NamedElement="_P6TvOR6_Eeel5txBxgvIkw" vodmlid="domain.generic.GenericCoord"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_P7HnYh6_Eeel5txBxgvIkw" base_NamedElement="_P6TvOh6_Eeel5txBxgvIkw" vodmlid="domain.redshift.RedshiftCoord"/>
 </xmi:XMI>

Modified: trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.gvd
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.gvd	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.gvd	Wed Apr 12 09:18:17 2017	(r3935)
@@ -1,6 +1,6 @@
 
 digraph GVmap {  
-	label = "\n\ncoordsys data model"
+	label = "\n\ncoordsys_tessel data model"
 	rankdir=TB
 	
 	node [ 
@@ -68,327 +68,327 @@
 	shape=record
 	fontsize=8
 	style=filled] 
-	"coordsys:CoordFrame" [
+	"coordsys_tessel:CoordFrame" [
     URL="#CoordFrame"
     label = "{CoordFrame}"
     fillcolor="/set312/1"
     ] ;
-  "coordsys:CoordSys" [
+  "coordsys_tessel:CoordSys" [
     URL="#CoordSys"
     label = "{CoordSys}"
     fillcolor="/set312/1"
     ] ;
-  "coordsys:AstroCoordSystem" [
+  "coordsys_tessel:AstroCoordSystem" [
     URL="#AstroCoordSystem"
     label = "{AstroCoordSystem}"
     fillcolor="/set312/1"
     ] ;
-  "coordsys:PixelCoordSystem" [
+  "coordsys_tessel:PixelCoordSystem" [
     URL="#PixelCoordSystem"
     label = "{PixelCoordSystem}"
     fillcolor="/set312/1"
     ] ;
-  "coordsys:domain.pixel.PixelCoord" [
+  "coordsys_tessel:domain.pixel.PixelCoord" [
     URL="#domain.pixel.PixelCoord"
     label = "{<<datatype>>\ndomain/pixel/PixelCoord|+loc : ivoa:integer\l}"
     fillcolor="/set312/3"
     ] ;
-  "coordsys:domain.pixel.PixelFrame" [
+  "coordsys_tessel:domain.pixel.PixelFrame" [
     URL="#domain.pixel.PixelFrame"
     label = "{domain/pixel/PixelFrame}"
     fillcolor="/set312/3"
     ] ;
-  "coordsys:domain.pixel.PixelSpace" [
+  "coordsys_tessel:domain.pixel.PixelSpace" [
     URL="#domain.pixel.PixelSpace"
     label = "{domain/pixel/PixelSpace}"
     fillcolor="/set312/3"
     ] ;
-  "coordsys:domain.pixel.PixelAxis" [
+  "coordsys_tessel:domain.pixel.PixelAxis" [
     URL="#domain.pixel.PixelAxis"
     label = "{domain/pixel/PixelAxis|+name : ivoa:string\l+length : ivoa:nonnegativeInteger\l}"
     fillcolor="/set312/3"
     ] ;
-  "coordsys:domain.pixel.CoordSpace" [
+  "coordsys_tessel:domain.pixel.CoordSpace" [
     URL="#domain.pixel.CoordSpace"
     label = "{domain/pixel/CoordSpace}"
     fillcolor="/set312/3"
     ] ;
-  "coordsys:domain.generic.GenericCoord" [
+  "coordsys_tessel:domain.generic.GenericCoord" [
     URL="#domain.generic.GenericCoord"
     label = "{<<datatype>>\ndomain/generic/GenericCoord|+loc : ivoa:Quantity\l}"
     fillcolor="/set312/4"
     ] ;
-  "coordsys:domain.generic.GenericFrame" [
+  "coordsys_tessel:domain.generic.GenericFrame" [
     URL="#domain.generic.GenericFrame"
     label = "{domain/generic/GenericFrame}"
     fillcolor="/set312/4"
     ] ;
-  "coordsys:domain.generic.CoordAxis" [
+  "coordsys_tessel:domain.generic.CoordAxis" [
     URL="#domain.generic.CoordAxis"
     label = "{domain/generic/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}"
     fillcolor="/set312/4"
     ] ;
-  "coordsys:domain.generic.CoordSpace" [
+  "coordsys_tessel:domain.generic.CoordSpace" [
     URL="#domain.generic.CoordSpace"
     label = "{domain/generic/CoordSpace}"
     fillcolor="/set312/4"
     ] ;
-  "coordsys:domain.generic.CoordSpace1D" [
+  "coordsys_tessel:domain.generic.CoordSpace1D" [
     URL="#domain.generic.CoordSpace1D"
     label = "{domain/generic/CoordSpace1D}"
     fillcolor="/set312/4"
     ] ;
-  "coordsys:domain.spatial.EpochType" [
+  "coordsys_tessel:domain.spatial.EpochType" [
     URL="#domain.spatial.EpochType"
     label = "{<<enumeration>>\ldomain/spatial/EpochType|+J\l+B\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.StdRefPosition" [
+  "coordsys_tessel:domain.spatial.StdRefPosition" [
     URL="#domain.spatial.StdRefPosition"
     label = "{<<enumeration>>\ldomain/spatial/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}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.StdRefFrame" [
+  "coordsys_tessel:domain.spatial.StdRefFrame" [
     URL="#domain.spatial.StdRefFrame"
     label = "{<<enumeration>>\ldomain/spatial/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}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.Handedness" [
+  "coordsys_tessel:domain.spatial.Handedness" [
     URL="#domain.spatial.Handedness"
     label = "{<<enumeration>>\ldomain/spatial/Handedness|+left\l+right\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.HealpixScheme" [
+  "coordsys_tessel:domain.spatial.HealpixScheme" [
     URL="#domain.spatial.HealpixScheme"
     label = "{<<enumeration>>\ldomain/spatial/HealpixScheme|+NESTED\l+RING\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.Epoch" [
+  "coordsys_tessel:domain.spatial.Epoch" [
     URL="#domain.spatial.Epoch"
-    label = "{<<datatype>>\ndomain/spatial/Epoch|+type : coordsys:domain.spatial.EpochType\l+year : ivoa:real\l}"
+    label = "{<<datatype>>\ndomain/spatial/Epoch|+type : coordsys_tessel:domain.spatial.EpochType\l+year : ivoa:real\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.SpatialCoord" [
+  "coordsys_tessel:domain.spatial.SpatialCoord" [
     URL="#domain.spatial.SpatialCoord"
     label = "{<<datatype>>\ndomain/spatial/SpatialCoord|+loc : ivoa:Quantity\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.SpatialLocation" [
+  "coordsys_tessel:domain.spatial.SpatialLocation" [
     URL="#domain.spatial.SpatialLocation"
     label = "{<<datatype>>\ndomain/spatial/SpatialLocation}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.StdSpatialLocation" [
+  "coordsys_tessel:domain.spatial.StdSpatialLocation" [
     URL="#domain.spatial.StdSpatialLocation"
-    label = "{<<datatype>>\ndomain/spatial/StdSpatialLocation|+coord : coordsys:domain.spatial.StdRefPosition\l}"
+    label = "{<<datatype>>\ndomain/spatial/StdSpatialLocation|+coord : coordsys_tessel:domain.spatial.StdRefPosition\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.SpatialLocation1D" [
+  "coordsys_tessel:domain.spatial.SpatialLocation1D" [
     URL="#domain.spatial.SpatialLocation1D"
-    label = "{<<datatype>>\ndomain/spatial/SpatialLocation1D|+coord : coordsys:domain.spatial.SpatialCoord\l}"
+    label = "{<<datatype>>\ndomain/spatial/SpatialLocation1D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.SpatialLocation2D" [
+  "coordsys_tessel:domain.spatial.SpatialLocation2D" [
     URL="#domain.spatial.SpatialLocation2D"
-    label = "{<<datatype>>\ndomain/spatial/SpatialLocation2D|+coord : coordsys:domain.spatial.SpatialCoord\l}"
+    label = "{<<datatype>>\ndomain/spatial/SpatialLocation2D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.SpatialLocation3D" [
+  "coordsys_tessel:domain.spatial.SpatialLocation3D" [
     URL="#domain.spatial.SpatialLocation3D"
-    label = "{<<datatype>>\ndomain/spatial/SpatialLocation3D|+coord : coordsys:domain.spatial.SpatialCoord\l}"
+    label = "{<<datatype>>\ndomain/spatial/SpatialLocation3D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.SpaceFrame" [
+  "coordsys_tessel:domain.spatial.SpaceFrame" [
     URL="#domain.spatial.SpaceFrame"
-    label = "{domain/spatial/SpaceFrame|+origin : coordsys:domain.spatial.SpatialLocation\l+orientation : coordsys:domain.spatial.StdRefFrame\l+equinox : coordsys:domain.spatial.Epoch\l}"
+    label = "{domain/spatial/SpaceFrame|+origin : coordsys_tessel:domain.spatial.SpatialLocation\l+orientation : coordsys_tessel:domain.spatial.StdRefFrame\l+equinox : coordsys_tessel:domain.spatial.Epoch\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.CoordSpace" [
+  "coordsys_tessel:domain.spatial.CoordSpace" [
     URL="#domain.spatial.CoordSpace"
     label = "{domain/spatial/CoordSpace}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.Spherical" [
+  "coordsys_tessel:domain.spatial.Spherical" [
     URL="#domain.spatial.Spherical"
-    label = "{domain/spatial/Spherical|+handedness : coordsys:domain.spatial.Handedness\l}"
+    label = "{domain/spatial/Spherical|+handedness : coordsys_tessel:domain.spatial.Handedness\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.Cartesian" [
+  "coordsys_tessel:domain.spatial.Cartesian" [
     URL="#domain.spatial.Cartesian"
-    label = "{domain/spatial/Cartesian|+handedness : coordsys:domain.spatial.Handedness\l}"
+    label = "{domain/spatial/Cartesian|+handedness : coordsys_tessel:domain.spatial.Handedness\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.CoordAxis" [
+  "coordsys_tessel:domain.spatial.CoordAxis" [
     URL="#domain.spatial.CoordAxis"
     label = "{domain/spatial/CoordAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.Axis" [
+  "coordsys_tessel:domain.spatial.Axis" [
     URL="#domain.spatial.Axis"
     label = "{domain/spatial/Axis|+name : ivoa:string\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.TesselationAxis" [
+  "coordsys_tessel:domain.spatial.TesselationAxis" [
     URL="#domain.spatial.TesselationAxis"
     label = "{domain/spatial/TesselationAxis}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.Tesselation" [
+  "coordsys_tessel:domain.spatial.Tesselation" [
     URL="#domain.spatial.Tesselation"
     label = "{domain/spatial/Tesselation}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.QuadCube" [
+  "coordsys_tessel:domain.spatial.QuadCube" [
     URL="#domain.spatial.QuadCube"
     label = "{domain/spatial/QuadCube}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.Igloo" [
+  "coordsys_tessel:domain.spatial.Igloo" [
     URL="#domain.spatial.Igloo"
     label = "{domain/spatial/Igloo}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.Healpix" [
+  "coordsys_tessel:domain.spatial.Healpix" [
     URL="#domain.spatial.Healpix"
-    label = "{domain/spatial/Healpix|+Schema : coordsys:domain.spatial.HealpixScheme\l+norder : ivoa:integer\l}"
+    label = "{domain/spatial/Healpix|+Schema : coordsys_tessel:domain.spatial.HealpixScheme\l+norder : ivoa:integer\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.HTM" [
+  "coordsys_tessel:domain.spatial.HTM" [
     URL="#domain.spatial.HTM"
     label = "{domain/spatial/HTM}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spatial.SkyIndex" [
+  "coordsys_tessel:domain.spatial.SkyIndex" [
     URL="#domain.spatial.SkyIndex"
     label = "{domain/spatial/SkyIndex|+loc : ivoa:integer\l}"
     fillcolor="/set312/5"
     ] ;
-  "coordsys:domain.spectral.SpectralCoord" [
+  "coordsys_tessel:domain.spectral.SpectralCoord" [
     URL="#domain.spectral.SpectralCoord"
     label = "{<<datatype>>\ndomain/spectral/SpectralCoord|+loc : ivoa:RealQuantity\l}"
     fillcolor="/set312/6"
     ] ;
-  "coordsys:domain.spectral.SpectralFrame" [
+  "coordsys_tessel:domain.spectral.SpectralFrame" [
     URL="#domain.spectral.SpectralFrame"
-    label = "{domain/spectral/SpectralFrame|+refPosition : coordsys:domain.spatial.SpatialLocation\l}"
+    label = "{domain/spectral/SpectralFrame|+refPosition : coordsys_tessel:domain.spatial.SpatialLocation\l}"
     fillcolor="/set312/6"
     ] ;
-  "coordsys:domain.spectral.CoordAxis" [
+  "coordsys_tessel:domain.spectral.CoordAxis" [
     URL="#domain.spectral.CoordAxis"
     label = "{domain/spectral/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}"
     fillcolor="/set312/6"
     ] ;
-  "coordsys:domain.spectral.CoordSpace" [
+  "coordsys_tessel:domain.spectral.CoordSpace" [
     URL="#domain.spectral.CoordSpace"
     label = "{domain/spectral/CoordSpace}"
     fillcolor="/set312/6"
     ] ;
-  "coordsys:domain.spectral.CoordSpace1D" [
+  "coordsys_tessel:domain.spectral.CoordSpace1D" [
     URL="#domain.spectral.CoordSpace1D"
     label = "{domain/spectral/CoordSpace1D}"
     fillcolor="/set312/6"
     ] ;
-  "coordsys:domain.temporal.TimeScale" [
+  "coordsys_tessel:domain.temporal.TimeScale" [
     URL="#domain.temporal.TimeScale"
     label = "{<<enumeration>>\ldomain/temporal/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}"
     fillcolor="/set312/7"
     ] ;
-  "coordsys:domain.temporal.TimeCoord" [
+  "coordsys_tessel:domain.temporal.TimeCoord" [
     URL="#domain.temporal.TimeCoord"
     label = "{<<datatype>>\ndomain/temporal/TimeCoord}"
     fillcolor="/set312/7"
     ] ;
-  "coordsys:domain.temporal.TimeOffset" [
+  "coordsys_tessel:domain.temporal.TimeOffset" [
     URL="#domain.temporal.TimeOffset"
     label = "{<<datatype>>\ndomain/temporal/TimeOffset|+loc : ivoa:RealQuantity\l}"
     fillcolor="/set312/7"
     ] ;
-  "coordsys:domain.temporal.TimeInstant" [
+  "coordsys_tessel:domain.temporal.TimeInstant" [
     URL="#domain.temporal.TimeInstant"
     label = "{<<datatype>>\ndomain/temporal/TimeInstant|+loc : ivoa:datetime\l}"
     fillcolor="/set312/7"
     ] ;
-  "coordsys:domain.temporal.TimeFrame" [
+  "coordsys_tessel:domain.temporal.TimeFrame" [
     URL="#domain.temporal.TimeFrame"
-    label = "{domain/temporal/TimeFrame|+timescale : coordsys:domain.temporal.TimeScale\l+refPosition : coordsys:domain.spatial.SpatialLocation\l+refDirection : coordsys:domain.spatial.SpatialLocation\l+offset : coordsys:domain.temporal.TimeOffset\l}"
+    label = "{domain/temporal/TimeFrame|+timescale : coordsys_tessel:domain.temporal.TimeScale\l+refPosition : coordsys_tessel:domain.spatial.SpatialLocation\l+refDirection : coordsys_tessel:domain.spatial.SpatialLocation\l+offset : coordsys_tessel:domain.temporal.TimeOffset\l}"
     fillcolor="/set312/7"
     ] ;
-  "coordsys:domain.temporal.CoordSpace" [
+  "coordsys_tessel:domain.temporal.CoordSpace" [
     URL="#domain.temporal.CoordSpace"
     label = "{domain/temporal/CoordSpace}"
     fillcolor="/set312/7"
     ] ;
-  "coordsys:domain.temporal.CoordSpace1D" [
+  "coordsys_tessel:domain.temporal.CoordSpace1D" [
     URL="#domain.temporal.CoordSpace1D"
     label = "{domain/temporal/CoordSpace1D}"
     fillcolor="/set312/7"
     ] ;
-  "coordsys:domain.temporal.CoordAxis" [
+  "coordsys_tessel:domain.temporal.CoordAxis" [
     URL="#domain.temporal.CoordAxis"
     label = "{domain/temporal/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}"
     fillcolor="/set312/7"
     ] ;
-  "coordsys:domain.polarization.PolStokes" [
+  "coordsys_tessel:domain.polarization.PolStokes" [
     URL="#domain.polarization.PolStokes"
     label = "{<<enumeration>>\ldomain/polarization/PolStokes|+I\l+Q\l+U\l+V\l}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolCircular" [
+  "coordsys_tessel:domain.polarization.PolCircular" [
     URL="#domain.polarization.PolCircular"
     label = "{<<enumeration>>\ldomain/polarization/PolCircular|+RR\l+LL\l+RL\l+LR\l}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolLinear" [
+  "coordsys_tessel:domain.polarization.PolLinear" [
     URL="#domain.polarization.PolLinear"
     label = "{<<enumeration>>\ldomain/polarization/PolLinear|+XX\l+YY\l+XY\l+YX\l}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolVector" [
+  "coordsys_tessel:domain.polarization.PolVector" [
     URL="#domain.polarization.PolVector"
     label = "{<<enumeration>>\ldomain/polarization/PolVector|+I\l+PF\l+PP\l+PA\l}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolCoord" [
+  "coordsys_tessel:domain.polarization.PolCoord" [
     URL="#domain.polarization.PolCoord"
     label = "{<<datatype>>\ndomain/polarization/PolCoord}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolStokesCoord" [
+  "coordsys_tessel:domain.polarization.PolStokesCoord" [
     URL="#domain.polarization.PolStokesCoord"
-    label = "{<<datatype>>\ndomain/polarization/PolStokesCoord|+loc : coordsys:domain.polarization.PolStokes\l}"
+    label = "{<<datatype>>\ndomain/polarization/PolStokesCoord|+loc : coordsys_tessel:domain.polarization.PolStokes\l}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolCircularCoord" [
+  "coordsys_tessel:domain.polarization.PolCircularCoord" [
     URL="#domain.polarization.PolCircularCoord"
-    label = "{<<datatype>>\ndomain/polarization/PolCircularCoord|+loc : coordsys:domain.polarization.PolCircular\l}"
+    label = "{<<datatype>>\ndomain/polarization/PolCircularCoord|+loc : coordsys_tessel:domain.polarization.PolCircular\l}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolLinearCoord" [
+  "coordsys_tessel:domain.polarization.PolLinearCoord" [
     URL="#domain.polarization.PolLinearCoord"
-    label = "{<<datatype>>\ndomain/polarization/PolLinearCoord|+loc : coordsys:domain.polarization.PolLinear\l}"
+    label = "{<<datatype>>\ndomain/polarization/PolLinearCoord|+loc : coordsys_tessel:domain.polarization.PolLinear\l}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolVectorCoord" [
+  "coordsys_tessel:domain.polarization.PolVectorCoord" [
     URL="#domain.polarization.PolVectorCoord"
-    label = "{<<datatype>>\ndomain/polarization/PolVectorCoord|+loc : coordsys:domain.polarization.PolVector\l}"
+    label = "{<<datatype>>\ndomain/polarization/PolVectorCoord|+loc : coordsys_tessel:domain.polarization.PolVector\l}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.PolarizationFrame" [
+  "coordsys_tessel:domain.polarization.PolarizationFrame" [
     URL="#domain.polarization.PolarizationFrame"
     label = "{domain/polarization/PolarizationFrame}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.CoordSpace" [
+  "coordsys_tessel:domain.polarization.CoordSpace" [
     URL="#domain.polarization.CoordSpace"
     label = "{domain/polarization/CoordSpace}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.CoordSpace1D" [
+  "coordsys_tessel:domain.polarization.CoordSpace1D" [
     URL="#domain.polarization.CoordSpace1D"
     label = "{domain/polarization/CoordSpace1D}"
     fillcolor="/set312/8"
     ] ;
-  "coordsys:domain.polarization.DiscreteAxis" [
+  "coordsys_tessel:domain.polarization.DiscreteAxis" [
     URL="#domain.polarization.DiscreteAxis"
     label = "{domain/polarization/DiscreteAxis|+name : ivoa:string\l}"
     fillcolor="/set312/8"
@@ -396,68 +396,68 @@
   
  
     edge [color="red", arrowtail="none", arrowhead="empty"]
-    "coordsys:AstroCoordSystem" -> "coordsys:CoordSys" ;
-  "coordsys:domain.pixel.PixelFrame" -> "coordsys:CoordFrame" ;
-  "coordsys:domain.pixel.PixelSpace" -> "coordsys:domain.pixel.CoordSpace" ;
-  "coordsys:domain.generic.GenericFrame" -> "coordsys:CoordFrame" ;
-  "coordsys:domain.generic.CoordSpace1D" -> "coordsys:domain.generic.CoordSpace" ;
-  "coordsys:domain.spatial.StdSpatialLocation" -> "coordsys:domain.spatial.SpatialLocation" ;
-  "coordsys:domain.spatial.SpatialLocation1D" -> "coordsys:domain.spatial.SpatialLocation" ;
-  "coordsys:domain.spatial.SpatialLocation2D" -> "coordsys:domain.spatial.SpatialLocation" ;
-  "coordsys:domain.spatial.SpatialLocation3D" -> "coordsys:domain.spatial.SpatialLocation" ;
-  "coordsys:domain.spatial.SpaceFrame" -> "coordsys:CoordFrame" ;
-  "coordsys:domain.spatial.Spherical" -> "coordsys:domain.spatial.CoordSpace" ;
-  "coordsys:domain.spatial.Cartesian" -> "coordsys:domain.spatial.CoordSpace" ;
-  "coordsys:domain.spatial.CoordAxis" -> "coordsys:domain.spatial.Axis" ;
-  "coordsys:domain.spatial.Axis" -> "coordsys:domain.spatial.CoordSpace" ;
-  "coordsys:domain.spatial.TesselationAxis" -> "coordsys:domain.spatial.Axis" ;
-  "coordsys:domain.spatial.Tesselation" -> "coordsys:domain.spatial.CoordSpace" ;
-  "coordsys:domain.spatial.QuadCube" -> "coordsys:domain.spatial.Tesselation" ;
-  "coordsys:domain.spatial.Igloo" -> "coordsys:domain.spatial.Tesselation" ;
-  "coordsys:domain.spatial.Healpix" -> "coordsys:domain.spatial.Tesselation" ;
-  "coordsys:domain.spatial.HTM" -> "coordsys:domain.spatial.Tesselation" ;
-  "coordsys:domain.spectral.SpectralFrame" -> "coordsys:CoordFrame" ;
-  "coordsys:domain.spectral.CoordSpace1D" -> "coordsys:domain.spectral.CoordSpace" ;
-  "coordsys:domain.temporal.TimeOffset" -> "coordsys:domain.temporal.TimeCoord" ;
-  "coordsys:domain.temporal.TimeInstant" -> "coordsys:domain.temporal.TimeCoord" ;
-  "coordsys:domain.temporal.TimeFrame" -> "coordsys:CoordFrame" ;
-  "coordsys:domain.temporal.CoordSpace1D" -> "coordsys:domain.temporal.CoordSpace" ;
-  "coordsys:domain.polarization.PolStokesCoord" -> "coordsys:domain.polarization.PolCoord" ;
-  "coordsys:domain.polarization.PolCircularCoord" -> "coordsys:domain.polarization.PolCoord" ;
-  "coordsys:domain.polarization.PolLinearCoord" -> "coordsys:domain.polarization.PolCoord" ;
-  "coordsys:domain.polarization.PolVectorCoord" -> "coordsys:domain.polarization.PolCoord" ;
-  "coordsys:domain.polarization.PolarizationFrame" -> "coordsys:CoordFrame" ;
-  "coordsys:domain.polarization.CoordSpace1D" -> "coordsys:domain.polarization.CoordSpace" ;
+    "coordsys_tessel:AstroCoordSystem" -> "coordsys_tessel:CoordSys" ;
+  "coordsys_tessel:domain.pixel.PixelFrame" -> "coordsys_tessel:CoordFrame" ;
+  "coordsys_tessel:domain.pixel.PixelSpace" -> "coordsys_tessel:domain.pixel.CoordSpace" ;
+  "coordsys_tessel:domain.generic.GenericFrame" -> "coordsys_tessel:CoordFrame" ;
+  "coordsys_tessel:domain.generic.CoordSpace1D" -> "coordsys_tessel:domain.generic.CoordSpace" ;
+  "coordsys_tessel:domain.spatial.StdSpatialLocation" -> "coordsys_tessel:domain.spatial.SpatialLocation" ;
+  "coordsys_tessel:domain.spatial.SpatialLocation1D" -> "coordsys_tessel:domain.spatial.SpatialLocation" ;
+  "coordsys_tessel:domain.spatial.SpatialLocation2D" -> "coordsys_tessel:domain.spatial.SpatialLocation" ;
+  "coordsys_tessel:domain.spatial.SpatialLocation3D" -> "coordsys_tessel:domain.spatial.SpatialLocation" ;
+  "coordsys_tessel:domain.spatial.SpaceFrame" -> "coordsys_tessel:CoordFrame" ;
+  "coordsys_tessel:domain.spatial.Spherical" -> "coordsys_tessel:domain.spatial.CoordSpace" ;
+  "coordsys_tessel:domain.spatial.Cartesian" -> "coordsys_tessel:domain.spatial.CoordSpace" ;
+  "coordsys_tessel:domain.spatial.CoordAxis" -> "coordsys_tessel:domain.spatial.Axis" ;
+  "coordsys_tessel:domain.spatial.TesselationAxis" -> "coordsys_tessel:domain.spatial.Axis" ;
+  "coordsys_tessel:domain.spatial.Tesselation" -> "coordsys_tessel:domain.spatial.CoordSpace" ;
+  "coordsys_tessel:domain.spatial.QuadCube" -> "coordsys_tessel:domain.spatial.Tesselation" ;
+  "coordsys_tessel:domain.spatial.Igloo" -> "coordsys_tessel:domain.spatial.Tesselation" ;
+  "coordsys_tessel:domain.spatial.Healpix" -> "coordsys_tessel:domain.spatial.Tesselation" ;
+  "coordsys_tessel:domain.spatial.HTM" -> "coordsys_tessel:domain.spatial.Tesselation" ;
+  "coordsys_tessel:domain.spectral.SpectralFrame" -> "coordsys_tessel:CoordFrame" ;
+  "coordsys_tessel:domain.spectral.CoordSpace1D" -> "coordsys_tessel:domain.spectral.CoordSpace" ;
+  "coordsys_tessel:domain.temporal.TimeOffset" -> "coordsys_tessel:domain.temporal.TimeCoord" ;
+  "coordsys_tessel:domain.temporal.TimeInstant" -> "coordsys_tessel:domain.temporal.TimeCoord" ;
+  "coordsys_tessel:domain.temporal.TimeFrame" -> "coordsys_tessel:CoordFrame" ;
+  "coordsys_tessel:domain.temporal.CoordSpace1D" -> "coordsys_tessel:domain.temporal.CoordSpace" ;
+  "coordsys_tessel:domain.polarization.PolStokesCoord" -> "coordsys_tessel:domain.polarization.PolCoord" ;
+  "coordsys_tessel:domain.polarization.PolCircularCoord" -> "coordsys_tessel:domain.polarization.PolCoord" ;
+  "coordsys_tessel:domain.polarization.PolLinearCoord" -> "coordsys_tessel:domain.polarization.PolCoord" ;
+  "coordsys_tessel:domain.polarization.PolVectorCoord" -> "coordsys_tessel:domain.polarization.PolCoord" ;
+  "coordsys_tessel:domain.polarization.PolarizationFrame" -> "coordsys_tessel:CoordFrame" ;
+  "coordsys_tessel:domain.polarization.CoordSpace1D" -> "coordsys_tessel:domain.polarization.CoordSpace" ;
   
  
     edge [color="blue", arrowhead="open", arrowtail="diamond",dir="both",fontsize="10"]
-    "coordsys:PixelCoordSystem" -> "coordsys:domain.pixel.PixelFrame" [headlabel="1..*",label="pixelFrame",labelfontsize=10] ;
-  "coordsys:domain.pixel.PixelFrame" -> "coordsys:domain.pixel.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
-  "coordsys:domain.pixel.CoordSpace" -> "coordsys:domain.pixel.PixelAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
-  "coordsys:domain.generic.GenericFrame" -> "coordsys:domain.generic.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
-  "coordsys:domain.generic.CoordSpace" -> "coordsys:domain.generic.CoordAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
-  "coordsys:domain.spatial.SpaceFrame" -> "coordsys:domain.spatial.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
-  "coordsys:domain.spectral.SpectralFrame" -> "coordsys:domain.spectral.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
-  "coordsys:domain.spectral.CoordSpace" -> "coordsys:domain.spectral.CoordAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
-  "coordsys:domain.temporal.TimeFrame" -> "coordsys:domain.temporal.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
-  "coordsys:domain.temporal.CoordSpace" -> "coordsys:domain.temporal.CoordAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
-  "coordsys:domain.polarization.PolarizationFrame" -> "coordsys:domain.polarization.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
-  "coordsys:domain.polarization.CoordSpace" -> "coordsys:domain.polarization.DiscreteAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
+    "coordsys_tessel:PixelCoordSystem" -> "coordsys_tessel:domain.pixel.PixelFrame" [headlabel="1..*",label="pixelFrame",labelfontsize=10] ;
+  "coordsys_tessel:domain.pixel.PixelFrame" -> "coordsys_tessel:domain.pixel.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
+  "coordsys_tessel:domain.pixel.CoordSpace" -> "coordsys_tessel:domain.pixel.PixelAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.generic.GenericFrame" -> "coordsys_tessel:domain.generic.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
+  "coordsys_tessel:domain.generic.CoordSpace" -> "coordsys_tessel:domain.generic.CoordAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.spatial.SpaceFrame" -> "coordsys_tessel:domain.spatial.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
+  "coordsys_tessel:domain.spatial.CoordSpace" -> "coordsys_tessel:domain.spatial.Axis" [headlabel="1..*",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.spectral.SpectralFrame" -> "coordsys_tessel:domain.spectral.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
+  "coordsys_tessel:domain.spectral.CoordSpace" -> "coordsys_tessel:domain.spectral.CoordAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.temporal.TimeFrame" -> "coordsys_tessel:domain.temporal.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
+  "coordsys_tessel:domain.temporal.CoordSpace" -> "coordsys_tessel:domain.temporal.CoordAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.polarization.PolarizationFrame" -> "coordsys_tessel:domain.polarization.CoordSpace" [headlabel="1",label="coordSpace",labelfontsize=10] ;
+  "coordsys_tessel:domain.polarization.CoordSpace" -> "coordsys_tessel:domain.polarization.DiscreteAxis" [headlabel="1..*",label="axis",labelfontsize=10] ;
   
  
     edge [color="green", arrowhead="open", arrowtail="none"]
-    "coordsys:CoordSys" -> "coordsys:domain.generic.GenericFrame" [headlabel="0..*",label="genericFrame",labelfontsize=10] ;
-  "coordsys:AstroCoordSystem" -> "coordsys:domain.polarization.PolarizationFrame" [headlabel="0..1",label="polarizationFrame",labelfontsize=10] ;
-  "coordsys:AstroCoordSystem" -> "coordsys:domain.spatial.SpaceFrame" [headlabel="0..1",label="spaceFrame",labelfontsize=10] ;
-  "coordsys:AstroCoordSystem" -> "coordsys:domain.temporal.TimeFrame" [headlabel="0..1",label="timeFrame",labelfontsize=10] ;
-  "coordsys:AstroCoordSystem" -> "coordsys:domain.spectral.SpectralFrame" [headlabel="0..1",label="spectralFrame",labelfontsize=10] ;
-  "coordsys:domain.pixel.PixelCoord" -> "coordsys:domain.pixel.PixelAxis" [headlabel="1",label="axis",labelfontsize=10] ;
-  "coordsys:domain.generic.GenericCoord" -> "coordsys:domain.generic.CoordAxis" [headlabel="1",label="axis",labelfontsize=10] ;
-  "coordsys:domain.spatial.SpatialCoord" -> "coordsys:domain.spatial.CoordAxis" [headlabel="1",label="axis",labelfontsize=10] ;
-  "coordsys:domain.spatial.SkyIndex" -> "coordsys:domain.spatial.TesselationAxis" [headlabel="1",label="axis",labelfontsize=10] ;
-  "coordsys:domain.spectral.SpectralCoord" -> "coordsys:domain.spectral.CoordAxis" [headlabel="1",label="axis",labelfontsize=10] ;
-  "coordsys:domain.temporal.TimeCoord" -> "coordsys:domain.temporal.CoordAxis" [headlabel="1",label="axis",labelfontsize=10] ;
-  "coordsys:domain.polarization.PolCoord" -> "coordsys:domain.polarization.DiscreteAxis" [headlabel="1",label="axis",labelfontsize=10] ;
+    "coordsys_tessel:CoordSys" -> "coordsys_tessel:domain.generic.GenericFrame" [headlabel="0..*",label="genericFrame",labelfontsize=10] ;
+  "coordsys_tessel:AstroCoordSystem" -> "coordsys_tessel:domain.polarization.PolarizationFrame" [headlabel="0..1",label="polarizationFrame",labelfontsize=10] ;
+  "coordsys_tessel:AstroCoordSystem" -> "coordsys_tessel:domain.spatial.SpaceFrame" [headlabel="0..1",label="spaceFrame",labelfontsize=10] ;
+  "coordsys_tessel:AstroCoordSystem" -> "coordsys_tessel:domain.temporal.TimeFrame" [headlabel="0..1",label="timeFrame",labelfontsize=10] ;
+  "coordsys_tessel:AstroCoordSystem" -> "coordsys_tessel:domain.spectral.SpectralFrame" [headlabel="0..1",label="spectralFrame",labelfontsize=10] ;
+  "coordsys_tessel:domain.pixel.PixelCoord" -> "coordsys_tessel:domain.pixel.PixelAxis" [headlabel="1",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.generic.GenericCoord" -> "coordsys_tessel:domain.generic.CoordAxis" [headlabel="1",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.spatial.SpatialCoord" -> "coordsys_tessel:domain.spatial.CoordAxis" [headlabel="1",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.spatial.SkyIndex" -> "coordsys_tessel:domain.spatial.TesselationAxis" [headlabel="1",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.spectral.SpectralCoord" -> "coordsys_tessel:domain.spectral.CoordAxis" [headlabel="1",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.temporal.TimeCoord" -> "coordsys_tessel:domain.temporal.CoordAxis" [headlabel="1",label="axis",labelfontsize=10] ;
+  "coordsys_tessel:domain.polarization.PolCoord" -> "coordsys_tessel:domain.polarization.DiscreteAxis" [headlabel="1",label="axis",labelfontsize=10] ;
     
 }
   
\ No newline at end of file

Modified: trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html	Wed Apr 12 09:18:17 2017	(r3935)
@@ -12,7 +12,7 @@
       <table class=".toc">
         <tr>
           <td>1.</td>
-          <td>    <a href="#model_section">model: coordsys</a></td>
+          <td>    <a href="#model_section">model: coordsys_tessel</a></td>
         </tr>
         <tr>
           <td>2.</td>
@@ -328,17 +328,17 @@
       </table>
     </div>
     <hr>
-    <h1><a name="model_section">1. Model: STC2 Coordinate System model (coordsys)</a></h1>
+    <h1><a name="model_section">1. Model: STC2 Coordinate System model (coordsys_tessel)</a></h1>
     <table>
       <tr>
         <td align="right"><b>Authors</b></td>
         <td> : </td>
-        <td>Arnold Rots, Mark Cresitello-Dittmar</td>
+        <td>Arnold Rots, Mark Cresitello-Dittmar, L Michel</td>
       </tr>
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2017-03-29T17:26:00</td>
+        <td>2017-04-11T15:58:53</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -381,71 +381,71 @@
 <area shape="rect" id="node5" href="#domain.spectral" title="spectral" alt="" coords="371,245,450,293"/>
 <area shape="rect" id="node6" href="#domain.temporal" title="temporal" alt="" coords="261,245,347,293"/>
 <area shape="rect" id="node7" href="#domain.polarization" title="polarization" alt="" coords="129,245,237,293"/>
-<area shape="rect" id="node8" href="#CoordFrame" title="{CoordFrame}" alt="" coords="1866,993,1942,1043"/>
-<area shape="rect" id="node9" href="#CoordSys" title="{CoordSys}" alt="" coords="1763,733,1835,782"/>
-<area shape="rect" id="node18" href="#domain.generic.GenericFrame" title="{domain/generic/GenericFrame}" alt="" coords="1721,866,1876,915"/>
-<area shape="rect" id="node10" href="#AstroCoordSystem" title="{AstroCoordSystem}" alt="" coords="1937,599,2039,649"/>
-<area shape="rect" id="node34" href="#domain.spatial.SpaceFrame" title="{domain/spatial/SpaceFrame|+origin : coordsys:domain.spatial.SpatialLocation\l+orientation : coordsys:domain.spatial.StdRefFrame\l+equinox : coordsys:domain.spatial.Epoch\l}" alt="" coords="1491,722,1738,793"/>
-<area shape="rect" id="node48" href="#domain.spectral.SpectralFrame" title="{domain/spectral/SpectralFrame|+refPosition : coordsys:domain.spatial.SpatialLocation\l}" alt="" coords="1859,733,2117,782"/>
-<area shape="rect" id="node56" href="#domain.temporal.TimeFrame" title="{domain/temporal/TimeFrame|+timescale : coordsys:domain.temporal.TimeScale\l+refPosition : coordsys:domain.spatial.SpatialLocation\l+refDirection : coordsys:domain.spatial.SpatialLocation\l+offset : coordsys:domain.temporal.TimeOffset\l}" alt="" coords="3480,716,3744,799"/>
-<area shape="rect" id="node69" href="#domain.polarization.PolarizationFrame" title="{domain/polarization/PolarizationFrame}" alt="" coords="2141,733,2331,782"/>
-<area shape="rect" id="node11" href="#PixelCoordSystem" title="{PixelCoordSystem}" alt="" coords="1365,733,1467,782"/>
-<area shape="rect" id="node13" href="#domain.pixel.PixelFrame" title="{domain/pixel/PixelFrame}" alt="" coords="1451,866,1581,915"/>
-<area shape="rect" id="node12" href="#domain.pixel.PixelCoord" title="{<<datatype>>\ndomain/pixel/PixelCoord|+loc : ivoa:integer\l}" alt="" coords="1072,989,1200,1047"/>
-<area shape="rect" id="node15" href="#domain.pixel.PixelAxis" title="{domain/pixel/PixelAxis|+name : ivoa:string\l+length : ivoa:nonnegativeInteger\l}" alt="" coords="1129,1122,1295,1181"/>
-<area shape="rect" id="node16" href="#domain.pixel.CoordSpace" title="{domain/pixel/CoordSpace}" alt="" coords="1225,993,1357,1043"/>
-<area shape="rect" id="node14" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace}" alt="" coords="911,866,1039,915"/>
-<area shape="rect" id="node17" href="#domain.generic.GenericCoord" title="{<<datatype>>\ndomain/generic/GenericCoord|+loc : ivoa:Quantity\l}" alt="" coords="1557,989,1709,1047"/>
-<area shape="rect" id="node19" href="#domain.generic.CoordAxis" title="{domain/generic/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}" alt="" coords="1395,1116,1541,1187"/>
-<area shape="rect" id="node20" href="#domain.generic.CoordSpace" title="{domain/generic/CoordSpace}" alt="" coords="1390,993,1533,1043"/>
-<area shape="rect" id="node21" href="#domain.generic.CoordSpace1D" title="{domain/generic/CoordSpace1D}" alt="" coords="1270,866,1426,915"/>
-<area shape="rect" id="node22" href="#domain.spatial.EpochType" title="{<<enumeration>>\ldomain/spatial/EpochType|+J\l+B\l}" alt="" coords="1107,233,1243,304"/>
-<area shape="rect" id="node23" href="#domain.spatial.StdRefPosition" title="{<<enumeration>>\ldomain/spatial/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="1267,113,1421,424"/>
-<area shape="rect" id="node24" href="#domain.spatial.StdRefFrame" title="{<<enumeration>>\ldomain/spatial/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="1446,5,1591,532"/>
-<area shape="rect" id="node25" href="#domain.spatial.Handedness" title="{<<enumeration>>\ldomain/spatial/Handedness|+left\l+right\l}" alt="" coords="1616,233,1755,304"/>
-<area shape="rect" id="node26" href="#domain.spatial.HealpixScheme" title="{<<enumeration>>\ldomain/spatial/HealpixScheme|+NESTED\l+RING\l}" alt="" coords="1779,233,1933,304"/>
-<area shape="rect" id="node27" href="#domain.spatial.Epoch" title="{<<datatype>>\ndomain/spatial/Epoch|+type : coordsys:domain.spatial.EpochType\l+year : ivoa:real\l}" alt="" coords="1958,233,2167,304"/>
-<area shape="rect" id="node28" href="#domain.spatial.SpatialCoord" title="{<<datatype>>\ndomain/spatial/SpatialCoord|+loc : ivoa:Quantity\l}" alt="" coords="941,239,1083,298"/>
-<area shape="rect" id="node38" href="#domain.spatial.CoordAxis" title="{domain/spatial/CoordAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}" alt="" coords="939,595,1085,653"/>
-<area shape="rect" id="node29" href="#domain.spatial.SpatialLocation" title="{<<datatype>>\ndomain/spatial/SpatialLocation}" alt="" coords="2603,599,2757,649"/>
-<area shape="rect" id="node30" href="#domain.spatial.StdSpatialLocation" title="{<<datatype>>\ndomain/spatial/StdSpatialLocation|+coord : coordsys:domain.spatial.StdRefPosition\l}" alt="" coords="2191,239,2422,298"/>
-<area shape="rect" id="node31" href="#domain.spatial.SpatialLocation1D" title="{<<datatype>>\ndomain/spatial/SpatialLocation1D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2446,239,2669,298"/>
-<area shape="rect" id="node32" href="#domain.spatial.SpatialLocation2D" title="{<<datatype>>\ndomain/spatial/SpatialLocation2D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2693,239,2915,298"/>
-<area shape="rect" id="node33" href="#domain.spatial.SpatialLocation3D" title="{<<datatype>>\ndomain/spatial/SpatialLocation3D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2939,239,3162,298"/>
-<area shape="rect" id="node35" href="#domain.spatial.CoordSpace" title="{domain/spatial/CoordSpace}" alt="" coords="1063,866,1201,915"/>
-<area shape="rect" id="node36" href="#domain.spatial.Spherical" title="{domain/spatial/Spherical|+handedness : coordsys:domain.spatial.Handedness\l}" alt="" coords="543,733,785,782"/>
-<area shape="rect" id="node37" href="#domain.spatial.Cartesian" title="{domain/spatial/Cartesian|+handedness : coordsys:domain.spatial.Handedness\l}" alt="" coords="809,733,1050,782"/>
-<area shape="rect" id="node39" href="#domain.spatial.Axis" title="{domain/spatial/Axis|+name : ivoa:string\l}" alt="" coords="1075,733,1181,782"/>
-<area shape="rect" id="node40" href="#domain.spatial.TesselationAxis" title="{domain/spatial/TesselationAxis}" alt="" coords="759,599,915,649"/>
-<area shape="rect" id="node41" href="#domain.spatial.Tesselation" title="{domain/spatial/Tesselation}" alt="" coords="1205,733,1341,782"/>
-<area shape="rect" id="node42" href="#domain.spatial.QuadCube" title="{domain/spatial/QuadCube}" alt="" coords="1109,599,1241,649"/>
-<area shape="rect" id="node43" href="#domain.spatial.Igloo" title="{domain/spatial/Igloo}" alt="" coords="1265,599,1375,649"/>
-<area shape="rect" id="node44" href="#domain.spatial.Healpix" title="{domain/spatial/Healpix|+Schema : coordsys:domain.spatial.HealpixScheme\l+norder : ivoa:integer\l}" alt="" coords="1399,595,1643,653"/>
-<area shape="rect" id="node45" href="#domain.spatial.HTM" title="{domain/spatial/HTM}" alt="" coords="1667,599,1778,649"/>
-<area shape="rect" id="node46" href="#domain.spatial.SkyIndex" title="{domain/spatial/SkyIndex|+loc : ivoa:integer\l}" alt="" coords="774,244,901,293"/>
-<area shape="rect" id="node47" href="#domain.spectral.SpectralCoord" title="{<<datatype>>\ndomain/spectral/SpectralCoord|+loc : ivoa:RealQuantity\l}" alt="" coords="2669,861,2824,920"/>
-<area shape="rect" id="node49" href="#domain.spectral.CoordAxis" title="{domain/spectral/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="2636,983,2801,1053"/>
-<area shape="rect" id="node50" href="#domain.spectral.CoordSpace" title="{domain/spectral/CoordSpace}" alt="" coords="2362,866,2507,915"/>
-<area shape="rect" id="node51" href="#domain.spectral.CoordSpace1D" title="{domain/spectral/CoordSpace1D}" alt="" coords="2355,733,2514,782"/>
-<area shape="rect" id="node52" href="#domain.temporal.TimeScale" title="{<<enumeration>>\ldomain/temporal/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="3187,191,3331,346"/>
-<area shape="rect" id="node53" href="#domain.temporal.TimeCoord" title="{<<datatype>>\ndomain/temporal/TimeCoord}" alt="" coords="4201,866,4348,915"/>
-<area shape="rect" id="node59" href="#domain.temporal.CoordAxis" title="{domain/temporal/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="4101,983,4267,1053"/>
-<area shape="rect" id="node54" href="#domain.temporal.TimeOffset" title="{<<datatype>>\ndomain/temporal/TimeOffset|+loc : ivoa:RealQuantity\l}" alt="" coords="4201,728,4349,787"/>
-<area shape="rect" id="node55" href="#domain.temporal.TimeInstant" title="{<<datatype>>\ndomain/temporal/TimeInstant|+loc : ivoa:datetime\l}" alt="" coords="4373,728,4523,787"/>
-<area shape="rect" id="node57" href="#domain.temporal.CoordSpace" title="{domain/temporal/CoordSpace}" alt="" coords="4020,866,4169,915"/>
-<area shape="rect" id="node58" href="#domain.temporal.CoordSpace1D" title="{domain/temporal/CoordSpace1D}" alt="" coords="4013,733,4176,782"/>
-<area shape="rect" id="node60" href="#domain.polarization.PolStokes" title="{<<enumeration>>\ldomain/polarization/PolStokes|+I\l+Q\l+U\l+V\l}" alt="" coords="3355,221,3507,316"/>
-<area shape="rect" id="node61" href="#domain.polarization.PolCircular" title="{<<enumeration>>\ldomain/polarization/PolCircular|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="3531,221,3691,316"/>
-<area shape="rect" id="node62" href="#domain.polarization.PolLinear" title="{<<enumeration>>\ldomain/polarization/PolLinear|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="3715,221,3869,316"/>
-<area shape="rect" id="node63" href="#domain.polarization.PolVector" title="{<<enumeration>>\ldomain/polarization/PolVector|+I\l+PF\l+PP\l+PA\l}" alt="" coords="3893,221,4048,316"/>
-<area shape="rect" id="node64" href="#domain.polarization.PolCoord" title="{<<datatype>>\ndomain/polarization/PolCoord}" alt="" coords="3035,866,3186,915"/>
-<area shape="rect" id="node72" href="#domain.polarization.DiscreteAxis" title="{domain/polarization/DiscreteAxis|+name : ivoa:string\l}" alt="" coords="2891,993,3058,1043"/>
-<area shape="rect" id="node65" href="#domain.polarization.PolStokesCoord" title="{<<datatype>>\ndomain/polarization/PolStokesCoord|+loc : coordsys:domain.polarization.PolStokes\l}" alt="" coords="2983,728,3203,787"/>
-<area shape="rect" id="node66" href="#domain.polarization.PolCircularCoord" title="{<<datatype>>\ndomain/polarization/PolCircularCoord|+loc : coordsys:domain.polarization.PolCircular\l}" alt="" coords="3227,728,3455,787"/>
-<area shape="rect" id="node67" href="#domain.polarization.PolLinearCoord" title="{<<datatype>>\ndomain/polarization/PolLinearCoord|+loc : coordsys:domain.polarization.PolLinear\l}" alt="" coords="3768,728,3989,787"/>
-<area shape="rect" id="node68" href="#domain.polarization.PolVectorCoord" title="{<<datatype>>\ndomain/polarization/PolVectorCoord|+loc : coordsys:domain.polarization.PolVector\l}" alt="" coords="2737,728,2959,787"/>
-<area shape="rect" id="node70" href="#domain.polarization.CoordSpace" title="{domain/polarization/CoordSpace}" alt="" coords="2848,866,3011,915"/>
-<area shape="rect" id="node71" href="#domain.polarization.CoordSpace1D" title="{domain/polarization/CoordSpace1D}" alt="" coords="2538,733,2713,782"/>
+<area shape="rect" id="node8" href="#CoordFrame" title="{CoordFrame}" alt="" coords="2467,872,2543,921"/>
+<area shape="rect" id="node9" href="#CoordSys" title="{CoordSys}" alt="" coords="2320,611,2392,661"/>
+<area shape="rect" id="node18" href="#domain.generic.GenericFrame" title="{domain/generic/GenericFrame}" alt="" coords="2328,745,2483,794"/>
+<area shape="rect" id="node10" href="#AstroCoordSystem" title="{AstroCoordSystem}" alt="" coords="2509,244,2611,293"/>
+<area shape="rect" id="node34" href="#domain.spatial.SpaceFrame" title="{domain/spatial/SpaceFrame|+origin : coordsys_tessel:domain.spatial.SpatialLocation\l+orientation : coordsys_tessel:domain.spatial.StdRefFrame\l+equinox : coordsys_tessel:domain.spatial.Epoch\l}" alt="" coords="2021,601,2296,671"/>
+<area shape="rect" id="node48" href="#domain.spectral.SpectralFrame" title="{domain/spectral/SpectralFrame|+refPosition : coordsys_tessel:domain.spatial.SpatialLocation\l}" alt="" coords="2417,611,2703,661"/>
+<area shape="rect" id="node56" href="#domain.temporal.TimeFrame" title="{domain/temporal/TimeFrame|+timescale : coordsys_tessel:domain.temporal.TimeScale\l+refPosition : coordsys_tessel:domain.spatial.SpatialLocation\l+refDirection : coordsys_tessel:domain.spatial.SpatialLocation\l+offset : coordsys_tessel:domain.temporal.TimeOffset\l}" alt="" coords="3084,595,3377,677"/>
+<area shape="rect" id="node69" href="#domain.polarization.PolarizationFrame" title="{domain/polarization/PolarizationFrame}" alt="" coords="3762,611,3953,661"/>
+<area shape="rect" id="node11" href="#PixelCoordSystem" title="{PixelCoordSystem}" alt="" coords="1896,611,1997,661"/>
+<area shape="rect" id="node13" href="#domain.pixel.PixelFrame" title="{domain/pixel/PixelFrame}" alt="" coords="2123,745,2253,794"/>
+<area shape="rect" id="node12" href="#domain.pixel.PixelCoord" title="{<<datatype>>\ndomain/pixel/PixelCoord|+loc : ivoa:integer\l}" alt="" coords="1404,867,1532,926"/>
+<area shape="rect" id="node15" href="#domain.pixel.PixelAxis" title="{domain/pixel/PixelAxis|+name : ivoa:string\l+length : ivoa:nonnegativeInteger\l}" alt="" coords="1591,1001,1758,1059"/>
+<area shape="rect" id="node16" href="#domain.pixel.CoordSpace" title="{domain/pixel/CoordSpace}" alt="" coords="1787,872,1919,921"/>
+<area shape="rect" id="node14" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace}" alt="" coords="1789,745,1917,794"/>
+<area shape="rect" id="node17" href="#domain.generic.GenericCoord" title="{<<datatype>>\ndomain/generic/GenericCoord|+loc : ivoa:Quantity\l}" alt="" coords="2123,867,2275,926"/>
+<area shape="rect" id="node19" href="#domain.generic.CoordAxis" title="{domain/generic/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}" alt="" coords="1958,995,2103,1065"/>
+<area shape="rect" id="node20" href="#domain.generic.CoordSpace" title="{domain/generic/CoordSpace}" alt="" coords="1955,872,2098,921"/>
+<area shape="rect" id="node21" href="#domain.generic.CoordSpace1D" title="{domain/generic/CoordSpace1D}" alt="" coords="1942,745,2098,794"/>
+<area shape="rect" id="node22" href="#domain.spatial.EpochType" title="{<<enumeration>>\ldomain/spatial/EpochType|+J\l+B\l}" alt="" coords="2788,233,2924,304"/>
+<area shape="rect" id="node23" href="#domain.spatial.StdRefPosition" title="{<<enumeration>>\ldomain/spatial/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="3411,113,3565,424"/>
+<area shape="rect" id="node24" href="#domain.spatial.StdRefFrame" title="{<<enumeration>>\ldomain/spatial/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="3821,5,3966,532"/>
+<area shape="rect" id="node25" href="#domain.spatial.Handedness" title="{<<enumeration>>\ldomain/spatial/Handedness|+left\l+right\l}" alt="" coords="4107,233,4245,304"/>
+<area shape="rect" id="node26" href="#domain.spatial.HealpixScheme" title="{<<enumeration>>\ldomain/spatial/HealpixScheme|+NESTED\l+RING\l}" alt="" coords="4327,233,4481,304"/>
+<area shape="rect" id="node27" href="#domain.spatial.Epoch" title="{<<datatype>>\ndomain/spatial/Epoch|+type : coordsys_tessel:domain.spatial.EpochType\l+year : ivoa:real\l}" alt="" coords="4535,233,4774,304"/>
+<area shape="rect" id="node28" href="#domain.spatial.SpatialCoord" title="{<<datatype>>\ndomain/spatial/SpatialCoord|+loc : ivoa:Quantity\l}" alt="" coords="1729,607,1871,665"/>
+<area shape="rect" id="node38" href="#domain.spatial.CoordAxis" title="{domain/spatial/CoordAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}" alt="" coords="1619,740,1765,799"/>
+<area shape="rect" id="node29" href="#domain.spatial.SpatialLocation" title="{<<datatype>>\ndomain/spatial/SpatialLocation}" alt="" coords="5281,611,5436,661"/>
+<area shape="rect" id="node30" href="#domain.spatial.StdSpatialLocation" title="{<<datatype>>\ndomain/spatial/StdSpatialLocation|+coord : coordsys_tessel:domain.spatial.StdRefPosition\l}" alt="" coords="4813,239,5072,298"/>
+<area shape="rect" id="node31" href="#domain.spatial.SpatialLocation1D" title="{<<datatype>>\ndomain/spatial/SpatialLocation1D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}" alt="" coords="5096,239,5347,298"/>
+<area shape="rect" id="node32" href="#domain.spatial.SpatialLocation2D" title="{<<datatype>>\ndomain/spatial/SpatialLocation2D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}" alt="" coords="5371,239,5621,298"/>
+<area shape="rect" id="node33" href="#domain.spatial.SpatialLocation3D" title="{<<datatype>>\ndomain/spatial/SpatialLocation3D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}" alt="" coords="5645,239,5896,298"/>
+<area shape="rect" id="node35" href="#domain.spatial.CoordSpace" title="{domain/spatial/CoordSpace}" alt="" coords="1456,745,1595,794"/>
+<area shape="rect" id="node39" href="#domain.spatial.Axis" title="{domain/spatial/Axis|+name : ivoa:string\l}" alt="" coords="1556,872,1663,921"/>
+<area shape="rect" id="node36" href="#domain.spatial.Spherical" title="{domain/spatial/Spherical|+handedness : coordsys_tessel:domain.spatial.Handedness\l}" alt="" coords="1434,611,1705,661"/>
+<area shape="rect" id="node37" href="#domain.spatial.Cartesian" title="{domain/spatial/Cartesian|+handedness : coordsys_tessel:domain.spatial.Handedness\l}" alt="" coords="1139,611,1410,661"/>
+<area shape="rect" id="node40" href="#domain.spatial.TesselationAxis" title="{domain/spatial/TesselationAxis}" alt="" coords="1038,745,1194,794"/>
+<area shape="rect" id="node41" href="#domain.spatial.Tesselation" title="{domain/spatial/Tesselation}" alt="" coords="980,611,1116,661"/>
+<area shape="rect" id="node42" href="#domain.spatial.QuadCube" title="{domain/spatial/QuadCube}" alt="" coords="909,244,1041,293"/>
+<area shape="rect" id="node43" href="#domain.spatial.Igloo" title="{domain/spatial/Igloo}" alt="" coords="1065,244,1175,293"/>
+<area shape="rect" id="node44" href="#domain.spatial.Healpix" title="{domain/spatial/Healpix|+Schema : coordsys_tessel:domain.spatial.HealpixScheme\l+norder : ivoa:integer\l}" alt="" coords="1199,239,1473,298"/>
+<area shape="rect" id="node45" href="#domain.spatial.HTM" title="{domain/spatial/HTM}" alt="" coords="774,244,885,293"/>
+<area shape="rect" id="node46" href="#domain.spatial.SkyIndex" title="{domain/spatial/SkyIndex|+loc : ivoa:integer\l}" alt="" coords="829,611,955,661"/>
+<area shape="rect" id="node47" href="#domain.spectral.SpectralCoord" title="{<<datatype>>\ndomain/spectral/SpectralCoord|+loc : ivoa:RealQuantity\l}" alt="" coords="3180,740,3335,799"/>
+<area shape="rect" id="node49" href="#domain.spectral.CoordAxis" title="{domain/spectral/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="3144,861,3309,932"/>
+<area shape="rect" id="node50" href="#domain.spectral.CoordSpace" title="{domain/spectral/CoordSpace}" alt="" coords="2734,745,2879,794"/>
+<area shape="rect" id="node51" href="#domain.spectral.CoordSpace1D" title="{domain/spectral/CoordSpace1D}" alt="" coords="2727,611,2886,661"/>
+<area shape="rect" id="node52" href="#domain.temporal.TimeScale" title="{<<enumeration>>\ldomain/temporal/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="5920,191,6064,346"/>
+<area shape="rect" id="node53" href="#domain.temporal.TimeCoord" title="{<<datatype>>\ndomain/temporal/TimeCoord}" alt="" coords="3359,745,3505,794"/>
+<area shape="rect" id="node59" href="#domain.temporal.CoordAxis" title="{domain/temporal/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="3421,861,3587,932"/>
+<area shape="rect" id="node54" href="#domain.temporal.TimeOffset" title="{<<datatype>>\ndomain/temporal/TimeOffset|+loc : ivoa:RealQuantity\l}" alt="" coords="3402,607,3550,665"/>
+<area shape="rect" id="node55" href="#domain.temporal.TimeInstant" title="{<<datatype>>\ndomain/temporal/TimeInstant|+loc : ivoa:datetime\l}" alt="" coords="2911,607,3060,665"/>
+<area shape="rect" id="node57" href="#domain.temporal.CoordSpace" title="{domain/temporal/CoordSpace}" alt="" coords="3529,745,3679,794"/>
+<area shape="rect" id="node58" href="#domain.temporal.CoordSpace1D" title="{domain/temporal/CoordSpace1D}" alt="" coords="3575,611,3737,661"/>
+<area shape="rect" id="node60" href="#domain.polarization.PolStokes" title="{<<enumeration>>\ldomain/polarization/PolStokes|+I\l+Q\l+U\l+V\l}" alt="" coords="6088,221,6240,316"/>
+<area shape="rect" id="node61" href="#domain.polarization.PolCircular" title="{<<enumeration>>\ldomain/polarization/PolCircular|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="6264,221,6424,316"/>
+<area shape="rect" id="node62" href="#domain.polarization.PolLinear" title="{<<enumeration>>\ldomain/polarization/PolLinear|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="6449,221,6602,316"/>
+<area shape="rect" id="node63" href="#domain.polarization.PolVector" title="{<<enumeration>>\ldomain/polarization/PolVector|+I\l+PF\l+PP\l+PA\l}" alt="" coords="6627,221,6781,316"/>
+<area shape="rect" id="node64" href="#domain.polarization.PolCoord" title="{<<datatype>>\ndomain/polarization/PolCoord}" alt="" coords="4501,745,4651,794"/>
+<area shape="rect" id="node72" href="#domain.polarization.DiscreteAxis" title="{domain/polarization/DiscreteAxis|+name : ivoa:string\l}" alt="" coords="4237,872,4403,921"/>
+<area shape="rect" id="node65" href="#domain.polarization.PolStokesCoord" title="{<<datatype>>\ndomain/polarization/PolStokesCoord|+loc : coordsys_tessel:domain.polarization.PolStokes\l}" alt="" coords="4726,607,4975,665"/>
+<area shape="rect" id="node66" href="#domain.polarization.PolCircularCoord" title="{<<datatype>>\ndomain/polarization/PolCircularCoord|+loc : coordsys_tessel:domain.polarization.PolCircular\l}" alt="" coords="4999,607,5257,665"/>
+<area shape="rect" id="node67" href="#domain.polarization.PolLinearCoord" title="{<<datatype>>\ndomain/polarization/PolLinearCoord|+loc : coordsys_tessel:domain.polarization.PolLinear\l}" alt="" coords="4451,607,4701,665"/>
+<area shape="rect" id="node68" href="#domain.polarization.PolVectorCoord" title="{<<datatype>>\ndomain/polarization/PolVectorCoord|+loc : coordsys_tessel:domain.polarization.PolVector\l}" alt="" coords="4176,607,4427,665"/>
+<area shape="rect" id="node70" href="#domain.polarization.CoordSpace" title="{domain/polarization/CoordSpace}" alt="" coords="3983,745,4145,794"/>
+<area shape="rect" id="node71" href="#domain.polarization.CoordSpace1D" title="{domain/polarization/CoordSpace1D}" alt="" coords="3977,611,4151,661"/>
 </map>
 
     <hr>
@@ -461,7 +461,7 @@
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model</td>
-        <td class="objecttype-name">coordsys</td>
+        <td class="objecttype-name">coordsys_tessel</td>
       </tr>
       <tr>
         <td width="20%" class="info-title">child package(s)</td>
@@ -497,7 +497,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CoordSys">CoordSys [coordsys:CoordSys]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordSys">CoordSys [coordsys_tessel:CoordSys]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">references</td>
@@ -510,7 +510,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.polarizationFrame"></a><b>polarizationFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.polarization.PolarizationFrame">PolarizationFrame [coordsys:domain.polarization.PolarizationFrame]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolarizationFrame">PolarizationFrame [coordsys_tessel:domain.polarization.PolarizationFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -530,7 +530,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.spaceFrame"></a><b>spaceFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.SpaceFrame">SpaceFrame [coordsys:domain.spatial.SpaceFrame]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpaceFrame">SpaceFrame [coordsys_tessel:domain.spatial.SpaceFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -550,7 +550,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.spectralFrame"></a><b>spectralFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spectral.SpectralFrame">SpectralFrame [coordsys:domain.spectral.SpectralFrame]</a></td>
+                      <td class="feature-detail"><a href="#domain.spectral.SpectralFrame">SpectralFrame [coordsys_tessel:domain.spectral.SpectralFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -570,7 +570,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.timeFrame"></a><b>timeFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.temporal.TimeFrame">TimeFrame [coordsys:domain.temporal.TimeFrame]</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.TimeFrame">TimeFrame [coordsys_tessel:domain.temporal.TimeFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -663,7 +663,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="CoordSys.genericFrame"></a><b>genericFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.generic.GenericFrame">GenericFrame [coordsys:domain.generic.GenericFrame]</a></td>
+                      <td class="feature-detail"><a href="#domain.generic.GenericFrame">GenericFrame [coordsys_tessel:domain.generic.GenericFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -719,7 +719,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="PixelCoordSystem.pixelFrame"></a><b>pixelFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.pixel.PixelFrame">PixelFrame [coordsys:domain.pixel.PixelFrame]</a></td>
+                      <td class="feature-detail"><a href="#domain.pixel.PixelFrame">PixelFrame [coordsys_tessel:domain.pixel.PixelFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -765,7 +765,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">coordsys</a></td>
+        <td colspan="2" class="feature-detail"><a href="#model_section">coordsys_tessel</a></td>
       </tr>
       <tr>
         <td width="20%" class="info-title">child package(s)</td>
@@ -952,7 +952,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.generic.CoordSpace.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.generic.CoordAxis">CoordAxis [coordsys:domain.generic.CoordAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.generic.CoordAxis">CoordAxis [coordsys_tessel:domain.generic.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1007,7 +1007,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.CoordSpace">CoordSpace [coordsys:domain.generic.CoordSpace]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic.CoordSpace">CoordSpace [coordsys_tessel:domain.generic.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">constraints</td>
@@ -1086,7 +1086,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.GenericCoord.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.generic.CoordAxis">CoordAxis [coordsys:domain.generic.CoordAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.generic.CoordAxis">CoordAxis [coordsys_tessel:domain.generic.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1138,7 +1138,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys:CoordFrame]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys_tessel:CoordFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
@@ -1156,7 +1156,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.generic.GenericFrame.coordSpace"></a><b>coordSpace</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.generic.CoordSpace">CoordSpace [coordsys:domain.generic.CoordSpace]</a></td>
+                      <td class="feature-detail"><a href="#domain.generic.CoordSpace">CoordSpace [coordsys_tessel:domain.generic.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1259,7 +1259,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.pixel.CoordSpace.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.pixel.PixelAxis">PixelAxis [coordsys:domain.pixel.PixelAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.pixel.PixelAxis">PixelAxis [coordsys_tessel:domain.pixel.PixelAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1436,7 +1436,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.PixelCoord.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.pixel.PixelAxis">PixelAxis [coordsys:domain.pixel.PixelAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.pixel.PixelAxis">PixelAxis [coordsys_tessel:domain.pixel.PixelAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1488,7 +1488,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys:CoordFrame]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys_tessel:CoordFrame]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">compositions</td>
@@ -1501,7 +1501,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.pixel.PixelFrame.coordSpace"></a><b>coordSpace</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.pixel.CoordSpace">CoordSpace [coordsys:domain.pixel.CoordSpace]</a></td>
+                      <td class="feature-detail"><a href="#domain.pixel.CoordSpace">CoordSpace [coordsys_tessel:domain.pixel.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1556,7 +1556,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.pixel.CoordSpace">CoordSpace [coordsys:domain.pixel.CoordSpace]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel.CoordSpace">CoordSpace [coordsys_tessel:domain.pixel.CoordSpace]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -1645,7 +1645,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.polarization.CoordSpace.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.polarization.DiscreteAxis">DiscreteAxis [coordsys:domain.polarization.DiscreteAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.DiscreteAxis">DiscreteAxis [coordsys_tessel:domain.polarization.DiscreteAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1700,7 +1700,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.CoordSpace">CoordSpace [coordsys:domain.polarization.CoordSpace]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.CoordSpace">CoordSpace [coordsys_tessel:domain.polarization.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">constraints</td>
@@ -1884,7 +1884,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [coordsys:domain.polarization.PolCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [coordsys_tessel:domain.polarization.PolCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1897,7 +1897,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolCircularCoord.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.polarization.PolCircular">PolCircular [coordsys:domain.polarization.PolCircular]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolCircular">PolCircular [coordsys_tessel:domain.polarization.PolCircular]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -1962,7 +1962,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolCoord.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.polarization.DiscreteAxis">DiscreteAxis [coordsys:domain.polarization.DiscreteAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.DiscreteAxis">DiscreteAxis [coordsys_tessel:domain.polarization.DiscreteAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2091,7 +2091,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [coordsys:domain.polarization.PolCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [coordsys_tessel:domain.polarization.PolCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2104,7 +2104,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolLinearCoord.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.polarization.PolLinear">PolLinear [coordsys:domain.polarization.PolLinear]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolLinear">PolLinear [coordsys_tessel:domain.polarization.PolLinear]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2233,7 +2233,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [coordsys:domain.polarization.PolCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [coordsys_tessel:domain.polarization.PolCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2246,7 +2246,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolStokesCoord.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.polarization.PolStokes">PolStokes [coordsys:domain.polarization.PolStokes]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolStokes">PolStokes [coordsys_tessel:domain.polarization.PolStokes]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2375,7 +2375,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [coordsys:domain.polarization.PolCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [coordsys_tessel:domain.polarization.PolCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2388,7 +2388,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolVectorCoord.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.polarization.PolVector">PolVector [coordsys:domain.polarization.PolVector]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolVector">PolVector [coordsys_tessel:domain.polarization.PolVector]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2439,7 +2439,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys:CoordFrame]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys_tessel:CoordFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
@@ -2457,7 +2457,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.polarization.PolarizationFrame.coordSpace"></a><b>coordSpace</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.polarization.CoordSpace">CoordSpace [coordsys:domain.polarization.CoordSpace]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.CoordSpace">CoordSpace [coordsys_tessel:domain.polarization.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2551,10 +2551,6 @@
                       <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys:domain.spatial.CoordSpace]</a></td>
-                    </tr>
-                    <tr>
                       <td class="info-title">Subclasses in this model</td>
                       <td class="feature-detail" colspan="3"><a href="#domain.spatial.CoordAxis">CoordAxis</a> <a href="#domain.spatial.TesselationAxis">TesselationAxis</a> 
                       </td>
@@ -2621,7 +2617,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys:domain.spatial.CoordSpace]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys_tessel:domain.spatial.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2634,7 +2630,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Cartesian.handedness"></a><b>handedness</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Handedness">Handedness [coordsys:domain.spatial.Handedness]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.Handedness">Handedness [coordsys_tessel:domain.spatial.Handedness]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2691,7 +2687,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Axis">Axis [coordsys:domain.spatial.Axis]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Axis">Axis [coordsys_tessel:domain.spatial.Axis]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
@@ -2780,7 +2776,39 @@
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.Axis">Axis</a> <a href="#domain.spatial.Cartesian">Cartesian</a> <a href="#domain.spatial.Spherical">Spherical</a> <a href="#domain.spatial.Tesselation">Tesselation</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.Cartesian">Cartesian</a> <a href="#domain.spatial.Spherical">Spherical</a> <a href="#domain.spatial.Tesselation">Tesselation</a> 
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">compositions</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="5"><a name="domain.spatial.CoordSpace.axis"></a><b>axis</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.Axis">Axis [coordsys_tessel:domain.spatial.Axis]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.spatial.CoordSpace.axis</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                   </table>
@@ -2826,7 +2854,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Epoch.type"></a><b>type</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.EpochType">EpochType [coordsys:domain.spatial.EpochType]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.EpochType">EpochType [coordsys_tessel:domain.spatial.EpochType]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -2949,7 +2977,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Tesselation">Tesselation [coordsys:domain.spatial.Tesselation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Tesselation">Tesselation [coordsys_tessel:domain.spatial.Tesselation]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -3037,7 +3065,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Tesselation">Tesselation [coordsys:domain.spatial.Tesselation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Tesselation">Tesselation [coordsys_tessel:domain.spatial.Tesselation]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3050,7 +3078,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Healpix.Schema"></a><b>Schema</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.HealpixScheme">HealpixScheme [coordsys:domain.spatial.HealpixScheme]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.HealpixScheme">HealpixScheme [coordsys_tessel:domain.spatial.HealpixScheme]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3170,7 +3198,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Tesselation">Tesselation [coordsys:domain.spatial.Tesselation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Tesselation">Tesselation [coordsys_tessel:domain.spatial.Tesselation]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -3206,7 +3234,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Tesselation">Tesselation [coordsys:domain.spatial.Tesselation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Tesselation">Tesselation [coordsys_tessel:domain.spatial.Tesselation]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -3276,7 +3304,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SkyIndex.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.TesselationAxis">TesselationAxis [coordsys:domain.spatial.TesselationAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.TesselationAxis">TesselationAxis [coordsys_tessel:domain.spatial.TesselationAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3327,7 +3355,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys:CoordFrame]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys_tessel:CoordFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
@@ -3345,7 +3373,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpaceFrame.origin"></a><b>origin</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys:domain.spatial.SpatialLocation]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys_tessel:domain.spatial.SpatialLocation]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3365,7 +3393,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpaceFrame.orientation"></a><b>orientation</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.StdRefFrame">StdRefFrame [coordsys:domain.spatial.StdRefFrame]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.StdRefFrame">StdRefFrame [coordsys_tessel:domain.spatial.StdRefFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3385,7 +3413,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpaceFrame.equinox"></a><b>equinox</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Epoch">Epoch [coordsys:domain.spatial.Epoch]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.Epoch">Epoch [coordsys_tessel:domain.spatial.Epoch]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3413,7 +3441,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spatial.SpaceFrame.coordSpace"></a><b>coordSpace</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys:domain.spatial.CoordSpace]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys_tessel:domain.spatial.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3505,7 +3533,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpatialCoord.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.CoordAxis">CoordAxis [coordsys:domain.spatial.CoordAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.CoordAxis">CoordAxis [coordsys_tessel:domain.spatial.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3596,7 +3624,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys:domain.spatial.SpatialLocation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys_tessel:domain.spatial.SpatialLocation]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3609,7 +3637,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpatialLocation1D.coord"></a><b>coord</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coordsys:domain.spatial.SpatialCoord]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coordsys_tessel:domain.spatial.SpatialCoord]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3660,7 +3688,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys:domain.spatial.SpatialLocation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys_tessel:domain.spatial.SpatialLocation]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3673,7 +3701,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpatialLocation2D.coord"></a><b>coord</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coordsys:domain.spatial.SpatialCoord]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coordsys_tessel:domain.spatial.SpatialCoord]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3724,7 +3752,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys:domain.spatial.SpatialLocation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys_tessel:domain.spatial.SpatialLocation]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3737,7 +3765,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpatialLocation3D.coord"></a><b>coord</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coordsys:domain.spatial.SpatialCoord]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coordsys_tessel:domain.spatial.SpatialCoord]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -3788,7 +3816,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys:domain.spatial.CoordSpace]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys_tessel:domain.spatial.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3801,7 +3829,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Spherical.handedness"></a><b>handedness</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Handedness">Handedness [coordsys:domain.spatial.Handedness]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.Handedness">Handedness [coordsys_tessel:domain.spatial.Handedness]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -4716,7 +4744,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys:domain.spatial.SpatialLocation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys_tessel:domain.spatial.SpatialLocation]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4729,7 +4757,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.StdSpatialLocation.coord"></a><b>coord</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.StdRefPosition">StdRefPosition [coordsys:domain.spatial.StdRefPosition]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.StdRefPosition">StdRefPosition [coordsys_tessel:domain.spatial.StdRefPosition]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -4780,7 +4808,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys:domain.spatial.CoordSpace]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.CoordSpace">CoordSpace [coordsys_tessel:domain.spatial.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
@@ -4827,7 +4855,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Axis">Axis [coordsys:domain.spatial.Axis]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Axis">Axis [coordsys_tessel:domain.spatial.Axis]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
@@ -5020,7 +5048,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spectral.CoordSpace.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spectral.CoordAxis">CoordAxis [coordsys:domain.spectral.CoordAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.spectral.CoordAxis">CoordAxis [coordsys_tessel:domain.spectral.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5075,7 +5103,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.CoordSpace">CoordSpace [coordsys:domain.spectral.CoordSpace]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.CoordSpace">CoordSpace [coordsys_tessel:domain.spectral.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">constraints</td>
@@ -5151,7 +5179,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.SpectralCoord.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spectral.CoordAxis">CoordAxis [coordsys:domain.spectral.CoordAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.spectral.CoordAxis">CoordAxis [coordsys_tessel:domain.spectral.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5203,7 +5231,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys:CoordFrame]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys_tessel:CoordFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
@@ -5221,7 +5249,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.SpectralFrame.refPosition"></a><b>refPosition</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys:domain.spatial.SpatialLocation]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys_tessel:domain.spatial.SpatialLocation]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5249,7 +5277,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spectral.SpectralFrame.coordSpace"></a><b>coordSpace</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spectral.CoordSpace">CoordSpace [coordsys:domain.spectral.CoordSpace]</a></td>
+                      <td class="feature-detail"><a href="#domain.spectral.CoordSpace">CoordSpace [coordsys_tessel:domain.spectral.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5461,7 +5489,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.temporal.CoordSpace.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.temporal.CoordAxis">CoordAxis [coordsys:domain.temporal.CoordAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.CoordAxis">CoordAxis [coordsys_tessel:domain.temporal.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5516,7 +5544,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.CoordSpace">CoordSpace [coordsys:domain.temporal.CoordSpace]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.CoordSpace">CoordSpace [coordsys_tessel:domain.temporal.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">constraints</td>
@@ -5572,7 +5600,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeCoord.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.temporal.CoordAxis">CoordAxis [coordsys:domain.temporal.CoordAxis]</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.CoordAxis">CoordAxis [coordsys_tessel:domain.temporal.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5624,7 +5652,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys:CoordFrame]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coordsys_tessel:CoordFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
@@ -5642,7 +5670,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeFrame.timescale"></a><b>timescale</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.temporal.TimeScale">TimeScale [coordsys:domain.temporal.TimeScale]</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.TimeScale">TimeScale [coordsys_tessel:domain.temporal.TimeScale]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5662,7 +5690,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeFrame.refPosition"></a><b>refPosition</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys:domain.spatial.SpatialLocation]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys_tessel:domain.spatial.SpatialLocation]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5682,7 +5710,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeFrame.refDirection"></a><b>refDirection</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys:domain.spatial.SpatialLocation]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialLocation">SpatialLocation [coordsys_tessel:domain.spatial.SpatialLocation]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5702,7 +5730,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeFrame.offset"></a><b>offset</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.temporal.TimeOffset">TimeOffset [coordsys:domain.temporal.TimeOffset]</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.TimeOffset">TimeOffset [coordsys_tessel:domain.temporal.TimeOffset]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5730,7 +5758,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="5"><a name="domain.temporal.TimeFrame.coordSpace"></a><b>coordSpace</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.temporal.CoordSpace">CoordSpace [coordsys:domain.temporal.CoordSpace]</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.CoordSpace">CoordSpace [coordsys_tessel:domain.temporal.CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -5784,7 +5812,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.TimeCoord">TimeCoord [coordsys:domain.temporal.TimeCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.TimeCoord">TimeCoord [coordsys_tessel:domain.temporal.TimeCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -5845,7 +5873,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.TimeCoord">TimeCoord [coordsys:domain.temporal.TimeCoord]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.TimeCoord">TimeCoord [coordsys_tessel:domain.temporal.TimeCoord]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -6713,6 +6741,14 @@
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.spatial.CoordSpace.axis">domain.spatial.CoordSpace.axis</a></td>
+        <td class="feature-detail">composition</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
       </tr>
       <tr>

Modified: trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.map
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.map	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.map	Wed Apr 12 09:18:17 2017	(r3935)
@@ -6,69 +6,69 @@
 <area shape="rect" id="node5" href="#domain.spectral" title="spectral" alt="" coords="371,245,450,293"/>
 <area shape="rect" id="node6" href="#domain.temporal" title="temporal" alt="" coords="261,245,347,293"/>
 <area shape="rect" id="node7" href="#domain.polarization" title="polarization" alt="" coords="129,245,237,293"/>
-<area shape="rect" id="node8" href="#CoordFrame" title="{CoordFrame}" alt="" coords="1866,993,1942,1043"/>
-<area shape="rect" id="node9" href="#CoordSys" title="{CoordSys}" alt="" coords="1763,733,1835,782"/>
-<area shape="rect" id="node18" href="#domain.generic.GenericFrame" title="{domain/generic/GenericFrame}" alt="" coords="1721,866,1876,915"/>
-<area shape="rect" id="node10" href="#AstroCoordSystem" title="{AstroCoordSystem}" alt="" coords="1937,599,2039,649"/>
-<area shape="rect" id="node34" href="#domain.spatial.SpaceFrame" title="{domain/spatial/SpaceFrame|+origin : coordsys:domain.spatial.SpatialLocation\l+orientation : coordsys:domain.spatial.StdRefFrame\l+equinox : coordsys:domain.spatial.Epoch\l}" alt="" coords="1491,722,1738,793"/>
-<area shape="rect" id="node48" href="#domain.spectral.SpectralFrame" title="{domain/spectral/SpectralFrame|+refPosition : coordsys:domain.spatial.SpatialLocation\l}" alt="" coords="1859,733,2117,782"/>
-<area shape="rect" id="node56" href="#domain.temporal.TimeFrame" title="{domain/temporal/TimeFrame|+timescale : coordsys:domain.temporal.TimeScale\l+refPosition : coordsys:domain.spatial.SpatialLocation\l+refDirection : coordsys:domain.spatial.SpatialLocation\l+offset : coordsys:domain.temporal.TimeOffset\l}" alt="" coords="3480,716,3744,799"/>
-<area shape="rect" id="node69" href="#domain.polarization.PolarizationFrame" title="{domain/polarization/PolarizationFrame}" alt="" coords="2141,733,2331,782"/>
-<area shape="rect" id="node11" href="#PixelCoordSystem" title="{PixelCoordSystem}" alt="" coords="1365,733,1467,782"/>
-<area shape="rect" id="node13" href="#domain.pixel.PixelFrame" title="{domain/pixel/PixelFrame}" alt="" coords="1451,866,1581,915"/>
-<area shape="rect" id="node12" href="#domain.pixel.PixelCoord" title="{<<datatype>>\ndomain/pixel/PixelCoord|+loc : ivoa:integer\l}" alt="" coords="1072,989,1200,1047"/>
-<area shape="rect" id="node15" href="#domain.pixel.PixelAxis" title="{domain/pixel/PixelAxis|+name : ivoa:string\l+length : ivoa:nonnegativeInteger\l}" alt="" coords="1129,1122,1295,1181"/>
-<area shape="rect" id="node16" href="#domain.pixel.CoordSpace" title="{domain/pixel/CoordSpace}" alt="" coords="1225,993,1357,1043"/>
-<area shape="rect" id="node14" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace}" alt="" coords="911,866,1039,915"/>
-<area shape="rect" id="node17" href="#domain.generic.GenericCoord" title="{<<datatype>>\ndomain/generic/GenericCoord|+loc : ivoa:Quantity\l}" alt="" coords="1557,989,1709,1047"/>
-<area shape="rect" id="node19" href="#domain.generic.CoordAxis" title="{domain/generic/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}" alt="" coords="1395,1116,1541,1187"/>
-<area shape="rect" id="node20" href="#domain.generic.CoordSpace" title="{domain/generic/CoordSpace}" alt="" coords="1390,993,1533,1043"/>
-<area shape="rect" id="node21" href="#domain.generic.CoordSpace1D" title="{domain/generic/CoordSpace1D}" alt="" coords="1270,866,1426,915"/>
-<area shape="rect" id="node22" href="#domain.spatial.EpochType" title="{<<enumeration>>\ldomain/spatial/EpochType|+J\l+B\l}" alt="" coords="1107,233,1243,304"/>
-<area shape="rect" id="node23" href="#domain.spatial.StdRefPosition" title="{<<enumeration>>\ldomain/spatial/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="1267,113,1421,424"/>
-<area shape="rect" id="node24" href="#domain.spatial.StdRefFrame" title="{<<enumeration>>\ldomain/spatial/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="1446,5,1591,532"/>
-<area shape="rect" id="node25" href="#domain.spatial.Handedness" title="{<<enumeration>>\ldomain/spatial/Handedness|+left\l+right\l}" alt="" coords="1616,233,1755,304"/>
-<area shape="rect" id="node26" href="#domain.spatial.HealpixScheme" title="{<<enumeration>>\ldomain/spatial/HealpixScheme|+NESTED\l+RING\l}" alt="" coords="1779,233,1933,304"/>
-<area shape="rect" id="node27" href="#domain.spatial.Epoch" title="{<<datatype>>\ndomain/spatial/Epoch|+type : coordsys:domain.spatial.EpochType\l+year : ivoa:real\l}" alt="" coords="1958,233,2167,304"/>
-<area shape="rect" id="node28" href="#domain.spatial.SpatialCoord" title="{<<datatype>>\ndomain/spatial/SpatialCoord|+loc : ivoa:Quantity\l}" alt="" coords="941,239,1083,298"/>
-<area shape="rect" id="node38" href="#domain.spatial.CoordAxis" title="{domain/spatial/CoordAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}" alt="" coords="939,595,1085,653"/>
-<area shape="rect" id="node29" href="#domain.spatial.SpatialLocation" title="{<<datatype>>\ndomain/spatial/SpatialLocation}" alt="" coords="2603,599,2757,649"/>
-<area shape="rect" id="node30" href="#domain.spatial.StdSpatialLocation" title="{<<datatype>>\ndomain/spatial/StdSpatialLocation|+coord : coordsys:domain.spatial.StdRefPosition\l}" alt="" coords="2191,239,2422,298"/>
-<area shape="rect" id="node31" href="#domain.spatial.SpatialLocation1D" title="{<<datatype>>\ndomain/spatial/SpatialLocation1D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2446,239,2669,298"/>
-<area shape="rect" id="node32" href="#domain.spatial.SpatialLocation2D" title="{<<datatype>>\ndomain/spatial/SpatialLocation2D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2693,239,2915,298"/>
-<area shape="rect" id="node33" href="#domain.spatial.SpatialLocation3D" title="{<<datatype>>\ndomain/spatial/SpatialLocation3D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2939,239,3162,298"/>
-<area shape="rect" id="node35" href="#domain.spatial.CoordSpace" title="{domain/spatial/CoordSpace}" alt="" coords="1063,866,1201,915"/>
-<area shape="rect" id="node36" href="#domain.spatial.Spherical" title="{domain/spatial/Spherical|+handedness : coordsys:domain.spatial.Handedness\l}" alt="" coords="543,733,785,782"/>
-<area shape="rect" id="node37" href="#domain.spatial.Cartesian" title="{domain/spatial/Cartesian|+handedness : coordsys:domain.spatial.Handedness\l}" alt="" coords="809,733,1050,782"/>
-<area shape="rect" id="node39" href="#domain.spatial.Axis" title="{domain/spatial/Axis|+name : ivoa:string\l}" alt="" coords="1075,733,1181,782"/>
-<area shape="rect" id="node40" href="#domain.spatial.TesselationAxis" title="{domain/spatial/TesselationAxis}" alt="" coords="759,599,915,649"/>
-<area shape="rect" id="node41" href="#domain.spatial.Tesselation" title="{domain/spatial/Tesselation}" alt="" coords="1205,733,1341,782"/>
-<area shape="rect" id="node42" href="#domain.spatial.QuadCube" title="{domain/spatial/QuadCube}" alt="" coords="1109,599,1241,649"/>
-<area shape="rect" id="node43" href="#domain.spatial.Igloo" title="{domain/spatial/Igloo}" alt="" coords="1265,599,1375,649"/>
-<area shape="rect" id="node44" href="#domain.spatial.Healpix" title="{domain/spatial/Healpix|+Schema : coordsys:domain.spatial.HealpixScheme\l+norder : ivoa:integer\l}" alt="" coords="1399,595,1643,653"/>
-<area shape="rect" id="node45" href="#domain.spatial.HTM" title="{domain/spatial/HTM}" alt="" coords="1667,599,1778,649"/>
-<area shape="rect" id="node46" href="#domain.spatial.SkyIndex" title="{domain/spatial/SkyIndex|+loc : ivoa:integer\l}" alt="" coords="774,244,901,293"/>
-<area shape="rect" id="node47" href="#domain.spectral.SpectralCoord" title="{<<datatype>>\ndomain/spectral/SpectralCoord|+loc : ivoa:RealQuantity\l}" alt="" coords="2669,861,2824,920"/>
-<area shape="rect" id="node49" href="#domain.spectral.CoordAxis" title="{domain/spectral/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="2636,983,2801,1053"/>
-<area shape="rect" id="node50" href="#domain.spectral.CoordSpace" title="{domain/spectral/CoordSpace}" alt="" coords="2362,866,2507,915"/>
-<area shape="rect" id="node51" href="#domain.spectral.CoordSpace1D" title="{domain/spectral/CoordSpace1D}" alt="" coords="2355,733,2514,782"/>
-<area shape="rect" id="node52" href="#domain.temporal.TimeScale" title="{<<enumeration>>\ldomain/temporal/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="3187,191,3331,346"/>
-<area shape="rect" id="node53" href="#domain.temporal.TimeCoord" title="{<<datatype>>\ndomain/temporal/TimeCoord}" alt="" coords="4201,866,4348,915"/>
-<area shape="rect" id="node59" href="#domain.temporal.CoordAxis" title="{domain/temporal/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="4101,983,4267,1053"/>
-<area shape="rect" id="node54" href="#domain.temporal.TimeOffset" title="{<<datatype>>\ndomain/temporal/TimeOffset|+loc : ivoa:RealQuantity\l}" alt="" coords="4201,728,4349,787"/>
-<area shape="rect" id="node55" href="#domain.temporal.TimeInstant" title="{<<datatype>>\ndomain/temporal/TimeInstant|+loc : ivoa:datetime\l}" alt="" coords="4373,728,4523,787"/>
-<area shape="rect" id="node57" href="#domain.temporal.CoordSpace" title="{domain/temporal/CoordSpace}" alt="" coords="4020,866,4169,915"/>
-<area shape="rect" id="node58" href="#domain.temporal.CoordSpace1D" title="{domain/temporal/CoordSpace1D}" alt="" coords="4013,733,4176,782"/>
-<area shape="rect" id="node60" href="#domain.polarization.PolStokes" title="{<<enumeration>>\ldomain/polarization/PolStokes|+I\l+Q\l+U\l+V\l}" alt="" coords="3355,221,3507,316"/>
-<area shape="rect" id="node61" href="#domain.polarization.PolCircular" title="{<<enumeration>>\ldomain/polarization/PolCircular|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="3531,221,3691,316"/>
-<area shape="rect" id="node62" href="#domain.polarization.PolLinear" title="{<<enumeration>>\ldomain/polarization/PolLinear|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="3715,221,3869,316"/>
-<area shape="rect" id="node63" href="#domain.polarization.PolVector" title="{<<enumeration>>\ldomain/polarization/PolVector|+I\l+PF\l+PP\l+PA\l}" alt="" coords="3893,221,4048,316"/>
-<area shape="rect" id="node64" href="#domain.polarization.PolCoord" title="{<<datatype>>\ndomain/polarization/PolCoord}" alt="" coords="3035,866,3186,915"/>
-<area shape="rect" id="node72" href="#domain.polarization.DiscreteAxis" title="{domain/polarization/DiscreteAxis|+name : ivoa:string\l}" alt="" coords="2891,993,3058,1043"/>
-<area shape="rect" id="node65" href="#domain.polarization.PolStokesCoord" title="{<<datatype>>\ndomain/polarization/PolStokesCoord|+loc : coordsys:domain.polarization.PolStokes\l}" alt="" coords="2983,728,3203,787"/>
-<area shape="rect" id="node66" href="#domain.polarization.PolCircularCoord" title="{<<datatype>>\ndomain/polarization/PolCircularCoord|+loc : coordsys:domain.polarization.PolCircular\l}" alt="" coords="3227,728,3455,787"/>
-<area shape="rect" id="node67" href="#domain.polarization.PolLinearCoord" title="{<<datatype>>\ndomain/polarization/PolLinearCoord|+loc : coordsys:domain.polarization.PolLinear\l}" alt="" coords="3768,728,3989,787"/>
-<area shape="rect" id="node68" href="#domain.polarization.PolVectorCoord" title="{<<datatype>>\ndomain/polarization/PolVectorCoord|+loc : coordsys:domain.polarization.PolVector\l}" alt="" coords="2737,728,2959,787"/>
-<area shape="rect" id="node70" href="#domain.polarization.CoordSpace" title="{domain/polarization/CoordSpace}" alt="" coords="2848,866,3011,915"/>
-<area shape="rect" id="node71" href="#domain.polarization.CoordSpace1D" title="{domain/polarization/CoordSpace1D}" alt="" coords="2538,733,2713,782"/>
+<area shape="rect" id="node8" href="#CoordFrame" title="{CoordFrame}" alt="" coords="2467,872,2543,921"/>
+<area shape="rect" id="node9" href="#CoordSys" title="{CoordSys}" alt="" coords="2320,611,2392,661"/>
+<area shape="rect" id="node18" href="#domain.generic.GenericFrame" title="{domain/generic/GenericFrame}" alt="" coords="2328,745,2483,794"/>
+<area shape="rect" id="node10" href="#AstroCoordSystem" title="{AstroCoordSystem}" alt="" coords="2509,244,2611,293"/>
+<area shape="rect" id="node34" href="#domain.spatial.SpaceFrame" title="{domain/spatial/SpaceFrame|+origin : coordsys_tessel:domain.spatial.SpatialLocation\l+orientation : coordsys_tessel:domain.spatial.StdRefFrame\l+equinox : coordsys_tessel:domain.spatial.Epoch\l}" alt="" coords="2021,601,2296,671"/>
+<area shape="rect" id="node48" href="#domain.spectral.SpectralFrame" title="{domain/spectral/SpectralFrame|+refPosition : coordsys_tessel:domain.spatial.SpatialLocation\l}" alt="" coords="2417,611,2703,661"/>
+<area shape="rect" id="node56" href="#domain.temporal.TimeFrame" title="{domain/temporal/TimeFrame|+timescale : coordsys_tessel:domain.temporal.TimeScale\l+refPosition : coordsys_tessel:domain.spatial.SpatialLocation\l+refDirection : coordsys_tessel:domain.spatial.SpatialLocation\l+offset : coordsys_tessel:domain.temporal.TimeOffset\l}" alt="" coords="3084,595,3377,677"/>
+<area shape="rect" id="node69" href="#domain.polarization.PolarizationFrame" title="{domain/polarization/PolarizationFrame}" alt="" coords="3762,611,3953,661"/>
+<area shape="rect" id="node11" href="#PixelCoordSystem" title="{PixelCoordSystem}" alt="" coords="1896,611,1997,661"/>
+<area shape="rect" id="node13" href="#domain.pixel.PixelFrame" title="{domain/pixel/PixelFrame}" alt="" coords="2123,745,2253,794"/>
+<area shape="rect" id="node12" href="#domain.pixel.PixelCoord" title="{<<datatype>>\ndomain/pixel/PixelCoord|+loc : ivoa:integer\l}" alt="" coords="1404,867,1532,926"/>
+<area shape="rect" id="node15" href="#domain.pixel.PixelAxis" title="{domain/pixel/PixelAxis|+name : ivoa:string\l+length : ivoa:nonnegativeInteger\l}" alt="" coords="1591,1001,1758,1059"/>
+<area shape="rect" id="node16" href="#domain.pixel.CoordSpace" title="{domain/pixel/CoordSpace}" alt="" coords="1787,872,1919,921"/>
+<area shape="rect" id="node14" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace}" alt="" coords="1789,745,1917,794"/>
+<area shape="rect" id="node17" href="#domain.generic.GenericCoord" title="{<<datatype>>\ndomain/generic/GenericCoord|+loc : ivoa:Quantity\l}" alt="" coords="2123,867,2275,926"/>
+<area shape="rect" id="node19" href="#domain.generic.CoordAxis" title="{domain/generic/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}" alt="" coords="1958,995,2103,1065"/>
+<area shape="rect" id="node20" href="#domain.generic.CoordSpace" title="{domain/generic/CoordSpace}" alt="" coords="1955,872,2098,921"/>
+<area shape="rect" id="node21" href="#domain.generic.CoordSpace1D" title="{domain/generic/CoordSpace1D}" alt="" coords="1942,745,2098,794"/>
+<area shape="rect" id="node22" href="#domain.spatial.EpochType" title="{<<enumeration>>\ldomain/spatial/EpochType|+J\l+B\l}" alt="" coords="2788,233,2924,304"/>
+<area shape="rect" id="node23" href="#domain.spatial.StdRefPosition" title="{<<enumeration>>\ldomain/spatial/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="3411,113,3565,424"/>
+<area shape="rect" id="node24" href="#domain.spatial.StdRefFrame" title="{<<enumeration>>\ldomain/spatial/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="3821,5,3966,532"/>
+<area shape="rect" id="node25" href="#domain.spatial.Handedness" title="{<<enumeration>>\ldomain/spatial/Handedness|+left\l+right\l}" alt="" coords="4107,233,4245,304"/>
+<area shape="rect" id="node26" href="#domain.spatial.HealpixScheme" title="{<<enumeration>>\ldomain/spatial/HealpixScheme|+NESTED\l+RING\l}" alt="" coords="4327,233,4481,304"/>
+<area shape="rect" id="node27" href="#domain.spatial.Epoch" title="{<<datatype>>\ndomain/spatial/Epoch|+type : coordsys_tessel:domain.spatial.EpochType\l+year : ivoa:real\l}" alt="" coords="4535,233,4774,304"/>
+<area shape="rect" id="node28" href="#domain.spatial.SpatialCoord" title="{<<datatype>>\ndomain/spatial/SpatialCoord|+loc : ivoa:Quantity\l}" alt="" coords="1729,607,1871,665"/>
+<area shape="rect" id="node38" href="#domain.spatial.CoordAxis" title="{domain/spatial/CoordAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l}" alt="" coords="1619,740,1765,799"/>
+<area shape="rect" id="node29" href="#domain.spatial.SpatialLocation" title="{<<datatype>>\ndomain/spatial/SpatialLocation}" alt="" coords="5281,611,5436,661"/>
+<area shape="rect" id="node30" href="#domain.spatial.StdSpatialLocation" title="{<<datatype>>\ndomain/spatial/StdSpatialLocation|+coord : coordsys_tessel:domain.spatial.StdRefPosition\l}" alt="" coords="4813,239,5072,298"/>
+<area shape="rect" id="node31" href="#domain.spatial.SpatialLocation1D" title="{<<datatype>>\ndomain/spatial/SpatialLocation1D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}" alt="" coords="5096,239,5347,298"/>
+<area shape="rect" id="node32" href="#domain.spatial.SpatialLocation2D" title="{<<datatype>>\ndomain/spatial/SpatialLocation2D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}" alt="" coords="5371,239,5621,298"/>
+<area shape="rect" id="node33" href="#domain.spatial.SpatialLocation3D" title="{<<datatype>>\ndomain/spatial/SpatialLocation3D|+coord : coordsys_tessel:domain.spatial.SpatialCoord\l}" alt="" coords="5645,239,5896,298"/>
+<area shape="rect" id="node35" href="#domain.spatial.CoordSpace" title="{domain/spatial/CoordSpace}" alt="" coords="1456,745,1595,794"/>
+<area shape="rect" id="node39" href="#domain.spatial.Axis" title="{domain/spatial/Axis|+name : ivoa:string\l}" alt="" coords="1556,872,1663,921"/>
+<area shape="rect" id="node36" href="#domain.spatial.Spherical" title="{domain/spatial/Spherical|+handedness : coordsys_tessel:domain.spatial.Handedness\l}" alt="" coords="1434,611,1705,661"/>
+<area shape="rect" id="node37" href="#domain.spatial.Cartesian" title="{domain/spatial/Cartesian|+handedness : coordsys_tessel:domain.spatial.Handedness\l}" alt="" coords="1139,611,1410,661"/>
+<area shape="rect" id="node40" href="#domain.spatial.TesselationAxis" title="{domain/spatial/TesselationAxis}" alt="" coords="1038,745,1194,794"/>
+<area shape="rect" id="node41" href="#domain.spatial.Tesselation" title="{domain/spatial/Tesselation}" alt="" coords="980,611,1116,661"/>
+<area shape="rect" id="node42" href="#domain.spatial.QuadCube" title="{domain/spatial/QuadCube}" alt="" coords="909,244,1041,293"/>
+<area shape="rect" id="node43" href="#domain.spatial.Igloo" title="{domain/spatial/Igloo}" alt="" coords="1065,244,1175,293"/>
+<area shape="rect" id="node44" href="#domain.spatial.Healpix" title="{domain/spatial/Healpix|+Schema : coordsys_tessel:domain.spatial.HealpixScheme\l+norder : ivoa:integer\l}" alt="" coords="1199,239,1473,298"/>
+<area shape="rect" id="node45" href="#domain.spatial.HTM" title="{domain/spatial/HTM}" alt="" coords="774,244,885,293"/>
+<area shape="rect" id="node46" href="#domain.spatial.SkyIndex" title="{domain/spatial/SkyIndex|+loc : ivoa:integer\l}" alt="" coords="829,611,955,661"/>
+<area shape="rect" id="node47" href="#domain.spectral.SpectralCoord" title="{<<datatype>>\ndomain/spectral/SpectralCoord|+loc : ivoa:RealQuantity\l}" alt="" coords="3180,740,3335,799"/>
+<area shape="rect" id="node49" href="#domain.spectral.CoordAxis" title="{domain/spectral/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="3144,861,3309,932"/>
+<area shape="rect" id="node50" href="#domain.spectral.CoordSpace" title="{domain/spectral/CoordSpace}" alt="" coords="2734,745,2879,794"/>
+<area shape="rect" id="node51" href="#domain.spectral.CoordSpace1D" title="{domain/spectral/CoordSpace1D}" alt="" coords="2727,611,2886,661"/>
+<area shape="rect" id="node52" href="#domain.temporal.TimeScale" title="{<<enumeration>>\ldomain/temporal/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="5920,191,6064,346"/>
+<area shape="rect" id="node53" href="#domain.temporal.TimeCoord" title="{<<datatype>>\ndomain/temporal/TimeCoord}" alt="" coords="3359,745,3505,794"/>
+<area shape="rect" id="node59" href="#domain.temporal.CoordAxis" title="{domain/temporal/CoordAxis|+name : ivoa:string\l+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="3421,861,3587,932"/>
+<area shape="rect" id="node54" href="#domain.temporal.TimeOffset" title="{<<datatype>>\ndomain/temporal/TimeOffset|+loc : ivoa:RealQuantity\l}" alt="" coords="3402,607,3550,665"/>
+<area shape="rect" id="node55" href="#domain.temporal.TimeInstant" title="{<<datatype>>\ndomain/temporal/TimeInstant|+loc : ivoa:datetime\l}" alt="" coords="2911,607,3060,665"/>
+<area shape="rect" id="node57" href="#domain.temporal.CoordSpace" title="{domain/temporal/CoordSpace}" alt="" coords="3529,745,3679,794"/>
+<area shape="rect" id="node58" href="#domain.temporal.CoordSpace1D" title="{domain/temporal/CoordSpace1D}" alt="" coords="3575,611,3737,661"/>
+<area shape="rect" id="node60" href="#domain.polarization.PolStokes" title="{<<enumeration>>\ldomain/polarization/PolStokes|+I\l+Q\l+U\l+V\l}" alt="" coords="6088,221,6240,316"/>
+<area shape="rect" id="node61" href="#domain.polarization.PolCircular" title="{<<enumeration>>\ldomain/polarization/PolCircular|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="6264,221,6424,316"/>
+<area shape="rect" id="node62" href="#domain.polarization.PolLinear" title="{<<enumeration>>\ldomain/polarization/PolLinear|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="6449,221,6602,316"/>
+<area shape="rect" id="node63" href="#domain.polarization.PolVector" title="{<<enumeration>>\ldomain/polarization/PolVector|+I\l+PF\l+PP\l+PA\l}" alt="" coords="6627,221,6781,316"/>
+<area shape="rect" id="node64" href="#domain.polarization.PolCoord" title="{<<datatype>>\ndomain/polarization/PolCoord}" alt="" coords="4501,745,4651,794"/>
+<area shape="rect" id="node72" href="#domain.polarization.DiscreteAxis" title="{domain/polarization/DiscreteAxis|+name : ivoa:string\l}" alt="" coords="4237,872,4403,921"/>
+<area shape="rect" id="node65" href="#domain.polarization.PolStokesCoord" title="{<<datatype>>\ndomain/polarization/PolStokesCoord|+loc : coordsys_tessel:domain.polarization.PolStokes\l}" alt="" coords="4726,607,4975,665"/>
+<area shape="rect" id="node66" href="#domain.polarization.PolCircularCoord" title="{<<datatype>>\ndomain/polarization/PolCircularCoord|+loc : coordsys_tessel:domain.polarization.PolCircular\l}" alt="" coords="4999,607,5257,665"/>
+<area shape="rect" id="node67" href="#domain.polarization.PolLinearCoord" title="{<<datatype>>\ndomain/polarization/PolLinearCoord|+loc : coordsys_tessel:domain.polarization.PolLinear\l}" alt="" coords="4451,607,4701,665"/>
+<area shape="rect" id="node68" href="#domain.polarization.PolVectorCoord" title="{<<datatype>>\ndomain/polarization/PolVectorCoord|+loc : coordsys_tessel:domain.polarization.PolVector\l}" alt="" coords="4176,607,4427,665"/>
+<area shape="rect" id="node70" href="#domain.polarization.CoordSpace" title="{domain/polarization/CoordSpace}" alt="" coords="3983,745,4145,794"/>
+<area shape="rect" id="node71" href="#domain.polarization.CoordSpace1D" title="{domain/polarization/CoordSpace1D}" alt="" coords="3977,611,4151,661"/>
 </map>

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

Modified: trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml	Wed Apr 12 09:18:17 2017	(r3935)
@@ -2,14 +2,14 @@
 <vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1.0"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.ivoa.net/xml/VODML/v1.0 http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/xsd/vo-dml-v1.0.xsd">
-  <name>coordsys</name>
+  <name>coordsys_tessel</name>
   <description>The coordsys model defines a pattern for Coordinate Frame specifications, various Coordinate System objects for bundling Coordinate Frames into associated groups, and implements the CoordFrame pattern for several physical domains.  The expectation is that as models are created which touch on domains not represented here, they will implement this pattern in the same fashion for the new domain.  This implementation may reside in the other model, or be added to this list of implementations.  Models which refer to the CoordFrame of this model are stating an expectation that the instances included follow the specified pattern.
 </description>
   <title>STC2 Coordinate System model</title>
-  <author>Arnold Rots, Mark Cresitello-Dittmar</author>
+  <author>Arnold Rots, Mark Cresitello-Dittmar, L Michel</author>
   <version>2.0</version>
   <previousVersion>0.x</previousVersion>
-  <lastModified>2017-03-29T17:26:00</lastModified>
+  <lastModified>2017-04-11T15:58:53</lastModified>
   <import>
     <name>ivoa</name>
     <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</url>
@@ -34,7 +34,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>coordsys:domain.generic.GenericFrame</vodml-ref>
+        <vodml-ref>coordsys_tessel:domain.generic.GenericFrame</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>0</minOccurs>
@@ -48,7 +48,7 @@
     <name>AstroCoordSystem</name>
     <description>AstroCoordSystem is a container object for organizing physical Coordinate Frame specifications into related groupings.  The object provides a references to Coordinate Frame instances in each of the known domain implementations.  As a whole, the AstroCoordSystem should provide a complete description of the domain space. </description>
     <extends>
-      <vodml-ref>coordsys:CoordSys</vodml-ref>
+      <vodml-ref>coordsys_tessel:CoordSys</vodml-ref>
     </extends>
     <reference>
       <vodml-id>AstroCoordSystem.polarizationFrame</vodml-id>
@@ -57,7 +57,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>coordsys:domain.polarization.PolarizationFrame</vodml-ref>
+        <vodml-ref>coordsys_tessel:domain.polarization.PolarizationFrame</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>0</minOccurs>
@@ -71,7 +71,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>coordsys:domain.spatial.SpaceFrame</vodml-ref>
+        <vodml-ref>coordsys_tessel:domain.spatial.SpaceFrame</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>0</minOccurs>
@@ -85,7 +85,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>coordsys:domain.temporal.TimeFrame</vodml-ref>
+        <vodml-ref>coordsys_tessel:domain.temporal.TimeFrame</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>0</minOccurs>
@@ -99,7 +99,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>coordsys:domain.spectral.SpectralFrame</vodml-ref>
+        <vodml-ref>coordsys_tessel:domain.spectral.SpectralFrame</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>0</minOccurs>
@@ -119,7 +119,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
       <datatype>
-        <vodml-ref>coordsys:domain.pixel.PixelFrame</vodml-ref>
+        <vodml-ref>coordsys_tessel:domain.pixel.PixelFrame</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
@@ -168,7 +168,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.pixel.PixelAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.pixel.PixelAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -185,7 +185,7 @@
 orientation: n/a
 </description>
         <extends>
-          <vodml-ref>coordsys:CoordFrame</vodml-ref>
+          <vodml-ref>coordsys_tessel:CoordFrame</vodml-ref>
         </extends>
         <composition>
           <vodml-id>domain.pixel.PixelFrame.coordSpace</vodml-id>
@@ -194,7 +194,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.pixel.CoordSpace</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.pixel.CoordSpace</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -210,7 +210,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.pixel.CoordSpace</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.pixel.CoordSpace</vodml-ref>
         </extends>
       </objectType>
 
@@ -263,7 +263,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.pixel.PixelAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.pixel.PixelAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -306,7 +306,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.generic.CoordAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.generic.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -323,7 +323,7 @@
 orientation: n/a
 </description>
         <extends>
-          <vodml-ref>coordsys:CoordFrame</vodml-ref>
+          <vodml-ref>coordsys_tessel:CoordFrame</vodml-ref>
         </extends>
         <composition>
           <vodml-id>domain.generic.GenericFrame.coordSpace</vodml-id>
@@ -332,7 +332,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.generic.CoordSpace</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.generic.CoordSpace</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -404,7 +404,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.generic.CoordAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.generic.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -420,7 +420,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.generic.CoordSpace</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.generic.CoordSpace</vodml-ref>
         </extends>
         <constraint>
           <description><axis:CoordAxis[1]></description>
@@ -966,7 +966,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.EpochType</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.EpochType</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1015,7 +1015,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.CoordAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1038,7 +1038,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.SpatialLocation</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.SpatialLocation</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.StdSpatialLocation.coord</vodml-id>
@@ -1047,7 +1047,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.StdRefPosition</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.StdRefPosition</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1063,7 +1063,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.SpatialLocation</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.SpatialLocation</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.SpatialLocation1D.coord</vodml-id>
@@ -1072,7 +1072,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialCoord</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.SpatialCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1088,7 +1088,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.SpatialLocation</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.SpatialLocation</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.SpatialLocation2D.coord</vodml-id>
@@ -1097,7 +1097,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialCoord</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.SpatialCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>2</minOccurs>
@@ -1113,7 +1113,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.SpatialLocation</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.SpatialLocation</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.SpatialLocation3D.coord</vodml-id>
@@ -1122,7 +1122,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialCoord</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.SpatialCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>3</minOccurs>
@@ -1138,7 +1138,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:CoordFrame</vodml-ref>
+          <vodml-ref>coordsys_tessel:CoordFrame</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.SpaceFrame.origin</vodml-id>
@@ -1147,7 +1147,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialLocation</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.SpatialLocation</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1161,7 +1161,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.StdRefFrame</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.StdRefFrame</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1175,7 +1175,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.Epoch</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.Epoch</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -1189,7 +1189,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.CoordSpace</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.CoordSpace</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1204,6 +1204,20 @@
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+        <composition>
+          <vodml-id>domain.spatial.CoordSpace.axis</vodml-id>
+          <name>axis</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>coordsys_tessel:domain.spatial.Axis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>-1</maxOccurs>
+          </multiplicity>
+        </composition>
       </objectType>
 
       <objectType>
@@ -1213,7 +1227,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.CoordSpace</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.CoordSpace</vodml-ref>
         </extends>
         <constraint>
           <description>axis:CoordAxis[3]</description>
@@ -1225,7 +1239,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.Handedness</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.Handedness</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -1241,7 +1255,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.CoordSpace</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.CoordSpace</vodml-ref>
         </extends>
         <constraint>
           <description>axis:CoordAxis[3]</description>
@@ -1253,7 +1267,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.Handedness</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.Handedness</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -1269,7 +1283,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.Axis</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.Axis</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.CoordAxis.domainMin</vodml-id>
@@ -1307,9 +1321,6 @@
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coordsys:domain.spatial.CoordSpace</vodml-ref>
-        </extends>
         <attribute>
           <vodml-id>domain.spatial.Axis.name</vodml-id>
           <name>name</name>
@@ -1333,7 +1344,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.Axis</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.Axis</vodml-ref>
         </extends>
       </objectType>
 
@@ -1344,7 +1355,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.CoordSpace</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.CoordSpace</vodml-ref>
         </extends>
         <constraint>
           <description>{:axis:TesselationAxis[1]}</description>
@@ -1358,7 +1369,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.Tesselation</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.Tesselation</vodml-ref>
         </extends>
       </objectType>
 
@@ -1367,7 +1378,7 @@
         <name>Igloo</name>
         <description><Enter note text here></description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.Tesselation</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.Tesselation</vodml-ref>
         </extends>
       </objectType>
 
@@ -1378,7 +1389,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.Tesselation</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.Tesselation</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spatial.Healpix.Schema</vodml-id>
@@ -1387,7 +1398,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.HealpixScheme</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.HealpixScheme</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1417,7 +1428,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spatial.Tesselation</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spatial.Tesselation</vodml-ref>
         </extends>
       </objectType>
 
@@ -1446,7 +1457,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.TesselationAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.TesselationAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1489,7 +1500,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spectral.CoordAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spectral.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1506,7 +1517,7 @@
 orientation: n/a
 </description>
         <extends>
-          <vodml-ref>coordsys:CoordFrame</vodml-ref>
+          <vodml-ref>coordsys_tessel:CoordFrame</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.spectral.SpectralFrame.refPosition</vodml-id>
@@ -1515,7 +1526,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialLocation</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.SpatialLocation</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1529,7 +1540,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spectral.CoordSpace</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spectral.CoordSpace</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1601,7 +1612,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spectral.CoordAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spectral.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1617,7 +1628,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.spectral.CoordSpace</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.spectral.CoordSpace</vodml-ref>
         </extends>
         <constraint>
           <description><axis:CoordAxis[1]></description>
@@ -1716,7 +1727,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.temporal.CoordAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.temporal.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1730,7 +1741,7 @@
         <name>TimeOffset</name>
         <description>The time coordinate is represented as an offset from the origin.</description>
         <extends>
-          <vodml-ref>coordsys:domain.temporal.TimeCoord</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.temporal.TimeCoord</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.TimeOffset.loc</vodml-id>
@@ -1753,7 +1764,7 @@
         <name>TimeInstant</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>
         <extends>
-          <vodml-ref>coordsys:domain.temporal.TimeCoord</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.temporal.TimeCoord</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.TimeInstant.loc</vodml-id>
@@ -1779,7 +1790,7 @@
 orientation: n/a
 </description>
         <extends>
-          <vodml-ref>coordsys:CoordFrame</vodml-ref>
+          <vodml-ref>coordsys_tessel:CoordFrame</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.TimeFrame.timescale</vodml-id>
@@ -1788,7 +1799,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.temporal.TimeScale</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.temporal.TimeScale</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1802,7 +1813,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialLocation</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.SpatialLocation</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1816,7 +1827,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialLocation</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.spatial.SpatialLocation</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -1830,7 +1841,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.temporal.TimeOffset</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.temporal.TimeOffset</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -1844,7 +1855,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.temporal.CoordSpace</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.temporal.CoordSpace</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1866,7 +1877,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.temporal.CoordAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.temporal.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1882,7 +1893,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.temporal.CoordSpace</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.temporal.CoordSpace</vodml-ref>
         </extends>
         <constraint>
           <description><axis:CoordAxis[1]></description>
@@ -2105,7 +2116,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.DiscreteAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.polarization.DiscreteAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -2121,7 +2132,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.polarization.PolCoord</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.polarization.PolCoord</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.polarization.PolStokesCoord.loc</vodml-id>
@@ -2130,7 +2141,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.PolStokes</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.polarization.PolStokes</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -2146,7 +2157,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.polarization.PolCoord</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.polarization.PolCoord</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.polarization.PolCircularCoord.loc</vodml-id>
@@ -2155,7 +2166,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.PolCircular</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.polarization.PolCircular</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -2171,7 +2182,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.polarization.PolCoord</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.polarization.PolCoord</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.polarization.PolLinearCoord.loc</vodml-id>
@@ -2180,7 +2191,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.PolLinear</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.polarization.PolLinear</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -2196,7 +2207,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.polarization.PolCoord</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.polarization.PolCoord</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.polarization.PolVectorCoord.loc</vodml-id>
@@ -2205,7 +2216,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.PolVector</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.polarization.PolVector</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -2221,7 +2232,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:CoordFrame</vodml-ref>
+          <vodml-ref>coordsys_tessel:CoordFrame</vodml-ref>
         </extends>
         <composition>
           <vodml-id>domain.polarization.PolarizationFrame.coordSpace</vodml-id>
@@ -2230,7 +2241,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.CoordSpace</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.polarization.CoordSpace</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -2252,7 +2263,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.DiscreteAxis</vodml-ref>
+            <vodml-ref>coordsys_tessel:domain.polarization.DiscreteAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -2268,7 +2279,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coordsys:domain.polarization.CoordSpace</vodml-ref>
+          <vodml-ref>coordsys_tessel:domain.polarization.CoordSpace</vodml-ref>
         </extends>
         <constraint>
           <description><axis:CoordAxis[1]></description>

Modified: trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.xmi
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.xmi	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.xmi	Wed Apr 12 09:18:17 2017	(r3935)
@@ -1,688 +1,694 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_ej-CYBSTEeeZh9zsKpIhxg/0" xmlns:default="http:///schemas/default/_ekPvMBSTEeeZh9zsKpIhxg/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20100901 http:///schemas/IVOA_UML_Profile/_ej-CYBSTEeeZh9zsKpIhxg/0 IVOA_UML_Profile.profile.xmi#_elTfIBSTEeeZh9zsKpIhxg http:///schemas/default/_ekPvMBSTEeeZh9zsKpIhxg/0 default.profile.xmi#_euBWRBSTEeeZh9zsKpIhxg">
-  <uml:Model xmi:id="_ejkZwBSTEeeZh9zsKpIhxg" name="coordsys">
-    <eAnnotations xmi:id="_ejkZwRSTEeeZh9zsKpIhxg" source="Objing">
-      <contents xmi:type="uml:Property" xmi:id="_ejkZwhSTEeeZh9zsKpIhxg" name="exporterVersion">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_ejkZwxSTEeeZh9zsKpIhxg" value="3.0.0"/>
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_5rI-MB6-Eeel5txBxgvIkw/0" xmlns:default="http:///schemas/default/_5rcgMB6-Eeel5txBxgvIkw/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20100901 http:///schemas/IVOA_UML_Profile/_5rI-MB6-Eeel5txBxgvIkw/0 IVOA_UML_Profile.profile.xmi#_5rgxpx6-Eeel5txBxgvIkw http:///schemas/default/_5rcgMB6-Eeel5txBxgvIkw/0 default.profile.xmi#_5r_51x6-Eeel5txBxgvIkw">
+  <uml:Model xmi:id="_5rHJAB6-Eeel5txBxgvIkw" name="coordsys_tessel">
+    <eAnnotations xmi:id="_5rHJAR6-Eeel5txBxgvIkw" source="Objing">
+      <contents xmi:type="uml:Property" xmi:id="_5rHJAh6-Eeel5txBxgvIkw" name="exporterVersion">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_5rHJAx6-Eeel5txBxgvIkw" value="3.0.0"/>
       </contents>
     </eAnnotations>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_ejkZxBSTEeeZh9zsKpIhxg">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJBB6-Eeel5txBxgvIkw">
       <body>The coordsys model defines a pattern for Coordinate Frame specifications, various Coordinate System objects for bundling Coordinate Frames into associated groups, and implements the CoordFrame pattern for several physical domains.  The expectation is that as models are created which touch on domains not represented here, they will implement this pattern in the same fashion for the new domain.  This implementation may reside in the other model, or be added to this list of implementations.  Models which refer to the CoordFrame of this model are stating an expectation that the instances included follow the specified pattern.
 </body>
     </ownedComment>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_ejkZxRSTEeeZh9zsKpIhxg" constrainedElement="_ejlA5RSTEeeZh9zsKpIhxg">
-      <specification xmi:type="uml:LiteralString" xmi:id="_ejkZxhSTEeeZh9zsKpIhxg" value="<axis:CoordAxis[1]>"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_5rHJBR6-Eeel5txBxgvIkw" constrainedElement="_5rHJWx6-Eeel5txBxgvIkw">
+      <specification xmi:type="uml:LiteralString" xmi:id="_5rHJBh6-Eeel5txBxgvIkw" value="<axis:CoordAxis[1]>"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_ejkZxxSTEeeZh9zsKpIhxg" constrainedElement="_ejlA_hSTEeeZh9zsKpIhxg">
-      <specification xmi:type="uml:LiteralString" xmi:id="_ejkZyBSTEeeZh9zsKpIhxg" value="axis:CoordAxis[3]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_5rHJBx6-Eeel5txBxgvIkw" constrainedElement="_5rHwFR6-Eeel5txBxgvIkw">
+      <specification xmi:type="uml:LiteralString" xmi:id="_5rHJCB6-Eeel5txBxgvIkw" value="axis:CoordAxis[3]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_ejkZyRSTEeeZh9zsKpIhxg" constrainedElement="_ejlBAhSTEeeZh9zsKpIhxg">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_ejkZyhSTEeeZh9zsKpIhxg">
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_5rHJCR6-Eeel5txBxgvIkw" constrainedElement="_5rHwGR6-Eeel5txBxgvIkw">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJCh6-Eeel5txBxgvIkw">
         <body><Enter note text here></body>
       </ownedComment>
-      <specification xmi:type="uml:LiteralString" xmi:id="_ejkZyxSTEeeZh9zsKpIhxg" value="axis:CoordAxis[3]"/>
+      <specification xmi:type="uml:LiteralString" xmi:id="_5rHJCx6-Eeel5txBxgvIkw" value="axis:CoordAxis[3]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_ejkZzBSTEeeZh9zsKpIhxg" constrainedElement="_ejlBdBSTEeeZh9zsKpIhxg">
-      <specification xmi:type="uml:LiteralString" xmi:id="_ejkZzRSTEeeZh9zsKpIhxg" value="{:axis:TesselationAxis[1]}"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_5rHJDB6-Eeel5txBxgvIkw" constrainedElement="_5rHwih6-Eeel5txBxgvIkw">
+      <specification xmi:type="uml:LiteralString" xmi:id="_5rHJDR6-Eeel5txBxgvIkw" value="{:axis:TesselationAxis[1]}"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_ejkZzhSTEeeZh9zsKpIhxg" constrainedElement="_ejlBoxSTEeeZh9zsKpIhxg">
-      <specification xmi:type="uml:LiteralString" xmi:id="_ejkZzxSTEeeZh9zsKpIhxg" value="<axis:CoordAxis[1]>"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_5rHJDh6-Eeel5txBxgvIkw" constrainedElement="_5rHwuR6-Eeel5txBxgvIkw">
+      <specification xmi:type="uml:LiteralString" xmi:id="_5rHJDx6-Eeel5txBxgvIkw" value="<axis:CoordAxis[1]>"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_ejkZ0BSTEeeZh9zsKpIhxg" constrainedElement="_ejlBwhSTEeeZh9zsKpIhxg">
-      <specification xmi:type="uml:LiteralString" xmi:id="_ejkZ0RSTEeeZh9zsKpIhxg" value="<axis:CoordAxis[1]>"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_5rHJEB6-Eeel5txBxgvIkw" constrainedElement="_5rHw2B6-Eeel5txBxgvIkw">
+      <specification xmi:type="uml:LiteralString" xmi:id="_5rHJER6-Eeel5txBxgvIkw" value="<axis:CoordAxis[1]>"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_ejkZ0hSTEeeZh9zsKpIhxg" constrainedElement="_ejlB8hSTEeeZh9zsKpIhxg">
-      <specification xmi:type="uml:LiteralString" xmi:id="_ejkZ0xSTEeeZh9zsKpIhxg" value="<axis:CoordAxis[1]>"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_5rHJEh6-Eeel5txBxgvIkw" constrainedElement="_5rHxCB6-Eeel5txBxgvIkw">
+      <specification xmi:type="uml:LiteralString" xmi:id="_5rHJEx6-Eeel5txBxgvIkw" value="<axis:CoordAxis[1]>"/>
     </ownedRule>
-    <packagedElement xmi:type="uml:Package" xmi:id="_ejkZ1BSTEeeZh9zsKpIhxg" name="ivoa">
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ1RSTEeeZh9zsKpIhxg" name="nonnegativeInteger"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ1hSTEeeZh9zsKpIhxg" name="integer"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ1xSTEeeZh9zsKpIhxg" name="rational"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ2BSTEeeZh9zsKpIhxg" name="real"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ2RSTEeeZh9zsKpIhxg" name="complex"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ2hSTEeeZh9zsKpIhxg" name="string"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ2xSTEeeZh9zsKpIhxg" name="boolean"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ3BSTEeeZh9zsKpIhxg" name="datetime"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ3RSTEeeZh9zsKpIhxg" name="anyURI">
-        <generalization xmi:type="uml:Generalization" xmi:id="_ejkZ3hSTEeeZh9zsKpIhxg" general="_ejkZ2hSTEeeZh9zsKpIhxg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ3xSTEeeZh9zsKpIhxg" name="Quantity" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkZ4BSTEeeZh9zsKpIhxg" name="unit" visibility="public" type="_ejkZ6BSTEeeZh9zsKpIhxg" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejkZ4RSTEeeZh9zsKpIhxg"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_5rHJFB6-Eeel5txBxgvIkw" name="ivoa">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJFR6-Eeel5txBxgvIkw" name="nonnegativeInteger"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJFh6-Eeel5txBxgvIkw" name="integer"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJFx6-Eeel5txBxgvIkw" name="rational"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJGB6-Eeel5txBxgvIkw" name="real"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJGR6-Eeel5txBxgvIkw" name="complex"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJGh6-Eeel5txBxgvIkw" name="string"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJGx6-Eeel5txBxgvIkw" name="boolean"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJHB6-Eeel5txBxgvIkw" name="datetime"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJHR6-Eeel5txBxgvIkw" name="anyURI">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5rHJHh6-Eeel5txBxgvIkw" general="_5rHJGh6-Eeel5txBxgvIkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJHx6-Eeel5txBxgvIkw" name="Quantity" isAbstract="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJIB6-Eeel5txBxgvIkw" name="unit" visibility="public" type="_5rHJKB6-Eeel5txBxgvIkw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHJIR6-Eeel5txBxgvIkw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ4hSTEeeZh9zsKpIhxg" name="IntegerQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_ejkZ4xSTEeeZh9zsKpIhxg" general="_ejkZ3xSTEeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkZ5BSTEeeZh9zsKpIhxg" name="value" visibility="public" type="_ejkZ1hSTEeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ5RSTEeeZh9zsKpIhxg" name="RealQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_ejkZ5hSTEeeZh9zsKpIhxg" general="_ejkZ3xSTEeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkZ5xSTEeeZh9zsKpIhxg" name="value" visibility="public" type="_ejkZ2BSTEeeZh9zsKpIhxg" isUnique="false"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJIh6-Eeel5txBxgvIkw" name="IntegerQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5rHJIx6-Eeel5txBxgvIkw" general="_5rHJHx6-Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJJB6-Eeel5txBxgvIkw" name="value" visibility="public" type="_5rHJFh6-Eeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJJR6-Eeel5txBxgvIkw" name="RealQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5rHJJh6-Eeel5txBxgvIkw" general="_5rHJHx6-Eeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJJx6-Eeel5txBxgvIkw" name="value" visibility="public" type="_5rHJGB6-Eeel5txBxgvIkw" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ejkZ6BSTEeeZh9zsKpIhxg" name="Unit">
-        <generalization xmi:type="uml:Generalization" xmi:id="_ejkZ6RSTEeeZh9zsKpIhxg" general="_ejkZ2hSTEeeZh9zsKpIhxg"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5rHJKB6-Eeel5txBxgvIkw" name="Unit">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5rHJKR6-Eeel5txBxgvIkw" general="_5rHJGh6-Eeel5txBxgvIkw"/>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_ejkZ6hSTEeeZh9zsKpIhxg" name=" STC V2.0 Coordsys Model (2016)"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_ejkZ6xSTEeeZh9zsKpIhxg" name="domain">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_ejkZ7BSTEeeZh9zsKpIhxg">
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_5rHJKh6-Eeel5txBxgvIkw" name=" STC V2.0 Coordsys Model (2016)"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_5rHJKx6-Eeel5txBxgvIkw" name="domain">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJLB6-Eeel5txBxgvIkw">
         <body>The Domain package contains implementations of the Coordinate Frame pattern for various physical domains.  Many of these domains are 1-Dimensional and there is a good deal of consolidation which could take place in those domains (ie 1-1 relations could get absorbed or eliminated).  However, the defined pattern satisfies ALL domains, and we feel the consistancy this generates simplifies the understanding and implementation of the model.  If one understands the pattern, the interpretation of any domain is straight-forward.</body>
       </ownedComment>
-      <packagedElement xmi:type="uml:Package" xmi:id="_ejkZ7RSTEeeZh9zsKpIhxg" name="pixel">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ejkZ7hSTEeeZh9zsKpIhxg">
+      <packagedElement xmi:type="uml:Package" xmi:id="_5rHJLR6-Eeel5txBxgvIkw" name="pixel">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJLh6-Eeel5txBxgvIkw">
           <body>This package implements the Coordinate Frame pattern for the Pixel domain.
 The Pixel coordinate space is defined as a 'virtual' binned space, with no physical meaning.  The axes in this space provide integer indexes into the space.</body>
         </ownedComment>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejkZ7xSTEeeZh9zsKpIhxg" name="PixelFrame">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejkZ8BSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJLx6-Eeel5txBxgvIkw" name="PixelFrame">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJMB6-Eeel5txBxgvIkw">
             <body>origin: 0.0
 dimensionality: 1..3
 orientation: n/a
 </body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejkZ8RSTEeeZh9zsKpIhxg" general="_ejlCIBSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkZ8hSTEeeZh9zsKpIhxg" name="coordSpace" visibility="public" type="_ejkaARSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejkZ8xSTEeeZh9zsKpIhxg"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHJMR6-Eeel5txBxgvIkw" general="_5rHxNh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJMh6-Eeel5txBxgvIkw" name="coordSpace" visibility="public" type="_5rHJQR6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHJMx6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejkZ8xSTEeeZh9zsKpIhxg" memberEnd="_ejkZ8hSTEeeZh9zsKpIhxg _ejkZ9BSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejkZ9BSTEeeZh9zsKpIhxg" visibility="public" type="_ejkZ7xSTEeeZh9zsKpIhxg" association="_ejkZ8xSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJMx6-Eeel5txBxgvIkw" memberEnd="_5rHJMh6-Eeel5txBxgvIkw _5rHJNB6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJNB6-Eeel5txBxgvIkw" visibility="public" type="_5rHJLx6-Eeel5txBxgvIkw" association="_5rHJMx6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejkZ9RSTEeeZh9zsKpIhxg" name="PixelSpace">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejkZ9hSTEeeZh9zsKpIhxg" general="_ejkaARSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJNR6-Eeel5txBxgvIkw" name="PixelSpace">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHJNh6-Eeel5txBxgvIkw" general="_5rHJQR6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejkZ9xSTEeeZh9zsKpIhxg" name="PixelAxis">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkZ-BSTEeeZh9zsKpIhxg" name="name" visibility="public" type="_ejkZ2hSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkZ-RSTEeeZh9zsKpIhxg" name="length" visibility="public" type="_ejkZ1RSTEeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJNx6-Eeel5txBxgvIkw" name="PixelAxis">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJOB6-Eeel5txBxgvIkw" name="name" visibility="public" type="_5rHJGh6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJOR6-Eeel5txBxgvIkw" name="length" visibility="public" type="_5rHJFR6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_ejkZ-hSTEeeZh9zsKpIhxg" name="Pixel Domain Package"/>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejkZ-xSTEeeZh9zsKpIhxg" name="PixelCoord">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkZ_BSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejkZ9xSTEeeZh9zsKpIhxg" association="_ejkZ_hSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkZ_RSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejkZ1hSTEeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_5rHJOh6-Eeel5txBxgvIkw" name="Pixel Domain Package"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHJOx6-Eeel5txBxgvIkw" name="PixelCoord">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJPB6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHJNx6-Eeel5txBxgvIkw" association="_5rHJPh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJPR6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHJFh6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejkZ_hSTEeeZh9zsKpIhxg" memberEnd="_ejkZ_BSTEeeZh9zsKpIhxg _ejkZ_xSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejkZ_xSTEeeZh9zsKpIhxg" visibility="public" type="_ejkZ-xSTEeeZh9zsKpIhxg" association="_ejkZ_hSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejkaABSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJPh6-Eeel5txBxgvIkw" memberEnd="_5rHJPB6-Eeel5txBxgvIkw _5rHJPx6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJPx6-Eeel5txBxgvIkw" visibility="public" type="_5rHJOx6-Eeel5txBxgvIkw" association="_5rHJPh6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHJQB6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejkaARSTEeeZh9zsKpIhxg" name="CoordSpace" isAbstract="true">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejkaAhSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejkZ9xSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejkaBBSTEeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejkaAxSTEeeZh9zsKpIhxg" value="*"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJQR6-Eeel5txBxgvIkw" name="CoordSpace" isAbstract="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJQh6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHJNx6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHJRB6-Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHJQx6-Eeel5txBxgvIkw" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejkaBBSTEeeZh9zsKpIhxg" memberEnd="_ejkaAhSTEeeZh9zsKpIhxg _ejkaBRSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejkaBRSTEeeZh9zsKpIhxg" visibility="public" type="_ejkaARSTEeeZh9zsKpIhxg" association="_ejkaBBSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJRB6-Eeel5txBxgvIkw" memberEnd="_5rHJQh6-Eeel5txBxgvIkw _5rHJRR6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJRR6-Eeel5txBxgvIkw" visibility="public" type="_5rHJQR6-Eeel5txBxgvIkw" association="_5rHJRB6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlA0BSTEeeZh9zsKpIhxg" memberEnd="_ejln8hSTEeeZh9zsKpIhxg _ejlA0RSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlA0RSTEeeZh9zsKpIhxg" visibility="public" type="_ejln8BSTEeeZh9zsKpIhxg" association="_ejlA0BSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJRh6-Eeel5txBxgvIkw" memberEnd="_5rHxSR6-Eeel5txBxgvIkw _5rHJRx6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJRx6-Eeel5txBxgvIkw" visibility="public" type="_5rHxRx6-Eeel5txBxgvIkw" association="_5rHJRh6-Eeel5txBxgvIkw"/>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_ejlA0hSTEeeZh9zsKpIhxg" name="generic">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ejlA0xSTEeeZh9zsKpIhxg">
+      <packagedElement xmi:type="uml:Package" xmi:id="_5rHJSB6-Eeel5txBxgvIkw" name="generic">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJSR6-Eeel5txBxgvIkw">
           <body>Implementation of the Coordinate Frame pattern for 'generic' domains.   The generic domain covers any domain not represented by the specialized physical domains, and a specialized representation is not deemed necessary.</body>
         </ownedComment>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlA1BSTEeeZh9zsKpIhxg" name="GenericFrame">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlA1RSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJSh6-Eeel5txBxgvIkw" name="GenericFrame">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJSx6-Eeel5txBxgvIkw">
             <body>origin: 0.0 
 dimensionality: 1D
 orientation: n/a
 </body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlA1hSTEeeZh9zsKpIhxg" general="_ejlCIBSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA1xSTEeeZh9zsKpIhxg" name="coordSpace" visibility="public" type="_ejlA4BSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlA2BSTEeeZh9zsKpIhxg"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHJTB6-Eeel5txBxgvIkw" general="_5rHxNh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJTR6-Eeel5txBxgvIkw" name="coordSpace" visibility="public" type="_5rHJVh6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHJTh6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlA2BSTEeeZh9zsKpIhxg" memberEnd="_ejlA1xSTEeeZh9zsKpIhxg _ejlA2RSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlA2RSTEeeZh9zsKpIhxg" visibility="public" type="_ejlA1BSTEeeZh9zsKpIhxg" association="_ejlA2BSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJTh6-Eeel5txBxgvIkw" memberEnd="_5rHJTR6-Eeel5txBxgvIkw _5rHJTx6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJTx6-Eeel5txBxgvIkw" visibility="public" type="_5rHJSh6-Eeel5txBxgvIkw" association="_5rHJTh6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlA2hSTEeeZh9zsKpIhxg" name="CoordAxis">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA2xSTEeeZh9zsKpIhxg" name="name" visibility="public" type="_ejkZ2hSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA3BSTEeeZh9zsKpIhxg" name="domainMin" visibility="public" type="_ejkZ3xSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlA3RSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJUB6-Eeel5txBxgvIkw" name="CoordAxis">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJUR6-Eeel5txBxgvIkw" name="name" visibility="public" type="_5rHJGh6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJUh6-Eeel5txBxgvIkw" name="domainMin" visibility="public" type="_5rHJHx6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHJUx6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA3hSTEeeZh9zsKpIhxg" name="domainMax" visibility="public" type="_ejkZ3xSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlA3xSTEeeZh9zsKpIhxg"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJVB6-Eeel5txBxgvIkw" name="domainMax" visibility="public" type="_5rHJHx6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHJVR6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlA4BSTEeeZh9zsKpIhxg" name="CoordSpace" isAbstract="true">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA4RSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlA2hSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlA4xSTEeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejlA4hSTEeeZh9zsKpIhxg" value="*"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJVh6-Eeel5txBxgvIkw" name="CoordSpace" isAbstract="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJVx6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHJUB6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHJWR6-Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHJWB6-Eeel5txBxgvIkw" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlA4xSTEeeZh9zsKpIhxg" memberEnd="_ejlA4RSTEeeZh9zsKpIhxg _ejlA5BSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlA5BSTEeeZh9zsKpIhxg" visibility="public" type="_ejlA4BSTEeeZh9zsKpIhxg" association="_ejlA4xSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJWR6-Eeel5txBxgvIkw" memberEnd="_5rHJVx6-Eeel5txBxgvIkw _5rHJWh6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJWh6-Eeel5txBxgvIkw" visibility="public" type="_5rHJVh6-Eeel5txBxgvIkw" association="_5rHJWR6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlA5RSTEeeZh9zsKpIhxg" name="CoordSpace1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlA5hSTEeeZh9zsKpIhxg" general="_ejlA4BSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJWx6-Eeel5txBxgvIkw" name="CoordSpace1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHJXB6-Eeel5txBxgvIkw" general="_5rHJVh6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_ejlA5xSTEeeZh9zsKpIhxg" name="Generic Domain Package"/>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlA6BSTEeeZh9zsKpIhxg" name="GenericCoord">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlA6RSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_5rHJXR6-Eeel5txBxgvIkw" name="Generic Domain Package"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHJXh6-Eeel5txBxgvIkw" name="GenericCoord">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJXx6-Eeel5txBxgvIkw">
             <body>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.</body>
           </ownedComment>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA6hSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlA2hSTEeeZh9zsKpIhxg" association="_ejlA7BSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA6xSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejkZ3xSTEeeZh9zsKpIhxg" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJYB6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHJUB6-Eeel5txBxgvIkw" association="_5rHJYh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJYR6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHJHx6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlA7BSTEeeZh9zsKpIhxg" memberEnd="_ejlA6hSTEeeZh9zsKpIhxg _ejlA7RSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlA7RSTEeeZh9zsKpIhxg" visibility="public" type="_ejlA6BSTEeeZh9zsKpIhxg" association="_ejlA7BSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlA7hSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJYh6-Eeel5txBxgvIkw" memberEnd="_5rHJYB6-Eeel5txBxgvIkw _5rHJYx6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJYx6-Eeel5txBxgvIkw" visibility="public" type="_5rHJXh6-Eeel5txBxgvIkw" association="_5rHJYh6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHJZB6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlA7xSTEeeZh9zsKpIhxg" memberEnd="_ejln4hSTEeeZh9zsKpIhxg _ejlA8BSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlA8BSTEeeZh9zsKpIhxg" visibility="public" type="_ejln4BSTEeeZh9zsKpIhxg" association="_ejlA7xSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlA8RSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJZR6-Eeel5txBxgvIkw" memberEnd="_5rHxOR6-Eeel5txBxgvIkw _5rHJZh6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJZh6-Eeel5txBxgvIkw" visibility="public" type="_5rHxNx6-Eeel5txBxgvIkw" association="_5rHJZR6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHJZx6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_ejlA8hSTEeeZh9zsKpIhxg" name="spatial">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ejlA8xSTEeeZh9zsKpIhxg">
+      <packagedElement xmi:type="uml:Package" xmi:id="_5rHJaB6-Eeel5txBxgvIkw" name="spatial">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_5rHJaR6-Eeel5txBxgvIkw">
           <body>Implementation of the Coordinate Frame pattern for the Spatial domain.
 This domain is relatively complex each property of the pattern ( origin, orientation, coordinate space ) has a non-trivial definition and the domain has a higher level of dimensionality.
 </body>
         </ownedComment>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlA9BSTEeeZh9zsKpIhxg" name="SpaceFrame">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlA9RSTEeeZh9zsKpIhxg" general="_ejlCIBSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA9hSTEeeZh9zsKpIhxg" name="coordSpace" visibility="public" type="_ejlA_RSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlA-xSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA9xSTEeeZh9zsKpIhxg" name="origin" visibility="public" type="_ejlBWhSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA-BSTEeeZh9zsKpIhxg" name="orientation" visibility="public" type="_ejlBMRSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlA-RSTEeeZh9zsKpIhxg" name="equinox" visibility="public" type="_ejlBDRSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlA-hSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHJah6-Eeel5txBxgvIkw" name="SpaceFrame">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHJax6-Eeel5txBxgvIkw" general="_5rHxNh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJbB6-Eeel5txBxgvIkw" name="coordSpace" visibility="public" type="_5rHwEB6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHJcR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJbR6-Eeel5txBxgvIkw" name="origin" visibility="public" type="_5rHwcR6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJbh6-Eeel5txBxgvIkw" name="orientation" visibility="public" type="_5rHwSB6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHJbx6-Eeel5txBxgvIkw" name="equinox" visibility="public" type="_5rHwJB6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHJcB6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlA-xSTEeeZh9zsKpIhxg" memberEnd="_ejlA9hSTEeeZh9zsKpIhxg _ejlA_BSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlA_BSTEeeZh9zsKpIhxg" visibility="public" type="_ejlA9BSTEeeZh9zsKpIhxg" association="_ejlA-xSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHJcR6-Eeel5txBxgvIkw" memberEnd="_5rHJbB6-Eeel5txBxgvIkw _5rHJch6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHJch6-Eeel5txBxgvIkw" visibility="public" type="_5rHJah6-Eeel5txBxgvIkw" association="_5rHJcR6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlA_RSTEeeZh9zsKpIhxg" name="CoordSpace" isAbstract="true"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlA_hSTEeeZh9zsKpIhxg" name="Spherical">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlA_xSTEeeZh9zsKpIhxg" general="_ejlA_RSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBABSTEeeZh9zsKpIhxg" name="handedness" visibility="public" type="_ejlBbBSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBARSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwEB6-Eeel5txBxgvIkw" name="CoordSpace" isAbstract="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwER6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHwhh6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHwEx6-Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHwEh6-Eeel5txBxgvIkw" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBAhSTEeeZh9zsKpIhxg" name="Cartesian">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBAxSTEeeZh9zsKpIhxg" general="_ejlA_RSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBBBSTEeeZh9zsKpIhxg" name="handedness" visibility="public" type="_ejlBbBSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBBRSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHwEx6-Eeel5txBxgvIkw" memberEnd="_5rHwER6-Eeel5txBxgvIkw _5rHwFB6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHwFB6-Eeel5txBxgvIkw" visibility="public" type="_5rHwEB6-Eeel5txBxgvIkw" association="_5rHwEx6-Eeel5txBxgvIkw"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwFR6-Eeel5txBxgvIkw" name="Spherical">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwFh6-Eeel5txBxgvIkw" general="_5rHwEB6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwFx6-Eeel5txBxgvIkw" name="handedness" visibility="public" type="_5rHwgx6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwGB6-Eeel5txBxgvIkw"/>
+          </ownedAttribute>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwGR6-Eeel5txBxgvIkw" name="Cartesian">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwGh6-Eeel5txBxgvIkw" general="_5rHwEB6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwGx6-Eeel5txBxgvIkw" name="handedness" visibility="public" type="_5rHwgx6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwHB6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBBhSTEeeZh9zsKpIhxg" name="CoordAxis">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBBxSTEeeZh9zsKpIhxg" general="_ejlBbxSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBCBSTEeeZh9zsKpIhxg" name="domainMin" visibility="public" type="_ejkZ3xSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBCRSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwHR6-Eeel5txBxgvIkw" name="CoordAxis">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwHh6-Eeel5txBxgvIkw" general="_5rHwhh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwHx6-Eeel5txBxgvIkw" name="domainMin" visibility="public" type="_5rHJHx6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwIB6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBChSTEeeZh9zsKpIhxg" name="domainMax" visibility="public" type="_ejkZ3xSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBCxSTEeeZh9zsKpIhxg"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwIR6-Eeel5txBxgvIkw" name="domainMax" visibility="public" type="_5rHJHx6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwIh6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_ejlBDBSTEeeZh9zsKpIhxg" name="Spatial Domain Package"/>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlBDRSTEeeZh9zsKpIhxg" name="Epoch">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBDhSTEeeZh9zsKpIhxg" name="type" visibility="public" type="_ejlBEBSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBDxSTEeeZh9zsKpIhxg" name="year" visibility="public" type="_ejkZ2BSTEeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_5rHwIx6-Eeel5txBxgvIkw" name="Spatial Domain Package"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHwJB6-Eeel5txBxgvIkw" name="Epoch">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwJR6-Eeel5txBxgvIkw" name="type" visibility="public" type="_5rHwJx6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwJh6-Eeel5txBxgvIkw" name="year" visibility="public" type="_5rHJGB6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlBEBSTEeeZh9zsKpIhxg" name="EpochType">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBERSTEeeZh9zsKpIhxg" name="J"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBEhSTEeeZh9zsKpIhxg" name="B"/>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHwJx6-Eeel5txBxgvIkw" name="EpochType">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwKB6-Eeel5txBxgvIkw" name="J"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwKR6-Eeel5txBxgvIkw" name="B"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlBExSTEeeZh9zsKpIhxg" name="SpatialCoord">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBFBSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHwKh6-Eeel5txBxgvIkw" name="SpatialCoord">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwKx6-Eeel5txBxgvIkw">
             <body>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.</body>
           </ownedComment>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBFRSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlBBhSTEeeZh9zsKpIhxg" association="_ejlBFxSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBFhSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejkZ3xSTEeeZh9zsKpIhxg" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwLB6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHwHR6-Eeel5txBxgvIkw" association="_5rHwLh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwLR6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHJHx6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBFxSTEeeZh9zsKpIhxg" memberEnd="_ejlBFRSTEeeZh9zsKpIhxg _ejlBGBSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBGBSTEeeZh9zsKpIhxg" visibility="public" type="_ejlBExSTEeeZh9zsKpIhxg" association="_ejlBFxSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBGRSTEeeZh9zsKpIhxg"/>
-          </ownedEnd>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlBGhSTEeeZh9zsKpIhxg" name="StdRefPosition">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBGxSTEeeZh9zsKpIhxg" name="TOPOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBHBSTEeeZh9zsKpIhxg" name="BARYCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBHRSTEeeZh9zsKpIhxg" name="HELIOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBHhSTEeeZh9zsKpIhxg" name="GEOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBHxSTEeeZh9zsKpIhxg" name="GALACTIC_CENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBIBSTEeeZh9zsKpIhxg" name="LOCAL_GROUP_CENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBIRSTEeeZh9zsKpIhxg" name="MOON"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBIhSTEeeZh9zsKpIhxg" name="EMBARYCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBIxSTEeeZh9zsKpIhxg" name="MERCURY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBJBSTEeeZh9zsKpIhxg" name="VENUS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBJRSTEeeZh9zsKpIhxg" name="MARS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBJhSTEeeZh9zsKpIhxg" name="JUPITER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBJxSTEeeZh9zsKpIhxg" name="SATURN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBKBSTEeeZh9zsKpIhxg" name="URANUS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBKRSTEeeZh9zsKpIhxg" name="NEPTUNE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBKhSTEeeZh9zsKpIhxg" name="PLUTO"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBKxSTEeeZh9zsKpIhxg" name="RELOCATABLE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBLBSTEeeZh9zsKpIhxg" name="LSR"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBLRSTEeeZh9zsKpIhxg" name="LSRK"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBLhSTEeeZh9zsKpIhxg" name="LSRD"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBLxSTEeeZh9zsKpIhxg" name="UNKNOWN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBMBSTEeeZh9zsKpIhxg" name="CUSTOM"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlBMRSTEeeZh9zsKpIhxg" name="StdRefFrame">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBMhSTEeeZh9zsKpIhxg" name="ICRS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBMxSTEeeZh9zsKpIhxg" name="FK4"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBNBSTEeeZh9zsKpIhxg" name="FK5"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBNRSTEeeZh9zsKpIhxg" name="ECLIPTIC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBNhSTEeeZh9zsKpIhxg" name="GALACTIC_I"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBNxSTEeeZh9zsKpIhxg" name="GALACTIC_II"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBOBSTEeeZh9zsKpIhxg" name="SUPER_GALACTIC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBORSTEeeZh9zsKpIhxg" name="AZ_EL"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBOhSTEeeZh9zsKpIhxg" name="BODY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBOxSTEeeZh9zsKpIhxg" name="GEO_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBPBSTEeeZh9zsKpIhxg" name="GEO_D"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBPRSTEeeZh9zsKpIhxg" name="MAG"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBPhSTEeeZh9zsKpIhxg" name="GSE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBPxSTEeeZh9zsKpIhxg" name="GSM"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBQBSTEeeZh9zsKpIhxg" name="SM"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBQRSTEeeZh9zsKpIhxg" name="HGC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBQhSTEeeZh9zsKpIhxg" name="HEE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBQxSTEeeZh9zsKpIhxg" name="HEEQ"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBRBSTEeeZh9zsKpIhxg" name="HCI"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBRRSTEeeZh9zsKpIhxg" name="HCD"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBRhSTEeeZh9zsKpIhxg" name="MERCURY_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBRxSTEeeZh9zsKpIhxg" name="VENUS_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBSBSTEeeZh9zsKpIhxg" name="LUNA_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBSRSTEeeZh9zsKpIhxg" name="MARS_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBShSTEeeZh9zsKpIhxg" name="JUPITER_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBSxSTEeeZh9zsKpIhxg" name="SATURN_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBTBSTEeeZh9zsKpIhxg" name="URANUS_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBTRSTEeeZh9zsKpIhxg" name="NEPTUNE_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBThSTEeeZh9zsKpIhxg" name="PLUTO_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBTxSTEeeZh9zsKpIhxg" name="MERCURY_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBUBSTEeeZh9zsKpIhxg" name="VENUS_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBURSTEeeZh9zsKpIhxg" name="LUNA_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBUhSTEeeZh9zsKpIhxg" name="MARS_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBUxSTEeeZh9zsKpIhxg" name="JUPITER_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBVBSTEeeZh9zsKpIhxg" name="SATURN_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBVRSTEeeZh9zsKpIhxg" name="URANUS_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBVhSTEeeZh9zsKpIhxg" name="NEPTUNE_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBVxSTEeeZh9zsKpIhxg" name="PLUTO_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBWBSTEeeZh9zsKpIhxg" name="UNKNOWN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBWRSTEeeZh9zsKpIhxg" name="CUSTOM"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHwLh6-Eeel5txBxgvIkw" memberEnd="_5rHwLB6-Eeel5txBxgvIkw _5rHwLx6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHwLx6-Eeel5txBxgvIkw" visibility="public" type="_5rHwKh6-Eeel5txBxgvIkw" association="_5rHwLh6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwMB6-Eeel5txBxgvIkw"/>
+          </ownedEnd>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHwMR6-Eeel5txBxgvIkw" name="StdRefPosition">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwMh6-Eeel5txBxgvIkw" name="TOPOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwMx6-Eeel5txBxgvIkw" name="BARYCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwNB6-Eeel5txBxgvIkw" name="HELIOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwNR6-Eeel5txBxgvIkw" name="GEOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwNh6-Eeel5txBxgvIkw" name="GALACTIC_CENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwNx6-Eeel5txBxgvIkw" name="LOCAL_GROUP_CENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwOB6-Eeel5txBxgvIkw" name="MOON"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwOR6-Eeel5txBxgvIkw" name="EMBARYCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwOh6-Eeel5txBxgvIkw" name="MERCURY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwOx6-Eeel5txBxgvIkw" name="VENUS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwPB6-Eeel5txBxgvIkw" name="MARS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwPR6-Eeel5txBxgvIkw" name="JUPITER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwPh6-Eeel5txBxgvIkw" name="SATURN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwPx6-Eeel5txBxgvIkw" name="URANUS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwQB6-Eeel5txBxgvIkw" name="NEPTUNE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwQR6-Eeel5txBxgvIkw" name="PLUTO"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwQh6-Eeel5txBxgvIkw" name="RELOCATABLE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwQx6-Eeel5txBxgvIkw" name="LSR"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwRB6-Eeel5txBxgvIkw" name="LSRK"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwRR6-Eeel5txBxgvIkw" name="LSRD"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwRh6-Eeel5txBxgvIkw" name="UNKNOWN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwRx6-Eeel5txBxgvIkw" name="CUSTOM"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHwSB6-Eeel5txBxgvIkw" name="StdRefFrame">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwSR6-Eeel5txBxgvIkw" name="ICRS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwSh6-Eeel5txBxgvIkw" name="FK4"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwSx6-Eeel5txBxgvIkw" name="FK5"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwTB6-Eeel5txBxgvIkw" name="ECLIPTIC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwTR6-Eeel5txBxgvIkw" name="GALACTIC_I"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwTh6-Eeel5txBxgvIkw" name="GALACTIC_II"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwTx6-Eeel5txBxgvIkw" name="SUPER_GALACTIC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwUB6-Eeel5txBxgvIkw" name="AZ_EL"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwUR6-Eeel5txBxgvIkw" name="BODY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwUh6-Eeel5txBxgvIkw" name="GEO_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwUx6-Eeel5txBxgvIkw" name="GEO_D"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwVB6-Eeel5txBxgvIkw" name="MAG"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwVR6-Eeel5txBxgvIkw" name="GSE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwVh6-Eeel5txBxgvIkw" name="GSM"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwVx6-Eeel5txBxgvIkw" name="SM"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwWB6-Eeel5txBxgvIkw" name="HGC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwWR6-Eeel5txBxgvIkw" name="HEE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwWh6-Eeel5txBxgvIkw" name="HEEQ"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwWx6-Eeel5txBxgvIkw" name="HCI"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwXB6-Eeel5txBxgvIkw" name="HCD"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwXR6-Eeel5txBxgvIkw" name="MERCURY_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwXh6-Eeel5txBxgvIkw" name="VENUS_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwXx6-Eeel5txBxgvIkw" name="LUNA_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwYB6-Eeel5txBxgvIkw" name="MARS_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwYR6-Eeel5txBxgvIkw" name="JUPITER_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwYh6-Eeel5txBxgvIkw" name="SATURN_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwYx6-Eeel5txBxgvIkw" name="URANUS_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwZB6-Eeel5txBxgvIkw" name="NEPTUNE_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwZR6-Eeel5txBxgvIkw" name="PLUTO_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwZh6-Eeel5txBxgvIkw" name="MERCURY_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwZx6-Eeel5txBxgvIkw" name="VENUS_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwaB6-Eeel5txBxgvIkw" name="LUNA_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwaR6-Eeel5txBxgvIkw" name="MARS_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwah6-Eeel5txBxgvIkw" name="JUPITER_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwax6-Eeel5txBxgvIkw" name="SATURN_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwbB6-Eeel5txBxgvIkw" name="URANUS_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwbR6-Eeel5txBxgvIkw" name="NEPTUNE_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwbh6-Eeel5txBxgvIkw" name="PLUTO_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwbx6-Eeel5txBxgvIkw" name="UNKNOWN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwcB6-Eeel5txBxgvIkw" name="CUSTOM"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlBWhSTEeeZh9zsKpIhxg" name="SpatialLocation" isAbstract="true">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBWxSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHwcR6-Eeel5txBxgvIkw" name="SpatialLocation" isAbstract="true">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwch6-Eeel5txBxgvIkw">
             <body>SpatialLocation defines the origin of the spatial coordinate space.  This location is represented either by a standard reference position, or a specified point in another Spatial frame.  This object is used as the origin of the SpaceFrame here, but also to specify the Spatial Reference Position (refPosition) associated with other domain Frames.  For example, in the Time domain, the Spatial Reference Position indicates that the 'time' values are the time that the 'event' occured at that location, which may be different from the detector location.  
  </body>
           </ownedComment>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlBXBSTEeeZh9zsKpIhxg" name="StdSpatialLocation">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBXRSTEeeZh9zsKpIhxg" general="_ejlBWhSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBXhSTEeeZh9zsKpIhxg" name="coord" visibility="public" type="_ejlBGhSTEeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHwcx6-Eeel5txBxgvIkw" name="StdSpatialLocation">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwdB6-Eeel5txBxgvIkw" general="_5rHwcR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwdR6-Eeel5txBxgvIkw" name="coord" visibility="public" type="_5rHwMR6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlBXxSTEeeZh9zsKpIhxg" name="SpatialLocation1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBYBSTEeeZh9zsKpIhxg" general="_ejlBWhSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBYRSTEeeZh9zsKpIhxg" name="coord" visibility="public" type="_ejlBExSTEeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHwdh6-Eeel5txBxgvIkw" name="SpatialLocation1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwdx6-Eeel5txBxgvIkw" general="_5rHwcR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHweB6-Eeel5txBxgvIkw" name="coord" visibility="public" type="_5rHwKh6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlBYhSTEeeZh9zsKpIhxg" name="SpatialLocation2D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBYxSTEeeZh9zsKpIhxg" general="_ejlBWhSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBZBSTEeeZh9zsKpIhxg" name="coord" visibility="public" type="_ejlBExSTEeeZh9zsKpIhxg" isUnique="false">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejlBZRSTEeeZh9zsKpIhxg" value="2"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBZhSTEeeZh9zsKpIhxg" value="2"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHweR6-Eeel5txBxgvIkw" name="SpatialLocation2D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHweh6-Eeel5txBxgvIkw" general="_5rHwcR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwex6-Eeel5txBxgvIkw" name="coord" visibility="public" type="_5rHwKh6-Eeel5txBxgvIkw" isUnique="false">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHwfB6-Eeel5txBxgvIkw" value="2"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwfR6-Eeel5txBxgvIkw" value="2"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlBZxSTEeeZh9zsKpIhxg" name="SpatialLocation3D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBaBSTEeeZh9zsKpIhxg" general="_ejlBWhSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBaRSTEeeZh9zsKpIhxg" name="coord" visibility="public" type="_ejlBExSTEeeZh9zsKpIhxg" isUnique="false">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejlBahSTEeeZh9zsKpIhxg" value="3"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBaxSTEeeZh9zsKpIhxg" value="3"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHwfh6-Eeel5txBxgvIkw" name="SpatialLocation3D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwfx6-Eeel5txBxgvIkw" general="_5rHwcR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwgB6-Eeel5txBxgvIkw" name="coord" visibility="public" type="_5rHwKh6-Eeel5txBxgvIkw" isUnique="false">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHwgR6-Eeel5txBxgvIkw" value="3"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwgh6-Eeel5txBxgvIkw" value="3"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlBbBSTEeeZh9zsKpIhxg" name="Handedness">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBbRSTEeeZh9zsKpIhxg" name="left"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBbhSTEeeZh9zsKpIhxg" name="right"/>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHwgx6-Eeel5txBxgvIkw" name="Handedness">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwhB6-Eeel5txBxgvIkw" name="left"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwhR6-Eeel5txBxgvIkw" name="right"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBbxSTEeeZh9zsKpIhxg" name="Axis">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBcBSTEeeZh9zsKpIhxg" general="_ejlA_RSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBcRSTEeeZh9zsKpIhxg" name="name" visibility="public" type="_ejkZ2hSTEeeZh9zsKpIhxg" isUnique="false"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwhh6-Eeel5txBxgvIkw" name="Axis">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwhx6-Eeel5txBxgvIkw" name="name" visibility="public" type="_5rHJGh6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBchSTEeeZh9zsKpIhxg" name="TesselationAxis">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBcxSTEeeZh9zsKpIhxg" general="_ejlBbxSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwiB6-Eeel5txBxgvIkw" name="TesselationAxis">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwiR6-Eeel5txBxgvIkw" general="_5rHwhh6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBdBSTEeeZh9zsKpIhxg" name="Tesselation">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBdRSTEeeZh9zsKpIhxg" general="_ejlA_RSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwih6-Eeel5txBxgvIkw" name="Tesselation">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwix6-Eeel5txBxgvIkw" general="_5rHwEB6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBdhSTEeeZh9zsKpIhxg" name="QuadCube">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBdxSTEeeZh9zsKpIhxg" general="_ejlBdBSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwjB6-Eeel5txBxgvIkw" name="QuadCube">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwjR6-Eeel5txBxgvIkw" general="_5rHwih6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBeBSTEeeZh9zsKpIhxg" name="Igloo">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBeRSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwjh6-Eeel5txBxgvIkw" name="Igloo">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwjx6-Eeel5txBxgvIkw">
             <body><Enter note text here></body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBehSTEeeZh9zsKpIhxg" general="_ejlBdBSTEeeZh9zsKpIhxg"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwkB6-Eeel5txBxgvIkw" general="_5rHwih6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBexSTEeeZh9zsKpIhxg" name="Healpix">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBfBSTEeeZh9zsKpIhxg" general="_ejlBdBSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBfRSTEeeZh9zsKpIhxg" name="Schema" visibility="public" type="_ejlBgRSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBfhSTEeeZh9zsKpIhxg" name="norder" visibility="public" type="_ejkZ1hSTEeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBfxSTEeeZh9zsKpIhxg" name="HTM">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBgBSTEeeZh9zsKpIhxg" general="_ejlBdBSTEeeZh9zsKpIhxg"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlBgRSTEeeZh9zsKpIhxg" name="HealpixScheme">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBghSTEeeZh9zsKpIhxg" name="NESTED"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlBgxSTEeeZh9zsKpIhxg" name="RING"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBhBSTEeeZh9zsKpIhxg" name="SkyIndex">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBhRSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlBchSTEeeZh9zsKpIhxg" association="_ejlBiBSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBhhSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejkZ1hSTEeeZh9zsKpIhxg" isUnique="false">
-            <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBhxSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwkR6-Eeel5txBxgvIkw" name="Healpix">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwkh6-Eeel5txBxgvIkw" general="_5rHwih6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwkx6-Eeel5txBxgvIkw" name="Schema" visibility="public" type="_5rHwlx6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwlB6-Eeel5txBxgvIkw" name="norder" visibility="public" type="_5rHJFh6-Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwlR6-Eeel5txBxgvIkw" name="HTM">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwlh6-Eeel5txBxgvIkw" general="_5rHwih6-Eeel5txBxgvIkw"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHwlx6-Eeel5txBxgvIkw" name="HealpixScheme">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwmB6-Eeel5txBxgvIkw" name="NESTED"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHwmR6-Eeel5txBxgvIkw" name="RING"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwmh6-Eeel5txBxgvIkw" name="SkyIndex">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwmx6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHwiB6-Eeel5txBxgvIkw" association="_5rHwnh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwnB6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHJFh6-Eeel5txBxgvIkw" isUnique="false">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwnR6-Eeel5txBxgvIkw">
               <body><Enter note text here></body>
             </ownedComment>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBiBSTEeeZh9zsKpIhxg" memberEnd="_ejlBhRSTEeeZh9zsKpIhxg _ejlBiRSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBiRSTEeeZh9zsKpIhxg" visibility="public" type="_ejlBhBSTEeeZh9zsKpIhxg" association="_ejlBiBSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBihSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHwnh6-Eeel5txBxgvIkw" memberEnd="_5rHwmx6-Eeel5txBxgvIkw _5rHwnx6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHwnx6-Eeel5txBxgvIkw" visibility="public" type="_5rHwmh6-Eeel5txBxgvIkw" association="_5rHwnh6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwoB6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBixSTEeeZh9zsKpIhxg" memberEnd="_ejln6hSTEeeZh9zsKpIhxg _ejlBjBSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBjBSTEeeZh9zsKpIhxg" visibility="public" type="_ejln5RSTEeeZh9zsKpIhxg" association="_ejlBixSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBjRSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHwoR6-Eeel5txBxgvIkw" memberEnd="_5rHxQR6-Eeel5txBxgvIkw _5rHwoh6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHwoh6-Eeel5txBxgvIkw" visibility="public" type="_5rHxPB6-Eeel5txBxgvIkw" association="_5rHwoR6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwox6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_ejlBjhSTEeeZh9zsKpIhxg" name="spectral">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBjxSTEeeZh9zsKpIhxg">
+      <packagedElement xmi:type="uml:Package" xmi:id="_5rHwpB6-Eeel5txBxgvIkw" name="spectral">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwpR6-Eeel5txBxgvIkw">
           <body>Implementation of the Coordinate Frame pattern for the Spectral domain.
 This is a basic 1-Dimensional coordinate space.</body>
         </ownedComment>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBkBSTEeeZh9zsKpIhxg" name="SpectralFrame">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBkRSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwph6-Eeel5txBxgvIkw" name="SpectralFrame">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwpx6-Eeel5txBxgvIkw">
             <body>origin: 0.0
 dimensionality: 1D
 orientation: n/a
 </body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBkhSTEeeZh9zsKpIhxg" general="_ejlCIBSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBkxSTEeeZh9zsKpIhxg" name="coordSpace" visibility="public" type="_ejlBnhSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlBlRSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBlBSTEeeZh9zsKpIhxg" name="refPosition" visibility="public" type="_ejlBWhSTEeeZh9zsKpIhxg" isUnique="false"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwqB6-Eeel5txBxgvIkw" general="_5rHxNh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwqR6-Eeel5txBxgvIkw" name="coordSpace" visibility="public" type="_5rHwtB6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHwqx6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwqh6-Eeel5txBxgvIkw" name="refPosition" visibility="public" type="_5rHwcR6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBlRSTEeeZh9zsKpIhxg" memberEnd="_ejlBkxSTEeeZh9zsKpIhxg _ejlBlhSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBlhSTEeeZh9zsKpIhxg" visibility="public" type="_ejlBkBSTEeeZh9zsKpIhxg" association="_ejlBlRSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHwqx6-Eeel5txBxgvIkw" memberEnd="_5rHwqR6-Eeel5txBxgvIkw _5rHwrB6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHwrB6-Eeel5txBxgvIkw" visibility="public" type="_5rHwph6-Eeel5txBxgvIkw" association="_5rHwqx6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBlxSTEeeZh9zsKpIhxg" name="CoordAxis">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBmBSTEeeZh9zsKpIhxg" name="name" visibility="public" type="_ejkZ2hSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBmRSTEeeZh9zsKpIhxg" name="domainMin" visibility="public" type="_ejkZ5RSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBmhSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwrR6-Eeel5txBxgvIkw" name="CoordAxis">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwrh6-Eeel5txBxgvIkw" name="name" visibility="public" type="_5rHJGh6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwrx6-Eeel5txBxgvIkw" name="domainMin" visibility="public" type="_5rHJJR6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwsB6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBmxSTEeeZh9zsKpIhxg" name="domainMax" visibility="public" type="_ejkZ5RSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBnBSTEeeZh9zsKpIhxg"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwsR6-Eeel5txBxgvIkw" name="domainMax" visibility="public" type="_5rHJJR6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwsh6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_ejlBnRSTEeeZh9zsKpIhxg" name="Spectral Domain Package"/>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBnhSTEeeZh9zsKpIhxg" name="CoordSpace" isAbstract="true">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBnxSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlBlxSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlBoRSTEeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejlBoBSTEeeZh9zsKpIhxg" value="*"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_5rHwsx6-Eeel5txBxgvIkw" name="Spectral Domain Package"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwtB6-Eeel5txBxgvIkw" name="CoordSpace" isAbstract="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwtR6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHwrR6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHwtx6-Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHwth6-Eeel5txBxgvIkw" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBoRSTEeeZh9zsKpIhxg" memberEnd="_ejlBnxSTEeeZh9zsKpIhxg _ejlBohSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBohSTEeeZh9zsKpIhxg" visibility="public" type="_ejlBnhSTEeeZh9zsKpIhxg" association="_ejlBoRSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHwtx6-Eeel5txBxgvIkw" memberEnd="_5rHwtR6-Eeel5txBxgvIkw _5rHwuB6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHwuB6-Eeel5txBxgvIkw" visibility="public" type="_5rHwtB6-Eeel5txBxgvIkw" association="_5rHwtx6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBoxSTEeeZh9zsKpIhxg" name="CoordSpace1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBpBSTEeeZh9zsKpIhxg" general="_ejlBnhSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwuR6-Eeel5txBxgvIkw" name="CoordSpace1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwuh6-Eeel5txBxgvIkw" general="_5rHwtB6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlBpRSTEeeZh9zsKpIhxg" name="SpectralCoord">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBphSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHwux6-Eeel5txBxgvIkw" name="SpectralCoord">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwvB6-Eeel5txBxgvIkw">
             <body>An instance of a point along the associated Spectral axis.</body>
           </ownedComment>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBpxSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlBlxSTEeeZh9zsKpIhxg" association="_ejlBqRSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBqBSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejkZ5RSTEeeZh9zsKpIhxg" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwvR6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHwrR6-Eeel5txBxgvIkw" association="_5rHwvx6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwvh6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHJJR6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBqRSTEeeZh9zsKpIhxg" memberEnd="_ejlBpxSTEeeZh9zsKpIhxg _ejlBqhSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBqhSTEeeZh9zsKpIhxg" visibility="public" type="_ejlBpRSTEeeZh9zsKpIhxg" association="_ejlBqRSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBqxSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHwvx6-Eeel5txBxgvIkw" memberEnd="_5rHwvR6-Eeel5txBxgvIkw _5rHwwB6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHwwB6-Eeel5txBxgvIkw" visibility="public" type="_5rHwux6-Eeel5txBxgvIkw" association="_5rHwvx6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwwR6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBrBSTEeeZh9zsKpIhxg" memberEnd="_ejln7hSTEeeZh9zsKpIhxg _ejlBrRSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBrRSTEeeZh9zsKpIhxg" visibility="public" type="_ejln5RSTEeeZh9zsKpIhxg" association="_ejlBrBSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBrhSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHwwh6-Eeel5txBxgvIkw" memberEnd="_5rHxRR6-Eeel5txBxgvIkw _5rHwwx6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHwwx6-Eeel5txBxgvIkw" visibility="public" type="_5rHxPB6-Eeel5txBxgvIkw" association="_5rHwwh6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwxB6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_ejlBrxSTEeeZh9zsKpIhxg" name="temporal">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBsBSTEeeZh9zsKpIhxg">
+      <packagedElement xmi:type="uml:Package" xmi:id="_5rHwxR6-Eeel5txBxgvIkw" name="temporal">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwxh6-Eeel5txBxgvIkw">
           <body>Implementation of the Coordinate Frame pattern for the Time domain.
 This is a basic 1-Dimensional coordinate space.</body>
         </ownedComment>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBsRSTEeeZh9zsKpIhxg" name="TimeFrame">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBshSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHwxx6-Eeel5txBxgvIkw" name="TimeFrame">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHwyB6-Eeel5txBxgvIkw">
             <body>origin: implied
 dimensionality: 1D
 orientation: n/a
 </body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBsxSTEeeZh9zsKpIhxg" general="_ejlCIBSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBtBSTEeeZh9zsKpIhxg" name="coordSpace" visibility="public" type="_ejlBvRSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlBuxSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBtRSTEeeZh9zsKpIhxg" name="timescale" visibility="public" type="_ejlB2RSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBthSTEeeZh9zsKpIhxg" name="refPosition" visibility="public" type="_ejlBWhSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBtxSTEeeZh9zsKpIhxg" name="refDirection" visibility="public" type="_ejlBWhSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBuBSTEeeZh9zsKpIhxg"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHwyR6-Eeel5txBxgvIkw" general="_5rHxNh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwyh6-Eeel5txBxgvIkw" name="coordSpace" visibility="public" type="_5rHw0x6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHw0R6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwyx6-Eeel5txBxgvIkw" name="timescale" visibility="public" type="_5rHw7x6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwzB6-Eeel5txBxgvIkw" name="refPosition" visibility="public" type="_5rHwcR6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwzR6-Eeel5txBxgvIkw" name="refDirection" visibility="public" type="_5rHwcR6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHwzh6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBuRSTEeeZh9zsKpIhxg" name="offset" visibility="public" type="_ejlB0RSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBuhSTEeeZh9zsKpIhxg"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHwzx6-Eeel5txBxgvIkw" name="offset" visibility="public" type="_5rHw5x6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHw0B6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBuxSTEeeZh9zsKpIhxg" memberEnd="_ejlBtBSTEeeZh9zsKpIhxg _ejlBvBSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBvBSTEeeZh9zsKpIhxg" visibility="public" type="_ejlBsRSTEeeZh9zsKpIhxg" association="_ejlBuxSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHw0R6-Eeel5txBxgvIkw" memberEnd="_5rHwyh6-Eeel5txBxgvIkw _5rHw0h6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHw0h6-Eeel5txBxgvIkw" visibility="public" type="_5rHwxx6-Eeel5txBxgvIkw" association="_5rHw0R6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBvRSTEeeZh9zsKpIhxg" name="CoordSpace" isAbstract="true">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBvhSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlBxBSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlBwBSTEeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejlBvxSTEeeZh9zsKpIhxg" value="*"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHw0x6-Eeel5txBxgvIkw" name="CoordSpace" isAbstract="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHw1B6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHw2h6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHw1h6-Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHw1R6-Eeel5txBxgvIkw" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBwBSTEeeZh9zsKpIhxg" memberEnd="_ejlBvhSTEeeZh9zsKpIhxg _ejlBwRSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBwRSTEeeZh9zsKpIhxg" visibility="public" type="_ejlBvRSTEeeZh9zsKpIhxg" association="_ejlBwBSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHw1h6-Eeel5txBxgvIkw" memberEnd="_5rHw1B6-Eeel5txBxgvIkw _5rHw1x6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHw1x6-Eeel5txBxgvIkw" visibility="public" type="_5rHw0x6-Eeel5txBxgvIkw" association="_5rHw1h6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBwhSTEeeZh9zsKpIhxg" name="CoordSpace1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlBwxSTEeeZh9zsKpIhxg" general="_ejlBvRSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHw2B6-Eeel5txBxgvIkw" name="CoordSpace1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHw2R6-Eeel5txBxgvIkw" general="_5rHw0x6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlBxBSTEeeZh9zsKpIhxg" name="CoordAxis">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBxRSTEeeZh9zsKpIhxg" name="name" visibility="public" type="_ejkZ2hSTEeeZh9zsKpIhxg" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBxhSTEeeZh9zsKpIhxg" name="domainMin" visibility="public" type="_ejkZ5RSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlBxxSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHw2h6-Eeel5txBxgvIkw" name="CoordAxis">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHw2x6-Eeel5txBxgvIkw" name="name" visibility="public" type="_5rHJGh6-Eeel5txBxgvIkw" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHw3B6-Eeel5txBxgvIkw" name="domainMin" visibility="public" type="_5rHJJR6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHw3R6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlByBSTEeeZh9zsKpIhxg" name="domainMax" visibility="public" type="_ejkZ5RSTEeeZh9zsKpIhxg" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlByRSTEeeZh9zsKpIhxg"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHw3h6-Eeel5txBxgvIkw" name="domainMax" visibility="public" type="_5rHJJR6-Eeel5txBxgvIkw" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHw3x6-Eeel5txBxgvIkw"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_ejlByhSTEeeZh9zsKpIhxg" name="Temporal Domain Package"/>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlByxSTEeeZh9zsKpIhxg" name="TimeCoord" isAbstract="true">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlBzBSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_5rHw4B6-Eeel5txBxgvIkw" name="Temporal Domain Package"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHw4R6-Eeel5txBxgvIkw" name="TimeCoord" isAbstract="true">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHw4h6-Eeel5txBxgvIkw">
             <body>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.</body>
           </ownedComment>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlBzRSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlBxBSTEeeZh9zsKpIhxg" association="_ejlBzhSTEeeZh9zsKpIhxg"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHw4x6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHw2h6-Eeel5txBxgvIkw" association="_5rHw5B6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlBzhSTEeeZh9zsKpIhxg" memberEnd="_ejlBzRSTEeeZh9zsKpIhxg _ejlBzxSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlBzxSTEeeZh9zsKpIhxg" visibility="public" type="_ejlByxSTEeeZh9zsKpIhxg" association="_ejlBzhSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlB0BSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHw5B6-Eeel5txBxgvIkw" memberEnd="_5rHw4x6-Eeel5txBxgvIkw _5rHw5R6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHw5R6-Eeel5txBxgvIkw" visibility="public" type="_5rHw4R6-Eeel5txBxgvIkw" association="_5rHw5B6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHw5h6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlB0RSTEeeZh9zsKpIhxg" name="TimeOffset">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlB0hSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHw5x6-Eeel5txBxgvIkw" name="TimeOffset">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHw6B6-Eeel5txBxgvIkw">
             <body>The time coordinate is represented as an offset from the origin.</body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlB0xSTEeeZh9zsKpIhxg" general="_ejlByxSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlB1BSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejkZ5RSTEeeZh9zsKpIhxg" isUnique="false"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHw6R6-Eeel5txBxgvIkw" general="_5rHw4R6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHw6h6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHJJR6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlB1RSTEeeZh9zsKpIhxg" name="TimeInstant">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlB1hSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHw6x6-Eeel5txBxgvIkw" name="TimeInstant">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHw7B6-Eeel5txBxgvIkw">
             <body>The time is represented as a particular instant.  While interchangable with the TimeOffset, this form typically has a defined structure in representation.</body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlB1xSTEeeZh9zsKpIhxg" general="_ejlByxSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlB2BSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejkZ3BSTEeeZh9zsKpIhxg" isUnique="false"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHw7R6-Eeel5txBxgvIkw" general="_5rHw4R6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHw7h6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHJHB6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlB2RSTEeeZh9zsKpIhxg" name="TimeScale">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB2hSTEeeZh9zsKpIhxg" name="TT"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB2xSTEeeZh9zsKpIhxg" name="ET"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB3BSTEeeZh9zsKpIhxg" name="TDB"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB3RSTEeeZh9zsKpIhxg" name="TCG"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB3hSTEeeZh9zsKpIhxg" name="TCB"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB3xSTEeeZh9zsKpIhxg" name="TAI"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB4BSTEeeZh9zsKpIhxg" name="UTC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB4RSTEeeZh9zsKpIhxg" name="LST"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlB4hSTEeeZh9zsKpIhxg" name="LOCAL"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlB4xSTEeeZh9zsKpIhxg" memberEnd="_ejln7BSTEeeZh9zsKpIhxg _ejlB5BSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlB5BSTEeeZh9zsKpIhxg" visibility="public" type="_ejln5RSTEeeZh9zsKpIhxg" association="_ejlB4xSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlB5RSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHw7x6-Eeel5txBxgvIkw" name="TimeScale">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw8B6-Eeel5txBxgvIkw" name="TT"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw8R6-Eeel5txBxgvIkw" name="ET"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw8h6-Eeel5txBxgvIkw" name="TDB"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw8x6-Eeel5txBxgvIkw" name="TCG"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw9B6-Eeel5txBxgvIkw" name="TCB"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw9R6-Eeel5txBxgvIkw" name="TAI"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw9h6-Eeel5txBxgvIkw" name="UTC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw9x6-Eeel5txBxgvIkw" name="LST"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHw-B6-Eeel5txBxgvIkw" name="LOCAL"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHw-R6-Eeel5txBxgvIkw" memberEnd="_5rHxQx6-Eeel5txBxgvIkw _5rHw-h6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHw-h6-Eeel5txBxgvIkw" visibility="public" type="_5rHxPB6-Eeel5txBxgvIkw" association="_5rHw-R6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHw-x6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_ejlB5hSTEeeZh9zsKpIhxg" name="polarization">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ejlB5xSTEeeZh9zsKpIhxg">
+      <packagedElement xmi:type="uml:Package" xmi:id="_5rHw_B6-Eeel5txBxgvIkw" name="polarization">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_5rHw_R6-Eeel5txBxgvIkw">
           <body>Implementation of the Coordinate Frame pattern for the Polarization domain.
 This is a 1-Dimensional coordinate space, but the nature of the polarization coordinate values (discrete enumerated strings) requires a different axis specification.</body>
         </ownedComment>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlB6BSTEeeZh9zsKpIhxg" name="PolarizationFrame" isAbstract="true">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlB6RSTEeeZh9zsKpIhxg" general="_ejlCIBSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlB6hSTEeeZh9zsKpIhxg" name="coordSpace" visibility="public" type="_ejlB7RSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlB6xSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHw_h6-Eeel5txBxgvIkw" name="PolarizationFrame" isAbstract="true">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHw_x6-Eeel5txBxgvIkw" general="_5rHxNh6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxAB6-Eeel5txBxgvIkw" name="coordSpace" visibility="public" type="_5rHxAx6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHxAR6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlB6xSTEeeZh9zsKpIhxg" memberEnd="_ejlB6hSTEeeZh9zsKpIhxg _ejlB7BSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlB7BSTEeeZh9zsKpIhxg" visibility="public" type="_ejlB6BSTEeeZh9zsKpIhxg" association="_ejlB6xSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHxAR6-Eeel5txBxgvIkw" memberEnd="_5rHxAB6-Eeel5txBxgvIkw _5rHxAh6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHxAh6-Eeel5txBxgvIkw" visibility="public" type="_5rHw_h6-Eeel5txBxgvIkw" association="_5rHxAR6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlB7RSTEeeZh9zsKpIhxg" name="CoordSpace" isAbstract="true">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlB7hSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlB9BSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlB8BSTEeeZh9zsKpIhxg">
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejlB7xSTEeeZh9zsKpIhxg" value="*"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHxAx6-Eeel5txBxgvIkw" name="CoordSpace" isAbstract="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxBB6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHxCh6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHxBh6-Eeel5txBxgvIkw">
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHxBR6-Eeel5txBxgvIkw" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlB8BSTEeeZh9zsKpIhxg" memberEnd="_ejlB7hSTEeeZh9zsKpIhxg _ejlB8RSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlB8RSTEeeZh9zsKpIhxg" visibility="public" type="_ejlB7RSTEeeZh9zsKpIhxg" association="_ejlB8BSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHxBh6-Eeel5txBxgvIkw" memberEnd="_5rHxBB6-Eeel5txBxgvIkw _5rHxBx6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHxBx6-Eeel5txBxgvIkw" visibility="public" type="_5rHxAx6-Eeel5txBxgvIkw" association="_5rHxBh6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlB8hSTEeeZh9zsKpIhxg" name="CoordSpace1D">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlB8xSTEeeZh9zsKpIhxg" general="_ejlB7RSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHxCB6-Eeel5txBxgvIkw" name="CoordSpace1D">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHxCR6-Eeel5txBxgvIkw" general="_5rHxAx6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_ejlB9BSTEeeZh9zsKpIhxg" name="DiscreteAxis">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_ejlB9RSTEeeZh9zsKpIhxg">
+        <packagedElement xmi:type="uml:Class" xmi:id="_5rHxCh6-Eeel5txBxgvIkw" name="DiscreteAxis">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5rHxCx6-Eeel5txBxgvIkw">
             <body>In this domain, the CoordAxis is not a continuous set of points, but rather, a discrete set of values.  The values are provided by a set of coordinates representing the various polarization flavors/states.</body>
           </ownedComment>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlB9hSTEeeZh9zsKpIhxg" name="name" visibility="public" type="_ejkZ2hSTEeeZh9zsKpIhxg" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxDB6-Eeel5txBxgvIkw" name="name" visibility="public" type="_5rHJGh6-Eeel5txBxgvIkw" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlB9xSTEeeZh9zsKpIhxg" name="PolCoord" isAbstract="true">
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlB-BSTEeeZh9zsKpIhxg" name="axis" visibility="public" type="_ejlB9BSTEeeZh9zsKpIhxg" association="_ejlB-RSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHxDR6-Eeel5txBxgvIkw" name="PolCoord" isAbstract="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxDh6-Eeel5txBxgvIkw" name="axis" visibility="public" type="_5rHxCh6-Eeel5txBxgvIkw" association="_5rHxDx6-Eeel5txBxgvIkw"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlB-RSTEeeZh9zsKpIhxg" memberEnd="_ejlB-BSTEeeZh9zsKpIhxg _ejlB-hSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlB-hSTEeeZh9zsKpIhxg" visibility="public" type="_ejlB9xSTEeeZh9zsKpIhxg" association="_ejlB-RSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlB-xSTEeeZh9zsKpIhxg"/>
-          </ownedEnd>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_ejlB_BSTEeeZh9zsKpIhxg" name="Polarization Domain Package"/>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlB_RSTEeeZh9zsKpIhxg" name="PolStokesCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlB_hSTEeeZh9zsKpIhxg" general="_ejlB9xSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlB_xSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejlCCRSTEeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlCABSTEeeZh9zsKpIhxg" name="PolCircularCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlCARSTEeeZh9zsKpIhxg" general="_ejlB9xSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlCAhSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejlCDhSTEeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlCAxSTEeeZh9zsKpIhxg" name="PolLinearCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlCBBSTEeeZh9zsKpIhxg" general="_ejlB9xSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlCBRSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejlCExSTEeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_ejlCBhSTEeeZh9zsKpIhxg" name="PolVectorCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ejlCBxSTEeeZh9zsKpIhxg" general="_ejlB9xSTEeeZh9zsKpIhxg"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejlCCBSTEeeZh9zsKpIhxg" name="loc" visibility="public" type="_ejlCGBSTEeeZh9zsKpIhxg" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlCCRSTEeeZh9zsKpIhxg" name="PolStokes">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCChSTEeeZh9zsKpIhxg" name="I"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCCxSTEeeZh9zsKpIhxg" name="Q"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCDBSTEeeZh9zsKpIhxg" name="U"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCDRSTEeeZh9zsKpIhxg" name="V"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlCDhSTEeeZh9zsKpIhxg" name="PolCircular">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCDxSTEeeZh9zsKpIhxg" name="RR"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCEBSTEeeZh9zsKpIhxg" name="LL"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCERSTEeeZh9zsKpIhxg" name="RL"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCEhSTEeeZh9zsKpIhxg" name="LR"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlCExSTEeeZh9zsKpIhxg" name="PolLinear">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCFBSTEeeZh9zsKpIhxg" name="XX"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCFRSTEeeZh9zsKpIhxg" name="YY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCFhSTEeeZh9zsKpIhxg" name="XY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCFxSTEeeZh9zsKpIhxg" name="YX"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_ejlCGBSTEeeZh9zsKpIhxg" name="PolVector">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCGRSTEeeZh9zsKpIhxg" name="I"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCGhSTEeeZh9zsKpIhxg" name="PF"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCGxSTEeeZh9zsKpIhxg" name="PP"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ejlCHBSTEeeZh9zsKpIhxg" name="PA"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_ejlCHRSTEeeZh9zsKpIhxg" memberEnd="_ejln6BSTEeeZh9zsKpIhxg _ejlCHhSTEeeZh9zsKpIhxg">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_ejlCHhSTEeeZh9zsKpIhxg" visibility="public" type="_ejln5RSTEeeZh9zsKpIhxg" association="_ejlCHRSTEeeZh9zsKpIhxg">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejlCHxSTEeeZh9zsKpIhxg"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHxDx6-Eeel5txBxgvIkw" memberEnd="_5rHxDh6-Eeel5txBxgvIkw _5rHxEB6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHxEB6-Eeel5txBxgvIkw" visibility="public" type="_5rHxDR6-Eeel5txBxgvIkw" association="_5rHxDx6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHxER6-Eeel5txBxgvIkw"/>
+          </ownedEnd>
+        </packagedElement>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_5rHxEh6-Eeel5txBxgvIkw" name="Polarization Domain Package"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHxEx6-Eeel5txBxgvIkw" name="PolStokesCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHxFB6-Eeel5txBxgvIkw" general="_5rHxDR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxFR6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHxHx6-Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHxFh6-Eeel5txBxgvIkw" name="PolCircularCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHxFx6-Eeel5txBxgvIkw" general="_5rHxDR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxGB6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHxJB6-Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHxGR6-Eeel5txBxgvIkw" name="PolLinearCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHxGh6-Eeel5txBxgvIkw" general="_5rHxDR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxGx6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHxKR6-Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_5rHxHB6-Eeel5txBxgvIkw" name="PolVectorCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_5rHxHR6-Eeel5txBxgvIkw" general="_5rHxDR6-Eeel5txBxgvIkw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxHh6-Eeel5txBxgvIkw" name="loc" visibility="public" type="_5rHxLh6-Eeel5txBxgvIkw" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHxHx6-Eeel5txBxgvIkw" name="PolStokes">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxIB6-Eeel5txBxgvIkw" name="I"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxIR6-Eeel5txBxgvIkw" name="Q"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxIh6-Eeel5txBxgvIkw" name="U"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxIx6-Eeel5txBxgvIkw" name="V"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHxJB6-Eeel5txBxgvIkw" name="PolCircular">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxJR6-Eeel5txBxgvIkw" name="RR"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxJh6-Eeel5txBxgvIkw" name="LL"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxJx6-Eeel5txBxgvIkw" name="RL"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxKB6-Eeel5txBxgvIkw" name="LR"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHxKR6-Eeel5txBxgvIkw" name="PolLinear">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxKh6-Eeel5txBxgvIkw" name="XX"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxKx6-Eeel5txBxgvIkw" name="YY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxLB6-Eeel5txBxgvIkw" name="XY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxLR6-Eeel5txBxgvIkw" name="YX"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_5rHxLh6-Eeel5txBxgvIkw" name="PolVector">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxLx6-Eeel5txBxgvIkw" name="I"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxMB6-Eeel5txBxgvIkw" name="PF"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxMR6-Eeel5txBxgvIkw" name="PP"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5rHxMh6-Eeel5txBxgvIkw" name="PA"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Association" xmi:id="_5rHxMx6-Eeel5txBxgvIkw" memberEnd="_5rHxPx6-Eeel5txBxgvIkw _5rHxNB6-Eeel5txBxgvIkw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_5rHxNB6-Eeel5txBxgvIkw" visibility="public" type="_5rHxPB6-Eeel5txBxgvIkw" association="_5rHxMx6-Eeel5txBxgvIkw">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHxNR6-Eeel5txBxgvIkw"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_ejlCIBSTEeeZh9zsKpIhxg" name="CoordFrame" isAbstract="true"/>
-    <packagedElement xmi:type="uml:Class" xmi:id="_ejln4BSTEeeZh9zsKpIhxg" name="CoordSys">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_ejln4RSTEeeZh9zsKpIhxg">
+    <packagedElement xmi:type="uml:Class" xmi:id="_5rHxNh6-Eeel5txBxgvIkw" name="CoordFrame" isAbstract="true"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_5rHxNx6-Eeel5txBxgvIkw" name="CoordSys">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_5rHxOB6-Eeel5txBxgvIkw">
         <body>The CoordSys object is the parent of a set of containers for organizing Coordinate Frame specifications into related groupings.  </body>
       </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ejln4hSTEeeZh9zsKpIhxg" name="genericFrame" visibility="public" type="_ejlA1BSTEeeZh9zsKpIhxg" association="_ejlA7xSTEeeZh9zsKpIhxg">
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejln4xSTEeeZh9zsKpIhxg" value="*"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejln5BSTEeeZh9zsKpIhxg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxOR6-Eeel5txBxgvIkw" name="genericFrame" visibility="public" type="_5rHJSh6-Eeel5txBxgvIkw" association="_5rHJZR6-Eeel5txBxgvIkw">
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHxOh6-Eeel5txBxgvIkw" value="*"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHxOx6-Eeel5txBxgvIkw"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_ejln5RSTEeeZh9zsKpIhxg" name="AstroCoordSystem">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_ejln5hSTEeeZh9zsKpIhxg">
+    <packagedElement xmi:type="uml:Class" xmi:id="_5rHxPB6-Eeel5txBxgvIkw" name="AstroCoordSystem">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_5rHxPR6-Eeel5txBxgvIkw">
         <body>AstroCoordSystem is a container object for organizing physical Coordinate Frame specifications into related groupings.  The object provides a references to Coordinate Frame instances in each of the known domain implementations.  As a whole, the AstroCoordSystem should provide a complete description of the domain space. </body>
       </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_ejln5xSTEeeZh9zsKpIhxg" general="_ejln4BSTEeeZh9zsKpIhxg"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ejln6BSTEeeZh9zsKpIhxg" name="polarizationFrame" visibility="public" type="_ejlB6BSTEeeZh9zsKpIhxg" association="_ejlCHRSTEeeZh9zsKpIhxg">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejln6RSTEeeZh9zsKpIhxg"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_5rHxPh6-Eeel5txBxgvIkw" general="_5rHxNx6-Eeel5txBxgvIkw"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxPx6-Eeel5txBxgvIkw" name="polarizationFrame" visibility="public" type="_5rHw_h6-Eeel5txBxgvIkw" association="_5rHxMx6-Eeel5txBxgvIkw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHxQB6-Eeel5txBxgvIkw"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ejln6hSTEeeZh9zsKpIhxg" name="spaceFrame" visibility="public" type="_ejlA9BSTEeeZh9zsKpIhxg" association="_ejlBixSTEeeZh9zsKpIhxg">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejln6xSTEeeZh9zsKpIhxg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxQR6-Eeel5txBxgvIkw" name="spaceFrame" visibility="public" type="_5rHJah6-Eeel5txBxgvIkw" association="_5rHwoR6-Eeel5txBxgvIkw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHxQh6-Eeel5txBxgvIkw"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ejln7BSTEeeZh9zsKpIhxg" name="timeFrame" visibility="public" type="_ejlBsRSTEeeZh9zsKpIhxg" association="_ejlB4xSTEeeZh9zsKpIhxg">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejln7RSTEeeZh9zsKpIhxg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxQx6-Eeel5txBxgvIkw" name="timeFrame" visibility="public" type="_5rHwxx6-Eeel5txBxgvIkw" association="_5rHw-R6-Eeel5txBxgvIkw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHxRB6-Eeel5txBxgvIkw"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ejln7hSTEeeZh9zsKpIhxg" name="spectralFrame" visibility="public" type="_ejlBkBSTEeeZh9zsKpIhxg" association="_ejlBrBSTEeeZh9zsKpIhxg">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ejln7xSTEeeZh9zsKpIhxg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxRR6-Eeel5txBxgvIkw" name="spectralFrame" visibility="public" type="_5rHwph6-Eeel5txBxgvIkw" association="_5rHwwh6-Eeel5txBxgvIkw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHxRh6-Eeel5txBxgvIkw"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_ejln8BSTEeeZh9zsKpIhxg" name="PixelCoordSystem">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_ejln8RSTEeeZh9zsKpIhxg">
+    <packagedElement xmi:type="uml:Class" xmi:id="_5rHxRx6-Eeel5txBxgvIkw" name="PixelCoordSystem">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_5rHxSB6-Eeel5txBxgvIkw">
         <body>The PixelCoordSystem contains the complete list of Pixel Frame specifications.  Here, the relation between the system and its frames is different than in the physical CoordSys.  In the pixel domain, there is only 1 system, composed of a specific set of PixelAxes organized in PixelFrames.</body>
       </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ejln8hSTEeeZh9zsKpIhxg" name="pixelFrame" visibility="public" type="_ejkZ7xSTEeeZh9zsKpIhxg" aggregation="composite" association="_ejlA0BSTEeeZh9zsKpIhxg">
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejln8xSTEeeZh9zsKpIhxg" value="*"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_5rHxSR6-Eeel5txBxgvIkw" name="pixelFrame" visibility="public" type="_5rHJLx6-Eeel5txBxgvIkw" aggregation="composite" association="_5rHJRh6-Eeel5txBxgvIkw">
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rHxSh6-Eeel5txBxgvIkw" value="*"/>
       </ownedAttribute>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_ejkZwBSTEeeZh9zsKpIhxg" xmi:id="_ew318BSTEeeZh9zsKpIhxg">
-      <eAnnotations xmi:id="_ew6SMBSTEeeZh9zsKpIhxg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_elTfIBSTEeeZh9zsKpIhxg"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_5rHJAB6-Eeel5txBxgvIkw" xmi:id="_5t27AB6-Eeel5txBxgvIkw">
+      <eAnnotations xmi:id="_5t27AR6-Eeel5txBxgvIkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_5rgxpx6-Eeel5txBxgvIkw"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_ew318BSTEeeZh9zsKpIhxg" href="IVOA_UML_Profile.profile.xmi#_elS4EBSTEeeZh9zsKpIhxg"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_5t27AB6-Eeel5txBxgvIkw" href="IVOA_UML_Profile.profile.xmi#_5rgxoB6-Eeel5txBxgvIkw"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_ejkZwBSTEeeZh9zsKpIhxg" xmi:id="_ew_xwBSTEeeZh9zsKpIhxg">
-      <eAnnotations xmi:id="_ew_xwRSTEeeZh9zsKpIhxg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="default.profile.xmi#_euBWRBSTEeeZh9zsKpIhxg"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_5rHJAB6-Eeel5txBxgvIkw" xmi:id="_5t7zgB6-Eeel5txBxgvIkw">
+      <eAnnotations xmi:id="_5t7zgR6-Eeel5txBxgvIkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="default.profile.xmi#_5r_51x6-Eeel5txBxgvIkw"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_ew_xwBSTEeeZh9zsKpIhxg" href="default.profile.xmi#_euAvMBSTEeeZh9zsKpIhxg"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_5t7zgB6-Eeel5txBxgvIkw" href="default.profile.xmi#_5r_50B6-Eeel5txBxgvIkw"/>
     </profileApplication>
   </uml:Model>
-  <IVOA_UML_Profile:model xmi:id="_exHGgBSTEeeZh9zsKpIhxg" base_Package="_ejkZwBSTEeeZh9zsKpIhxg" title="STC2 Coordinate System model" version="2.0" authors="Arnold Rots, Mark Cresitello-Dittmar" previousVersion="0.x"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_exI7sBSTEeeZh9zsKpIhxg" base_Package="_ejkZ1BSTEeeZh9zsKpIhxg" name="ivoa" version="1.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exI7sRSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ1RSTEeeZh9zsKpIhxg" vodmlid="nonnegativeInteger"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exJiwBSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ1hSTEeeZh9zsKpIhxg" vodmlid="integer"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exJiwRSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ1xSTEeeZh9zsKpIhxg" vodmlid="rational"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exJiwhSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ2BSTEeeZh9zsKpIhxg" vodmlid="real"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exKJ0BSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ2RSTEeeZh9zsKpIhxg" vodmlid="complex"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exKJ0RSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ2hSTEeeZh9zsKpIhxg" vodmlid="string"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exKJ0hSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ2xSTEeeZh9zsKpIhxg" vodmlid="boolean"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exKw4BSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ3BSTEeeZh9zsKpIhxg" vodmlid="datetime"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exKw4RSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ3RSTEeeZh9zsKpIhxg" vodmlid="anyURI"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exKw4hSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ3xSTEeeZh9zsKpIhxg" vodmlid="Quantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exLX8BSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ4hSTEeeZh9zsKpIhxg" vodmlid="IntegerQuantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exLX8RSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ5RSTEeeZh9zsKpIhxg" vodmlid="RealQuantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_exLX8hSTEeeZh9zsKpIhxg" base_NamedElement="_ejkZ6BSTEeeZh9zsKpIhxg" vodmlid="Unit"/>
-  <default:subset xmi:id="_exL_ABSTEeeZh9zsKpIhxg" base_Constraint="_ejkZxRSTEeeZh9zsKpIhxg"/>
-  <default:subset xmi:id="_exL_ARSTEeeZh9zsKpIhxg" base_Constraint="_ejkZxxSTEeeZh9zsKpIhxg"/>
-  <default:subset xmi:id="_exL_AhSTEeeZh9zsKpIhxg" base_Constraint="_ejkZyRSTEeeZh9zsKpIhxg"/>
-  <default:subset xmi:id="_exL_AxSTEeeZh9zsKpIhxg" base_Constraint="_ejkZzBSTEeeZh9zsKpIhxg"/>
-  <default:subset xmi:id="_exMmEBSTEeeZh9zsKpIhxg" base_Constraint="_ejkZzhSTEeeZh9zsKpIhxg"/>
-  <default:subset xmi:id="_exMmERSTEeeZh9zsKpIhxg" base_Constraint="_ejkZ0BSTEeeZh9zsKpIhxg"/>
-  <default:subset xmi:id="_exMmEhSTEeeZh9zsKpIhxg" base_Constraint="_ejkZ0hSTEeeZh9zsKpIhxg"/>
+  <IVOA_UML_Profile:model xmi:id="_5uBTEB6-Eeel5txBxgvIkw" base_Package="_5rHJAB6-Eeel5txBxgvIkw" title="STC2 Coordinate System model" version="2.0" authors="Arnold Rots, Mark Cresitello-Dittmar, L Michel" previousVersion="0.x"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_5uBTER6-Eeel5txBxgvIkw" base_Package="_5rHJFB6-Eeel5txBxgvIkw" name="ivoa" version="1.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uB6IB6-Eeel5txBxgvIkw" base_NamedElement="_5rHJFR6-Eeel5txBxgvIkw" vodmlid="nonnegativeInteger"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uB6IR6-Eeel5txBxgvIkw" base_NamedElement="_5rHJFh6-Eeel5txBxgvIkw" vodmlid="integer"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uB6Ih6-Eeel5txBxgvIkw" base_NamedElement="_5rHJFx6-Eeel5txBxgvIkw" vodmlid="rational"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uChMB6-Eeel5txBxgvIkw" base_NamedElement="_5rHJGB6-Eeel5txBxgvIkw" vodmlid="real"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uChMR6-Eeel5txBxgvIkw" base_NamedElement="_5rHJGR6-Eeel5txBxgvIkw" vodmlid="complex"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uChMh6-Eeel5txBxgvIkw" base_NamedElement="_5rHJGh6-Eeel5txBxgvIkw" vodmlid="string"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uChMx6-Eeel5txBxgvIkw" base_NamedElement="_5rHJGx6-Eeel5txBxgvIkw" vodmlid="boolean"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uJO4B6-Eeel5txBxgvIkw" base_NamedElement="_5rHJHB6-Eeel5txBxgvIkw" vodmlid="datetime"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uJ18B6-Eeel5txBxgvIkw" base_NamedElement="_5rHJHR6-Eeel5txBxgvIkw" vodmlid="anyURI"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uJ18R6-Eeel5txBxgvIkw" base_NamedElement="_5rHJHx6-Eeel5txBxgvIkw" vodmlid="Quantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uJ18h6-Eeel5txBxgvIkw" base_NamedElement="_5rHJIh6-Eeel5txBxgvIkw" vodmlid="IntegerQuantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uJ18x6-Eeel5txBxgvIkw" base_NamedElement="_5rHJJR6-Eeel5txBxgvIkw" vodmlid="RealQuantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5uKdAB6-Eeel5txBxgvIkw" base_NamedElement="_5rHJKB6-Eeel5txBxgvIkw" vodmlid="Unit"/>
+  <default:subset xmi:id="_5uKdAR6-Eeel5txBxgvIkw" base_Constraint="_5rHJBR6-Eeel5txBxgvIkw"/>
+  <default:subset xmi:id="_5uKdAh6-Eeel5txBxgvIkw" base_Constraint="_5rHJBx6-Eeel5txBxgvIkw"/>
+  <default:subset xmi:id="_5uKdAx6-Eeel5txBxgvIkw" base_Constraint="_5rHJCR6-Eeel5txBxgvIkw"/>
+  <default:subset xmi:id="_5uKdBB6-Eeel5txBxgvIkw" base_Constraint="_5rHJDB6-Eeel5txBxgvIkw"/>
+  <default:subset xmi:id="_5uKdBR6-Eeel5txBxgvIkw" base_Constraint="_5rHJDh6-Eeel5txBxgvIkw"/>
+  <default:subset xmi:id="_5uLEEB6-Eeel5txBxgvIkw" base_Constraint="_5rHJEB6-Eeel5txBxgvIkw"/>
+  <default:subset xmi:id="_5uLEER6-Eeel5txBxgvIkw" base_Constraint="_5rHJEh6-Eeel5txBxgvIkw"/>
 </xmi:XMI>

Added: trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel_diagram.png
==============================================================================
Binary file. No diff available.

Copied and modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy (from r3925, trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.groovy)
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.groovy	Fri Mar 31 17:30:18 2017	(r3925, copy source)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy	Wed Apr 12 09:18:17 2017	(r3935)
@@ -1,124 +1,135 @@
 package votable
-
+/**
+ * lmsource.groovy
+ * Laurent Michel - 04/2017
+ */
 import cfa.vo.vodml.io.VodmlReader
 
 def location = { path ->
     VodmlReader.getResource("/${path}")
 }
-
+/*
+ * Model imports
+ */
 def remote = "http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models"
-
-def ivoaLocation = location('ivoa.vo-dml.xml')
-def ivoaRemoteLocation = new URL("$remote/ivoa/IVOA.vo-dml.xml")
-def tesselLocation = new URL("$remote/tesselation/coordsys_tessel.vo-dml.xml")
+def ivoaRemoteLocation       = new URL("$remote/ivoa/IVOA.vo-dml.xml")
+def coordsys_tessel_location = new URL("$remote/tesselation/coordsys_tessel.vo-dml.xml")
+def coords_tessel_location   = new URL("$remote/tesselation/coords_tessel.vo-dml.xml")
+def lmsource_location        = new URL("$remote/tesselation/lmsource.vo-dml.xml")
 
 def reader = new VodmlReader()
 
-ivoaSpec = reader.read(ivoaRemoteLocation.openStream())
-tesselSpec = reader.read(tesselLocation.openStream())
-
+ivoaSpec             = reader.read(ivoaRemoteLocation.openStream())
+coordsys_tessel_spec = reader.read(coordsys_tessel_location.openStream())
+coords_tessel_spec   = reader.read(coords_tessel_location.openStream())
+lmsources_spec       = reader.read(lmsource_location.openStream())
+
+/*
+ * <VODML> element building
+ * The actual output is a VOTable
+ */
 dmInstance {
-    model(spec: ivoaSpec  , vodmlURL: ivoaRemoteLocation)
-    model(spec: tesselSpec, vodmlURL: tesselLocation, identifier: "ivo://ivoa.org/dm/sample/Tessel/0.1")
-
+	/*
+	 * Model imports
+	 */
+    model(spec: ivoaSpec            , vodmlURL: ivoaRemoteLocation)
+    model(spec: coordsys_tessel_spec, vodmlURL: coordsys_tessel_location, identifier: "ivo://ivoa.org/dm/sample/CoordSysTessel/0.1")
+    model(spec: coords_tessel_spec  , vodmlURL: coords_tessel_location  , identifier: "ivo://ivoa.org/dm/sample/CoordsTessel/0.1")
+    model(spec: lmsources_spec      , vodmlURL: lmsource_location       , identifier: "ivo://ivoa.org/dm/sample/LMSource/0.1")
+	/*
+	 * GLobals: Some of the values should be read in {PARAMS}, but as long as this is not featured win Jovail they are hard coded.
+	 */
     globals(id: "_MyFirstGlobal") {
-      instance(type: "coordsys:domain.spatial.SpaceFrame", id: "_icrs") {
-        instance(role: "ragoon", value: "ICRS")
-    	}
-   	}
-
- 
-//     ["2mass:H", "2mass:J", "2mass:K"].each { name ->
-//         def id = "_${name.replace(':', '')}"
-//         instance(type: "filter:PhotometryFilter", id: id) {
-//             pk(value: id)
-//             instance(role: "name", value: name)
-//         }
-//     }
-// 
-//     globals(id: "_SDSS_FILTERS") {
-//         ["sdss:g", "sdss:r", "sdss:u"].each { name ->
-//             instance(type: "filter:PhotometryFilter") {
-//                 pk(value: name)
-//                 instance(role: "name", value: name)
-//             }
-//         }
-//     }
-
-//     resource(id: "table_objects") {
-// 
-//         table(id: "_table1") {
-// 
-//             def sourceNames = ['08120809-0206132', '08115683-0205428', '08115826-0205336']
-//             def ra = [123.033734, 122.986794, 122.992773]
-//             def dec = [-2.103671, -2.095231, -2.092676]
-//             def j = [14.161, 15.860, 16.273]
-//             def jErr = [0.025, 0.060, 0.096]
-//             def h = [13.681, 15.103, 15.718]
-//             def hErr = [0.027, 0.077, 0.112]
-//             def k = [13.675, 14.847, 15.460]
-//             def kErr = [0.048, 0.127, 0.212]
-
-//             instance(type: "sample:catalog.SDSSSource", id: "_source") {
-//                 pk() {
-//                     column(role: "name", id: "_designation", data: sourceNames)
-//                 }
-//                 instance(role: "position") {
-//                     column(role: "longitude", id: "_ra", data: ra)
-//                     column(role: "latitude", id: "_dec", data: dec)
-//                     reference(role: "frame") {
-//                         idref("_icrs")
-//                     }
-//                 }
-//                 instance(role: "positionError") {
-//                     instance(role: "longError", value: 0.1)
-//                     instance(role: "latError", value: 0.1)
-//                 }
-//                 instance(role: "luminosity") {
-//                     column(role: "value", id: "_magH", data: h)
-//                     column(role: "error", id: "_errH", data: hErr)
-//                     instance(role: "type", value: "magnitude")
-//                     reference(role: "filter") {
-//                         idref("_2massH")
-//                     }
-//                 }
-//                 instance(role: "luminosity") {
-//                     column(role: "value", id: "_magK", data: k)
-//                     column(role: "error", id: "_errK", data: kErr)
-//                     instance(role: "type", value: "magnitude")
-//                     reference(role: "filter") {
-//                         idref("_2massK")
-//                     }
-//                 }
-//                 instance(role: "luminosity") {
-//                     column(role: "error", id: "_errJ", data: jErr)
-//                     reference(role: "filter") {
-//                         idref("_2massJ")
-//                     }
-//                     column(role: "value", id: "_magJ", data: j)
-//                     instance(role: "type", value: "magnitude")
-//                 }
-//                 composition(role: "luminosity", ref: "SDSS_MAGS")
-//             }
-//        }
+        /*
+         * SpaceFrame of the source position
+         */
+        instance(type: "coordsys:domain.spatial.SpaceFrame", id: "_coordspaceframe") {
+          instance(type: "coordsys:domain.spatial.SpatialLocation", role: "coordsys:domain.spatial.SpaceFrame.origin"     , value: "TOPOCENTER")
+          instance(type: "coordsys:domain.spatial.StdRefFrame",     role: "coordsys:domain.spatial.SpaceFrame.orientation", value: "ICRS")
+          instance(type: "coordsys:domain.spatial.Epoch",           role: "coordsys:domain.spatial.SpaceFrame.equinox"    , value: "2015")
+        }
+        /*
+         * SpaceFrame of the healpix indexation
+         */
+        instance(type: "coordsys:domain.spatial.SpaceFrame", id: "_healpixspaceframe") {
+          instance(type: "coordsys:domain.spatial.SpatialLocation", role: "coordsys:domain.spatial.SpaceFrame.origin"     , value: "TOPOCENTER")
+          instance(type: "coordsys:domain.spatial.StdRefFrame",     role: "coordsys:domain.spatial.SpaceFrame.orientation", value: "ICRS")
+          instance(type: "coordsys:domain.spatial.Epoch",           role: "coordsys:domain.spatial.SpaceFrame.equinox"    , value: "2000")
+          reference(role: "coordSpace") {
+            idref("_healpixframe")      
+          }
+        }
+        /*
+         * Healpix parameters
+         */
+        instance(type: "coordsys:domain.spatial.Healpix", id: "_healpixframe") {
+          instance(type: "oordsys:domain.spatial.HealpixSchema", role: "coordsys:domain.spatial.Healpix.Schema", value: "NESTED")
+          instance(type: "ivoa:integer",  role: "coordsys:domain.spatial.Healpix.norder", value: "13")
+         }
+    }
+   	/*
+   	 * Pseudo table necessarly to generatea VODML annotation
+   	 */
+	resource(id: "table_objects") {
+         table(id: "_table1") {
+         	def nameesaada   = []
+         	def pos_ra_csa   = []
+         	def pos_dec_csa  = []
+         	def error_maj_csa = []
+         	def healpix_csa  = []
+         	def parallax_csa = []
+			/*
+			 * One Source instance per data row
+			 */  
+            instance(type: "source.Source", id: "_source") {
+				// taking the name as primary key (works for this example)
+                pk() {
+                    column(role: "name", id: "namesaada_100", data: nameesaada) 
+                }
+                column(role: "name", id: "namesaada_100", data: nameesaada)
+                // Position2D component: RA/DEC + error
+                instance(role: "source.Source.position", type: "coords_tessel:domain.spatial.Position2D") {
+                	instance(role: "coords_tessel:domain.spatial.Position.tile"){
+                	    instance(role: "coordsys_tessel:domain.spatial.SkyIndex"){
+							column(role: "loc", id: "healpix_csa_100", data: healpix_csa)
+               		      } 
+               		    }
+                		instance(role: "coords_tessel:domain.spatial.Position2D") {
+                		  instance(role: "coord") {
+                 		  	instance(role: "coordsys_tessel:domain.spatial.SpatialCoord") {
+                 		      column(role: "longitude", id: "pos_ra_csa_100", data: pos_ra_csa)
+                 		        instance(role: "axis"){
+                 		          instance(type: "ivoa:String", role: "name", value: "ra")
+                 		        }
+                		  	}
+                 		  	instance(role: "coordsys_tessel:domain.spatial.SpatialCoord") {
+                 		      column(role: "latitude", id: "pos_dec_csa_100", data: pos_dec_csa)
+                 		        instance(role: "axis"){
+                 		          instance(type: "ivoa:String", role: "name", value: "dec")
+                 		        }
+                		  	}
+                		  }
+               		      instance(role: "error") {
+                 		  	instance(role: "domain.spatial.StatisticalError2D") {
+                  		  		instance(role: "statError", type: "dtypes.Ellipse") {
+                 		          column(role: "semiAxis", id: "error_maj_csa_100", data: error_maj_csa)
+                 		          instance(type: "ivoa:Quantity", role: "posAngle", value: "0")
+                 		  	    }
+                		     }
+                		  }
+                        }
+                 }
+                 // Just to look a little bit like Gaia
+                 column(role: "parallax", id: "parallax_csa_100", data: parallax_csa)
+                 // Association with both space frame (don't know how to tell Jovial to make an association)
+                 reference(role: "spaceFrame") {
+                   idref("_coordspaceframe")
+                 }
+                 reference(role: "tesselation") {
+                   idref("_healpixspaceframe")
+                 }
+            }
+         }
+	}
 
-//         def sourceId = ["08120809-0206132", "08120809-0206132"]
-//         def mag = [23.2, 23.0]
-//         def err = [0.04, 0.03]
-//         def filterId = ["sdss:g", "sdss:r"]
-// 
-//         table(id: "_sdss_mags") {
-//             instance(id: "SDSS_MAGS", type: "sample:catalog.LuminosityMeasurement") {
-//                 fk(target: "_source") {
-//                     column(id: "_container", data: sourceId)
-//                 }
-//                 column(role: "value", id: "_mag", data: mag)
-//                 column(role: "error", id: "_eMag", data: err)
-//                 reference(role: "filter") {
-//                     fk(target: "_SDSS_FILTERS") {
-//                         column(id: "_filter", data: filterId)
-//                     }
-//                 }
-//             }
-//    }
 }
\ No newline at end of file

Added: trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy.output.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy.output.xml	Wed Apr 12 09:18:17 2017	(r3935)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?><VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <VODML>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>coordsys</NAME>
+      <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml</URL>
+      <IDENTIFIER>ivo://ivoa.org/dm/sample/Tessel/0.1</IDENTIFIER>
+    </MODEL>
+    <GLOBALS ID="_MyFirstGlobal">
+      <INSTANCE dmtype="null" ID="_coordspaceframe">
+        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
+          <LITERAL value="TOPOCENTER" dmtype="coordsys:domain.spatial.SpatialLocation"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
+          <LITERAL value="ICRS" dmtype="coordsys:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
+          <LITERAL value="2015" dmtype="coordsys:domain.spatial.Epoch"/>
+        </ATTRIBUTE>
+      </INSTANCE>
+      <INSTANCE dmtype="null" ID="_healpixspaceframe">
+        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
+          <LITERAL value="TOPOCENTER" dmtype="coordsys:domain.spatial.SpatialLocation"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
+          <LITERAL value="ICRS" dmtype="coordsys:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
+          <LITERAL value="2000" dmtype="coordsys:domain.spatial.Epoch"/>
+        </ATTRIBUTE>
+        <REFERENCE dmrole="coordSpace">
+          <IDREF>_healpixframe</IDREF>
+        </REFERENCE>
+      </INSTANCE>
+      <INSTANCE dmtype="null" ID="_healpixframe">
+        <ATTRIBUTE dmrole="Schema">
+          <LITERAL value="NESTED" dmtype="HealpixSchema"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="norder">
+          <LITERAL value="13" dmtype="ivoa:integer"/>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </GLOBALS>
+    <TEMPLATES tableref="_table1">
+      <INSTANCE dmtype="source.Source" ID="_source">
+        <PRIMARYKEY>
+          <PKFIELD>
+            <COLUMN dmtype="ivoa:string" ref="namesaada_100"/>
+          </PKFIELD>
+        </PRIMARYKEY>
+        <ATTRIBUTE dmrole="name">
+          <COLUMN dmtype="" ref="namesaada_100"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="source.Source.position">
+          <INSTANCE dmtype="coords_tessel:domain.spatial.Position2D">
+            <ATTRIBUTE dmrole="coords_tessel:domain.spatial.Position.tile">
+              <INSTANCE dmtype="null">
+                <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SkyIndex">
+                  <INSTANCE dmtype="null">
+                    <ATTRIBUTE dmrole="loc">
+                      <COLUMN dmtype="" ref="healpix_csa_100"/>
+                    </ATTRIBUTE>
+                  </INSTANCE>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <ATTRIBUTE dmrole="coords_tessel:domain.spatial.Position2D">
+              <INSTANCE dmtype="null">
+                <ATTRIBUTE dmrole="coord">
+                  <INSTANCE dmtype="null">
+                    <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpatialCoord">
+                      <INSTANCE dmtype="null">
+                        <ATTRIBUTE dmrole="axis">
+                          <INSTANCE dmtype="null">
+                            <ATTRIBUTE dmrole="name">
+                              <LITERAL value="ra" dmtype="ivoa:String"/>
+                            </ATTRIBUTE>
+                          </INSTANCE>
+                        </ATTRIBUTE>
+                        <ATTRIBUTE dmrole="longitude">
+                          <COLUMN dmtype="" ref="pos_ra_csa_100"/>
+                        </ATTRIBUTE>
+                      </INSTANCE>
+                    </ATTRIBUTE>
+                    <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpatialCoord">
+                      <INSTANCE dmtype="null">
+                        <ATTRIBUTE dmrole="axis">
+                          <INSTANCE dmtype="null">
+                            <ATTRIBUTE dmrole="name">
+                              <LITERAL value="dec" dmtype="ivoa:String"/>
+                            </ATTRIBUTE>
+                          </INSTANCE>
+                        </ATTRIBUTE>
+                        <ATTRIBUTE dmrole="latitude">
+                          <COLUMN dmtype="" ref="pos_dec_csa_100"/>
+                        </ATTRIBUTE>
+                      </INSTANCE>
+                    </ATTRIBUTE>
+                  </INSTANCE>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="error">
+                  <INSTANCE dmtype="null">
+                    <ATTRIBUTE dmrole="domain.spatial.StatisticalError2D">
+                      <INSTANCE dmtype="null">
+                        <ATTRIBUTE dmrole="statError">
+                          <INSTANCE dmtype="dtypes.Ellipse">
+                            <ATTRIBUTE dmrole="posAngle">
+                              <LITERAL value="0" dmtype="ivoa:Quantity"/>
+                            </ATTRIBUTE>
+                            <ATTRIBUTE dmrole="semiAxis">
+                              <COLUMN dmtype="" ref="error_maj_csa_100"/>
+                            </ATTRIBUTE>
+                          </INSTANCE>
+                        </ATTRIBUTE>
+                      </INSTANCE>
+                    </ATTRIBUTE>
+                  </INSTANCE>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <REFERENCE dmrole="spaceFrame">
+          <IDREF>_coordspaceframe</IDREF>
+        </REFERENCE>
+        <REFERENCE dmrole="tesselation">
+          <IDREF>_healpixspaceframe</IDREF>
+        </REFERENCE>
+        <ATTRIBUTE dmrole="name">
+          <COLUMN dmtype="" ref="namesaada_100"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="parallax">
+          <COLUMN dmtype="" ref="parallax_csa_100"/>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </TEMPLATES>
+  </VODML>
+  <RESOURCE ID="table_objects">
+    <TABLE ID="_table1">
+      <FIELD datatype="char" arraysize="*" ID="namesaada_100"/>
+      <FIELD datatype="char" arraysize="*" ID="healpix_csa_100"/>
+      <FIELD datatype="char" arraysize="*" ID="pos_ra_csa_100"/>
+      <FIELD datatype="char" arraysize="*" ID="pos_dec_csa_100"/>
+      <FIELD datatype="char" arraysize="*" ID="error_maj_csa_100"/>
+      <FIELD datatype="char" arraysize="*" ID="parallax_csa_100"/>
+      <DATA>
+        <TABLEDATA/>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>
\ No newline at end of file

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.gvd
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.gvd	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.gvd	Wed Apr 12 09:18:17 2017	(r3935)
@@ -27,13 +27,13 @@
 	style=filled] 
 	"lmsource:source.Source" [
     URL="#source.Source"
-    label = "{source/Source|+name : ivoa:string\l+position : :domain.spatial.Position2D\l+parallax : ivoa:quantity.Quantity\l}"
+    label = "{source/Source|+name : ivoa:string\l+position : coords_tessel:domain.spatial.Position2D\l+parallax : ivoa:quantity.Quantity\l}"
     fillcolor="/set312/2"
     ] ;
   
  
     edge [color="green", arrowhead="open", arrowtail="none"]
-    "lmsource:source.Source" -> ":CoordFrame" [headlabel="1",label="spaceFrame",labelfontsize=10] ;
+    "lmsource:source.Source" -> "coordsys_tessel:CoordFrame" [headlabel="1",label="spaceFrame",labelfontsize=10] ;
     
 }
   
\ No newline at end of file

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.html
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.html	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.html	Wed Apr 12 09:18:17 2017	(r3935)
@@ -43,17 +43,17 @@
         <tr>
           <td>4.1</td>
           <td>
-                <a href="#ivoa">ivoa</a></td>
+                <a href="#coords_tessel">coords_tessel</a></td>
         </tr>
         <tr>
           <td>4.2</td>
           <td>
-                <a href="#tcoords">tcoords</a></td>
+                <a href="#coordsys_tessel">coordsys_tessel</a></td>
         </tr>
         <tr>
           <td>4.3</td>
           <td>
-                <a href="#tcoordsys">tcoordsys</a></td>
+                <a href="#ivoa">ivoa</a></td>
         </tr>
       </table>
     </div>
@@ -68,7 +68,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2017-03-30T13:29:36</td>
+        <td>2017-04-11T17:02:13</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -95,9 +95,9 @@
       <tr>
         <td colspan="3"></td>
       </tr>
-    </table><img src="lmsource.png" usemap="#GVmap"><map id="GVmap" name="GVmap">
+    </table><img src="lmsource.png}" usemap="#GVmap"><map id="GVmap" name="GVmap">
 <area shape="rect" id="node1" href="#source" title="source" alt="" coords="27,57,99,105"/>
-<area shape="rect" id="node2" href="#source.Source" title="{source/Source|+name : ivoa:string\l+position : :domain.spatial.Position2D\l+parallax : ivoa:quantity.Quantity\l}" alt="" coords="123,46,309,117"/>
+<area shape="rect" id="node2" href="#source.Source" title="{source/Source|+name : ivoa:string\l+position : coords_tessel:domain.spatial.Position2D\l+parallax : ivoa:quantity.Quantity\l}" alt="" coords="123,46,365,117"/>
 </map>
 
     <hr>
@@ -181,7 +181,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="source.Source.name"></a><b>name</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/IVOA.html#string">string</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#string">string</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -201,7 +201,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="source.Source.position"></a><b>position</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#"></a>:<a href="#domain.spatial.Position2D">domain.spatial.Position2D</a></td>
+                      <td class="feature-detail"><a href="#coords_tessel">coords_tessel</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html#domain.spatial.Position2D">domain.spatial.Position2D</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -221,7 +221,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="source.Source.parallax"></a><b>parallax</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/IVOA.html#quantity.Quantity">quantity.Quantity</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#quantity.Quantity">quantity.Quantity</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -249,7 +249,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="source.Source.spaceFrame"></a><b>spaceFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#"></a>:<a href="#CoordFrame">CoordFrame</a></td>
+                      <td class="feature-detail"><a href="#coordsys_tessel">coordsys_tessel</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html#CoordFrame">CoordFrame</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -349,52 +349,52 @@
       For each imported model we list URLs to the VO-DML and HTML representations and the prefix used for vodml-ids from inside
       the model.
     </p>
-    <h2><a name="ivoa"></a>4.1 ivoa
+    <h2><a name="coords_tessel"></a>4.1 coords_tessel
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">ivoa</td>
+        <td class="objecttype-name">coords_tessel</td>
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="http://volute-g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml">http://volute-g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
-        <td><a href="http://volute-g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html">http://volute-g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html</a></td>
       </tr>
     </table>
-    <h2><a name="tcoords"></a>4.2 tcoords
+    <h2><a name="coordsys_tessel"></a>4.2 coordsys_tessel
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">tcoords</td>
+        <td class="objecttype-name">coordsys_tessel</td>
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href=""></a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
-        <td><a href=""></a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html</a></td>
       </tr>
     </table>
-    <h2><a name="tcoordsys"></a>4.3 tcoordsys
+    <h2><a name="ivoa"></a>4.3 ivoa
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">tcoordsys</td>
+        <td class="objecttype-name">ivoa</td>
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.xmi">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.xmi</a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>
-        <td><a href=""></a></td>
+        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</a></td>
       </tr>
     </table>
   </body>

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.map
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.map	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.map	Wed Apr 12 09:18:17 2017	(r3935)
@@ -1,4 +1,4 @@
 <map id="GVmap" name="GVmap">
 <area shape="rect" id="node1" href="#source" title="source" alt="" coords="27,57,99,105"/>
-<area shape="rect" id="node2" href="#source.Source" title="{source/Source|+name : ivoa:string\l+position : :domain.spatial.Position2D\l+parallax : ivoa:quantity.Quantity\l}" alt="" coords="123,46,309,117"/>
+<area shape="rect" id="node2" href="#source.Source" title="{source/Source|+name : ivoa:string\l+position : coords_tessel:domain.spatial.Position2D\l+parallax : ivoa:quantity.Quantity\l}" alt="" coords="123,46,365,117"/>
 </map>

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

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.vo-dml.xml	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.vo-dml.xml	Wed Apr 12 09:18:17 2017	(r3935)
@@ -8,21 +8,21 @@
         </description>
   <title/>
   <version>0.x</version>
-  <lastModified>2017-03-30T13:29:36</lastModified>
+  <lastModified>2017-04-11T17:02:13</lastModified>
   <import>
     <name>ivoa</name>
-    <url>http://volute-g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</url>
-    <documentationURL>http://volute-g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</documentationURL>
+    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</url>
+    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</documentationURL>
   </import>
   <import>
-    <name>tcoordsys</name>
-    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.xmi</url>
-    <documentationURL/>
+    <name>coordsys_tessel</name>
+    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml</url>
+    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html</documentationURL>
   </import>
   <import>
-    <name>tcoords</name>
-    <url/>
-    <documentationURL/>
+    <name>coords_tessel</name>
+    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml</url>
+    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html</documentationURL>
   </import>
 
   <package>
@@ -58,7 +58,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <datatype>
-          <vodml-ref>:domain.spatial.Position2D</vodml-ref>
+          <vodml-ref>coords_tessel:domain.spatial.Position2D</vodml-ref>
         </datatype>
         <multiplicity>
           <minOccurs>1</minOccurs>
@@ -86,7 +86,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <datatype>
-          <vodml-ref>:CoordFrame</vodml-ref>
+          <vodml-ref>coordsys_tessel:CoordFrame</vodml-ref>
         </datatype>
         <multiplicity>
           <minOccurs>1</minOccurs>

Added: trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml	Wed Apr 12 09:18:17 2017	(r3935)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3">
+	
+<DESCRIPTION><![CDATA[
+SaadaDB:
+   name : ThreeXMMdr6
+   url  : http://xcatdb.unistra.fr/3xmmdr6
+   date : Mon Apr 10 17:18:07 CEST 2017
+Query parameters:
+   query: SELECT  TOP 5  CATALOGUE.CATALOGUE_ENTRY.namesaada,CATALOGUE.CATALOGUE_ENTRY.pos_ra_csa,CATALOGUE.CATALOGUE_ENTRY.pos_dec_csa,CATALOGUE.CATALOGUE_ENTRY.healpix_csa,CATALOGUE.CATALOGUE_ENTRY.error_maj_csa
+FROM CATALOGUE.CATALOGUE_ENTRY
+
+   limit: -1
+Archive generated by SAADA: http://saada.u-strasbg.fr
+]]>
+	
+	</DESCRIPTION>
+	<COOSYS ID="ICRS" system="ICRS"/>
+	<RESOURCE type="results"><DESCRIPTION>TAP1.0</DESCRIPTION>
+		<INFO name="QUERY_STATUS" value="OK"/>
+		<INFO name="LANGUAGE" value="ADQL"/>
+		<INFO name="QUERY"><![CDATA[SELECT "CATALOGUE_ENTRY.namesaada", "CATALOGUE_ENTRY.pos_ra_csa", "CATALOGUE_ENTRY.pos_dec_csa", "CATALOGUE_ENTRY.healpix_csa", "CATALOGUE_ENTRY.error_maj_csa"
+FROM CATALOGUE_ENTRY AS CATALOGUE_ENTRY]]></INFO>
+		<TABLE name="Results">
+			<GROUP ID="_healpix">
+				<PARAM name="healpix_schema" value="NESTED">
+				<PARAM name="healpix_order" value="13">
+			</GROUP>
+			<FIELD ID="namesaada_100" name="namesaada" datatype="char" ucd="meta.id" arraysize="*">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="pos_ra_csa_100" name="pos_ra_csa" datatype="double" ucd="pos.eq.ra;meta.main" unit="deg">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="pos_dec_csa_100" name="pos_dec_csa" datatype="double" ucd="pos.eq.dec;meta.main" unit="deg">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="healpix_csa_100" name="healpix_csa" datatype="long">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="error_maj_csa_100" name="error_maj_csa" datatype="double" ucd="stat.error;phys.size" unit="deg">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="parallax_csa_100" name="parallax_csa" datatype="double" ucd="pos.parallax" unit="arcsec">
+				<DESCRIPTION>Attribute added by hand</DESCRIPTION>
+			</FIELD>
+			<DATA>
+				<TABLEDATA>
+					<TR><TD><![CDATA[3XMM J172607.5+022156]]></TD><TD>261.53145000675</TD><TD>2.3655706408564</TD><TD>8171902023</TD><TD>2.16155833333333E-4</TD><TD></TD></TR>
+					<TR><TD><![CDATA[3XMM J100208.7+015057]]></TD><TD>150.53636456284</TD><TD>1.8497826449617</TD><TD>7145194753</TD><TD>6.02861111111111E-4</TD><TD></TD></TR>
+					<TR><TD><![CDATA[3XMM J172607.7+022334]]></TD><TD>261.53219216683</TD><TD>2.3929305745001</TD><TD>8171902391</TD><TD>2.76385555555556E-4</TD><TD></TD></TR>
+					<TR><TD><![CDATA[3XMM J172608.4+022539]]></TD><TD>261.53504545299</TD><TD>2.4275679503222</TD><TD>8174699164</TD><TD>4.24838888888889E-4</TD><TD></TD></TR>
+					<TR><TD><![CDATA[3XMM J172610.0+020959]]></TD><TD>261.5419369875</TD><TD>2.1664740879867</TD><TD>8149518785</TD><TD>5.88491666666667E-4</TD><TD></TD></TR>
+				</TABLEDATA>
+
+			</DATA>
+		</TABLE>
+	</RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.xml	Wed Apr 12 09:18:17 2017	(r3935)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3">
+	
+<DESCRIPTION><![CDATA[
+SaadaDB:
+   name : ThreeXMMdr6
+   url  : http://xcatdb.unistra.fr/3xmmdr6
+   date : Mon Apr 10 17:18:07 CEST 2017
+Query parameters:
+   query: SELECT  TOP 5  CATALOGUE.CATALOGUE_ENTRY.namesaada,CATALOGUE.CATALOGUE_ENTRY.pos_ra_csa,CATALOGUE.CATALOGUE_ENTRY.pos_dec_csa,CATALOGUE.CATALOGUE_ENTRY.healpix_csa,CATALOGUE.CATALOGUE_ENTRY.error_maj_csa
+FROM CATALOGUE.CATALOGUE_ENTRY
+
+   limit: -1
+Archive generated by SAADA: http://saada.u-strasbg.fr
+]]>
+	
+	</DESCRIPTION>
+	<COOSYS ID="ICRS" system="ICRS"/>
+	<RESOURCE type="results"><DESCRIPTION>TAP1.0</DESCRIPTION>
+		<INFO name="QUERY_STATUS" value="OK"/>
+		<INFO name="LANGUAGE" value="ADQL"/>
+		<INFO name="QUERY"><![CDATA[SELECT "CATALOGUE_ENTRY.namesaada", "CATALOGUE_ENTRY.pos_ra_csa", "CATALOGUE_ENTRY.pos_dec_csa", "CATALOGUE_ENTRY.healpix_csa", "CATALOGUE_ENTRY.error_maj_csa"
+FROM CATALOGUE_ENTRY AS CATALOGUE_ENTRY]]></INFO>
+		<TABLE name="Results">
+			<GROUP ID="_healpix">
+				<PARAM name="healpix_schema" value="NESTED">
+				<PARAM name="healpix_order" value="13">
+			</GROUP>
+			<FIELD ID="namesaada_100" name="namesaada" datatype="char" ucd="meta.id" arraysize="*">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="pos_ra_csa_100" name="pos_ra_csa" datatype="double" ucd="pos.eq.ra;meta.main" unit="deg">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="pos_dec_csa_100" name="pos_dec_csa" datatype="double" ucd="pos.eq.dec;meta.main" unit="deg">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="healpix_csa_100" name="healpix_csa" datatype="long">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="error_maj_csa_100" name="error_maj_csa" datatype="double" ucd="stat.error;phys.size" unit="deg">
+				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>
+			</FIELD>
+			<FIELD ID="parallax_csa_100" name="parallax_csa" datatype="double" ucd="pos.parallax" unit="arcsec">
+				<DESCRIPTION>Attribute added by hand</DESCRIPTION>
+			</FIELD>
+			<DATA>
+				<TABLEDATA>
+					<TR><TD><![CDATA[3XMM J172607.5+022156]]></TD><TD>261.53145000675</TD><TD>2.3655706408564</TD><TD>8171902023</TD><TD>2.16155833333333E-4</TD><TD></TD></TR>
+					<TR><TD><![CDATA[3XMM J100208.7+015057]]></TD><TD>150.53636456284</TD><TD>1.8497826449617</TD><TD>7145194753</TD><TD>6.02861111111111E-4</TD><TD></TD></TR>
+					<TR><TD><![CDATA[3XMM J172607.7+022334]]></TD><TD>261.53219216683</TD><TD>2.3929305745001</TD><TD>8171902391</TD><TD>2.76385555555556E-4</TD><TD></TD></TR>
+					<TR><TD><![CDATA[3XMM J172608.4+022539]]></TD><TD>261.53504545299</TD><TD>2.4275679503222</TD><TD>8174699164</TD><TD>4.24838888888889E-4</TD><TD></TD></TR>
+					<TR><TD><![CDATA[3XMM J172610.0+020959]]></TD><TD>261.5419369875</TD><TD>2.1664740879867</TD><TD>8149518785</TD><TD>5.88491666666667E-4</TD><TD></TD></TR>
+				</TABLEDATA>
+
+			</DATA>
+		</TABLE>
+	</RESOURCE>
+</VOTABLE>

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.xmi
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.xmi	Tue Apr 11 21:34:40 2017	(r3934)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.xmi	Wed Apr 12 09:18:17 2017	(r3935)
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_CbUw4BU8EeeZh9zsKpIhxg/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20100901 http:///schemas/IVOA_UML_Profile/_CbUw4BU8EeeZh9zsKpIhxg/0 IVOA_UML_Profile.profile.xmi#_CcSaNxU8EeeZh9zsKpIhxg">
-  <uml:Model xmi:id="_CbRGgBU8EeeZh9zsKpIhxg" name="lmsource">
-    <eAnnotations xmi:id="_CbRGgRU8EeeZh9zsKpIhxg" source="Objing">
-      <contents xmi:type="uml:Property" xmi:id="_CbRGghU8EeeZh9zsKpIhxg" name="exporterVersion">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_CbRGgxU8EeeZh9zsKpIhxg" value="3.0.0"/>
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_Ww-mkB6sEeel5txBxgvIkw/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20100901 http:///schemas/IVOA_UML_Profile/_Ww-mkB6sEeel5txBxgvIkw/0 IVOA_UML_Profile.profile.xmi#_WxBC0h6sEeel5txBxgvIkw">
+  <uml:Model xmi:id="_Ww9YcB6sEeel5txBxgvIkw" name="lmsource">
+    <eAnnotations xmi:id="_Ww9YcR6sEeel5txBxgvIkw" source="Objing">
+      <contents xmi:type="uml:Property" xmi:id="_Ww9Ych6sEeel5txBxgvIkw" name="exporterVersion">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_Ww9Ycx6sEeel5txBxgvIkw" value="3.0.0"/>
       </contents>
     </eAnnotations>
-    <packagedElement xmi:type="uml:Package" xmi:id="_CbRGhBU8EeeZh9zsKpIhxg" name="ivoa">
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGhRU8EeeZh9zsKpIhxg" name="real"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGhhU8EeeZh9zsKpIhxg" name="datetime"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGhxU8EeeZh9zsKpIhxg" name="anyURI">
-        <generalization xmi:type="uml:Generalization" xmi:id="_CbRGiBU8EeeZh9zsKpIhxg" general="_CbRGiRU8EeeZh9zsKpIhxg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGiRU8EeeZh9zsKpIhxg" name="string"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGihU8EeeZh9zsKpIhxg" name="nonnegativeInteger"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGixU8EeeZh9zsKpIhxg" name="boolean"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGjBU8EeeZh9zsKpIhxg" name="integer"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGjRU8EeeZh9zsKpIhxg" name="rational">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGjhU8EeeZh9zsKpIhxg" name="numerator" visibility="public" type="_CbRGjBU8EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGjxU8EeeZh9zsKpIhxg" name="denominator" visibility="public" type="_CbRGihU8EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGkBU8EeeZh9zsKpIhxg" name="complex">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGkRU8EeeZh9zsKpIhxg" name="re" visibility="public" type="_CbRGhRU8EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGkhU8EeeZh9zsKpIhxg" name="im" visibility="public" type="_CbRGhRU8EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_CbRGkxU8EeeZh9zsKpIhxg" name="IVOA Base Types V1.0 (2016)"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_CbRGlBU8EeeZh9zsKpIhxg" name="Unit">
-        <generalization xmi:type="uml:Generalization" xmi:id="_CbRGlRU8EeeZh9zsKpIhxg" general="_CbRGiRU8EeeZh9zsKpIhxg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_CbRGlhU8EeeZh9zsKpIhxg" name="Quantity" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGlxU8EeeZh9zsKpIhxg" name="unit" visibility="public" type="_CbRGlBU8EeeZh9zsKpIhxg" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CbRGmBU8EeeZh9zsKpIhxg"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_Ww9YdB6sEeel5txBxgvIkw" name="ivoa">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9YdR6sEeel5txBxgvIkw" name="real"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9Ydh6sEeel5txBxgvIkw" name="datetime"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9Ydx6sEeel5txBxgvIkw" name="anyURI">
+        <generalization xmi:type="uml:Generalization" xmi:id="_Ww9YeB6sEeel5txBxgvIkw" general="_Ww9YeR6sEeel5txBxgvIkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9YeR6sEeel5txBxgvIkw" name="string"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9Yeh6sEeel5txBxgvIkw" name="nonnegativeInteger"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9Yex6sEeel5txBxgvIkw" name="boolean"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9YfB6sEeel5txBxgvIkw" name="integer"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9YfR6sEeel5txBxgvIkw" name="rational">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9Yfh6sEeel5txBxgvIkw" name="numerator" visibility="public" type="_Ww9YfB6sEeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9Yfx6sEeel5txBxgvIkw" name="denominator" visibility="public" type="_Ww9Yeh6sEeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9YgB6sEeel5txBxgvIkw" name="complex">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9YgR6sEeel5txBxgvIkw" name="re" visibility="public" type="_Ww9YdR6sEeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9Ygh6sEeel5txBxgvIkw" name="im" visibility="public" type="_Ww9YdR6sEeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_Ww9Ygx6sEeel5txBxgvIkw" name="IVOA Base Types V1.0 (2016)"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ww9YhB6sEeel5txBxgvIkw" name="Unit">
+        <generalization xmi:type="uml:Generalization" xmi:id="_Ww9YhR6sEeel5txBxgvIkw" general="_Ww9YeR6sEeel5txBxgvIkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_Ww9Yhh6sEeel5txBxgvIkw" name="Quantity" isAbstract="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9Yhx6sEeel5txBxgvIkw" name="unit" visibility="public" type="_Ww9YhB6sEeel5txBxgvIkw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ww9YiB6sEeel5txBxgvIkw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_CbRGmRU8EeeZh9zsKpIhxg" name="IntegerQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_CbRGmhU8EeeZh9zsKpIhxg" general="_CbRGlhU8EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGmxU8EeeZh9zsKpIhxg" name="value" visibility="public" type="_CbRGjBU8EeeZh9zsKpIhxg" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_CbRGnBU8EeeZh9zsKpIhxg" name="RealQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_CbRGnRU8EeeZh9zsKpIhxg" general="_CbRGlhU8EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGnhU8EeeZh9zsKpIhxg" name="value" visibility="public" type="_CbRGhRU8EeeZh9zsKpIhxg" isUnique="false"/>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_Ww9YiR6sEeel5txBxgvIkw" name="IntegerQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_Ww9Yih6sEeel5txBxgvIkw" general="_Ww9Yhh6sEeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9Yix6sEeel5txBxgvIkw" name="value" visibility="public" type="_Ww9YfB6sEeel5txBxgvIkw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_Ww9YjB6sEeel5txBxgvIkw" name="RealQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_Ww9YjR6sEeel5txBxgvIkw" general="_Ww9Yhh6sEeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9Yjh6sEeel5txBxgvIkw" name="value" visibility="public" type="_Ww9YdR6sEeel5txBxgvIkw" isUnique="false"/>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_CbRGnxU8EeeZh9zsKpIhxg" name="Template Model V1.0 (2016)"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_CbRGoBU8EeeZh9zsKpIhxg" name="tcoordsys">
-      <packagedElement xmi:type="uml:Class" xmi:id="_CbRGoRU8EeeZh9zsKpIhxg" name="SpaceFrame"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_CbRGohU8EeeZh9zsKpIhxg" name="source">
-      <packagedElement xmi:type="uml:Class" xmi:id="_CbRGoxU8EeeZh9zsKpIhxg" name="Source">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGpBU8EeeZh9zsKpIhxg" name="spaceFrame" visibility="public" type="_CbRGoRU8EeeZh9zsKpIhxg" association="_CbRGqBU8EeeZh9zsKpIhxg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGpRU8EeeZh9zsKpIhxg" name="name" visibility="public" type="_CbRGiRU8EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGphU8EeeZh9zsKpIhxg" name="position" visibility="public" type="_CbRGqxU8EeeZh9zsKpIhxg" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_CbRGpxU8EeeZh9zsKpIhxg" name="parallax" visibility="public" type="_CbRGlhU8EeeZh9zsKpIhxg" isUnique="false"/>
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_Ww9Yjx6sEeel5txBxgvIkw" name="Template Model V1.0 (2016)"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_Ww9YkB6sEeel5txBxgvIkw" name="coordsys_tessel">
+      <packagedElement xmi:type="uml:Class" xmi:id="_Ww9YkR6sEeel5txBxgvIkw" name="SpaceFrame"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_Ww9Ykh6sEeel5txBxgvIkw" memberEnd="_Ww9Ylh6sEeel5txBxgvIkw _Ww9Ykx6sEeel5txBxgvIkw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_Ww9Ykx6sEeel5txBxgvIkw" visibility="public" type="_Ww9YlR6sEeel5txBxgvIkw" association="_Ww9Ykh6sEeel5txBxgvIkw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_CbRGqBU8EeeZh9zsKpIhxg" memberEnd="_CbRGpBU8EeeZh9zsKpIhxg _CbRGqRU8EeeZh9zsKpIhxg">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_CbRGqRU8EeeZh9zsKpIhxg" visibility="public" type="_CbRGoxU8EeeZh9zsKpIhxg" association="_CbRGqBU8EeeZh9zsKpIhxg"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_Ww9YlB6sEeel5txBxgvIkw" name="source">
+      <packagedElement xmi:type="uml:Class" xmi:id="_Ww9YlR6sEeel5txBxgvIkw" name="Source">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9Ylh6sEeel5txBxgvIkw" name="spaceFrame" visibility="public" type="_Ww9YkR6sEeel5txBxgvIkw" association="_Ww9Ykh6sEeel5txBxgvIkw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9Ylx6sEeel5txBxgvIkw" name="name" visibility="public" type="_Ww9YeR6sEeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9YmB6sEeel5txBxgvIkw" name="position" visibility="public" type="_Ww9Ymx6sEeel5txBxgvIkw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ww9YmR6sEeel5txBxgvIkw" name="parallax" visibility="public" type="_Ww9Yhh6sEeel5txBxgvIkw" isUnique="false"/>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_CbRGqhU8EeeZh9zsKpIhxg" name="tcoords">
-      <packagedElement xmi:type="uml:Class" xmi:id="_CbRGqxU8EeeZh9zsKpIhxg" name="Position2D"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_Ww9Ymh6sEeel5txBxgvIkw" name="coords_tessel">
+      <packagedElement xmi:type="uml:Class" xmi:id="_Ww9Ymx6sEeel5txBxgvIkw" name="Position2D"/>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_CbRGgBU8EeeZh9zsKpIhxg" xmi:id="_CcufEBU8EeeZh9zsKpIhxg">
-      <eAnnotations xmi:id="_CcufERU8EeeZh9zsKpIhxg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_CcSaNxU8EeeZh9zsKpIhxg"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_Ww9YcB6sEeel5txBxgvIkw" xmi:id="_WxxQwB6sEeel5txBxgvIkw">
+      <eAnnotations xmi:id="_WxxQwR6sEeel5txBxgvIkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_WxBC0h6sEeel5txBxgvIkw"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_CcufEBU8EeeZh9zsKpIhxg" href="IVOA_UML_Profile.profile.xmi#_CcSaMBU8EeeZh9zsKpIhxg"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_WxxQwB6sEeel5txBxgvIkw" href="IVOA_UML_Profile.profile.xmi#_WxAbwB6sEeel5txBxgvIkw"/>
     </profileApplication>
   </uml:Model>
-  <IVOA_UML_Profile:model xmi:id="_CcvGIBU8EeeZh9zsKpIhxg" base_Package="_CbRGgBU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_CcvGIRU8EeeZh9zsKpIhxg" base_Package="_CbRGhBU8EeeZh9zsKpIhxg" name="ivoa" version="1.0" url="http://volute-g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="http://volute-g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
-  <IVOA_UML_Profile:primitive xmi:id="_CcvtMBU8EeeZh9zsKpIhxg" base_DataType="_CbRGhRU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGhRU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcvtMRU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGhRU8EeeZh9zsKpIhxg" vodmlid="real"/>
-  <IVOA_UML_Profile:primitive xmi:id="_CcvtMhU8EeeZh9zsKpIhxg" base_DataType="_CbRGhhU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGhhU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcwUQBU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGhhU8EeeZh9zsKpIhxg" vodmlid="datetime"/>
-  <IVOA_UML_Profile:primitive xmi:id="_CcwUQRU8EeeZh9zsKpIhxg" base_DataType="_CbRGhxU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGhxU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcwUQhU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGhxU8EeeZh9zsKpIhxg" vodmlid="anyURI"/>
-  <IVOA_UML_Profile:primitive xmi:id="_Ccw7UBU8EeeZh9zsKpIhxg" base_DataType="_CbRGiRU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGiRU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_Ccw7URU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGiRU8EeeZh9zsKpIhxg" vodmlid="string"/>
-  <IVOA_UML_Profile:primitive xmi:id="_Ccw7UhU8EeeZh9zsKpIhxg" base_DataType="_CbRGihU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGihU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_Ccw7UxU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGihU8EeeZh9zsKpIhxg" vodmlid="nonnegativeInteger"/>
-  <IVOA_UML_Profile:primitive xmi:id="_Ccw7VBU8EeeZh9zsKpIhxg" base_DataType="_CbRGixU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGixU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcxiYBU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGixU8EeeZh9zsKpIhxg" vodmlid="boolean"/>
-  <IVOA_UML_Profile:primitive xmi:id="_CcxiYRU8EeeZh9zsKpIhxg" base_DataType="_CbRGjBU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGjBU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcxiYhU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGjBU8EeeZh9zsKpIhxg" vodmlid="integer"/>
-  <IVOA_UML_Profile:primitive xmi:id="_CcxiYxU8EeeZh9zsKpIhxg" base_DataType="_CbRGjRU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGjRU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcyJcBU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGjRU8EeeZh9zsKpIhxg" vodmlid="rational"/>
-  <IVOA_UML_Profile:primitive xmi:id="_CcyJcRU8EeeZh9zsKpIhxg" base_DataType="_CbRGkBU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGkBU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcyJchU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGkBU8EeeZh9zsKpIhxg" vodmlid="complex"/>
-  <IVOA_UML_Profile:primitive xmi:id="_CcyJcxU8EeeZh9zsKpIhxg" base_DataType="_CbRGlBU8EeeZh9zsKpIhxg" base_PrimitiveType="_CbRGlBU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcyJdBU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGlBU8EeeZh9zsKpIhxg" vodmlid="quantity.Unit"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcywgBU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGlhU8EeeZh9zsKpIhxg" vodmlid="quantity.Quantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcywgRU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGmRU8EeeZh9zsKpIhxg" vodmlid="quantity.IntegerQuantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CcywghU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGnBU8EeeZh9zsKpIhxg" vodmlid="quantity.RealQuantity"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_CczXkBU8EeeZh9zsKpIhxg" base_Package="_CbRGoBU8EeeZh9zsKpIhxg" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.xmi"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CczXkRU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGoRU8EeeZh9zsKpIhxg" vodmlid="CoordFrame"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_CczXkhU8EeeZh9zsKpIhxg" base_Package="_CbRGqhU8EeeZh9zsKpIhxg"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_CczXkxU8EeeZh9zsKpIhxg" base_NamedElement="_CbRGqxU8EeeZh9zsKpIhxg" vodmlid="domain.spatial.Position2D"/>
+  <IVOA_UML_Profile:model xmi:id="_WxzF8B6sEeel5txBxgvIkw" base_Package="_Ww9YcB6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_WxzF8R6sEeel5txBxgvIkw" base_Package="_Ww9YdB6sEeel5txBxgvIkw" name="ivoa" version="1.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx07IB6sEeel5txBxgvIkw" base_DataType="_Ww9YdR6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9YdR6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx07IR6sEeel5txBxgvIkw" base_NamedElement="_Ww9YdR6sEeel5txBxgvIkw" vodmlid="real"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx2wUB6sEeel5txBxgvIkw" base_DataType="_Ww9Ydh6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9Ydh6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx3XYB6sEeel5txBxgvIkw" base_NamedElement="_Ww9Ydh6sEeel5txBxgvIkw" vodmlid="datetime"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx3XYR6sEeel5txBxgvIkw" base_DataType="_Ww9Ydx6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9Ydx6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx3XYh6sEeel5txBxgvIkw" base_NamedElement="_Ww9Ydx6sEeel5txBxgvIkw" vodmlid="anyURI"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx3-cB6sEeel5txBxgvIkw" base_DataType="_Ww9YeR6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9YeR6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx5MkB6sEeel5txBxgvIkw" base_NamedElement="_Ww9YeR6sEeel5txBxgvIkw" vodmlid="string"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx5zoB6sEeel5txBxgvIkw" base_DataType="_Ww9Yeh6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9Yeh6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx5zoR6sEeel5txBxgvIkw" base_NamedElement="_Ww9Yeh6sEeel5txBxgvIkw" vodmlid="nonnegativeInteger"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx7BwB6sEeel5txBxgvIkw" base_DataType="_Ww9Yex6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9Yex6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx8P4B6sEeel5txBxgvIkw" base_NamedElement="_Ww9Yex6sEeel5txBxgvIkw" vodmlid="boolean"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx8P4R6sEeel5txBxgvIkw" base_DataType="_Ww9YfB6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9YfB6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx8P4h6sEeel5txBxgvIkw" base_NamedElement="_Ww9YfB6sEeel5txBxgvIkw" vodmlid="integer"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx828B6sEeel5txBxgvIkw" base_DataType="_Ww9YfR6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9YfR6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx9eAB6sEeel5txBxgvIkw" base_NamedElement="_Ww9YfR6sEeel5txBxgvIkw" vodmlid="rational"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx9eAR6sEeel5txBxgvIkw" base_DataType="_Ww9YgB6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9YgB6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx-FEB6sEeel5txBxgvIkw" base_NamedElement="_Ww9YgB6sEeel5txBxgvIkw" vodmlid="complex"/>
+  <IVOA_UML_Profile:primitive xmi:id="_Wx-sIB6sEeel5txBxgvIkw" base_DataType="_Ww9YhB6sEeel5txBxgvIkw" base_PrimitiveType="_Ww9YhB6sEeel5txBxgvIkw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx_TMB6sEeel5txBxgvIkw" base_NamedElement="_Ww9YhB6sEeel5txBxgvIkw" vodmlid="quantity.Unit"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx_TMR6sEeel5txBxgvIkw" base_NamedElement="_Ww9Yhh6sEeel5txBxgvIkw" vodmlid="quantity.Quantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx_6QB6sEeel5txBxgvIkw" base_NamedElement="_Ww9YiR6sEeel5txBxgvIkw" vodmlid="quantity.IntegerQuantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_Wx_6QR6sEeel5txBxgvIkw" base_NamedElement="_Ww9YjB6sEeel5txBxgvIkw" vodmlid="quantity.RealQuantity"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_WyAhUB6sEeel5txBxgvIkw" base_Package="_Ww9YkB6sEeel5txBxgvIkw" name="coordsys_tessel" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_WyAhUR6sEeel5txBxgvIkw" base_NamedElement="_Ww9YkR6sEeel5txBxgvIkw" vodmlid="CoordFrame"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_WyBIYB6sEeel5txBxgvIkw" base_Package="_Ww9Ymh6sEeel5txBxgvIkw" name="coords_tessel" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_WyBIYR6sEeel5txBxgvIkw" base_NamedElement="_Ww9Ymx6sEeel5txBxgvIkw" vodmlid="domain.spatial.Position2D"/>
 </xmi:XMI>

Added: trunk/projects/dm/vo-dml/models/tesselation/lmsource_diagram.png
==============================================================================
Binary file. No diff available.


More information about the Volutecommits mailing list