@enervance/insight-cim-model 0.0.62 → 0.0.63

package/dist/model/wires/PhaseTapChangerTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"PhaseTapChangerTable.js","sourceRoot":"","sources":["../../../src/model/wires/PhaseTapChangerTable.ts"],"names":[],"mappings":";;;AACA,6BAAiE;AAKjE,kEAAsE;AAEtE,MAAa,oBAAqB,SAAQ,oBAAgB;IAMtD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAH9C,+BAA0B,GAAgC,EAAE,CAAC;IAI7D,CAAC;IAEM,4BAA4B,CAAC,yBAAoD;QACpF,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpE,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAC/B,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,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,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;QAED,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,0BAA0B,EAAE;YACtD,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SAC3C;IACL,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACtE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,KAAI,MAAM,GAAG,IAAI,IAAI,CAAC,0BAA0B,EAAC;YAC7C,aAAa,IAAI,GAAG,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;SAC9E;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,+BAA+B,CAAC,mBAAyC;QACrE,IAAI,aAAa,GAAG,KAAK,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;QAC/E,KAAI,MAAM,GAAG,IAAI,IAAI,CAAC,0BAA0B,EAAC;YAC7C,aAAa,IAAI,GAAG,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;SAC7E;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;CACJ;AA9CD,oDA8CC"}
+{"version":3,"file":"PhaseTapChangerTable.js","sourceRoot":"","sources":["../../../src/model/wires/PhaseTapChangerTable.ts"],"names":[],"mappings":";;;AACA,6BAAiE;AAKjE,kEAAsE;AAEtE,MAAa,oBAAqB,SAAQ,oBAAgB;IAEtD,sBAAsB,CAAyB;IAE/C,0BAA0B,GAAgC,EAAE,CAAC;IAE7D,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,4BAA4B,CAAC,yBAAoD;QACpF,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpE,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAC/B,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,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,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;QACD,mBAAmB;QACnB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,0BAA0B,EAAE;YACtD,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SAC3C;IACL,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACtE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,KAAI,MAAM,GAAG,IAAI,IAAI,CAAC,0BAA0B,EAAC;YAC7C,aAAa,IAAI,GAAG,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;SAC9E;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,+BAA+B,CAAC,mBAAyC;QACrE,IAAI,aAAa,GAAG,KAAK,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;QAC/E,KAAI,MAAM,GAAG,IAAI,IAAI,CAAC,0BAA0B,EAAC;YAC7C,aAAa,IAAI,GAAG,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;SAC7E;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;CACJ;AA9CD,oDA8CC"}

package/dist/model/wires/PhaseTapChangerTablePoint.d.ts

@@ -7,6 +7,7 @@ export declare class PhaseTapChangerTablePoint extends TapChangerTablePoint {
     phaseTapChangerTableUUID: string;
     angle: number;
     constructor(mrid?: 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/wires/PhaseTapChangerTablePoint.js

@@ -6,9 +6,13 @@ const __1 = require("../..");
 const TapChangerTablePoint_1 = require("./TapChangerTablePoint");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class PhaseTapChangerTablePoint extends TapChangerTablePoint_1.TapChangerTablePoint {
+    phaseTapChangerTable;
+    phaseTapChangerTableUUID;
+    angle;
     constructor(mrid) {
         super(mrid);
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_EQ) {
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);

package/dist/model/wires/PhaseTapChangerTablePoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"PhaseTapChangerTablePoint.js","sourceRoot":"","sources":["../../../src/model/wires/PhaseTapChangerTablePoint.ts"],"names":[],"mappings":";;;AACA,2DAA4D;AAE5D,6BAA8B;AAC9B,iEAA4D;AAE5D,kEAAoF;AAEpF,MAAa,yBAA0B,SAAQ,2CAAoB;IAMjE,YAAY,IAAa;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,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,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,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAG,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YACjC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,kCAAkC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SACjG;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;YAC3H,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBACjC,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,6CAA6C,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;gBAClH,IAAA,sCAAqB,EAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,eAAe,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;gBAClH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,+DAA+D,CAAC,CAAC;aACzF;SACF;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC1B,IAAI,CAAC,KAAK,GAAG,mBAAmB,CAAC,yBAAyB,CAAC,KAAK,CAAC;YACjE,aAAa,IAAI,iCAAiC,CAAC;SACtD;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,+BAA+B,CAAC,mBAAyC;QACvE,IAAI,aAAa,GAAG,KAAK,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;QAC/E,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAtDD,8DAsDC"}
+{"version":3,"file":"PhaseTapChangerTablePoint.js","sourceRoot":"","sources":["../../../src/model/wires/PhaseTapChangerTablePoint.ts"],"names":[],"mappings":";;;AACA,2DAA4D;AAE5D,6BAA8B;AAC9B,iEAA4D;AAE5D,kEAAoF;AAEpF,MAAa,yBAA0B,SAAQ,2CAAoB;IACjE,oBAAoB,CAAuB;IAC3C,wBAAwB,CAAS;IAEjC,KAAK,CAAS;IAEd,YAAY,IAAa;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,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,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAG,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YACjC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,kCAAkC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SACjG;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,IAAI,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;YAC3H,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBACjC,SAAS,CAAC,cAAc,CAAC,WAAO,CAAC,aAAa,EAAE,6CAA6C,EAAE,WAAO,CAAC,SAAS,CAAC,CAAC;gBAClH,IAAA,sCAAqB,EAAC,SAAS,EAAE,WAAO,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,eAAe,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;gBAClH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,+DAA+D,CAAC,CAAC;aACzF;SACF;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC1B,IAAI,CAAC,KAAK,GAAG,mBAAmB,CAAC,yBAAyB,CAAC,KAAK,CAAC;YACjE,aAAa,IAAI,iCAAiC,CAAC;SACtD;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,+BAA+B,CAAC,mBAAyC;QACvE,IAAI,aAAa,GAAG,KAAK,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;QAC/E,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAtDD,8DAsDC"}

package/dist/model/wires/PhaseTapChangerTabular.d.ts

@@ -5,6 +5,7 @@ export declare class PhaseTapChangerTabular extends PhaseTapChanger {
     phaseTapChangerTable: PhaseTapChangerTable;
     phaseTapChangerTableUUID: string;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string);
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
 }

package/dist/model/wires/PhaseTapChangerTabular.js

@@ -5,9 +5,12 @@ const PhaseTapChanger_1 = require("./PhaseTapChanger");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class PhaseTapChangerTabular extends PhaseTapChanger_1.PhaseTapChanger {
+    phaseTapChangerTable;
+    phaseTapChangerTableUUID;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
             const suffixID = this.getSuffixID(profile);

package/dist/model/wires/PhaseTapChangerTabular.js.map

@@ -1 +1 @@
-{"version":3,"file":"PhaseTapChangerTabular.js","sourceRoot":"","sources":["../../../src/model/wires/PhaseTapChangerTabular.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAEpD,qDAAkD;AAElD,kEAAsE;AAEtE,MAAa,sBAAuB,SAAQ,iCAAe;IAKzD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;YAC3H,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBACjC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,6CAA6C,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAClH,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;gBAClH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,4DAA4D,CAAC,CAAC;aACtF;SACF;IACH,CAAC;CACF;AAnCD,wDAmCC"}
+{"version":3,"file":"PhaseTapChangerTabular.js","sourceRoot":"","sources":["../../../src/model/wires/PhaseTapChangerTabular.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAEpD,qDAAkD;AAElD,kEAAsE;AAEtE,MAAa,sBAAuB,SAAQ,iCAAe;IAEzD,oBAAoB,CAAuB;IAC3C,wBAAwB,CAAS;IAEjC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC;YAC3H,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBACjC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,6CAA6C,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAClH,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;gBAClH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,4DAA4D,CAAC,CAAC;aACtF;SACF;IACH,CAAC;CACF;AAnCD,wDAmCC"}

package/dist/model/wires/Plant.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Plant = void 0;
 const EquipmentContainer_1 = require("../core/EquipmentContainer");
 class Plant extends EquipmentContainer_1.EquipmentContainer {
+    static sparqlQuery = ``;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
 }
 exports.Plant = Plant;
-Plant.sparqlQuery = ``;
 //# sourceMappingURL=Plant.js.map

package/dist/model/wires/Plant.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plant.js","sourceRoot":"","sources":["../../../src/model/wires/Plant.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAE9D,MAAa,KAAM,SAAQ,uCAAkB;IAKzC,YAAY,IAAY,EAAE,IAAY,EAAE,SAAkB,EAAE,WAAoB;QAC5E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;;AAPL,sBASC;AANiB,iBAAW,GAAY,EAAE,CAAA"}
+{"version":3,"file":"Plant.js","sourceRoot":"","sources":["../../../src/model/wires/Plant.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAE9D,MAAa,KAAM,SAAQ,uCAAkB;IAGlC,MAAM,CAAC,WAAW,GAAY,EAAE,CAAA;IAEvC,YAAY,IAAY,EAAE,IAAY,EAAE,SAAkB,EAAE,WAAoB;QAC5E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;;AAPL,sBASC"}

package/dist/model/wires/PowerTransformer.d.ts

@@ -1,31 +1,33 @@
 import { ConductingEquipment } from '../core/ConductingEquipment';
 import { PowerTransformerEnd } from './PowerTransformerEnd';
-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';
 import { IIdentifiedObject } from '../../interfaces/model/core/IIdentifiedObject';
 import { IConnectivityNode } from '../../interfaces/model/core/IConnectivityNode';
 export declare class PowerTransformer extends ConductingEquipment {
-    powerTransformerEnds: PowerTransformerEnd[];
+    powerTransformerEnd: PowerTransformerEnd[];
     isPartOfGeneratorUnit: boolean;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     addPowerTransformerEnd(powerTransformerEnd: PowerTransformerEnd): void;
     static getQuerySPARQL(graphURI: string): string;
     static sparqlQuery: 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;
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
     private getRatedS;
     breadthFirstSearch(networkElements: any[]): void;
     determineTopologicalNodes(connNodes: IConnectivityNode[]): void;
+    /** Die Reihenfolge ist absteigend nach Spannungsebene */
     getBusConnections(): IIdentifiedObject[];
     sortTransformerEnds(): void;
     sortTransformerEnd(sortProperty: string, order: 'asc' | 'desc'): void;
     toGeoJSON(geoJSON: any, 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;

package/dist/model/wires/PowerTransformer.js

@@ -7,13 +7,14 @@ const utils_1 = require("../../util/utils");
 const datatype_converter_1 = require("../../util/datatype-converter");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
+    powerTransformerEnd;
+    isPartOfGeneratorUnit = false;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
-        this.isPartOfGeneratorUnit = false;
-        this.powerTransformerEnds = [];
+        this.powerTransformerEnd = [];
     }
     addPowerTransformerEnd(powerTransformerEnd) {
-        this.powerTransformerEnds.push(powerTransformerEnd);
+        this.powerTransformerEnd.push(powerTransformerEnd);
     }
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
@@ -21,9 +22,36 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
         }
         return PowerTransformer.sparqlQuery;
     }
+    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(?trUUID), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(STR(?trUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName ?description ?installation ?isPartOfGeneratorUnit
+        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?trUUID rdf:type cim:PowerTransformer .
+                OPTIONAL {?trUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?trUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?trUUID enervance:IdentifiedObject.installation ?installation .}
+                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?trUUID cim:PowerTransformer.isPartOfGeneratorUnit ?isPartOfGeneratorUnit .}
+                OPTIONAL {?trUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+        }
+    `;
     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 PowerTransformer();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addPowerTransformer(newClass);
@@ -43,16 +71,15 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
         return this.json;
     }
     toJSONAttributes() {
-        var _a, _b;
         super.toJSONAttributes();
-        this.json['s'] = (_a = this.getRatedS()) === null || _a === void 0 ? void 0 : _a.ratedS;
-        this.json['umspannung'] = (_b = this.powerTransformerEnds.map(elem => elem.baseVoltage.nominalVoltage.value)) === null || _b === void 0 ? void 0 : _b.join('/');
+        this.json['s'] = this.getRatedS()?.ratedS;
+        this.json['umspannung'] = this.powerTransformerEnd.map(elem => elem.baseVoltage.nominalVoltage.value)?.join('/');
     }
     toJSONAssociations() {
         super.toJSONAssociations();
     }
     getRatedS() {
-        return this.powerTransformerEnds.reduce(function (prev, curr) {
+        return this.powerTransformerEnd.reduce(function (prev, curr) {
             return curr.ratedS > prev.ratedS ? curr : prev;
         });
     }
@@ -62,15 +89,16 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
             super.breadthFirstSearch(networkElements);
         }
     }
+    //hier endet der Aufruf
     determineTopologicalNodes(connNodes) {
         return;
     }
+    /** Die Reihenfolge ist absteigend nach Spannungsebene */
     getBusConnections() {
-        var _a;
         const connections = [];
-        for (let i = 0; i < this.powerTransformerEnds.length; i++) {
-            const element = this.powerTransformerEnds[i];
-            const node = (_a = element.terminal) === null || _a === void 0 ? void 0 : _a.getConnectedNode();
+        for (let i = 0; i < this.powerTransformerEnd.length; i++) {
+            const element = this.powerTransformerEnd[i];
+            const node = element.terminal?.getConnectedNode();
             if (node) {
                 connections.push(node);
             }
@@ -78,7 +106,7 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
         return connections;
     }
     sortTransformerEnds() {
-        const sortedArray = this.powerTransformerEnds.sort((n1, n2) => {
+        const sortedArray = this.powerTransformerEnd.sort((n1, n2) => {
             if (n1.endNumber > n2.endNumber) {
                 return 1;
             }
@@ -87,10 +115,10 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
             }
             return 0;
         });
-        this.powerTransformerEnds = sortedArray;
+        this.powerTransformerEnd = sortedArray;
     }
     sortTransformerEnd(sortProperty, order) {
-        this.powerTransformerEnds.sort(function (w1, w2) {
+        this.powerTransformerEnd.sort(function (w1, w2) {
             if (order === 'asc')
                 return w1[sortProperty] - w2[sortProperty];
             if (order === 'desc')
@@ -114,7 +142,7 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
                     [x + offsetX, y + offsetY],
                     [x + offsetX, y - offsetY],
                     [x - offsetX, y - offsetY],
-                    [x - offsetX, y + offsetY]
+                    [x - offsetX, y + offsetY] //links oben
                 ]
             ];
             geoJSON['geometry'] = {
@@ -136,6 +164,7 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
         }
         return geoJSON;
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
             const suffixID = this.getSuffixID(profile);
@@ -158,32 +187,4 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
     }
 }
 exports.PowerTransformer = PowerTransformer;
-PowerTransformer.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(?trUUID), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(STR(?trUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName ?description ?installation ?isPartOfGeneratorUnit
-        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?trUUID rdf:type cim:PowerTransformer .
-                OPTIONAL {?trUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?trUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?trUUID enervance:IdentifiedObject.installation ?installation .}
-                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?trUUID cim:PowerTransformer.isPartOfGeneratorUnit ?isPartOfGeneratorUnit .}
-                OPTIONAL {?trUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-        }
-    `;
 //# sourceMappingURL=PowerTransformer.js.map

package/dist/model/wires/PowerTransformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"PowerTransformer.js","sourceRoot":"","sources":["../../../src/model/wires/PowerTransformer.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAKhE,qDAAgD;AAChD,4CAA0C;AAE1C,sEAAwD;AAGxD,kEAAoF;AAEpF,MAAa,gBAAiB,SAAQ,yCAAmB;IAMvD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAH5C,0BAAqB,GAAY,KAAK,CAAC;QAIrC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;IACjC,CAAC;IAEM,sBAAsB,CAAC,mBAAwC;QACpE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACtD,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC5E;QACD,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACtC,CAAC;IA+BM,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,gBAAgB,EAAE,CAAC;YACxC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,qBAAqB,GAAG,IAAA,8BAAS,EAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC,CAAC;IACnF,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,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,GAAG,CAAC,GAAG,MAAA,IAAI,CAAC,SAAS,EAAE,0CAAE,MAAM,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,MAAA,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACpH,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;IAEO,SAAS;QAChB,OAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,UAAS,IAAI,EAAE,IAAI;YACxD,OAAO,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IACM,kBAAkB,CAAC,eAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC3C;IACH,CAAC;IAGM,yBAAyB,CAAC,SAA8B;QAC7D,OAAO;IACT,CAAC;IAGM,iBAAiB;;QACtB,MAAM,WAAW,GAAwB,EAAE,CAAC;QAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzD,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,QAAQ,0CAAE,gBAAgB,EAAE,CAAC;YAClD,IAAI,IAAI,EAAE;gBACR,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aACvB;SACF;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,mBAAmB;QACxB,MAAM,WAAW,GAA0B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YACnF,IAAI,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,EAAE;gBAC/B,OAAO,CAAC,CAAC;aACV;YACD,IAAI,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,EAAE;gBAC/B,OAAO,CAAC,CAAC,CAAC;aACX;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC;IAC1C,CAAC;IAEM,kBAAkB,CAAC,YAAoB,EAAE,KAAqB;QACnE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE;YAC7C,IAAI,KAAK,KAAK,KAAK;gBAAE,OAAO,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC;YAChE,IAAI,KAAK,KAAK,MAAM;gBAAE,OAAO,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,SAAS,CAAC,OAAY,EAAE,OAAe,EAAE,cAA+B,EAAE,aAA6B;QAE5G,MAAM,WAAW,GAAa,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAC7E,MAAM,UAAU,GAA0B,cAAc,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAE1F,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAG9C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE;YACjD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAEjE,MAAM,aAAa,GAAiB;gBAClC;oBACE,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;oBAC1B,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;oBAC1B,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;oBAC1B,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;oBAC1B,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;iBAC3B;aACF,CAAC;YACF,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,aAAa;aAC3B,CAAA;YAED,MAAM,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;YAC/C,OAAO,CAAC,YAAY,CAAC,GAAG;gBACtB,iBAAiB,EAAE,aAAa,CAAC,IAAI;gBACrC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;gBACjC,QAAQ,EAAE,CAAC,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,GAAC,GAAG;gBAC/C,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACd,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,GAAG,aAAa,CAAC;gBAC1C,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,GAAG,aAAa,CAAC;gBAC1C,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBAChB,MAAM,EAAE,UAAU,CAAC,aAAa;gBAChC,aAAa,EAAE,UAAU,CAAC,aAAa;aACxC,CAAA;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IAEH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,yCAAyC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACxH;IAEH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;;AA7MH,4CA8MC;AAxLe,4BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2BjC,CAAA"}
+{"version":3,"file":"PowerTransformer.js","sourceRoot":"","sources":["../../../src/model/wires/PowerTransformer.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/PowerTransformerEnd.d.ts

@@ -1,6 +1,6 @@
 import { PowerTransformer } from './PowerTransformer';
 import { TransformerEnd } from './TransformerEnd';
-import { Model } from '../model/Model';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 import XMLWriter from 'xml-writer';
 import { WindingConnection } from './WindingConnection';
 import { IDefaultValuesConfig } from '../../converter/integral7/interface-i7/IDefaultValuesConfig';
@@ -22,12 +22,13 @@ export declare class PowerTransformerEnd extends TransformerEnd {
     constructor(uuid?: string, name?: string, shortName?: string, description?: string, endNumber?: 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;
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): 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/wires/PowerTransformerEnd.js

@@ -6,20 +6,55 @@ const utils_1 = require("../../util/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class PowerTransformerEnd extends TransformerEnd_1.TransformerEnd {
+    powerTransformer;
+    powerTransformerUUID;
+    r = 0;
+    x = 0;
+    b = 0;
+    g = 0;
+    r0 = 0;
+    x0 = 0;
+    b0 = 0;
+    g0 = 0;
+    ratedS = 0;
+    ratedU = 0;
+    phaseAngleClock = 0;
+    connectionKind;
     constructor(uuid, name, shortName, description, endNumber) {
         super(uuid, name, shortName, description, endNumber);
-        this.r = 0;
-        this.x = 0;
-        this.b = 0;
-        this.g = 0;
-        this.r0 = 0;
-        this.x0 = 0;
-        this.b0 = 0;
-        this.g0 = 0;
-        this.ratedS = 0;
-        this.ratedU = 0;
-        this.phaseAngleClock = 0;
     }
+    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(?ptreUUID), '#'), '_') AS ?uuid) 
+        ?name ?shortName ?description ?r ?x ?ratedS ?ratedU ?endNumber 
+        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
+        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?powerTransformerUUID)
+         (strafter(strafter(str(?trUUID), '#'), '_') AS ?terminalUUID)
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?ptreUUID rdf:type cim:PowerTransformerEnd .
+                OPTIONAL{?ptreUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?ptreUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?ptreUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.r ?r .}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.x ?x .}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.ratedS ?ratedS .}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.ratedU ?ratedU .}
+                OPTIONAL{?ptreUUID cim:TransformerEnd.endNumber ?endNumber .}
+                OPTIONAL{?ptreUUID cim:TransformerEnd.BaseVoltage ?bvUUID}
+                OPTIONAL{?ptreUUID cim:TransformerEnd.Terminal ?trUUID.}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.PowerTransformer ?ptUUID.}
+            }
+        }
+    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return PowerTransformerEnd.sparqlQuery.replace('<http://default/>', graphURI);
@@ -27,8 +62,7 @@ class PowerTransformerEnd extends TransformerEnd_1.TransformerEnd {
         return PowerTransformerEnd.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 trafoEnd = new PowerTransformerEnd();
             trafoEnd.resolveAttributesFusekiJSON(value);
             cimModel.addPowerTransformerEnd(trafoEnd);
@@ -65,6 +99,7 @@ class PowerTransformerEnd extends TransformerEnd_1.TransformerEnd {
         super.toJSONAssociations();
         this.json['powerTransformerUUID'] = this.powerTransformerUUID;
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
             const suffixID = this.getSuffixID(profile);
@@ -90,6 +125,7 @@ class PowerTransformerEnd extends TransformerEnd_1.TransformerEnd {
             (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.ratedS`, this.ratedS ? this.ratedS : 0);
             (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.ratedU`, this.ratedU ? this.ratedU : 0);
             (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.phaseAngleClock`, this.phaseAngleClock ? this.phaseAngleClock : 0);
+            //<cim:PowerTransformerEnd.connectionKind rdf:resource="http://iec.ch/TC57/2013/CIM-schema-cim16#WindingConnection.Yn"/>
             if (this.connectionKind) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, `${this.constructor.name}.connectionKind`, rdf_xml_1.RDF_XML.CIM_NS_16);
                 (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.CIM_NS_16}WindingConnection.${this.connectionKind}`);
@@ -100,6 +136,7 @@ class PowerTransformerEnd extends TransformerEnd_1.TransformerEnd {
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
+            // <cim:PowerTransformerEnd.PowerTransformer rdf:resource="#_92b99273-a9ac-45e8-b422-5958cf26a312"/>
             this.powerTransformerUUID = this.powerTransformer ? this.powerTransformer.mrid : this.powerTransformerUUID;
             if (this.powerTransformerUUID) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, `${this.constructor.name}.PowerTransformer`, rdf_xml_1.RDF_XML.CIM_NS_16);
@@ -119,36 +156,4 @@ class PowerTransformerEnd extends TransformerEnd_1.TransformerEnd {
     }
 }
 exports.PowerTransformerEnd = PowerTransformerEnd;
-PowerTransformerEnd.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(?ptreUUID), '#'), '_') AS ?uuid) 
-        ?name ?shortName ?description ?r ?x ?ratedS ?ratedU ?endNumber 
-        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID) 
-        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?powerTransformerUUID)
-         (strafter(strafter(str(?trUUID), '#'), '_') AS ?terminalUUID)
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?ptreUUID rdf:type cim:PowerTransformerEnd .
-                OPTIONAL{?ptreUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?ptreUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?ptreUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.r ?r .}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.x ?x .}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.ratedS ?ratedS .}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.ratedU ?ratedU .}
-                OPTIONAL{?ptreUUID cim:TransformerEnd.endNumber ?endNumber .}
-                OPTIONAL{?ptreUUID cim:TransformerEnd.BaseVoltage ?bvUUID}
-                OPTIONAL{?ptreUUID cim:TransformerEnd.Terminal ?trUUID.}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.PowerTransformer ?ptUUID.}
-            }
-        }
-    `;
 //# sourceMappingURL=PowerTransformerEnd.js.map

package/dist/model/wires/PowerTransformerEnd.js.map

@@ -1 +1 @@
-{"version":3,"file":"PowerTransformerEnd.js","sourceRoot":"","sources":["../../../src/model/wires/PowerTransformerEnd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PowerTransformerEnd.js","sourceRoot":"","sources":["../../../src/model/wires/PowerTransformerEnd.ts"],"names":[],"mappings":";;;AACA,qDAAgD;AAEhD,4CAA0C;AAE1C,qDAAgD;AAGhD,kEAAoF;AAEpF,MAAa,mBAAoB,SAAQ,+BAAc;IAErD,gBAAgB,CAAmB;IACnC,oBAAoB,CAAS;IAE7B,CAAC,GAAW,CAAC,CAAC;IACd,CAAC,GAAW,CAAC,CAAC;IACd,CAAC,GAAW,CAAC,CAAC;IACd,CAAC,GAAW,CAAC,CAAC;IACd,EAAE,GAAW,CAAC,CAAC;IACf,EAAE,GAAW,CAAC,CAAC;IACf,EAAE,GAAW,CAAC,CAAC;IACf,EAAE,GAAW,CAAC,CAAC;IACf,MAAM,GAAW,CAAC,CAAC;IACnB,MAAM,GAAW,CAAC,CAAC;IACnB,eAAe,GAAW,CAAC,CAAC;IAC5B,cAAc,CAAoB;IAElC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,SAAkB;QACpG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;IAGM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BjC,CAAA;IAEI,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,mBAAmB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC/E;QACD,OAAO,mBAAmB,CAAC,WAAW,CAAC;IACzC,CAAC;IAEM,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,mBAAmB,EAAE,CAAC;YAC3C,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAC5C,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;QAEpE,IAAI,CAAC,CAAC,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,CAAC,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAE1C,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,gBAAgB;YAAE,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;;YACzE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,qCAAqC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAChI,CAAC;IAEM,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,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IAEpC,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;IAChE,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvG,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnH,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnH,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9I,wHAAwH;YACxH,IAAI,IAAI,CAAC,cAAc,EAAE;gBACvB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,iBAAiB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC9G,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,SAAS,qBAAqB,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;gBACpH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,oGAAoG;YACpG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;YAC3G,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,mBAAmB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAChH,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBAC9G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;aAC3D;SACF;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,aAAa,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,GAAG,CAAC;QAClE,OAAO,aAAa,CAAC;IACvB,CAAC;;AApKH,kDAsKC"}

package/dist/model/wires/RatioTapChanger.d.ts

@@ -10,6 +10,28 @@ export declare class RatioTapChanger extends TapChanger {
     ratioTapChangerTable: RatioTapChangerTable;
     ratioTapChangerTableUUID: string;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string);
+    /**                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(?bvUUID), "#"), "_") AS ?uuid)
+     ?name ?stepVoltageIncrement
+  
+     WHERE {
+                      GRAPH <http://localhost:3007/enerVance/data/i7test>{
+  
+                          ?bvUUID rdf:type cim:RatioTapChanger .
+                          OPTIONAL{?bvUUID cim:IdentifiedObject.name ?name .}
+                          OPTIONAL{?bvUUID cim:RatioTapChanger.stepVoltageIncrement ?stepVoltageIncrement .}
+                          OPTIONAL{?bvUUID cim:RatioTapChanger.transformerEnd ?trEndUUID .}
+                          OPTIONAL{?bvUUID cim:RatioTapChanger.ratioTapChangerTable ?trTapChUUID .}
+                      }
+                  }*/
+    /** 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/wires/RatioTapChanger.js

@@ -5,9 +5,37 @@ const __1 = require("../..");
 const TapChanger_1 = require("./TapChanger");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class RatioTapChanger extends TapChanger_1.TapChanger {
+    transformerEnd;
+    transformerEndUUID;
+    stepVoltageIncrement; //%
+    tculControlMode;
+    ratioTapChangerTable;
+    ratioTapChangerTableUUID;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
+    /**                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(?bvUUID), "#"), "_") AS ?uuid)
+     ?name ?stepVoltageIncrement
+  
+     WHERE {
+                      GRAPH <http://localhost:3007/enerVance/data/i7test>{
+  
+                          ?bvUUID rdf:type cim:RatioTapChanger .
+                          OPTIONAL{?bvUUID cim:IdentifiedObject.name ?name .}
+                          OPTIONAL{?bvUUID cim:RatioTapChanger.stepVoltageIncrement ?stepVoltageIncrement .}
+                          OPTIONAL{?bvUUID cim:RatioTapChanger.transformerEnd ?trEndUUID .}
+                          OPTIONAL{?bvUUID cim:RatioTapChanger.ratioTapChangerTable ?trTapChUUID .}
+                      }
+                  }*/
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_EQ || profile === __1.RDF_XML.PROFILE_SSH) {
             const suffixID = this.getSuffixID(profile);
@@ -51,6 +79,8 @@ class RatioTapChanger extends TapChanger_1.TapChanger {
             }
         }
     }
+    //There are no explicitly defined standardized mandatory attributes. See. CGMES 2.4.15 RatioTapChanger attribute list.
+    // TODO
     validateMandatoryAttributesCGMES(defaultValuesConfig) {
         let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
         if (!this.tculControlMode) {

package/dist/model/wires/RatioTapChanger.js.map

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