@enervance/insight-cim-model 0.0.77 → 0.0.79

package/dist/model/core/VoltageLevel.js

@@ -3,17 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoltageLevel = void 0;
 const EquipmentContainer_1 = require("../core/EquipmentContainer.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-const utils_1 = require("../../util/utils.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const xml_serializer_2 = require("../../util/xml/xml.serializer.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
-    substation;
-    substationUUID;
-    baseVoltage;
-    baseVoltageUUID;
-    bays;
-    highVoltageLimit;
-    lowVoltageLimit;
     constructor(uuid, name, shortName, description, baseIRI) {
         super(uuid, name, shortName, description, baseIRI);
         this.bays = [];
@@ -42,27 +34,6 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
     addBay(bay) {
         this.bays.push(bay);
     }
-    static sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (STRAFTER(str(?vlUUID), '#_') AS ?uuid)  
-                (CONCAT(STRBEFORE(str(?vlUUID), '#_'), '#_') AS ?baseIRI) 
-                ?name (STRAFTER(str(?sUUID), '#_') AS ?substationUUID) (STRAFTER(str(?bvUUID), '#_') AS ?baseVoltageUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-                OPTIONAL{?vlUUID rdf:type cim:VoltageLevel .}
-                OPTIONAL{?vlUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?vlUUID cim:VoltageLevel.Substation ?sUUID .}
-                OPTIONAL{?vlUUID cim:VoltageLevel.BaseVoltage ?bvUUID .}
-            }
-        }
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return VoltageLevel.sparqlQuery.replace('<http://default/>', graphURI);
@@ -70,7 +41,8 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
         return VoltageLevel.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        var _a, _b;
+        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
             const voltageLevel = new VoltageLevel();
             voltageLevel.resolveAttributesFusekiJSON(value);
             cimModel.addVoltageLevel(voltageLevel);
@@ -79,9 +51,9 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
         //BaseVoltage
-        this.baseVoltageUUID = (0, utils_1.getValue)(value, 'baseVoltageUUID');
+        this.baseVoltageUUID = parser_utils_1.ParserUtils.getValue(value, 'baseVoltageUUID');
         //substation
-        this.substationUUID = (0, utils_1.getValue)(value, 'substationUUID');
+        this.substationUUID = parser_utils_1.ParserUtils.getValue(value, 'substationUUID');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -120,7 +92,7 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            (0, xml_serializer_2.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -138,12 +110,12 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
             if (this.substation) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'VoltageLevel.Substation', rdf_xml_1.RDF_XML.CIM_NS_16);
-                (0, xml_serializer_2.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.substation.mrid}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.substation.mrid}`);
                 xmlWriter.endElement();
             }
             else if (this.substationUUID) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'VoltageLevel.Substation', rdf_xml_1.RDF_XML.CIM_NS_16);
-                (0, xml_serializer_2.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.substationUUID}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.substationUUID}`);
                 xmlWriter.endElement();
             }
             else {
@@ -151,12 +123,12 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
             }
             if (this.baseVoltage) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'VoltageLevel.BaseVoltage', rdf_xml_1.RDF_XML.CIM_NS_16);
-                (0, xml_serializer_2.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.baseVoltage.mrid}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.baseVoltage.mrid}`);
                 xmlWriter.endElement();
             }
             else if (this.baseVoltageUUID) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'VoltageLevel.BaseVoltage', rdf_xml_1.RDF_XML.CIM_NS_16);
-                (0, xml_serializer_2.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.baseVoltageUUID}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.baseVoltageUUID}`);
                 xmlWriter.endElement();
             }
             else {
@@ -169,4 +141,25 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.VoltageLevel = VoltageLevel;
+VoltageLevel.sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (STRAFTER(str(?vlUUID), '#_') AS ?uuid)  
+                (CONCAT(STRBEFORE(str(?vlUUID), '#_'), '#_') AS ?baseIRI) 
+                ?name (STRAFTER(str(?sUUID), '#_') AS ?substationUUID) (STRAFTER(str(?bvUUID), '#_') AS ?baseVoltageUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+                OPTIONAL{?vlUUID rdf:type cim:VoltageLevel .}
+                OPTIONAL{?vlUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?vlUUID cim:VoltageLevel.Substation ?sUUID .}
+                OPTIONAL{?vlUUID cim:VoltageLevel.BaseVoltage ?bvUUID .}
+            }
+        }
+    `;
 //# sourceMappingURL=VoltageLevel.js.map

package/dist/model/core/VoltageLevel.js.map

@@ -1 +1 @@
-{"version":3,"file":"VoltageLevel.js","sourceRoot":"","sources":["../../../src/model/core/VoltageLevel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VoltageLevel.js","sourceRoot":"","sources":["../../../src/model/core/VoltageLevel.ts"],"names":[],"mappings":"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"}

package/dist/model/dc/ACDCConverter.js

@@ -4,36 +4,12 @@ exports.ACDCConverter = void 0;
 const ConductingEquipment_1 = require("../core/ConductingEquipment.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-const utils_1 = require("../../converter/integral7/utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class ACDCConverter extends ConductingEquipment_1.ConductingEquipment {
-    /** Base apparent power of the converter pole */
-    baseS;
-    /** Active power loss in pole at no power transfer. Converter configuration data used in power flow. */
-    idleLoss;
-    /** The maximum voltage on the DC side at which the converter should operate. Converter configuration data used in power flow.*/
-    maxUdc;
-    /** Min allowed converter DC voltage. Converter configuration data used in power flow. */
-    minUdc;
-    /** Number of valves in the converter. Used in loss calculations. */
-    numberOfValves;
-    /** Rated converter DC voltage, also called UdN. Converter configuration data used in power flow. */
-    ratedUdc;
-    /** Converter configuration data used in power flow. Refer to poleLossP. */
-    resistiveLoss;
-    /** Switching losses, relative to the base apparent power 'baseS'.
-     Refer to poleLossP.*/
-    switchingLoss;
-    /** Valve threshold voltage. Forward voltage drop when the valve is conducting. Used in loss calculations, i.e. the switchLoss depend on numberOfValves * valveU0. */
-    valveU0;
-    /** All converters' DC sides linked to this point of common coupling terminal.*/
-    pccTerminal;
-    pccTerminalUUID;
-    dCTerminals = new Map();
-    //SSH Profil
-    p; //ActivePower mandatory
-    q; //ReactivePower mandatory
-    targetPpcc; //ActivePower mandatory
-    targetUdc; //Voltage mandatory
+    constructor() {
+        super(...arguments);
+        this.dCTerminals = new Map();
+    }
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
@@ -72,23 +48,23 @@ class ACDCConverter extends ConductingEquipment_1.ConductingEquipment {
     }
     validateMandatoryAttributesCGMES(defaultValuesConfig) {
         let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        if (!(0, utils_1.isNumericI7)(this.numberOfValves)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.numberOfValves)) {
             this.numberOfValves = defaultValuesConfig.ACDCConverter.numberOfValves;
             defaultValues += 'numberOfValves,';
         }
-        if (!(0, utils_1.isNumericI7)(this.p)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.p)) {
             this.p = defaultValuesConfig.ACDCConverter.p;
             defaultValues += 'p,';
         }
-        if (!(0, utils_1.isNumericI7)(this.q)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.q)) {
             this.q = defaultValuesConfig.ACDCConverter.q;
             defaultValues += 'q,';
         }
-        if (!(0, utils_1.isNumericI7)(this.targetPpcc)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.targetPpcc)) {
             this.targetPpcc = defaultValuesConfig.ACDCConverter.targetPpcc;
             defaultValues += 'targetPpcc,';
         }
-        if (!(0, utils_1.isNumericI7)(this.targetUdc)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.targetUdc)) {
             this.targetUdc = defaultValuesConfig.ACDCConverter.targetUdc;
             defaultValues += 'targetUdc,';
         }

package/dist/model/dc/ACDCConverter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ACDCConverter.js","sourceRoot":"","sources":["../../../src/model/dc/ACDCConverter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ACDCConverter.js","sourceRoot":"","sources":["../../../src/model/dc/ACDCConverter.ts"],"names":[],"mappings":"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"}

package/dist/model/dc/ACDCConverterDCTerminal.js

@@ -5,9 +5,6 @@ const DCBaseTerminal_1 = require("./DCBaseTerminal.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class ACDCConverterDCTerminal extends DCBaseTerminal_1.DCBaseTerminal {
-    polarity;
-    dCConductingEquipment; // mandatory
-    dCConductingEquipmentUUID;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }

package/dist/model/dc/ACDCConverterDCTerminal.js.map

@@ -1 +1 @@
-{"version":3,"file":"ACDCConverterDCTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/ACDCConverterDCTerminal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ACDCConverterDCTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/ACDCConverterDCTerminal.ts"],"names":[],"mappings":"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"}

package/dist/model/dc/CsConverter.js

@@ -4,29 +4,9 @@ exports.CsConverter = void 0;
 const ACDCConverter_1 = require("./ACDCConverter.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const CsPpccControlKind_1 = require("./CsPpccControlKind.js");
-const utils_1 = require("../../converter/integral7/utils.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 class CsConverter extends ACDCConverter_1.ACDCConverter {
-    /** Maximum firing angle. CSC configuration data used in power flow. */
-    maxAlpha;
-    /** Maximum extinction angle. CSC configuration data used in power flow. */
-    maxGamma;
-    /** The maximum direct current (Id) on the DC side at which the converter should operate. Converter configuration data use in power flow. */
-    maxIdc;
-    /** Minimum firing angle. CSC configuration data used in power flow. */
-    minAlpha;
-    /** Minimum extinction angle. CSC configuration data used in power flow.*/
-    minGamma;
-    /** The minimum direct current (Id) on the DC side at which the converter should operate. CSC configuration data used in power flow. */
-    minIdc;
-    /** Rated converter DC current, also called IdN. Converter configuration data used in power flow. */
-    ratedIdc;
-    //SSH Profil
-    operatingMode; //mandatory
-    pPccControl; //mandatory
-    targetAlpha; //ActivePower mandatory
-    targetGamma; //ActivePower mandatory
-    targetIdc; //ActivePower mandatory
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
@@ -71,15 +51,15 @@ class CsConverter extends ACDCConverter_1.ACDCConverter {
             this.pPccControl = CsPpccControlKind_1.CsPpccControlKind[defaultValuesConfig.CsConverter.pPccControl];
             defaultValues += 'pPccControl,';
         }
-        if (!(0, utils_1.isNumericI7)(this.targetAlpha)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.targetAlpha)) {
             this.targetAlpha = defaultValuesConfig.CsConverter.targetAlpha;
             defaultValues += 'targetAlpha,';
         }
-        if (!(0, utils_1.isNumericI7)(this.targetGamma)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.targetGamma)) {
             this.targetGamma = defaultValuesConfig.CsConverter.targetGamma;
             defaultValues += 'targetGamma,';
         }
-        if (!(0, utils_1.isNumericI7)(this.targetIdc)) {
+        if (!(0, parser_utils_1.isNumericI7)(this.targetIdc)) {
             this.targetIdc = defaultValuesConfig.CsConverter.targetIdc;
             defaultValues += 'targetIdc,';
         }

package/dist/model/dc/CsConverter.js.map

@@ -1 +1 @@
-{"version":3,"file":"CsConverter.js","sourceRoot":"","sources":["../../../src/model/dc/CsConverter.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,qDAAgD;AAIhD,2DAAsD;AAEtD,2DAA4D;AAC5D,kEAAoF;AAEpF,MAAa,WAAY,SAAQ,6BAAa;IAE5C,uEAAuE;IACvE,QAAQ,CAAS;IACjB,2EAA2E;IAC3E,QAAQ,CAAS;IAEjB,4IAA4I;IAC5I,MAAM,CAAS;IAEf,uEAAuE;IACvE,QAAQ,CAAS;IAEjB,0EAA0E;IAC1E,QAAQ,CAAS;IAEjB,uIAAuI;IACvI,MAAM,CAAS;IAEf,oGAAoG;IACpG,QAAQ,CAAS;IAEjB,YAAY;IACZ,aAAa,CAAsB,CAAC,WAAW;IAC/C,WAAW,CAAoB,CAAC,WAAW;IAC3C,WAAW,CAAS,CAAC,uBAAuB;IAC5C,WAAW,CAAS,CAAC,uBAAuB;IAC5C,SAAS,CAAS,CAAC,uBAAuB;IAE1C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YAC1G,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACpF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACpF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SACzF;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YAE1C,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,0BAA0B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC9F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,0BAA0B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC9F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,wBAAwB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAE1F,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,2BAA2B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAChG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,SAAS,uBAAuB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;YACrH,SAAS,CAAC,UAAU,EAAE,CAAC;YAEvB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC9F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,SAAS,qBAAqB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACjH,SAAS,CAAC,UAAU,EAAE,CAAC;SAExB;IACH,CAAC;IAGD,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,IAAI,CAAC,WAAW,GAAG,qCAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAClF,aAAa,IAAI,cAAc,CAAA;SAChC;QACD,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAC,WAAW,CAAC;YAC/D,aAAa,IAAI,cAAc,CAAA;SAChC;QACD,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAC,WAAW,CAAC;YAC/D,aAAa,IAAI,cAAc,CAAA;SAChC;QACD,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAChC,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC,WAAW,CAAC,SAAS,CAAC;YAC3D,aAAa,IAAI,YAAY,CAAA;SAC9B;QACD,IAAI,aAAa,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,GAAG,CAAC;QAClE,OAAO,aAAa,CAAC;IACvB,CAAC;CAEF;AAhGD,kCAgGC"}
+{"version":3,"file":"CsConverter.js","sourceRoot":"","sources":["../../../src/model/dc/CsConverter.ts"],"names":[],"mappings":"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"}

package/dist/model/dc/DCBaseTerminal.js

@@ -5,8 +5,6 @@ const ACDCTerminal_1 = require("../core/ACDCTerminal.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class DCBaseTerminal extends ACDCTerminal_1.ACDCTerminal {
-    dcNode;
-    dcNodeUUID;
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {

package/dist/model/dc/DCBaseTerminal.js.map

@@ -1 +1 @@
-{"version":3,"file":"DCBaseTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/DCBaseTerminal.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAElD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,cAAe,SAAQ,2BAAY;IAE9C,MAAM,CAAS;IACf,UAAU,CAAS;IAET,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,uBAAuB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC5F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACrG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,UAAU,EAAE;gBAC1B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,uBAAuB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC5F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gBACpG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,gBAAgB,EAAE;oBAC9C,SAAS,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC;iBACjD;aACF;SACF;IACH,CAAC;CACF;AAvBD,wCAuBC"}
+{"version":3,"file":"DCBaseTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/DCBaseTerminal.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAElD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,cAAe,SAAQ,2BAAY;IAKpC,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,uBAAuB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC5F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACrG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,UAAU,EAAE;gBAC1B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,uBAAuB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC5F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gBACpG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,gBAAgB,EAAE;oBAC9C,SAAS,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC;iBACjD;aACF;SACF;IACH,CAAC;CACF;AAvBD,wCAuBC"}

package/dist/model/dc/DCConductingEquipment.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DCConductingEquipment = void 0;
 const Equipment_1 = require("../core/Equipment.js");
 class DCConductingEquipment extends Equipment_1.Equipment {
-    dCTerminals = new Map();
+    constructor() {
+        super(...arguments);
+        this.dCTerminals = new Map();
+    }
 }
 exports.DCConductingEquipment = DCConductingEquipment;
 //# sourceMappingURL=DCConductingEquipment.js.map

package/dist/model/dc/DCConductingEquipment.js.map

@@ -1 +1 @@
-{"version":3,"file":"DCConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/dc/DCConductingEquipment.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAE9C,MAAa,qBAAsB,SAAQ,qBAAS;IAElD,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;CAElD;AAJD,sDAIC"}
+{"version":3,"file":"DCConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/dc/DCConductingEquipment.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAE9C,MAAa,qBAAsB,SAAQ,qBAAS;IAApD;;QAEE,gBAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IAEnD,CAAC;CAAA;AAJD,sDAIC"}

package/dist/model/dc/DCConverterUnit.js

@@ -6,9 +6,6 @@ const DCConverterOperatingModeKind_1 = require("./DCConverterOperatingModeKind.j
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class DCConverterUnit extends DCEquipmentContainer_1.DCEquipmentContainer {
-    operationMode; // cgmes mandatory
-    substation;
-    substationUUID;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }

package/dist/model/dc/DCConverterUnit.js.map

@@ -1 +1 @@
-{"version":3,"file":"DCConverterUnit.js","sourceRoot":"","sources":["../../../src/model/dc/DCConverterUnit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DCConverterUnit.js","sourceRoot":"","sources":["../../../src/model/dc/DCConverterUnit.ts"],"names":[],"mappings":"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"}

package/dist/model/dc/DCEquipmentContainer.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DCEquipmentContainer = void 0;
 const EquipmentContainer_1 = require("../core/EquipmentContainer.js");
 class DCEquipmentContainer extends EquipmentContainer_1.EquipmentContainer {
-    dCNodes = new Map();
+    constructor() {
+        super(...arguments);
+        this.dCNodes = new Map();
+    }
 }
 exports.DCEquipmentContainer = DCEquipmentContainer;
 //# sourceMappingURL=DCEquipmentContainer.js.map

package/dist/model/dc/DCEquipmentContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"DCEquipmentContainer.js","sourceRoot":"","sources":["../../../src/model/dc/DCEquipmentContainer.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAG9D,MAAa,oBAAqB,SAAQ,uCAAkB;IAE1D,OAAO,GAAwB,IAAI,GAAG,EAAE,CAAC;CAE1C;AAJD,oDAIC"}
+{"version":3,"file":"DCEquipmentContainer.js","sourceRoot":"","sources":["../../../src/model/dc/DCEquipmentContainer.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAG9D,MAAa,oBAAqB,SAAQ,uCAAkB;IAA5D;;QAEE,YAAO,GAAwB,IAAI,GAAG,EAAE,CAAC;IAE3C,CAAC;CAAA;AAJD,oDAIC"}

package/dist/model/dc/DCLine.js

@@ -5,29 +5,9 @@ const DCEquipmentContainer_1 = require("./DCEquipmentContainer.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class DCLine extends DCEquipmentContainer_1.DCEquipmentContainer {
-    region;
-    regionUUID;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
-    static sparqlQuery = `
-        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:   <http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (STRAFTER(str(?hsUUID), '#_') AS ?uuid)  
-        (CONCAT(STRBEFORE(str(?hsUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name 
-        WHERE { 
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:DCLine .
-                OPTIONAL { ?MRID cim:IdentifiedObject.name ?name .}
-            }
-        }
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return DCLine.sparqlQuery.replace('<http://default/>', graphURI);
@@ -47,4 +27,22 @@ class DCLine extends DCEquipmentContainer_1.DCEquipmentContainer {
     }
 }
 exports.DCLine = DCLine;
+DCLine.sparqlQuery = `
+        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:   <http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (STRAFTER(str(?hsUUID), '#_') AS ?uuid)  
+        (CONCAT(STRBEFORE(str(?hsUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name 
+        WHERE { 
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:DCLine .
+                OPTIONAL { ?MRID cim:IdentifiedObject.name ?name .}
+            }
+        }
+    `;
 //# sourceMappingURL=DCLine.js.map

package/dist/model/dc/DCLine.js.map

@@ -1 +1 @@
-{"version":3,"file":"DCLine.js","sourceRoot":"","sources":["../../../src/model/dc/DCLine.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAE5D,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,MAAO,SAAQ,2CAAoB;IAE9C,MAAM,CAAwB;IAC9B,UAAU,CAAS;IAEnB,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;KAiBjC,CAAC;IAEG,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAClE;QACD,OAAO,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;IAEM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;;AA7CH,wBAgDC"}
+{"version":3,"file":"DCLine.js","sourceRoot":"","sources":["../../../src/model/dc/DCLine.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAE5D,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,MAAO,SAAQ,2CAAoB;IAK9C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAqBM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAClE;QACD,OAAO,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;IAEM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;;AA7CH,wBAgDC;AAvCe,kBAAW,GAAW;;;;;;;;;;;;;;;;;KAiBjC,CAAC"}

package/dist/model/dc/DCLineSegment.js

@@ -5,43 +5,9 @@ const DCConductingEquipment_1 = require("./DCConductingEquipment.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class DCLineSegment extends DCConductingEquipment_1.DCConductingEquipment {
-    /** Capacitance of the DC line segment. Significant for cables only. */
-    capacitance;
-    /** Inductance of the DC line segment. Neglectable compared with DCSeriesDevice used for smoothing.*/
-    inductance;
-    /** Resistance of the DC line segment. */
-    resistance;
-    /** Segment length for calculating line section capabilities. */
-    length;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
-    static sparqlQuery = `
-        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:   <http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (STRAFTER(str(?hsUUID), '#_') AS ?uuid)  
-        (CONCAT(STRBEFORE(str(?hsUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?capacitance ?inductance ?length ?resistance
-        
-         (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-        WHERE { 
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:DCLine .
-                OPTIONAL { ?MRID cim:IdentifiedObject.name ?name .}
-                OPTIONAL { ?MRID cim:DCLineSegment.capacitance ?capacitance .}
-                OPTIONAL { ?MRID cim:DCLineSegment.inductance ?inductance .}
-                OPTIONAL { ?MRID cim:DCLineSegment.length ?length .}
-                OPTIONAL { ?MRID cim:DCLineSegment.resistance ?resistance .}
-                
-                OPTIONAL {?acLineSegmentUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-        }
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return DCLineSegment.sparqlQuery.replace('<http://default/>', graphURI);
@@ -71,4 +37,30 @@ class DCLineSegment extends DCConductingEquipment_1.DCConductingEquipment {
     }
 }
 exports.DCLineSegment = DCLineSegment;
+DCLineSegment.sparqlQuery = `
+        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:   <http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (STRAFTER(str(?hsUUID), '#_') AS ?uuid)  
+        (CONCAT(STRBEFORE(str(?hsUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?capacitance ?inductance ?length ?resistance
+        
+         (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+        WHERE { 
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:DCLine .
+                OPTIONAL { ?MRID cim:IdentifiedObject.name ?name .}
+                OPTIONAL { ?MRID cim:DCLineSegment.capacitance ?capacitance .}
+                OPTIONAL { ?MRID cim:DCLineSegment.inductance ?inductance .}
+                OPTIONAL { ?MRID cim:DCLineSegment.length ?length .}
+                OPTIONAL { ?MRID cim:DCLineSegment.resistance ?resistance .}
+                
+                OPTIONAL {?acLineSegmentUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+        }
+    `;
 //# sourceMappingURL=DCLineSegment.js.map

package/dist/model/dc/DCLineSegment.js.map

@@ -1 +1 @@
-{"version":3,"file":"DCLineSegment.js","sourceRoot":"","sources":["../../../src/model/dc/DCLineSegment.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAE9D,qDAAgD;AAChD,kEAAoF;AAEpF,MAAa,aAAc,SAAQ,6CAAqB;IAEtD,uEAAuE;IACvE,WAAW,CAAS;IAEpB,qGAAqG;IACrG,UAAU,CAAS;IAEnB,yCAAyC;IACzC,UAAU,CAAS;IAEnB,gEAAgE;IAChE,MAAM,CAAS;IAEf,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;KAyBjC,CAAC;IAEG,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACzE;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACtF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAChG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SAC/F;IACH,CAAC;;AAzEH,sCA4EC"}
+{"version":3,"file":"DCLineSegment.js","sourceRoot":"","sources":["../../../src/model/dc/DCLineSegment.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAE9D,qDAAgD;AAChD,kEAAoF;AAEpF,MAAa,aAAc,SAAQ,6CAAqB;IActD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IA6BM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACzE;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACtF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,4BAA4B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAChG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SAC/F;IACH,CAAC;;AAzEH,sCA4EC;AA1De,yBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;KAyBjC,CAAC"}

package/dist/model/dc/DCNode.js

@@ -5,12 +5,10 @@ const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class DCNode extends IdentifiedObject_1.IdentifiedObject {
-    dcEquipmentContainer; // mandatory
-    dcEquipmentContainerUUID;
-    /** ACDCConverterDCTerminal / DCTerminal*/
-    dcTerminals = new Map();
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
+        /** ACDCConverterDCTerminal / DCTerminal*/
+        this.dcTerminals = new Map();
     }
     /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {

package/dist/model/dc/DCNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"DCNode.js","sourceRoot":"","sources":["../../../src/model/dc/DCNode.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAG1D,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,MAAO,SAAQ,mCAAgB;IAE1C,oBAAoB,CAAuB,CAAC,YAAY;IACxD,wBAAwB,CAAS;IAEjC,0CAA0C;IAC1C,WAAW,GAAgC,IAAI,GAAG,EAAE,CAAC;IAErD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAA,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;YAC1H,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBACjC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,6BAA6B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAClG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;gBAClH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACtC,SAAS,CAAC,YAAY,CAAC,qCAAqC,CAAC,CAAC;iBAC/D;aACF;SACF;IACH,CAAC;CAEF;AAzCD,wBAyCC"}
+{"version":3,"file":"DCNode.js","sourceRoot":"","sources":["../../../src/model/dc/DCNode.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAG1D,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,MAAO,SAAQ,mCAAgB;IAQ1C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAJ5C,0CAA0C;QAC1C,gBAAW,GAAgC,IAAI,GAAG,EAAE,CAAC;IAIrD,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAA,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;YAC1H,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBACjC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,6BAA6B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAClG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;gBAClH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACtC,SAAS,CAAC,YAAY,CAAC,qCAAqC,CAAC,CAAC;iBAC/D;aACF;SACF;IACH,CAAC;CAEF;AAzCD,wBAyCC"}

package/dist/model/dc/DCTerminal.js

@@ -5,8 +5,6 @@ const DCBaseTerminal_1 = require("./DCBaseTerminal.js");
 const rdf_xml_1 = require("../../constants/rdf-xml.js");
 const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
 class DCTerminal extends DCBaseTerminal_1.DCBaseTerminal {
-    dCConductingEquipment; // mandatory
-    dCConductingEquipmentUUID;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }