@enervance/insight-cim-model 0.0.62 → 0.0.63

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

@@ -4,7 +4,18 @@ exports.WNFeeder = void 0;
 const Feeder_1 = require("../../../core/Feeder");
 const utils_1 = require("../../../../util/utils");
 const RegulatingCondEq_1 = require("../../../wires/RegulatingCondEq");
+/** 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;
@@ -29,18 +40,42 @@ class WNFeeder extends Feeder_1.Feeder {
         this.q = q;
         return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'westnetzneplan', 'WNFeeder', 'q', this.q + '');
     }
+    /*  setFeededPower(feededPower: number) {
+        this.feededPower = feededPower;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'westnetzneplan', 'WNFeeder', 'feededPower', String(this.feededPower));
+      }*/
+    /*
+      getFeededApparentPowerDemand(): number {
+        let power = 0;
+        for (const equip of this.additionalGroupedEquipment.values()) {
+          if (equip instanceof EnergyConsumer) {
+            const ec = equip as WNEnergyConsumer;
+            power += ec.getApparentPower() * (isNumericI7(ec.feederMultiplier) ? ec.feederMultiplier : 1);
+          }
+        }
+        return power;
+      }*/
+    /*  getFeededApparentPowerFeeder(): number {
+        let power = 0;
+        for (const equip of this.additionalGroupedEquipment.values()) {
+          if (equip instanceof EnergySource) {
+            power += (equip as EnergySource).getApparentPower();
+          }
+        }
+        return power;
+      }*/
     getVoltage() {
-        var _a, _b;
         for (const equip of this.additionalGroupedEquipment.values()) {
-            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;
+            if (equip.getBaseVoltage()?.nominalVoltage.value > 0) {
+                return equip.getBaseVoltage()?.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 */
         for (const terminal of this.normalHeadTerminals.values()) {
             for (const cnTerminal of terminal.connectivityNode.terminals.values()) {
                 if (cnTerminal.conductingEquipment.additionalEquipmentContainer === undefined) {
@@ -49,11 +84,11 @@ class WNFeeder extends Feeder_1.Feeder {
             }
         }
         for (const cn of additionalTerminals) {
-            const vl = (_a = cn.connectivityNode) === null || _a === void 0 ? void 0 : _a.connectivityNodeContainer;
+            const vl = cn.connectivityNode?.connectivityNodeContainer;
             if (vl) {
                 for (const equip of vl.equipments.values()) {
                     if (equip instanceof RegulatingCondEq_1.RegulatingCondEq) {
-                        const ratedU = (_b = equip.regulatingControl) === null || _b === void 0 ? void 0 : _b.targetValue;
+                        const ratedU = equip.regulatingControl?.targetValue;
                         if (ratedU) {
                             return ratedU;
                         }
@@ -61,13 +96,16 @@ class WNFeeder extends Feeder_1.Feeder {
                 }
             }
         }
+        /** kein Slackspannung verfügbar, dann Nennspannung */
         for (const equip of this.additionalGroupedEquipment.values()) {
-            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;
+            if (equip.getBaseVoltage()?.nominalVoltage.value > 0) {
+                return equip.getBaseVoltage()?.nominalVoltage.value;
             }
         }
+        /** Ansonsten 0 */
         return 0;
     }
+    /** ------------------ JSON------------------------*/
     toJSON() {
         super.toJSON();
         this.toJSONAttributes();
@@ -75,20 +113,32 @@ 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'] = (_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['headConductingEquipmentUUID'] = this.getHeadConductingEquipment()?.mrid;
+        this.json['headNode'] = this.getHeadNode()?.mrid;
         this.json['saifi'] = this.getFailureProbability();
     }
+    /*  public getCurrent(): number {
+        const demandS = this.getFeededApparentPowerDemand();
+        const voltage = this.getRatedVoltage() * 1_000;
+        const current = (demandS * 1_000_000)/((voltage > 0 ? voltage : 1) * Math.sqrt(3));
+        if (isNumericI7(current)) {
+          return current;
+        }
+        else {
+          return 0;
+        }
+      }*/
     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 = ((_a = cn.name) === null || _a === void 0 ? void 0 : _a.substr(0, 21)) || '';
+            const tp = cn.name?.substr(0, 21) || '';
             if (tpMap.has(tp))
                 continue;
             for (const asset of cn.assets.values()) {
@@ -99,6 +149,7 @@ class WNFeeder extends Feeder_1.Feeder {
                 }
             }
         }
+        /** Die Raten von Strinkreisabschnitten und -strecken werden über die Assetseite bestimmt */
         const asset = [...this.assets.values()].find(elem => elem);
         let wiresFailureRate = asset ? asset.getFailureRate() : 0;
         for (const tp of tpMap.values()) {
@@ -110,14 +161,16 @@ class WNFeeder extends Feeder_1.Feeder {
         super.toJSONAssociations();
         this.json['normalEnergizedConnectivityNodeUUID'] = [...this.normalEnergizedConnectivityNodes.keys()];
     }
+    /** ------------------ Fuseki Parser ------------------------*/
+    /** Parst und initialisiert das Objekt aus Fuseki JSON Daten  */
     static resolveClassFusekiJSON(data, cimModel) {
-        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) => {
+        data?.results?.bindings?.forEach((value) => {
             const newClass = new WNFeeder();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addFeeder(newClass);
         });
     }
+    /** Parst die Attributs- und Assoziationsinformationen aus Fuseki JSON Daten */
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
         this.number = (0, utils_1.getValue)(value, 'number');
@@ -125,6 +178,8 @@ class WNFeeder extends Feeder_1.Feeder {
         this.p = +(0, utils_1.getValue)(value, 'p');
         this.q = +(0, utils_1.getValue)(value, 'q');
     }
+    /** Initialisiert Assoziationen aus geparsten Daten
+     *  Fuseki und XML Daten */
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
     }
@@ -137,23 +192,11 @@ class WNFeeder extends Feeder_1.Feeder {
     createNewStatementSPARQL() {
         return `
             <${this.baseIRI}${this.mrid}>
-            a   cim:Feeder ;
+            a   westnetzneplan:WNFeeder ;
                 cim:IdentifiedObject.name '${this.name}' .
         `;
     }
-    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 = `
+    static 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#> 
@@ -170,7 +213,7 @@ WNFeeder.sparqlQuery = `
         WHERE { 
             GRAPH <http://default/>{
             
-                ?fUUID rdf:type cim:Feeder .
+                ?fUUID rdf:type westnetzneplan:WNFeeder .
                 OPTIONAL{?fUUID cim:IdentifiedObject.name ?name .}
                 OPTIONAL{?fUUID entsoe:IdentifiedObject.shortName ?shortName .}
                 OPTIONAL{?fUUID cim:IdentifiedObject.description ?description .}
@@ -184,4 +227,16 @@ WNFeeder.sparqlQuery = `
         }
         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/core/WNSwitchTypeKind.js

@@ -5,6 +5,6 @@ var WNSwitchTypeKind;
 (function (WNSwitchTypeKind) {
     WNSwitchTypeKind[WNSwitchTypeKind["S"] = 'schaltbar'] = "S";
     WNSwitchTypeKind[WNSwitchTypeKind["N"] = 'nicht schaltbar'] = "N";
-    WNSwitchTypeKind[WNSwitchTypeKind["E"] = 'eingeschränkt schaltbar'] = "E";
+    WNSwitchTypeKind[WNSwitchTypeKind["E"] = 'eingeschränkt schaltbar'] = "E"; // eingeschränkt schaltbar
 })(WNSwitchTypeKind = exports.WNSwitchTypeKind || (exports.WNSwitchTypeKind = {}));
 //# sourceMappingURL=WNSwitchTypeKind.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"WNSwitchTypeKind.js","sourceRoot":"","sources":["../../../../../src/model/extensions/neplan-westnetz/core/WNSwitchTypeKind.ts"],"names":[],"mappings":";;;AAAA,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,yCAAI,WAAkB,OAAA,CAAA;IACtB,yCAAI,iBAAwB,OAAA,CAAA;IAC5B,yCAAI,yBAAiC,OAAA,CAAA;AACvC,CAAC,EAJW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAI3B"}
+{"version":3,"file":"WNSwitchTypeKind.js","sourceRoot":"","sources":["../../../../../src/model/extensions/neplan-westnetz/core/WNSwitchTypeKind.ts"],"names":[],"mappings":";;;AAAA,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,yCAAI,WAAkB,OAAA,CAAA;IACtB,yCAAI,iBAAwB,OAAA,CAAA;IAC5B,yCAAI,yBAAiC,OAAA,CAAA,CAAC,0BAA0B;AAClE,CAAC,EAJW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAI3B"}

package/dist/model/extensions/neplan-westnetz/faults/WNFaultConnectivityNode.d.ts

@@ -1,18 +1,20 @@
 import { Fault } from '../../../faults/Fault';
 import { WNConnectivityNode } from '../core/WNConnectivityNode';
-import { Model } from '../../../model/Model';
 import { IIdentifiedObject } from '../../../../interfaces/model/core/IIdentifiedObject';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
 export declare class WNFaultConnectivityNode extends Fault {
     connectivityNode: WNConnectivityNode;
     connectivityNodeUUID: string;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     getFaultEquipment(): IIdentifiedObject;
+    /** ------------------ JSON------------------------*/
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
+    /** ------------------ Fuseki Parser ------------------------*/
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
     resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     static getQuerySPARQL(graphURI: string): string;
     static sparqlQuery: string;
     setConnectivityNode(cn: WNConnectivityNode): string;

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

@@ -4,6 +4,8 @@ exports.WNFaultConnectivityNode = void 0;
 const Fault_1 = require("../../../faults/Fault");
 const utils_1 = require("../../../../util/utils");
 class WNFaultConnectivityNode extends Fault_1.Fault {
+    connectivityNode;
+    connectivityNodeUUID;
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
@@ -11,6 +13,7 @@ class WNFaultConnectivityNode extends Fault_1.Fault {
     getFaultEquipment() {
         return this.connectivityNode;
     }
+    /** ------------------ JSON------------------------*/
     toJSON() {
         super.toJSON();
         this.toJSONAttributes();
@@ -24,9 +27,9 @@ class WNFaultConnectivityNode extends Fault_1.Fault {
         super.toJSONAssociations();
         this.json['connectivityNodeUUID'] = this.connectivityNodeUUID;
     }
+    /** ------------------ Fuseki Parser ------------------------*/
     static resolveClassFusekiJSON(data, cimModel) {
-        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) => {
+        data?.results?.bindings?.forEach((value) => {
             const newClass = new WNFaultConnectivityNode();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addCustomFault(newClass);
@@ -44,6 +47,7 @@ class WNFaultConnectivityNode extends Fault_1.Fault {
             this.connectivityNode.fault = this;
         }
         else {
+            //console.log(this.constructor.name + ' ' + this.mrid + ' hat keinen Feeder ' + this.additionalConnectivityNodeContainerUUID);
         }
     }
     static getQuerySPARQL(graphURI) {
@@ -52,21 +56,7 @@ class WNFaultConnectivityNode extends Fault_1.Fault {
         }
         return WNFaultConnectivityNode.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 = `
+    static 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#> 
@@ -92,4 +82,18 @@ WNFaultConnectivityNode.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;
 //# 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;AAG5C,kDAAgD;AAGhD,MAAa,uBAAwB,SAAQ,aAAK;IAKhD,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;IAGM,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;IAGM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC7D,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,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,QAAe;QAC9C,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;SAEN;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;IA6BD,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;AAxCe,mCAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;KAyBjC,CAAC"}
+{"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.d.ts

@@ -1,17 +1,20 @@
 import { Outage } from '../../../operations/Outage';
 import { WNConnectivityNode } from '../core/WNConnectivityNode';
-import { Model } from '../../../model/Model';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
 export declare class WNOutage extends Outage {
+    /** Von einem N-1 Fall betroffene ConnectivityNodes  */
     outageIsolationConnectivityNodes: Map<string, WNConnectivityNode>;
     outageIsolationConnectivityNodesUUIDs: string[];
     constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
     addOutageIsolationConnectivityNodes(cn: WNConnectivityNode): string;
+    /** ------------------ JSON------------------------*/
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    /** ------------------ Fuseki Parser ------------------------*/
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     static getQuerySPARQL(graphURI: string): string;
     static sparqlQuery: string;
     createNewStatementSPARQL(): string;

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

@@ -5,6 +5,9 @@ const Outage_1 = require("../../../operations/Outage");
 const WNConnectivityNode_1 = require("../core/WNConnectivityNode");
 const utils_1 = require("../../../../util/utils");
 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();
@@ -21,6 +24,7 @@ class WNOutage extends Outage_1.Outage {
         }
         return '';
     }
+    /** ------------------ JSON------------------------*/
     toJSON() {
         super.toJSON();
         this.toJSONAttributes();
@@ -33,9 +37,9 @@ class WNOutage extends Outage_1.Outage {
     toJSONAssociations() {
         super.toJSONAssociations();
     }
+    /** ------------------ Fuseki Parser ------------------------*/
     static resolveClassFusekiJSON(data, cimModel) {
-        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) => {
+        data?.results?.bindings?.forEach((value) => {
             const newClass = new WNOutage();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addOutage(newClass);
@@ -47,6 +51,7 @@ class WNOutage extends Outage_1.Outage {
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
+        /** connectivityModes parsen */
         for (const cnUUID of this.outageIsolationConnectivityNodesUUIDs) {
             const cn = cimModel.getObject(cnUUID);
             if (cn && cn instanceof WNConnectivityNode_1.WNConnectivityNode) {
@@ -62,16 +67,7 @@ class WNOutage extends Outage_1.Outage {
         }
         return WNOutage.sparqlQuery;
     }
-    createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Outage ;
-                cim:IdentifiedObject.name "WNOutage" .
-        `;
-    }
-}
-exports.WNOutage = WNOutage;
-WNOutage.sparqlQuery = `
+    static 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#>
@@ -94,4 +90,13 @@ WNOutage.sparqlQuery = `
             }
         }
         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":";;;AAAA,uDAAkD;AAClD,mEAA8D;AAC9D,kDAAuE;AAGvE,MAAa,QAAS,SAAQ,eAAM;IAGlC,uDAAuD;IACvD,gCAAgC,CAAkC;IAClE,qCAAqC,CAAW;IAEhD,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,gCAAgC,GAAG,IAAI,GAAG,EAAE,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,mCAAmC,CAAC,EAAsB;QACxD,IAAI,CAAC,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;YACvD,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACvD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,kCAAkC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;SAC5I;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,IAAI,kCAAkC,EAAE,CAAC,IAAI,kBAAkB,CAAC,CAAC;SAC7F;QACD,OAAO,EAAE,CAAC;IACZ,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;IAC7B,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,QAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,qCAAqC,GAAG,IAAA,6BAAqB,EAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,kCAAkC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/H,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,+BAA+B;QAC/B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,qCAAqC,EAAE;YAC/D,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,EAAE,IAAI,EAAE,YAAY,uCAAkB,EAAE;gBAC1C,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACvD,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACjC;SACF;QACD,IAAI,CAAC,qCAAqC,CAAC,MAAM,GAAG,CAAC,CAAC;IACxD,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACrB,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACpE;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;IACM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;uCAsBC,CAAC;IAE/B,wBAAwB;QAE7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;;SAG9B,CAAC;IACR,CAAC;;AAxGH,4BAyGC"}

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

@@ -1,7 +1,7 @@
 import { EVACLineSegment } from '../../enervance/wires/EVACLineSegment';
-import { Model } from '../../../model/Model';
 import { EVACLineSubSegment } from '../../enervance/wires/EVACLineSubSegment';
 import { WNBay } from '../core/WNBay';
+import { ModelContainer } from '../../../../model-container/model/ModelContainer';
 export declare class WNACLineSegment extends EVACLineSegment {
     fromBay: WNBay;
     fromBayUUID: string;
@@ -10,9 +10,9 @@ export declare class WNACLineSegment extends EVACLineSegment {
     constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string, length?: number);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     addLineSubSegment(lineSubSegment: EVACLineSubSegment): void;
     toJSON(): any;
     toJSONAttributes(): void;

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

@@ -5,9 +5,58 @@ const EVACLineSegment_1 = require("../../enervance/wires/EVACLineSegment");
 const rdf_xml_1 = require("../../../../constants/rdf-xml");
 const utils_1 = require("../../../../util/utils");
 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);
@@ -15,8 +64,7 @@ class WNACLineSegment extends EVACLineSegment_1.EVACLineSegment {
         return WNACLineSegment.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        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) => {
+        data?.results?.bindings?.forEach((value) => {
             const acLineSegment = new WNACLineSegment();
             acLineSegment.resolveAttributesFusekiJSON(value);
             cimModel.addACLineSegment(acLineSegment);
@@ -57,49 +105,4 @@ 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