Revert "reuse iidm:TerminalRef"

This reverts commit eb47953. Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
powsybl · Nov 14, 2023 · 0f2f73b · 0f2f73b
1 parent 0312d75
commit 0f2f73b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/iidm/iidm-xml-converter/src/main/resources/xsd/referencePriorities.xsd b/iidm/iidm-xml-converter/src/main/resources/xsd/referencePriorities.xsd
@@ -10,21 +10,19 @@
 <xs:schema version="1.0"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11"
-           xmlns:refpri="http://www.powsybl.org/schema/iidm/ext/reference_priorities/1_0"
            targetNamespace="http://www.powsybl.org/schema/iidm/ext/reference_priorities/1_0"
            elementFormDefault="qualified">
     <xs:import namespace="http://www.powsybl.org/schema/iidm/1_11" schemaLocation="iidm_V1_11.xsd"/>
-    <xs:complexType name="TerminalReferencePriority">
-        <xs:complexContent>
-            <xs:extension base="iidm:TerminalRef">
-                <xs:attribute name="priority" use="required" type="xs:nonNegativeInteger"/>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
     <xs:element name="referencePriorities">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="referencePriority"  minOccurs="0" maxOccurs="unbounded" type="refpri:TerminalReferencePriority"/>
+                <xs:element name="referencePriority"  minOccurs="0" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:attribute name="id" use="required" type="iidm:nonEmptyString"/>
+                        <xs:attribute name="side" type="iidm:Side"/>
+                        <xs:attribute name="priority" use="required" type="xs:nonNegativeInteger"/>
+                    </xs:complexType>
+                </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/iidm/iidm-xml-converter/src/main/resources/xsd/referenceTerminals.xsd b/iidm/iidm-xml-converter/src/main/resources/xsd/referenceTerminals.xsd
@@ -16,7 +16,12 @@
     <xs:element name="referenceTerminals">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="referenceTerminal" minOccurs="0" maxOccurs="unbounded" type="iidm:TerminalRef"/>
+                <xs:element name="referenceTerminal"  minOccurs="0" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:attribute name="id" use="required" type="iidm:nonEmptyString"/>
+                        <xs:attribute name="side" type="iidm:Side"/>
+                    </xs:complexType>
+                </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>