@enervance/insight-cim-model 0.0.325 → 0.0.328

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

@@ -9,7 +9,7 @@ import { ConverterStatus, IExportConfig, Integral7Model, ITargetVoltage } from '
 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';
-import { AsynchronmotorTyp, Einspeisung, Ersatzquerzweig, GeneratorTyp, KDrosselTyp, Marktgebiet, Netzgruppe, Standort, Trafo } from './model/interfaces.js';
+import { AsynchronmotorTyp, Einspeisung, Ersatzquerzweig, GeneratorTyp, ISvProfileData, KDrosselTyp, Marktgebiet, Netzgruppe, Standort, Trafo } from './model/interfaces.js';
 import { ConfigurableDLConvertOptions, Executor } from './dl-convert/executor.js';
 import { IEnergySourceTypeMapping } from './interface-i7/energy-source.type.mapping.js';
 import { IUuidConfig } from './interface-i7/uuid-config.interface.js';
@@ -63,7 +63,9 @@ export declare class ConverterIntegral7 {
     /** Array zur Speicherung von I7 Berechnungen */
     private powerFlowResults;
     /** Map zur Speicherung der relevanten Infos für das SV-Profile je Frame */
-    private svProfileTerminalData;
+    private: Map<number, ISvProfileData>;
+    private svProfileZweigData;
+    private svProfileKnotenData;
     set configurableDLConvertOptions(arg: ConfigurableDLConvertOptions);
     get configurableDLConvertOptions(): ConfigurableDLConvertOptions;
     constructor();

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

@@ -317,7 +317,8 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const integral7Modell = frame.getI7Model();
             const cimModel = frame.cimModel;
-            this.svProfileTerminalData = new Map;
+            this.svProfileZweigData = new Map;
+            this.svProfileKnotenData = new Map;
             const subGeoRegionsUUIDs = geoRegion.regions.map(elem => elem.mrid);
             const subGeoRegionsI7IDs = [];
             for (const uuid of subGeoRegionsUUIDs) {
@@ -596,8 +597,8 @@ class ConverterIntegral7 {
             // exportiere erstes gespeichertes Ergebnis
             if (this.powerFlowResults.length) {
                 const powerFlowResultID = this.powerFlowResults[0].ergnr;
-                /** Leitungen */
-                yield this.createSvPowerFlowAnschluesse(cimModel, powerFlowResultID, this.svProfileTerminalData);
+                /** Querzweig */
+                yield this.createSvPowerFlowAnschluesse(cimModel, powerFlowResultID, this.svProfileZweigData);
                 /** Sammelschienen */
                 yield this.createSvProfileDataSsab(cimModel, powerFlowResultID);
                 /** KnotenSo */
@@ -693,7 +694,7 @@ class ConverterIntegral7 {
     createSvPowerFlowAnschluesse(cimModel, powerFlowResultID, svProfileData) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             /** Längszweige */
-            if (!this.svProfileTerminalData.size && !this.powerFlowResults.length)
+            if (!this.svProfileZweigData.size && !this.powerFlowResults.length)
                 return;
             if (!this.isTableAvailable(integral_sql_1.Integral7TableNames.ERG_LFL_ANSCHLUSS))
                 return;
@@ -1348,7 +1349,11 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug('Sammelschiene ' + i7Data.id + ' besitzt keine Schaltanlage.');
                     }
-                    this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+                    const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+                    this.svProfileKnotenData.set(i7Data.id, {
+                        powerFlowResultID: i7Data.id,
+                        terminalUUID: terminal === null || terminal === void 0 ? void 0 : terminal.mrid
+                    });
                     this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.SAMMELSCHIENE);
                     cimModel.addConnectivityNode(connectivityNode);
                     cimModel.addBusbarSection(busbarSection);
@@ -2579,8 +2584,17 @@ class ConverterIntegral7 {
                      *  KontenSo -> Anschluesspunkt
                      *  KnotenSf -> Schaltfeldpunkt
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
-                    this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
-                    this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
+                    const startTerminal = this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
+                    const targetTerminal = this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
+                    /** SVProfile Data */
+                    this.svProfileZweigData.set(i7Data.flakn3p, {
+                        powerFlowResultID: i7Data.flakn3p,
+                        terminalUUID: startTerminal === null || startTerminal === void 0 ? void 0 : startTerminal.mrid
+                    });
+                    this.svProfileZweigData.set(i7Data.flekn3p, {
+                        powerFlowResultID: i7Data.flekn3p,
+                        terminalUUID: targetTerminal === null || targetTerminal === void 0 ? void 0 : targetTerminal.mrid
+                    });
                     /**EQ */
                     if (flag_lfl && !flag_ks) {
                         equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 10e9;
@@ -3385,6 +3399,10 @@ class ConverterIntegral7 {
         }
         if (connectivityNode) {
             const cpTerminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+            this.svProfileZweigData.set(i7Data.flussinfo3p, {
+                powerFlowResultID: i7Data.flussinfo3p,
+                terminalUUID: cpTerminal === null || cpTerminal === void 0 ? void 0 : cpTerminal.mrid
+            });
             //create regulating control
             if (isRegulatingControl && (i7DataEinsp || i7DataKomp)) {
                 let cterminal = undefined; //connection point terminal of this device
@@ -4285,8 +4303,8 @@ class ConverterIntegral7 {
                     tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                 }
                 const leitungStromkreisabschnitt = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(type, this.getAvailableColumnNames(tableName), leitungIDs));
-                let result_ohl = undefined;
-                let result_cable = undefined;
+                let result_ohl = new Array;
+                let result_cable = new Array;
                 if (type.match(integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG)) {
                     result_cable = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KABEL), leitungIDs));
                     result_ohl = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.FREILEITUNG), leitungIDs));
@@ -4371,7 +4389,7 @@ class ConverterIntegral7 {
                     const acLineSegmentStart = acLineSegments[0];
                     const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     /** SVProfile Data */
-                    this.svProfileTerminalData.set(i7Data.flakn3p, {
+                    this.svProfileZweigData.set(i7Data.flakn3p, {
                         powerFlowResultID: i7Data.flakn3p,
                         terminalUUID: startTerminal === null || startTerminal === void 0 ? void 0 : startTerminal.mrid
                     });
@@ -4394,7 +4412,7 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
-                    let cable = result_cable.filter(elem => elem.id === stromkreisabschnitte[0].id);
+                    let cable = result_cable === null || result_cable === void 0 ? void 0 : result_cable.filter(elem => elem.id === stromkreisabschnitte[0].id);
                     this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentStart, stromkreisabschnitte[0], cable.length > 0, defaultValuesConfig);
                     cimModel.addACLineSegment(acLineSegmentStart);
                     /** Mitte */
@@ -4431,7 +4449,7 @@ class ConverterIntegral7 {
                     const acLineSegmentZiel = acLineSegments[anzahl - 1];
                     const targetTerminal = this.createBoundaryConnection(frame, acLineSegmentZiel, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     /** SvProfile Data */
-                    this.svProfileTerminalData.set(i7Data.flekn3p, {
+                    this.svProfileZweigData.set(i7Data.flekn3p, {
                         powerFlowResultID: i7Data.flekn3p,
                         terminalUUID: targetTerminal === null || targetTerminal === void 0 ? void 0 : targetTerminal.mrid
                     });
@@ -5091,7 +5109,7 @@ class ConverterIntegral7 {
                      * */
                     const startTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     /** SvProfile Data */
-                    this.svProfileTerminalData.set(i7Data.flakn3p, {
+                    this.svProfileZweigData.set(i7Data.flakn3p, {
                         powerFlowResultID: i7Data.flakn3p,
                         terminalUUID: startTerminal === null || startTerminal === void 0 ? void 0 : startTerminal.mrid
                     });
@@ -5130,7 +5148,7 @@ class ConverterIntegral7 {
                            const zielTerminal = ziel ? this.createConnection(cimModel, powerTransformer, ziel, PhaseCode.ABC, true, 2) : undefined;*/
                     const zielTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     /** SvProfile Data */
-                    this.svProfileTerminalData.set(i7Data.flekn3p, {
+                    this.svProfileZweigData.set(i7Data.flekn3p, {
                         powerFlowResultID: i7Data.flekn3p,
                         terminalUUID: zielTerminal === null || zielTerminal === void 0 ? void 0 : zielTerminal.mrid
                     });
@@ -5332,7 +5350,7 @@ class ConverterIntegral7 {
                          const start = cimModel.getObject(knotenUUID);*/
                     const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, PhaseCode_1.PhaseCode.ABC);
                     /** SvProfile Data */
-                    this.svProfileTerminalData.set(wicklung1.flakn3p, {
+                    this.svProfileZweigData.set(wicklung1.flakn3p, {
                         powerFlowResultID: wicklung1.flakn3p,
                         terminalUUID: terminal1 === null || terminal1 === void 0 ? void 0 : terminal1.mrid
                     });
@@ -5382,7 +5400,7 @@ class ConverterIntegral7 {
                     /*        const start2 = cimModel.getObject(this.integralID2UUID.get(wicklung2.aknoten));
                             const terminal2 = start ? this.createConnection(cimModel, powerTransformer, start2, PhaseCode.ABC, true, 2) : undefined;*/
                     const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC);
-                    this.svProfileTerminalData.set(wicklung2.flakn3p, {
+                    this.svProfileZweigData.set(wicklung2.flakn3p, {
                         powerFlowResultID: wicklung2.flakn3p,
                         terminalUUID: terminal2 === null || terminal2 === void 0 ? void 0 : terminal2.mrid
                     });
@@ -5434,7 +5452,7 @@ class ConverterIntegral7 {
                     /*        const start3 = cimModel.getObject(this.integralID2UUID.get(wicklung2.aknoten));
                             const terminal3 = start ? this.createConnection(cimModel, powerTransformer, start3, PhaseCode.ABC, true, 3) : undefined;*/
                     const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC);
-                    this.svProfileTerminalData.set(wicklung3.flakn3p, {
+                    this.svProfileZweigData.set(wicklung3.flakn3p, {
                         powerFlowResultID: wicklung3.flakn3p,
                         terminalUUID: terminal3 === null || terminal3 === void 0 ? void 0 : terminal3.mrid
                     });