npm - @enervance/insight-cim-model - Versions diffs - 0.0.486 → 1.0.0-dev - Mend

@enervance/insight-cim-model 0.0.486 → 1.0.0-dev

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2678) hide show

package/dist/model/dc/DCLineSegment.js CHANGED Viewed

@@ -1,14 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DCLineSegment = void 0;
-const DCConductingEquipment_1 = require("./DCConductingEquipment.js");
-const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-const parser_utils_1 = require("../../utils2/parser.utils.js");
+const DCConductingEquipment_1 = require("./DCConductingEquipment");
+const rdf_xml_1 = require("../../constants/rdf-xml");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
+const parser_utils_1 = require("../../utils2/parser.utils");
 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);
@@ -53,30 +87,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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DCLineSegment.js","sourceRoot":"","sources":["../../../src/model/dc/DCLineSegment.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAE9D,qDAAgD;AAChD,kEAAoF;AAEpF,4DAAwD;AAExD,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,CAAC;YACtB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QAC1E,CAAC;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,CAAC;YACxE,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;QACzB,CAAC;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,CAAC;YACnC,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;QAChG,CAAC;IACH,CAAC;IAED,+BAA+B,CAAC,mBAAiD;QAC/E,IAAI,aAAa,GAAG,KAAK,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;QAC/E,IAAI,CAAC,IAAA,0BAAW,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,GAAG,mBAAmB,CAAC,aAAa,CAAC,UAAU,CAAC;YAC/D,IAAG,aAAa,CAAC,MAAM,KAAG,CAAC,EAAC,CAAC;gBAC3B,aAAa,IAAI,YAAY,CAAA;YAC/B,CAAC;iBAAI,CAAC;gBACJ,aAAa,IAAI,aAAa,CAAA;YAChC,CAAC;QACH,CAAC;QAED,IAAI,aAAa,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,GAAG,CAAC;QAElE,OAAO,aAAa,CAAC;IACvB,CAAC;;AAzFH,sCA0FC~~;AAxEe,yBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;KAyBjC,CAAC~~"}
1	+ {"version":3,"file":"DCLineSegment.js","sourceRoot":"","sources":["../../../src/model/dc/DCLineSegment.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAE9D,qDAAgD;AAChD,kEAAoF;AAEpF,4DAAwD;AAExD,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,CAAC;YACtB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QAC1E,CAAC;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,CAAC;YACxE,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;QACzB,CAAC;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,CAAC;YACnC,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;QAChG,CAAC;IACH,CAAC;IAED,+BAA+B,CAAC,mBAAiD;QAC/E,IAAI,aAAa,GAAG,KAAK,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;QAC/E,IAAI,CAAC,IAAA,0BAAW,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,GAAG,mBAAmB,CAAC,aAAa,CAAC,UAAU,CAAC;YAC/D,IAAG,aAAa,CAAC,MAAM,KAAG,CAAC,EAAC,CAAC;gBAC3B,aAAa,IAAI,YAAY,CAAA;YAC/B,CAAC;iBAAI,CAAC;gBACJ,aAAa,IAAI,aAAa,CAAA;YAChC,CAAC;QACH,CAAC;QAED,IAAI,aAAa,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,GAAG,CAAC;QAElE,OAAO,aAAa,CAAC;IACvB,CAAC;;AAzFH,sCA0FC"}

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

@@ -1,8 +1,8 @@
-import { IdentifiedObject } from '../core/IdentifiedObject.js';
-import { DCEquipmentContainer } from './DCEquipmentContainer.js';
-import { DCBaseTerminal } from './DCBaseTerminal.js';
+import { IdentifiedObject } from '../core/IdentifiedObject';
+import { DCEquipmentContainer } from './DCEquipmentContainer';
+import { DCBaseTerminal } from './DCBaseTerminal';
 import { XMLWriter } from '@enervance/xml-writer';
-import { DCTopologicalNode } from './DCTopologicalNode.js';
+import { DCTopologicalNode } from './DCTopologicalNode';
 export declare class DCNode extends IdentifiedObject {
     dcEquipmentContainer: DCEquipmentContainer;
     dcEquipmentContainerUUID: string;

package/dist/model/dc/DCNode.js CHANGED Viewed

@@ -1,14 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DCNode = void 0;
-const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
-const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
+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();
+    dcTopologicalNode;
+    dcTopologicalNodeUUID;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
-        /** ACDCConverterDCTerminal / DCTerminal*/
-        this.dcTerminals = new Map();
     }
     /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"DCNode.js","sourceRoot":"","sources":["../../../src/model/dc/DCNode.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAG1D,qDAAgD;AAEhD,kEAAoF;AAGpF,MAAa,MAAO,SAAQ,mCAAgB;~~IAW1C~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;~~QAP5C~~,~~0CAA0C;QAC1C,gBAAW,GAAgC,IAAI,GAAG,EAAE,~~CAAC;~~IAOrD,CAAC;~~IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE,CAAC;YACnC,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;QACzB,CAAC;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,iBAAO,CAAC,SAAS,CAAC;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,QAAQ,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC7E,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;QACzB,CAAC;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,CAAC;YACnC,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,CAAC;gBAClC,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;YACzB,CAAC;iBAAM,CAAC;gBACN,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACvC,SAAS,CAAC,YAAY,CAAC,qCAAqC,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE,CAAC;YAC1C,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;YAC/G,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAClC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,0BAA0B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC/F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;gBAC/G,SAAS,CAAC,UAAU,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,YAAY,CAAC,yCAAyC,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C;;WAEG;IACL,CAAC;IAEM,wBAAwB,CAAC,qBAA6B;QAC3D,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;CACF;AAvED,wBAuEC"}
1	+ {"version":3,"file":"DCNode.js","sourceRoot":"","sources":["../../../src/model/dc/DCNode.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,5 @@
-import { DCBaseTerminal } from './DCBaseTerminal.js';
-import { DCConductingEquipment } from './DCConductingEquipment.js';
+import { DCBaseTerminal } from './DCBaseTerminal';
+import { DCConductingEquipment } from './DCConductingEquipment';
 import { XMLWriter } from '@enervance/xml-writer';
 export declare class DCTerminal extends DCBaseTerminal {
     dCConductingEquipment: DCConductingEquipment;

package/dist/model/dc/DCTerminal.js CHANGED Viewed

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DCTerminal = void 0;
-const DCBaseTerminal_1 = require("./DCBaseTerminal.js");
-const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
+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);
         this.connected = true;

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

	@@ -1 +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;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,4BAA4B;QAC1B,IAAG,IAAI,CAAC,yBAAyB,EAAC,CAAC;YACjC,OAAO,IAAI,CAAC,yBAAyB,CAAC;QACxC,CAAC;aAAK,IAAG,IAAI,CAAC,qBAAqB,EAAC,CAAC;YACnC,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;QAC9C,CAAC;aAAI,CAAC;YACJ,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,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,UAAU,EAAE,CAAC;YACxG,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;QACzB,CAAC;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,CAAC;YACnC,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,CAAC;gBACnC,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;YACzB,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,YAAY,CAAC,sCAAsC,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;CAEF;AA/CD,gCA+CC"}
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;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;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,4BAA4B;QAC1B,IAAG,IAAI,CAAC,yBAAyB,EAAC,CAAC;YACjC,OAAO,IAAI,CAAC,yBAAyB,CAAC;QACxC,CAAC;aAAK,IAAG,IAAI,CAAC,qBAAqB,EAAC,CAAC;YACnC,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;QAC9C,CAAC;aAAI,CAAC;YACJ,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,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,UAAU,EAAE,CAAC;YACxG,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;QACzB,CAAC;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,CAAC;YACnC,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,CAAC;gBACnC,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;YACzB,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,YAAY,CAAC,sCAAsC,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;CAEF;AA/CD,gCA+CC"}

package/dist/model/dc/DCTopologicalNode.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
-import { IdentifiedObject } from '../core/IdentifiedObject.js';
+import { IdentifiedObject } from '../core/IdentifiedObject';
 import { XMLWriter } from '@enervance/xml-writer';
-import { DCEquipmentContainer } from './DCEquipmentContainer.js';
-import { DCNode } from './DCNode.js';
-import { DCBaseTerminal } from './DCBaseTerminal.js';
-import { ModelContainer } from '../../model-container/model/ModelContainer.js';
+import { DCEquipmentContainer } from './DCEquipmentContainer';
+import { DCNode } from './DCNode';
+import { DCBaseTerminal } from './DCBaseTerminal';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 export declare class DCTopologicalNode extends IdentifiedObject {
     dcEquipmentContainer: DCEquipmentContainer;
     dcEquipmentContainerUUID: string;

package/dist/model/dc/DCTopologicalNode.js CHANGED Viewed

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DCTopologicalNode = void 0;
-const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
-const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject");
+const rdf_xml_1 = require("../../constants/rdf-xml");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class DCTopologicalNode extends IdentifiedObject_1.IdentifiedObject {
+    dcEquipmentContainer;
+    dcEquipmentContainerUUID;
+    dcNodes = new Map();
+    dcBaseTerminals = new Map();
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
-        this.dcNodes = new Map();
-        this.dcBaseTerminals = new Map();
     }
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_TP) {

package/dist/model/dc/DCTopologicalNode.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DCTopologicalNode.js","sourceRoot":"","sources":["../../../src/model/dc/DCTopologicalNode.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAE5D,qDAAkD;AAElD,kEAAoF;AAMpF,MAAa,iBAAkB,SAAQ,mCAAgB;~~IASrD~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;~~QAL5C~~,~~YAAO,GAAwB,IAAI,GAAG,EAAE,~~CAAC;~~QAEzC,oBAAe,GAAgC,IAAI,GAAG,EAAE,CAAC;IAIzD,CAAC;~~IAEM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,iBAAO,CAAC,MAAM,CAAC;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,mBAAmB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YACxF,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;QACzB,CAAC;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,CAAC;YACnC,IAAA,6BAAY,EAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,wBAAwB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE,CAAC;YACnC,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,CAAC;gBAClC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,wCAAwC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC7G,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;YACzB,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,YAAY,CAAC,uDAAuD,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;IACH,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,uBAAuB,CAAC,oBAA0C;QACvE,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACnD,CAAC;IAEM,2BAA2B,CAAC,wBAAgC;QACjE,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;IAC3D,CAAC;CAEF;AAnED,8CAmEC"}
1	+ {"version":3,"file":"DCTopologicalNode.js","sourceRoot":"","sources":["../../../src/model/dc/DCTopologicalNode.ts"],"names":[],"mappings":"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"}

package/dist/model/dc/VsCapabilityCurve.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { XMLWriter } from '@enervance/xml-writer';
-import { Curve } from "../core/Curve.js";
-import { VsConverter } from './VsConverter.js';
+import { Curve } from "../core/Curve";
+import { VsConverter } from './VsConverter';
 export declare class VsCapabilityCurve extends Curve {
     VsConverterDCSides: Map<string, VsConverter>;
     /** CIM RDF/XML Serialisierung */

package/dist/model/dc/VsCapabilityCurve.js CHANGED Viewed

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VsCapabilityCurve = void 0;
-const Curve_1 = require("../core/Curve.js");
-const __1 = require("../../index.js");
-const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
+const Curve_1 = require("../core/Curve");
+const __1 = require("../..");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class VsCapabilityCurve extends Curve_1.Curve {
-    constructor() {
-        super(...arguments);
-        this.VsConverterDCSides = new Map();
-    }
+    VsConverterDCSides = new Map();
     /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === __1.RDF_XML.PROFILE_EQ || profile === __1.RDF_XML.PROFILE_SSH) {

package/dist/model/dc/VsCapabilityCurve.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"VsCapabilityCurve.js","sourceRoot":"","sources":["../../../src/model/dc/VsCapabilityCurve.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,6BAA8B;AAC9B,kEAAsE;AAGtE,MAAa,iBAAkB,SAAQ,aAAK;~~IAA5C;;QAEI~~,~~uBAAkB~~,GAA4B,IAAI,GAAG,EAAuB,CAAC;~~IAsBjF~~,~~CAAC;IApBG,~~iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,WAAO,CAAC,UAAU,IAAI,OAAO,KAAK,WAAO,CAAC,WAAW,EAAE,CAAC;YACnE,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;QAC3B,CAAC;IACL,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACJ;AAxBD,8CAwBC"}
1	+ {"version":3,"file":"VsCapabilityCurve.js","sourceRoot":"","sources":["../../../src/model/dc/VsCapabilityCurve.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,6BAA8B;AAC9B,kEAAsE;AAGtE,MAAa,iBAAkB,SAAQ,aAAK;IAExC,kBAAkB,GAA4B,IAAI,GAAG,EAAuB,CAAC;IAE7E,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,WAAO,CAAC,UAAU,IAAI,OAAO,KAAK,WAAO,CAAC,WAAW,EAAE,CAAC;YACnE,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;QAC3B,CAAC;IACL,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACJ;AAxBD,8CAwBC"}

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

@@ -1,9 +1,9 @@
-import { ACDCConverter } from './ACDCConverter.js';
-import { VsPpccControlKind } from './VsPpccControlKind.js';
-import { VsQpccControlKind } from './VsQpccControlKind.js';
+import { ACDCConverter } from './ACDCConverter';
+import { VsPpccControlKind } from './VsPpccControlKind';
+import { VsQpccControlKind } from './VsQpccControlKind';
 import { XMLWriter } from '@enervance/xml-writer';
-import { DefaultValuesConfigInterface } from '../../converter/integral7/interface-i7/default-values-config.interface.js';
-import { VsCapabilityCurve } from './VsCapabilityCurve.js';
+import { DefaultValuesConfigInterface } from '../../converter/integral7/interface-i7/default-values-config.interface';
+import { VsCapabilityCurve } from './VsCapabilityCurve';
 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;

package/dist/model/dc/VsConverter.js CHANGED Viewed

@@ -1,13 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VsConverter = void 0;
-const ACDCConverter_1 = require("./ACDCConverter.js");
-const VsPpccControlKind_1 = require("./VsPpccControlKind.js");
-const VsQpccControlKind_1 = require("./VsQpccControlKind.js");
-const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-const parser_utils_1 = require("../../utils2/parser.utils.js");
+const ACDCConverter_1 = require("./ACDCConverter");
+const VsPpccControlKind_1 = require("./VsPpccControlKind");
+const VsQpccControlKind_1 = require("./VsQpccControlKind");
+const rdf_xml_1 = require("../../constants/rdf-xml");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
+const parser_utils_1 = require("../../utils2/parser.utils");
 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: active power droop at dc side in pu
+    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
+    capabilityCurve;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"VsConverter.js","sourceRoot":"","sources":["../../../src/model/dc/VsConverter.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,2DAAsD;AACtD,2DAAsD;AACtD,qDAAgD;AAGhD,kEAAoF;AACpF,4DAAwD;AAGxD,MAAa,WAAY,SAAQ,6BAAa;~~IAiB5C~~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"}
1	+ {"version":3,"file":"VsConverter.js","sourceRoot":"","sources":["../../../src/model/dc/VsConverter.ts"],"names":[],"mappings":"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"}

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

@@ -1,9 +1,9 @@
-import { IdentifiedObject } from "../core/IdentifiedObject.js";
-import { DiagramObject } from "../diagram/DiagramObject.js";
-import { ModelContainer } from '../../model-container/model/ModelContainer.js';
-import { OrientationKind } from './OrientationKind.js';
+import { IdentifiedObject } from "../core/IdentifiedObject";
+import { DiagramObject } from "../diagram/DiagramObject";
+import { ModelContainer } from '../../model-container/model/ModelContainer';
+import { OrientationKind } from './OrientationKind';
 import { XMLWriter } from '@enervance/xml-writer';
-import { DiagramStyle } from './DiagramStyle.js';
+import { DiagramStyle } from './DiagramStyle';
 export declare class Diagram extends IdentifiedObject {
     orientation: OrientationKind;
     x1InitialView: number;

package/dist/model/diagram/Diagram.js CHANGED Viewed

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Diagram = void 0;
-const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
-const rdf_xml_1 = require("../../constants/rdf-xml.js");
-const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
+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,29 @@ 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)
+                (CONCAT(STRBEFORE(STR(?diagramUUID), '#_'), '#_') AS ?baseIRI)
+                ?mrid ?name ?shortName
+        WHERE {
+            GRAPH <http://default/>{
+                ?diagramUUID rdf:type cim:Diagram .
+                OPTIONAL {?diagramUUID cim:IdentifiedObject.mrid ?mrid .}
+                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 +51,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);
@@ -91,27 +119,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)
-                (CONCAT(STRBEFORE(STR(?diagramUUID), '#_'), '#_') AS ?baseIRI)
-                ?mrid ?name ?shortName
-        WHERE {
-            GRAPH <http://default/>{
-                ?diagramUUID rdf:type cim:Diagram .
-                OPTIONAL {?diagramUUID cim:IdentifiedObject.mrid ?mrid .}
-                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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Diagram.js","sourceRoot":"","sources":["../../../src/model/diagram/Diagram.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAI1D,qDAAgD;AAGhD,kEAAsE;AAEtE,MAAa,OAAQ,SAAQ,mCAAgB;~~IAWzC~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAChG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;~~QAHvD~~,~~oBAAe,GAAoB,EAAE,~~CAAC;~~IAItC,CAAC;~~IAEM,gBAAgB,CAAC,aAA4B;QAChD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;~~IA2BM~~,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC,CAAC;YACpB,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,OAAO,CAAC,WAAW,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACpE,~~MAAA,MAAA,~~IAAI,~~aAAJ~~,~~IAAI,uBAAJ,IAAI,CAAE,~~OAAO,~~0CAAE~~,QAAQ,~~0CAAE~~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~~;AA3GiB,mBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;KAsBnC,AAtBwB,CAsBxB~~"}
1	+ {"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 CHANGED Viewed

@@ -1,8 +1,8 @@
-import { IdentifiedObject } from '../core/IdentifiedObject.js';
-import { Diagram } from '../diagram/Diagram.js';
-import { DiagramObjectPoint } from '../diagram/DiagramObjectPoint.js';
-import { ModelContainer } from '../../model-container/model/ModelContainer.js';
-import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos.js';
+import { IdentifiedObject } from '../core/IdentifiedObject';
+import { Diagram } from '../diagram/Diagram';
+import { DiagramObjectPoint } from '../diagram/DiagramObjectPoint';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
+import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos';
 import { XMLWriter } from '@enervance/xml-writer';
 export declare class DiagramObject extends IdentifiedObject {
     drawingOrder: number;

package/dist/model/diagram/DiagramObject.js CHANGED Viewed

@@ -1,15 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiagramObject = void 0;
-const IdentifiedObject_1 = require("../core/IdentifiedObject.js");
-const xml_serializer_1 = require("../../util/xml/xml.serializer.js");
-const parser_utils_1 = require("../../utils2/parser.utils.js");
-const rdf_xml_1 = require("../../constants/rdf-xml.js");
+const IdentifiedObject_1 = require("../core/IdentifiedObject");
+const xml_serializer_1 = require("../../util/xml/xml.serializer");
+const parser_utils_1 = require("../../utils2/parser.utils");
+const rdf_xml_1 = require("../../constants/rdf-xml");
 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);
-        /** angle of rotation (in Degrees) of the diagram object in a clockwise direction from the normal */
-        this.rotation = 0;
         this.baseIRI = baseIRI;
         this.diagramObjectPoints = [];
     }
@@ -74,6 +81,32 @@ 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)
+         ?mrid ?drawingOrder ?rotation
+        WHERE {
+            GRAPH <http://default/>{
+                ?doUUID rdf:type cim:DiagramObject .
+                OPTIONAL {?doUUID cim:IdentifiedObject.mrid ?mrid .}
+                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 +114,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);
@@ -276,30 +308,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)
-         ?mrid ?drawingOrder ?rotation
-        WHERE {
-            GRAPH <http://default/>{
-                ?doUUID rdf:type cim:DiagramObject .
-                OPTIONAL {?doUUID cim:IdentifiedObject.mrid ?mrid .}
-                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