@enervance/insight-cim-model 0.0.360 → 0.0.361

package/dist/converter/cgmes-validator.d.ts

@@ -1,5 +1,3 @@
 import { IIdentifiedObject } from '../interfaces/model/core/IIdentifiedObject.js';
 import { DefaultValuesConfigInterface } from './integral7/interface-i7/default-values-config.interface.js';
-export declare function validateCGMESData(objects: Map<string, IIdentifiedObject>, defaultValuesConfig: DefaultValuesConfigInterface): void;
-export declare function validateAttributesCGMES(objects: Map<string, IIdentifiedObject>, defaultValuesConfig: DefaultValuesConfigInterface): void;
-export declare function validateAttributesOclCGMES(objects: Map<string, IIdentifiedObject>): void;
+export declare function validateCGMESData(objects: Map<string, IIdentifiedObject>, defaultValuesConfig: DefaultValuesConfigInterface, validationResult2Description?: boolean): void;

package/dist/converter/cgmes-validator.js

@@ -1,25 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAttributesOclCGMES = exports.validateAttributesCGMES = exports.validateCGMESData = void 0;
-function validateCGMESData(objects, defaultValuesConfig) {
+exports.validateCGMESData = void 0;
+function validateCGMESData(objects, defaultValuesConfig, validationResult2Description) {
     for (const obj of objects.values()) {
-        obj.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        obj.validateOptionalAttributesCGMES(defaultValuesConfig);
+        obj.validateMandatoryAttributesCGMES(defaultValuesConfig, validationResult2Description);
+        obj.validateOptionalAttributesCGMES(defaultValuesConfig, validationResult2Description);
         obj.validateOclCGMES();
     }
 }
 exports.validateCGMESData = validateCGMESData;
-function validateAttributesCGMES(objects, defaultValuesConfig) {
-    for (const obj of objects.values()) {
-        obj.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        obj.validateOptionalAttributesCGMES(defaultValuesConfig);
-    }
-}
-exports.validateAttributesCGMES = validateAttributesCGMES;
-function validateAttributesOclCGMES(objects) {
-    for (const obj of objects.values()) {
-        obj.validateOclCGMES();
-    }
-}
-exports.validateAttributesOclCGMES = validateAttributesOclCGMES;
 //# sourceMappingURL=cgmes-validator.js.map

package/dist/converter/cgmes-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"cgmes-validator.js","sourceRoot":"","sources":["../../src/converter/cgmes-validator.ts"],"names":[],"mappings":";;;AAGA,SAAgB,iBAAiB,CAAC,OAAuC,EAAE,mBAAiD;IAC1H,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;QAClC,GAAG,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAC1D,GAAG,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;QACzD,GAAG,CAAC,gBAAgB,EAAE,CAAC;KACxB;AACH,CAAC;AAND,8CAMC;AAED,SAAgB,uBAAuB,CAAC,OAAuC,EAAE,mBAAiD;IAChI,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;QAClC,GAAG,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAC1D,GAAG,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;KAC1D;AACH,CAAC;AALD,0DAKC;AAED,SAAgB,0BAA0B,CAAC,OAAuC;IAChF,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;QAClC,GAAG,CAAC,gBAAgB,EAAE,CAAC;KACxB;AACH,CAAC;AAJD,gEAIC"}
+{"version":3,"file":"cgmes-validator.js","sourceRoot":"","sources":["../../src/converter/cgmes-validator.ts"],"names":[],"mappings":";;;AAGA,SAAgB,iBAAiB,CAAC,OAAuC,EAAE,mBAAiD,EAAE,4BAAsC;IAClK,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;QAClC,GAAG,CAAC,gCAAgC,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;QACxF,GAAG,CAAC,+BAA+B,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;QACvF,GAAG,CAAC,gBAAgB,EAAE,CAAC;KACxB;AACH,CAAC;AAND,8CAMC"}

package/dist/converter/integral7/converter.integral7.js

@@ -1552,7 +1552,7 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BELASTUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BELASTUNG), knotenSfIDs));
                 for (const i7Data of result) {
-                    const load = targetClass === cim_class_names_1.ClassNames.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname) : new EnergyConsumer_1.EnergyConsumer((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.kurzname, i7Data.bezeichner);
+                    const load = targetClass === cim_class_names_1.ClassNames.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname, i7Data.bezeichner) : new EnergyConsumer_1.EnergyConsumer((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname);
                     load.setExternalId(i7Data.guid);
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                     const spannungslos = (0, parser_utils_1.isBooleanI7)(i7Data.spannungslos) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.spannungslos) : undefined;
@@ -2385,6 +2385,7 @@ class ConverterIntegral7 {
         });
     }
     convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 const einspeisePrio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : 1;
@@ -2406,6 +2407,9 @@ class ConverterIntegral7 {
                 const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : undefined;
                 const x1 = (0, parser_utils_1.isNumericI7)(i7Data.x1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x1) : undefined;
                 const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EI']), i7Data.kurzname);
+                if (equivalentInjection.getUUID() === 'd9d9f3a0-6693-455c-b57b-2e3ffb264002') {
+                    console.log();
+                }
                 /** Export Extended Ward equivalent with voltage regulation */
                 if (flag_lfl && !flag_ks && usoll && (r_ext !== 0 || x_ext !== 0)) {
                     //is regulating equivalent equipment
@@ -2489,6 +2493,13 @@ class ConverterIntegral7 {
                 equivalentInjection.xExt = x_ext;
                 equivalentInjection.aggregate = true; // default Wert im I7 Export. Not needed for EquivalentInjection, BusbarSection, PowerTransformerEnd, EquivalentShunt, EquivalentBranch
                 this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data, targetVoltages);
+                const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                if (connectivityNode) {
+                    const voltage = targetVoltages.get((_a = this.UUID2Integral7ID.get(connectivityNode.getUUID())) === null || _a === void 0 ? void 0 : _a.find(elem => elem));
+                    if (voltage === null || voltage === void 0 ? void 0 : voltage.usoll) {
+                        equivalentInjection.regulationTarget = +voltage.usoll;
+                    }
+                }
                 // ToDo PSRType
                 cimModel.addEquivalentInjection(equivalentInjection);
                 this.addIdMapping(i7Data.id, equivalentInjection.mrid, integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG);
@@ -3394,9 +3405,6 @@ class ConverterIntegral7 {
         if (condEquip instanceof RotatingMachine_1.RotatingMachine || condEquip instanceof ExternalNetworkInjection_1.ExternalNetworkInjection || condEquip instanceof EquivalentInjection_1.EquivalentInjection) {
             i7DataEinsp = i7Data;
             i7DataRQ = i7Data;
-            if (condEquip.getUUID() === '10409E08-E2C0-4EBD-AD4C-5370178ED62F' || condEquip.getUUID() === '0c67bf21-a557-46ea-af63-2a3ac116bd2e') {
-                const stop = true;
-            }
         }
         if (condEquip instanceof SynchronousMachine_1.SynchronousMachine) {
             suffix = '_SM';