[Volute] r3990 - in trunk/projects/dm/CubeDM-1.0: doc/diagrams model

Volute commit messages volutecommits at g-vo.org
Fri Apr 28 23:10:14 CEST 2017


Author: mdittmar
Date: Fri Apr 28 23:10:13 2017
New Revision: 3990

Log:
update to alternate modeling

Modified:
   trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - DataProduct diagram.png
   trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - Dataset Composite Pattern.png
   trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - ND DataProduct diagram.png
   trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - NDImage diagram.png
   trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - NDImageDataset diagram.png
   trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - SparseCube  diagram.png
   trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - SparseCubeDataset diagram.png
   trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - model imports.png
   trunk/projects/dm/CubeDM-1.0/model/Cube.zip
   trunk/projects/dm/CubeDM-1.0/model/cubeModel_uml2p4p1.xmi

Modified: trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - DataProduct diagram.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - Dataset Composite Pattern.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - ND DataProduct diagram.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - NDImage diagram.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - NDImageDataset diagram.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - SparseCube  diagram.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - SparseCubeDataset diagram.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/doc/diagrams/Cube - model imports.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/model/Cube.zip
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/CubeDM-1.0/model/cubeModel_uml2p4p1.xmi
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/model/cubeModel_uml2p4p1.xmi	Fri Apr 28 21:12:37 2017	(r3989)
+++ trunk/projects/dm/CubeDM-1.0/model/cubeModel_uml2p4p1.xmi	Fri Apr 28 23:10:13 2017	(r3990)
@@ -1,834 +1,598 @@
-<?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/_HrurQOtSEeaeZKaHgNOvDw/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/_HrurQOtSEeaeZKaHgNOvDw/0 IVOA_UML_Profile.profile.xmi#_Hr4cR-tSEeaeZKaHgNOvDw">
-  <uml:Model xmi:id="_HrlhUOtSEeaeZKaHgNOvDw" name="cube">
-    <eAnnotations xmi:id="_HrlhUetSEeaeZKaHgNOvDw" source="Objing">
-      <contents xmi:type="uml:Property" xmi:id="_HrlhUutSEeaeZKaHgNOvDw" name="exporterVersion">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhU-tSEeaeZKaHgNOvDw" 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/_r9SvLCxWEeeQ1MfYuQw_Rg/0" xmlns:default="http:///schemas/default/_r9vZwCxWEeeQ1MfYuQw_Rg/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/_r9SvLCxWEeeQ1MfYuQw_Rg/0 IVOA_UML_Profile.profile.xmi#_r_H51yxWEeeQ1MfYuQw_Rg http:///schemas/default/_r9vZwCxWEeeQ1MfYuQw_Rg/0 default.profile.xmi#_sKTPFyxWEeeQ1MfYuQw_Rg">
+  <uml:Model xmi:id="_r9St0CxWEeeQ1MfYuQw_Rg" name="cube">
+    <eAnnotations xmi:id="_r9St0SxWEeeQ1MfYuQw_Rg" source="Objing">
+      <contents xmi:type="uml:Property" xmi:id="_r9St0ixWEeeQ1MfYuQw_Rg" name="exporterVersion">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St0yxWEeeQ1MfYuQw_Rg" value="3.0.0"/>
       </contents>
-      <contents xmi:type="uml:Property" xmi:id="_HrlhVOtSEeaeZKaHgNOvDw" name="isRoundTrip"/>
-      <contents xmi:type="uml:Property" xmi:id="_HrlhVetSEeaeZKaHgNOvDw" name="Visibility">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhVutSEeaeZKaHgNOvDw" value="0"/>
+      <contents xmi:type="uml:Property" xmi:id="_r9St1CxWEeeQ1MfYuQw_Rg" name="isRoundTrip"/>
+      <contents xmi:type="uml:Property" xmi:id="_r9St1SxWEeeQ1MfYuQw_Rg" name="Visibility">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St1ixWEeeQ1MfYuQw_Rg" value="0"/>
       </contents>
     </eAnnotations>
-    <packagedElement xmi:type="uml:Package" xmi:id="_HrlhV-tSEeaeZKaHgNOvDw" name="ivoa">
-      <eAnnotations xmi:id="_HrlhWOtSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrlhWetSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhWutSEeaeZKaHgNOvDw" value="0"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_r9St1yxWEeeQ1MfYuQw_Rg" constrainedElement="_r9Su1ixWEeeQ1MfYuQw_Rg">
+      <specification xmi:type="uml:LiteralString" xmi:id="_r9St2CxWEeeQ1MfYuQw_Rg" value="axis:DataAxis[1]"/>
+    </ownedRule>
+    <packagedElement xmi:type="uml:Package" xmi:id="_r9St2SxWEeeQ1MfYuQw_Rg" name="ivoa">
+      <eAnnotations xmi:id="_r9St2ixWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9St2yxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St3CxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_HrlhW-tSEeaeZKaHgNOvDw" name="IVOA Base Types V1.0 (2016)">
-        <eAnnotations xmi:id="_HrlhXOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhXetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhXutSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_r9St3SxWEeeQ1MfYuQw_Rg" name="IVOA Base Types V1.0 (2016)">
+        <eAnnotations xmi:id="_r9St3ixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9St3yxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St4CxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrlhX-tSEeaeZKaHgNOvDw" name="integer">
-        <eAnnotations xmi:id="_HrlhYOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhYetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhYutSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9St4SxWEeeQ1MfYuQw_Rg" name="integer">
+        <eAnnotations xmi:id="_r9St4ixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9St4yxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St5CxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlhY-tSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9St5SxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrlhZOtSEeaeZKaHgNOvDw" name="nonnegativeinteger">
-        <eAnnotations xmi:id="_HrlhZetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhZutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhZ-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9St5ixWEeeQ1MfYuQw_Rg" name="nonnegativeinteger">
+        <eAnnotations xmi:id="_r9St5yxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9St6CxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St6SxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlhaOtSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9St6ixWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrlhaetSEeaeZKaHgNOvDw" name="real">
-        <eAnnotations xmi:id="_HrlhautSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlha-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhbOtSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9St6yxWEeeQ1MfYuQw_Rg" name="real">
+        <eAnnotations xmi:id="_r9St7CxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9St7SxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St7ixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlhbetSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9St7yxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrlhbutSEeaeZKaHgNOvDw" name="boolean">
-        <eAnnotations xmi:id="_Hrlhb-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhcOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhcetSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9St8CxWEeeQ1MfYuQw_Rg" name="boolean">
+        <eAnnotations xmi:id="_r9St8SxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9St8ixWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St8yxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlhcutSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9St9CxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hrlhc-tSEeaeZKaHgNOvDw" name="datetime">
-        <eAnnotations xmi:id="_HrlhdOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhdetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhdutSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9St9SxWEeeQ1MfYuQw_Rg" name="datetime">
+        <eAnnotations xmi:id="_r9St9ixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9St9yxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St-CxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrlhd-tSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9St-SxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrlheOtSEeaeZKaHgNOvDw" name="complex">
-        <eAnnotations xmi:id="_HrlheetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlheutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlhe-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9St-ixWEeeQ1MfYuQw_Rg" name="complex">
+        <eAnnotations xmi:id="_r9St-yxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9St_CxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9St_SxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlhfOtSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9St_ixWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrlhfetSEeaeZKaHgNOvDw" name="rational">
-        <eAnnotations xmi:id="_HrlhfutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlhf-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhgOtSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9St_yxWEeeQ1MfYuQw_Rg" name="rational">
+        <eAnnotations xmi:id="_r9SuACxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuASxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuAixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlhgetSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuAyxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrlhgutSEeaeZKaHgNOvDw" name="string">
-        <eAnnotations xmi:id="_Hrlhg-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhhOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhhetSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9SuBCxWEeeQ1MfYuQw_Rg" name="string">
+        <eAnnotations xmi:id="_r9SuBSxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuBixWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuByxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlhhutSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuCCxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hrlhh-tSEeaeZKaHgNOvDw" name="Unit">
-        <eAnnotations xmi:id="_HrlhiOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhietSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhiutSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9SuCSxWEeeQ1MfYuQw_Rg" name="Unit">
+        <eAnnotations xmi:id="_r9SuCixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuCyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuDCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrlhi-tSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuDSxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_HrlhjOtSEeaeZKaHgNOvDw" general="_HrlhgutSEeaeZKaHgNOvDw"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_r9SuDixWEeeQ1MfYuQw_Rg" general="_r9SuBCxWEeeQ1MfYuQw_Rg"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrlhjetSEeaeZKaHgNOvDw" name="anyURI">
-        <eAnnotations xmi:id="_HrlhjutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlhj-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhkOtSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9SuDyxWEeeQ1MfYuQw_Rg" name="anyURI">
+        <eAnnotations xmi:id="_r9SuECxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuESxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuEixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlhketSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuEyxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_HrlhkutSEeaeZKaHgNOvDw" general="_HrlhgutSEeaeZKaHgNOvDw"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_r9SuFCxWEeeQ1MfYuQw_Rg" general="_r9SuBCxWEeeQ1MfYuQw_Rg"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hrlhk-tSEeaeZKaHgNOvDw" name="Quantity" isAbstract="true">
-        <eAnnotations xmi:id="_HrlhlOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhletSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhlutSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9SuFSxWEeeQ1MfYuQw_Rg" name="Quantity" isAbstract="true">
+        <eAnnotations xmi:id="_r9SuFixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuFyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuGCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrlhl-tSEeaeZKaHgNOvDw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuGSxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_HrlhmOtSEeaeZKaHgNOvDw" name="unit" visibility="public" type="_Hrlhh-tSEeaeZKaHgNOvDw" isUnique="false">
-          <eAnnotations xmi:id="_HrlhmetSEeaeZKaHgNOvDw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_HrlhmutSEeaeZKaHgNOvDw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlhm-tSEeaeZKaHgNOvDw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SuGixWEeeQ1MfYuQw_Rg" name="unit" visibility="public" type="_r9SuCSxWEeeQ1MfYuQw_Rg" isUnique="false">
+          <eAnnotations xmi:id="_r9SuGyxWEeeQ1MfYuQw_Rg" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_r9SuHCxWEeeQ1MfYuQw_Rg" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuHSxWEeeQ1MfYuQw_Rg" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_HrlhnOtSEeaeZKaHgNOvDw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhnetSEeaeZKaHgNOvDw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_r9SuHixWEeeQ1MfYuQw_Rg" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuHyxWEeeQ1MfYuQw_Rg" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrlhnutSEeaeZKaHgNOvDw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r9SuICxWEeeQ1MfYuQw_Rg"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hrlhn-tSEeaeZKaHgNOvDw" name="IntegerQuantity">
-        <eAnnotations xmi:id="_HrlhoOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhoetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhoutSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrlho-tSEeaeZKaHgNOvDw" name="isPrimitive"/>
-        </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_HrlhpOtSEeaeZKaHgNOvDw" general="_Hrlhk-tSEeaeZKaHgNOvDw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_HrlhpetSEeaeZKaHgNOvDw" name="value" visibility="public" type="_HrlhX-tSEeaeZKaHgNOvDw" isUnique="false">
-          <eAnnotations xmi:id="_HrlhputSEeaeZKaHgNOvDw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_Hrlhp-tSEeaeZKaHgNOvDw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhqOtSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9SuISxWEeeQ1MfYuQw_Rg" name="IntegerQuantity">
+        <eAnnotations xmi:id="_r9SuIixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuIyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuJCxWEeeQ1MfYuQw_Rg" value="0"/>
+          </contents>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuJSxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
+        </eAnnotations>
+        <generalization xmi:type="uml:Generalization" xmi:id="_r9SuJixWEeeQ1MfYuQw_Rg" general="_r9SuFSxWEeeQ1MfYuQw_Rg"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SuJyxWEeeQ1MfYuQw_Rg" name="value" visibility="public" type="_r9St4SxWEeeQ1MfYuQw_Rg" isUnique="false">
+          <eAnnotations xmi:id="_r9SuKCxWEeeQ1MfYuQw_Rg" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_r9SuKSxWEeeQ1MfYuQw_Rg" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuKixWEeeQ1MfYuQw_Rg" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_HrlhqetSEeaeZKaHgNOvDw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhqutSEeaeZKaHgNOvDw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_r9SuKyxWEeeQ1MfYuQw_Rg" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuLCxWEeeQ1MfYuQw_Rg" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hrlhq-tSEeaeZKaHgNOvDw" name="RealQuantity">
-        <eAnnotations xmi:id="_HrlhrOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhretSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhrutSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrlhr-tSEeaeZKaHgNOvDw" name="isPrimitive"/>
-        </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_HrlhsOtSEeaeZKaHgNOvDw" general="_Hrlhk-tSEeaeZKaHgNOvDw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_HrlhsetSEeaeZKaHgNOvDw" name="value" visibility="public" type="_HrlhaetSEeaeZKaHgNOvDw" isUnique="false">
-          <eAnnotations xmi:id="_HrlhsutSEeaeZKaHgNOvDw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_Hrlhs-tSEeaeZKaHgNOvDw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhtOtSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9SuLSxWEeeQ1MfYuQw_Rg" name="RealQuantity">
+        <eAnnotations xmi:id="_r9SuLixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuLyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuMCxWEeeQ1MfYuQw_Rg" value="0"/>
+          </contents>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuMSxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
+        </eAnnotations>
+        <generalization xmi:type="uml:Generalization" xmi:id="_r9SuMixWEeeQ1MfYuQw_Rg" general="_r9SuFSxWEeeQ1MfYuQw_Rg"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SuMyxWEeeQ1MfYuQw_Rg" name="value" visibility="public" type="_r9St6yxWEeeQ1MfYuQw_Rg" isUnique="false">
+          <eAnnotations xmi:id="_r9SuNCxWEeeQ1MfYuQw_Rg" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_r9SuNSxWEeeQ1MfYuQw_Rg" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuNixWEeeQ1MfYuQw_Rg" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_HrlhtetSEeaeZKaHgNOvDw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhtutSEeaeZKaHgNOvDw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_r9SuNyxWEeeQ1MfYuQw_Rg" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuOCxWEeeQ1MfYuQw_Rg" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_Hrlht-tSEeaeZKaHgNOvDw" name="ds">
-      <eAnnotations xmi:id="_HrlhuOtSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrlhuetSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhuutSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_r9SuOSxWEeeQ1MfYuQw_Rg" name="ds">
+      <eAnnotations xmi:id="_r9SuOixWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SuOyxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuPCxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_Hrlhu-tSEeaeZKaHgNOvDw" name="Dataset Metadata V1.0 (2016)">
-        <eAnnotations xmi:id="_HrlhvOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhvetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhvutSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_r9SuPSxWEeeQ1MfYuQw_Rg" name="Dataset Metadata V1.0 (2017)">
+        <eAnnotations xmi:id="_r9SuPixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuPyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuQCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_Hrlhv-tSEeaeZKaHgNOvDw" name="ObsDataset" isAbstract="true">
-        <eAnnotations xmi:id="_HrlhwOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhwetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlhwutSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_r9SuQSxWEeeQ1MfYuQw_Rg" name="ObsDataset" isAbstract="true">
+        <eAnnotations xmi:id="_r9SuQixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuQyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuRCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_Hrlhw-tSEeaeZKaHgNOvDw" general="_HrlhxOtSEeaeZKaHgNOvDw"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_r9SuRSxWEeeQ1MfYuQw_Rg" general="_r9SuRixWEeeQ1MfYuQw_Rg"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_HrlhxOtSEeaeZKaHgNOvDw" name="Dataset" isAbstract="true">
-        <eAnnotations xmi:id="_HrlhxetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhxutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlhx-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_r9SuRixWEeeQ1MfYuQw_Rg" name="Dataset" isAbstract="true">
+        <eAnnotations xmi:id="_r9SuRyxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuSCxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuSSxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_HrlhyOtSEeaeZKaHgNOvDw" name="coordsys">
-      <eAnnotations xmi:id="_HrlhyetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrlhyutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlhy-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_r9SuSixWEeeQ1MfYuQw_Rg" name="coords">
+      <eAnnotations xmi:id="_r9SuSyxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SuTCxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuTSxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:Class" xmi:id="_HrlhzOtSEeaeZKaHgNOvDw" name="CoordSys">
-        <eAnnotations xmi:id="_HrlhzetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlhzutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlhz-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_r9SuTixWEeeQ1MfYuQw_Rg" name="Astronomical Coordinates and Systems (2017)">
+        <eAnnotations xmi:id="_r9SuTyxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuUCxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuUSxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_Hrlh0OtSEeaeZKaHgNOvDw" name="STC V2.0 CoordSys submodel (2017)">
-        <eAnnotations xmi:id="_Hrlh0etSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlh0utSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh0-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_r9SuUixWEeeQ1MfYuQw_Rg" name="PixelCoordSystem">
+        <eAnnotations xmi:id="_r9SuUyxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuVCxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuVSxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_Hrlh1OtSEeaeZKaHgNOvDw" name="PixelCoordSystem">
-        <eAnnotations xmi:id="_Hrlh1etSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlh1utSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh1-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_r9SuVixWEeeQ1MfYuQw_Rg" name="CoordSys">
+        <eAnnotations xmi:id="_r9SuVyxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuWCxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuWSxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_Hrlh2OtSEeaeZKaHgNOvDw" memberEnd="_HrlitutSEeaeZKaHgNOvDw _Hrlh2etSEeaeZKaHgNOvDw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_Hrlh2etSEeaeZKaHgNOvDw" visibility="public" type="_HrlisutSEeaeZKaHgNOvDw" association="_Hrlh2OtSEeaeZKaHgNOvDw">
-          <eAnnotations xmi:id="_Hrlh2utSEeaeZKaHgNOvDw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_Hrlh2-tSEeaeZKaHgNOvDw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh3OtSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_r9SuWixWEeeQ1MfYuQw_Rg" memberEnd="_r9SuuCxWEeeQ1MfYuQw_Rg _r9SuWyxWEeeQ1MfYuQw_Rg">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_r9SuWyxWEeeQ1MfYuQw_Rg" visibility="public" type="_r9SutCxWEeeQ1MfYuQw_Rg" association="_r9SuWixWEeeQ1MfYuQw_Rg">
+          <eAnnotations xmi:id="_r9SuXCxWEeeQ1MfYuQw_Rg" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_r9SuXSxWEeeQ1MfYuQw_Rg" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuXixWEeeQ1MfYuQw_Rg" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_Hrlh3etSEeaeZKaHgNOvDw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh3utSEeaeZKaHgNOvDw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_r9SuXyxWEeeQ1MfYuQw_Rg" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuYCxWEeeQ1MfYuQw_Rg" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hrlh3-tSEeaeZKaHgNOvDw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_Hrlh4OtSEeaeZKaHgNOvDw" memberEnd="_HrliwOtSEeaeZKaHgNOvDw _Hrlh4etSEeaeZKaHgNOvDw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_Hrlh4etSEeaeZKaHgNOvDw" visibility="public" type="_HrlivOtSEeaeZKaHgNOvDw" association="_Hrlh4OtSEeaeZKaHgNOvDw">
-          <eAnnotations xmi:id="_Hrlh4utSEeaeZKaHgNOvDw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_Hrlh4-tSEeaeZKaHgNOvDw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh5OtSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_r9SuYSxWEeeQ1MfYuQw_Rg" memberEnd="_r9SuyyxWEeeQ1MfYuQw_Rg _r9SuYixWEeeQ1MfYuQw_Rg">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_r9SuYixWEeeQ1MfYuQw_Rg" visibility="public" type="_r9SuxixWEeeQ1MfYuQw_Rg" association="_r9SuYSxWEeeQ1MfYuQw_Rg">
+          <eAnnotations xmi:id="_r9SuYyxWEeeQ1MfYuQw_Rg" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_r9SuZCxWEeeQ1MfYuQw_Rg" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuZSxWEeeQ1MfYuQw_Rg" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_Hrlh5etSEeaeZKaHgNOvDw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh5utSEeaeZKaHgNOvDw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_r9SuZixWEeeQ1MfYuQw_Rg" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuZyxWEeeQ1MfYuQw_Rg" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hrlh5-tSEeaeZKaHgNOvDw"/>
         </ownedEnd>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_Hrlh6OtSEeaeZKaHgNOvDw" name="coords">
-      <eAnnotations xmi:id="_Hrlh6etSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_Hrlh6utSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh6-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_r9SuaCxWEeeQ1MfYuQw_Rg" name="meas">
+      <eAnnotations xmi:id="_r9SuaSxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SuaixWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuayxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:Class" xmi:id="_Hrlh7OtSEeaeZKaHgNOvDw" name="DerivedCoordinate" isAbstract="true">
-        <eAnnotations xmi:id="_Hrlh7etSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlh7utSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh7-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_r9SubCxWEeeQ1MfYuQw_Rg" name="Measurements (2017)">
+        <eAnnotations xmi:id="_r9SubSxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SubixWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SubyxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_Hrlh8OtSEeaeZKaHgNOvDw" name="STC V2.0 Coords submodel (2017)">
-        <eAnnotations xmi:id="_Hrlh8etSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlh8utSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh8-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_r9SucCxWEeeQ1MfYuQw_Rg" name="PixelIndex">
+        <eAnnotations xmi:id="_r9SucSxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SucixWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SucyxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
+          <contents xmi:type="uml:Property" xmi:id="_r9SudCxWEeeQ1MfYuQw_Rg" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_Hrlh9OtSEeaeZKaHgNOvDw" name="Pixel" isAbstract="true">
-        <eAnnotations xmi:id="_Hrlh9etSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlh9utSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh9-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_r9SudSxWEeeQ1MfYuQw_Rg" name="CoordMeasure" isAbstract="true">
+        <eAnnotations xmi:id="_r9SudixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SudyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SueCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_Hrlh-OtSEeaeZKaHgNOvDw" memberEnd="_HrljCutSEeaeZKaHgNOvDw _Hrlh-etSEeaeZKaHgNOvDw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_Hrlh-etSEeaeZKaHgNOvDw" visibility="public" type="_HrljButSEeaeZKaHgNOvDw" association="_Hrlh-OtSEeaeZKaHgNOvDw">
-          <eAnnotations xmi:id="_Hrlh-utSEeaeZKaHgNOvDw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_Hrlh--tSEeaeZKaHgNOvDw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh_OtSEeaeZKaHgNOvDw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_Hrlh_etSEeaeZKaHgNOvDw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlh_utSEeaeZKaHgNOvDw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hrlh_-tSEeaeZKaHgNOvDw"/>
-        </ownedEnd>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_HrliAOtSEeaeZKaHgNOvDw" memberEnd="_HrljJutSEeaeZKaHgNOvDw _HrliAetSEeaeZKaHgNOvDw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_HrliAetSEeaeZKaHgNOvDw" visibility="public" type="_HrljIutSEeaeZKaHgNOvDw" association="_HrliAOtSEeaeZKaHgNOvDw">
-          <eAnnotations xmi:id="_HrliAutSEeaeZKaHgNOvDw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_HrliA-tSEeaeZKaHgNOvDw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliBOtSEeaeZKaHgNOvDw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_HrliBetSEeaeZKaHgNOvDw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliButSEeaeZKaHgNOvDw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrliB-tSEeaeZKaHgNOvDw"/>
-        </ownedEnd>
-      </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_HrliCOtSEeaeZKaHgNOvDw" name="trans">
-      <eAnnotations xmi:id="_HrliCetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrliCutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliC-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_r9SueSxWEeeQ1MfYuQw_Rg" name="trans">
+      <eAnnotations xmi:id="_r9SueixWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SueyxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SufCxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_HrliDOtSEeaeZKaHgNOvDw" name="STC V2.0 Transform submodel (2017)">
-        <eAnnotations xmi:id="_HrliDetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliDutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliD-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_r9SufSxWEeeQ1MfYuQw_Rg" name="Transforms (2017)">
+        <eAnnotations xmi:id="_r9SufixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SufyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SugCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_HrliEOtSEeaeZKaHgNOvDw" name="Mappings">
-        <eAnnotations xmi:id="_HrliEetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliEutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliE-tSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_r9SugSxWEeeQ1MfYuQw_Rg" name="Mappings">
+        <eAnnotations xmi:id="_r9SugixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SugyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuhCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_HrliFOtSEeaeZKaHgNOvDw" memberEnd="_HrliyutSEeaeZKaHgNOvDw _HrliFetSEeaeZKaHgNOvDw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_HrliFetSEeaeZKaHgNOvDw" visibility="public" type="_HrlixutSEeaeZKaHgNOvDw" association="_HrliFOtSEeaeZKaHgNOvDw">
-          <eAnnotations xmi:id="_HrliFutSEeaeZKaHgNOvDw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_HrliF-tSEeaeZKaHgNOvDw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliGOtSEeaeZKaHgNOvDw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_r9SuhSxWEeeQ1MfYuQw_Rg" memberEnd="_r9SuvyxWEeeQ1MfYuQw_Rg _r9SuhixWEeeQ1MfYuQw_Rg">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_r9SuhixWEeeQ1MfYuQw_Rg" visibility="public" type="_r9SutCxWEeeQ1MfYuQw_Rg" association="_r9SuhSxWEeeQ1MfYuQw_Rg">
+          <eAnnotations xmi:id="_r9SuhyxWEeeQ1MfYuQw_Rg" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_r9SuiCxWEeeQ1MfYuQw_Rg" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuiSxWEeeQ1MfYuQw_Rg" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_HrliGetSEeaeZKaHgNOvDw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliGutSEeaeZKaHgNOvDw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_r9SuiixWEeeQ1MfYuQw_Rg" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuiyxWEeeQ1MfYuQw_Rg" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrliG-tSEeaeZKaHgNOvDw"/>
         </ownedEnd>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrliHOtSEeaeZKaHgNOvDw" name="NDImageDataset">
-      <eAnnotations xmi:id="_HrliHetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrliHutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliH-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9SujCxWEeeQ1MfYuQw_Rg" name="NDImage">
+      <eAnnotations xmi:id="_r9SujSxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SujixWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SujyxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <generalization xmi:type="uml:Generalization" xmi:id="_HrliIOtSEeaeZKaHgNOvDw" general="_Hrlhv-tSEeaeZKaHgNOvDw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrliIetSEeaeZKaHgNOvDw" name="image" visibility="public" type="_HrliMOtSEeaeZKaHgNOvDw" association="_HrliKOtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliIutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliI-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliJOtSEeaeZKaHgNOvDw" value="0"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_r9SukCxWEeeQ1MfYuQw_Rg" general="_r9SuxixWEeeQ1MfYuQw_Rg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SukSxWEeeQ1MfYuQw_Rg" name="data" visibility="public" type="_r9Su1ixWEeeQ1MfYuQw_Rg" aggregation="composite" association="_r9SumSxWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SukixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SukyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SulCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliJetSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliJutSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SulSxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SulixWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HrliJ-tSEeaeZKaHgNOvDw" value="*"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r9SulyxWEeeQ1MfYuQw_Rg" value="*"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r9SumCxWEeeQ1MfYuQw_Rg"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrliKOtSEeaeZKaHgNOvDw" memberEnd="_HrliIetSEeaeZKaHgNOvDw _HrliKetSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_HrliKetSEeaeZKaHgNOvDw" visibility="public" type="_HrliHOtSEeaeZKaHgNOvDw" association="_HrliKOtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliKutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliK-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliLOtSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_r9SumSxWEeeQ1MfYuQw_Rg" memberEnd="_r9SukSxWEeeQ1MfYuQw_Rg _r9SumixWEeeQ1MfYuQw_Rg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_r9SumixWEeeQ1MfYuQw_Rg" visibility="public" type="_r9SujCxWEeeQ1MfYuQw_Rg" association="_r9SumSxWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SumyxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SunCxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SunSxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliLetSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliLutSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SunixWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SunyxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrliL-tSEeaeZKaHgNOvDw"/>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrliMOtSEeaeZKaHgNOvDw" name="NDImage">
-      <eAnnotations xmi:id="_HrliMetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrliMutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliM-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9SuoCxWEeeQ1MfYuQw_Rg" name="SparseCube">
+      <eAnnotations xmi:id="_r9SuoSxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SuoixWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuoyxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <generalization xmi:type="uml:Generalization" xmi:id="_HrliNOtSEeaeZKaHgNOvDw" general="_Hrlim-tSEeaeZKaHgNOvDw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrliNetSEeaeZKaHgNOvDw" name="data" visibility="public" type="_Hrli0OtSEeaeZKaHgNOvDw" aggregation="composite" association="_HrliPetSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliNutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliN-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliOOtSEeaeZKaHgNOvDw" value="0"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_r9SupCxWEeeQ1MfYuQw_Rg" general="_r9Su0SxWEeeQ1MfYuQw_Rg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SupSxWEeeQ1MfYuQw_Rg" name="data" visibility="public" type="_r9Su6SxWEeeQ1MfYuQw_Rg" aggregation="composite" association="_r9SurSxWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SupixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SupyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuqCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliOetSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliOutSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuqSxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuqixWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HrliO-tSEeaeZKaHgNOvDw" value="*"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrliPOtSEeaeZKaHgNOvDw"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r9SuqyxWEeeQ1MfYuQw_Rg" value="*"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r9SurCxWEeeQ1MfYuQw_Rg"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrliPetSEeaeZKaHgNOvDw" memberEnd="_HrliNetSEeaeZKaHgNOvDw _HrliPutSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_HrliPutSEeaeZKaHgNOvDw" visibility="public" type="_HrliMOtSEeaeZKaHgNOvDw" association="_HrliPetSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliP-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliQOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliQetSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_r9SurSxWEeeQ1MfYuQw_Rg" memberEnd="_r9SupSxWEeeQ1MfYuQw_Rg _r9SurixWEeeQ1MfYuQw_Rg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_r9SurixWEeeQ1MfYuQw_Rg" visibility="public" type="_r9SuoCxWEeeQ1MfYuQw_Rg" association="_r9SurSxWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SuryxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SusCxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SusSxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliQutSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliQ-tSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SusixWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SusyxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrliROtSEeaeZKaHgNOvDw" name="SparseCubeDataset">
-      <eAnnotations xmi:id="_HrliRetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrliRutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliR-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9SutCxWEeeQ1MfYuQw_Rg" name="DataProduct" isAbstract="true">
+      <eAnnotations xmi:id="_r9SutSxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SutixWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SutyxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <generalization xmi:type="uml:Generalization" xmi:id="_HrliSOtSEeaeZKaHgNOvDw" general="_Hrlhv-tSEeaeZKaHgNOvDw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrliSetSEeaeZKaHgNOvDw" name="cube" visibility="public" type="_HrliWOtSEeaeZKaHgNOvDw" association="_HrliUOtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliSutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliS-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliTOtSEeaeZKaHgNOvDw" value="0"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SuuCxWEeeQ1MfYuQw_Rg" name="coordSys" visibility="public" type="_r9SuVixWEeeQ1MfYuQw_Rg" aggregation="composite" association="_r9SuWixWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SuuSxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuuixWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuuyxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliTetSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliTutSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuvCxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuvSxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HrliT-tSEeaeZKaHgNOvDw" value="*"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r9SuvixWEeeQ1MfYuQw_Rg" value="*"/>
       </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrliUOtSEeaeZKaHgNOvDw" memberEnd="_HrliSetSEeaeZKaHgNOvDw _HrliUetSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_HrliUetSEeaeZKaHgNOvDw" visibility="public" type="_HrliROtSEeaeZKaHgNOvDw" association="_HrliUOtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliUutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliU-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliVOtSEeaeZKaHgNOvDw" value="0"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SuvyxWEeeQ1MfYuQw_Rg" name="mappings" visibility="public" type="_r9SugSxWEeeQ1MfYuQw_Rg" aggregation="composite" association="_r9SuhSxWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SuwCxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuwSxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuwixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliVetSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliVutSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuwyxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuxCxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrliV-tSEeaeZKaHgNOvDw"/>
-      </ownedEnd>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r9SuxSxWEeeQ1MfYuQw_Rg"/>
+      </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrliWOtSEeaeZKaHgNOvDw" name="SparseCube">
-      <eAnnotations xmi:id="_HrliWetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrliWutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliW-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9SuxixWEeeQ1MfYuQw_Rg" name="PixelatedDataProduct" isAbstract="true">
+      <eAnnotations xmi:id="_r9SuxyxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SuyCxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuySxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <generalization xmi:type="uml:Generalization" xmi:id="_HrliXOtSEeaeZKaHgNOvDw" general="_HrliretSEeaeZKaHgNOvDw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrliXetSEeaeZKaHgNOvDw" name="data" visibility="public" type="_Hrli7-tSEeaeZKaHgNOvDw" aggregation="composite" association="_HrliZetSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliXutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliX-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliYOtSEeaeZKaHgNOvDw" value="0"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_r9SuyixWEeeQ1MfYuQw_Rg" general="_r9SutCxWEeeQ1MfYuQw_Rg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SuyyxWEeeQ1MfYuQw_Rg" name="pixelCoordSys" visibility="public" type="_r9SuUixWEeeQ1MfYuQw_Rg" aggregation="composite" association="_r9SuYSxWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SuzCxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SuzSxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SuzixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliYetSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliYutSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SuzyxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su0CxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HrliY-tSEeaeZKaHgNOvDw" value="*"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrliZOtSEeaeZKaHgNOvDw"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrliZetSEeaeZKaHgNOvDw" memberEnd="_HrliXetSEeaeZKaHgNOvDw _HrliZutSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_HrliZutSEeaeZKaHgNOvDw" visibility="public" type="_HrliWOtSEeaeZKaHgNOvDw" association="_HrliZetSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliZ-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliaOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliaetSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliautSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlia-tSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrlibOtSEeaeZKaHgNOvDw" name="DataProduct" isAbstract="true">
-      <eAnnotations xmi:id="_HrlibetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrlibutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlib-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9Su0SxWEeeQ1MfYuQw_Rg" name="PointDataProduct" isAbstract="true">
+      <eAnnotations xmi:id="_r9Su0ixWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9Su0yxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su1CxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrlicOtSEeaeZKaHgNOvDw" name="coordSys" visibility="public" type="_HrlisutSEeaeZKaHgNOvDw" aggregation="composite" association="_HrlihutSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrlicetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlicutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlic-tSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlidOtSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlidetSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HrlidutSEeaeZKaHgNOvDw" value="*"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hrlid-tSEeaeZKaHgNOvDw" name="mappings" visibility="public" type="_HrlixutSEeaeZKaHgNOvDw" aggregation="composite" association="_HrlijetSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrlieOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlieetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlieutSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrlie-tSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlifOtSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrlifetSEeaeZKaHgNOvDw"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrlifutSEeaeZKaHgNOvDw" name="observable" visibility="public" type="_HrljButSEeaeZKaHgNOvDw" aggregation="composite" association="_HrlilOtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrlif-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrligOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrligetSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrligutSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlig-tSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HrlihOtSEeaeZKaHgNOvDw" value="*"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrlihetSEeaeZKaHgNOvDw"/>
-      </ownedAttribute>
+      <generalization xmi:type="uml:Generalization" xmi:id="_r9Su1SxWEeeQ1MfYuQw_Rg" general="_r9SutCxWEeeQ1MfYuQw_Rg"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrlihutSEeaeZKaHgNOvDw" memberEnd="_HrlicOtSEeaeZKaHgNOvDw _Hrlih-tSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Hrlih-tSEeaeZKaHgNOvDw" visibility="public" type="_HrlibOtSEeaeZKaHgNOvDw" association="_HrlihutSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliiOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliietSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliiutSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrlii-tSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlijOtSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrlijetSEeaeZKaHgNOvDw" memberEnd="_Hrlid-tSEeaeZKaHgNOvDw _HrlijutSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_HrlijutSEeaeZKaHgNOvDw" visibility="public" type="_HrlibOtSEeaeZKaHgNOvDw" association="_HrlijetSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrlij-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlikOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliketSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlikutSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlik-tSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrlilOtSEeaeZKaHgNOvDw" memberEnd="_HrlifutSEeaeZKaHgNOvDw _HrliletSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_HrliletSEeaeZKaHgNOvDw" visibility="public" type="_HrlibOtSEeaeZKaHgNOvDw" association="_HrlilOtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrlilutSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrlil-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlimOtSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlimetSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlimutSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Hrlim-tSEeaeZKaHgNOvDw" name="PixelatedDataProduct" isAbstract="true">
-      <eAnnotations xmi:id="_HrlinOtSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrlinetSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlinutSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9Su1ixWEeeQ1MfYuQw_Rg" name="Voxel">
+      <eAnnotations xmi:id="_r9Su1yxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9Su2CxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su2SxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <generalization xmi:type="uml:Generalization" xmi:id="_Hrlin-tSEeaeZKaHgNOvDw" general="_HrlibOtSEeaeZKaHgNOvDw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrlioOtSEeaeZKaHgNOvDw" name="pixelCoordSys" visibility="public" type="_HrlivOtSEeaeZKaHgNOvDw" aggregation="composite" association="_HrliputSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrlioetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlioutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrlio-tSEeaeZKaHgNOvDw" value="0"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_r9Su2ixWEeeQ1MfYuQw_Rg" general="_r9SvGSxWEeeQ1MfYuQw_Rg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9Su2yxWEeeQ1MfYuQw_Rg" name="pixelAxis" visibility="public" type="_r9SvDyxWEeeQ1MfYuQw_Rg" aggregation="composite" association="_r9Su4ixWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9Su3CxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9Su3SxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su3ixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlipOtSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlipetSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9Su3yxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su4CxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r9Su4SxWEeeQ1MfYuQw_Rg" value="*"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrliputSEeaeZKaHgNOvDw" memberEnd="_HrlioOtSEeaeZKaHgNOvDw _Hrlip-tSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Hrlip-tSEeaeZKaHgNOvDw" visibility="public" type="_Hrlim-tSEeaeZKaHgNOvDw" association="_HrliputSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliqOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliqetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliqutSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_r9Su4ixWEeeQ1MfYuQw_Rg" memberEnd="_r9Su2yxWEeeQ1MfYuQw_Rg _r9Su4yxWEeeQ1MfYuQw_Rg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_r9Su4yxWEeeQ1MfYuQw_Rg" visibility="public" type="_r9Su1ixWEeeQ1MfYuQw_Rg" association="_r9Su4ixWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9Su5CxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9Su5SxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su5ixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrliq-tSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlirOtSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9Su5yxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su6CxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrliretSEeaeZKaHgNOvDw" name="PointDataProduct" isAbstract="true">
-      <eAnnotations xmi:id="_HrlirutSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_Hrlir-tSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlisOtSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9Su6SxWEeeQ1MfYuQw_Rg" name="NDPoint">
+      <eAnnotations xmi:id="_r9Su6ixWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9Su6yxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su7CxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <generalization xmi:type="uml:Generalization" xmi:id="_HrlisetSEeaeZKaHgNOvDw" general="_HrlibOtSEeaeZKaHgNOvDw"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_r9Su7SxWEeeQ1MfYuQw_Rg" general="_r9SvGSxWEeeQ1MfYuQw_Rg"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrlisutSEeaeZKaHgNOvDw" name="CoordSys">
-      <eAnnotations xmi:id="_Hrlis-tSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrlitOtSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlitetSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_r9Su7ixWEeeQ1MfYuQw_Rg" name="NDCube V1.0 (2017)">
+      <eAnnotations xmi:id="_r9Su7yxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9Su8CxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su8SxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrlitutSEeaeZKaHgNOvDw" name="instref" visibility="public" type="_HrlhzOtSEeaeZKaHgNOvDw" association="_Hrlh2OtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrlit-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliuOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliuetSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrliuutSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrliu-tSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrlivOtSEeaeZKaHgNOvDw" name="PixelCoordSys">
-      <eAnnotations xmi:id="_HrlivetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrlivutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrliv-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9Su8ixWEeeQ1MfYuQw_Rg" name="Observable">
+      <eAnnotations xmi:id="_r9Su8yxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9Su9CxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su9SxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrliwOtSEeaeZKaHgNOvDw" name="instref" visibility="public" type="_Hrlh1OtSEeaeZKaHgNOvDw" association="_Hrlh4OtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrliwetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrliwutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrliw-tSEeaeZKaHgNOvDw" value="0"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_r9Su9ixWEeeQ1MfYuQw_Rg" general="_r9SvBSxWEeeQ1MfYuQw_Rg"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9Su9yxWEeeQ1MfYuQw_Rg" name="instance" visibility="public" type="_r9SudSxWEeeQ1MfYuQw_Rg" aggregation="composite" association="_r9Su_ixWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9Su-CxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9Su-SxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su-ixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlixOtSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlixetSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9Su-yxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9Su_CxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r9Su_SxWEeeQ1MfYuQw_Rg"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrlixutSEeaeZKaHgNOvDw" name="Mappings">
-      <eAnnotations xmi:id="_Hrlix-tSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrliyOtSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrliyetSEeaeZKaHgNOvDw" value="0"/>
-        </contents>
-      </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrliyutSEeaeZKaHgNOvDw" name="instref" visibility="public" type="_HrliEOtSEeaeZKaHgNOvDw" association="_HrliFOtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrliy-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrlizOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrlizetSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_r9Su_ixWEeeQ1MfYuQw_Rg" memberEnd="_r9Su9yxWEeeQ1MfYuQw_Rg _r9Su_yxWEeeQ1MfYuQw_Rg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_r9Su_yxWEeeQ1MfYuQw_Rg" visibility="public" type="_r9Su8ixWEeeQ1MfYuQw_Rg" association="_r9Su_ixWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SvACxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SvASxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvAixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrlizutSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrliz-tSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Hrli0OtSEeaeZKaHgNOvDw" name="Voxel">
-      <eAnnotations xmi:id="_Hrli0etSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_Hrli0utSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli0-tSEeaeZKaHgNOvDw" value="0"/>
-        </contents>
-      </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hrli1OtSEeaeZKaHgNOvDw" name="pixelAxis" visibility="public" type="_HrljIutSEeaeZKaHgNOvDw" aggregation="composite" association="_Hrli4etSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrli1etSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrli1utSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli1-tSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrli2OtSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli2etSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hrli2utSEeaeZKaHgNOvDw" value="*"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hrli2-tSEeaeZKaHgNOvDw" name="dependentAxis" visibility="public" type="_HrljLOtSEeaeZKaHgNOvDw" aggregation="composite" association="_Hrli6OtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrli3OtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrli3etSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli3utSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrli3-tSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli4OtSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Hrli4etSEeaeZKaHgNOvDw" memberEnd="_Hrli1OtSEeaeZKaHgNOvDw _Hrli4utSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Hrli4utSEeaeZKaHgNOvDw" visibility="public" type="_Hrli0OtSEeaeZKaHgNOvDw" association="_Hrli4etSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrli4-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrli5OtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli5etSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrli5utSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli5-tSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Hrli6OtSEeaeZKaHgNOvDw" memberEnd="_Hrli2-tSEeaeZKaHgNOvDw _Hrli6etSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Hrli6etSEeaeZKaHgNOvDw" visibility="public" type="_Hrli0OtSEeaeZKaHgNOvDw" association="_Hrli6OtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrli6utSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrli6-tSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli7OtSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrli7etSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli7utSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SvAyxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvBCxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Hrli7-tSEeaeZKaHgNOvDw" name="NDPoint">
-      <eAnnotations xmi:id="_Hrli8OtSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_Hrli8etSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli8utSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9SvBSxWEeeQ1MfYuQw_Rg" name="DataAxis" isAbstract="true">
+      <eAnnotations xmi:id="_r9SvBixWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SvByxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvCCxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Hrli8-tSEeaeZKaHgNOvDw" name="axis" visibility="public" type="_HrljEOtSEeaeZKaHgNOvDw" aggregation="composite" association="_Hrli--tSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrli9OtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrli9etSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli9utSEeaeZKaHgNOvDw" value="0"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SvCSxWEeeQ1MfYuQw_Rg" name="dependent" visibility="public" type="_r9St8CxWEeeQ1MfYuQw_Rg" isUnique="false">
+        <eAnnotations xmi:id="_r9SvCixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SvCyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvDCxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_Hrli9-tSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli-OtSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SvDSxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvDixWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hrli-etSEeaeZKaHgNOvDw" value="*"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hrli-utSEeaeZKaHgNOvDw"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Hrli--tSEeaeZKaHgNOvDw" memberEnd="_Hrli8-tSEeaeZKaHgNOvDw _Hrli_OtSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Hrli_OtSEeaeZKaHgNOvDw" visibility="public" type="_Hrli7-tSEeaeZKaHgNOvDw" association="_Hrli--tSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_Hrli_etSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_Hrli_utSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Hrli_-tSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrljAOtSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljAetSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_HrljAutSEeaeZKaHgNOvDw" name="NDCube V1.0 (2016)">
-      <eAnnotations xmi:id="_HrljA-tSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrljBOtSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljBetSEeaeZKaHgNOvDw" value="0"/>
-        </contents>
-      </eAnnotations>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrljButSEeaeZKaHgNOvDw" name="Observable">
-      <eAnnotations xmi:id="_HrljB-tSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrljCOtSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljCetSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9SvDyxWEeeQ1MfYuQw_Rg" name="PixelAxis">
+      <eAnnotations xmi:id="_r9SvECxWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SvESxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvEixWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrljCutSEeaeZKaHgNOvDw" name="instref" visibility="public" type="_Hrlh7OtSEeaeZKaHgNOvDw" association="_Hrlh-OtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrljC-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrljDOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljDetSEeaeZKaHgNOvDw" value="0"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SvEyxWEeeQ1MfYuQw_Rg" name="coord" visibility="public" type="_r9SucCxWEeeQ1MfYuQw_Rg" isUnique="false">
+        <eAnnotations xmi:id="_r9SvFCxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SvFSxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvFixWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrljDutSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljD-tSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SvFyxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvGCxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrljEOtSEeaeZKaHgNOvDw" name="DataAxis">
-      <eAnnotations xmi:id="_HrljEetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrljEutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljE-tSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9SvGSxWEeeQ1MfYuQw_Rg" name="DataElement" isAbstract="true">
+      <eAnnotations xmi:id="_r9SvGixWEeeQ1MfYuQw_Rg" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_r9SvGyxWEeeQ1MfYuQw_Rg" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvHCxWEeeQ1MfYuQw_Rg" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrljFOtSEeaeZKaHgNOvDw" name="observable" visibility="public" type="_HrljButSEeaeZKaHgNOvDw" association="_HrljGutSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrljFetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrljFutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljF-tSEeaeZKaHgNOvDw" value="0"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_r9SvHSxWEeeQ1MfYuQw_Rg" name="axis" visibility="public" type="_r9SvBSxWEeeQ1MfYuQw_Rg" aggregation="composite" association="_r9SvJSxWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SvHixWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SvHyxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvICxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrljGOtSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljGetSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SvISxWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvIixWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r9SvIyxWEeeQ1MfYuQw_Rg" value="*"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r9SvJCxWEeeQ1MfYuQw_Rg"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrljGutSEeaeZKaHgNOvDw" memberEnd="_HrljFOtSEeaeZKaHgNOvDw _HrljG-tSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_HrljG-tSEeaeZKaHgNOvDw" visibility="public" type="_HrljEOtSEeaeZKaHgNOvDw" association="_HrljGutSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrljHOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrljHetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljHutSEeaeZKaHgNOvDw" value="0"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_r9SvJSxWEeeQ1MfYuQw_Rg" memberEnd="_r9SvHSxWEeeQ1MfYuQw_Rg _r9SvJixWEeeQ1MfYuQw_Rg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_r9SvJixWEeeQ1MfYuQw_Rg" visibility="public" type="_r9SvGSxWEeeQ1MfYuQw_Rg" association="_r9SvJSxWEeeQ1MfYuQw_Rg">
+        <eAnnotations xmi:id="_r9SvJyxWEeeQ1MfYuQw_Rg" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_r9SvKCxWEeeQ1MfYuQw_Rg" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvKSxWEeeQ1MfYuQw_Rg" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrljH-tSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljIOtSEeaeZKaHgNOvDw" value="read_write"/>
+          <contents xmi:type="uml:Property" xmi:id="_r9SvKixWEeeQ1MfYuQw_Rg" name="AccessMode">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_r9SvKyxWEeeQ1MfYuQw_Rg" value="read_write"/>
           </contents>
         </eAnnotations>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrljIetSEeaeZKaHgNOvDw"/>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrljIutSEeaeZKaHgNOvDw" name="PixelAxis">
-      <eAnnotations xmi:id="_HrljI-tSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrljJOtSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljJetSEeaeZKaHgNOvDw" value="0"/>
-        </contents>
-      </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrljJutSEeaeZKaHgNOvDw" name="pixelCoord" visibility="public" type="_Hrlh9OtSEeaeZKaHgNOvDw" association="_HrliAOtSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrljJ-tSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrljKOtSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljKetSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrljKutSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljK-tSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_HrljLOtSEeaeZKaHgNOvDw" name="DependentAxis">
-      <eAnnotations xmi:id="_HrljLetSEeaeZKaHgNOvDw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_HrljLutSEeaeZKaHgNOvDw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljL-tSEeaeZKaHgNOvDw" value="0"/>
-        </contents>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_r9St0CxWEeeQ1MfYuQw_Rg" xmi:id="_sTAfICxWEeeQ1MfYuQw_Rg">
+      <eAnnotations xmi:id="_sTAfISxWEeeQ1MfYuQw_Rg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_r_H51yxWEeeQ1MfYuQw_Rg"/>
       </eAnnotations>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HrljMOtSEeaeZKaHgNOvDw" name="observable" visibility="public" type="_HrljButSEeaeZKaHgNOvDw" association="_HrljNutSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrljMetSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrljMutSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljM-tSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrljNOtSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljNetSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_HrljNutSEeaeZKaHgNOvDw" memberEnd="_HrljMOtSEeaeZKaHgNOvDw _HrljN-tSEeaeZKaHgNOvDw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_HrljN-tSEeaeZKaHgNOvDw" visibility="public" type="_HrljLOtSEeaeZKaHgNOvDw" association="_HrljNutSEeaeZKaHgNOvDw">
-        <eAnnotations xmi:id="_HrljOOtSEeaeZKaHgNOvDw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_HrljOetSEeaeZKaHgNOvDw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljOutSEeaeZKaHgNOvDw" value="0"/>
-          </contents>
-          <contents xmi:type="uml:Property" xmi:id="_HrljO-tSEeaeZKaHgNOvDw" name="AccessMode">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HrljPOtSEeaeZKaHgNOvDw" value="read_write"/>
-          </contents>
-        </eAnnotations>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HrljPetSEeaeZKaHgNOvDw"/>
-      </ownedEnd>
-    </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_HrlhUOtSEeaeZKaHgNOvDw" xmi:id="_H0rL4OtSEeaeZKaHgNOvDw">
-      <eAnnotations xmi:id="_H0rL4etSEeaeZKaHgNOvDw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_Hr4cR-tSEeaeZKaHgNOvDw"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_sTAfICxWEeeQ1MfYuQw_Rg" href="IVOA_UML_Profile.profile.xmi#_r_H50CxWEeeQ1MfYuQw_Rg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_r9St0CxWEeeQ1MfYuQw_Rg" xmi:id="_sTAfIixWEeeQ1MfYuQw_Rg">
+      <eAnnotations xmi:id="_sTAfIyxWEeeQ1MfYuQw_Rg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="default.profile.xmi#_sKTPFyxWEeeQ1MfYuQw_Rg"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_H0rL4OtSEeaeZKaHgNOvDw" href="IVOA_UML_Profile.profile.xmi#_Hr4cQOtSEeaeZKaHgNOvDw"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_sTAfIixWEeeQ1MfYuQw_Rg" href="default.profile.xmi#_sKTPECxWEeeQ1MfYuQw_Rg"/>
     </profileApplication>
   </uml:Model>
-  <IVOA_UML_Profile:model xmi:id="_H0-G0OtSEeaeZKaHgNOvDw" base_Package="_HrlhUOtSEeaeZKaHgNOvDw" title="IVOA N-Dimensional Cube Model" version="1.0" authors="Mark Cresitello-Dittmar, Doug Tody, Francois Bonnarel, Omar Laurino, Mireille Louys, Arnold Rots, Jose Enrique Ruiz, Jesus Salgado, and the IVOA Data Model Working Group"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_H0-G0etSEeaeZKaHgNOvDw" base_Package="_HrlhV-tSEeaeZKaHgNOvDw" name="ivoa" version="1.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_H0-G0utSEeaeZKaHgNOvDw" base_Package="_Hrlht-tSEeaeZKaHgNOvDw" name="ds" version="1.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_H0-G0-tSEeaeZKaHgNOvDw" base_NamedElement="_Hrlhv-tSEeaeZKaHgNOvDw" vodmlid="experiment.ObsDataset"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_H0-G1OtSEeaeZKaHgNOvDw" base_NamedElement="_HrlhxOtSEeaeZKaHgNOvDw" vodmlid="Dataset"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_H0-G1etSEeaeZKaHgNOvDw" base_Package="_HrlhyOtSEeaeZKaHgNOvDw" name="coordsys" version="2.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_H0-G1utSEeaeZKaHgNOvDw" base_NamedElement="_HrlhzOtSEeaeZKaHgNOvDw" vodmlid="CoordSys"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_H0-G1-tSEeaeZKaHgNOvDw" base_NamedElement="_Hrlh1OtSEeaeZKaHgNOvDw" vodmlid="PixelCoordSystem"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_H0-G2OtSEeaeZKaHgNOvDw" base_Package="_Hrlh6OtSEeaeZKaHgNOvDw" name="coords" version="2.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_H0-G2etSEeaeZKaHgNOvDw" base_NamedElement="_Hrlh7OtSEeaeZKaHgNOvDw" vodmlid="DerivedCoordinate"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_H0-G2utSEeaeZKaHgNOvDw" base_NamedElement="_Hrlh9OtSEeaeZKaHgNOvDw" vodmlid="domain.pixel.Pixel"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_H0-G2-tSEeaeZKaHgNOvDw" base_Package="_HrliCOtSEeaeZKaHgNOvDw" name="trans" version="2.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_H0-G3OtSEeaeZKaHgNOvDw" base_NamedElement="_HrliEOtSEeaeZKaHgNOvDw" vodmlid="Mappings"/>
+  <IVOA_UML_Profile:model xmi:id="_sTKQICxWEeeQ1MfYuQw_Rg" base_Package="_r9St0CxWEeeQ1MfYuQw_Rg" title="IVOA N-Dimensional Cube Model" version="1.0" authors="Mark Cresitello-Dittmar, Doug Tody, Francois Bonnarel, Omar Laurino, Mireille Louys, Arnold Rots, Jose Enrique Ruiz, Jesus Salgado, and the IVOA Data Model Working Group"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_sTKQISxWEeeQ1MfYuQw_Rg" base_Package="_r9St2SxWEeeQ1MfYuQw_Rg" name="ivoa" version="1.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_sTKQIixWEeeQ1MfYuQw_Rg" base_Package="_r9SuOSxWEeeQ1MfYuQw_Rg" name="ds" version="1.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_sTKQIyxWEeeQ1MfYuQw_Rg" base_NamedElement="_r9SuQSxWEeeQ1MfYuQw_Rg" vodmlid="experiment.ObsDataset"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_sTKQJCxWEeeQ1MfYuQw_Rg" base_NamedElement="_r9SuRixWEeeQ1MfYuQw_Rg" vodmlid="Dataset"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_sTKQJSxWEeeQ1MfYuQw_Rg" base_Package="_r9SuSixWEeeQ1MfYuQw_Rg" name="coords" version="2.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_sTKQJixWEeeQ1MfYuQw_Rg" base_NamedElement="_r9SuUixWEeeQ1MfYuQw_Rg" vodmlid="PixelCoordSystem"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_sTKQJyxWEeeQ1MfYuQw_Rg" base_NamedElement="_r9SuVixWEeeQ1MfYuQw_Rg" vodmlid="CoordSys"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_sTKQKCxWEeeQ1MfYuQw_Rg" base_Package="_r9SuaCxWEeeQ1MfYuQw_Rg" name="meas" version="2.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/meas/STCMeas-2.0.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_sTKQKSxWEeeQ1MfYuQw_Rg" base_NamedElement="_r9SudSxWEeeQ1MfYuQw_Rg" vodmlid="CoordMeasure"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_sTKQKixWEeeQ1MfYuQw_Rg" base_Package="_r9SueSxWEeeQ1MfYuQw_Rg" name="trans" version="2.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_sTKQKyxWEeeQ1MfYuQw_Rg" base_NamedElement="_r9SugSxWEeeQ1MfYuQw_Rg" vodmlid="Mappings"/>
+  <default:subset xmi:id="_sTKQLCxWEeeQ1MfYuQw_Rg" base_Constraint="_r9St1yxWEeeQ1MfYuQw_Rg"/>
 </xmi:XMI>


More information about the Volutecommits mailing list