npm - @enervance/insight-cim-model - Versions diffs - 0.0.12 → 0.0.14 - Mend

@enervance/insight-cim-model 0.0.12 → 0.0.14

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 (770) hide show

package/dist/model/wires/ACLineSegment.js CHANGED Viewed

@@ -4,6 +4,7 @@ exports.ACLineSegment = void 0;
 const Conductor_1 = require("./Conductor");
 const utils_1 = require("../../util/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
+const utils_2 = require("../../converter/integral7/utils");
 class ACLineSegment extends Conductor_1.Conductor {
     constructor(uuid, name, shortName, description, length, aggregate) {
         super(uuid, name, shortName, description, length, aggregate);
@@ -74,13 +75,14 @@ class ACLineSegment extends Conductor_1.Conductor {
             linePoints.push([+point.xPosition, +point.yPosition]);
         });
         const geoJSON = {};
-        geoJSON['id'] = this.mrid;
+        geoJSON['id'] = 0;
         geoJSON['type'] = 'Feature';
         geoJSON['geometry'] = {
             type: 'LineString',
             coordinates: linePoints
         };
         geoJSON['properties'] = {
+            sapId: this.name,
             uuid: this.mrid,
             objectType: this.constructor.name,
         };
@@ -92,9 +94,6 @@ class ACLineSegment extends Conductor_1.Conductor {
     toCIMXML(xmlWriter, profile) {
         const suffixID = this.getSuffixID(profile);
         const prefixUUID = this.getPrefixUUID(suffixID);
-        let defaultValues = '';
-        this.checkMandatoryAttributes(profile, defaultValues);
-        this.description += defaultValues;
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
             utils_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
@@ -127,46 +126,47 @@ class ACLineSegment extends Conductor_1.Conductor {
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
     }
-    checkMandatoryAttributes(profile, defaultValues) {
-        super.checkMandatoryAttributes(profile, defaultValues);
-        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
-            if (!this.r) {
-                this.r = 1;
-                defaultValues += 'r,';
-            }
-            if (!this.x) {
-                this.x = 1;
-                defaultValues += 'x,';
-            }
-            if (!this.bch) {
-                this.bch = 1;
-                defaultValues += 'bch,';
-            }
-            if (!this.gch) {
-                this.gch = 1;
-                defaultValues += 'gch,';
-            }
-            if (!this.r0) {
-                this.r0 = 1;
-                defaultValues += 'r0,';
-            }
-            if (!this.x0) {
-                this.x0 = 1;
-                defaultValues += 'x0,';
-            }
-            if (!this.b0ch) {
-                this.b0ch = 1;
-                defaultValues += 'b0ch,';
-            }
-            if (!this.g0ch) {
-                this.g0ch = 1;
-                defaultValues += 'g0ch,';
-            }
-            if (!this.shortCircuitEndTemperature) {
-                this.shortCircuitEndTemperature = 80;
-                defaultValues += 'shortCircuitEndTemperature,';
-            }
+    validateMandatoryAttributesCGMES(defaultValuesConfig) {
+        let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
+        if (!utils_2.isNumericI7(this.r)) {
+            this.r = defaultValuesConfig.ACLineSegment.r;
+            defaultValues += 'r,';
+        }
+        if (!utils_2.isNumericI7(this.x)) {
+            this.x = defaultValuesConfig.ACLineSegment.x;
+            defaultValues += 'x,';
+        }
+        if (!utils_2.isNumericI7(this.bch)) {
+            this.bch = defaultValuesConfig.ACLineSegment.bch;
+            defaultValues += 'bch,';
+        }
+        if (!utils_2.isNumericI7(this.gch)) {
+            this.gch = defaultValuesConfig.ACLineSegment.gch;
+            defaultValues += 'gch,';
+        }
+        if (!utils_2.isNumericI7(this.r0)) {
+            this.r0 = defaultValuesConfig.ACLineSegment.r0;
+            defaultValues += 'r0,';
+        }
+        if (!utils_2.isNumericI7(this.x0)) {
+            this.x0 = defaultValuesConfig.ACLineSegment.x0;
+            defaultValues += 'x0,';
         }
+        if (!utils_2.isNumericI7(this.b0ch)) {
+            this.b0ch = defaultValuesConfig.ACLineSegment.b0ch;
+            defaultValues += 'b0ch,';
+        }
+        if (!utils_2.isNumericI7(this.g0ch)) {
+            this.g0ch = defaultValuesConfig.ACLineSegment.g0ch;
+            defaultValues += 'g0ch,';
+        }
+        if (!utils_2.isNumericI7(this.shortCircuitEndTemperature)) {
+            this.shortCircuitEndTemperature = defaultValuesConfig.ACLineSegment.shortCircuitEndTemperature;
+            defaultValues += 'shortCircuitEndTemperature,';
+        }
+        if (defaultValues.length)
+            this.description = `[${defaultValues}]`;
+        return defaultValues;
     }
     checkExportData(profilURI) {
         if (this.psrType || this.psrTypeUUID) {
@@ -174,6 +174,14 @@ class ACLineSegment extends Conductor_1.Conductor {
         }
         return false;
     }
+    setR(r) {
+        this.r = r;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'cim', 'ACLineSegment', 'r', String(this.r));
+    }
+    setX(x) {
+        this.x = x;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'cim', 'ACLineSegment', 'x', String(this.x));
+    }
 }
 exports.ACLineSegment = ACLineSegment;
 ACLineSegment.sparqlQuery = `
@@ -206,7 +214,6 @@ ACLineSegment.sparqlQuery = `
                         OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.x ?x .}
                         OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.bch ?bch .}
                         OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.gch ?gch .}
-                        OPTIONAL {?acLineSegmentUUID cim:ACLineSegment.length ?length .}
                         OPTIONAL {?acLineSegmentUUID cim:ConductingEquipment.BaseVoltage ?bvUUID .}
                         OPTIONAL {?acLineSegmentUUID cim:PowerSystemResource.PSRType ?ptUUID .}
                         OPTIONAL {?acLineSegmentUUID cim:Equipment.EquipmentContainer ?ecUUID .}

package/dist/model/wires/ACLineSegment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ACLineSegment.js","sourceRoot":"","sources":["../../../src/model/wires/ACLineSegment.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;~~AAMxC~~,4CAAiF;~~AAGjF~~,qDAAkD;AAGlD,MAAa,aAAc,SAAQ,qBAAS;IAE1C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,MAAe,EAAE,SAAmB;QACtH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;~~IAuDM~~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~~IAAI,~~CAAC,~~IAAI,~~CAAC;~~QAC1B~~,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;QAC5B,OAAO,CAAC,UAAU,CAAC,GAAG;YACpB,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,UAAU;SACxB,CAAC;QACF,OAAO,CAAC,YAAY,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;SAClC,CAAA;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAGM,yBAAyB,CAAC,SAA8B;QAC7D,OAAO;IACT,CAAC;~~IAiDM~~,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;~~QAChD~~,IAAI,~~aAAa,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,wBAAwB,CAAC,~~OAAO,~~EAAE,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,IAAI,aAAa,CAAC;QAClC,IAAI,OAAO,~~KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,6BAAqB,CAAC,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;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAO,CAAC,aAAa,CAAC,EAAE;YAC3F,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,6BAAqB,CAAC,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,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5E,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5E,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,oBAAoB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAChF,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,oBAAoB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAEhF,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9E,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9E,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAClF,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAElF,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2CAA2C,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;SAC/H;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,~~wBAAwB~~,CAAC,~~OAAe~~,~~EAAE~~,~~aAAqB;QAC7D~~,KAAK,CAAC,~~wBAAwB~~,CAAC,~~OAAO~~,~~EAAE,aAAa,~~CAAC,CAAC;~~QACvD~~,IAAI,~~OAAO~~,~~KAAK~~,~~iBAAO,~~CAAC,~~UAAU,EAAE;YAClC,~~IAAI,CAAC,~~IAAI,~~CAAC,CAAC,EAAE;~~gBACX~~,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;~~gBACX~~,aAAa,IAAI,IAAI,CAAA;~~aACtB~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;~~gBACX~~,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;~~gBACX~~,aAAa,IAAI,IAAI,CAAA;~~aACtB~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;~~gBACb~~,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;~~gBACb~~,aAAa,IAAI,MAAM,CAAA;~~aACxB~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;~~gBACb~~,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;~~gBACb~~,aAAa,IAAI,MAAM,CAAA;~~aACxB~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;~~gBACZ~~,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;~~gBACZ~~,aAAa,IAAI,KAAK,CAAA;~~aACvB~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;~~gBACZ~~,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;~~gBACZ~~,aAAa,IAAI,KAAK,CAAA;~~aACvB~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;~~gBACd~~,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;~~gBACd~~,aAAa,IAAI,OAAO,CAAA;~~aACzB~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;~~gBACd~~,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;~~gBACd~~,aAAa,IAAI,OAAO,CAAA;~~aACzB~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE;~~gBACpC~~,IAAI,CAAC,0BAA0B,GAAG,~~EAAE~~,CAAC;~~gBACrC~~,aAAa,IAAI,6BAA6B,CAAA;~~aAC~~/C;~~SACF~~;~~IACH~~,CAAC;IAKD,eAAe,CAAC,SAAiB;QAC/B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE;YACpC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;;~~AAvSH~~,~~sCAwSC~~;~~AAtRe~~,yBAAW,GAAW~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAuCrB~~,CAAA"}
1	+ {"version":3,"file":"ACLineSegment.js","sourceRoot":"","sources":["../../../src/model/wires/ACLineSegment.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/AsynchronousMachine.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { RotatingMachine } from './RotatingMachine';
 import XMLWriter from 'xml-writer';
 import { AsynchronousMachineKind } from "./AsynchronousMachineKind";
+import { IDefaultValuesConfig } from '../../interfaces/default-values-config';
 export declare class AsynchronousMachine extends RotatingMachine {
     nominalFrequency: number;
     nominalSpeed: number;
@@ -16,5 +17,5 @@ export declare class AsynchronousMachine extends RotatingMachine {
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
-    checkMandatoryAttributes(profile: string, defaultValues: string): void;
+    validateMandatoryAttributesCGMES(defaultValuesConfig: IDefaultValuesConfig): string;
 }

package/dist/model/wires/AsynchronousMachine.js CHANGED Viewed

@@ -4,14 +4,13 @@ exports.AsynchronousMachine = void 0;
 const RotatingMachine_1 = require("./RotatingMachine");
 const __1 = require("../..");
 const utils_1 = require("../../util/utils");
+const AsynchronousMachineKind_1 = require("./AsynchronousMachineKind");
+const utils_2 = require("../../converter/integral7/utils");
 class AsynchronousMachine extends RotatingMachine_1.RotatingMachine {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
     toCIMXML(xmlWriter, profile) {
-        let defaultValues = '';
-        this.checkMandatoryAttributes(profile, defaultValues);
-        this.description += defaultValues;
         if (profile === __1.RDF_XML.PROFILE_EQ) {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
@@ -40,38 +39,39 @@ class AsynchronousMachine extends RotatingMachine_1.RotatingMachine {
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
     }
-    checkMandatoryAttributes(profile, defaultValues) {
-        super.checkMandatoryAttributes(profile, defaultValues);
-        if (profile === __1.RDF_XML.PROFILE_EQ) {
-            if (!this.converterFedDrive) {
-                this.converterFedDrive = false;
-                defaultValues += 'converterFedDrive,';
-            }
-            if (!this.efficiency) {
-                this.efficiency = 1;
-                defaultValues += 'efficiency,';
-            }
-            if (!this.iaIrRatio) {
-                this.iaIrRatio = 1;
-                defaultValues += 'iaIrRatio,';
-            }
-            if (!this.polePairNumber) {
-                this.polePairNumber = 1;
-                defaultValues += 'polePairNumber,';
-            }
-            if (!this.ratedMechanicalPower) {
-                this.ratedMechanicalPower = 0;
-                defaultValues += 'ratedMechanicalPower,';
-            }
-            if (!this.reversible) {
-                this.reversible = false;
-                defaultValues += 'reversible,';
-            }
-            if (!this.rxLockedRotorRatio) {
-                this.rxLockedRotorRatio = 0.1;
-                defaultValues += 'rxLockedRotorRatio,';
-            }
+    validateMandatoryAttributesCGMES(defaultValuesConfig) {
+        let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
+        if (!utils_2.isBooleanI7(this.converterFedDrive)) {
+            this.converterFedDrive = defaultValuesConfig.AsynchronousMachine.converterFedDrive;
+            defaultValues += 'converterFedDrive,';
+        }
+        if (!utils_2.isNumericI7(this.efficiency)) {
+            this.efficiency = defaultValuesConfig.AsynchronousMachine.efficiency;
+            defaultValues += 'efficiency,';
+        }
+        if (!utils_2.isNumericI7(this.iaIrRatio)) {
+            this.iaIrRatio = defaultValuesConfig.AsynchronousMachine.iaIrRatio;
+            defaultValues += 'iaIrRatio,';
+        }
+        if (!utils_2.isNumericI7(this.polePairNumber)) {
+            this.polePairNumber = defaultValuesConfig.AsynchronousMachine.polePairNumber;
+            defaultValues += 'polePairNumber,';
+        }
+        if (!utils_2.isNumericI7(this.ratedMechanicalPower)) {
+            this.ratedMechanicalPower = defaultValuesConfig.AsynchronousMachine.ratedMechanicalPower;
+            defaultValues += 'ratedMechanicalPower,';
+        }
+        if (!utils_2.isBooleanI7(this.reversible)) {
+            this.reversible = defaultValuesConfig.AsynchronousMachine.reversible;
+            defaultValues += 'reversible,';
+        }
+        if (!this.asynchronousMachineType) {
+            this.asynchronousMachineType = AsynchronousMachineKind_1.AsynchronousMachineKind[defaultValuesConfig.AsynchronousMachine.asynchronousMachineType];
+            defaultValues += 'asynchronousMachineType,';
         }
+        if (defaultValues.length)
+            this.description = `[${defaultValues}]`;
+        return defaultValues;
     }
 }
 exports.AsynchronousMachine = AsynchronousMachine;

package/dist/model/wires/AsynchronousMachine.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AsynchronousMachine.js","sourceRoot":"","sources":["../../../src/model/wires/AsynchronousMachine.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,6BAAgC;AAChC,4CAAuE;~~AAIvE~~,MAAa,mBAAoB,SAAQ,iCAAe;~~IAcpD~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;~~QAC9E~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;~~IAC9C~~,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;~~QACjD~~,IAAI,~~aAAa,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,wBAAwB,CAAC,~~OAAO,~~EAAE,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,IAAI,aAAa,CAAC;QAClC,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,6BAAqB,CAAC,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~~;~~IACL~~,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;~~QAC9D~~,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,~~IAAG~~,OAAO,KAAK,WAAO,CAAC,UAAU,EAAE;~~YAC/B~~,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,uCAAuC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAChH,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,mCAAmC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACxG,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,wCAAwC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAClH,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,iCAAiC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YACpG,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAClG,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,qCAAqC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5G,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,2CAA2C,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACxH,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,uCAAuC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAChH,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,iCAAiC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC9H,oBAAY,CAAC,SAAS,EAAE,GAAG,WAAO,CAAC,aAAa,yCAAyC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;~~SACvH~~;~~IACL~~,CAAC;~~IACS~~,oBAAoB,CAAC,SAAoB,EAAE,OAAe;~~QAChE~~,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;~~IACnD~~,CAAC;IAED,~~wBAAwB~~,CAAC,~~OAAe~~,~~EAAE~~,~~aAAqB;QAC3D~~,KAAK,CAAC,~~wBAAwB~~,CAAC,~~OAAO~~,~~EAAE,aAAa,~~CAAC,CAAC;~~QACvD~~,IAAI,~~OAAO~~,~~KAAK~~,~~WAAO,~~CAAC,~~UAAU,EAAE;YAChC,~~IAAI,CAAC,~~IAAI~~,CAAC,~~iBAAiB,~~EAAE;~~gBACzB~~,IAAI,CAAC,iBAAiB,GAAG,~~KAAK~~,CAAC;~~gBAC/B~~,aAAa,IAAI,oBAAoB,CAAA;~~aACxC~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;~~gBAClB~~,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;~~gBACpB~~,aAAa,IAAI,aAAa,CAAA;~~aACjC~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;~~gBACjB~~,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;~~gBACnB~~,aAAa,IAAI,YAAY,CAAA;~~aAChC~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;~~gBACtB~~,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;~~gBACxB~~,aAAa,IAAI,iBAAiB,CAAA;~~aACrC~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;~~gBAC5B~~,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC;~~gBAC9B~~,aAAa,IAAI,uBAAuB,CAAA;~~aAC3C~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;~~gBAClB~~,IAAI,CAAC,UAAU,GAAG,~~KAAK~~,CAAC;~~gBACxB~~,aAAa,IAAI,aAAa,CAAA;~~aACjC~~;~~YACD~~,IAAI,CAAC,IAAI,CAAC,~~kBAAkB~~,EAAE;~~gBAC1B~~,IAAI,CAAC,~~kBAAkB~~,GAAG,~~GAAG~~,CAAC;~~gBAC9B~~,aAAa,IAAI,~~qBAAqB~~,CAAA;~~aACzC~~;~~SACJ~~;~~IACL~~,CAAC;~~CACJ~~;~~AAtFD~~,~~kDAsFC~~"}
1	+ {"version":3,"file":"AsynchronousMachine.js","sourceRoot":"","sources":["../../../src/model/wires/AsynchronousMachine.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/BusbarSection.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { Connector } from "./Connector";
 import { Model } from "../model/Model";
 import XMLWriter from 'xml-writer';
 export declare class BusbarSection extends Connector {
+    ipMax: number;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string, aggregate?: boolean);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
@@ -9,4 +10,5 @@ export declare class BusbarSection extends Connector {
     protected resolveAttributesFusekiJSON(value: any): void;
     resolveParsedAssociations(cimModel: Model): void;
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
+    protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
 }

package/dist/model/wires/BusbarSection.js CHANGED Viewed

@@ -38,6 +38,12 @@ class BusbarSection extends Connector_1.Connector {
             xmlWriter.endElement();
         }
     }
+    toCIMXMLAttributes(xmlWriter, profile) {
+        super.toCIMXMLAttributes(xmlWriter, profile);
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
+            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:BusbarSection.ipMax`, this.ipMax);
+        }
+    }
 }
 exports.BusbarSection = BusbarSection;
 BusbarSection.sparqlQuery = `

package/dist/model/wires/BusbarSection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BusbarSection.js","sourceRoot":"","sources":["../../../src/model/wires/BusbarSection.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,qDAAkD;AAClD,~~4CAAyD~~;~~AAGzD~~,MAAa,aAAc,SAAQ,qBAAS;~~IAExC~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,SAAmB;QACnG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAuBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;QAC3D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YACzC,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;YAC1C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACP,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC5C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC5C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,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,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,6BAAqB,CAAC,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;IACL,CAAC;;~~AA7DL~~,~~sCA+DC~~;~~AAzDiB~~,yBAAW,GAAY;;;;;;;;;;;;;;;;;;;;KAoBpC,CAAA"}
1	+ {"version":3,"file":"BusbarSection.js","sourceRoot":"","sources":["../../../src/model/wires/BusbarSection.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,qDAAkD;AAClD,4CAAuE;AAGvE,MAAa,aAAc,SAAQ,qBAAS;IAIxC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,SAAmB;QACnG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAuBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;QAC3D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YACzC,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;YAC1C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACP,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC5C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC5C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,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,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,6BAAqB,CAAC,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;IACL,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAChC,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SACvF;IACL,CAAC;;AAtEL,sCAwEC;AAhEiB,yBAAW,GAAY;;;;;;;;;;;;;;;;;;;;KAoBpC,CAAA"}

package/dist/model/wires/Conductor.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { ConductingEquipment } from '../core/ConductingEquipment';
 import { Model } from '../model/Model';
 import XMLWriter from 'xml-writer';
+import { IDefaultValuesConfig } from '../../interfaces/default-values-config';
 export declare class Conductor extends ConductingEquipment {
     length: number;
     constructor(uuid: string, name: string, shortName: string, description: string, length: number, aggregate?: boolean);
@@ -9,5 +10,7 @@ export declare class Conductor extends ConductingEquipment {
     toJSONAttributes(): void;
     breadthFirstSearch(networkElements: any[]): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
-    checkMandatoryAttributes(profile: string, defaultValues: string): void;
+    validateMandatoryAttributesCGMES(defaultValuesConfig: IDefaultValuesConfig): string;
+    setLength(length: number): string;
+    getLength(): number;
 }

package/dist/model/wires/Conductor.js CHANGED Viewed

@@ -4,6 +4,7 @@ exports.Conductor = void 0;
 const ConductingEquipment_1 = require("../core/ConductingEquipment");
 const utils_1 = require("../../util/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
+const utils_2 = require("../../converter/integral7/utils");
 class Conductor extends ConductingEquipment_1.ConductingEquipment {
     constructor(uuid, name, shortName, description, length, aggregate) {
         super(uuid, name, shortName, description, aggregate);
@@ -32,14 +33,22 @@ class Conductor extends ConductingEquipment_1.ConductingEquipment {
             utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:Conductor.length`, String(this.length));
         }
     }
-    checkMandatoryAttributes(profile, defaultValues) {
-        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
-            if (!this.length) {
-                this.length = 0.1;
-                defaultValues += 'length,';
-            }
+    validateMandatoryAttributesCGMES(defaultValuesConfig) {
+        let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
+        if (!utils_2.isNumericI7(this.length)) {
+            this.length = defaultValuesConfig.Conductor.length;
+            defaultValues += 'length,';
         }
+        return defaultValues;
+    }
+    setLength(length) {
+        this.length = length;
+        return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'cim', 'Conductor', 'length', String(this.length));
+    }
+    getLength() {
+        return this.length;
     }
+    ;
 }
 exports.Conductor = Conductor;
 //# sourceMappingURL=Conductor.js.map

package/dist/model/wires/Conductor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Conductor.js","sourceRoot":"","sources":["../../../src/model/wires/Conductor.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAElE,4CAA0D;AAG1D,qDAAkD;AAElD,MAAa,SAAU,SAAQ,yCAAmB;~~IAI9C~~,YAAY,IAAY,EAAE,IAAY,EAAE,~~SAAkB~~,EAAE,~~WAAoB~~,EAAE,~~MAAe~~,EAAE,SAAmB;~~QAClH~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC;~~IAC1B~~,CAAC;IAES,2BAA2B,CAAC,KAAU;~~QAC5C~~,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;~~IAC5C~~,CAAC;IAEM,yBAAyB,CAAC,QAAe;~~QAC5C~~,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;~~IAC9C~~,CAAC;IAGM,gBAAgB;~~QACnB~~,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;~~IACtC~~,CAAC;IAEM,kBAAkB,CAAC,eAAsB;~~QAC5C~~,~~IAAG~~,CAAC,IAAI,CAAC,OAAO,~~EAAC~~;~~YACb~~,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;~~SAC7C~~;~~IACL~~,CAAC;IAGS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;~~QAC9D~~,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,~~IAAG~~,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;~~YAC/B~~,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;~~SAC7F~~;~~IACL~~,CAAC;IAED,~~wBAAwB~~,CAAC,~~OAAe,EAAE,aAAqB~~;~~QAC3D~~,IAAI,~~OAAO~~,KAAK,~~iBAAO~~,CAAC,~~UAAU~~,~~EAAE~~;~~YAChC~~,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;~~gBACd~~,IAAI,CAAC,MAAM,GAAG,~~GAAG~~,CAAC;~~gBAClB~~,aAAa,IAAI,SAAS,CAAA;~~aAC7B~~;~~SACJ~~;~~IACL~~,CAAC;~~CACJ~~;~~AA/CD~~,~~8BA+CC~~"}
1	+ {"version":3,"file":"Conductor.js","sourceRoot":"","sources":["../../../src/model/wires/Conductor.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAElE,4CAA0D;AAG1D,qDAAkD;AAElD,2DAA8D;AAE9D,MAAa,SAAU,SAAQ,yCAAmB;IAIhD,YAAY,IAAY,EAAE,IAAY,EAAE,SAAiB,EAAE,WAAmB,EAAE,MAAc,EAAE,SAAmB;QACjH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC;IACxB,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC1C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IACpC,CAAC;IAEM,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;IAGS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,oBAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3F;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC;YACnD,aAAa,IAAI,SAAS,CAAA;SAC3B;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAClH,CAAC;IACM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAAA,CAAC;CACH;AAvDD,8BAuDC"}

package/dist/model/wires/EnergyConsumer.d.ts CHANGED Viewed

@@ -5,12 +5,15 @@ import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos';
 import XMLWriter from 'xml-writer';
 import { IEnergyConsumer } from '../../interfaces/model/wires/IEnergyConsumer';
 import { IConnectivityNode } from '../../interfaces/model/core/IConnectivityNode';
+import { IDefaultValuesConfig } from '../../interfaces/default-values-config';
 export declare class EnergyConsumer extends ConductingEquipment implements IEnergyConsumer {
     customerCount: number;
     p: number;
     q: number;
-    pFixed: number;
-    qFixed: number;
+    pfixed: number;
+    qfixed: number;
+    pfixedPct: number;
+    qfixedPct: number;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     print(): void;
     getApparentPower(): number;
@@ -34,4 +37,5 @@ export declare class EnergyConsumer extends ConductingEquipment implements IEner
     resolveAssociationRDFXML(className: string, resourceName: string, resourceUUID: string): void;
     getP(): number;
     getQ(): number;
+    validateMandatoryAttributesCGMES(defaultValuesConfig: IDefaultValuesConfig): string;
 }

package/dist/model/wires/EnergyConsumer.js CHANGED Viewed

@@ -6,6 +6,7 @@ const utils_1 = require("../../util/utils");
 const sparql_building_block_1 = require("../../util/sparql/sparql-building-block");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const datatype_converter_1 = require("../../util/datatype-converter");
+const utils_2 = require("../../converter/integral7/utils");
 class EnergyConsumer extends ConductingEquipment_1.ConductingEquipment {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
@@ -115,9 +116,15 @@ class EnergyConsumer extends ConductingEquipment_1.ConductingEquipment {
     }
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
-        if (profile === rdf_xml_1.RDF_XML.PROFILE_SSH) {
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.p`, this.p ? this.p : 0);
-            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.q`, this.q ? this.q : 0);
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
+            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.pfixed`, this.pfixed);
+            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.qfixed`, this.qfixed);
+            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.pfixedPct`, this.pfixedPct);
+            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.qfixedPct`, this.qfixedPct);
+        }
+        else if (profile === rdf_xml_1.RDF_XML.PROFILE_SSH) {
+            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.p`, this.p);
+            utils_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:${this.constructor.name}.q`, this.q);
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
@@ -151,6 +158,20 @@ class EnergyConsumer extends ConductingEquipment_1.ConductingEquipment {
     getQ() {
         return isNaN(this.q) ? 0 : this.q;
     }
+    validateMandatoryAttributesCGMES(defaultValuesConfig) {
+        let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
+        if (!utils_2.isNumericI7(this.p)) {
+            this.p = defaultValuesConfig.EnergyConsumer.p;
+            defaultValues += 'p,';
+        }
+        if (!utils_2.isNumericI7(this.q)) {
+            this.q = defaultValuesConfig.EnergyConsumer.q;
+            defaultValues += 'q,';
+        }
+        if (this.constructor.name === "EnergyConsumer" && defaultValues.length)
+            this.description = `[${defaultValues}]`;
+        return defaultValues;
+    }
 }
 exports.EnergyConsumer = EnergyConsumer;
 EnergyConsumer.sparqlQuery = `

package/dist/model/wires/EnergyConsumer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EnergyConsumer.js","sourceRoot":"","sources":["../../../src/model/wires/EnergyConsumer.ts"],"names":[],"mappings":";;;AAAA,~~qEAAgE~~;~~AAIhE~~,~~4CAA+F~~;~~AAC/F~~,mFAOiD;AACjD,qDAAkD;AAGlD,sEAA6D;AAI7D,MAAa,cAAe,SAAQ,yCAAmB;~~IAWrD~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAE1C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAEtC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAEtC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IAGM,KAAK;~~QACR~~,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;~~IAClD~~,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEM,SAAS,~~CAAE~~,OAAY,EAAE,OAAe,EAAE,cAA+B,EAAE,aAA6B;~~QAC3G~~,MAAM,WAAW,~~GAAc~~,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;~~QAC9E~~,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,CAAC;QAC7B,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,CAAC,CAAC;QACjB,~~IAAG~~,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,~~EAAC~~;~~YAC7C~~,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAEjE,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;YAE9C,MAAM,EAAE,GAAG,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC;YAChC,MAAM,EAAE,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;YAEzB,MAAM,EAAE,GAAG,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC;YAChC,MAAM,EAAE,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;YAEzB,MAAM,EAAE,GAAG,CAAC,CAAC;YACb,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC;YAe3B,OAAO,CAAC,UAAU,CAAC,GAAG;~~gBAClB~~,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;~~aAC1D~~,CAAA;YAED,OAAO,CAAC,YAAY,CAAC,GAAG;~~gBACpB~~,iBAAiB,EAAE,aAAa,CAAC,IAAI;gBACrC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;gBACjC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACd,QAAQ,EAAE,aAAa,CAAC,WAAW,EAAE;~~aACxC~~,CAAA;~~SACJ~~;QACD,OAAO,OAAO,CAAC;~~IACnB~~,CAAC;~~IAmCM~~,MAAM,CAAC,cAAc,CAAC,QAAgB;~~QACzC~~,~~IAAG~~,QAAQ,CAAC,MAAM,GAAG,CAAC,~~EAAC~~;~~YACnB~~,OAAO,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;~~SAC5E~~;QACD,OAAO,cAAc,CAAC,WAAW,CAAC;~~IACtC~~,CAAC;~~IACM~~,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;~~QACzD~~,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;~~YACzC~~,MAAM,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;YACtC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;~~QACzC~~,CAAC,CAAC,CAAC;~~IACP~~,CAAC;~~IAEM~~,2BAA2B,CAAC,KAAU;~~QACzC~~,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,CAAC,GAAG,CAAC,sBAAc,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,CAAC,GAAG,CAAC,sBAAc,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;~~IAE5C~~,CAAC;~~IACM~~,yBAAyB,CAAC,QAAe;~~QAC/C~~,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;~~IAC1C~~,CAAC;IAEM,MAAM;~~QACT~~,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;~~IACrB~~,CAAC;IAEM,gBAAgB;~~QACnB~~,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;~~IAE5B~~,CAAC;IAEM,kBAAkB;~~QACrB~~,KAAK,CAAC,kBAAkB,EAAE,CAAC;~~IAC/B~~,CAAC;IAEM,kBAAkB,CAAC,eAAsB;~~QAC5C~~,~~IAAG~~,CAAC,IAAI,CAAC,OAAO,~~EAAC~~;~~YACb~~,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;~~SAC7C~~;~~IACL~~,CAAC;IAGM,yBAAyB,CAAC,SAA8B;~~QAC3D~~,OAAO;~~IACX~~,CAAC;IAEM,YAAY;~~QACf~~,OAAO,IAAI,CAAC;~~IAChB~~,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;~~QACjD~~,~~IAAG~~,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;~~YAClE~~,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,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,6BAAqB,CAAC,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~~;~~IACL~~,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;~~QAC9D~~,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,~~IAAG~~,OAAO,KAAK,iBAAO,CAAC,~~WAAW~~,EAAE;~~YAChC~~,oBAAY,CAAC,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~~,oBAAY,CAAC,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;~~SACvG~~;~~IACL~~,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;~~QAChE~~,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;~~IACnD~~,CAAC;IAIM,MAAM,CAAC,kBAAkB,CAAC,IAAY,EAAE,QAAe;~~QAC1D~~,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACrC,OAAO,QAAQ,CAAC;~~IACpB~~,CAAC;IAEM,uBAAuB,CAAC,SAAiB,EAAE,QAAgB,EAAE,KAAa;~~QAC7E~~,~~IAAG~~,SAAS,KAAK,gBAAgB,EAAE;~~YACjC~~,MAAM,QAAQ,GAAW,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1D,~~IAAG~~,QAAQ,EAAE;~~gBACX~~,IAAI,CAAC,QAAQ,CAAC,GAAG,iCAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aAChD;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;aACxB;SACF;aAAM;~~YACH~~,KAAK,CAAC,uBAAuB,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;~~SAC7D~~;~~IACL~~,CAAC;IAED,wBAAwB,CAAC,SAAiB,EAAE,YAAoB,EAAE,YAAoB;QACpF,KAAK,CAAC,wBAAwB,CAAC,SAAS,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;IACxE,CAAC;IAEM,IAAI;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IAEM,IAAI;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;;~~AAzOH~~,~~wCA0OC~~;~~AApJe~~,0BAAW,~~GAAY~~;~~QAC/B~~,qCAAa;QACb,2CAAmB;QACnB,wCAAgB;QAChB,qCAAa;QACb,qCAAa;QACb,wCAAgB;QAChB,qCAAa;QACb,qCAAa;;;;;;;;;;;;;;;;;;;;;;;;GAwBlB,CAAA"}
1	+ {"version":3,"file":"EnergyConsumer.js","sourceRoot":"","sources":["../../../src/model/wires/EnergyConsumer.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/EnergySource.d.ts CHANGED Viewed

@@ -1,12 +1,11 @@
 import { ConductingEquipment } from '../core/ConductingEquipment';
-import { Voltage } from '../domain/Voltage';
 import { Model } from '../model/Model';
 import { DiagramObject } from '../diagram/DiagramObject';
 import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos';
 import XMLWriter from 'xml-writer';
 import { IConnectivityNode, IdentifiedObject } from "../..";
+import { IDefaultValuesConfig } from '../../interfaces/default-values-config';
 export declare class EnergySource extends ConductingEquipment {
-    static sparqlQuery: string;
     activePower: number;
     reactivePower: number;
     r: number;
@@ -15,8 +14,10 @@ export declare class EnergySource extends ConductingEquipment {
     x: number;
     x0: number;
     xn: number;
-    nominalVoltage: Voltage;
+    nominalVoltage: number;
     nominalVoltageValue: number;
+    voltageMagnitude: number;
+    voltageAngle: number;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     print(): void;
     toGeoJSON(geoJSON: any, profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any;
@@ -36,8 +37,11 @@ export declare class EnergySource extends ConductingEquipment {
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
     checkExportData(profile: string): boolean;
-    checkMandatoryAttributes(profile: string, defaultValues: string): void;
     static resolveClassRDFXML(uuid: string, cimModel: Model): IdentifiedObject | undefined;
     resolveAttributesRDFXML(className: string, attrName: string, value: string): void;
     resolveAssociationRDFXML(className: string, resourceName: string, resourceUUID: string): void;
+    setActivePower(activePower: number): string;
+    setReactivePower(reactivePower: number): string;
+    validateMandatoryAttributesCGMES(defaultValuesConfig: IDefaultValuesConfig): string;
+    static sparqlQuery: string;
 }