use proper CIM namespace in kind of regulating control and control area

Signed-off-by: Luma <zamarrenolm@aia.es>
powsybl · Mar 4, 2022 · f53aa5f · f53aa5f
1 parent f4c479c
commit f53aa5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...-conversion/src/main/java/com/powsybl/cgmes/conversion/export/elements/ControlAreaEq.java b/...-conversion/src/main/java/com/powsybl/cgmes/conversion/export/elements/ControlAreaEq.java
@@ -18,7 +18,7 @@
  * @author Marcos de Miguel <demiguelm at aia.es>
  */
 public final class ControlAreaEq {
-    private static final String CONTROL_AREA_TYPE = "http://iec.ch/TC57/2013/CIM-schema-cim16#ControlAreaTypeKind.Interchange";
+    private static final String CONTROL_AREA_TYPE = "ControlAreaTypeKind.Interchange";
 
     public static void write(String id, String controlAreaName, String energyIdentificationCodeEIC, String cimNamespace, XMLStreamWriter writer) throws XMLStreamException {
         writer.writeStartElement(cimNamespace, "ControlArea");
@@ -30,7 +30,7 @@ public static void write(String id, String controlAreaName, String energyIdentif
         writer.writeCharacters(energyIdentificationCodeEIC);
         writer.writeEndElement();
         writer.writeEmptyElement(cimNamespace, "ControlArea.type");
-        writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, CONTROL_AREA_TYPE);
+        writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, cimNamespace + CONTROL_AREA_TYPE);
         writer.writeEndElement();
     }
 

diff --git a/...rsion/src/main/java/com/powsybl/cgmes/conversion/export/elements/RegulatingControlEq.java b/...rsion/src/main/java/com/powsybl/cgmes/conversion/export/elements/RegulatingControlEq.java
@@ -18,7 +18,7 @@
  */
 public final class RegulatingControlEq {
 
-    public static final String REGULATING_CONTROL_VOLTAGE = "http://iec.ch/TC57/2013/CIM-schema-cim16#RegulatingControlModeKind.voltage";
+    public static final String REGULATING_CONTROL_VOLTAGE = "RegulatingControlModeKind.voltage";
 
     public static void write(String id, String regulatingControlName, String terminalId, String cimNamespace, XMLStreamWriter writer) throws XMLStreamException {
         writer.writeStartElement(cimNamespace, "RegulatingControl");
@@ -29,7 +29,7 @@ public static void write(String id, String regulatingControlName, String termina
         writer.writeEmptyElement(cimNamespace, "RegulatingControl.Terminal");
         writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, "#" + terminalId);
         writer.writeEmptyElement(cimNamespace, "RegulatingControl.mode");
-        writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, REGULATING_CONTROL_VOLTAGE);
+        writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, cimNamespace + REGULATING_CONTROL_VOLTAGE);
         writer.writeEndElement();
     }