@enervance/insight-cim-model 0.0.372 → 0.0.373-beta10

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

@@ -71,7 +71,7 @@ const LimitTypeKind_1 = require("../../model/operationallimits/LimitTypeKind.js"
 const OperationalLimitDirectionKind_1 = require("../../model/operationallimits/OperationalLimitDirectionKind.js");
 const OperationalLimitSet_1 = require("../../model/operationallimits/OperationalLimitSet.js");
 const OperationalLimitType_1 = require("../../model/operationallimits/OperationalLimitType.js");
-const ControlArea_1 = require("../../model/operations/ControlArea.js");
+const ACLineSegment_1 = require("../../model/wires/ACLineSegment.js");
 const Breaker_1 = require("../../model/wires/Breaker.js");
 const BusbarSection_1 = require("../../model/wires/BusbarSection.js");
 const Disconnector_1 = require("../../model/wires/Disconnector.js");
@@ -128,7 +128,6 @@ const VsCapabilityCurve_1 = require("../../model/dc/VsCapabilityCurve.js");
 const INTEGRALEquivalentBranch_1 = require("../../model/extensions/amprion/equivalents/INTEGRALEquivalentBranch.js");
 const INTEGRALDCConverterUnit_1 = require("../../model/extensions/integral/dc/INTEGRALDCConverterUnit.js");
 const ApparentPowerLimit_1 = require("../../model/operationallimits/ApparentPowerLimit.js");
-const ControlAreaTypeKind_1 = require("../../model/operations/ControlAreaTypeKind.js");
 const AsynchronousMachine_1 = require("../../model/wires/AsynchronousMachine.js");
 const PhaseTapChangerLinear_1 = require("../../model/wires/PhaseTapChangerLinear.js");
 const RotatingMachine_1 = require("../../model/wires/RotatingMachine.js");
@@ -155,6 +154,8 @@ const SvVoltage_1 = require("../../model/statevariables/SvVoltage.js");
 const SvInjection_1 = require("../../model/statevariables/SvInjection.js");
 const SvTapStep_1 = require("../../model/statevariables/SvTapStep.js");
 const DCTopologicalNode_1 = require("../../model/dc/DCTopologicalNode.js");
+const INTEGRALTerminal_1 = require("../../model/extensions/integral/core/INTEGRALTerminal.js");
+const KnotenZw_1 = require("./model/integral/KnotenZw.js");
 class ConverterIntegral7 {
     set configurableDLConvertOptions(arg) {
         tslib_1.__classPrivateFieldSet(this, _ConverterIntegral7_configurableDLConvertOptions, arg, "f");
@@ -330,7 +331,7 @@ class ConverterIntegral7 {
             /** Regelzone -> ControlArea */
             let startTime = perf_hooks.performance.now();
             //await this.convertRegelzone(cimModel, defaultValuesConfig);
-            logExecutionTime(this.logger, startTime, `convertRegelzone(${cimModel.controlArea.size})`);
+            //logExecutionTime(this.logger, startTime, `convertRegelzone(${cimModel.controlArea.size})`);
             const marktGebiet = this.isTableAvailable(integral_sql_1.Integral7TableNames.MARKTGEBIET) ? yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.MARKTGEBIET, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.MARKTGEBIET), [])) : new Array();
             const netzGruppe = this.isTableAvailable(integral_sql_1.Integral7TableNames.NETZGRUPPE) ? yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NETZGRUPPE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NETZGRUPPE), [])) : new Array();
             startTime = perf_hooks.performance.now();
@@ -340,8 +341,9 @@ class ConverterIntegral7 {
             startTime = perf_hooks.performance.now();
             const standortIDs = [...integral7Modell.integralStandorte.keys()];
             /** Regelzone -> ControlArea */
-            /**if (standortIDs.length) await this.convertRegelzone(cimModel, defaultValuesConfig, standortIDs);
-             logExecutionTime(this.logger, startTime, `convertRegelzone(${cimModel.controlArea.size})`);*/
+            if (standortIDs.length)
+                yield this.convertRegelzone(cimModel, defaultValuesConfig, standortIDs);
+            logExecutionTime(this.logger, startTime, `convertRegelzone(${cimModel.controlArea.size})`);
             /** Schaltanlagen -> VoltageLevel */
             if (standortIDs.length)
                 yield this.convertSchaltanlagen(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
@@ -400,6 +402,12 @@ class ConverterIntegral7 {
             if (knotenSoIDs.length > 0)
                 yield this.convertSchlaufen(cimModel, integral7Modell, knotenSoIDs);
             logExecutionTime(this.logger, startTime, `convertSchlaufen()`);
+            startTime = perf_hooks.performance.now();
+            const schlaufenIDs = integral7Modell.integralSchlaufen;
+            /** Schaltanlagenabschnitte -> mappen auf bereits erstelltes VoltageLevel-Objekt (Schaltanlage) */
+            if (schlaufenIDs.length > 0)
+                yield this.convertKnotenZw(cimModel, integral7Modell, schlaufenIDs);
+            logExecutionTime(this.logger, startTime, `convertKnotenZw(...)`);
             /** Sammelschienenabschnitte -> BusbarSections */
             startTime = perf_hooks.performance.now();
             if (schaltanlagenAbschnittIDs.length > 0)
@@ -669,8 +677,12 @@ class ConverterIntegral7 {
                         frame.cimModel.addDiagram(resultingObject);
                         while (resultingObject.diagramElements.length > 0) {
                             const currentDiagramObject = resultingObject.diagramElements.pop();
+                            if (!frame.cimModel.objectExists(currentDiagramObject.getIdentifiedObjectUUID())
+                                && !frame.cimModel.dcObjects.has(currentDiagramObject.getIdentifiedObjectUUID())) {
+                                continue;
+                            }
                             // const diagramObject = resultingObject as DiagramObject;
-                            const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObject, this.configUuid, currentDiagramObject.getIdentifiedObjectUUID());
+                            const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObject, this.configUuid, `${resultingObject.getUUID()}${currentDiagramObject.getIdentifiedObjectUUID()}`);
                             currentDiagramObject.mrid = uuid;
                             for (let a = 0; a < currentDiagramObject.diagramObjectPoints.length; ++a) {
                                 const key = `${uuid}${a + 1}`;
@@ -897,8 +909,9 @@ class ConverterIntegral7 {
                 /** bereits verbeitete Knoten überspringen */
                 if (precessedConnectivityNodes.has(connectivityNode.getUUID()))
                     continue;
+                const cn = connectivityNode;
                 /** Zusammengeschaltete CNs bestimmen */
-                const tpNodes = i7_graph_utils_1.I7GraphUtils.determineTopologicalNodes(cimModel, connectivityNode);
+                const tpNodes = i7_graph_utils_1.I7GraphUtils.determineTopologicalNodes(cimModel, cn);
                 /** zusammengefasst CNs zwischenspeichern */
                 tpNodes.forEach(it => precessedConnectivityNodes.add(it.getUUID()));
                 /** Für Erdungsmodel (Terminal.phases = N) werden keine TopologicalNodes erstellt */
@@ -1062,21 +1075,23 @@ class ConverterIntegral7 {
     }
     convertRegelzone(cimModel, defaultValuesConfig, standortIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.REGELZONE)) {
-                //const resultNg: Regelzone[] = await this.mysqlController.execQuery(getNetzQuery(I7Objects.NETZGRUPPE, 0, 0, standortIDs));
-                const resultRz = yield this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
-                for (const i7Data of resultRz) {
-                    const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                    const ctrlarea = new ControlArea_1.ControlArea((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_RZ']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
-                    ctrlarea.type = ControlAreaTypeKind_1.ControlAreaTypeKind.agc;
-                    ctrlarea.netInterchange = 0;
-                    cimModel.addControlArea(ctrlarea);
-                    this.addIdMapping(i7Data.id, ctrlarea.mrid, integral_sql_1.Integral7TableNames.REGELZONE);
-                }
-            }
-            else {
-                this.logger.debug(`debug --- Tabelle ${integral_sql_1.Integral7TableNames.REGELZONE} ist nicht vorhanden.`);
-            }
+            /*if (this.isTableAvailable(Integral7TableNames.REGELZONE)) {
+              //const resultNg: Regelzone[] = await this.mysqlController.execQuery(getNetzQuery(I7Objects.NETZGRUPPE, 0, 0, standortIDs));
+              const resultRz: Regelzone[] = await this.mysqlController.execQuery(getNetzQuery(I7Objects.REGELZONE, 0, 0, []));
+              for (const i7Data of resultRz) {
+                const pBezug = isNumericI7(i7Data.p_bezug) ? convertToNumberI7(i7Data.p_bezug) : undefined;
+                const pLieferung = convertToNumberI7(i7Data.p_lieferung);
+                const i7Schluessel = REGELZONE_PRAEFIX + ueberpruefeZeichenkette(i7Data.bezeichner);
+                const ctrlarea = new ControlArea(getUUID(i7Data.guid), createNotation([ueberpruefeZeichenkette(i7Data.bezeichner), '_RZ']), ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
+                //ctrlarea.type = ControlAreaTypeKind.agc;
+                ctrlarea.type = ControlAreaTypeKind.interchange;
+                ctrlarea.netInterchange = isNumericI7(pBezug) && isNumericI7(pLieferung) pBezug - pLieferung;
+                cimModel.addControlArea(ctrlarea);
+                this.addIdMapping(i7Data.id, ctrlarea.mrid, Integral7TableNames.REGELZONE);
+              }
+            } else {
+              this.logger.debug(`debug --- Tabelle ${Integral7TableNames.REGELZONE} ist nicht vorhanden.`);
+            }*/
         });
     }
     convertSubGeoRegionen(regions, defaultValuesConfig) {
@@ -1179,9 +1194,10 @@ class ConverterIntegral7 {
                     else if (!(object instanceof Substation_1.Substation)) {
                         continue;
                     }
+                    let keyUn = (0, utils_2.getSpannungSchluessel)(String(i7Data.un));
                     const i7Schluessel = substation.key +
-                        integral_prefix_1.KNOTEN_STANDORT_PRAEFIX +
-                        i7Data.un +
+                        integral_prefix_1.SCHALTANLAGE_PRAEFIX +
+                        keyUn +
                         integral_prefix_1.MITTIGER_PUNKT +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     const vl = new VoltageLevel_1.VoltageLevel((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname);
@@ -1216,7 +1232,7 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     if (!voltageLevel) {
-                        this.logger.warn(`Schaltanlagenabschnitt ${i7Data.id} ist keiner Schaltanlage zugeornet.`);
+                        this.logger.warn(`Schaltanlagenabschnitt ${i7Data.id} ist keiner Schaltanlage zugeordnet.`);
                         continue;
                     }
                     else {
@@ -1242,10 +1258,13 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (!voltageLevel) {
-                        this.logger.warn(`Schaltfeld ${i7Data.id}/${i7Data.guid} ist keinem Schaltanlagenabschnitt zugeornet.`);
+                        this.logger.warn(`Schaltfeld ${i7Data.id}/${i7Data.guid} ist keinem Schaltanlagenabschnitt zugeordnet.`);
                         continue;
                     }
+                    const saabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
                     const i7Schluessel = voltageLevel.key +
+                        integral_prefix_1.SCHALTANLAGENABSCHNITT_PRAEFIX +
+                        (0, utils_2.ueberpruefeZeichenkette)(saabschnitt.bezeichner) +
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
@@ -1296,11 +1315,12 @@ class ConverterIntegral7 {
                     const key = integral_sql_1.I7Objects.KNOTEN_SO + ((_e = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getUUID()) !== null && _e !== void 0 ? _e : '');
                     const junction = new Junction_1.Junction(common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Junction, this.configUuid, key), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), connectivityNode.getUUID().substring(0, 8), "_J"]));
                     junction.equipmentContainer = vl;
-                    const terminal = this.createConnection(cimModel, junction, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+                    const terminal = this.createConnection(cimModel, junction, connectivityNode, PhaseCode_1.PhaseCode.ABC, true, false, integral7);
                     this.svProfileKnotenData.set(i7Data.id, {
                         powerFlowResultID: i7Data.id,
                         terminalUUID: terminal === null || terminal === void 0 ? void 0 : terminal.mrid
                     });
+                    cimModel.addJunction(junction);
                     const un = (0, utils_2.getU)(i7Data.un);
                     const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.configUuid, this.exportFramesBoundary);
                     /** Spannungsband */
@@ -1310,12 +1330,13 @@ class ConverterIntegral7 {
                     if (substation) {
                         vl.substation = substation;
                         substation.addVoltageLevel(vl);
+                        const keyUn = (0, utils_2.getSpannungSchluessel)(String(i7Data.un));
                         const i7Schluessel = substation.key +
                             integral_prefix_1.KNOTEN_STANDORT_PRAEFIX +
-                            i7Data.un +
+                            keyUn +
                             integral_prefix_1.MITTIGER_PUNKT +
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                        vl.key = i7Schluessel;
+                        //vl.key = i7Schluessel;
                         connectivityNode.key = i7Schluessel;
                     }
                     else {
@@ -1413,7 +1434,7 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug('Sammelschiene ' + i7Data.id + ' besitzt keine Schaltanlage.');
                     }
-                    const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+                    const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true, false, integral7);
                     this.svProfileSsabData.set(i7Data.id, {
                         powerFlowResultID: i7Data.id,
                         terminalUUID: terminal === null || terminal === void 0 ? void 0 : terminal.mrid
@@ -1514,6 +1535,20 @@ class ConverterIntegral7 {
             }
         });
     }
+    convertKnotenZw(cimModel, integral7, schlaufenIDs) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_ZW)) {
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_ZW, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_ZW), schlaufenIDs));
+                for (const i7Data of result) {
+                    const kZw = new KnotenZw_1.KnotenZwImpl(i7Data);
+                    integral7.knotenZwIDs.set(i7Data.id, kZw);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_KF} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertSchlaufen(cimModel, integral7, knotenSoIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             //Schlaufen
@@ -1522,15 +1557,17 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const key = integral_sql_1.I7Objects.SCHLAUFE + String(i7Data.id);
                     const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, key);
-                    const terminal = new Terminal_1.Terminal(uuid, i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar);
+                    const guid = (0, utils_2.ueberpruefeZeichenkette)(i7Data.guid);
+                    const terminal = new INTEGRALTerminal_1.INTEGRALTerminal(guid.length > 0 ? guid : uuid, i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar);
                     terminal.connected = (0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand);
                     terminal.phases = PhaseCode_1.PhaseCode.ABC;
                     terminal.key = integral_prefix_1.SCHLAUFE_PRAEFIX + i7Data.bezeichner;
+                    terminal.key_jumper = terminal.key;
                     this.addIdMapping(i7Data.id, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
                     this.addIdMapping(i7Data.knotenzw, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
-                    integral7.kontenZwIDs.push(i7Data.knotenzw);
                     this.checkAnschlussIDs(i7Data.knotenzw, integral7);
                     cimModel.addTerminal(terminal);
+                    integral7.integralSchlaufen.push(i7Data.id);
                     const connectivityNode = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
                     if (connectivityNode) {
                         connectivityNode.addTerminal(terminal);
@@ -2175,7 +2212,7 @@ class ConverterIntegral7 {
                     //EQ core profile content
                     const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (connectivityNode) {
-                        this.createConnection(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+                        this.createConnection(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC, true, false);
                         const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
                         if (equipmentContainer) {
                             equipmentContainer.addEquipment(asynchronousMachine);
@@ -2659,8 +2696,8 @@ class ConverterIntegral7 {
                      *  KontenSo -> Anschluesspunkt
                      *  KnotenSf -> Schaltfeldpunkt
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
-                    const startTerminal = this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
-                    const targetTerminal = this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
+                    const startTerminal = this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, i7Data, PhaseCode_1.PhaseCode.ABC, false);
+                    const targetTerminal = this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, i7Data, PhaseCode_1.PhaseCode.ABC, false);
                     /** SVProfile Data */
                     if (i7Data.flakn3p) {
                         this.svProfileZweigData.set(i7Data.flakn3p, {
@@ -3147,7 +3184,7 @@ class ConverterIntegral7 {
                     vsConverter.p = (0, parser_utils_1.isNumericI7)(i7Data.pges) ? i7Data.pges * -1 : 0;
                     vsConverter.q = (0, parser_utils_1.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
                     this.setTopologyEnergySourceConsumerObject(cimModel, vsConverter, i7Data, targetVoltages);
-                    vsConverter.droop = qdroop; //pu
+                    vsConverter.droop = 0;
                     vsConverter.droopCompensation = 0; //Resistance
                     vsConverter.qShare = 100; //PerCent
                     /** Status */
@@ -3474,7 +3511,7 @@ class ConverterIntegral7 {
             isRegulatingControl = false;
         }
         if (connectivityNode) {
-            const cpTerminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+            const cpTerminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true, false);
             if (i7Data.flussinfo3p) {
                 this.svProfileZweigData.set(i7Data.flussinfo3p, {
                     powerFlowResultID: i7Data.flussinfo3p,
@@ -3871,6 +3908,8 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             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));
+                console.log(containerIDs.length);
+                console.log(result.length);
                 for (const i7Data of result) {
                     const disconnector = new Disconnector_1.Disconnector((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner);
                     disconnector.setExternalId(i7Data.guid);
@@ -3911,12 +3950,22 @@ class ConverterIntegral7 {
             if (equipmentContainer) {
                 equipmentContainer.addEquipment(swtch);
                 swtch.equipmentContainer = equipmentContainer;
+                let i7Schluessel = equipmentContainer.key;
+                if (swtch instanceof Breaker_1.Breaker) {
+                    i7Schluessel += integral_prefix_1.LEISTUNGSSCHALTER_PRAEFIX +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                }
+                else if (swtch instanceof Disconnector_1.Disconnector) {
+                    i7Schluessel += integral_prefix_1.TRENNSCHALTER_PRAEFIX +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                }
+                swtch.key = i7Schluessel;
             }
             else {
                 this.logger.debug(`Schalter ${i7Data.id} besitzt keinen EquipmentContainer.`);
             }
             if (cnStart) {
-                const terminal = this.createConnection(cimModel, swtch, cnStart, PhaseCode_1.PhaseCode.ABC, true);
+                const terminal = this.createConnection(cimModel, swtch, cnStart, PhaseCode_1.PhaseCode.ABC, true, false);
                 /** I7 speichert Ergebnisse für geschlossene Schalter (Längs- und Querkupplunge)*/
                 if (i7Data.flussinfo > 0 && i7Data.schaltzustand === 1) {
                     this.svProfileSwitchData.set(i7Data.flussinfo, {
@@ -3929,7 +3978,7 @@ class ConverterIntegral7 {
                 this.logger.debug(`Schalter ${i7Data.id} besitzt keinen Anfangsknoten.`);
             }
             if (cnZiel) {
-                this.createConnection(cimModel, swtch, cnZiel, PhaseCode_1.PhaseCode.ABC, true);
+                this.createConnection(cimModel, swtch, cnZiel, PhaseCode_1.PhaseCode.ABC, true, false);
             }
             else {
                 this.logger.debug(`Schalter ${i7Data.id} besitzt keinen Zielknoten.`);
@@ -3958,10 +4007,11 @@ class ConverterIntegral7 {
                      *  KontenSo -> Anschluesspunkt
                      *  KnotenSf -> Schaltfeldpunkt
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
+                    //console.log(i7Data.guid);
                     const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
-                        startTerminal = this.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, true);
+                        startTerminal = this.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, true, false, integral7);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
@@ -3970,7 +4020,7 @@ class ConverterIntegral7 {
                     const target = cimModel.objects.get(this.integralID2UUID.get(i7Data.eknoten));
                     let targetTerminal;
                     if (target) {
-                        targetTerminal = this.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, true);
+                        targetTerminal = this.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, true, false, integral7);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
@@ -4049,7 +4099,7 @@ class ConverterIntegral7 {
                     const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
-                        startTerminal = this.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, true);
+                        startTerminal = this.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, true, false, integral7);
                     }
                     else {
                         this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
@@ -4057,7 +4107,7 @@ class ConverterIntegral7 {
                     const target = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
                     let targetTerminal;
                     if (target) {
-                        targetTerminal = this.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, true);
+                        targetTerminal = this.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, true, false, integral7);
                     }
                     else {
                         this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
@@ -4224,7 +4274,7 @@ class ConverterIntegral7 {
                             }
                             // Create connection for PetersenCoil and GroundingImpedance connected with 'Sternpunktschiene'. PetersenCoil and GroundingImpedance connected to 'Sternpunktknoten' is connected during convertTrafo2w and convertTrafo3w
                             if (connectivityNode) {
-                                this.createConnection(cimModel, conductingEquip, connectivityNode, PhaseCode_1.PhaseCode.N, true);
+                                this.createConnection(cimModel, conductingEquip, connectivityNode, PhaseCode_1.PhaseCode.N, true, false);
                                 integral7.sternPunktImpModel.stpSchieneUUIDStpImp.set(connectivityNode.getUUID(), conductingEquip);
                             }
                             else {
@@ -4277,7 +4327,7 @@ class ConverterIntegral7 {
                                 const uuidGroundDisconnector = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.GroundDisconnector, this.configUuid, keyGroundDisconnector);
                                 const groundDisconnector = new GroundDisconnector_1.GroundDisconnector(uuidGroundDisconnector, i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar, !schaltzustand, false);
                                 //Set connection to ConnectivityNode at neutral side to GroundingImpedance or PetersenCoil
-                                this.createConnection(cimModel, groundDisconnector, connectivityNodeN, PhaseCode_1.PhaseCode.N, true);
+                                this.createConnection(cimModel, groundDisconnector, connectivityNodeN, PhaseCode_1.PhaseCode.N, true, false);
                                 // cimModel.addGroundDisconnector(groundDisconnector);
                                 integral7.sternPunktImpModel.groundDisconnectors.set(groundDisconnector.getUUID(), groundDisconnector);
                                 /** SchaltelementID mit GroundDisconnector UUID verknüpfen, um Topologie des netz_knoten1pelem-Elements herstellen zu können */
@@ -4321,7 +4371,7 @@ class ConverterIntegral7 {
                         bay.voltageLevel = voltageLevel;
                         voltageLevel.addBay(bay);
                         const i7Schluessel = voltageLevel.description +
-                            '/LK-' +
+                            integral_prefix_1.LAENGSKUPPLUNG_PRAEFIX +
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                         bay.key = i7Schluessel;
                     }
@@ -4412,7 +4462,7 @@ class ConverterIntegral7 {
                     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));
                 }
                 for (const i7Data of result) {
-                    let lineNames = new Map;
+                    let lineNames = new Map();
                     /** Alle Stromkreisabschnitte */
                     const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
                     if (!((stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length) > 0))
@@ -4436,6 +4486,7 @@ class ConverterIntegral7 {
                         '-' +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
                     /** Wenn kein Stromkreisobjekt vorhanden ist, dann erstelle ein neues Objekt. */
+                    //TODO: take guid from model CLeitung-object
                     const uuidString = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Line, this.configUuid, i7Schluessel);
                     let lineName = createLineName(i7Data, uuidString, lineNames);
                     // Line (CGMES/CIM) -> ElmBranch
@@ -4453,6 +4504,7 @@ class ConverterIntegral7 {
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
                             '-' +
                             (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
+                        //TODO take guid from model CFreileitungAbschnitt-object, CKabelAbschnitt-object
                         const uuid = (0, parser_utils_1.getUUID)(stk.custom_guid_0120 + stk.custom_guid_2137, this.objectMappingConfig.standardiseUuid);
                         // acLineSegment -> ElmLne
                         const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuid, line.name + '_' + stk.bezeichner, i7Data.stkabname, i7Data.kommentar); //'name', 'shortname' für alle INTEGRALACLineSegment übernehmen
@@ -4489,7 +4541,7 @@ class ConverterIntegral7 {
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt
                      */
                     const acLineSegmentStart = acLineSegments[0];
-                    const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
+                    const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, i7Data, PhaseCode_1.PhaseCode.ABC, false);
                     /** SVProfile Data */
                     if (i7Data.flakn3p) {
                         this.svProfileZweigData.set(i7Data.flakn3p, {
@@ -4531,7 +4583,7 @@ class ConverterIntegral7 {
                         const cn = new ConnectivityNode_1.ConnectivityNode(uuid, (0, util_create_1.createNotation)([acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, false));
                         /**Connect end of aclinesegment i*/
                         cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
-                        tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
+                        tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true, false, integral7);
                         //this.setACLineSegmentCurrentLimt(cimModel, acLineSegment1, acLineSegment1.description, tmp_terminal);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
@@ -4540,7 +4592,7 @@ class ConverterIntegral7 {
                         cable = result_cable.filter(elem => elem.id === stromkreisabschnitte[i].id);
                         this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegments[i], stromkreisabschnitte[i], cable.length > 0, defaultValuesConfig);
                         /**Connect end of aclinesegment i+1*/
-                        tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true);
+                        tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true, false, integral7);
                         //this.setACLineSegmentCurrentLimt(cimModel, acLineSegment2, acLineSegment2.description, tmp_terminal);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
@@ -4551,7 +4603,7 @@ class ConverterIntegral7 {
                     }
                     /** Ende */
                     const acLineSegmentZiel = acLineSegments[anzahl - 1];
-                    const targetTerminal = this.createBoundaryConnection(frame, acLineSegmentZiel, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
+                    const targetTerminal = this.createBoundaryConnection(frame, acLineSegmentZiel, i7Data.eknoten, i7Data, PhaseCode_1.PhaseCode.ABC, false);
                     /** SvProfile Data */
                     if (i7Data.flekn3p) {
                         this.svProfileZweigData.set(i7Data.flekn3p, {
@@ -5210,7 +5262,7 @@ class ConverterIntegral7 {
                      *  KnotenSf -> Schaltfeldpunkt
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt
                      * */
-                    const startTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
+                    const startTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.aknoten, i7Data, PhaseCode_1.PhaseCode.ABC, false);
                     /** SvProfile Data */
                     if (i7Data.flakn3p) {
                         this.svProfileZweigData.set(i7Data.flakn3p, {
@@ -5251,7 +5303,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd2.ratedU = ur2;
                     /*       const ziel = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
                            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);
+                    const zielTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.eknoten, i7Data, PhaseCode_1.PhaseCode.ABC, false);
                     /** SvProfile Data */
                     if (i7Data.flekn3p) {
                         this.svProfileZweigData.set(i7Data.flekn3p, {
@@ -5455,7 +5507,7 @@ class ConverterIntegral7 {
                     }
                     /*     const knotenUUID = this.integralID2UUID.get(wicklung1.aknoten);
                          const start = cimModel.getObject(knotenUUID);*/
-                    const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, PhaseCode_1.PhaseCode.ABC);
+                    const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, wicklung1, PhaseCode_1.PhaseCode.ABC, true);
                     /** SvProfile Data */
                     if (wicklung1.flakn3p) {
                         this.svProfileZweigData.set(wicklung1.flakn3p, {
@@ -5508,7 +5560,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);
+                    const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, wicklung2, PhaseCode_1.PhaseCode.ABC, true);
                     if (wicklung1.flakn3p) {
                         this.svProfileZweigData.set(wicklung2.flakn3p, {
                             powerFlowResultID: wicklung2.flakn3p,
@@ -5562,7 +5614,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);
+                    const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, wicklung3, PhaseCode_1.PhaseCode.ABC, false);
                     if (wicklung3.flakn3p) {
                         this.svProfileZweigData.set(wicklung3.flakn3p, {
                             powerFlowResultID: wicklung3.flakn3p,
@@ -6011,7 +6063,7 @@ class ConverterIntegral7 {
         }
         return operationalLimitType;
     }
-    createConnection(cimModel, conductingEquipment, object, phase, connected) {
+    createConnection(cimModel, conductingEquipment, object, phase, connected, isTrafo3w, integral7, i7Object) {
         let isNameSet = false;
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
@@ -6033,6 +6085,33 @@ class ConverterIntegral7 {
             terminal.conductingEquipment = conductingEquipment;
             conductingEquipment.addTerminal(terminal);
             terminal.connected = (terminal.connected !== undefined) ? terminal.connected : connected;
+            //Complete INT7-key ('schluessel') of this CSchlaufe-object. Assumption: This is a CSchlaufe-object if key_jumper property of Terminal is not undefined.
+            if (terminal.key_jumper !== undefined && integral7 !== undefined && integral7.knotenZwIDs.size > 0) {
+                const schlaufeId = this.UUID2Integral7ID.get(terminal.getUUID())[0];
+                const kZw = [...integral7.knotenZwIDs.values()].filter(elem => elem.schlaufe === schlaufeId)[0];
+                let i7Schluessel = undefined;
+                if (conductingEquipment instanceof ACLineSegment_1.ACLineSegment) {
+                    i7Schluessel = conductingEquipment.equipmentContainer.key +
+                        integral_prefix_1.KNOTEN_ZW_PRAEFIX +
+                        kZw.bezeichner +
+                        terminal.key_jumper;
+                }
+                else if (isTrafo3w) {
+                    i7Schluessel = conductingEquipment.key +
+                        integral_prefix_1.TRAFOWICKLUNG3W_PRAEFIX +
+                        i7Object.bezeichner +
+                        integral_prefix_1.KNOTEN_ZW_PRAEFIX +
+                        kZw.bezeichner +
+                        terminal.key_jumper;
+                }
+                else {
+                    i7Schluessel = conductingEquipment.key +
+                        integral_prefix_1.KNOTEN_ZW_PRAEFIX +
+                        kZw.bezeichner +
+                        terminal.key_jumper;
+                }
+                terminal.key_jumper = i7Schluessel;
+            }
             if (!isNameSet) {
                 terminal.name = (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
             }
@@ -6042,15 +6121,16 @@ class ConverterIntegral7 {
         }
         return terminal;
     }
-    createBoundaryConnection(frame, conductingEquipment, i7ObjectID, phase) {
+    createBoundaryConnection(frame, conductingEquipment, i7ObjectID, i7Object, phase, isTrafo3w) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const cimModel = frame.cimModel;
+        const integral7 = frame.getI7Model();
         const anschlussUUID = this.integralID2UUID.get(i7ObjectID);
         let terminal = undefined;
         let cn = undefined;
         if (cimModel.objects.has(anschlussUUID)) {
             // Anschluss befindet sich im selben Modell
-            terminal = this.createConnection(cimModel, conductingEquipment, cimModel.getObject(anschlussUUID), phase, true);
+            terminal = this.createConnection(cimModel, conductingEquipment, cimModel.getObject(anschlussUUID), phase, true, isTrafo3w, integral7, i7Object);
         }
         else {
             // Anschluss befindet sich im Boundary-Modell
@@ -6100,6 +6180,33 @@ class ConverterIntegral7 {
                 if (terminal) {
                     terminal.conductingEquipment = conductingEquipment;
                     conductingEquipment.addTerminal(terminal);
+                    //Complete INT7-key ('schluessel') of this CSchlaufe-object. Assumption: This is a CSchlaufe-object if key_jumper property of Terminal is not undefined.
+                    if (terminal.key_jumper !== undefined && integral7 !== undefined && integral7.knotenZwIDs.size > 0) {
+                        const schlaufeId = this.UUID2Integral7ID.get(terminal.getUUID())[0];
+                        const kZw = [...integral7.knotenZwIDs.values(), ...frameBD.integral7Modell.knotenZwIDs.values()].filter(elem => elem.schlaufe === schlaufeId)[0];
+                        let i7Schluessel = undefined;
+                        if (conductingEquipment instanceof ACLineSegment_1.ACLineSegment) {
+                            i7Schluessel = conductingEquipment.equipmentContainer.key +
+                                integral_prefix_1.KNOTEN_ZW_PRAEFIX +
+                                kZw.bezeichner +
+                                terminal.key_jumper;
+                        }
+                        else if (isTrafo3w) {
+                            i7Schluessel = conductingEquipment.key +
+                                integral_prefix_1.TRAFOWICKLUNG3W_PRAEFIX +
+                                i7Object.bezeichner +
+                                integral_prefix_1.KNOTEN_ZW_PRAEFIX +
+                                kZw.bezeichner +
+                                terminal.key_jumper;
+                        }
+                        else {
+                            i7Schluessel = conductingEquipment.key +
+                                integral_prefix_1.KNOTEN_ZW_PRAEFIX +
+                                kZw.bezeichner +
+                                terminal.key_jumper;
+                        }
+                        terminal.key_jumper = i7Schluessel;
+                    }
                 }
             }
             else {
@@ -6597,7 +6704,7 @@ class ConverterIntegral7 {
         }
         // Spannungsebene
         if ((_b = (_a = powerTransformerEnd === null || powerTransformerEnd === void 0 ? void 0 : powerTransformerEnd.terminal) === null || _a === void 0 ? void 0 : _a.connectivityNode) === null || _b === void 0 ? void 0 : _b.getBaseVoltage()) {
-            powerTransformerEnd.baseVoltage = powerTransformerEnd.terminal.connectivityNode.getBaseVoltage();
+            powerTransformerEnd.baseVoltage = powerTransformerEnd.getTerminal().connectivityNode.getBaseVoltage();
         }
         else if (powerTransformerEnd.ratedU) {
             powerTransformerEnd.baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, powerTransformerEnd.ratedU, this.configUuid, this.exportFramesBoundary);
@@ -7001,13 +7108,16 @@ class ConverterIntegral7 {
         let connectivityNodeN = undefined;
         let groundDisconnector = undefined;
         let voltageLevel = undefined;
+        if (powerTransformer.getUUID() === "57664475-b08c-484a-8ef1-d84023084cd1" && powerTransformerEnd.endNumber === 2) {
+            const stop = false;
+        }
         if (stpKnoten) {
             groundDisconnectorUUID = i7Modell.sternPunktImpModel.stpSchaltelementeIdGroundDisconnectorUUID.get(stpKnoten.schaltelement1pelem);
             connectivityNodeN = i7Modell.sternPunktImpModel.stpSchieneIdConnectivityNode.get(i7Modell.sternPunktImpModel.GroundDisconnectorUuidStpSchieneId.get(groundDisconnectorUUID));
             groundDisconnector = i7Modell.sternPunktImpModel.groundDisconnectors.get(groundDisconnectorUUID);
             if (groundDisconnector !== undefined && groundDisconnector.getTerminals().size === 1) {
                 const cn = powerTransformerEnd.getTerminal().getConnectivityNode();
-                this.createConnection(cimModel, groundDisconnector, cn, PhaseCode_1.PhaseCode.ABCN, true);
+                this.createConnection(cimModel, groundDisconnector, cn, PhaseCode_1.PhaseCode.ABCN, true, false);
             }
             else if (groundDisconnector !== undefined && groundDisconnector.getTerminals().size < 1) {
                 this.logger.debug(`GroundDisconnector of PowerTransformerEnd ${powerTransformerEnd === null || powerTransformerEnd === void 0 ? void 0 : powerTransformerEnd.mrid} is not successfully connected.`);
@@ -7016,7 +7126,33 @@ class ConverterIntegral7 {
                 this.logger.debug(`GroundDisconnector of PowerTransformerEnd ${powerTransformerEnd === null || powerTransformerEnd === void 0 ? void 0 : powerTransformerEnd.mrid} is referenced by more than two Terminal objects.`);
             }
             /** EquipmentContainer - Voltage Level*/
-            voltageLevel = (this.determineEquipmentContainer('VoltageLevel', cimModel, powerTransformerEnd.getTerminal().connectivityNode.connectivityNodeContainer));
+            if (powerTransformerEnd.endNumber == 2 && powerTransformer.getUUID() === "57664475-b08c-484a-8ef1-d84023084cd1") {
+                const stop = true;
+            }
+            let tmpUUID = powerTransformerEnd.getTerminal().getConnectivityNodeUUID();
+            let connectivityNodes = new Map();
+            let voltageLevels = new Map();
+            let bays = new Map();
+            for (var cn of cimModel.connectivityNodes.entries()) {
+                connectivityNodes.set(cn[0], cn[1]);
+            }
+            for (var cnBd of this.exportFramesBoundary.values().next().value.cimModel.connectivityNodes.entries()) {
+                connectivityNodes.set(cnBd[0], cnBd[1]);
+            }
+            for (var vl of cimModel.voltageLevels.entries()) {
+                voltageLevels.set(vl[0], vl[1]);
+            }
+            for (var vlBd of this.exportFramesBoundary.values().next().value.cimModel.voltageLevels.entries()) {
+                voltageLevels.set(vlBd[0], vlBd[1]);
+            }
+            for (var bay of cimModel.bays.entries()) {
+                bays.set(bay[0], bay[1]);
+            }
+            const tmpCn = connectivityNodes.get(tmpUUID) ? connectivityNodes.get(tmpUUID) : undefined;
+            tmpUUID = tmpCn.getConnectivityNodeContainerUUID();
+            let equipmentContainer = voltageLevels.get(tmpUUID) ? voltageLevels.get(tmpUUID) : (bays.get(tmpUUID) ? bays.get(tmpUUID) : undefined);
+            equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, equipmentContainer);
+            voltageLevel = equipmentContainer ? equipmentContainer : undefined;
         }
         if (stpKnoten && groundDisconnector === undefined) { //Case 3 and Case 4
             const earthFaultCompensator = i7Modell.sternPunktImpModel.stpKnotenStpImp.get(stpKnoten.id);