@enervance/insight-cim-model 0.0.62 → 0.0.63

package/dist/model/dc/DCLineSegment.js

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

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

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

package/dist/model/dc/DCNode.d.ts

@@ -5,8 +5,10 @@ import XMLWriter from 'xml-writer';
 export declare class DCNode extends IdentifiedObject {
     dcEquipmentContainer: DCEquipmentContainer;
     dcEquipmentContainerUUID: string;
+    /** ACDCConverterDCTerminal / DCTerminal*/
     dcTerminals: Map<string, DCBaseTerminal>;
     constructor(uuid?: 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/dc/DCNode.js

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

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

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

package/dist/model/dc/DCTerminal.d.ts

@@ -6,6 +6,7 @@ export declare class DCTerminal extends DCBaseTerminal {
     dCConductingEquipmentUUID: string;
     constructor(mrid?: string, name?: string, shortName?: string, description?: string);
     getDCConductingEquipmentUUID(): string;
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
 }

package/dist/model/dc/DCTerminal.js

@@ -5,6 +5,8 @@ const DCBaseTerminal_1 = require("./DCBaseTerminal");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class DCTerminal extends DCBaseTerminal_1.DCBaseTerminal {
+    dCConductingEquipment; // mandatory
+    dCConductingEquipmentUUID;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
@@ -19,6 +21,7 @@ class DCTerminal extends DCBaseTerminal_1.DCBaseTerminal {
             return undefined;
         }
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
             const suffixID = this.getSuffixID(profile);

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

@@ -1 +1 @@
-{"version":3,"file":"DCTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/DCTerminal.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAEhD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,UAAW,SAAQ,+BAAc;IAK5C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,4BAA4B;QAC1B,IAAG,IAAI,CAAC,yBAAyB,EAAC;YAChC,OAAO,IAAI,CAAC,yBAAyB,CAAC;SACvC;aAAK,IAAG,IAAI,CAAC,qBAAqB,EAAC;YAClC,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;SAC7C;aAAI;YACH,OAAO,SAAS,CAAC;SAClB;IACH,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,yBAAyB,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAA,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC;YAC9H,IAAI,IAAI,CAAC,yBAAyB,EAAE;gBAClC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,kCAAkC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACvG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;gBACnH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,sCAAsC,CAAC,CAAC;aAChE;SACF;IACH,CAAC;CAEF;AA9CD,gCA8CC"}
+{"version":3,"file":"DCTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/DCTerminal.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAEhD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,UAAW,SAAQ,+BAAc;IAE5C,qBAAqB,CAAwB,CAAC,YAAY;IAC1D,yBAAyB,CAAS;IAElC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,4BAA4B;QAC1B,IAAG,IAAI,CAAC,yBAAyB,EAAC;YAChC,OAAO,IAAI,CAAC,yBAAyB,CAAC;SACvC;aAAK,IAAG,IAAI,CAAC,qBAAqB,EAAC;YAClC,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;SAC7C;aAAI;YACH,OAAO,SAAS,CAAC;SAClB;IACH,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,yBAAyB,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAA,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC;YAC9H,IAAI,IAAI,CAAC,yBAAyB,EAAE;gBAClC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,kCAAkC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACvG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;gBACnH,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,sCAAsC,CAAC,CAAC;aAChE;SACF;IACH,CAAC;CAEF;AA9CD,gCA8CC"}

package/dist/model/dc/VsConverter.d.ts

@@ -4,7 +4,9 @@ import { VsQpccControlKind } from './VsQpccControlKind';
 import XMLWriter from 'xml-writer';
 import { IDefaultValuesConfig } from '../../converter/integral7/interface-i7/IDefaultValuesConfig';
 export declare class VsConverter extends ACDCConverter {
+    /** The max quotient between the AC converter voltage (Uc) and DC voltage (Ud). A factor typically less than 1. VSC configuration data used in power flow. */
     maxModulationIndex: number;
+    /** The maximum current through a valve. This current limit is the basis for calculating the capability diagram. VSC  configuration data. */
     maxValveCurrent: number;
     droop: number;
     droopCompensation: number;
@@ -14,6 +16,7 @@ export declare class VsConverter extends ACDCConverter {
     targetQpcc: number;
     targetUpcc: number;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     validateMandatoryAttributesCGMES(defaultValuesConfig: IDefaultValuesConfig): string;

package/dist/model/dc/VsConverter.js

@@ -8,9 +8,21 @@ const rdf_xml_1 = require("../../constants/rdf-xml");
 const utils_1 = require("../../converter/integral7/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class VsConverter extends ACDCConverter_1.ACDCConverter {
+    /** The max quotient between the AC converter voltage (Uc) and DC voltage (Ud). A factor typically less than 1. VSC configuration data used in power flow. */
+    maxModulationIndex;
+    /** The maximum current through a valve. This current limit is the basis for calculating the capability diagram. VSC  configuration data. */
+    maxValveCurrent;
+    droop; // PU mandatory
+    droopCompensation; // resistance mandatory
+    pPccControl; // mandatory Kind of control of real power and/or DC voltage.
+    qPccControl; // mandatory
+    qShare; // Percent mandatory Reactive power sharing factor among parallel converters on Uac control.
+    targetQpcc; // ReactivePower mandatory
+    targetUpcc; // Voltage mandatory
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_SSH || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
             const suffixID = this.getSuffixID(profile);

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

@@ -1 +1 @@
-{"version":3,"file":"VsConverter.js","sourceRoot":"","sources":["../../../src/model/dc/VsConverter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VsConverter.js","sourceRoot":"","sources":["../../../src/model/dc/VsConverter.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,2DAAsD;AACtD,2DAAsD;AACtD,qDAAgD;AAGhD,2DAA4D;AAC5D,kEAAoF;AAEpF,MAAa,WAAY,SAAQ,6BAAa;IAE5C,6JAA6J;IAC7J,kBAAkB,CAAS;IAC3B,4IAA4I;IAC5I,eAAe,CAAS;IAExB,KAAK,CAAS,CAAC,eAAe;IAC9B,iBAAiB,CAAS,CAAC,uBAAuB;IAClD,WAAW,CAAoB,CAAC,6DAA6D;IAC7F,WAAW,CAAoB,CAAC,YAAY;IAC5C,MAAM,CAAS,CAAC,4FAA4F;IAC5G,UAAU,CAAS,CAAC,0BAA0B;IAC9C,UAAU,CAAS,CAAC,oBAAoB;IAExC,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,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YAC1G,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,iCAAiC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAC5G,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,8BAA8B,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;SACvG;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YAC1C,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAClF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,gCAAgC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAE1G,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC9F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,SAAS,qBAAqB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACjH,SAAS,CAAC,UAAU,EAAE,CAAC;YAEvB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC9F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,SAAS,qBAAqB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACjH,SAAS,CAAC,UAAU,EAAE,CAAC;YAEvB,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACpF,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,yBAAyB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5F,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,yBAAyB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SAC7F;IACH,CAAC;IACD,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;YAC5B,IAAI,CAAC,KAAK,GAAG,mBAAmB,CAAC,WAAW,CAAC,KAAK,CAAC;YACnD,aAAa,IAAI,QAAQ,CAAA;SAC1B;QACD,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,mBAAmB,CAAC,WAAW,CAAC,iBAAiB,CAAC;YAC3E,aAAa,IAAI,oBAAoB,CAAA;SACtC;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,IAAI,CAAC,WAAW,GAAG,qCAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAClF,aAAa,IAAI,cAAc,CAAA;SAChC;QACD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,IAAI,CAAC,WAAW,GAAG,qCAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAClF,aAAa,IAAI,cAAc,CAAA;SAChC;QAED,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC;YACrD,aAAa,IAAI,SAAS,CAAA;SAC3B;QACD,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACjC,IAAI,CAAC,UAAU,GAAG,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC;YAC7D,aAAa,IAAI,aAAa,CAAA;SAC/B;QACD,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACjC,IAAI,CAAC,UAAU,GAAG,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC;YAC7D,aAAa,IAAI,aAAa,CAAA;SAC/B;QACD,IAAI,aAAa,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,GAAG,CAAC;QAClE,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAzFD,kCAyFC"}

package/dist/model/diagram/Diagram.d.ts

@@ -1,6 +1,6 @@
 import { IdentifiedObject } from "../core/IdentifiedObject";
 import { DiagramObject } from "../diagram/DiagramObject";
-import { Model } from "../model/Model";
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 import { OrientationKind } from './OrientationKind';
 import XMLWriter from 'xml-writer';
 import { DiagramStyle } from './DiagramStyle';
@@ -17,12 +17,13 @@ export declare class Diagram extends IdentifiedObject {
     getDiagramElements(): DiagramObject[];
     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/diagram/Diagram.js

@@ -5,9 +5,15 @@ const IdentifiedObject_1 = require("../core/IdentifiedObject");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class Diagram extends IdentifiedObject_1.IdentifiedObject {
+    orientation;
+    x1InitialView;
+    x2InitialView;
+    y1InitialView;
+    y2InitialView;
+    diagramStyle;
+    diagramElements = [];
     constructor(uuid, name, shortName, description, baseIRI) {
         super(uuid, name, shortName, description, baseIRI);
-        this.diagramElements = [];
     }
     addDiagramObject(diagramObject) {
         this.diagramElements.push(diagramObject);
@@ -15,6 +21,27 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
     getDiagramElements() {
         return this.diagramElements;
     }
+    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(?diagramUUID), "#"), "_") AS ?uuid) 
+                ?name ?shortName
+                        
+        WHERE {
+            GRAPH <http://default/>{
+                ?diagramUUID rdf:type cim:Diagram .
+                OPTIONAL {?diagramUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?diagramUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?diagramUUID cim:Diagram.orientation ?orientationEnum .}
+            }
+        }
+    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return Diagram.sparqlQuery.replace("<http://default/>", graphURI);
@@ -22,8 +49,7 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
         return Diagram.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 newClass = new Diagram();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addDiagram(newClass);
@@ -47,6 +73,7 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
     toJSONAssociations() {
         super.toJSONAssociations();
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_DL) {
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
@@ -54,6 +81,10 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
+            /*            if(this.diagramStyle) {
+                            this.diagramStyle.toCIMXML(xmlWriter, profile);
+                        }*/
+            // DiagramElemente
             for (const diagramElement of this.diagramElements) {
                 diagramElement.toCIMXML(xmlWriter, profile);
             }
@@ -62,6 +93,7 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_DL) {
+            /*<entsoe:OperationalLimitType.limitType rdf:resource="http://entsoe.eu/CIM/SchemaExtension/3/1#LimitTypeKind.patl"/>*/
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, `${this.constructor.name}.orientation`, 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}OrientationKind.${this.orientation}`);
             xmlWriter.endElement();
@@ -70,6 +102,7 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_DL) {
+            /*<cim:VoltageLevel.Substation rdf:resource="#_1be806f9-0316-4bb8-b350-f54a292353f1"/>*/
             if (this.diagramStyle) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, `${this.constructor.name}.DiagramStyle`, 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.HASH_UNDERSCORE}${this.diagramStyle.mrid}`);
@@ -82,25 +115,4 @@ class Diagram extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.Diagram = Diagram;
-Diagram.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(?diagramUUID), "#"), "_") AS ?uuid) 
-                ?name ?shortName
-                        
-        WHERE {
-            GRAPH <http://default/>{
-                ?diagramUUID rdf:type cim:Diagram .
-                OPTIONAL {?diagramUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?diagramUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?diagramUUID cim:Diagram.orientation ?orientationEnum .}
-            }
-        }
-    `;
 //# sourceMappingURL=Diagram.js.map

package/dist/model/diagram/Diagram.js.map

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

package/dist/model/diagram/DiagramObject.d.ts

@@ -1,11 +1,12 @@
 import { IdentifiedObject } from '../core/IdentifiedObject';
 import { Diagram } from '../diagram/Diagram';
 import { DiagramObjectPoint } from '../diagram/DiagramObjectPoint';
-import { Model } from '../model/Model';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos';
 import XMLWriter from 'xml-writer';
 export declare class DiagramObject extends IdentifiedObject {
     drawingOrder: number;
+    /** angle of rotation (in Degrees) of the diagram object in a clockwise direction from the normal */
     rotation: number;
     identifiedObject: IdentifiedObject;
     identifiedObjectUUID: string;
@@ -29,14 +30,15 @@ export declare class DiagramObject extends IdentifiedObject {
     addDiagramObjectPoint(diagramObjectPoint: DiagramObjectPoint): void;
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
     createNewStatementSPARQL(): string;
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     getGeoJSON(profile: string, schemaSettings: ISchemaSettings): any;
     computeCoordiantes(profile: string, schemaSettings: ISchemaSettings): any;
     computeRectBounds(diagramObject: DiagramObject): number[];
     computeRectCircle(diagramObject: DiagramObject): number[];
+    /** 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/diagram/DiagramObject.js

@@ -7,9 +7,17 @@ const xml_serializer_1 = require("../../util/xml/xml.serializer");
 const __1 = require("../..");
 const xml_serializer_2 = require("../../util/xml/xml.serializer");
 class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
+    drawingOrder;
+    /** angle of rotation (in Degrees) of the diagram object in a clockwise direction from the normal */
+    rotation = 0;
+    identifiedObject;
+    identifiedObjectUUID;
+    diagram;
+    diagramUUID;
+    //private diagramObjectPoints : Array<DiagramObjectPoint>;
+    diagramObjectPoints;
     constructor(uuid, name, shortName, description, baseIRI) {
         super(uuid, name, shortName, description);
-        this.rotation = 0;
         this.baseIRI = baseIRI;
         this.diagramObjectPoints = [];
     }
@@ -74,6 +82,30 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
     addDiagramObjectPoint(diagramObjectPoint) {
         this.diagramObjectPoints.push(diagramObjectPoint);
     }
+    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(?doUUID), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(str(?doUUID), '#_'), '#_') AS ?baseIRI) 
+        (strafter(strafter(str(?dUUID), '#'), '_') AS ?diagramUUID) 
+        (strafter(strafter(str(?psrUUID), '#'), '_') AS ?identifiedObjectUUID) ?drawingOrder ?rotation
+                        
+        WHERE {
+            GRAPH <http://default/>{
+                ?doUUID rdf:type cim:DiagramObject .
+                OPTIONAL {?doUUID cim:DiagramObject.drawingOrder ?drawingOrder .}
+                OPTIONAL {?doUUID cim:DiagramObject.rotation ?rotation .}
+                OPTIONAL {?doUUID cim:DiagramObject.IdentifiedObject ?psrUUID .}
+                OPTIONAL {?doUUID cim:DiagramObject.Diagram ?dUUID .}
+            }
+        }
+    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return DiagramObject.sparqlQuery.replace('<http://default/>', graphURI);
@@ -81,8 +113,7 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
         return DiagramObject.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 newClass = new DiagramObject();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addDiagramObject(newClass);
@@ -106,9 +137,11 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
         this.diagram = cimModel.getDiagram(this.diagramUUID);
         if (this.diagram)
             this.diagram.addDiagramObject(this);
+        // else console.log(this.constructor.name + ' ' + this.mrid + ' hat keine diagramm Instanz ' + this.identifiedObjectUUID);
         this.identifiedObject = cimModel.getObject(this.identifiedObjectUUID);
         if (this.identifiedObject)
             this.identifiedObject.addDiagramObject(this);
+        // else console.log(this.constructor.name + ' ' + this.mrid + ' hat keine identifiedObjectInstanz ' + this.identifiedObjectUUID);
     }
     getGeoJSON(profile, schemaSettings) {
         if (this.identifiedObject) {
@@ -133,6 +166,7 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
             x = diagramObject.diagramObjectPoints[0].getXPosition();
             y = diagramObject.diagramObjectPoints[0].getYPosition();
         }
+        //deprecated
         else if (diagramObjectPointsLength === 4) {
             x = diagramObject.diagramObjectPoints[0].getXPosition();
             y = diagramObject.diagramObjectPoints[0].getYPosition();
@@ -144,18 +178,19 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
             y = diagramObject.diagramObjectPoints[0].getYPosition();
             const x2 = diagramObject.diagramObjectPoints[diagramObjectPointsLength - 1].getXPosition();
             const y2 = diagramObject.diagramObjectPoints[diagramObjectPointsLength - 1].getYPosition();
+            //Der Fall x1 > x2
             let revereDirection = false;
-            if (x <= x2 && Math.abs(x - x2) > 1) {
+            if (x <= x2 && Math.abs(x - x2) > 1) { //Breite
                 width = x2 - x;
             }
-            else if (x >= x2 && Math.abs(x2 - x) > 1) {
+            else if (x >= x2 && Math.abs(x2 - x) > 1) { //Breite
                 width = x - x2;
                 revereDirection = true;
             }
-            if (y < y2 && Math.abs(y - y2) > 1) {
+            if (y < y2 && Math.abs(y - y2) > 1) { //Hoehe
                 height = y2 - y;
             }
-            if (y > y2 && Math.abs(y2 - y) > 1) {
+            if (y > y2 && Math.abs(y2 - y) > 1) { //Hoehe
                 height = y - y2;
                 revereDirection = true;
             }
@@ -190,17 +225,32 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
             const y1 = diagramObject.diagramObjectPoints[0].getYPosition();
             const x2 = diagramObject.diagramObjectPoints[length - 1].getXPosition();
             const y2 = diagramObject.diagramObjectPoints[length - 1].getYPosition();
+            /** horizontal */
             if (yStdAbw < 3) {
                 width = x2 - x1;
                 height = 1;
             }
+            /** vertikal */
             else {
                 width = 1;
                 height = y2 - y1;
             }
+            /*      x = diagramObject.diagramObjectPoints[0].getXPosition();
+                    y = diagramObject.diagramObjectPoints[0].getYPosition();
+            
+                    const x2 = diagramObject.diagramObjectPoints[length - 1].getXPosition();
+                    const y2 = diagramObject.diagramObjectPoints[length - 1].getYPosition();
+            
+                    if (x <= x2 && Math.abs(x - x2) > 1) {//Breite
+                      width = x2 - x;
+                    }
+                    if (y < y2 && Math.abs(y - y2) > 1) {//Hoehe
+                      height = y2 - y;
+                    }*/
         }
         return [x, y, width, height];
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_DL) {
             xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
@@ -208,6 +258,7 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
+            // Points
             for (const point of this.diagramObjectPoints) {
                 point.toCIMXML(xmlWriter, profile);
             }
@@ -269,28 +320,4 @@ class DiagramObject extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.DiagramObject = DiagramObject;
-DiagramObject.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(?doUUID), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(str(?doUUID), '#_'), '#_') AS ?baseIRI) 
-        (strafter(strafter(str(?dUUID), '#'), '_') AS ?diagramUUID) 
-        (strafter(strafter(str(?psrUUID), '#'), '_') AS ?identifiedObjectUUID) ?drawingOrder ?rotation
-                        
-        WHERE {
-            GRAPH <http://default/>{
-                ?doUUID rdf:type cim:DiagramObject .
-                OPTIONAL {?doUUID cim:DiagramObject.drawingOrder ?drawingOrder .}
-                OPTIONAL {?doUUID cim:DiagramObject.rotation ?rotation .}
-                OPTIONAL {?doUUID cim:DiagramObject.IdentifiedObject ?psrUUID .}
-                OPTIONAL {?doUUID cim:DiagramObject.Diagram ?dUUID .}
-            }
-        }
-    `;
 //# sourceMappingURL=DiagramObject.js.map