allow multiple Plane.energy.bandpassName

redefine MultiPolygon in DALI-1.2 style; add direct reference in Plane.position
opencadc · Aug 7, 2024 · 3c6df65 · 3c6df65
1 parent 9ebe7b5
commit 3c6df65
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 63 deletions.
diff --git a/src/main/resources/CAOM-current-vodml.xml b/src/main/resources/CAOM-current-vodml.xml
@@ -191,27 +191,6 @@
             </literal>
         </enumeration>
 
-        <enumeration>
-            <vodml-id>SegmentType</vodml-id>
-            <name>SegmentType</name>
-            <description>code used in CAG description of polygons</description>
-            <literal>
-                <vodml-id>SegmentType.LINE</vodml-id>
-                <name>LINE</name>
-                <description>(0) line from previous to this vertex</description>
-            </literal>
-            <literal>
-                <vodml-id>SegmentType.MOVE</vodml-id>
-                <name>MOVE</name>
-                <description>(1) move from previous to this vertex</description>
-            </literal>
-            <literal>
-                <vodml-id>SegmentType.CLOSE</vodml-id>
-                <name>CLOSE</name>
-                <description>(2) line from previous vertex to last vertex with type MOVE</description>
-            </literal>
-        </enumeration>
-
         <enumeration>
             <vodml-id>ReleaseType</vodml-id>
             <name>ReleaseType</name>
@@ -2092,6 +2071,18 @@
                     <maxOccurs>1</maxOccurs>
                 </multiplicity>
             </attribute>
+            <attribute>
+                <vodml-id>Position.samples</vodml-id>
+                <name>samples</name>
+                <description>detailed sub-samples of the bounds</description>
+                <datatype>
+                    <vodml-ref>caom2:MultiPolygon</vodml-ref>
+                </datatype>
+                <multiplicity>
+                    <minOccurs>1</minOccurs>
+                    <maxOccurs>1</maxOccurs>
+                </multiplicity>
+            </attribute>
             <attribute>
                 <vodml-id>Position.minBounds</vodml-id>
                 <name>minBounds</name>
@@ -2310,13 +2301,14 @@
             <attribute>
                 <vodml-id>Energy.bandpassName</vodml-id>
                 <name>bandpassName</name>
-                <description>telescope- and instrument-specific name for the energy band included</description>
+                <description>telescope- and instrument-specific name for the energy band(s) included; multiple bands may be
+                    included if energies from all specified bands are included in the data (in the sense of union)</description>
                 <datatype>
                     <vodml-ref>ivoa:string</vodml-ref>
                 </datatype>
                 <multiplicity>
                     <minOccurs>0</minOccurs>
-                    <maxOccurs>1</maxOccurs>
+                    <maxOccurs>-1</maxOccurs>
                 </multiplicity>
             </attribute>
             <attribute>
@@ -2592,26 +2584,7 @@
                     </multiplicity>
                 </attribute>
             </dataType>
-            <dataType>
-                <vodml-id>Vertex</vodml-id>
-                <name>Vertex</name>
-                <extends>
-                    <vodml-ref>caom2:Point</vodml-ref>
-                </extends>
-                <attribute>
-                    <vodml-id>Vertex.type</vodml-id>
-                    <name>type</name>
-                    <datatype>
-                        <vodml-ref>caom2:SegmentType</vodml-ref>
-                    </datatype>
-                    <multiplicity>
-                        <minOccurs>1</minOccurs>
-                        <maxOccurs>1</maxOccurs>
-                    </multiplicity>
-                </attribute>
-
-            </dataType>
-
+
             <dataType abstract="true">
                 <vodml-id>Shape</vodml-id>
                 <name>Shape</name>
@@ -2652,17 +2625,16 @@
             <dataType>
                 <vodml-id>MultiPolygon</vodml-id>
                 <name>MultiPolygon</name>
-                <description>a region on the sky defined a sequence of points connected by great-circle segments; each simple polygon is
-                is terminated by a special type of vertex and multiple simple polygons are permitted to describe disconnected regions as
-                a single value</description>
+                <description>multiple simple polygons describing disconnected regions as a single value; each simple polygon is
+                is separated by a special type of point (see DALI-1.2)</description>
                 <attribute>
-                    <vodml-id>MultiPolygon.vertices</vodml-id>
+                    <vodml-id>MultiPolygon.polygons</vodml-id>
                     <name>vertices</name>
                     <datatype>
-                        <vodml-ref>caom2:Vertex</vodml-ref>
+                        <vodml-ref>caom2:Polygon</vodml-ref>
                     </datatype>
                     <multiplicity>
-                        <minOccurs>3</minOccurs>
+                        <minOccurs>1</minOccurs>
                         <maxOccurs>-1</maxOccurs>
                     </multiplicity>
                 </attribute>
@@ -2686,17 +2658,6 @@
                         <maxOccurs>-1</maxOccurs>
                     </multiplicity>
                 </attribute>
-                <attribute>
-                    <vodml-id>Polygon.samples</vodml-id>
-                    <name>samples</name>
-                    <datatype>
-                        <vodml-ref>caom2:MultiPolygon</vodml-ref>
-                    </datatype>
-                    <multiplicity>
-                        <minOccurs>1</minOccurs>
-                        <maxOccurs>1</maxOccurs>
-                    </multiplicity>
-                </attribute>
             </dataType>
 
             <dataType>

diff --git a/src/main/resources/draft-CAOM-2.5.png b/src/main/resources/draft-CAOM-2.5.png
diff --git a/src/uml/CAOM.zargo b/src/uml/CAOM.zargo
diff --git a/src/uml/merge-uml-pngs.sh b/src/uml/merge-uml-pngs.sh
@@ -2,9 +2,9 @@
 
 ## complete list
 #convert -append CAOM1core.png CAOM2datatypes.png CAOM3wcs.png CAOM4entities.png CAOM5vocabularies.png \
-	draft-CAOM-2.5.png
+#	draft-CAOM-2.5.png
 
 ## only changes
-convert -append CAOM1core.png CAOM4entities.png CAOM5vocabularies.png \
-        draft-CAOM-2.5.png
+magick CAOM1core.png CAOM2datatypes.png CAOM4entities.png CAOM5vocabularies.png \
+        -append draft-CAOM-2.5.png