@enervance/insight-cim-model 0.0.61 → 0.0.63

package/dist/model/operations/SwitchingPlan.d.ts

@@ -1,10 +1,19 @@
 import { Document } from '../common/Document';
 import { ISwitchingPlan } from '../../interfaces/model/operations/ISwitchingPlan';
 import { IOutage } from '../../interfaces/model/operations/IOutage';
-import { Model } from '../model/Model';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 import { ISwitchingAction } from '../../interfaces/model/operations/ISwitchingAction';
 export declare class SwitchingPlan extends Document implements ISwitchingPlan {
+    /** Wiederversorgungsmaßnahme
+     * -1: de-energise |
+     *  0: restore
+     * > 0 energize*/
     rank: number;
+    /**
+     * de-energise: Schaltmaßnahme zur galvanischen Trennung des (Ausfall-)Assets vom Netz
+     * restore: Normalschaltzustand wiederherstellen
+     * energise: Schaltmaßnahme zur wiederversorgung von durch den Ausfall betroffenen Assets
+     * */
     purpose: string;
     outage: IOutage;
     outageUUID: string;
@@ -14,13 +23,15 @@ export declare class SwitchingPlan extends Document implements ISwitchingPlan {
     setOutage(outage: IOutage): string;
     setPurpose(purpose: string): string;
     setRank(rank: number): string;
+    /** ------------------ JSON------------------------*/
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
+    /** ------------------ Fuseki Parser ------------------------*/
     createNewStatementSPARQL(): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
+    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;
 }

package/dist/model/operations/SwitchingPlan.js

@@ -4,6 +4,20 @@ exports.SwitchingPlan = void 0;
 const Document_1 = require("../common/Document");
 const utils_1 = require("../../util/utils");
 class SwitchingPlan extends Document_1.Document {
+    /** Wiederversorgungsmaßnahme
+     * -1: de-energise |
+     *  0: restore
+     * > 0 energize*/
+    rank;
+    /**
+     * de-energise: Schaltmaßnahme zur galvanischen Trennung des (Ausfall-)Assets vom Netz
+     * restore: Normalschaltzustand wiederherstellen
+     * energise: Schaltmaßnahme zur wiederversorgung von durch den Ausfall betroffenen Assets
+     * */
+    purpose;
+    outage;
+    outageUUID;
+    switchingActions;
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.switchingActions = new Map();
@@ -25,6 +39,7 @@ class SwitchingPlan extends Document_1.Document {
         this.rank = rank;
         return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'cim', 'SwitchingPlan', 'rank', String(rank));
     }
+    /** ------------------ JSON------------------------*/
     toJSON() {
         super.toJSON();
         this.toJSONAttributes();
@@ -38,17 +53,20 @@ class SwitchingPlan extends Document_1.Document {
     }
     toJSONAssociations() {
         super.toJSONAssociations();
+        /*    this.json['faultUUIDs'] = [...this.outage?.faults?.keys()];*/
         this.json['outageUUID'] = this.outageUUID;
     }
+    /** ------------------ Fuseki Parser ------------------------*/
     createNewStatementSPARQL() {
         return `
             <${this.baseIRI}${this.mrid}>
             a   cim:SwitchingPlan ;
                 cim:IdentifiedObject.name '${this.name}' .`;
+        /*      cim:SwitchingPlan.rank ${this.rank ? this.rank : "\"0\""} ;
+            cim:SwitchingPlan.purpose ${this.purpose ? this.purpose : "\"Purpose\""} .*/
     }
     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 SwitchingPlan();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addSwitchingPlan(newClass);
@@ -56,9 +74,9 @@ class SwitchingPlan extends Document_1.Document {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.rank = +utils_1.getValue(value, 'rank');
-        this.purpose = utils_1.getValue(value, 'purpose');
-        this.outageUUID = utils_1.getValue(value, 'outageUUID');
+        this.rank = +(0, utils_1.getValue)(value, 'rank');
+        this.purpose = (0, utils_1.getValue)(value, 'purpose');
+        this.outageUUID = (0, utils_1.getValue)(value, 'outageUUID');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -67,6 +85,7 @@ class SwitchingPlan extends Document_1.Document {
             this.outage.addSwitchingPlan(this);
         }
         else {
+            //console.log(this.constructor.name + ' ' + this.mrid + ' hat keine Outage ' + this.outageUUID);
         }
     }
     static getQuerySPARQL(graphURI) {
@@ -75,9 +94,7 @@ class SwitchingPlan extends Document_1.Document {
         }
         return SwitchingPlan.sparqlQuery;
     }
-}
-exports.SwitchingPlan = SwitchingPlan;
-SwitchingPlan.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#> 
@@ -99,4 +116,6 @@ SwitchingPlan.sparqlQuery = `
             }
         }
     `;
+}
+exports.SwitchingPlan = SwitchingPlan;
 //# sourceMappingURL=SwitchingPlan.js.map

package/dist/model/operations/SwitchingPlan.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchingPlan.js","sourceRoot":"","sources":["../../../src/model/operations/SwitchingPlan.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAK5C,4CAA0C;AAG1C,MAAa,aAAc,SAAQ,mBAAQ;IAoBzC,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,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,kBAAkB,CAAC,MAAwB;QACzC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,SAAS,CAAC,MAAe;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACjH,CAAC;IAED,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3G,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7G,CAAC;IAIM,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;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;IAEtC,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;IAC5C,CAAC;IAGM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;6CAEM,IAAI,CAAC,IAAI,KAAK,CAAC;IAG1D,CAAC;IACM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC7D,YAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;YACrC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC,EAAE;IACL,CAAC;IAGM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,gBAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,gBAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAClD,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACzC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;SACpC;aAAM;SAEN;IACH,CAAC;IAEM,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;;AA5GH,sCAoIC;AAtBe,yBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAC"}
+{"version":3,"file":"SwitchingPlan.js","sourceRoot":"","sources":["../../../src/model/operations/SwitchingPlan.ts"],"names":[],"mappings":"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"}

package/dist/model/statevariables/StateVariable.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StateVariable = void 0;
 class StateVariable {
+    mrid;
     constructor(uuid) {
         this.mrid = uuid;
     }

package/dist/model/statevariables/StateVariable.js.map

@@ -1 +1 @@
-{"version":3,"file":"StateVariable.js","sourceRoot":"","sources":["../../../src/model/statevariables/StateVariable.ts"],"names":[],"mappings":";;;AAEA,MAAsB,aAAa;IAI/B,YAAY,IAAY;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAES,QAAQ,CAAC,IAAS,EAAE,SAAc;QACxC,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAC;YAChC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;SACnC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,QAAQ,CAAC,SAAoB,EAAE,OAAe;IAErD,CAAC;IACS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;IAElE,CAAC;IACS,oBAAoB,CAAC,SAAoB,EAAE,OAAe;IAEpE,CAAC;CACJ;AAzBD,sCAyBC"}
+{"version":3,"file":"StateVariable.js","sourceRoot":"","sources":["../../../src/model/statevariables/StateVariable.ts"],"names":[],"mappings":";;;AAEA,MAAsB,aAAa;IAE/B,IAAI,CAAS;IAEb,YAAY,IAAY;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAES,QAAQ,CAAC,IAAS,EAAE,SAAc;QACxC,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAC;YAChC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;SACnC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,QAAQ,CAAC,SAAoB,EAAE,OAAe;IAErD,CAAC;IACS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;IAElE,CAAC;IACS,oBAAoB,CAAC,SAAoB,EAAE,OAAe;IAEpE,CAAC;CACJ;AAzBD,sCAyBC"}

package/dist/model/statevariables/SvPowerFlow.d.ts

@@ -1,6 +1,6 @@
 import { StateVariable } from "./StateVariable";
 import { Terminal } from "../core/Terminal";
-import { Model } from "../model/Model";
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 import { ITerminal } from '../../interfaces/model/core/ITerminal';
 import XMLWriter from 'xml-writer';
 import { IDefaultValuesConfig } from '../../converter/integral7/interface-i7/IDefaultValuesConfig';
@@ -13,9 +13,10 @@ export declare class SvPowerFlow extends StateVariable {
     static getQuerySPARQL(graphURI: string): string;
     getTerminal(): ITerminal;
     setTerminal(value: Terminal): void;
-    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;
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/statevariables/SvPowerFlow.js

@@ -5,6 +5,32 @@ const StateVariable_1 = require("./StateVariable");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class SvPowerFlow extends StateVariable_1.StateVariable {
+    //CLEAR GRAPH <http://localhost:3001/enerVance/data/Schmalle>
+    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#>
+        
+        SELECT  (strafter(strafter(str(?svPfUUID), "#"), "_") AS ?uuid) ?p ?q (strafter(strafter(str(?trUUID), "#"), "_") AS ?terminalUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?svPfUUID rdf:type cim:SvPowerFlow .
+                OPTIONAL{?svPfUUID cim:SvPowerFlow.p ?p .}
+                OPTIONAL{?svPfUUID cim:SvPowerFlow.q ?q .}
+                OPTIONAL{?svPfUUID cim:SvPowerFlow.Terminal ?trUUID .}
+            }
+        }
+    `;
+    terminal;
+    terminalUUID;
+    p;
+    q;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return SvPowerFlow.sparqlQuery.replace("<http://default/>", graphURI);
@@ -18,8 +44,7 @@ class SvPowerFlow extends StateVariable_1.StateVariable {
         this.terminal = value;
     }
     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 SvPowerFlow('');
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addSvPowerFlow(newClass);
@@ -31,16 +56,18 @@ class SvPowerFlow extends StateVariable_1.StateVariable {
             this.terminalUUID = this.getValue(value, 'terminalUUID');
     }
     resolveParsedAssociations(cimModel) {
+        //Terminal
         this.terminal = cimModel.getTerminal(this.terminalUUID);
         if (this.terminal)
             this.terminal.svPowerFlow = this;
         else
             console.log(this.constructor.name + " hat keine terminalInstanz " + this.terminalUUID);
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_SV) {
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_ID, `${rdf_xml_1.RDF_XML.UNDERSCORE}${this.mrid}`);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_ID, `${rdf_xml_1.RDF_XML.UNDERSCORE}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -48,8 +75,8 @@ class SvPowerFlow extends StateVariable_1.StateVariable {
     }
     toCIMXMLAttributes(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_SV) {
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SvPowerFlow.p`, this.p);
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SvPowerFlow.q`, this.q);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SvPowerFlow.p`, this.p);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SvPowerFlow.q`, this.q);
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
@@ -57,7 +84,7 @@ class SvPowerFlow extends StateVariable_1.StateVariable {
             this.terminalUUID = this.terminalUUID ? this.terminalUUID : this.terminal.mrid;
             if (this.terminalUUID) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'SvPowerFlow.Terminal', rdf_xml_1.RDF_XML.CIM_NS_16);
-                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.terminalUUID}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.terminalUUID}`);
                 xmlWriter.endElement();
             }
             else {
@@ -79,25 +106,4 @@ class SvPowerFlow extends StateVariable_1.StateVariable {
     }
 }
 exports.SvPowerFlow = SvPowerFlow;
-SvPowerFlow.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/2018/cim_extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?svPfUUID), "#"), "_") AS ?uuid) ?p ?q (strafter(strafter(str(?trUUID), "#"), "_") AS ?terminalUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?svPfUUID rdf:type cim:SvPowerFlow .
-                OPTIONAL{?svPfUUID cim:SvPowerFlow.p ?p .}
-                OPTIONAL{?svPfUUID cim:SvPowerFlow.q ?q .}
-                OPTIONAL{?svPfUUID cim:SvPowerFlow.Terminal ?trUUID .}
-            }
-        }
-    `;
 //# sourceMappingURL=SvPowerFlow.js.map

package/dist/model/statevariables/SvPowerFlow.js.map

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

package/dist/model/statevariables/SvStatus.d.ts

@@ -6,6 +6,7 @@ export declare class SvStatus extends StateVariable {
     conductingEquipment: ConductingEquipment;
     conductingEquipmentUUID: string;
     constructor(uuid: string);
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/statevariables/SvStatus.js

@@ -5,14 +5,17 @@ const rdf_xml_1 = require("../../constants/rdf-xml");
 const StateVariable_1 = require("./StateVariable");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class SvStatus extends StateVariable_1.StateVariable {
+    inService = true;
+    conductingEquipment;
+    conductingEquipmentUUID;
     constructor(uuid) {
         super(uuid);
-        this.inService = true;
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_SV) {
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_ID, `${rdf_xml_1.RDF_XML.UNDERSCORE}${this.mrid}`);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_ID, `${rdf_xml_1.RDF_XML.UNDERSCORE}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -20,19 +23,19 @@ class SvStatus extends StateVariable_1.StateVariable {
     }
     toCIMXMLAttributes(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_SV) {
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SvStatus.inService`, this.inService);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:SvStatus.inService`, this.inService);
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_SV) {
             if (this.conductingEquipment) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'SvStatus.ConductingEquipment', rdf_xml_1.RDF_XML.CIM_NS_16);
-                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.conductingEquipment.mrid}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.conductingEquipment.mrid}`);
                 xmlWriter.endElement();
             }
             else if (this.conductingEquipmentUUID) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'SvStatus.ConductingEquipment', rdf_xml_1.RDF_XML.CIM_NS_16);
-                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.conductingEquipmentUUID}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.conductingEquipmentUUID}`);
                 xmlWriter.endElement();
             }
             else {

package/dist/model/statevariables/SvStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"SvStatus.js","sourceRoot":"","sources":["../../../src/model/statevariables/SvStatus.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAGlD,mDAAgD;AAChD,kEAAoF;AAEpF,MAAa,QAAS,SAAQ,6BAAa;IAMzC,YAAY,IAAY;QACtB,KAAK,CAAC,IAAI,CAAC,CAAC;QALd,cAAS,GAAY,IAAI,CAAC;IAM1B,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,MAAM,EAAE,GAAG,iBAAO,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,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,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;SACxF;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAElE,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,mBAAmB,EAAE;gBAC5B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,8BAA8B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACnG,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,uBAAuB,EAAE;gBACvC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,8BAA8B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACnG,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;gBACjH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,+CAA+C,CAAC,CAAC;aACzE;SACF;IACH,CAAC;CAEF;AA5CD,4BA4CC"}
+{"version":3,"file":"SvStatus.js","sourceRoot":"","sources":["../../../src/model/statevariables/SvStatus.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAGlD,mDAAgD;AAChD,kEAAoF;AAEpF,MAAa,QAAS,SAAQ,6BAAa;IAEzC,SAAS,GAAY,IAAI,CAAC;IAC1B,mBAAmB,CAAsB;IACzC,uBAAuB,CAAS;IAEhC,YAAY,IAAY;QACtB,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,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,iBAAO,CAAC,MAAM,EAAE,GAAG,iBAAO,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,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,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;SACxF;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAElE,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,mBAAmB,EAAE;gBAC5B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,8BAA8B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACnG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,uBAAuB,EAAE;gBACvC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,8BAA8B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACnG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;gBACjH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,+CAA+C,CAAC,CAAC;aACzE;SACF;IACH,CAAC;CAEF;AA5CD,4BA4CC"}

package/dist/model/statevariables/SvTapStep.d.ts

@@ -6,6 +6,7 @@ export declare class SvTapStep extends StateVariable {
     tapChanger: TapChanger;
     tapChangerUUID: string;
     constructor(uuid: string, position?: number, tapChanger?: TapChanger);
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/statevariables/SvTapStep.js

@@ -5,15 +5,19 @@ const StateVariable_1 = require("./StateVariable");
 const __1 = require("../..");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class SvTapStep extends StateVariable_1.StateVariable {
+    position;
+    tapChanger;
+    tapChangerUUID;
     constructor(uuid, position, tapChanger) {
         super(uuid);
         this.position = position;
         this.tapChanger = tapChanger;
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_SV) {
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
-            xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_ID, `${__1.RDF_XML.UNDERSCORE}${this.mrid}`);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, __1.RDF_XML.RDF_ID, `${__1.RDF_XML.UNDERSCORE}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -21,19 +25,19 @@ class SvTapStep extends StateVariable_1.StateVariable {
     }
     toCIMXMLAttributes(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_SV) {
-            xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SvTapStep.position`, this.position);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:SvTapStep.position`, this.position);
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_SV) {
             if (this.tapChanger) {
                 xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'SvTapStep.TapChanger', __1.RDF_XML.CIM_NS_16);
-                xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.tapChanger.mrid}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.tapChanger.mrid}`);
                 xmlWriter.endElement();
             }
             else if (this.tapChangerUUID) {
                 xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'SvTapStep.TapChanger', __1.RDF_XML.CIM_NS_16);
-                xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.tapChangerUUID}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.tapChangerUUID}`);
                 xmlWriter.endElement();
             }
             else {

package/dist/model/statevariables/SvTapStep.js.map

@@ -1 +1 @@
-{"version":3,"file":"SvTapStep.js","sourceRoot":"","sources":["../../../src/model/statevariables/SvTapStep.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAE9C,6BAA8B;AAE9B,kEAAoF;AAGpF,MAAa,SAAU,SAAQ,6BAAa;IAM1C,YAAY,IAAY,EAAE,QAAiB,EAAE,UAAuB;QAClE,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,sCAAqB,CAAC,SAAS,EAAE,WAAO,CAAC,MAAM,EAAE,GAAG,WAAO,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,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,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,6BAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvF;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAElE,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,sBAAsB,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;gBAC3F,sCAAqB,CAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;gBACzG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC9B,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,sBAAsB,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;gBAC3F,sCAAqB,CAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;gBACxG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,uCAAuC,CAAC,CAAC;aACjE;SACF;IACH,CAAC;CACF;AA7CD,8BA6CC"}
+{"version":3,"file":"SvTapStep.js","sourceRoot":"","sources":["../../../src/model/statevariables/SvTapStep.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAE9C,6BAA8B;AAE9B,kEAAoF;AAGpF,MAAa,SAAU,SAAQ,6BAAa;IAE1C,QAAQ,CAAS;IACjB,UAAU,CAAa;IACvB,cAAc,CAAS;IAEvB,YAAY,IAAY,EAAE,QAAiB,EAAE,UAAuB;QAClE,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,WAAO,CAAC,MAAM,EAAE,GAAG,WAAO,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,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,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvF;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAElE,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,sBAAsB,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;gBAC3F,IAAA,sCAAqB,EAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;gBACzG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC9B,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,sBAAsB,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;gBAC3F,IAAA,sCAAqB,EAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;gBACxG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,uCAAuC,CAAC,CAAC;aACjE;SACF;IACH,CAAC;CACF;AA7CD,8BA6CC"}

package/dist/model/statevariables/SvVoltage.d.ts

@@ -1,6 +1,6 @@
 import { StateVariable } from './StateVariable';
 import { TopologicalNode } from '../topology/TopologicalNode';
-import { Model } from '../model/Model';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 export declare class SvVoltage extends StateVariable {
     static sparqlQuery: string;
     topologicalNode: TopologicalNode;
@@ -10,7 +10,7 @@ export declare class SvVoltage extends StateVariable {
     static getQuerySPARQL(graphURI: string): string;
     getTopologicalNode(): TopologicalNode;
     setTopologicalNode(value: TopologicalNode): void;
-    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;
 }

package/dist/model/statevariables/SvVoltage.js

@@ -3,6 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SvVoltage = void 0;
 const StateVariable_1 = require("./StateVariable");
 class SvVoltage extends StateVariable_1.StateVariable {
+    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#>
+        
+        SELECT  (strafter(strafter(str(?svPfUUID), '#'), '_') AS ?uuid) ?v ?angle (strafter(strafter(str(?tpUUID), '#'), '_') AS ?topologicalNodeUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?svPfUUID rdf:type cim:SvVoltage .
+                OPTIONAL{?svPfUUID cim:SvVoltage.v ?v .}
+                OPTIONAL{?svPfUUID cim:SvVoltage.angle ?angle .}
+                OPTIONAL{?svPfUUID cim:SvVoltage.TopologicalNode ?tpUUID .}
+            }
+        }
+    `;
+    topologicalNode;
+    topologicalNodeUUID;
+    angle;
+    v;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return SvVoltage.sparqlQuery.replace('<http://default/>', graphURI);
@@ -16,8 +41,7 @@ class SvVoltage extends StateVariable_1.StateVariable {
         this.topologicalNode = value;
     }
     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 SvVoltage('');
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addSvVoltage(newClass);
@@ -29,6 +53,7 @@ class SvVoltage extends StateVariable_1.StateVariable {
             this.topologicalNodeUUID = this.getValue(value, 'topologicalNodeUUID');
     }
     resolveParsedAssociations(cimModel) {
+        //Terminal
         this.topologicalNode = cimModel.getTopologicalNode(this.topologicalNodeUUID);
         if (this.topologicalNode)
             this.topologicalNode.svVoltage = this;
@@ -37,25 +62,4 @@ class SvVoltage extends StateVariable_1.StateVariable {
     }
 }
 exports.SvVoltage = SvVoltage;
-SvVoltage.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/2018/cim_extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?svPfUUID), '#'), '_') AS ?uuid) ?v ?angle (strafter(strafter(str(?tpUUID), '#'), '_') AS ?topologicalNodeUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?svPfUUID rdf:type cim:SvVoltage .
-                OPTIONAL{?svPfUUID cim:SvVoltage.v ?v .}
-                OPTIONAL{?svPfUUID cim:SvVoltage.angle ?angle .}
-                OPTIONAL{?svPfUUID cim:SvVoltage.TopologicalNode ?tpUUID .}
-            }
-        }
-    `;
 //# sourceMappingURL=SvVoltage.js.map

package/dist/model/statevariables/SvVoltage.js.map

@@ -1 +1 @@
-{"version":3,"file":"SvVoltage.js","sourceRoot":"","sources":["../../../src/model/statevariables/SvVoltage.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAI9C,MAAa,SAAU,SAAQ,6BAAa;IA+BjC,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACvE;QACD,OAAO,SAAS,CAAC,WAAW,CAAC;IACjC,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IACM,kBAAkB,CAAC,KAAsB;QAC5C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC3D,YAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC;YACnC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC,EAAE;IACP,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAEzC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;YAC3C,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC;YACnC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAC3E,CAAC;IAEG,yBAAyB,CAAC,QAAe;QAEzC,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC7E,IAAG,IAAI,CAAC,eAAe;YAAE,IAAI,CAAC,eAAe,CAAC,SAAS,GAAG,IAAI,CAAC;;YAC1D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,oCAAoC,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC9G,CAAC;;AAjEL,8BAkEC;AAhEiB,qBAAW,GAAY;;;;;;;;;;;;;;;;;;;;KAoBpC,CAAA"}
+{"version":3,"file":"SvVoltage.js","sourceRoot":"","sources":["../../../src/model/statevariables/SvVoltage.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAI9C,MAAa,SAAU,SAAQ,6BAAa;IAEjC,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;;;;KAoBpC,CAAA;IACD,eAAe,CAAkB;IACjC,mBAAmB,CAAS;IAE5B,KAAK,CAAS;IACd,CAAC,CAAS;IAIH,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACvE;QACD,OAAO,SAAS,CAAC,WAAW,CAAC;IACjC,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IACM,kBAAkB,CAAC,KAAsB;QAC5C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC;YACnC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACP,CAAC;IAEG,2BAA2B,CAAC,KAAU;QAEtC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;YAC3C,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC;YACnC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAC3E,CAAC;IAEG,yBAAyB,CAAC,QAAwB;QAClD,UAAU;QACV,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC7E,IAAG,IAAI,CAAC,eAAe;YAAE,IAAI,CAAC,eAAe,CAAC,SAAS,GAAG,IAAI,CAAC;;YAC1D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,oCAAoC,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC9G,CAAC;;AAjEL,8BAkEC"}

package/dist/model/topology/TopologicalIsland.js

@@ -3,6 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TopologicalIsland = void 0;
 const IdentifiedObject_1 = require("../core/IdentifiedObject");
 class TopologicalIsland extends IdentifiedObject_1.IdentifiedObject {
+    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#>
+        
+        SELECT  (strafter(strafter(str(?tpUUID), '#'), '_') AS ?uuid) ?name ?shortName ?description 
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?tpUUID rdf:type cim:TopologicalNode .
+                OPTIONAL{?tpUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?tpUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?tpUUID cim:IdentifiedObject.description ?description .}
+            }
+        }
+    `;
+    topologicalNodes;
+    angleRefTopologicalNode;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
         this.topologicalNodes = new Map();
@@ -27,24 +49,4 @@ class TopologicalIsland extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.TopologicalIsland = TopologicalIsland;
-TopologicalIsland.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/2018/cim_extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?tpUUID), '#'), '_') AS ?uuid) ?name ?shortName ?description 
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?tpUUID rdf:type cim:TopologicalNode .
-                OPTIONAL{?tpUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?tpUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?tpUUID cim:IdentifiedObject.description ?description .}
-            }
-        }
-    `;
 //# sourceMappingURL=TopologicalIsland.js.map

package/dist/model/topology/TopologicalIsland.js.map

@@ -1 +1 @@
-{"version":3,"file":"TopologicalIsland.js","sourceRoot":"","sources":["../../../src/model/topology/TopologicalIsland.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAI1D,MAAa,iBAAkB,SAAQ,mCAAgB;IA0BnD,YAAY,IAAY,EAAE,IAAY,EAAE,SAAkB,EAAE,WAAoB;QAC5E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IACtC,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC/E;QACD,OAAO,iBAAiB,CAAC,WAAW,CAAC;IACzC,CAAC;IAEM,mBAAmB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAEM,kBAAkB,CAAC,eAAiC;QACvD,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,GAAG,eAAe,CAAC;IACvE,CAAC;IAEM,0BAA0B;QAC7B,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACxC,CAAC;IACM,0BAA0B,CAAC,KAAsB;QACpD,IAAI,CAAC,uBAAuB,GAAG,KAAK,CAAC;IACzC,CAAC;;AAnDL,8CAoDC;AAlDiB,6BAAW,GAAY;;;;;;;;;;;;;;;;;;;KAmBpC,CAAA"}
+{"version":3,"file":"TopologicalIsland.js","sourceRoot":"","sources":["../../../src/model/topology/TopologicalIsland.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAI1D,MAAa,iBAAkB,SAAQ,mCAAgB;IAE5C,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;;;KAmBpC,CAAA;IAEO,gBAAgB,CAAgC;IAChD,uBAAuB,CAAkB;IAEjD,YAAY,IAAY,EAAE,IAAY,EAAE,SAAkB,EAAE,WAAoB;QAC5E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IACtC,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC/E;QACD,OAAO,iBAAiB,CAAC,WAAW,CAAC;IACzC,CAAC;IAEM,mBAAmB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAEM,kBAAkB,CAAC,eAAiC;QACvD,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,GAAG,eAAe,CAAC;IACvE,CAAC;IAEM,0BAA0B;QAC7B,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACxC,CAAC;IACM,0BAA0B,CAAC,KAAsB;QACpD,IAAI,CAAC,uBAAuB,GAAG,KAAK,CAAC;IACzC,CAAC;;AAnDL,8CAoDC"}

package/dist/model/topology/TopologicalNode.d.ts

@@ -4,7 +4,7 @@ import { ConnectivityNodeContainer } from '../core/ConnectivityNodeContainer';
 import { TopologicalIsland } from './TopologicalIsland';
 import { SvVoltage } from '../statevariables/SvVoltage';
 import { Terminal } from '../core/Terminal';
-import { Model } from '../model/Model';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 import { DiagramObject } from '../diagram/DiagramObject';
 import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos';
 import XMLWriter from 'xml-writer';
@@ -37,10 +37,11 @@ export declare class TopologicalNode extends IdentifiedObject {
     addTerminal(value: Terminal): void;
     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;
     computeBounds(profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any;
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;