@enervance/insight-cim-model 0.0.77 → 0.0.79

package/dist/model/extensions/neplan-westnetz/core/WNFeeder.js

@@ -2,20 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WNFeeder = void 0;
 const Feeder_1 = require("../../../core/Feeder.js");
-const utils_1 = require("../../../../util/utils.js");
 const RegulatingCondEq_1 = require("../../../wires/RegulatingCondEq.js");
+const parser_utils_1 = require("../../../../utils2/parser.utils.js");
 /** Wenstnezu Neplan Erweiterung */
 class WNFeeder extends Feeder_1.Feeder {
-    number;
-    /** Abgangsskalierung */
-    /** skalierter Abgangsstrom */
-    current;
-    /** skalierte Wirkleistung */
-    p;
-    /** skalierte Blindleistung */
-    q;
-    /** ConnectivityNodes that are normally energized by the feeder. */
-    normalEnergizedConnectivityNodes;
     constructor(uuid, name, shortName, description, baseIRI) {
         super(uuid, name, shortName, description);
         this.baseIRI = baseIRI;
@@ -41,14 +31,16 @@ class WNFeeder extends Feeder_1.Feeder {
         return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'westnetzneplan', 'WNFeeder', 'q', this.q + '');
     }
     getVoltage() {
+        var _a, _b;
         for (const equip of this.additionalGroupedEquipment.values()) {
-            if (equip.getBaseVoltage()?.nominalVoltage.value > 0) {
-                return equip.getBaseVoltage()?.nominalVoltage.value;
+            if (((_a = equip.getBaseVoltage()) === null || _a === void 0 ? void 0 : _a.nominalVoltage.value) > 0) {
+                return (_b = equip.getBaseVoltage()) === null || _b === void 0 ? void 0 : _b.nominalVoltage.value;
             }
         }
         return 0;
     }
     getRatedVoltage() {
+        var _a, _b, _c, _d;
         /** Die Slackspannung */
         const additionalTerminals = [...this.normalHeadTerminals.values()];
         /** Sonderfall: Simulation eines Schaltfeldes durch eine fiktive Leitung */
@@ -60,11 +52,11 @@ class WNFeeder extends Feeder_1.Feeder {
             }
         }
         for (const cn of additionalTerminals) {
-            const vl = cn.connectivityNode?.connectivityNodeContainer;
+            const vl = (_a = cn.connectivityNode) === null || _a === void 0 ? void 0 : _a.connectivityNodeContainer;
             if (vl) {
                 for (const equip of vl.equipments.values()) {
                     if (equip instanceof RegulatingCondEq_1.RegulatingCondEq) {
-                        const ratedU = equip.regulatingControl?.targetValue;
+                        const ratedU = (_b = equip.regulatingControl) === null || _b === void 0 ? void 0 : _b.targetValue;
                         if (ratedU) {
                             return ratedU;
                         }
@@ -74,8 +66,8 @@ class WNFeeder extends Feeder_1.Feeder {
         }
         /** kein Slackspannung verfügbar, dann Nennspannung */
         for (const equip of this.additionalGroupedEquipment.values()) {
-            if (equip.getBaseVoltage()?.nominalVoltage.value > 0) {
-                return equip.getBaseVoltage()?.nominalVoltage.value;
+            if (((_c = equip.getBaseVoltage()) === null || _c === void 0 ? void 0 : _c.nominalVoltage.value) > 0) {
+                return (_d = equip.getBaseVoltage()) === null || _d === void 0 ? void 0 : _d.nominalVoltage.value;
             }
         }
         /** Ansonsten 0 */
@@ -89,12 +81,13 @@ class WNFeeder extends Feeder_1.Feeder {
         return this.json;
     }
     toJSONAttributes() {
+        var _a, _b;
         super.toJSONAttributes();
         this.json['number'] = this.number;
         this.json['current'] = this.current;
         this.json['apparentpowerdemand'] = Math.sqrt(Math.pow(this.p, 2) + Math.pow(this.q, 2));
-        this.json['headConductingEquipmentUUID'] = this.getHeadConductingEquipment()?.mrid;
-        this.json['headNode'] = this.getHeadNode()?.mrid;
+        this.json['headConductingEquipmentUUID'] = (_a = this.getHeadConductingEquipment()) === null || _a === void 0 ? void 0 : _a.mrid;
+        this.json['headNode'] = (_b = this.getHeadNode()) === null || _b === void 0 ? void 0 : _b.mrid;
         this.json['saifi'] = this.getFailureProbability();
     }
     /*  public getCurrent(): number {
@@ -109,12 +102,13 @@ class WNFeeder extends Feeder_1.Feeder {
         }
       }*/
     getFailureProbability() {
+        var _a;
         /** Knoten sind ein Sonderfall -> Ausfallhäufigkeiten pro TP,
          * da das Netzmodell VoltageLevel-Elemente nicht geeignet sind. */
         /** Stationen */
         const tpMap = new Map();
         for (const cn of this.normalEnergizedConnectivityNodes.values()) {
-            const tp = cn.name?.substr(0, 21) || '';
+            const tp = ((_a = cn.name) === null || _a === void 0 ? void 0 : _a.substr(0, 21)) || '';
             if (tpMap.has(tp))
                 continue;
             for (const asset of cn.assets.values()) {
@@ -140,7 +134,8 @@ class WNFeeder extends Feeder_1.Feeder {
     /** ------------------ Fuseki Parser ------------------------*/
     /** Parst und initialisiert das Objekt aus Fuseki JSON Daten  */
     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 newClass = new WNFeeder();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addFeeder(newClass);
@@ -149,10 +144,10 @@ class WNFeeder extends Feeder_1.Feeder {
     /** Parst die Attributs- und Assoziationsinformationen aus Fuseki JSON Daten */
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.number = (0, utils_1.getValue)(value, 'number');
-        this.current = +(0, utils_1.getValue)(value, 'current');
-        this.p = +(0, utils_1.getValue)(value, 'p');
-        this.q = +(0, utils_1.getValue)(value, 'q');
+        this.number = parser_utils_1.ParserUtils.getValue(value, 'number');
+        this.current = +parser_utils_1.ParserUtils.getValue(value, 'current');
+        this.p = +parser_utils_1.ParserUtils.getValue(value, 'p');
+        this.q = +parser_utils_1.ParserUtils.getValue(value, 'q');
     }
     /** Initialisiert Assoziationen aus geparsten Daten
      *  Fuseki und XML Daten */
@@ -172,7 +167,19 @@ class WNFeeder extends Feeder_1.Feeder {
                 cim:IdentifiedObject.name '${this.name}' .
         `;
     }
-    static sparqlQuery = `
+    getHeadConductingEquipment() {
+        for (const headTerminal of this.normalHeadTerminals.values()) {
+            return headTerminal.conductingEquipment;
+        }
+    }
+    getHeadNode() {
+        for (const headTerminal of this.normalHeadTerminals.values()) {
+            return headTerminal.connectivityNode;
+        }
+    }
+}
+exports.WNFeeder = WNFeeder;
+WNFeeder.sparqlQuery = `
         PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
         PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
         PREFIX westnetzneplan:	    <http://westnetzneplan.de/CIM/Extensions#> 
@@ -203,16 +210,4 @@ class WNFeeder extends Feeder_1.Feeder {
         }
         GROUP BY ?fUUID ?baseIRI ?name ?shortName ?description ?number ?current ?p ?q ?negsUUID
     `;
-    getHeadConductingEquipment() {
-        for (const headTerminal of this.normalHeadTerminals.values()) {
-            return headTerminal.conductingEquipment;
-        }
-    }
-    getHeadNode() {
-        for (const headTerminal of this.normalHeadTerminals.values()) {
-            return headTerminal.connectivityNode;
-        }
-    }
-}
-exports.WNFeeder = WNFeeder;
 //# sourceMappingURL=WNFeeder.js.map

package/dist/model/extensions/neplan-westnetz/core/WNFeeder.js.map

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

package/dist/model/extensions/neplan-westnetz/faults/WNFaultConnectivityNode.js

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WNFaultConnectivityNode = void 0;
 const Fault_1 = require("../../../faults/Fault.js");
-const utils_1 = require("../../../../util/utils.js");
+const parser_utils_1 = require("../../../../utils2/parser.utils.js");
 class WNFaultConnectivityNode extends Fault_1.Fault {
-    connectivityNode;
-    connectivityNodeUUID;
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
@@ -29,7 +27,8 @@ class WNFaultConnectivityNode extends Fault_1.Fault {
     }
     /** ------------------ Fuseki Parser ------------------------*/
     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 newClass = new WNFaultConnectivityNode();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addCustomFault(newClass);
@@ -37,8 +36,8 @@ class WNFaultConnectivityNode extends Fault_1.Fault {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.connectivityNodeUUID = (0, utils_1.getValue)(value, 'connectivityNodeUUID');
-        this.outageUUID = (0, utils_1.getValue)(value, 'outageUUID');
+        this.connectivityNodeUUID = parser_utils_1.ParserUtils.getValue(value, 'connectivityNodeUUID');
+        this.outageUUID = parser_utils_1.ParserUtils.getValue(value, 'outageUUID');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -56,7 +55,21 @@ class WNFaultConnectivityNode extends Fault_1.Fault {
         }
         return WNFaultConnectivityNode.sparqlQuery;
     }
-    static sparqlQuery = `
+    setConnectivityNode(cn) {
+        this.connectivityNode = cn;
+        cn.fault = this;
+        return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'westnetzneplan', 'WNFaultConnectivityNode', 'ConnectivityNode', cn.mrid);
+    }
+    createNewStatementSPARQL() {
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Fault ;
+                cim:IdentifiedObject.name "CNFault" .
+        `;
+    }
+}
+exports.WNFaultConnectivityNode = WNFaultConnectivityNode;
+WNFaultConnectivityNode.sparqlQuery = `
         PREFIX cim:	 		            <http://iec.ch/TC57/2013/CIM-schema-cim16#> 
         PREFIX enervance:           <http://enervance.com/CIM/Extensions#> 
         PREFIX westnetzneplan:	    <http://westnetzneplan.de/CIM/Extensions#> 
@@ -82,18 +95,4 @@ class WNFaultConnectivityNode extends Fault_1.Fault {
             }
         }
     `;
-    setConnectivityNode(cn) {
-        this.connectivityNode = cn;
-        cn.fault = this;
-        return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'westnetzneplan', 'WNFaultConnectivityNode', 'ConnectivityNode', cn.mrid);
-    }
-    createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Fault ;
-                cim:IdentifiedObject.name "CNFault" .
-        `;
-    }
-}
-exports.WNFaultConnectivityNode = WNFaultConnectivityNode;
 //# sourceMappingURL=WNFaultConnectivityNode.js.map

package/dist/model/extensions/neplan-westnetz/faults/WNFaultConnectivityNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"WNFaultConnectivityNode.js","sourceRoot":"","sources":["../../../../../src/model/extensions/neplan-westnetz/faults/WNFaultConnectivityNode.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAE5C,kDAAgD;AAIhD,MAAa,uBAAwB,SAAQ,aAAK;IAEhD,gBAAgB,CAAqB;IACrC,oBAAoB,CAAS;IAE7B,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAGD,iBAAiB;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,qDAAqD;IAC9C,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;IAEhE,CAAC;IAED,+DAA+D;IACxD,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,uBAAuB,EAAE,CAAC;YAC/C,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,oBAAoB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;QACpE,IAAI,CAAC,UAAU,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAClD,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE;YAC7D,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAuB,CAAC;YACtG,IAAI,CAAC,gBAAgB,CAAC,KAAK,GAAG,IAAI,CAAC;SACpC;aAAM;YACL,8HAA8H;SAC/H;IACH,CAAC;IACM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,uBAAuB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACnF;QACD,OAAO,uBAAuB,CAAC,WAAW,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;KAyBjC,CAAC;IAEJ,mBAAmB,CAAC,EAAsB;QACxC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC;QAChB,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAC5I,CAAC;IAEM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;SAG9B,CAAC;IACR,CAAC;;AAvGH,0DAwGC"}
+{"version":3,"file":"WNFaultConnectivityNode.js","sourceRoot":"","sources":["../../../../../src/model/extensions/neplan-westnetz/faults/WNFaultConnectivityNode.ts"],"names":[],"mappings":"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"}

package/dist/model/extensions/neplan-westnetz/operations/WNOutage.js

@@ -3,11 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WNOutage = void 0;
 const Outage_1 = require("../../../operations/Outage.js");
 const WNConnectivityNode_1 = require("../core/WNConnectivityNode.js");
-const utils_1 = require("../../../../util/utils.js");
+const parser_utils_1 = require("../../../../utils2/parser.utils.js");
 class WNOutage extends Outage_1.Outage {
-    /** Von einem N-1 Fall betroffene ConnectivityNodes  */
-    outageIsolationConnectivityNodes;
-    outageIsolationConnectivityNodesUUIDs;
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.outageIsolationConnectivityNodes = new Map();
@@ -39,7 +36,8 @@ class WNOutage extends Outage_1.Outage {
     }
     /** ------------------ Fuseki Parser ------------------------*/
     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 newClass = new WNOutage();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addOutage(newClass);
@@ -47,7 +45,7 @@ class WNOutage extends Outage_1.Outage {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.outageIsolationConnectivityNodesUUIDs = (0, utils_1.parseCsvLineIntoArray)((0, utils_1.getValue)(value, 'outageIsolationConnectivityNodes'), ',');
+        this.outageIsolationConnectivityNodesUUIDs = parser_utils_1.ParserUtils.parseCsvLineIntoArray(parser_utils_1.ParserUtils.getValue(value, 'outageIsolationConnectivityNodes'), ',');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -67,7 +65,16 @@ class WNOutage extends Outage_1.Outage {
         }
         return WNOutage.sparqlQuery;
     }
-    static sparqlQuery = `
+    createNewStatementSPARQL() {
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Outage ;
+                cim:IdentifiedObject.name "WNOutage" .
+        `;
+    }
+}
+exports.WNOutage = WNOutage;
+WNOutage.sparqlQuery = `
         PREFIX cim:	 		    <http://iec.ch/TC57/2013/CIM-schema-cim16#>
         PREFIX westnetzneplan:	  <http://westnetzneplan.de/CIM/Extensions#>
         PREFIX entsoe:	 	  <http://entsoe.eu/CIM/SchemaExtension/3/1#>
@@ -90,13 +97,4 @@ class WNOutage extends Outage_1.Outage {
             }
         }
         GROUP BY ?MRID ?baseIRI ?name `;
-    createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Outage ;
-                cim:IdentifiedObject.name "WNOutage" .
-        `;
-    }
-}
-exports.WNOutage = WNOutage;
 //# sourceMappingURL=WNOutage.js.map

package/dist/model/extensions/neplan-westnetz/operations/WNOutage.js.map

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

package/dist/model/extensions/neplan-westnetz/wires/WNACLineSegment.js

@@ -3,60 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WNACLineSegment = void 0;
 const EVACLineSegment_1 = require("../../enervance/wires/EVACLineSegment.js");
 const rdf_xml_1 = require("../../../../constants/rdf-xml.js");
-const utils_1 = require("../../../../util/utils.js");
+const parser_utils_1 = require("../../../../utils2/parser.utils.js");
 class WNACLineSegment extends EVACLineSegment_1.EVACLineSegment {
-    fromBay;
-    fromBayUUID;
-    toBay;
-    toBayUUID;
     constructor(uuid, name, shortName, description, baseIRI, length) {
         super(uuid, name, shortName, description, baseIRI, length);
     }
-    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 amp:	 		<http://amprion.net/CIM/Extensions#> 
-                PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-                PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-                PREFIX westnetzneplan:	    <${rdf_xml_1.RDF_XML.WESTNETZNEPLAN_NS}> 
-        
-                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        ?name ?shortName ?description ?length ?r ?x ?bch ?gch ?installation 
-                        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
-                        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
-                        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-                        (strafter(strafter(str(?fBayUUID), '#'), '_') AS ?fromBayUUID) 
-                        (strafter(strafter(str(?tBayUUID), '#'), '_') AS ?toBayUUID) 
-                        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
-                                
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?acLineSegmentUUID rdf:type cim:ACLineSegment .
-                        OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
-                        OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
-                        OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
-                        OPTIONAL {?MRID enervance:IdentifiedObject.installation ?installation .}
-                        OPTIONAL {?MRID cim:Conductor.length ?length .}
-                        OPTIONAL {?MRID cim:ACLineSegment.r ?r .}
-                        OPTIONAL {?MRID cim:ACLineSegment.x ?x .}
-                        OPTIONAL {?MRID cim:ACLineSegment.bch ?bch .}
-                        OPTIONAL {?MRID cim:ACLineSegment.gch ?gch .}
-                        OPTIONAL {?MRID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
-                        OPTIONAL {?MRID cim:PowerSystemResource.PSRType ?ptUUID .}
-                        OPTIONAL {?MRID cim:Equipment.EquipmentContainer ?ecUUID .}
-                        OPTIONAL {?MRID westnetzneplan:WNACLineSegment.FromBay ?fBayUUID .}
-                        OPTIONAL {?MRID westnetzneplan:WNACLineSegment.ToBay ?tBayUUID .}
-                        OPTIONAL {?MRID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
-                   
-                    }
-                }
-                GROUP BY ?MRID ?baseIRI ?name ?shortName ?description 
-                         ?installation ?length ?r ?x ?bch ?gch ?length ?bvUUID ?ptUUID ?ecUUID 
-                         ?fBayUUID ?tBayUUID
-                `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return WNACLineSegment.sparqlQuery.replace('<http://default/>', graphURI);
@@ -64,7 +15,8 @@ class WNACLineSegment extends EVACLineSegment_1.EVACLineSegment {
         return WNACLineSegment.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 acLineSegment = new WNACLineSegment();
             acLineSegment.resolveAttributesFusekiJSON(value);
             cimModel.addACLineSegment(acLineSegment);
@@ -72,8 +24,8 @@ class WNACLineSegment extends EVACLineSegment_1.EVACLineSegment {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.fromBayUUID = (0, utils_1.getValue)(value, 'fromBayUUID');
-        this.toBayUUID = (0, utils_1.getValue)(value, 'toBayUUID');
+        this.fromBayUUID = parser_utils_1.ParserUtils.getValue(value, 'fromBayUUID');
+        this.toBayUUID = parser_utils_1.ParserUtils.getValue(value, 'toBayUUID');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -105,4 +57,49 @@ class WNACLineSegment extends EVACLineSegment_1.EVACLineSegment {
     }
 }
 exports.WNACLineSegment = WNACLineSegment;
+WNACLineSegment.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 amp:	 		<http://amprion.net/CIM/Extensions#> 
+                PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+                PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+                PREFIX westnetzneplan:	    <${rdf_xml_1.RDF_XML.WESTNETZNEPLAN_NS}> 
+        
+                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
+                        ?name ?shortName ?description ?length ?r ?x ?bch ?gch ?installation 
+                        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
+                        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID) 
+                        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+                        (strafter(strafter(str(?fBayUUID), '#'), '_') AS ?fromBayUUID) 
+                        (strafter(strafter(str(?tBayUUID), '#'), '_') AS ?toBayUUID) 
+                        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
+                                
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?acLineSegmentUUID rdf:type cim:ACLineSegment .
+                        OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
+                        OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
+                        OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
+                        OPTIONAL {?MRID enervance:IdentifiedObject.installation ?installation .}
+                        OPTIONAL {?MRID cim:Conductor.length ?length .}
+                        OPTIONAL {?MRID cim:ACLineSegment.r ?r .}
+                        OPTIONAL {?MRID cim:ACLineSegment.x ?x .}
+                        OPTIONAL {?MRID cim:ACLineSegment.bch ?bch .}
+                        OPTIONAL {?MRID cim:ACLineSegment.gch ?gch .}
+                        OPTIONAL {?MRID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
+                        OPTIONAL {?MRID cim:PowerSystemResource.PSRType ?ptUUID .}
+                        OPTIONAL {?MRID cim:Equipment.EquipmentContainer ?ecUUID .}
+                        OPTIONAL {?MRID westnetzneplan:WNACLineSegment.FromBay ?fBayUUID .}
+                        OPTIONAL {?MRID westnetzneplan:WNACLineSegment.ToBay ?tBayUUID .}
+                        OPTIONAL {?MRID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
+                   
+                    }
+                }
+                GROUP BY ?MRID ?baseIRI ?name ?shortName ?description 
+                         ?installation ?length ?r ?x ?bch ?gch ?length ?bvUUID ?ptUUID ?ecUUID 
+                         ?fBayUUID ?tBayUUID
+                `;
 //# sourceMappingURL=WNACLineSegment.js.map

package/dist/model/extensions/neplan-westnetz/wires/WNACLineSegment.js.map

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

package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.d.ts

@@ -50,10 +50,10 @@ export declare class WNEnergyConsumer extends EnergyConsumer implements IEnergyC
     customMultiplier: number;
     /**
      *  VB – vertragliche Last der angeschlossenen Niederspannungskunden
-        MB – gemessene Last der angeschlossenen Niederspannungskunden
-        V – vertragliche Last des Mittelspannungskunden
-        M – gemessene Last des Mittelspannungskunden
-        T – Trafo-Leistung
+     MB – gemessene Last der angeschlossenen Niederspannungskunden
+     V – vertragliche Last des Mittelspannungskunden
+     M – gemessene Last des Mittelspannungskunden
+     T – Trafo-Leistung
      * */
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     static sparqlQuery: string;