[Volute] r4934 - in trunk/projects/dm/STC: doc/diagrams/alt model/coords vo-dml

Volute commit messages volutecommits at g-vo.org
Thu Apr 26 22:04:25 CEST 2018


Author: mdittmar
Date: Thu Apr 26 22:04:23 2018
New Revision: 4934

Log:
update TimeOffset representation

Modified:
   trunk/projects/dm/STC/doc/diagrams/alt/temporal domain diagram.png
   trunk/projects/dm/STC/model/coords/STC_coords_V2.0.zip
   trunk/projects/dm/STC/model/coords/stc_coords_2.0_uml2p4p1.xmi
   trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html
   trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.png
   trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.vo-dml.xml

Modified: trunk/projects/dm/STC/doc/diagrams/alt/temporal domain diagram.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/STC/model/coords/STC_coords_V2.0.zip
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/STC/model/coords/stc_coords_2.0_uml2p4p1.xmi
==============================================================================
--- trunk/projects/dm/STC/model/coords/stc_coords_2.0_uml2p4p1.xmi	Mon Apr 23 18:17:51 2018	(r4933)
+++ trunk/projects/dm/STC/model/coords/stc_coords_2.0_uml2p4p1.xmi	Thu Apr 26 22:04:23 2018	(r4934)
@@ -1,516 +1,516 @@
-<?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/_XIb9EDnJEeiy4fd_s3YDfQ/0" xmlns:default="http:///schemas/default/_XJCYsDnJEeiy4fd_s3YDfQ/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/_XIb9EDnJEeiy4fd_s3YDfQ/0 IVOA_UML_Profile.profile.xmi#_XJLipznJEeiy4fd_s3YDfQ http:///schemas/default/_XJCYsDnJEeiy4fd_s3YDfQ/0 default.profile.xmi#_XVjKtznJEeiy4fd_s3YDfQ">
-  <uml:Model xmi:id="_XIb7wDnJEeiy4fd_s3YDfQ" name="coords">
-    <eAnnotations xmi:id="_XIb7wTnJEeiy4fd_s3YDfQ" source="Objing">
-      <contents xmi:type="uml:Property" xmi:id="_XIb7wjnJEeiy4fd_s3YDfQ" name="exporterVersion">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_XIb7wznJEeiy4fd_s3YDfQ" 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/_HeDRYEl-Eeie5KfMtdD_2Q/0" xmlns:default="http:///schemas/default/_HepHQEl-Eeie5KfMtdD_2Q/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/_HeDRYEl-Eeie5KfMtdD_2Q/0 IVOA_UML_Profile.profile.xmi#_HfFzN0l-Eeie5KfMtdD_2Q http:///schemas/default/_HepHQEl-Eeie5KfMtdD_2Q/0 default.profile.xmi#_HrnzV0l-Eeie5KfMtdD_2Q">
+  <uml:Model xmi:id="_Hd5gYEl-Eeie5KfMtdD_2Q" name="coords">
+    <eAnnotations xmi:id="_Hd5gYUl-Eeie5KfMtdD_2Q" source="Objing">
+      <contents xmi:type="uml:Property" xmi:id="_Hd5gYkl-Eeie5KfMtdD_2Q" name="exporterVersion">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hd5gY0l-Eeie5KfMtdD_2Q" value="3.0.0"/>
       </contents>
     </eAnnotations>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_XIb7xDnJEeiy4fd_s3YDfQ">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5gZEl-Eeie5KfMtdD_2Q">
       <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="_XIb7xTnJEeiy4fd_s3YDfQ" name="coords:Coordinate.frame" constrainedElement="_XIb7wDnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb7xjnJEeiy4fd_s3YDfQ" value=""/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gZUl-Eeie5KfMtdD_2Q" name="coords:Coordinate.frame" constrainedElement="_Hd5gYEl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gZkl-Eeie5KfMtdD_2Q" value=""/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb7xznJEeiy4fd_s3YDfQ" name="coords:CoordSpace.axis" constrainedElement="_XIb7_DnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb7yDnJEeiy4fd_s3YDfQ" value="coords:BinnedAxis"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gZ0l-Eeie5KfMtdD_2Q" name="coords:CoordSpace.axis" constrainedElement="_Hd5gnEl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gaEl-Eeie5KfMtdD_2Q" value="coords:BinnedAxis"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb7yTnJEeiy4fd_s3YDfQ" constrainedElement="_XIb8ADnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb7yjnJEeiy4fd_s3YDfQ" value="PixelIndex.frame:CoordFrame[0]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gaUl-Eeie5KfMtdD_2Q" constrainedElement="_Hd5goEl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gakl-Eeie5KfMtdD_2Q" value="PixelIndex.frame:CoordFrame[0]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb7yznJEeiy4fd_s3YDfQ" name="coords:Coordinate.frame" constrainedElement="_XIb8mznJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb7zDnJEeiy4fd_s3YDfQ" value="coords:domain.time.TimeFrame"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb7zTnJEeiy4fd_s3YDfQ" name="coords:CoordValue.axis" constrainedElement="_XIb8vTnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb7zjnJEeiy4fd_s3YDfQ" value="coords:DiscreteSetAxis"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb7zznJEeiy4fd_s3YDfQ" constrainedElement="_XIb8vTnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb70DnJEeiy4fd_s3YDfQ" value="PolCoordValue.frame:CoordFrame[0]"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb70TnJEeiy4fd_s3YDfQ" name="coords:CoordValue.axis" constrainedElement="_XIb8-jnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb70jnJEeiy4fd_s3YDfQ" value="coords:ContinuousAxis"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb70znJEeiy4fd_s3YDfQ" name="coords:CoordValue.axis" constrainedElement="_XIb8_TnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb71DnJEeiy4fd_s3YDfQ" value="coords:BinnedAxis"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb71TnJEeiy4fd_s3YDfQ" constrainedElement="_XIb9CjnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb71jnJEeiy4fd_s3YDfQ" value="cmpt:CoordValue[1]"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb71znJEeiy4fd_s3YDfQ" constrainedElement="_XIb9DDnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb72DnJEeiy4fd_s3YDfQ" value="cmpt:CoordValue[2]"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_XIb72TnJEeiy4fd_s3YDfQ" constrainedElement="_XIb9DjnJEeiy4fd_s3YDfQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_XIb72jnJEeiy4fd_s3YDfQ" value="cmpt:CoordValue[3]"/>
-    </ownedRule>
-    <packagedElement xmi:type="uml:Package" xmi:id="_XIb72znJEeiy4fd_s3YDfQ" name="ivoa">
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb73DnJEeiy4fd_s3YDfQ" name="nonnegativeInteger"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb73TnJEeiy4fd_s3YDfQ" name="integer"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb73jnJEeiy4fd_s3YDfQ" name="rational"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb73znJEeiy4fd_s3YDfQ" name="real"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb74DnJEeiy4fd_s3YDfQ" name="complex"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb74TnJEeiy4fd_s3YDfQ" name="string"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb74jnJEeiy4fd_s3YDfQ" name="boolean"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb74znJEeiy4fd_s3YDfQ" name="datetime"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb75DnJEeiy4fd_s3YDfQ" name="anyURI">
-        <generalization xmi:type="uml:Generalization" xmi:id="_XIb75TnJEeiy4fd_s3YDfQ" general="_XIb74TnJEeiy4fd_s3YDfQ"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5ga0l-Eeie5KfMtdD_2Q" name="coords:Coordinate.frame" constrainedElement="_Hd5hOUl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gbEl-Eeie5KfMtdD_2Q" value="coords:domain.time.TimeFrame"/>
+    </ownedRule>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gbUl-Eeie5KfMtdD_2Q" name="coords:CoordValue.axis" constrainedElement="_Hd5hXUl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gbkl-Eeie5KfMtdD_2Q" value="coords:DiscreteSetAxis"/>
+    </ownedRule>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gb0l-Eeie5KfMtdD_2Q" constrainedElement="_Hd5hXUl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gcEl-Eeie5KfMtdD_2Q" value="PolCoordValue.frame:CoordFrame[0]"/>
+    </ownedRule>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gcUl-Eeie5KfMtdD_2Q" name="coords:CoordValue.axis" constrainedElement="_Hd5hmkl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gckl-Eeie5KfMtdD_2Q" value="coords:ContinuousAxis"/>
+    </ownedRule>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gc0l-Eeie5KfMtdD_2Q" name="coords:CoordValue.axis" constrainedElement="_Hd5hnUl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gdEl-Eeie5KfMtdD_2Q" value="coords:BinnedAxis"/>
+    </ownedRule>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gdUl-Eeie5KfMtdD_2Q" constrainedElement="_Hd5hqkl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gdkl-Eeie5KfMtdD_2Q" value="cmpt:CoordValue[1]"/>
+    </ownedRule>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5gd0l-Eeie5KfMtdD_2Q" constrainedElement="_Hd5hrEl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5geEl-Eeie5KfMtdD_2Q" value="cmpt:CoordValue[2]"/>
+    </ownedRule>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_Hd5geUl-Eeie5KfMtdD_2Q" constrainedElement="_Hd5hrkl-Eeie5KfMtdD_2Q">
+      <specification xmi:type="uml:LiteralString" xmi:id="_Hd5gekl-Eeie5KfMtdD_2Q" value="cmpt:CoordValue[3]"/>
+    </ownedRule>
+    <packagedElement xmi:type="uml:Package" xmi:id="_Hd5ge0l-Eeie5KfMtdD_2Q" name="ivoa">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5gfEl-Eeie5KfMtdD_2Q" name="nonnegativeInteger"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5gfUl-Eeie5KfMtdD_2Q" name="integer"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5gfkl-Eeie5KfMtdD_2Q" name="rational"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5gf0l-Eeie5KfMtdD_2Q" name="real"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5ggEl-Eeie5KfMtdD_2Q" name="complex"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5ggUl-Eeie5KfMtdD_2Q" name="string"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5ggkl-Eeie5KfMtdD_2Q" name="boolean"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5gg0l-Eeie5KfMtdD_2Q" name="datetime"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5ghEl-Eeie5KfMtdD_2Q" name="anyURI">
+        <generalization xmi:type="uml:Generalization" xmi:id="_Hd5ghUl-Eeie5KfMtdD_2Q" general="_Hd5ggUl-Eeie5KfMtdD_2Q"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb75jnJEeiy4fd_s3YDfQ" name="Quantity" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb75znJEeiy4fd_s3YDfQ" name="unit" visibility="public" type="_XIb77znJEeiy4fd_s3YDfQ" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb76DnJEeiy4fd_s3YDfQ"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5ghkl-Eeie5KfMtdD_2Q" name="Quantity" isAbstract="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gh0l-Eeie5KfMtdD_2Q" name="unit" visibility="public" type="_Hd5gj0l-Eeie5KfMtdD_2Q" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5giEl-Eeie5KfMtdD_2Q"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb76TnJEeiy4fd_s3YDfQ" name="IntegerQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_XIb76jnJEeiy4fd_s3YDfQ" general="_XIb75jnJEeiy4fd_s3YDfQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb76znJEeiy4fd_s3YDfQ" name="value" visibility="public" type="_XIb73TnJEeiy4fd_s3YDfQ" isUnique="false"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5giUl-Eeie5KfMtdD_2Q" name="IntegerQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_Hd5gikl-Eeie5KfMtdD_2Q" general="_Hd5ghkl-Eeie5KfMtdD_2Q"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gi0l-Eeie5KfMtdD_2Q" name="value" visibility="public" type="_Hd5gfUl-Eeie5KfMtdD_2Q" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb77DnJEeiy4fd_s3YDfQ" name="RealQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_XIb77TnJEeiy4fd_s3YDfQ" general="_XIb75jnJEeiy4fd_s3YDfQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb77jnJEeiy4fd_s3YDfQ" name="value" visibility="public" type="_XIb73znJEeiy4fd_s3YDfQ" isUnique="false"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5gjEl-Eeie5KfMtdD_2Q" name="RealQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_Hd5gjUl-Eeie5KfMtdD_2Q" general="_Hd5ghkl-Eeie5KfMtdD_2Q"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gjkl-Eeie5KfMtdD_2Q" name="value" visibility="public" type="_Hd5gf0l-Eeie5KfMtdD_2Q" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb77znJEeiy4fd_s3YDfQ" name="Unit">
-        <generalization xmi:type="uml:Generalization" xmi:id="_XIb78DnJEeiy4fd_s3YDfQ" general="_XIb74TnJEeiy4fd_s3YDfQ"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5gj0l-Eeie5KfMtdD_2Q" name="Unit">
+        <generalization xmi:type="uml:Generalization" xmi:id="_Hd5gkEl-Eeie5KfMtdD_2Q" general="_Hd5ggUl-Eeie5KfMtdD_2Q"/>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_XIb78TnJEeiy4fd_s3YDfQ" name="Astronomical Coordinates and Systems model (2017)"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_XIb78jnJEeiy4fd_s3YDfQ" name="domain">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_XIb78znJEeiy4fd_s3YDfQ">
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_Hd5gkUl-Eeie5KfMtdD_2Q" name="Astronomical Coordinates and Systems model (2017)"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_Hd5gkkl-Eeie5KfMtdD_2Q" name="domain">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5gk0l-Eeie5KfMtdD_2Q">
         <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="_XIb79DnJEeiy4fd_s3YDfQ" name="pixel">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_XIb79TnJEeiy4fd_s3YDfQ">
+      <packagedElement xmi:type="uml:Package" xmi:id="_Hd5glEl-Eeie5KfMtdD_2Q" name="pixel">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5glUl-Eeie5KfMtdD_2Q">
           <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="_XIb79jnJEeiy4fd_s3YDfQ" name="PixelCoordSystem">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_XIb79znJEeiy4fd_s3YDfQ">
+        <packagedElement xmi:type="uml:Class" xmi:id="_Hd5glkl-Eeie5KfMtdD_2Q" name="PixelCoordSystem">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5gl0l-Eeie5KfMtdD_2Q">
             <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>
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb7-DnJEeiy4fd_s3YDfQ" general="_XIb8zDnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb7-TnJEeiy4fd_s3YDfQ" name="pixelSpace" visibility="public" type="_XIb7_DnJEeiy4fd_s3YDfQ" aggregation="composite" association="_XIb7-jnJEeiy4fd_s3YDfQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5gmEl-Eeie5KfMtdD_2Q" general="_Hd5hbEl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gmUl-Eeie5KfMtdD_2Q" name="pixelSpace" visibility="public" type="_Hd5gnEl-Eeie5KfMtdD_2Q" aggregation="composite" association="_Hd5gmkl-Eeie5KfMtdD_2Q"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_XIb7-jnJEeiy4fd_s3YDfQ" memberEnd="_XIb7-TnJEeiy4fd_s3YDfQ _XIb7-znJEeiy4fd_s3YDfQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_XIb7-znJEeiy4fd_s3YDfQ" visibility="public" type="_XIb79jnJEeiy4fd_s3YDfQ" association="_XIb7-jnJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_Hd5gmkl-Eeie5KfMtdD_2Q" memberEnd="_Hd5gmUl-Eeie5KfMtdD_2Q _Hd5gm0l-Eeie5KfMtdD_2Q">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_Hd5gm0l-Eeie5KfMtdD_2Q" visibility="public" type="_Hd5glkl-Eeie5KfMtdD_2Q" association="_Hd5gmkl-Eeie5KfMtdD_2Q"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_XIb7_DnJEeiy4fd_s3YDfQ" name="PixelSpace">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb7_TnJEeiy4fd_s3YDfQ" general="_XIb81znJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb7_jnJEeiy4fd_s3YDfQ" name="handedness" visibility="public" type="_XIb89znJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb7_znJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_Hd5gnEl-Eeie5KfMtdD_2Q" name="PixelSpace">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5gnUl-Eeie5KfMtdD_2Q" general="_Hd5hd0l-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gnkl-Eeie5KfMtdD_2Q" name="handedness" visibility="public" type="_Hd5hl0l-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5gn0l-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8ADnJEeiy4fd_s3YDfQ" name="PixelIndex">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8ATnJEeiy4fd_s3YDfQ" general="_XIb8_TnJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5goEl-Eeie5KfMtdD_2Q" name="PixelIndex">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5goUl-Eeie5KfMtdD_2Q" general="_Hd5hnUl-Eeie5KfMtdD_2Q"/>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_XIb8AjnJEeiy4fd_s3YDfQ" name="space">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_XIb8AznJEeiy4fd_s3YDfQ">
+      <packagedElement xmi:type="uml:Package" xmi:id="_Hd5gokl-Eeie5KfMtdD_2Q" name="space">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5go0l-Eeie5KfMtdD_2Q">
           <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="_XIb8BDnJEeiy4fd_s3YDfQ" name="SpaceFrame">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8BTnJEeiy4fd_s3YDfQ" general="_XIb8yznJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8BjnJEeiy4fd_s3YDfQ" name="refPosition" visibility="public" type="_XIb8TDnJEeiy4fd_s3YDfQ" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8BznJEeiy4fd_s3YDfQ" name="spaceRefFrame" visibility="public" type="_XIb8IznJEeiy4fd_s3YDfQ" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8CDnJEeiy4fd_s3YDfQ" name="equinox" visibility="public" type="_XIb8CznJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8CTnJEeiy4fd_s3YDfQ"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8CjnJEeiy4fd_s3YDfQ" name="planetaryEphem" visibility="public" type="_XIb74TnJEeiy4fd_s3YDfQ" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XIb8CznJEeiy4fd_s3YDfQ" name="Epoch"/>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_XIb8DDnJEeiy4fd_s3YDfQ" name="StdRefPosition">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8DTnJEeiy4fd_s3YDfQ" name="TOPOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8DjnJEeiy4fd_s3YDfQ" name="BARYCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8DznJEeiy4fd_s3YDfQ" name="HELIOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8EDnJEeiy4fd_s3YDfQ" name="GEOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8ETnJEeiy4fd_s3YDfQ" name="GALACTIC_CENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8EjnJEeiy4fd_s3YDfQ" name="LOCAL_GROUP_CENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8EznJEeiy4fd_s3YDfQ" name="MOON"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8FDnJEeiy4fd_s3YDfQ" name="EMBARYCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8FTnJEeiy4fd_s3YDfQ" name="MERCURY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8FjnJEeiy4fd_s3YDfQ" name="VENUS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8FznJEeiy4fd_s3YDfQ" name="MARS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8GDnJEeiy4fd_s3YDfQ" name="JUPITER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8GTnJEeiy4fd_s3YDfQ" name="SATURN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8GjnJEeiy4fd_s3YDfQ" name="URANUS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8GznJEeiy4fd_s3YDfQ" name="NEPTUNE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8HDnJEeiy4fd_s3YDfQ" name="PLUTO"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8HTnJEeiy4fd_s3YDfQ" name="RELOCATABLE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8HjnJEeiy4fd_s3YDfQ" name="LSR"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8HznJEeiy4fd_s3YDfQ" name="LSRK"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8IDnJEeiy4fd_s3YDfQ" name="LSRD"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8ITnJEeiy4fd_s3YDfQ" name="UNKNOWN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8IjnJEeiy4fd_s3YDfQ" name="CUSTOM"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_XIb8IznJEeiy4fd_s3YDfQ" name="StdRefFrame">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8JDnJEeiy4fd_s3YDfQ" name="ICRS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8JTnJEeiy4fd_s3YDfQ" name="FK4"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8JjnJEeiy4fd_s3YDfQ" name="FK5"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8JznJEeiy4fd_s3YDfQ" name="ECLIPTIC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8KDnJEeiy4fd_s3YDfQ" name="GALACTIC_I"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8KTnJEeiy4fd_s3YDfQ" name="GALACTIC_II"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8KjnJEeiy4fd_s3YDfQ" name="SUPER_GALACTIC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8KznJEeiy4fd_s3YDfQ" name="AZ_EL"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8LDnJEeiy4fd_s3YDfQ" name="BODY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8LTnJEeiy4fd_s3YDfQ" name="GEO_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8LjnJEeiy4fd_s3YDfQ" name="GEO_D"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8LznJEeiy4fd_s3YDfQ" name="MAG"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8MDnJEeiy4fd_s3YDfQ" name="GSE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8MTnJEeiy4fd_s3YDfQ" name="GSM"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8MjnJEeiy4fd_s3YDfQ" name="SM"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8MznJEeiy4fd_s3YDfQ" name="HGC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8NDnJEeiy4fd_s3YDfQ" name="HEE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8NTnJEeiy4fd_s3YDfQ" name="HEEQ"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8NjnJEeiy4fd_s3YDfQ" name="HCI"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8NznJEeiy4fd_s3YDfQ" name="HCD"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8ODnJEeiy4fd_s3YDfQ" name="MERCURY_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8OTnJEeiy4fd_s3YDfQ" name="VENUS_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8OjnJEeiy4fd_s3YDfQ" name="LUNA_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8OznJEeiy4fd_s3YDfQ" name="MARS_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8PDnJEeiy4fd_s3YDfQ" name="JUPITER_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8PTnJEeiy4fd_s3YDfQ" name="SATURN_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8PjnJEeiy4fd_s3YDfQ" name="URANUS_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8PznJEeiy4fd_s3YDfQ" name="NEPTUNE_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8QDnJEeiy4fd_s3YDfQ" name="PLUTO_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8QTnJEeiy4fd_s3YDfQ" name="MERCURY_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8QjnJEeiy4fd_s3YDfQ" name="VENUS_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8QznJEeiy4fd_s3YDfQ" name="LUNA_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8RDnJEeiy4fd_s3YDfQ" name="MARS_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8RTnJEeiy4fd_s3YDfQ" name="JUPITER_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8RjnJEeiy4fd_s3YDfQ" name="SATURN_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8RznJEeiy4fd_s3YDfQ" name="URANUS_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8SDnJEeiy4fd_s3YDfQ" name="NEPTUNE_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8STnJEeiy4fd_s3YDfQ" name="PLUTO_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8SjnJEeiy4fd_s3YDfQ" name="UNKNOWN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8SznJEeiy4fd_s3YDfQ" name="CUSTOM"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_Hd5gpEl-Eeie5KfMtdD_2Q" name="SpaceFrame">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5gpUl-Eeie5KfMtdD_2Q" general="_Hd5ha0l-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gpkl-Eeie5KfMtdD_2Q" name="refPosition" visibility="public" type="_Hd5g7El-Eeie5KfMtdD_2Q" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gp0l-Eeie5KfMtdD_2Q" name="spaceRefFrame" visibility="public" type="_Hd5gw0l-Eeie5KfMtdD_2Q" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gqEl-Eeie5KfMtdD_2Q" name="equinox" visibility="public" type="_Hd5gq0l-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5gqUl-Eeie5KfMtdD_2Q"/>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5gqkl-Eeie5KfMtdD_2Q" name="planetaryEphem" visibility="public" type="_Hd5ggUl-Eeie5KfMtdD_2Q" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hd5gq0l-Eeie5KfMtdD_2Q" name="Epoch"/>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_Hd5grEl-Eeie5KfMtdD_2Q" name="StdRefPosition">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5grUl-Eeie5KfMtdD_2Q" name="TOPOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5grkl-Eeie5KfMtdD_2Q" name="BARYCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gr0l-Eeie5KfMtdD_2Q" name="HELIOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gsEl-Eeie5KfMtdD_2Q" name="GEOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gsUl-Eeie5KfMtdD_2Q" name="GALACTIC_CENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gskl-Eeie5KfMtdD_2Q" name="LOCAL_GROUP_CENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gs0l-Eeie5KfMtdD_2Q" name="MOON"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gtEl-Eeie5KfMtdD_2Q" name="EMBARYCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gtUl-Eeie5KfMtdD_2Q" name="MERCURY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gtkl-Eeie5KfMtdD_2Q" name="VENUS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gt0l-Eeie5KfMtdD_2Q" name="MARS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5guEl-Eeie5KfMtdD_2Q" name="JUPITER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5guUl-Eeie5KfMtdD_2Q" name="SATURN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gukl-Eeie5KfMtdD_2Q" name="URANUS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gu0l-Eeie5KfMtdD_2Q" name="NEPTUNE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gvEl-Eeie5KfMtdD_2Q" name="PLUTO"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gvUl-Eeie5KfMtdD_2Q" name="RELOCATABLE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gvkl-Eeie5KfMtdD_2Q" name="LSR"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gv0l-Eeie5KfMtdD_2Q" name="LSRK"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gwEl-Eeie5KfMtdD_2Q" name="LSRD"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gwUl-Eeie5KfMtdD_2Q" name="UNKNOWN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gwkl-Eeie5KfMtdD_2Q" name="CUSTOM"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_Hd5gw0l-Eeie5KfMtdD_2Q" name="StdRefFrame">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gxEl-Eeie5KfMtdD_2Q" name="ICRS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gxUl-Eeie5KfMtdD_2Q" name="FK4"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gxkl-Eeie5KfMtdD_2Q" name="FK5"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gx0l-Eeie5KfMtdD_2Q" name="ECLIPTIC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gyEl-Eeie5KfMtdD_2Q" name="GALACTIC_I"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gyUl-Eeie5KfMtdD_2Q" name="GALACTIC_II"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gykl-Eeie5KfMtdD_2Q" name="SUPER_GALACTIC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gy0l-Eeie5KfMtdD_2Q" name="AZ_EL"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gzEl-Eeie5KfMtdD_2Q" name="BODY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gzUl-Eeie5KfMtdD_2Q" name="GEO_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gzkl-Eeie5KfMtdD_2Q" name="GEO_D"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5gz0l-Eeie5KfMtdD_2Q" name="MAG"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g0El-Eeie5KfMtdD_2Q" name="GSE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g0Ul-Eeie5KfMtdD_2Q" name="GSM"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g0kl-Eeie5KfMtdD_2Q" name="SM"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g00l-Eeie5KfMtdD_2Q" name="HGC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g1El-Eeie5KfMtdD_2Q" name="HEE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g1Ul-Eeie5KfMtdD_2Q" name="HEEQ"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g1kl-Eeie5KfMtdD_2Q" name="HCI"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g10l-Eeie5KfMtdD_2Q" name="HCD"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g2El-Eeie5KfMtdD_2Q" name="MERCURY_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g2Ul-Eeie5KfMtdD_2Q" name="VENUS_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g2kl-Eeie5KfMtdD_2Q" name="LUNA_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g20l-Eeie5KfMtdD_2Q" name="MARS_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g3El-Eeie5KfMtdD_2Q" name="JUPITER_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g3Ul-Eeie5KfMtdD_2Q" name="SATURN_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g3kl-Eeie5KfMtdD_2Q" name="URANUS_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g30l-Eeie5KfMtdD_2Q" name="NEPTUNE_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g4El-Eeie5KfMtdD_2Q" name="PLUTO_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g4Ul-Eeie5KfMtdD_2Q" name="MERCURY_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g4kl-Eeie5KfMtdD_2Q" name="VENUS_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g40l-Eeie5KfMtdD_2Q" name="LUNA_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g5El-Eeie5KfMtdD_2Q" name="MARS_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g5Ul-Eeie5KfMtdD_2Q" name="JUPITER_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g5kl-Eeie5KfMtdD_2Q" name="SATURN_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g50l-Eeie5KfMtdD_2Q" name="URANUS_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g6El-Eeie5KfMtdD_2Q" name="NEPTUNE_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g6Ul-Eeie5KfMtdD_2Q" name="PLUTO_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g6kl-Eeie5KfMtdD_2Q" name="UNKNOWN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5g60l-Eeie5KfMtdD_2Q" name="CUSTOM"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8TDnJEeiy4fd_s3YDfQ" name="RefLocation" isAbstract="true">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_XIb8TTnJEeiy4fd_s3YDfQ">
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5g7El-Eeie5KfMtdD_2Q" name="RefLocation" isAbstract="true">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5g7Ul-Eeie5KfMtdD_2Q">
             <body>RefLocation 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="_XIb8TjnJEeiy4fd_s3YDfQ" name="StdRefLocation">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8TznJEeiy4fd_s3YDfQ" general="_XIb8TDnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8UDnJEeiy4fd_s3YDfQ" name="position" visibility="public" type="_XIb8DDnJEeiy4fd_s3YDfQ" isUnique="false"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5g7kl-Eeie5KfMtdD_2Q" name="StdRefLocation">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5g70l-Eeie5KfMtdD_2Q" general="_Hd5g7El-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5g8El-Eeie5KfMtdD_2Q" name="position" visibility="public" type="_Hd5grEl-Eeie5KfMtdD_2Q" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8UTnJEeiy4fd_s3YDfQ" name="CustomRefLocation">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8UjnJEeiy4fd_s3YDfQ" general="_XIb8TDnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8UznJEeiy4fd_s3YDfQ" name="epoch" visibility="public" type="_XIb8CznJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8VDnJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5g8Ul-Eeie5KfMtdD_2Q" name="CustomRefLocation">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5g8kl-Eeie5KfMtdD_2Q" general="_Hd5g7El-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5g80l-Eeie5KfMtdD_2Q" name="epoch" visibility="public" type="_Hd5gq0l-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5g9El-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8VTnJEeiy4fd_s3YDfQ" name="position" visibility="public" type="_XIb88znJEeiy4fd_s3YDfQ" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8VjnJEeiy4fd_s3YDfQ" name="velocity" visibility="public" type="_XIb88znJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8VznJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5g9Ul-Eeie5KfMtdD_2Q" name="position" visibility="public" type="_Hd5hk0l-Eeie5KfMtdD_2Q" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5g9kl-Eeie5KfMtdD_2Q" name="velocity" visibility="public" type="_Hd5hk0l-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5g90l-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8WDnJEeiy4fd_s3YDfQ" name="EquatorialCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8WTnJEeiy4fd_s3YDfQ" general="_XIb8YDnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8WjnJEeiy4fd_s3YDfQ" name="ra" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8WznJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5g-El-Eeie5KfMtdD_2Q" name="EquatorialCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5g-Ul-Eeie5KfMtdD_2Q" general="_Hd5hAEl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5g-kl-Eeie5KfMtdD_2Q" name="ra" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5g-0l-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8XDnJEeiy4fd_s3YDfQ" name="dec" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8XTnJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5g_El-Eeie5KfMtdD_2Q" name="dec" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5g_Ul-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8XjnJEeiy4fd_s3YDfQ" name="r" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8XznJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5g_kl-Eeie5KfMtdD_2Q" name="r" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5g_0l-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8YDnJEeiy4fd_s3YDfQ" name="SpaceCoord" isAbstract="true">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8YTnJEeiy4fd_s3YDfQ" general="_XIb85znJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hAEl-Eeie5KfMtdD_2Q" name="SpaceCoord" isAbstract="true">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hAUl-Eeie5KfMtdD_2Q" general="_Hd5hh0l-Eeie5KfMtdD_2Q"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8YjnJEeiy4fd_s3YDfQ" name="CartesianCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8YznJEeiy4fd_s3YDfQ" general="_XIb8YDnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8ZDnJEeiy4fd_s3YDfQ" name="x" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8ZTnJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hAkl-Eeie5KfMtdD_2Q" name="CartesianCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hA0l-Eeie5KfMtdD_2Q" general="_Hd5hAEl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hBEl-Eeie5KfMtdD_2Q" name="x" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hBUl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8ZjnJEeiy4fd_s3YDfQ" name="y" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8ZznJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hBkl-Eeie5KfMtdD_2Q" name="y" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hB0l-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8aDnJEeiy4fd_s3YDfQ" name="z" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8aTnJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hCEl-Eeie5KfMtdD_2Q" name="z" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hCUl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8ajnJEeiy4fd_s3YDfQ" name="LongLatCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8aznJEeiy4fd_s3YDfQ" general="_XIb8YDnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8bDnJEeiy4fd_s3YDfQ" name="long" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8bTnJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hCkl-Eeie5KfMtdD_2Q" name="LongLatCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hC0l-Eeie5KfMtdD_2Q" general="_Hd5hAEl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hDEl-Eeie5KfMtdD_2Q" name="long" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hDUl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8bjnJEeiy4fd_s3YDfQ" name="lat" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8bznJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hDkl-Eeie5KfMtdD_2Q" name="lat" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hD0l-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8cDnJEeiy4fd_s3YDfQ" name="r" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8cTnJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hEEl-Eeie5KfMtdD_2Q" name="r" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hEUl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8cjnJEeiy4fd_s3YDfQ" name="GalacticCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8cznJEeiy4fd_s3YDfQ" general="_XIb8YDnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8dDnJEeiy4fd_s3YDfQ" name="l" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8dTnJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hEkl-Eeie5KfMtdD_2Q" name="GalacticCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hE0l-Eeie5KfMtdD_2Q" general="_Hd5hAEl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hFEl-Eeie5KfMtdD_2Q" name="l" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hFUl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8djnJEeiy4fd_s3YDfQ" name="b" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8dznJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hFkl-Eeie5KfMtdD_2Q" name="b" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hF0l-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8eDnJEeiy4fd_s3YDfQ" name="r" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8eTnJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hGEl-Eeie5KfMtdD_2Q" name="r" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hGUl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8ejnJEeiy4fd_s3YDfQ" name="EclipticCoord">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8eznJEeiy4fd_s3YDfQ" general="_XIb8YDnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8fDnJEeiy4fd_s3YDfQ" name="elong" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8fTnJEeiy4fd_s3YDfQ"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hGkl-Eeie5KfMtdD_2Q" name="EclipticCoord">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hG0l-Eeie5KfMtdD_2Q" general="_Hd5hAEl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hHEl-Eeie5KfMtdD_2Q" name="elong" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hHUl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8fjnJEeiy4fd_s3YDfQ" name="elat" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8fznJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hHkl-Eeie5KfMtdD_2Q" name="elat" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hH0l-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8gDnJEeiy4fd_s3YDfQ" name="r" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8gTnJEeiy4fd_s3YDfQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hIEl-Eeie5KfMtdD_2Q" name="r" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hIUl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_XIb8gjnJEeiy4fd_s3YDfQ" name="time">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_XIb8gznJEeiy4fd_s3YDfQ">
+      <packagedElement xmi:type="uml:Package" xmi:id="_Hd5hIkl-Eeie5KfMtdD_2Q" name="time">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5hI0l-Eeie5KfMtdD_2Q">
           <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="_XIb8hDnJEeiy4fd_s3YDfQ" name="TimeFrame">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_XIb8hTnJEeiy4fd_s3YDfQ">
+        <packagedElement xmi:type="uml:Class" xmi:id="_Hd5hJEl-Eeie5KfMtdD_2Q" name="TimeFrame">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5hJUl-Eeie5KfMtdD_2Q">
             <body>origin: implied
 dimensionality: 1D
 orientation: n/a
 </body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8hjnJEeiy4fd_s3YDfQ" general="_XIb8yznJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8hznJEeiy4fd_s3YDfQ" name="refPosition" visibility="public" type="_XIb8TDnJEeiy4fd_s3YDfQ" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8iDnJEeiy4fd_s3YDfQ" name="timescale" visibility="public" type="_XIb8kTnJEeiy4fd_s3YDfQ" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8iTnJEeiy4fd_s3YDfQ" name="refDirection" visibility="public" type="_XIb8TDnJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8ijnJEeiy4fd_s3YDfQ"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8iznJEeiy4fd_s3YDfQ" name="time0" visibility="public" type="_XIb8mznJEeiy4fd_s3YDfQ" isUnique="false">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb8jDnJEeiy4fd_s3YDfQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hJkl-Eeie5KfMtdD_2Q" general="_Hd5ha0l-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hJ0l-Eeie5KfMtdD_2Q" name="refPosition" visibility="public" type="_Hd5g7El-Eeie5KfMtdD_2Q" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hKEl-Eeie5KfMtdD_2Q" name="timescale" visibility="public" type="_Hd5hL0l-Eeie5KfMtdD_2Q" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hKUl-Eeie5KfMtdD_2Q" name="refDirection" visibility="public" type="_Hd5g7El-Eeie5KfMtdD_2Q" isUnique="false">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hKkl-Eeie5KfMtdD_2Q"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8jTnJEeiy4fd_s3YDfQ" name="ISOTime">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_XIb8jjnJEeiy4fd_s3YDfQ">
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hK0l-Eeie5KfMtdD_2Q" name="ISOTime">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5hLEl-Eeie5KfMtdD_2Q">
             <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="_XIb8jznJEeiy4fd_s3YDfQ" general="_XIb8mznJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8kDnJEeiy4fd_s3YDfQ" name="date" visibility="public" type="_XIb74znJEeiy4fd_s3YDfQ" isUnique="false"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hLUl-Eeie5KfMtdD_2Q" general="_Hd5hRUl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hLkl-Eeie5KfMtdD_2Q" name="date" visibility="public" type="_Hd5gg0l-Eeie5KfMtdD_2Q" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_Hd5hL0l-Eeie5KfMtdD_2Q" name="TimeScale">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hMEl-Eeie5KfMtdD_2Q" name="TT"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hMUl-Eeie5KfMtdD_2Q" name="ET"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hMkl-Eeie5KfMtdD_2Q" name="TDB"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hM0l-Eeie5KfMtdD_2Q" name="TCG"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hNEl-Eeie5KfMtdD_2Q" name="TCB"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hNUl-Eeie5KfMtdD_2Q" name="TAI"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hNkl-Eeie5KfMtdD_2Q" name="UTC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hN0l-Eeie5KfMtdD_2Q" name="LST"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hOEl-Eeie5KfMtdD_2Q" name="LOCAL"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hOUl-Eeie5KfMtdD_2Q" name="TimeStamp" isAbstract="true">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hOkl-Eeie5KfMtdD_2Q" general="_Hd5hh0l-Eeie5KfMtdD_2Q"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hO0l-Eeie5KfMtdD_2Q" name="JD">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hPEl-Eeie5KfMtdD_2Q" general="_Hd5hRUl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hPUl-Eeie5KfMtdD_2Q" name="date" visibility="public" type="_Hd5gf0l-Eeie5KfMtdD_2Q" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hPkl-Eeie5KfMtdD_2Q" name="MJD">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hP0l-Eeie5KfMtdD_2Q" general="_Hd5hRUl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hQEl-Eeie5KfMtdD_2Q" name="date" visibility="public" type="_Hd5gf0l-Eeie5KfMtdD_2Q" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hQUl-Eeie5KfMtdD_2Q" name="TimeOffset">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hQkl-Eeie5KfMtdD_2Q" general="_Hd5hOUl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hQ0l-Eeie5KfMtdD_2Q" name="time" visibility="public" type="_Hd5gjEl-Eeie5KfMtdD_2Q" isUnique="false"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hREl-Eeie5KfMtdD_2Q" name="time0" visibility="public" type="_Hd5hRUl-Eeie5KfMtdD_2Q" isUnique="false"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_XIb8kTnJEeiy4fd_s3YDfQ" name="TimeScale">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8kjnJEeiy4fd_s3YDfQ" name="TT"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8kznJEeiy4fd_s3YDfQ" name="ET"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8lDnJEeiy4fd_s3YDfQ" name="TDB"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8lTnJEeiy4fd_s3YDfQ" name="TCG"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8ljnJEeiy4fd_s3YDfQ" name="TCB"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8lznJEeiy4fd_s3YDfQ" name="TAI"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8mDnJEeiy4fd_s3YDfQ" name="UTC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8mTnJEeiy4fd_s3YDfQ" name="LST"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8mjnJEeiy4fd_s3YDfQ" name="LOCAL"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8mznJEeiy4fd_s3YDfQ" name="TimeStamp" isAbstract="true">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8nDnJEeiy4fd_s3YDfQ" general="_XIb85znJEeiy4fd_s3YDfQ"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8nTnJEeiy4fd_s3YDfQ" name="JD">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8njnJEeiy4fd_s3YDfQ" general="_XIb8mznJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8nznJEeiy4fd_s3YDfQ" name="date" visibility="public" type="_XIb73znJEeiy4fd_s3YDfQ" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8oDnJEeiy4fd_s3YDfQ" name="MJD">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8oTnJEeiy4fd_s3YDfQ" general="_XIb8mznJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8ojnJEeiy4fd_s3YDfQ" name="date" visibility="public" type="_XIb73znJEeiy4fd_s3YDfQ" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8oznJEeiy4fd_s3YDfQ" name="TimeOffset">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8pDnJEeiy4fd_s3YDfQ" general="_XIb8mznJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8pTnJEeiy4fd_s3YDfQ" name="time" visibility="public" type="_XIb77DnJEeiy4fd_s3YDfQ" isUnique="false"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8pjnJEeiy4fd_s3YDfQ" name="time0" visibility="public" type="_XIb8mznJEeiy4fd_s3YDfQ" isUnique="false"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hRUl-Eeie5KfMtdD_2Q" name="TimeInstant" isAbstract="true">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hRkl-Eeie5KfMtdD_2Q" general="_Hd5hOUl-Eeie5KfMtdD_2Q"/>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_XIb8pznJEeiy4fd_s3YDfQ" name="polarization">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_XIb8qDnJEeiy4fd_s3YDfQ">
+      <packagedElement xmi:type="uml:Package" xmi:id="_Hd5hR0l-Eeie5KfMtdD_2Q" name="polarization">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5hSEl-Eeie5KfMtdD_2Q">
           <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:Enumeration" xmi:id="_XIb8qTnJEeiy4fd_s3YDfQ" name="PolStokesEnum">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8qjnJEeiy4fd_s3YDfQ" name="I"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8qznJEeiy4fd_s3YDfQ" name="Q"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8rDnJEeiy4fd_s3YDfQ" name="U"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8rTnJEeiy4fd_s3YDfQ" name="V"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_XIb8rjnJEeiy4fd_s3YDfQ" name="PolCircularEnum">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8rznJEeiy4fd_s3YDfQ" name="RR"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8sDnJEeiy4fd_s3YDfQ" name="LL"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8sTnJEeiy4fd_s3YDfQ" name="RL"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8sjnJEeiy4fd_s3YDfQ" name="LR"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_XIb8sznJEeiy4fd_s3YDfQ" name="PolLinearEnum">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8tDnJEeiy4fd_s3YDfQ" name="XX"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8tTnJEeiy4fd_s3YDfQ" name="YY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8tjnJEeiy4fd_s3YDfQ" name="XY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8tznJEeiy4fd_s3YDfQ" name="YX"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_XIb8uDnJEeiy4fd_s3YDfQ" name="PolVectorEnum">
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8uTnJEeiy4fd_s3YDfQ" name="I"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8ujnJEeiy4fd_s3YDfQ" name="PF"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8uznJEeiy4fd_s3YDfQ" name="PP"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8vDnJEeiy4fd_s3YDfQ" name="PA"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8vTnJEeiy4fd_s3YDfQ" name="PolCoordValue" isAbstract="true">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8vjnJEeiy4fd_s3YDfQ" general="_XIb87TnJEeiy4fd_s3YDfQ"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8vznJEeiy4fd_s3YDfQ" name="PolLinear">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8wDnJEeiy4fd_s3YDfQ" general="_XIb8vTnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8wTnJEeiy4fd_s3YDfQ" name="cval" visibility="public" type="_XIb8sznJEeiy4fd_s3YDfQ" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8wjnJEeiy4fd_s3YDfQ" name="PolVector">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8wznJEeiy4fd_s3YDfQ" general="_XIb8vTnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8xDnJEeiy4fd_s3YDfQ" name="cval" visibility="public" type="_XIb8uDnJEeiy4fd_s3YDfQ" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8xTnJEeiy4fd_s3YDfQ" name="PolStokes">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8xjnJEeiy4fd_s3YDfQ" general="_XIb8vTnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8xznJEeiy4fd_s3YDfQ" name="cval" visibility="public" type="_XIb8qTnJEeiy4fd_s3YDfQ" isUnique="false"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8yDnJEeiy4fd_s3YDfQ" name="PolCircular">
-          <generalization xmi:type="uml:Generalization" xmi:id="_XIb8yTnJEeiy4fd_s3YDfQ" general="_XIb8vTnJEeiy4fd_s3YDfQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8yjnJEeiy4fd_s3YDfQ" name="cval" visibility="public" type="_XIb8rjnJEeiy4fd_s3YDfQ" isUnique="false"/>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_Hd5hSUl-Eeie5KfMtdD_2Q" name="PolStokesEnum">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hSkl-Eeie5KfMtdD_2Q" name="I"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hS0l-Eeie5KfMtdD_2Q" name="Q"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hTEl-Eeie5KfMtdD_2Q" name="U"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hTUl-Eeie5KfMtdD_2Q" name="V"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_Hd5hTkl-Eeie5KfMtdD_2Q" name="PolCircularEnum">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hT0l-Eeie5KfMtdD_2Q" name="RR"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hUEl-Eeie5KfMtdD_2Q" name="LL"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hUUl-Eeie5KfMtdD_2Q" name="RL"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hUkl-Eeie5KfMtdD_2Q" name="LR"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_Hd5hU0l-Eeie5KfMtdD_2Q" name="PolLinearEnum">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hVEl-Eeie5KfMtdD_2Q" name="XX"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hVUl-Eeie5KfMtdD_2Q" name="YY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hVkl-Eeie5KfMtdD_2Q" name="XY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hV0l-Eeie5KfMtdD_2Q" name="YX"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_Hd5hWEl-Eeie5KfMtdD_2Q" name="PolVectorEnum">
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hWUl-Eeie5KfMtdD_2Q" name="I"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hWkl-Eeie5KfMtdD_2Q" name="PF"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hW0l-Eeie5KfMtdD_2Q" name="PP"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hXEl-Eeie5KfMtdD_2Q" name="PA"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hXUl-Eeie5KfMtdD_2Q" name="PolCoordValue" isAbstract="true">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hXkl-Eeie5KfMtdD_2Q" general="_Hd5hjUl-Eeie5KfMtdD_2Q"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hX0l-Eeie5KfMtdD_2Q" name="PolLinear">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hYEl-Eeie5KfMtdD_2Q" general="_Hd5hXUl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hYUl-Eeie5KfMtdD_2Q" name="cval" visibility="public" type="_Hd5hU0l-Eeie5KfMtdD_2Q" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hYkl-Eeie5KfMtdD_2Q" name="PolVector">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hY0l-Eeie5KfMtdD_2Q" general="_Hd5hXUl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hZEl-Eeie5KfMtdD_2Q" name="cval" visibility="public" type="_Hd5hWEl-Eeie5KfMtdD_2Q" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hZUl-Eeie5KfMtdD_2Q" name="PolStokes">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hZkl-Eeie5KfMtdD_2Q" general="_Hd5hXUl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hZ0l-Eeie5KfMtdD_2Q" name="cval" visibility="public" type="_Hd5hSUl-Eeie5KfMtdD_2Q" isUnique="false"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5haEl-Eeie5KfMtdD_2Q" name="PolCircular">
+          <generalization xmi:type="uml:Generalization" xmi:id="_Hd5haUl-Eeie5KfMtdD_2Q" general="_Hd5hXUl-Eeie5KfMtdD_2Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hakl-Eeie5KfMtdD_2Q" name="cval" visibility="public" type="_Hd5hTkl-Eeie5KfMtdD_2Q" isUnique="false"/>
         </packagedElement>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb8yznJEeiy4fd_s3YDfQ" name="CoordFrame" isAbstract="true"/>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb8zDnJEeiy4fd_s3YDfQ" name="CoordSys" isAbstract="true">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_XIb8zTnJEeiy4fd_s3YDfQ">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5ha0l-Eeie5KfMtdD_2Q" name="CoordFrame" isAbstract="true"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5hbEl-Eeie5KfMtdD_2Q" name="CoordSys" isAbstract="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5hbUl-Eeie5KfMtdD_2Q">
         <body>The CoordSys object is the parent of a set of containers for organizing Coordinate Frame specifications into related groupings.  </body>
       </ownedComment>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb8zjnJEeiy4fd_s3YDfQ" name="AstroCoordSystem">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_XIb8zznJEeiy4fd_s3YDfQ">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5hbkl-Eeie5KfMtdD_2Q" name="AstroCoordSystem">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Hd5hb0l-Eeie5KfMtdD_2Q">
         <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="_XIb80DnJEeiy4fd_s3YDfQ" general="_XIb8zDnJEeiy4fd_s3YDfQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb80TnJEeiy4fd_s3YDfQ" name="coordFrame" visibility="public" type="_XIb8yznJEeiy4fd_s3YDfQ" association="_XIb81DnJEeiy4fd_s3YDfQ">
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XIb80jnJEeiy4fd_s3YDfQ" value="*"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb80znJEeiy4fd_s3YDfQ"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hcEl-Eeie5KfMtdD_2Q" general="_Hd5hbEl-Eeie5KfMtdD_2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hcUl-Eeie5KfMtdD_2Q" name="coordFrame" visibility="public" type="_Hd5ha0l-Eeie5KfMtdD_2Q" association="_Hd5hdEl-Eeie5KfMtdD_2Q">
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hd5hckl-Eeie5KfMtdD_2Q" value="*"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hc0l-Eeie5KfMtdD_2Q"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_XIb81DnJEeiy4fd_s3YDfQ" memberEnd="_XIb80TnJEeiy4fd_s3YDfQ _XIb81TnJEeiy4fd_s3YDfQ">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_XIb81TnJEeiy4fd_s3YDfQ" visibility="public" type="_XIb8zjnJEeiy4fd_s3YDfQ" association="_XIb81DnJEeiy4fd_s3YDfQ">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb81jnJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_Hd5hdEl-Eeie5KfMtdD_2Q" memberEnd="_Hd5hcUl-Eeie5KfMtdD_2Q _Hd5hdUl-Eeie5KfMtdD_2Q">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_Hd5hdUl-Eeie5KfMtdD_2Q" visibility="public" type="_Hd5hbkl-Eeie5KfMtdD_2Q" association="_Hd5hdEl-Eeie5KfMtdD_2Q">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hdkl-Eeie5KfMtdD_2Q"/>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb81znJEeiy4fd_s3YDfQ" name="CoordSpace">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb82DnJEeiy4fd_s3YDfQ" name="axis" visibility="public" type="_XIb83DnJEeiy4fd_s3YDfQ" aggregation="composite" association="_XIb82jnJEeiy4fd_s3YDfQ">
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XIb82TnJEeiy4fd_s3YDfQ" value="*"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5hd0l-Eeie5KfMtdD_2Q" name="CoordSpace">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5heEl-Eeie5KfMtdD_2Q" name="axis" visibility="public" type="_Hd5hfEl-Eeie5KfMtdD_2Q" aggregation="composite" association="_Hd5hekl-Eeie5KfMtdD_2Q">
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hd5heUl-Eeie5KfMtdD_2Q" value="*"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_XIb82jnJEeiy4fd_s3YDfQ" memberEnd="_XIb82DnJEeiy4fd_s3YDfQ _XIb82znJEeiy4fd_s3YDfQ">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_XIb82znJEeiy4fd_s3YDfQ" visibility="public" type="_XIb81znJEeiy4fd_s3YDfQ" association="_XIb82jnJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_Hd5hekl-Eeie5KfMtdD_2Q" memberEnd="_Hd5heEl-Eeie5KfMtdD_2Q _Hd5he0l-Eeie5KfMtdD_2Q">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_Hd5he0l-Eeie5KfMtdD_2Q" visibility="public" type="_Hd5hd0l-Eeie5KfMtdD_2Q" association="_Hd5hekl-Eeie5KfMtdD_2Q"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb83DnJEeiy4fd_s3YDfQ" name="Axis" isAbstract="true">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb83TnJEeiy4fd_s3YDfQ" name="name" visibility="public" type="_XIb74TnJEeiy4fd_s3YDfQ" isUnique="false">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb83jnJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5hfEl-Eeie5KfMtdD_2Q" name="Axis" isAbstract="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hfUl-Eeie5KfMtdD_2Q" name="name" visibility="public" type="_Hd5ggUl-Eeie5KfMtdD_2Q" isUnique="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hfkl-Eeie5KfMtdD_2Q"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb83znJEeiy4fd_s3YDfQ" name="ContinuousAxis">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb84DnJEeiy4fd_s3YDfQ" general="_XIb83DnJEeiy4fd_s3YDfQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb84TnJEeiy4fd_s3YDfQ" name="domainMin" visibility="public" type="_XIb75jnJEeiy4fd_s3YDfQ" isUnique="false">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb84jnJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5hf0l-Eeie5KfMtdD_2Q" name="ContinuousAxis">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hgEl-Eeie5KfMtdD_2Q" general="_Hd5hfEl-Eeie5KfMtdD_2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hgUl-Eeie5KfMtdD_2Q" name="domainMin" visibility="public" type="_Hd5ghkl-Eeie5KfMtdD_2Q" isUnique="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hgkl-Eeie5KfMtdD_2Q"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb84znJEeiy4fd_s3YDfQ" name="domainMax" visibility="public" type="_XIb75jnJEeiy4fd_s3YDfQ" isUnique="false">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb85DnJEeiy4fd_s3YDfQ"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hg0l-Eeie5KfMtdD_2Q" name="domainMax" visibility="public" type="_Hd5ghkl-Eeie5KfMtdD_2Q" isUnique="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hhEl-Eeie5KfMtdD_2Q"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb85TnJEeiy4fd_s3YDfQ" name="cyclic" visibility="public" type="_XIb74jnJEeiy4fd_s3YDfQ" isUnique="false">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb85jnJEeiy4fd_s3YDfQ"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hhUl-Eeie5KfMtdD_2Q" name="cyclic" visibility="public" type="_Hd5ggkl-Eeie5KfMtdD_2Q" isUnique="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hhkl-Eeie5KfMtdD_2Q"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:DataType" xmi:id="_XIb85znJEeiy4fd_s3YDfQ" name="Coordinate" isAbstract="true">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb86DnJEeiy4fd_s3YDfQ" name="frame" visibility="public" type="_XIb8yznJEeiy4fd_s3YDfQ" association="_XIb86jnJEeiy4fd_s3YDfQ">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb86TnJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hh0l-Eeie5KfMtdD_2Q" name="Coordinate" isAbstract="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hiEl-Eeie5KfMtdD_2Q" name="frame" visibility="public" type="_Hd5ha0l-Eeie5KfMtdD_2Q" association="_Hd5hikl-Eeie5KfMtdD_2Q">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hiUl-Eeie5KfMtdD_2Q"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_XIb86jnJEeiy4fd_s3YDfQ" memberEnd="_XIb86DnJEeiy4fd_s3YDfQ _XIb86znJEeiy4fd_s3YDfQ">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_XIb86znJEeiy4fd_s3YDfQ" visibility="public" type="_XIb85znJEeiy4fd_s3YDfQ" association="_XIb86jnJEeiy4fd_s3YDfQ">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb87DnJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_Hd5hikl-Eeie5KfMtdD_2Q" memberEnd="_Hd5hiEl-Eeie5KfMtdD_2Q _Hd5hi0l-Eeie5KfMtdD_2Q">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_Hd5hi0l-Eeie5KfMtdD_2Q" visibility="public" type="_Hd5hh0l-Eeie5KfMtdD_2Q" association="_Hd5hikl-Eeie5KfMtdD_2Q">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hjEl-Eeie5KfMtdD_2Q"/>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xmi:type="uml:DataType" xmi:id="_XIb87TnJEeiy4fd_s3YDfQ" name="CoordValue" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb87jnJEeiy4fd_s3YDfQ" general="_XIb85znJEeiy4fd_s3YDfQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb87znJEeiy4fd_s3YDfQ" name="axis" visibility="public" type="_XIb83DnJEeiy4fd_s3YDfQ" association="_XIb88DnJEeiy4fd_s3YDfQ"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_XIb88DnJEeiy4fd_s3YDfQ" memberEnd="_XIb87znJEeiy4fd_s3YDfQ _XIb88TnJEeiy4fd_s3YDfQ">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_XIb88TnJEeiy4fd_s3YDfQ" visibility="public" type="_XIb87TnJEeiy4fd_s3YDfQ" association="_XIb88DnJEeiy4fd_s3YDfQ">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb88jnJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hjUl-Eeie5KfMtdD_2Q" name="CoordValue" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hjkl-Eeie5KfMtdD_2Q" general="_Hd5hh0l-Eeie5KfMtdD_2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hj0l-Eeie5KfMtdD_2Q" name="axis" visibility="public" type="_Hd5hfEl-Eeie5KfMtdD_2Q" association="_Hd5hkEl-Eeie5KfMtdD_2Q"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_Hd5hkEl-Eeie5KfMtdD_2Q" memberEnd="_Hd5hj0l-Eeie5KfMtdD_2Q _Hd5hkUl-Eeie5KfMtdD_2Q">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_Hd5hkUl-Eeie5KfMtdD_2Q" visibility="public" type="_Hd5hjUl-Eeie5KfMtdD_2Q" association="_Hd5hkEl-Eeie5KfMtdD_2Q">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hkkl-Eeie5KfMtdD_2Q"/>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xmi:type="uml:DataType" xmi:id="_XIb88znJEeiy4fd_s3YDfQ" name="CompositeCoordinate" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb89DnJEeiy4fd_s3YDfQ" general="_XIb85znJEeiy4fd_s3YDfQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb89TnJEeiy4fd_s3YDfQ" name="cmpt" visibility="public" type="_XIb87TnJEeiy4fd_s3YDfQ" isUnique="false">
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XIb89jnJEeiy4fd_s3YDfQ" value="*"/>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hk0l-Eeie5KfMtdD_2Q" name="CompositeCoordinate" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hlEl-Eeie5KfMtdD_2Q" general="_Hd5hh0l-Eeie5KfMtdD_2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hlUl-Eeie5KfMtdD_2Q" name="cmpt" visibility="public" type="_Hd5hjUl-Eeie5KfMtdD_2Q" isUnique="false">
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hd5hlkl-Eeie5KfMtdD_2Q" value="*"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_XIb89znJEeiy4fd_s3YDfQ" name="Handedness">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8-DnJEeiy4fd_s3YDfQ" name="left"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XIb8-TnJEeiy4fd_s3YDfQ" name="right"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8-jnJEeiy4fd_s3YDfQ" name="PhysicalCoordValue">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb8-znJEeiy4fd_s3YDfQ" general="_XIb87TnJEeiy4fd_s3YDfQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8_DnJEeiy4fd_s3YDfQ" name="cval" visibility="public" type="_XIb75jnJEeiy4fd_s3YDfQ" isUnique="false"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:DataType" xmi:id="_XIb8_TnJEeiy4fd_s3YDfQ" name="BinnedCoordValue">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb8_jnJEeiy4fd_s3YDfQ" general="_XIb87TnJEeiy4fd_s3YDfQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb8_znJEeiy4fd_s3YDfQ" name="cval" visibility="public" type="_XIb73TnJEeiy4fd_s3YDfQ" isUnique="false"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb9ADnJEeiy4fd_s3YDfQ" name="BinnedAxis">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb9ATnJEeiy4fd_s3YDfQ" general="_XIb83DnJEeiy4fd_s3YDfQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb9AjnJEeiy4fd_s3YDfQ" name="length" visibility="public" type="_XIb73DnJEeiy4fd_s3YDfQ" isUnique="false"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb9AznJEeiy4fd_s3YDfQ" name="DiscreteSetAxis">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb9BDnJEeiy4fd_s3YDfQ" general="_XIb83DnJEeiy4fd_s3YDfQ"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XIb9BTnJEeiy4fd_s3YDfQ" name="GenericCoordFrame">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb9BjnJEeiy4fd_s3YDfQ" general="_XIb8yznJEeiy4fd_s3YDfQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb9BznJEeiy4fd_s3YDfQ" name="refPosition" visibility="public" type="_XIb8TDnJEeiy4fd_s3YDfQ" isUnique="false"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XIb9CDnJEeiy4fd_s3YDfQ" name="planetaryEphem" visibility="public" type="_XIb74TnJEeiy4fd_s3YDfQ" isUnique="false">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIb9CTnJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_Hd5hl0l-Eeie5KfMtdD_2Q" name="Handedness">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hmEl-Eeie5KfMtdD_2Q" name="left"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Hd5hmUl-Eeie5KfMtdD_2Q" name="right"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hmkl-Eeie5KfMtdD_2Q" name="PhysicalCoordValue">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hm0l-Eeie5KfMtdD_2Q" general="_Hd5hjUl-Eeie5KfMtdD_2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hnEl-Eeie5KfMtdD_2Q" name="cval" visibility="public" type="_Hd5ghkl-Eeie5KfMtdD_2Q" isUnique="false"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hnUl-Eeie5KfMtdD_2Q" name="BinnedCoordValue">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hnkl-Eeie5KfMtdD_2Q" general="_Hd5hjUl-Eeie5KfMtdD_2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hn0l-Eeie5KfMtdD_2Q" name="cval" visibility="public" type="_Hd5gfUl-Eeie5KfMtdD_2Q" isUnique="false"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5hoEl-Eeie5KfMtdD_2Q" name="BinnedAxis">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hoUl-Eeie5KfMtdD_2Q" general="_Hd5hfEl-Eeie5KfMtdD_2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hokl-Eeie5KfMtdD_2Q" name="length" visibility="public" type="_Hd5gfEl-Eeie5KfMtdD_2Q" isUnique="false"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5ho0l-Eeie5KfMtdD_2Q" name="DiscreteSetAxis">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hpEl-Eeie5KfMtdD_2Q" general="_Hd5hfEl-Eeie5KfMtdD_2Q"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Hd5hpUl-Eeie5KfMtdD_2Q" name="GenericCoordFrame">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hpkl-Eeie5KfMtdD_2Q" general="_Hd5ha0l-Eeie5KfMtdD_2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hp0l-Eeie5KfMtdD_2Q" name="refPosition" visibility="public" type="_Hd5g7El-Eeie5KfMtdD_2Q" isUnique="false"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hd5hqEl-Eeie5KfMtdD_2Q" name="planetaryEphem" visibility="public" type="_Hd5ggUl-Eeie5KfMtdD_2Q" isUnique="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd5hqUl-Eeie5KfMtdD_2Q"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:DataType" xmi:id="_XIb9CjnJEeiy4fd_s3YDfQ" name="CompositeCoord1D">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb9CznJEeiy4fd_s3YDfQ" general="_XIb88znJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hqkl-Eeie5KfMtdD_2Q" name="CompositeCoord1D">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hq0l-Eeie5KfMtdD_2Q" general="_Hd5hk0l-Eeie5KfMtdD_2Q"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:DataType" xmi:id="_XIb9DDnJEeiy4fd_s3YDfQ" name="CompositeCoord2D">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb9DTnJEeiy4fd_s3YDfQ" general="_XIb88znJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hrEl-Eeie5KfMtdD_2Q" name="CompositeCoord2D">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hrUl-Eeie5KfMtdD_2Q" general="_Hd5hk0l-Eeie5KfMtdD_2Q"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:DataType" xmi:id="_XIb9DjnJEeiy4fd_s3YDfQ" name="CompositeCoord3D">
-      <generalization xmi:type="uml:Generalization" xmi:id="_XIb9DznJEeiy4fd_s3YDfQ" general="_XIb88znJEeiy4fd_s3YDfQ"/>
+    <packagedElement xmi:type="uml:DataType" xmi:id="_Hd5hrkl-Eeie5KfMtdD_2Q" name="CompositeCoord3D">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Hd5hr0l-Eeie5KfMtdD_2Q" general="_Hd5hk0l-Eeie5KfMtdD_2Q"/>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_XIb7wDnJEeiy4fd_s3YDfQ" xmi:id="_XiXesDnJEeiy4fd_s3YDfQ">
-      <eAnnotations xmi:id="_XiXesTnJEeiy4fd_s3YDfQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_XJLipznJEeiy4fd_s3YDfQ"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_Hd5gYEl-Eeie5KfMtdD_2Q" xmi:id="_H4lRQEl-Eeie5KfMtdD_2Q">
+      <eAnnotations xmi:id="_H4lRQUl-Eeie5KfMtdD_2Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_HfFzN0l-Eeie5KfMtdD_2Q"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_XiXesDnJEeiy4fd_s3YDfQ" href="IVOA_UML_Profile.profile.xmi#_XJLioDnJEeiy4fd_s3YDfQ"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_H4lRQEl-Eeie5KfMtdD_2Q" href="IVOA_UML_Profile.profile.xmi#_HfFzMEl-Eeie5KfMtdD_2Q"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_XIb7wDnJEeiy4fd_s3YDfQ" xmi:id="_XihPsDnJEeiy4fd_s3YDfQ">
-      <eAnnotations xmi:id="_XihPsTnJEeiy4fd_s3YDfQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="default.profile.xmi#_XVjKtznJEeiy4fd_s3YDfQ"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_Hd5gYEl-Eeie5KfMtdD_2Q" xmi:id="_H44MMEl-Eeie5KfMtdD_2Q">
+      <eAnnotations xmi:id="_H44MMUl-Eeie5KfMtdD_2Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="default.profile.xmi#_HrnzV0l-Eeie5KfMtdD_2Q"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_XihPsDnJEeiy4fd_s3YDfQ" href="default.profile.xmi#_XVjKsDnJEeiy4fd_s3YDfQ"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_H44MMEl-Eeie5KfMtdD_2Q" href="default.profile.xmi#_HrnzUEl-Eeie5KfMtdD_2Q"/>
     </profileApplication>
   </uml:Model>
-  <IVOA_UML_Profile:model xmi:id="_XihPsjnJEeiy4fd_s3YDfQ" base_Package="_XIb7wDnJEeiy4fd_s3YDfQ" title="Astronomical Coordinates and Coordinate Systems" version="2.0" authors="Arnold Rots, Mark Cresitello-Dittmar, Omar Laurino" previousVersion="0.x"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_XihPsznJEeiy4fd_s3YDfQ" base_Package="_XIb72znJEeiy4fd_s3YDfQ" name="ivoa" version="1.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XihPtDnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb73DnJEeiy4fd_s3YDfQ" vodmlid="nonnegativeInteger"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZoDnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb73TnJEeiy4fd_s3YDfQ" vodmlid="integer"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZoTnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb73jnJEeiy4fd_s3YDfQ" vodmlid="rational"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZojnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb73znJEeiy4fd_s3YDfQ" vodmlid="real"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZoznJEeiy4fd_s3YDfQ" base_NamedElement="_XIb74DnJEeiy4fd_s3YDfQ" vodmlid="complex"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZpDnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb74TnJEeiy4fd_s3YDfQ" vodmlid="string"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZpTnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb74jnJEeiy4fd_s3YDfQ" vodmlid="boolean"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZpjnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb74znJEeiy4fd_s3YDfQ" vodmlid="datetime"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZpznJEeiy4fd_s3YDfQ" base_NamedElement="_XIb75DnJEeiy4fd_s3YDfQ" vodmlid="anyURI"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZqDnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb75jnJEeiy4fd_s3YDfQ" vodmlid="Quantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZqTnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb76TnJEeiy4fd_s3YDfQ" vodmlid="IntegerQuantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZqjnJEeiy4fd_s3YDfQ" base_NamedElement="_XIb77DnJEeiy4fd_s3YDfQ" vodmlid="RealQuantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_XiqZqznJEeiy4fd_s3YDfQ" base_NamedElement="_XIb77znJEeiy4fd_s3YDfQ" vodmlid="Unit"/>
-  <default:subset xmi:id="_XiqZrDnJEeiy4fd_s3YDfQ" base_Constraint="_XIb7xznJEeiy4fd_s3YDfQ"/>
-  <default:subset xmi:id="_XiqZrTnJEeiy4fd_s3YDfQ" base_Constraint="_XIb7yznJEeiy4fd_s3YDfQ"/>
-  <default:subset xmi:id="_XiqZrjnJEeiy4fd_s3YDfQ" base_Constraint="_XIb7zTnJEeiy4fd_s3YDfQ"/>
-  <default:subset xmi:id="_XiqZrznJEeiy4fd_s3YDfQ" base_Constraint="_XIb70TnJEeiy4fd_s3YDfQ"/>
-  <default:subset xmi:id="_XiqZsDnJEeiy4fd_s3YDfQ" base_Constraint="_XIb70znJEeiy4fd_s3YDfQ"/>
+  <IVOA_UML_Profile:model xmi:id="_H5LuMEl-Eeie5KfMtdD_2Q" base_Package="_Hd5gYEl-Eeie5KfMtdD_2Q" title="Astronomical Coordinates and Coordinate Systems" version="2.0" authors="Arnold Rots, Mark Cresitello-Dittmar, Omar Laurino" previousVersion="0.x"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_H5LuMUl-Eeie5KfMtdD_2Q" base_Package="_Hd5ge0l-Eeie5KfMtdD_2Q" name="ivoa" version="1.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5LuMkl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5gfEl-Eeie5KfMtdD_2Q" vodmlid="nonnegativeInteger"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5LuM0l-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5gfUl-Eeie5KfMtdD_2Q" vodmlid="integer"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5LuNEl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5gfkl-Eeie5KfMtdD_2Q" vodmlid="rational"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5LuNUl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5gf0l-Eeie5KfMtdD_2Q" vodmlid="real"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5LuNkl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5ggEl-Eeie5KfMtdD_2Q" vodmlid="complex"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5LuN0l-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5ggUl-Eeie5KfMtdD_2Q" vodmlid="string"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5LuOEl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5ggkl-Eeie5KfMtdD_2Q" vodmlid="boolean"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5LuOUl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5gg0l-Eeie5KfMtdD_2Q" vodmlid="datetime"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5U4IEl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5ghEl-Eeie5KfMtdD_2Q" vodmlid="anyURI"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5U4IUl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5ghkl-Eeie5KfMtdD_2Q" vodmlid="Quantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5U4Ikl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5giUl-Eeie5KfMtdD_2Q" vodmlid="IntegerQuantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5U4I0l-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5gjEl-Eeie5KfMtdD_2Q" vodmlid="RealQuantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_H5U4JEl-Eeie5KfMtdD_2Q" base_NamedElement="_Hd5gj0l-Eeie5KfMtdD_2Q" vodmlid="Unit"/>
+  <default:subset xmi:id="_H5U4JUl-Eeie5KfMtdD_2Q" base_Constraint="_Hd5gZ0l-Eeie5KfMtdD_2Q"/>
+  <default:subset xmi:id="_H5U4Jkl-Eeie5KfMtdD_2Q" base_Constraint="_Hd5ga0l-Eeie5KfMtdD_2Q"/>
+  <default:subset xmi:id="_H5U4J0l-Eeie5KfMtdD_2Q" base_Constraint="_Hd5gbUl-Eeie5KfMtdD_2Q"/>
+  <default:subset xmi:id="_H5U4KEl-Eeie5KfMtdD_2Q" base_Constraint="_Hd5gcUl-Eeie5KfMtdD_2Q"/>
+  <default:subset xmi:id="_H5U4KUl-Eeie5KfMtdD_2Q" base_Constraint="_Hd5gc0l-Eeie5KfMtdD_2Q"/>
 </xmi:XMI>

Modified: trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html
==============================================================================
--- trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html	Mon Apr 23 18:17:51 2018	(r4933)
+++ trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.html	Thu Apr 26 22:04:23 2018	(r4934)
@@ -232,14 +232,18 @@
         </tr>
         <tr>
           <td>2.6.5</td>
-          <td>    <a href="#domain.time.TimeOffset">dataType: TimeOffset</a></td>
+          <td>    <a href="#domain.time.TimeInstant">dataType: TimeInstant</a></td>
         </tr>
         <tr>
           <td>2.6.6</td>
-          <td>    <a href="#domain.time.TimeScale">enumeration: TimeScale</a></td>
+          <td>    <a href="#domain.time.TimeOffset">dataType: TimeOffset</a></td>
         </tr>
         <tr>
           <td>2.6.7</td>
+          <td>    <a href="#domain.time.TimeScale">enumeration: TimeScale</a></td>
+        </tr>
+        <tr>
+          <td>2.6.8</td>
           <td>    <a href="#domain.time.TimeStamp">dataType: TimeStamp</a></td>
         </tr>
         <tr>
@@ -270,7 +274,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2018-04-06T14:59:37</td>
+        <td>2018-04-26T15:17:50</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -312,55 +316,56 @@
 <area shape="rect" id="node6" href="#domain.time" title="time" alt="" coords="259,273,331,321"/>
 <area shape="rect" id="node7" href="#domain.polarization" title="polarization" alt="" coords="128,273,235,321"/>
 <area shape="rect" id="node8" href="#Handedness" title="{<<enumeration>>\nHandedness|+left\l+right\l}" alt="" coords="555,259,653,335"/>
-<area shape="rect" id="node9" href="#Coordinate" title="{<<datatype>>\nCoordinate}" alt="" coords="2128,962,2211,1011"/>
-<area shape="rect" id="node17" href="#CoordFrame" title="{CoordFrame}" alt="" coords="2312,1099,2387,1149"/>
-<area shape="rect" id="node10" href="#CoordValue" title="{<<datatype>>\nCoordValue}" alt="" coords="1499,811,1581,861"/>
-<area shape="rect" id="node21" href="#Axis" title="{Axis|+name : ivoa:string\l}" alt="" coords="1147,962,1251,1011"/>
-<area shape="rect" id="node11" href="#CompositeCoordinate" title="{<<datatype>>\nCompositeCoordinate|+cmpt : coords:CoordValue\l}" alt="" coords="3260,805,3401,867"/>
-<area shape="rect" id="node12" href="#PhysicalCoordValue" title="{<<datatype>>\nPhysicalCoordValue|+cval : ivoa:Quantity\l}" alt="" coords="1484,670,1596,733"/>
-<area shape="rect" id="node13" href="#BinnedCoordValue" title="{<<datatype>>\nBinnedCoordValue|+cval : ivoa:integer\l}" alt="" coords="1620,670,1727,733"/>
-<area shape="rect" id="node14" href="#CompositeCoord1D" title="{<<datatype>>\nCompositeCoord1D}" alt="" coords="3343,677,3449,726"/>
-<area shape="rect" id="node15" href="#CompositeCoord2D" title="{<<datatype>>\nCompositeCoord2D}" alt="" coords="3473,677,3580,726"/>
-<area shape="rect" id="node16" href="#CompositeCoord3D" title="{<<datatype>>\nCompositeCoord3D}" alt="" coords="3212,677,3319,726"/>
-<area shape="rect" id="node18" href="#CoordSys" title="{CoordSys}" alt="" coords="788,677,860,726"/>
+<area shape="rect" id="node9" href="#Coordinate" title="{<<datatype>>\nCoordinate}" alt="" coords="1919,962,2001,1011"/>
+<area shape="rect" id="node17" href="#CoordFrame" title="{CoordFrame}" alt="" coords="2103,1099,2177,1149"/>
+<area shape="rect" id="node10" href="#CoordValue" title="{<<datatype>>\nCoordValue}" alt="" coords="1391,811,1473,861"/>
+<area shape="rect" id="node21" href="#Axis" title="{Axis|+name : ivoa:string\l}" alt="" coords="1053,962,1157,1011"/>
+<area shape="rect" id="node11" href="#CompositeCoordinate" title="{<<datatype>>\nCompositeCoordinate|+cmpt : coords:CoordValue\l}" alt="" coords="2833,805,2975,867"/>
+<area shape="rect" id="node12" href="#PhysicalCoordValue" title="{<<datatype>>\nPhysicalCoordValue|+cval : ivoa:Quantity\l}" alt="" coords="1081,670,1193,733"/>
+<area shape="rect" id="node13" href="#BinnedCoordValue" title="{<<datatype>>\nBinnedCoordValue|+cval : ivoa:integer\l}" alt="" coords="1217,670,1324,733"/>
+<area shape="rect" id="node14" href="#CompositeCoord1D" title="{<<datatype>>\nCompositeCoord1D}" alt="" coords="2785,677,2892,726"/>
+<area shape="rect" id="node15" href="#CompositeCoord2D" title="{<<datatype>>\nCompositeCoord2D}" alt="" coords="2916,677,3023,726"/>
+<area shape="rect" id="node16" href="#CompositeCoord3D" title="{<<datatype>>\nCompositeCoord3D}" alt="" coords="3047,677,3153,726"/>
+<area shape="rect" id="node18" href="#CoordSys" title="{CoordSys}" alt="" coords="776,677,848,726"/>
 <area shape="rect" id="node19" href="#AstroCoordSystem" title="{AstroCoordSystem}" alt="" coords="677,273,779,322"/>
-<area shape="rect" id="node20" href="#CoordSpace" title="{CoordSpace}" alt="" coords="1028,811,1103,861"/>
-<area shape="rect" id="node22" href="#ContinuousAxis" title="{ContinuousAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l+cyclic : ivoa:boolean\l}" alt="" coords="1127,798,1271,874"/>
-<area shape="rect" id="node23" href="#BinnedAxis" title="{BinnedAxis|+length : ivoa:nonnegativeInteger\l}" alt="" coords="1295,811,1460,861"/>
-<area shape="rect" id="node24" href="#DiscreteSetAxis" title="{DiscreteSetAxis}" alt="" coords="911,811,1004,861"/>
-<area shape="rect" id="node25" href="#GenericCoordFrame" title="{GenericCoordFrame|+refPosition : coords:domain.space.RefLocation\l+planetaryEphem : ivoa:string\l}" alt="" coords="2235,955,2464,1018"/>
-<area shape="rect" id="node26" href="#domain.pixel.PixelIndex" title="{<<datatype>>\ndomain/pixel/PixelIndex}" alt="" coords="2053,273,2179,322"/>
+<area shape="rect" id="node20" href="#CoordSpace" title="{CoordSpace}" alt="" coords="935,811,1009,861"/>
+<area shape="rect" id="node22" href="#ContinuousAxis" title="{ContinuousAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l+cyclic : ivoa:boolean\l}" alt="" coords="1033,798,1177,874"/>
+<area shape="rect" id="node23" href="#BinnedAxis" title="{BinnedAxis|+length : ivoa:nonnegativeInteger\l}" alt="" coords="1201,811,1367,861"/>
+<area shape="rect" id="node24" href="#DiscreteSetAxis" title="{DiscreteSetAxis}" alt="" coords="817,811,911,861"/>
+<area shape="rect" id="node25" href="#GenericCoordFrame" title="{GenericCoordFrame|+refPosition : coords:domain.space.RefLocation\l+planetaryEphem : ivoa:string\l}" alt="" coords="2025,955,2255,1018"/>
+<area shape="rect" id="node26" href="#domain.pixel.PixelIndex" title="{<<datatype>>\ndomain/pixel/PixelIndex}" alt="" coords="984,273,1109,322"/>
 <area shape="rect" id="node27" href="#domain.pixel.PixelCoordSystem" title="{domain/pixel/PixelCoordSystem}" alt="" coords="803,273,960,322"/>
-<area shape="rect" id="node28" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace|+handedness : coords:Handedness\l}" alt="" coords="940,677,1105,726"/>
-<area shape="rect" id="node29" href="#domain.space.Epoch" title="{<<primitive type>>\ndomain/space/Epoch}" alt="" coords="2401,273,2511,322"/>
-<area shape="rect" id="node30" href="#domain.space.StdRefPosition" title="{<<enumeration>>\ndomain/space/StdRefPosition|+TOPOCENTER\l+BARYCENTER\l+HELIOCENTER\l+GEOCENTER\l+GALACTIC_CENTER\l+LOCAL_GROUP_CENTER\l+MOON\l+EMBARYCENTER\l+MERCURY\l+VENUS\l+MARS\l+JUPITER\l+SATURN\l+URANUS\l+NEPTUNE\l+PLUTO\l+RELOCATABLE\l+LSR\l+LSRK\l+LSRD\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="2856,126,3011,469"/>
-<area shape="rect" id="node31" href="#domain.space.StdRefFrame" title="{<<enumeration>>\ndomain/space/StdRefFrame|+ICRS\l+FK4\l+FK5\l+ECLIPTIC\l+GALACTIC_I\l+GALACTIC_II\l+SUPER_GALACTIC\l+AZ_EL\l+BODY\l+GEO_C\l+GEO_D\l+MAG\l+GSE\l+GSM\l+SM\l+HGC\l+HEE\l+HEEQ\l+HCI\l+HCD\l+MERCURY_C\l+VENUS_C\l+LUNA_C\l+MARS_C\l+JUPITER_C_III\l+SATURN_C_III\l+URANUS_C_III\l+NEPTUNE_C_III\l+PLUTO_C\l+MERCURY_G\l+VENUS_G\l+LUNA_G\l+MARS_G\l+JUPITER_G_III\l+SATURN_G_III\l+URANUS_G_III\l+NEPTUNE_G_III\l+PLUTO_G\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="3196,6,3337,589"/>
-<area shape="rect" id="node32" href="#domain.space.RefLocation" title="{<<datatype>>\ndomain/space/RefLocation}" alt="" coords="3604,677,3740,726"/>
-<area shape="rect" id="node33" href="#domain.space.StdRefLocation" title="{<<datatype>>\ndomain/space/StdRefLocation|+position : coords:domain.space.StdRefPosition\l}" alt="" coords="3441,266,3668,329"/>
-<area shape="rect" id="node34" href="#domain.space.CustomRefLocation" title="{<<datatype>>\ndomain/space/CustomRefLocation|+epoch : coords:domain.space.Epoch\l+position : coords:CompositeCoordinate\l+velocity : coords:CompositeCoordinate\l}" alt="" coords="3692,253,3887,342"/>
-<area shape="rect" id="node35" href="#domain.space.EquatorialCoord" title="{<<datatype>>\ndomain/space/EquatorialCoord|+ra : ivoa:RealQuantity\l+dec : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="1916,657,2071,746"/>
-<area shape="rect" id="node36" href="#domain.space.SpaceCoord" title="{<<datatype>>\ndomain/space/SpaceCoord}" alt="" coords="2103,811,2236,861"/>
-<area shape="rect" id="node37" href="#domain.space.CartesianCoord" title="{<<datatype>>\ndomain/space/CartesianCoord|+x : ivoa:RealQuantity\l+y : ivoa:RealQuantity\l+z : ivoa:RealQuantity\l}" alt="" coords="2095,657,2244,746"/>
-<area shape="rect" id="node38" href="#domain.space.LongLatCoord" title="{<<datatype>>\ndomain/space/LongLatCoord|+long : ivoa:RealQuantity\l+lat : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="2268,657,2415,746"/>
-<area shape="rect" id="node39" href="#domain.space.GalacticCoord" title="{<<datatype>>\ndomain/space/GalacticCoord|+l : ivoa:RealQuantity\l+b : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="2439,657,2585,746"/>
-<area shape="rect" id="node40" href="#domain.space.EclipticCoord" title="{<<datatype>>\ndomain/space/EclipticCoord|+elong : ivoa:RealQuantity\l+elat : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="1751,657,1892,746"/>
-<area shape="rect" id="node41" href="#domain.space.SpaceFrame" title="{domain/space/SpaceFrame|+refPosition : coords:domain.space.RefLocation\l+spaceRefFrame : coords:domain.space.StdRefFrame\l+equinox : coords:domain.space.Epoch\l+planetaryEphem : ivoa:string\l}" alt="" coords="2488,942,2741,1031"/>
-<area shape="rect" id="node42" href="#domain.time.TimeScale" title="{<<enumeration>>\ndomain/time/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="3911,213,4036,382"/>
-<area shape="rect" id="node43" href="#domain.time.ISOTime" title="{<<datatype>>\ndomain/time/ISOTime|+date : ivoa:datetime\l}" alt="" coords="2953,670,3071,733"/>
-<area shape="rect" id="node44" href="#domain.time.TimeStamp" title="{<<datatype>>\ndomain/time/TimeStamp}" alt="" coords="2767,811,2895,861"/>
-<area shape="rect" id="node45" href="#domain.time.JD" title="{<<datatype>>\ndomain/time/JD|+date : ivoa:real\l}" alt="" coords="3095,670,3188,733"/>
-<area shape="rect" id="node46" href="#domain.time.MJD" title="{<<datatype>>\ndomain/time/MJD|+date : ivoa:real\l}" alt="" coords="2609,670,2708,733"/>
-<area shape="rect" id="node47" href="#domain.time.TimeOffset" title="{<<datatype>>\ndomain/time/TimeOffset|+time : ivoa:RealQuantity\l+time0 : coords:domain.time.TimeStamp\l}" alt="" coords="2732,663,2929,739"/>
-<area shape="rect" id="node48" href="#domain.time.TimeFrame" title="{domain/time/TimeFrame|+refPosition : coords:domain.space.RefLocation\l+timescale : coords:domain.time.TimeScale\l+refDirection : coords:domain.space.RefLocation\l+time0 : coords:domain.time.TimeStamp\l}" alt="" coords="2765,942,3003,1031"/>
-<area shape="rect" id="node49" href="#domain.polarization.PolStokesEnum" title="{<<enumeration>>\ndomain/polarization/PolStokesEnum|+I\l+Q\l+U\l+V\l}" alt="" coords="4060,246,4236,349"/>
-<area shape="rect" id="node50" href="#domain.polarization.PolCircularEnum" title="{<<enumeration>>\ndomain/polarization/PolCircularEnum|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="4260,246,4444,349"/>
-<area shape="rect" id="node51" href="#domain.polarization.PolLinearEnum" title="{<<enumeration>>\ndomain/polarization/PolLinearEnum|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="4468,246,4647,349"/>
-<area shape="rect" id="node52" href="#domain.polarization.PolVectorEnum" title="{<<enumeration>>\ndomain/polarization/PolVectorEnum|+I\l+PF\l+PP\l+PA\l}" alt="" coords="4671,246,4849,349"/>
-<area shape="rect" id="node53" href="#domain.polarization.PolCoordValue" title="{<<datatype>>\ndomain/polarization/PolCoordValue}" alt="" coords="1284,677,1460,726"/>
-<area shape="rect" id="node54" href="#domain.polarization.PolLinear" title="{<<datatype>>\ndomain/polarization/PolLinear|+cval : coords:domain.polarization.PolLinearEnum\l}" alt="" coords="984,266,1227,329"/>
-<area shape="rect" id="node55" href="#domain.polarization.PolVector" title="{<<datatype>>\ndomain/polarization/PolVector|+cval : coords:domain.polarization.PolVectorEnum\l}" alt="" coords="1251,266,1493,329"/>
-<area shape="rect" id="node56" href="#domain.polarization.PolStokes" title="{<<datatype>>\ndomain/polarization/PolStokes|+cval : coords:domain.polarization.PolStokesEnum\l}" alt="" coords="1517,266,1757,329"/>
-<area shape="rect" id="node57" href="#domain.polarization.PolCircular" title="{<<datatype>>\ndomain/polarization/PolCircular|+cval : coords:domain.polarization.PolCircularEnum\l}" alt="" coords="1781,266,2029,329"/>
+<area shape="rect" id="node28" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace|+handedness : coords:Handedness\l}" alt="" coords="885,677,1051,726"/>
+<area shape="rect" id="node29" href="#domain.space.Epoch" title="{<<primitive type>>\ndomain/space/Epoch}" alt="" coords="2889,273,2999,322"/>
+<area shape="rect" id="node30" href="#domain.space.StdRefPosition" title="{<<enumeration>>\ndomain/space/StdRefPosition|+TOPOCENTER\l+BARYCENTER\l+HELIOCENTER\l+GEOCENTER\l+GALACTIC_CENTER\l+LOCAL_GROUP_CENTER\l+MOON\l+EMBARYCENTER\l+MERCURY\l+VENUS\l+MARS\l+JUPITER\l+SATURN\l+URANUS\l+NEPTUNE\l+PLUTO\l+RELOCATABLE\l+LSR\l+LSRK\l+LSRD\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="3023,126,3177,469"/>
+<area shape="rect" id="node31" href="#domain.space.StdRefFrame" title="{<<enumeration>>\ndomain/space/StdRefFrame|+ICRS\l+FK4\l+FK5\l+ECLIPTIC\l+GALACTIC_I\l+GALACTIC_II\l+SUPER_GALACTIC\l+AZ_EL\l+BODY\l+GEO_C\l+GEO_D\l+MAG\l+GSE\l+GSM\l+SM\l+HGC\l+HEE\l+HEEQ\l+HCI\l+HCD\l+MERCURY_C\l+VENUS_C\l+LUNA_C\l+MARS_C\l+JUPITER_C_III\l+SATURN_C_III\l+URANUS_C_III\l+NEPTUNE_C_III\l+PLUTO_C\l+MERCURY_G\l+VENUS_G\l+LUNA_G\l+MARS_G\l+JUPITER_G_III\l+SATURN_G_III\l+URANUS_G_III\l+NEPTUNE_G_III\l+PLUTO_G\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="3201,6,3343,589"/>
+<area shape="rect" id="node32" href="#domain.space.RefLocation" title="{<<datatype>>\ndomain/space/RefLocation}" alt="" coords="3529,677,3665,726"/>
+<area shape="rect" id="node33" href="#domain.space.StdRefLocation" title="{<<datatype>>\ndomain/space/StdRefLocation|+position : coords:domain.space.StdRefPosition\l}" alt="" coords="3367,266,3593,329"/>
+<area shape="rect" id="node34" href="#domain.space.CustomRefLocation" title="{<<datatype>>\ndomain/space/CustomRefLocation|+epoch : coords:domain.space.Epoch\l+position : coords:CompositeCoordinate\l+velocity : coords:CompositeCoordinate\l}" alt="" coords="3617,253,3812,342"/>
+<area shape="rect" id="node35" href="#domain.space.EquatorialCoord" title="{<<datatype>>\ndomain/space/EquatorialCoord|+ra : ivoa:RealQuantity\l+dec : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="2055,657,2209,746"/>
+<area shape="rect" id="node36" href="#domain.space.SpaceCoord" title="{<<datatype>>\ndomain/space/SpaceCoord}" alt="" coords="1893,811,2027,861"/>
+<area shape="rect" id="node37" href="#domain.space.CartesianCoord" title="{<<datatype>>\ndomain/space/CartesianCoord|+x : ivoa:RealQuantity\l+y : ivoa:RealQuantity\l+z : ivoa:RealQuantity\l}" alt="" coords="2233,657,2383,746"/>
+<area shape="rect" id="node38" href="#domain.space.LongLatCoord" title="{<<datatype>>\ndomain/space/LongLatCoord|+long : ivoa:RealQuantity\l+lat : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="1548,657,1695,746"/>
+<area shape="rect" id="node39" href="#domain.space.GalacticCoord" title="{<<datatype>>\ndomain/space/GalacticCoord|+l : ivoa:RealQuantity\l+b : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="1719,657,1865,746"/>
+<area shape="rect" id="node40" href="#domain.space.EclipticCoord" title="{<<datatype>>\ndomain/space/EclipticCoord|+elong : ivoa:RealQuantity\l+elat : ivoa:RealQuantity\l+r : ivoa:RealQuantity\l}" alt="" coords="1889,657,2031,746"/>
+<area shape="rect" id="node41" href="#domain.space.SpaceFrame" title="{domain/space/SpaceFrame|+refPosition : coords:domain.space.RefLocation\l+spaceRefFrame : coords:domain.space.StdRefFrame\l+equinox : coords:domain.space.Epoch\l+planetaryEphem : ivoa:string\l}" alt="" coords="2279,942,2532,1031"/>
+<area shape="rect" id="node42" href="#domain.time.TimeScale" title="{<<enumeration>>\ndomain/time/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="3836,213,3961,382"/>
+<area shape="rect" id="node43" href="#domain.time.ISOTime" title="{<<datatype>>\ndomain/time/ISOTime|+date : ivoa:datetime\l}" alt="" coords="2508,266,2625,329"/>
+<area shape="rect" id="node48" href="#domain.time.TimeInstant" title="{<<datatype>>\ndomain/time/TimeInstant}" alt="" coords="2631,677,2761,726"/>
+<area shape="rect" id="node44" href="#domain.time.TimeStamp" title="{<<datatype>>\ndomain/time/TimeStamp}" alt="" coords="2443,811,2571,861"/>
+<area shape="rect" id="node45" href="#domain.time.JD" title="{<<datatype>>\ndomain/time/JD|+date : ivoa:real\l}" alt="" coords="2649,266,2743,329"/>
+<area shape="rect" id="node46" href="#domain.time.MJD" title="{<<datatype>>\ndomain/time/MJD|+date : ivoa:real\l}" alt="" coords="2767,266,2865,329"/>
+<area shape="rect" id="node47" href="#domain.time.TimeOffset" title="{<<datatype>>\ndomain/time/TimeOffset|+time : ivoa:RealQuantity\l+time0 : coords:domain.time.TimeInstant\l}" alt="" coords="2407,663,2607,739"/>
+<area shape="rect" id="node49" href="#domain.time.TimeFrame" title="{domain/time/TimeFrame|+refPosition : coords:domain.space.RefLocation\l+timescale : coords:domain.time.TimeScale\l+refDirection : coords:domain.space.RefLocation\l}" alt="" coords="2556,949,2793,1025"/>
+<area shape="rect" id="node50" href="#domain.polarization.PolStokesEnum" title="{<<enumeration>>\ndomain/polarization/PolStokesEnum|+I\l+Q\l+U\l+V\l}" alt="" coords="3985,246,4161,349"/>
+<area shape="rect" id="node51" href="#domain.polarization.PolCircularEnum" title="{<<enumeration>>\ndomain/polarization/PolCircularEnum|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="4185,246,4369,349"/>
+<area shape="rect" id="node52" href="#domain.polarization.PolLinearEnum" title="{<<enumeration>>\ndomain/polarization/PolLinearEnum|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="4393,246,4572,349"/>
+<area shape="rect" id="node53" href="#domain.polarization.PolVectorEnum" title="{<<enumeration>>\ndomain/polarization/PolVectorEnum|+I\l+PF\l+PP\l+PA\l}" alt="" coords="4596,246,4775,349"/>
+<area shape="rect" id="node54" href="#domain.polarization.PolCoordValue" title="{<<datatype>>\ndomain/polarization/PolCoordValue}" alt="" coords="1348,677,1524,726"/>
+<area shape="rect" id="node55" href="#domain.polarization.PolLinear" title="{<<datatype>>\ndomain/polarization/PolLinear|+cval : coords:domain.polarization.PolLinearEnum\l}" alt="" coords="1133,266,1376,329"/>
+<area shape="rect" id="node56" href="#domain.polarization.PolVector" title="{<<datatype>>\ndomain/polarization/PolVector|+cval : coords:domain.polarization.PolVectorEnum\l}" alt="" coords="1400,266,1643,329"/>
+<area shape="rect" id="node57" href="#domain.polarization.PolStokes" title="{<<datatype>>\ndomain/polarization/PolStokes|+cval : coords:domain.polarization.PolStokesEnum\l}" alt="" coords="1667,266,1907,329"/>
+<area shape="rect" id="node58" href="#domain.polarization.PolCircular" title="{<<datatype>>\ndomain/polarization/PolCircular|+cval : coords:domain.polarization.PolCircularEnum\l}" alt="" coords="1931,266,2179,329"/>
 </map>
 
     <hr>
@@ -4239,7 +4244,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.time.ISOTime">ISOTime</a> <a href="#domain.time.JD">JD</a> <a href="#domain.time.MJD">MJD</a> <a href="#domain.time.TimeOffset">TimeOffset</a> <a href="#domain.time.TimeStamp">TimeStamp</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.time.ISOTime">ISOTime</a> <a href="#domain.time.JD">JD</a> <a href="#domain.time.MJD">MJD</a> <a href="#domain.time.TimeInstant">TimeInstant</a> <a href="#domain.time.TimeOffset">TimeOffset</a> <a href="#domain.time.TimeStamp">TimeStamp</a> 
         </td>
       </tr>
       <tr>
@@ -4279,7 +4284,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeInstant">TimeInstant [coords:domain.time.TimeInstant]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4343,7 +4348,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeInstant">TimeInstant [coords:domain.time.TimeInstant]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4407,7 +4412,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeInstant">TimeInstant [coords:domain.time.TimeInstant]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4542,24 +4547,49 @@
                         
                       </td>
                     </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="domain.time.TimeInstant"></a>2.6.5 dataType: TimeInstant
+    </h3>
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.time.TimeInstant</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.time.TimeFrame.time0"></a><b>time0</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.time">time</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.time.TimeFrame.time0</td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="info-title" width="20%">abstract</td>
+                      <td class="feature-detail" colspan="3">True</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="info-title" width="20%">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.time.ISOTime">ISOTime</a> <a href="#domain.time.JD">JD</a> <a href="#domain.time.MJD">MJD</a> 
                       </td>
                     </tr>
                   </table>
@@ -4569,7 +4599,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.time.TimeOffset"></a>2.6.5 dataType: TimeOffset
+    </div><br><h3><a name="domain.time.TimeOffset"></a>2.6.6 dataType: TimeOffset
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -4629,7 +4659,7 @@
                     <tr>
                       <td class="feature-detail" valign="top" rowspan="4"><a name="domain.time.TimeOffset.time0"></a><b>time0</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.time.TimeStamp">TimeStamp [coords:domain.time.TimeStamp]</a></td>
+                      <td class="feature-detail"><a href="#domain.time.TimeInstant">TimeInstant [coords:domain.time.TimeInstant]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
@@ -4653,7 +4683,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.time.TimeScale"></a>2.6.6 enumeration: TimeScale
+    </div><br><h3><a name="domain.time.TimeScale"></a>2.6.7 enumeration: TimeScale
     </h3>
     <table border="1" width="100%" cellspacing="2">
       <tr>
@@ -4796,7 +4826,7 @@
           
         </td>
       </tr>
-    </table><br><h3><a name="domain.time.TimeStamp"></a>2.6.7 dataType: TimeStamp
+    </table><br><h3><a name="domain.time.TimeStamp"></a>2.6.8 dataType: TimeStamp
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -4831,7 +4861,7 @@
                     </tr>
                     <tr>
                       <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.time.ISOTime">ISOTime</a> <a href="#domain.time.JD">JD</a> <a href="#domain.time.MJD">MJD</a> <a href="#domain.time.TimeOffset">TimeOffset</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.time.TimeInstant">TimeInstant</a> <a href="#domain.time.TimeOffset">TimeOffset</a> 
                       </td>
                     </tr>
                     <tr>
@@ -6328,7 +6358,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.TimeFrame.time0">domain.time.TimeFrame.time0</a></td>
+        <td class="feature-detail"><a href="#domain.time.TimeFrame.timescale">domain.time.TimeFrame.timescale</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -6336,8 +6366,8 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.time.TimeFrame.timescale">domain.time.TimeFrame.timescale</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.time.TimeInstant">domain.time.TimeInstant</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           

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

Modified: trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.vo-dml.xml
==============================================================================
--- trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.vo-dml.xml	Mon Apr 23 18:17:51 2018	(r4933)
+++ trunk/projects/dm/STC/vo-dml/STC_coords-v2.0.vo-dml.xml	Thu Apr 26 22:04:23 2018	(r4934)
@@ -10,7 +10,7 @@
   <author>Arnold Rots, Mark Cresitello-Dittmar, Omar Laurino</author>
   <version>2.0</version>
   <previousVersion>0.x</previousVersion>
-  <lastModified>2018-04-06T14:59:37</lastModified>
+  <lastModified>2018-04-26T15:17:50</lastModified>
   <import>
     <name>ivoa</name>
     <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.vo-dml.xml</url>
@@ -1491,7 +1491,7 @@
         <name>ISOTime</name>
         <description>The time is represented as a particular instant.  While interchangable with the TimeOffset, this form typically has a defined structure in representation.</description>
         <extends>
-          <vodml-ref>coords:domain.time.TimeStamp</vodml-ref>
+          <vodml-ref>coords:domain.time.TimeInstant</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.time.ISOTime.date</vodml-id>
@@ -1535,7 +1535,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.time.TimeStamp</vodml-ref>
+          <vodml-ref>coords:domain.time.TimeInstant</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.time.JD.date</vodml-id>
@@ -1560,7 +1560,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.time.TimeStamp</vodml-ref>
+          <vodml-ref>coords:domain.time.TimeInstant</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.time.MJD.date</vodml-id>
@@ -1608,7 +1608,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.time.TimeStamp</vodml-ref>
+            <vodml-ref>coords:domain.time.TimeInstant</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -1617,6 +1617,17 @@
         </attribute>
       </dataType>
 
+      <dataType abstract="true">
+        <vodml-id>domain.time.TimeInstant</vodml-id>
+        <name>TimeInstant</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>coords:domain.time.TimeStamp</vodml-ref>
+        </extends>
+      </dataType>
+
       <objectType>
         <vodml-id>domain.time.TimeFrame</vodml-id>
         <name>TimeFrame</name>
@@ -1666,20 +1677,6 @@
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <attribute>
-          <vodml-id>domain.time.TimeFrame.time0</vodml-id>
-          <name>time0</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>coords:domain.time.TimeStamp</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>


More information about the Volutecommits mailing list