From 11b8b57f084befb6dcf25b04bfd10b0c780de906 Mon Sep 17 00:00:00 2001
From: SaintierFr <99645240+SaintierFr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:48:06 +0200
Subject: [PATCH] 142 compas core update xsd file (#143)

* Issue #142: Update SCL_CoMPAS.xsd file and its consequencies (tSclFileType type in scl-extensions.xjb file)

Signed-off-by: SAINTIER FRANCOIS <francois.saintier@rte-france.com>

* Issue #142: Second update of SCL_CoMPAS.xsd file

Signed-off-by: SAINTIER FRANCOIS <francois.saintier@rte-france.com>

* Issue #142: Third update of SCL_CoMPAS.xsd file  (correction of the mistakes in sclName and SclFileType). Revert the modification done in scl-extensions.xjb

Signed-off-by: SAINTIER FRANCOIS <francois.saintier@rte-france.com>
Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>
---
 .../src/main/resources/xsd/SCL_CoMPAS.xsd     | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
index 42f88ab..140c067 100644
--- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
+++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
@@ -13,6 +13,7 @@ SPDX-License-Identifier: Apache-2.0
         <xs:documentation xml:lang="en">
             Version 1.0 Release 2021/06/16
             Version 1.1 Release 2022/01/21
+            Version 1.2 Release 2022/06/08
         </xs:documentation>
     </xs:annotation>
 
@@ -150,12 +151,24 @@ SPDX-License-Identifier: Apache-2.0
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:enumeration value="BAY_EXTERNAL"/>
             <xs:enumeration value="BAY_INTERNAL"/>
-            <xs:enumeration value="BAY_INTERNAL_EXTERNAL"/>
+            <xs:enumeration value="BAY_EXTERNAL"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="tCompasTopoNodeDirection">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">
+                Define if a Node Direction is Up or Down
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Up"/>
+            <xs:enumeration value="Down"/>
         </xs:restriction>
     </xs:simpleType>
 
+
     <xs:complexType name="tCompasFlow">
         <xs:annotation>
             <xs:documentation xml:lang="en">
@@ -182,23 +195,14 @@ SPDX-License-Identifier: Apache-2.0
                 The BayCodif is specific to each user to identify the bay kind.
             </xs:documentation>
         </xs:annotation>
-        <xs:attribute name="BayCodif" type="xs:string" use="optional"/>
         <xs:attribute name="UUID" type="xs:string" use="optional"/>
+        <xs:attribute name="Indice" type="xs:string" use="optional"/>
         <xs:attribute name="Version" type="xs:string" use="optional"/>
         <xs:attribute name="MainLabel" type="xs:string" use="optional"/>
         <xs:attribute name="SecondLabel" type="xs:string" use="optional"/>
-        <xs:attribute name="NumBay" type="xs:string" use="optional"/>
-        <xs:attribute name="ZoneNumber" type="xs:string" use="optional"/>
-    </xs:complexType>
-
-    <xs:complexType name="tCompasConnectivityNode">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">
-                Define the specific busbarsection or zone of the connectivity node
-            </xs:documentation>
-        </xs:annotation>
-        <xs:attribute name="UUID" type="xs:string" use="optional"/>
-        <xs:attribute name="ZoneNumber" type="xs:string" use="optional"/>
+        <xs:attribute name="BayCodif" type="xs:string" use="optional"/>
+        <xs:attribute name="NumBay" type="xs:integer" use="optional"/>
+        <xs:attribute name="BayCount" type="xs:integer" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="tCompasICDHeader" mixed="true">
@@ -263,14 +267,27 @@ SPDX-License-Identifier: Apache-2.0
         <xs:attribute name="CriteriaAssociationID" type="xs:string" use="optional"/>
     </xs:complexType>
 
+    <xs:complexType name="tCompasTopo">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">
+                Describe the connectivity node and layout order for a given Bay;can be multiple instanciated in case of bay which is connected to multiple nodes
+            </xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="Node" type="xs:string" use="required"/>
+        <xs:attribute name="NodeOrder" type="xs:integer" use="required"/>
+        <xs:attribute name="Direction" type="tCompasTopoNodeDirection" use="required"/>
+    </xs:complexType>
+
+
     <xs:element name="SclName" type="tCompasSclName"/>
     <xs:element name="SclFileType" type="tCompasSclFileType"/>
     <xs:element name="Flow" type="tCompasFlow"/>
-    <xs:element name="ConnectivityNode" type="tCompasConnectivityNode"/>
     <xs:element name="Bay" type="tCompasBay"/>
     <xs:element name="LDevice" type="tCompasLDevice"/>
     <xs:element name="Criteria" type="tCompasCriteria"/>
     <xs:element name="ICDHeader" type="tCompasICDHeader"/>
     <xs:element name="SystemVersion" type="tCompasSystemVersion"/>
     <xs:element name="Function" type="tCompasFunction"/>
-</xs:schema>
+    <xs:element name="Topo" type="tCompasTopo"/>
+
+</xs:schema>
\ No newline at end of file