@enervance/insight-cim-model 0.0.191 → 0.0.192

package/dist/converter/integral7/converter.integral7.d.ts

@@ -5,7 +5,7 @@ import { PowerTransformerEnd } from '../../model/wires/PowerTransformerEnd.js';
 import { MySQLConfig, MysqlController } from '../../util/database/mysql-controller.js';
 import { INTEGRALModelContainer } from '../../model-container/model/INTEGRALModelContainer.js';
 import { ModelContainer } from '../../model-container/model/ModelContainer.js';
-import { ConverterStatus, IExportConfig, ITargetVoltage, Integral7Model } from './interface-i7/data-structures-i7.js';
+import { ConverterStatus, IExportConfig, Integral7Model, ITargetVoltage } from './interface-i7/data-structures-i7.js';
 import { DefaultValuesConfigInterface } from './interface-i7/default-values-config.interface.js';
 import { I7ExportFrame } from './interface-i7/export-frame-i7.js';
 import { ObjectMappingConfigInterface } from './interface-i7/object-mapping-config.interface.js';

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

@@ -141,6 +141,7 @@ const EVWireObject_1 = require("../../model/extensions/enervance/assets/EVWireOb
 const INTEGRALPowerTransformer2WInfo_1 = require("../../model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js");
 const impedance_utils_1 = require("./impedance.utils.js");
 const util_cim_model_1 = require("./util-cim.model.js");
+const EVAssetOriginKind_1 = require("../../model/extensions/enervance/assets/EVAssetOriginKind.js");
 class ConverterIntegral7 {
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
@@ -3257,7 +3258,7 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_STARR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_STARR), containerIDs));
                 for (const i7Data of result) {
                     //const junction = new Junction(getUUID(i7Data.guid, this.objectMappingConfig.standardiseUuid), createNotation([getName(i7Data),"_J",`_${cimModel.junctions]), 'JNCT', 'starre Verbindung');
-                    const breaker = new Breaker_1.Breaker((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_BR']), 'Breaker', 'starre Verbindung');
+                    const breaker = new Breaker_1.Breaker((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, 'Breaker', 'starre Verbindung');
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -3310,7 +3311,7 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNERFI_3P)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRENNERFI_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNERFI_3P), containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_D']));
+                    const disconnector = new Disconnector_1.Disconnector((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner);
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNERFI_3P);
@@ -3326,7 +3327,7 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNER_3P)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRENNER_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNER_3P), containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_D']));
+                    const disconnector = new Disconnector_1.Disconnector((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner);
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNER_3P);
@@ -3342,7 +3343,7 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER), containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_BR']));
+                    const breaker = new Breaker_1.Breaker((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner);
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -3395,7 +3396,7 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) && integral7.lDrosselAnschlussKnotenIDs.length) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSDROSSEL), integral7.lDrosselAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SC']), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
                     // Topologie
                     /* Anfang
                      * 3 moegliche Anschluesse
@@ -3479,7 +3480,7 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR), integral7.lKondensatorAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SC']), i7Data.kurzname);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname);
                     // Topologie
                     /* Anfang
                      * 3 moegliche Anschluesse
@@ -3634,7 +3635,7 @@ class ConverterIntegral7 {
                             let conductingEquip;
                             if (imax && imin) {
                                 /** PetersenCoil */
-                                const petersenCoil = new PetersenCoil_1.PetersenCoil((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_PC']), i7Data.kurzname);
+                                const petersenCoil = new PetersenCoil_1.PetersenCoil((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname);
                                 integral7.sternPunktImpModel.petersenCoils.set(petersenCoil.mrid, petersenCoil);
                                 integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, petersenCoil);
                                 this.addIdMapping(i7Data.id, petersenCoil.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
@@ -3713,7 +3714,7 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
                 for (const i7Data of result) {
                     const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
+                    const bay = new AMPRIONBay_1.AMPRIONBay(uuid, i7Data.bezeichner, i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
@@ -3723,7 +3724,7 @@ class ConverterIntegral7 {
                         const i7Schluessel = voltageLevel.description +
                             '/LK-' +
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                        bay.description = i7Schluessel;
+                        bay.key = i7Schluessel;
                     }
                     else {
                         this.logger.debug(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
@@ -3854,6 +3855,7 @@ class ConverterIntegral7 {
                         acLineSegment.key = i7Schluessel;
                         const wire = new EVWireObject_1.EVWireObject(uuidWireObject, stk.name);
                         wire.type = 'Stromkreisabschnitt';
+                        wire.origin = EVAssetOriginKind_1.EVAssetOriginKind.stock;
                         wire.addPowerSystemResource(acLineSegment);
                         acLineSegment.addAsset(wire);
                         cimModel.addWireObject(wire);
@@ -4034,7 +4036,7 @@ class ConverterIntegral7 {
                      *  - topology informations of second pole are not available in INTEGRAL model, thus this will be created during conversion
                      *  - a metallic return is always assumed) with two groundings (one per end) is assumed in every case
                      */
-                    const dcLine = new DCLine_1.DCLine((0, parser_utils_1.getUUID)(i7Data.guid_dcline, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCL']));
+                    const dcLine = new DCLine_1.DCLine((0, parser_utils_1.getUUID)(i7Data.guid_dcline, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner);
                     let dcLineNeg = undefined;
                     let dcLineNeutral = undefined;
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
@@ -4053,7 +4055,7 @@ class ConverterIntegral7 {
                     let dcNodeStartMiddle = undefined;
                     let dcNodeTargetMiddle = undefined;
                     //Parameter "guidp" is available for monopolar and bipolar dc systems. Thus create DCLineSegment with positive sign property in any case.
-                    const dcLineSegment = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidp, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
+                    const dcLineSegment = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidp, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname, i7Schluessel);
                     dcLineSegmentSet.push(dcLineSegment);
                     let dcLineSegmentNeg = undefined;
                     let dcLineSegmentNeutral = undefined;
@@ -4068,8 +4070,8 @@ class ConverterIntegral7 {
                     if (bipole) {
                         const dcLineKey = dcLine.getUUID();
                         const dcLineUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCLine, this.configUuid, dcLineKey);
-                        dcLineNeg = new DCLine_1.DCLine(dcLineUuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCL']));
-                        dcLineSegmentNeg = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidn, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCLS'], 32, true), (0, util_create_1.createNotation)([i7Data.kurzname, '_neg'], 12, true), i7Schluessel);
+                        dcLineNeg = new DCLine_1.DCLine(dcLineUuid, i7Data.bezeichner);
+                        dcLineSegmentNeg = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidn, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, (0, util_create_1.createNotation)([i7Data.kurzname, '_neg'], 12, true), i7Schluessel);
                         dcLineSegmentSet.push(dcLineSegmentNeg);
                         dcLineSegmentNeg.length = dcLineSegment.length;
                         dcLineSegmentNeg.capacitance = undefined;
@@ -4473,12 +4475,6 @@ class ConverterIntegral7 {
                 }
                 for (const i7Data of result) {
                     const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    if (i7Data.ur2 === 25) {
-                        const stop = true;
-                    }
-                    if (uuid === 'a4480d0ac6e0413eb2ef683bf7b171a6') {
-                        let stop = true;
-                    }
                     const powerTransformer = new PowerTransformer_1.PowerTransformer(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
                     /** AssetInfos */