@enervance/insight-cim-model 0.0.214-next → 0.0.215-dev

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

@@ -27,6 +27,7 @@ const CsConverter_1 = require("../../model/dc/CsConverter.js");
 const CsOperatingModeKind_1 = require("../../model/dc/CsOperatingModeKind.js");
 const DCConverterOperatingModeKind_1 = require("../../model/dc/DCConverterOperatingModeKind.js");
 const DCLine_1 = require("../../model/dc/DCLine.js");
+const DCLineSegment_1 = require("../../model/dc/DCLineSegment.js");
 const DCNode_1 = require("../../model/dc/DCNode.js");
 const DCTerminal_1 = require("../../model/dc/DCTerminal.js");
 const VsConverter_1 = require("../../model/dc/VsConverter.js");
@@ -141,9 +142,6 @@ const INTEGRALPowerTransformer2WInfo_1 = require("../../model/extensions/integra
 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");
-const PetersenCoilModeKind_1 = require("../../model/wires/PetersenCoilModeKind.js");
-const GroundDisconnector_1 = require("../../model/wires/GroundDisconnector.js");
-const DCLineSegment_1 = require("../../model/extensions/integral/dc/DCLineSegment.js");
 class ConverterIntegral7 {
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
@@ -208,7 +206,6 @@ class ConverterIntegral7 {
                 yield this.queryErsatzLaengsAnschlussIDs();
                 yield this.queryLkondensatorAnschlussIDs();
                 /** BD Profile  */
-                this.logger.debug('Convert BD Profiles');
                 console.log('Convert BD Profiles');
                 let boundaryEqUUId = undefined;
                 for (const entry of this.exportFramesBoundary.entries()) {
@@ -220,7 +217,6 @@ class ConverterIntegral7 {
                         continue;
                     yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig);
                 }
-                this.logger.debug('Convert MAS Profiles');
                 console.log('Convert MAS Profiles');
                 for (const entry of this.exportFrames.entries()) {
                     const geoRegionUUID = entry[0];
@@ -229,7 +225,6 @@ class ConverterIntegral7 {
                     if (!geoRegion)
                         continue;
                     // frame.addDependentModel(RDF_XML.PROFILE_EQ_BD, this.exportFramesBoundary.entries().next()?.value[1].getModelUUID(RDF_XML.PROFILE_EQ_BD));
-                    this.logger.debug(`Convert MAS profile: ${frame.mas}`);
                     console.log(`Convert MAS profile: ${frame.mas}`);
                     yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig);
                     if (boundaryEqUUId) {
@@ -239,7 +234,6 @@ class ConverterIntegral7 {
                     frame.purgeData();
                     const startTime = perf_hooks.performance.now();
                     frame.openXMLModel();
-                    this.logger.debug(`Serialize MAS profile: ${frame.mas}`);
                     console.log(`Serialize MAS profile: ${frame.mas}`);
                     frame.serializeModel(defaultValuesConfig);
                     yield frame.closeXMLModel();
@@ -247,7 +241,7 @@ class ConverterIntegral7 {
                     frame.cimModel.purgeData();
                     console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
                 }
-                this.logger.debug('Serialize BD Profiles');
+                console.log('Serialize BD Profiles');
                 for (const entry of this.exportFramesBoundary.entries()) {
                     const geoRegionUUID = entry[0];
                     const frame = entry[1];
@@ -266,7 +260,7 @@ class ConverterIntegral7 {
                     let endTime = perf_hooks.performance.now();
                     console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
                 }
-                this.logger.debug('Serialize Default Profile');
+                console.log('Serialize Default Profile');
                 this.exportFrameDefault.openXMLModel();
                 this.exportFrameDefault.serializeModel(defaultValuesConfig);
                 yield this.exportFrameDefault.closeXMLModel();
@@ -404,22 +398,6 @@ class ConverterIntegral7 {
                 yield this.convertLeistungsschalter(cimModel, eqiupmentContainerIDs);
                 logExecutionTime(this.logger, startTime, `convertLeistungsschalter(${cimModel.breakers.size})`);
             }
-            /** Sternpunktimp Modell
-             * 1) netz_knoten1pso
-             * 2) netz_schaltelement1pelem -> Junction/Terminal
-             * 3) netz_kdrossel */
-            /** Sternpunktschienen -> ConnectivityNodes */
-            if (standortIDs.length > 0) {
-                startTime = perf_hooks.performance.now();
-                const stpSchieneID = yield this.convertSternpunktSchienen(cimModel, integral7Modell, standortIDs);
-                /** KDrossel -> GroundingImpedance/PetersenCoil */
-                yield this.convertKdrossel(cimModel, integral7Modell, stpSchieneID, defaultValuesConfig);
-                /** Schaltzustand der Schaltelemente */
-                yield this.convertStpSchaltelemente(cimModel, integral7Modell, stpSchieneID);
-                /** Sternpunktschienenkupplung*/ // ToDo: Wie kann so etwas in CGMES abgebildet werden?
-                //await this.convertStpSchienenKupplung(cimModel, integral7Modell, stpSchieneID);
-                logExecutionTime(this.logger, startTime, `convertSternpunkte`);
-            }
             /** Trafo2W */
             if (standortIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
@@ -498,6 +476,20 @@ class ConverterIntegral7 {
                 yield this.convertKompensationskondensatoren(cimModel, integral7Modell.targetVoltages, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertKompensationskondensatoren`);
             }
+            /** Sternpunktimp Modell
+             * 1) netz_knoten1pso
+             * 2) netz_schaltelement1pelem -> Junction/Terminal
+             * 3) netz_kdrossel */
+            /** Sternpunktschienen -> ConnectivityNodes */
+            if (standortIDs.length > 0) {
+                startTime = perf_hooks.performance.now();
+                const stpSchieneID = yield this.convertSternpunktSchienen(cimModel, integral7Modell, standortIDs);
+                /** KDrossel -> GroundingImpedance/PetersenCoil */
+                yield this.convertKdrossel(cimModel, integral7Modell, stpSchieneID);
+                /** Schaltzustand der Schaltelemente */
+                yield this.convertStpSchaltelemente(integral7Modell, stpSchieneID);
+                logExecutionTime(this.logger, startTime, `convertSternpunkte`);
+            }
             /** Statcom -> StaticVarCompensator */
             /** Sonderfall mit Trafo
              * Trafos müssen zuertst konvertiert werden. */
@@ -558,7 +550,6 @@ class ConverterIntegral7 {
                 const netz_standortIds = standortIDs.map(standortId => {
                     return { id: standortId };
                 });
-                const boundary_standortIds = [];
                 const netz_knotensoIds = knotenSoIDs.map(knotenSoId => {
                     return { id: knotenSoId };
                 });
@@ -568,7 +559,6 @@ class ConverterIntegral7 {
                     });
                     entry[1].integral7Modell.integralKnotenSo.forEach((_, key) => {
                         netz_knotensoIds.push({ id: key });
-                        boundary_standortIds.push({ id: key });
                     });
                 }
                 const netzLeitungIds = [...integral7Modell.integralLeitungen.keys()];
@@ -578,8 +568,6 @@ class ConverterIntegral7 {
                 const allLeitungIds = [...new Set([...netzLeitungIds, ...netzHgueLeitungIds, ...netzErsatzlaengszweigIds, ...netzStreckenlastIds]).values()];
                 const convertOptions = {
                     visible_only: true,
-                    boundary_standortIds,
-                    nsg_standort_treshold_percentage: 25,
                     only: {
                         netz_standortIds,
                         netz_knotensoIds,
@@ -597,7 +585,6 @@ class ConverterIntegral7 {
                         })
                     }
                 };
-                frame.cimModel.addDiagramStyle(this.executor.dlConverter.diagramStyles[cim_constants_1.DiagramLayoutTypes.NODE_BREAKER]);
                 const resultingObjects = yield this.executor.convert(convertOptions);
                 for (const resultingObject of resultingObjects) {
                     if (resultingObject instanceof Diagram_1.Diagram) {
@@ -708,7 +695,7 @@ class ConverterIntegral7 {
                         .then((result) => {
                         for (const i7Data of result) {
                             const i7Schluessel = integral_prefix_1.GEOREGION_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                            const region = new GeographicalRegion_1.GeographicalRegion((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner)]), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
+                            const region = new GeographicalRegion_1.GeographicalRegion((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_GR']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
                             //region.i7key = i7Schluessel;
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
@@ -756,12 +743,11 @@ class ConverterIntegral7 {
                         .then((result) => {
                         for (const i7Data of result) {
                             const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner)
-                            ]), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluesel);
+                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_SGR']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluesel);
                             const regionUUID = this.integralID2UUID.get(i7Data.georegion);
                             let region = regions.find(elem => elem.mrid === regionUUID);
                             if (!region) {
-                                region = (0, utils_1.createIfNotExitsGeoregionByName)(this.cimModelDefault, (0, util_create_1.createNotation)([defaultValuesConfig.GeographicalRegion.name]), this.configUuid);
+                                region = (0, utils_1.createIfNotExitsGeoregionByName)(this.cimModelDefault, (0, util_create_1.createNotation)([defaultValuesConfig.GeographicalRegion.name, '_GR']), this.configUuid);
                                 this.logger.debug(`SubGeographicalRegion UUID ${subregion.mrid} I7-ID ${i7Data.id} Name ${i7Data.bezeichner} hat keine Region.`);
                             }
                             subregion.region = region;
@@ -852,7 +838,7 @@ class ConverterIntegral7 {
                         i7Data.un +
                         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);
+                    const vl = new VoltageLevel_1.VoltageLevel((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname, i7Schluessel);
                     vl.key = i7Schluessel;
                     const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, vl, cim_constants_1.CimAssetAliasNames.VoltageLevel, this.configUuid);
                     if (i7Data.baujahr) {
@@ -941,31 +927,23 @@ class ConverterIntegral7 {
         });
     }
     convertKnotenSo(frame, integral7, standortIDs, defaultValuesConfig) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_SO)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_SO), standortIDs));
-                const netzGruppe = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NETZGRUPPE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NETZGRUPPE), []));
                 for (const i7Data of result) {
-                    const netzgruppe = netzGruppe.filter(elem => elem.id === i7Data.netzgruppe);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid);
+                    // const vl = new VoltageLevel(getUUID(i7Data.guid_v, this.objectMappingConfig.standardiseUuid), createNotation([getName(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
                     const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VoltageLevel, this.configUuid, rdfid), i7Data.bezeichner, i7Data.kurzname);
+                    //const rdfid = getUUID(i7Data.guid); /**This is the mrid for TopologicalNode */
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar);
-                    if (connectivityNode.getUUID() === '98d0e9eb-bfb0-4da4-9700-660626da1c56' || connectivityNode.getName() === 'XDU_SL12') {
-                        let stop = true;
-                    }
                     connectivityNode.setConnectivityNodeContainer(vl);
                     vl.addConnectivityNode(connectivityNode);
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
-                    connectivityNode.netzGruppe = (_a = netzgruppe === null || netzgruppe === void 0 ? void 0 : netzgruppe.at(0)) === null || _a === void 0 ? void 0 : _a.bezeichner;
                     if (frame.boundary) {
                         connectivityNode.boundaryPoint = true;
                     }
-                    const key = integral_sql_1.I7Objects.KNOTEN_SO + ((_b = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getUUID()) !== null && _b !== void 0 ? _b : '');
-                    const junction = new Junction_1.Junction(common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VoltageLevel, this.configUuid, key), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), connectivityNode.getUUID().substring(0, 8), "_J"]));
-                    this.createConnection(cimModel, junction, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
                     const un = (0, utils_2.getU)(i7Data.un);
                     const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.configUuid, this.exportFramesBoundary);
                     /** Spannungsband */
@@ -981,7 +959,7 @@ class ConverterIntegral7 {
                             integral_prefix_1.MITTIGER_PUNKT +
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                         vl.key = i7Schluessel;
-                        connectivityNode.key = i7Schluessel;
+                        connectivityNode.description = i7Schluessel;
                     }
                     else {
                         this.logger.debug(`KnotenSo ${i7Data.id} ${vl.mrid} besitzt keine Substation.`);
@@ -1023,27 +1001,21 @@ class ConverterIntegral7 {
         });
     }
     convertSammelschienenAbschnitte(cimModel, integral7, schaltanlagenAbschnittIDs) {
-        var _a, _b, _c;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SAMMELSCHIENE)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
-                const netzGruppe = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NETZGRUPPE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NETZGRUPPE), []));
                 for (const i7Data of result) {
                     const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    const netzgruppe = netzGruppe.filter(elem => elem.id === i7Data.netzgruppe);
-                    let saab = undefined;
-                    if (integral7.integralSchaltanlagenAbschnitte.has(i7Data.saabschnitt)) {
-                        saab = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    }
+                    //const rdfid: string = getUUID(i7Data.guid); /** this is the mrid for TopologicalNode*/
                     const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid);
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, i7Data.bezeichner, i7Data.kurzname);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
-                    connectivityNode.netzGruppe = (_a = netzgruppe === null || netzgruppe === void 0 ? void 0 : netzgruppe.at(0)) === null || _a === void 0 ? void 0 : _a.bezeichner;
                     const keyBusbarSection = [
                         integral_sql_1.I7Objects.SAMMELSCHIENE,
-                        (_b = voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.getUUID()) !== null && _b !== void 0 ? _b : '',
-                        (_c = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getUUID()) !== null && _c !== void 0 ? _c : ''
+                        (_a = voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.getUUID()) !== null && _a !== void 0 ? _a : '',
+                        (_b = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getUUID()) !== null && _b !== void 0 ? _b : ''
                     ].join('');
                     const uuidBusbarSection = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.BusbarSection, this.configUuid, keyBusbarSection);
                     const busbarSection = new BusbarSection_1.BusbarSection(uuidBusbarSection, i7Data.bezeichner, i7Schaltanlagenabschnitt.kurzname);
@@ -1059,15 +1031,11 @@ class ConverterIntegral7 {
                         voltageLevel.highVoltageLimit = (0, parser_utils_1.isNumericI7)(i7Data.umax) ? (0, parser_utils_1.convertToNumberI7)(i7Data.umax) : voltageLevel.highVoltageLimit;
                         // umin
                         voltageLevel.lowVoltageLimit = (0, parser_utils_1.isNumericI7)(i7Data.umin) ? (0, parser_utils_1.convertToNumberI7)(i7Data.umin) : voltageLevel.lowVoltageLimit;
-                        //define INTEGRAL Schluessel for ConnectivityNode
-                        if (saab !== undefined) {
-                            const i7Schluessel = voltageLevel.key +
-                                integral_prefix_1.SCHALTANLAGENABSCHNITT_PRAEFIX +
-                                (0, utils_2.ueberpruefeZeichenkette)(saab.bezeichner) +
-                                integral_prefix_1.SAMMELSCHIENENABSCHNITT_PRAEFIX +
-                                (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                            connectivityNode.key = i7Schluessel;
-                        }
+                        /**const i7Schluessel = voltageLevel.substation.name +
+                         SAMMELSCHIENENABSCHNITT_PRAEFIX +
+                         ueberpruefeZeichenkette(i7Data.bezeichner);
+                         busbarSection.description = i7Schluessel;
+                         connectivityNode.description = i7Schluessel;*/
                         /** Spannungsband */
                         integral7.targetVoltages.set(i7Data.id, { usoll: i7Data.usoll, umin: i7Data.umin, umax: i7Data.umax });
                         // TODO VoltageLimits?
@@ -1080,7 +1048,7 @@ class ConverterIntegral7 {
                     cimModel.addConnectivityNode(connectivityNode);
                     cimModel.addBusbarSection(busbarSection);
                     /** Integral 7 Modell erstellen zur Berechnung der Netzschema */
-                    if (saab !== undefined) {
+                    if (integral7.integralSchaltanlagenAbschnitte.has(i7Data.saabschnitt)) {
                         integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt).ssab.push(i7Data);
                     }
                 }
@@ -1097,11 +1065,10 @@ class ConverterIntegral7 {
                 const result = yield this.queryDataInChuncks(integral_sql_1.I7Objects.KNOTEN_SF, schaltfeldIDs);
                 for (const i7Data of result) {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.schaltfeld));
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([i7Data.bezeichner, '_CN'], 32, false), (0, util_create_1.createNotation)([i7Data.bezeichner, '_CN'], 32, false));
-                    if (bay !== undefined) {
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
+                    if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
-                        connectivityNode.key = bay.key + integral_prefix_1.KNOTEN_SF_PRAEFIX + i7Data.bezeichner;
                     }
                     else {
                         this.logger.debug(`KnotenSf ${i7Data.id} besitzt kein Schaltfeld.`);
@@ -1126,11 +1093,11 @@ class ConverterIntegral7 {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.kpfeld));
                     const key = integral_sql_1.I7Objects.KNOTEN_KF + ((_a = bay === null || bay === void 0 ? void 0 : bay.getUUID()) !== null && _a !== void 0 ? _a : '') + String(i7Data.id) + String(i7Data.kpfeld);
                     const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ConnectivityNode, this.configUuid, key);
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuid, (0, util_create_1.createNotation)([i7Data.bezeichner, '_CN'], 32, false), (0, util_create_1.createNotation)([i7Data.bezeichner, '_CN'], 32, false));
+                    // const connectivityNode = new ConnectivityNode(getUUID(i7Data.guid, this.objectMappingConfig.standardiseUuid), createNotation([getName(i7Data), '_CN']), 'knotenkf');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuid, i7Data.bezeichner, 'knotenkf');
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
-                        connectivityNode.key = bay.key + integral_prefix_1.KNOTEN_KF_PRAEFIX + i7Data.bezeichner;
                     }
                     else {
                         this.logger.debug(`KnotenKf ${i7Data.id} besitzt kein Schaltfeld.`);
@@ -1153,12 +1120,11 @@ class ConverterIntegral7 {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
                     const key = integral_sql_1.I7Objects.KNOTEN_LK + ((_a = bay === null || bay === void 0 ? void 0 : bay.getUUID()) !== null && _a !== void 0 ? _a : '') + String(i7Data.id) + String(i7Data.lkupplung);
                     const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ConnectivityNode, this.configUuid, key);
-                    const name = (0, util_create_1.createNotation)([i7Data.bezeichner, '_CN'], 32, false);
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuid, name, name);
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuid, i7Data.bezeichner, 'KnotenLk');
+                    // const connectivityNode = new ConnectivityNode(CommonUtils.generateUUID(), createNotation([getName(i7Data), '_CN']), 'KnotenLk');
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
-                        connectivityNode.key = bay.key + integral_prefix_1.KNOTEN_LK_PRAEFIX + i7Data.bezeichner;
                     }
                     else {
                         this.logger.debug(`KnotenLk ${i7Data.id} besitzt kein Schaltfeld.`);
@@ -1181,12 +1147,8 @@ class ConverterIntegral7 {
                     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);
-                    if (terminal.getUUID() === '7564eef1-6cd6-59c2-957e-825c6593fdf2') {
-                        const stop = true;
-                    }
                     terminal.connected = (0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand);
                     terminal.phases = PhaseCode_1.PhaseCode.ABC;
-                    terminal.key = integral_prefix_1.SCHLAUFE_PRAEFIX + i7Data.bezeichner;
                     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);
@@ -1292,101 +1254,6 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertVollUmrichterEinspeisung(cimModel, targetVoltages, knotenSfIDs, objectMappingConfig, energySourceTypeMappingConfig) {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const targetClass = objectMappingConfig.Einspeisung.class;
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.VOLLUMRICHTEREINSPEISUNG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.VOLLUMRICHTEREINSPEISUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.VOLLUMRICHTEREINSPEISUNG), knotenSfIDs));
-                for (const i7Data of result) {
-                    try {
-                        const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                        const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);
-                        externalNetworkInjection.nameprimaertyp = 'Wind Onshore';
-                        let mf = undefined;
-                        mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
-                        if (mf) {
-                            cimModel.addMultiplierFactor(mf);
-                            externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
-                        }
-                        /** Convert EQ-profile dataset. */
-                        const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
-                        externalNetworkInjection.maxP = maxP;
-                        const governorscd = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                        externalNetworkInjection.governorSCD = governorscd;
-                        const maxQ = (0, parser_utils_1.isNumericI7)(i7Data.q_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_max) : undefined;
-                        externalNetworkInjection.maxQ = maxQ;
-                        const minP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : undefined;
-                        externalNetworkInjection.minP = minP;
-                        const minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
-                        externalNetworkInjection.minQ = minQ;
-                        this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, targetVoltages);
-                        /**Convert short circuit constants */
-                        const r0X0 = undefined;
-                        const r1X1 = undefined;
-                        const z0Z1 = undefined;
-                        const maxR0X0Ratio = r0X0;
-                        externalNetworkInjection.maxR0ToX0Ratio = maxR0X0Ratio;
-                        const maxR1X1Ratio = r1X1;
-                        externalNetworkInjection.maxR1ToX1Ratio = maxR1X1Ratio;
-                        const maxZ0Z1Ratio = z0Z1;
-                        externalNetworkInjection.maxZ0ToZ1Ratio = maxZ0Z1Ratio;
-                        const minR0X0Ratio = r0X0;
-                        externalNetworkInjection.minR0ToX0Ratio = minR0X0Ratio;
-                        const minR1X1Ratio = r1X1;
-                        externalNetworkInjection.minR1ToX1Ratio = minR1X1Ratio;
-                        const minZ0Z1Ratio = z0Z1;
-                        externalNetworkInjection.minZ0ToZ1Ratio = minZ0Z1Ratio;
-                        const i2sk1 = (0, parser_utils_1.isNumericI7)(i7Data.i2sk1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.i2sk1) : undefined;
-                        const i2sk2 = (0, parser_utils_1.isNumericI7)(i7Data.i2sk2) ? (0, parser_utils_1.convertToNumberI7)(i7Data.i2sk2) : undefined;
-                        const i2sk2e = (0, parser_utils_1.isNumericI7)(i7Data.i2sk2e) ? (0, parser_utils_1.convertToNumberI7)(i7Data.i2sk2e) : undefined;
-                        const i2sk3 = (0, parser_utils_1.isNumericI7)(i7Data.i2sk3) ? (0, parser_utils_1.convertToNumberI7)(i7Data.i2sk3) : undefined;
-                        const ikMin = (0, utils_2.transformShortCircuitCurrent)(Math.min(i2sk1, i2sk2, i2sk2e, i2sk3));
-                        const ikMax = (0, utils_2.transformShortCircuitCurrent)(Math.max(i2sk1, i2sk2, i2sk2e, i2sk3));
-                        externalNetworkInjection.minInitialSymShCCurrent = ikMin;
-                        externalNetworkInjection.maxInitialSymShCCurrent = ikMax;
-                        const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : false;
-                        /** Convert SSH-profile dataset. */
-                        /**
-                         * @description Set einspprio as referencePriority. PowerFactory sets external network injections with referencePriority == 1, to slack control mode. In regular case referencePriority for externalnetworkextensions is set to value '0'.
-                         *                einspprio having no effect in loadflow calculation if voltage control does not exists.
-                         * */
-                        let prio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
-                        if (((_a = externalNetworkInjection.regulatingControl) === null || _a === void 0 ? void 0 : _a.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
-                            if (prio !== undefined && prio > 0) {
-                                externalNetworkInjection.referencePriority = prio + 1; //TODO: SLACK is a injection with maximum prio in the network section and active voltage control.
-                            }
-                            else if (prio !== undefined && prio === 0) {
-                                externalNetworkInjection.referencePriority = prio;
-                            }
-                            else {
-                                externalNetworkInjection.referencePriority = undefined;
-                            }
-                        }
-                        const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
-                        const p = powerData[0];
-                        const q = powerData[1];
-                        externalNetworkInjection.setActivePower(p * -1); //convert to load sign system
-                        externalNetworkInjection.setReactivePower(q * -1); //convert to load sign system
-                        // AMPI7 profile
-                        const cosPhi = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi) ? ((0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) !== 0 ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) : 1) : undefined;
-                        externalNetworkInjection.cos_phi = cosPhi;
-                        externalNetworkInjection.p_mf = (mf && powerData[2]) ? powerData[2] * -1 : undefined;
-                        externalNetworkInjection.q_mf = (mf && powerData[3]) ? powerData[3] * -1 : undefined;
-                        externalNetworkInjection.normallyInService = inBetrieb;
-                        cimModel.addExternalNetworkInjection(externalNetworkInjection);
-                        this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
-                    }
-                    catch (err) {
-                        this.logger.error(`error --- convertVollumrichtereinspeisung ${i7Data.id} ${err}`);
-                    }
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.VOLLUMRICHTEREINSPEISUNG} ist nicht vorhanden.`);
-            }
-        });
-    }
     convertErsatzQuerZweige(cimModel, targetVoltages, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG)) {
@@ -1419,9 +1286,6 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const genType = this.generatorTypen.get(i7Data.nametyp);
                     const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM'], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
-                    if (synchronousMachine.getUUID() === '10409E08-E2C0-4EBD-AD4C-5370178ED62F') {
-                        let stop = true;
-                    }
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                     const cosPhi = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) : undefined;
                     const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
@@ -1523,7 +1387,7 @@ class ConverterIntegral7 {
                     const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
                     // AMP I7 Profil
                     synchronousMachine.cos_phi = i7Data.cos_phi;
-                    if (synchronousMachine.getUUID() === '69718d2d-5988-49a9-b5c8-d53d0cf0e89a') {
+                    if (synchronousMachine.getUUID() === '03ee3f18-9984-48eb-bc26-09e8c182fbda') {
                         let stop = true;
                     }
                     if (synchronousMachine.getUUID() === 'f6d81d19-dca0-48e9-a43e-4ab1f6bf697d') {
@@ -1575,7 +1439,7 @@ class ConverterIntegral7 {
                     // synchronousMachine.voltageRegulationRange: number;
                     /** Create ReactiveCapabilityCurves */
                     if (minP !== undefined && maxP !== undefined && minQvonPmin !== undefined && maxQvonPmax !== undefined) {
-                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve((0, parser_utils_1.getUUID)(i7Data.guid_rcc, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)(['CurveData', '_', synchronousMachine.getUUID().substring(0, 8), '_RCC']));
+                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve((0, parser_utils_1.getUUID)(i7Data.guid_rcc, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)(['CurveData', synchronousMachine.mrid, '_RCC']));
                         reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                         reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
                         reactiveCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
@@ -1658,9 +1522,6 @@ class ConverterIntegral7 {
                         // TODO: genControlSource is not required.
                         //generatingUnit.genControlSource = GeneratorControlSource.onAGC;
                         /**Complete GeneratingUnit data */
-                        if (generatingUnit.getUUID() === '70810e1e74aa4359b387bef9158f4767' || synchronousMachine.getUUID() === '70810e1e74aa4359b387bef9158f4767') {
-                            const stop = true;
-                        }
                         generatingUnit.initialP = (0, parser_utils_1.isNumericI7)(i7Data.p0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p0) : undefined;
                         // generatingUnit.longPF
                         // generatingUnit.maximumAllowableSpinningReserve
@@ -1812,7 +1673,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);
+                        (0, util_create_1.createConnection)(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC);
                         const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
                         if (equipmentContainer) {
                             equipmentContainer.addEquipment(asynchronousMachine);
@@ -2075,12 +1936,12 @@ class ConverterIntegral7 {
                 }
                 else if (flag_lfl || flag_ks) {
                     equivalentInjection.regulationCapability = false;
-                    equivalentInjection.r = (0, parser_utils_1.isNumericI7)(r1) ? r1 : 1e9;
-                    equivalentInjection.r0 = (0, parser_utils_1.isNumericI7)(r0) ? r0 : 1e9;
-                    equivalentInjection.r2 = (0, parser_utils_1.isNumericI7)(r1) ? r1 : 1e9;
-                    equivalentInjection.x = (0, parser_utils_1.isNumericI7)(x1) ? x1 : 1e9;
-                    equivalentInjection.x0 = (0, parser_utils_1.isNumericI7)(x0) ? x0 : 1e9;
-                    equivalentInjection.x2 = (0, parser_utils_1.isNumericI7)(x1) ? x1 : 1e9;
+                    equivalentInjection.r = (0, parser_utils_1.isNumericI7)(r1) ? 1e9 : r1;
+                    equivalentInjection.r0 = (0, parser_utils_1.isNumericI7)(r0) ? 1e9 : r0;
+                    equivalentInjection.r2 = (0, parser_utils_1.isNumericI7)(r1) ? 1e9 : r1;
+                    equivalentInjection.x = (0, parser_utils_1.isNumericI7)(x1) ? 1e9 : x1;
+                    equivalentInjection.x0 = (0, parser_utils_1.isNumericI7)(x0) ? 1e9 : x0;
+                    equivalentInjection.x2 = (0, parser_utils_1.isNumericI7)(x1) ? 1e9 : x1;
                 }
                 /** Export Extended Ward equivalent with no voltage regulation */
                 else if (((r_ext !== undefined && r_ext !== 0) || (x_ext !== undefined && x_ext !== 0))) {
@@ -2376,9 +2237,6 @@ class ConverterIntegral7 {
                     const qr = (0, parser_utils_1.isNumericI7)(i7Data.qr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qr) : undefined;
                     const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
                     shunt.nomU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
-                    if (shunt.getUUID() === '547B9591-C41B-4496-9954-2215B8945124') {
-                        let stop = true;
-                    }
                     // Set electrical properties (EQ core)
                     if ((0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
                         shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
@@ -2518,7 +2376,7 @@ class ConverterIntegral7 {
                     /** EQ */
                     statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(ur, qkapr);
                     statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(ur, qindr)) * -1;
-                    statVarCom.slope = (0, parser_utils_1.isNumericI7)(mrez) && mrez !== 0 ? 1 / (0, parser_utils_1.convertToNumberI7)(mrez) : 0;
+                    statVarCom.slope = mrez !== 0 ? 1 / mrez : 0;
                     statVarCom.sVCControlMode = SVCControlMode_1.SVCControlMode.voltage;
                     statVarCom.aggregate = false;
                     /** EQ-SC */
@@ -2527,6 +2385,7 @@ class ConverterIntegral7 {
                     /** SV */
                     //statVarCom.svpowerflow
                     /** Regelung */
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid_rc);
                     const regulatingControl = this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, targetVoltages, undefined, true);
                     /** EQ */
                     if (regulatingControl) {
@@ -2554,7 +2413,7 @@ class ConverterIntegral7 {
                     /** EQ */
                     statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(ur, qkapr);
                     statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(ur, qindr)) * -1;
-                    statVarCom.slope = (0, parser_utils_1.isNumericI7)(mrez) && mrez !== 0 ? 1 / (0, parser_utils_1.convertToNumberI7)(mrez) : 0;
+                    statVarCom.slope = mrez !== 0 ? 1 / mrez : 0;
                     statVarCom.sVCControlMode = SVCControlMode_1.SVCControlMode.voltage;
                     statVarCom.aggregate = false;
                     /** EQ-SC */
@@ -2566,11 +2425,11 @@ class ConverterIntegral7 {
                     /** EQ */
                     statVarCom.voltageSetPoint = regulatingControl.targetValue ? regulatingControl.targetValue : ur;
                     cimModel.addStaticVarCompensator(statVarCom);
-                    this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.SVC);
+                    this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.STATCOM);
                 }
             }
             else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.SVC} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
             }
         });
     }
@@ -2623,10 +2482,9 @@ class ConverterIntegral7 {
                     csConverter.ratedIdc = (0, utils_2.calculateRatedIdc)(csConverter.ratedUdc, pr);
                     /** spannungsabhängige Wirk-Verluste in kW bei Leerlauf mit Bemessungsspannung in kV*/
                     csConverter.idleLoss = (0, parser_utils_1.isNumericI7)(i7Data.p_leer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_leer) * Math.pow(10, -3) : undefined;
-                    csConverter.maxUdc = csConverter.ratedUdc * 1.08; // +5% * ratedUdc
-                    csConverter.minUdc = csConverter.ratedUdc * 0.98; // -5% * ratedUdc
-                    //R=U^2/P
-                    csConverter.resistiveLoss = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? Math.pow(csConverter.ratedUdc, 2) / ((0, parser_utils_1.convertToNumberI7)(i7Data.pkr) * Math.pow(10, 3)) : undefined;
+                    csConverter.maxUdc = csConverter.ratedUdc * 1.05; // +5% * ratedUdc
+                    csConverter.minUdc = csConverter.ratedUdc * 0.95; // -5% * ratedUdc
+                    csConverter.resistiveLoss = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) * Math.pow(10, -3) : undefined;
                     csConverter.switchingLoss = 0;
                     /* csConverter.numberOfValves
                     csConverter.valveU0*/
@@ -2720,21 +2578,21 @@ class ConverterIntegral7 {
                     /** Bemessungsleistung (Gleichstromseite) in MW
                      * im CS-Fall S = P?
                      * Abhängig vom  */
-                    vsConverter.baseS = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
+                    vsConverter.baseS = i7Data.pr;
                     /** Bemessungsspannung (Gleichstromseite) in kV*/
                     //If udc is set in Integral data model set converter.ratedUdc as i7Data.udc else take the data value for i7Data.ur (Bemessungsspannung)
                     vsConverter.ratedUdc = (0, parser_utils_1.isNumericI7)(i7Data.udc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.udc) : ((0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined);
-                    /** spannungsabhängige Wirk-Verluste in MW bei Leerlauf mit Bemessungsspannung in kV*/
+                    /** spannungsabhängige Wirk-Verluste bei Leerlauf mit Bemessungsspannung in kV*/
                     vsConverter.idleLoss = (0, parser_utils_1.isNumericI7)(i7Data.p_leer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_leer) * Math.pow(10, -3) : undefined;
-                    vsConverter.maxUdc = vsConverter.ratedUdc * 1.08; // +8% * ratedUdc
-                    vsConverter.minUdc = vsConverter.ratedUdc * 0.98; // -2% * ratedUdc
-                    vsConverter.resistiveLoss = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? Math.pow(vsConverter.ratedUdc, 2) / ((0, parser_utils_1.convertToNumberI7)(i7Data.pkr) * Math.pow(10, 3)) : undefined;
+                    vsConverter.maxUdc = vsConverter.ratedUdc * 1.08; // +5% * ratedUdc
+                    vsConverter.minUdc = vsConverter.ratedUdc * 0.98; // -5% * ratedUdc
+                    vsConverter.resistiveLoss = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) * Math.pow(10, -3) : undefined;
                     vsConverter.switchingLoss = undefined;
                     /*  csConverter.maxModulationIndex = ;
                         csConverter.maxValveCurrent =  */
                     /** CapabilityCurveData */
-                    const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : vsConverter.baseS;
-                    const minP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : -1 * vsConverter.baseS;
+                    const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
+                    const minP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : undefined;
                     const maxQ = (0, parser_utils_1.isNumericI7)(i7Data.q_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_max) : undefined;
                     const minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
                     /** SSH export values */
@@ -2757,11 +2615,11 @@ class ConverterIntegral7 {
                     vsConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     acDCConverterDCTerminal.dcNode = dcNode;
                     dcNode.dcTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
-                    /** Create VsCapabilityCurves */
+                    /** Create ReactiveCapabilityCurves */
                     if (minP !== undefined && maxP !== undefined && minQ != undefined && maxQ !== undefined) {
                         let keyVsCapabilityCurve = cim_class_names_1.ClassNames.VsCapabilityCurve + i7Data.id + vsConverter.getUUID();
                         let uuidVsCapabilityCurve = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VsCapabilityCurve, this.configUuid, keyVsCapabilityCurve);
-                        const vsCapabilityCurve = new VsCapabilityCurve_1.VsCapabilityCurve(uuidVsCapabilityCurve, (0, util_create_1.createNotation)(['CurveData', '_', vsConverter.getUUID().substring(0, 8), '_VCC']));
+                        const vsCapabilityCurve = new VsCapabilityCurve_1.VsCapabilityCurve(uuidVsCapabilityCurve, (0, util_create_1.createNotation)(['CurveData', vsConverter.getUUID().substring(0, 8), '_VCC']));
                         vsCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                         vsCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
                         vsCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
@@ -2772,7 +2630,7 @@ class ConverterIntegral7 {
                         const curveData1 = new CurveData_1.CurveData(uuidCurveData);
                         curveData1.curve = vsCapabilityCurve;
                         curveData1.xvalue = minP; //pMin
-                        curveData1.y1value = minQ; //qMin pMax
+                        curveData1.y1value = minQ; //qMin
                         curveData1.y2value = maxQ; //qMax pMin
                         cimModel.addCurveData(curveData1);
                         //reactive capability curve data for pmax
@@ -2782,7 +2640,7 @@ class ConverterIntegral7 {
                         curveData2.curve = vsCapabilityCurve;
                         curveData2.xvalue = maxP; //pMax
                         curveData2.y1value = minQ; //qMin pMax
-                        curveData2.y2value = maxQ; //qMax pMax
+                        curveData2.y2value = maxQ; //qMin pMax
                         cimModel.addCurveData(curveData2);
                         cimModel.addVsCapabilityCurve(vsCapabilityCurve);
                         vsConverter.capabilityCurve = vsCapabilityCurve;
@@ -2905,6 +2763,7 @@ class ConverterIntegral7 {
                     if (i7Data.guid === '_ab64e281-72d0-45fb-8cb3-da4ae99a4f8c') {
                         const stop = true;
                     }
+                    let einspeisePrioritaet = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
                     const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
                     externalNetworkInjection.maxP = maxP;
                     const governorscd = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
@@ -2936,10 +2795,9 @@ class ConverterIntegral7 {
                     const skAkt = (0, parser_utils_1.isNumericI7)(i7Data.sk_akt) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_akt) : undefined;
                     const skMin = (0, parser_utils_1.isNumericI7)(i7Data.sk_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_min) : skAkt;
                     const skMax = (0, parser_utils_1.isNumericI7)(i7Data.sk_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_max) : skAkt;
-                    const nomV = externalNetworkInjection.getTerminals().values().next().value.getConnectivityNode().getBaseVoltageAsNumber();
-                    const minIkSecond = (0, parser_utils_1.isNumericI7)(i7Data.sk_min) ? (0, utils_2.calculateShortCircuitCurrent)(skMin, nomV) : undefined;
+                    const minIkSecond = (0, parser_utils_1.isNumericI7)(i7Data.sk_min) ? (0, parser_utils_1.convertToNumberI7)(skMin) / Math.sqrt(3) * skMin : undefined;
                     externalNetworkInjection.minInitialSymShCCurrent = minIkSecond;
-                    const maxIkSecond = (0, parser_utils_1.isNumericI7)(i7Data.sk_max) ? (0, utils_2.calculateShortCircuitCurrent)(skMax, nomV) : undefined;
+                    const maxIkSecond = (0, parser_utils_1.isNumericI7)(i7Data.sk_max) ? (0, parser_utils_1.convertToNumberI7)(skMax) / Math.sqrt(3) * skMax : undefined;
                     externalNetworkInjection.maxInitialSymShCCurrent = maxIkSecond;
                     const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : false;
                     /** Convert SSH-profile dataset. */
@@ -3002,9 +2860,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';
@@ -3025,26 +2880,16 @@ class ConverterIntegral7 {
             suffix = '_EI';
         }
         else if (condEquip instanceof StaticVarCompensator_1.StaticVarCompensator) {
-            if (condEquip.getUUID() === '18e12018-03dd-4d6e-a626-ea404017050f' || condEquip.getUUID() === '4352ad9f-c841-4dcb-9a42-3ccabcb56487'
-                || condEquip.getUUID() === '3d060069-9253-4e68-bb75-74d92982bb1a' || condEquip.getUUID() === '03c53185-aaa7-4040-8b43-76f79fac82b9' || condEquip.getUUID() === '02ba5072-a387-47c6-b9ce-b9d3def21964') {
-                let stop = true;
-            }
             i7DataSVC = i7Data;
             i7DataRQ = i7Data;
             suffix = '_SVC';
         }
         else if (condEquip instanceof LinearShuntCompensator_1.LinearShuntCompensator) {
-            if (condEquip.getUUID() === '547B9591-C41B-4496-9954-2215B8945124') {
-                let stop = true;
-            }
             i7DataKomp = i7Data;
             i7DataRQ = i7Data;
             suffix = '_LSC';
         }
         else if (condEquip instanceof ACDCConverter_1.ACDCConverter) {
-            if (condEquip.getUUID() === '71331a6b-000d-4049-89cc-9319a69367f6') {
-                let stop = true;
-            }
             i7DataHgue = i7Data;
             suffix = '_ACDCC';
         }
@@ -3081,61 +2926,62 @@ class ConverterIntegral7 {
                 let tVMax = undefined; //maximum target voltage
                 let tVMin = undefined; //minimum target voltage
                 const regCondEquip = condEquip;
-                //get rated voltage of controlled node.
-                if (knotenSpgGeregelt && spannungsregelungRemote) {
-                    cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
-                    if (cterminal === undefined) {
-                        let stop = true;
-                    }
-                    if (cterminal) {
-                        tCn = cterminal.getConnectivityNode();
-                        if (tCn) {
-                            tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
-                            tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
-                            usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
+                if (spannungsregelungLokal || spannungsregelungRemote) {
+                    //get rated voltage of controlled node.
+                    if (knotenSpgGeregelt && spannungsregelungRemote) {
+                        cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
+                        if (cterminal === undefined) {
+                            let stop = true;
+                        }
+                        if (cterminal) {
+                            tCn = cterminal.getConnectivityNode();
+                            if (tCn) {
+                                tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
+                                tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
+                                usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
+                            }
+                            else {
+                                this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Entfernt geregelter Knoten konnte nicht ermittelt werden.`);
+                            }
                         }
                         else {
-                            this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Entfernt geregelter Knoten konnte nicht ermittelt werden.`);
+                            this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Anschlusspunkt (Terminal) des entfernt geregelter Knoten konnte nicht ermittelt werden.`);
                         }
                     }
-                    else {
-                        this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Anschlusspunkt (Terminal) des entfernt geregelter Knoten konnte nicht ermittelt werden.`);
-                    }
-                }
-                if ((knotenSpgGeregelt || connectivityNode) && spannungsregelungLokal) {
-                    switch (knotenSpgGeregelt) {
-                        case undefined: {
-                            if (cpTerminal.connectivityNode.getConnectivityNodeContainer() instanceof Bay_1.Bay) {
-                                cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
+                    if ((knotenSpgGeregelt || connectivityNode) && spannungsregelungLokal) {
+                        switch (knotenSpgGeregelt) {
+                            case undefined: {
+                                if (cpTerminal.connectivityNode.getConnectivityNodeContainer() instanceof Bay_1.Bay) {
+                                    cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
+                                }
+                                if (cterminal === undefined) {
+                                    cterminal = (0, util_graph2tree_1.getControlledNode)(cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)), cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)));
+                                }
+                                break;
                             }
-                            if (cterminal === undefined) {
-                                cterminal = (0, util_graph2tree_1.getControlledNode)(cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)), cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)));
+                            default: {
+                                cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
                             }
-                            break;
                         }
-                        default: {
-                            cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
+                        if (cterminal) {
+                            tCn = cterminal.getConnectivityNode();
+                            if (tCn) {
+                                tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
+                                tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
+                                usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
+                            }
+                            else {
+                                this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Lokal geregelter Knoten konnte nicht ermittelt werden.`);
+                            }
                         }
                     }
-                    if (cterminal) {
-                        tCn = cterminal.getConnectivityNode();
+                    uband = (0, parser_utils_1.isNumericI7)(tVMax) && (0, parser_utils_1.isNumericI7)(tVMin) ? (0, parser_utils_1.convertToNumberI7)(tVMax) - (0, parser_utils_1.convertToNumberI7)(tVMin) : undefined;
+                    if (uband === undefined) {
                         if (tCn) {
-                            tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
-                            tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
-                            usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
-                        }
-                        else {
-                            this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Lokal geregelter Knoten konnte nicht ermittelt werden.`);
+                            uband = tCn.getBaseVoltageAsNumber() * 0.1;
                         }
                     }
                 }
-                uband = (0, parser_utils_1.isNumericI7)(tVMax) && (0, parser_utils_1.isNumericI7)(tVMin) ? (0, parser_utils_1.convertToNumberI7)(tVMax) - (0, parser_utils_1.convertToNumberI7)(tVMin) : undefined;
-                if (uband === undefined) {
-                    if (tCn) {
-                        uband = tCn.getBaseVoltageAsNumber() * 0.1;
-                    }
-                }
-                usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : usoll;
                 //Create and define regulating control for voltage control
                 if (cterminal !== undefined) {
                     rControl = (0, utils_2.createRegulatingControl)((0, parser_utils_1.getUUID)(i7DataRQ.guid_rc), (0, util_create_1.createNotation)([regCondEquip.getUUID().substring(0, 8), suffix]), true, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage);
@@ -3148,9 +2994,6 @@ class ConverterIntegral7 {
                     rControl.targetDeadband = (0, parser_utils_1.isNumericI7)(uband) ? uband : undefined; //zulässiges Spannungsband
                     /** Spannung in kilo*/
                     //TODO TEMP FIX bei lokaler Regelegung bleibt usoll = null.
-                    if (cterminal !== undefined && cterminal.getUUID() === '7564eef1-6cd6-59c2-957e-825c6593fdf2') {
-                        const stop = true;
-                    }
                     rControl.targetValue = (0, parser_utils_1.isNumericI7)(usoll) ? usoll : ((0, parser_utils_1.isNumericI7)(i7DataEinsp === null || i7DataEinsp === void 0 ? void 0 : i7DataEinsp.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7DataEinsp.usoll) : tCn.getBaseVoltageAsNumber());
                     const guidSuffix = (_a = tCn === null || tCn === void 0 ? void 0 : tCn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8);
                     rControl.name = (0, util_create_1.createNotation)([rControl.name, '_', guidSuffix, '_RC'], 32, true);
@@ -3166,7 +3009,7 @@ class ConverterIntegral7 {
                     }
                 }
             }
-            else if (isRegulatingControl && i7DataSVC !== undefined) {
+            else if (isRegulatingControl && i7DataSVC) {
                 /** Regelung */
                 const regCondEquip = condEquip;
                 const cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
@@ -3187,12 +3030,12 @@ class ConverterIntegral7 {
                 uband = (0, parser_utils_1.isNumericI7)(tVMax) && (0, parser_utils_1.isNumericI7)(tVMin) ? (0, parser_utils_1.convertToNumberI7)(tVMax) - (0, parser_utils_1.convertToNumberI7)(tVMin) : undefined;
                 if (uband === undefined) {
                     if (tCn) {
-                        uband = (0, parser_utils_1.isNumericI7)(uref) ? uref * 0.1 : ((0, parser_utils_1.isNumericI7)(usoll) ? usoll * 0.1 : tCn.getBaseVoltageAsNumber() * 0.1);
+                        uband = tCn.getBaseVoltageAsNumber() * 0.1;
                     }
                 }
                 if (cterminal !== undefined) {
                     const uuid = (0, parser_utils_1.getUUID)(i7DataSVC.guid_rc);
-                    rControl = (0, utils_2.createRegulatingControl)(uuid, (0, util_create_1.createNotation)([condEquip.getUUID().substring(0, 8), suffix]), true, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage);
+                    rControl = (0, utils_2.createRegulatingControl)(uuid, (0, util_create_1.createNotation)([condEquip.getUUID().substring(0, 8), suffix]), inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage);
                     rControl.enabled = true;
                     if (isStatcom) {
                         rControl.discrete = true;
@@ -3265,23 +3108,20 @@ class ConverterIntegral7 {
                     usoll = (0, parser_utils_1.isNumericI7)(i7DataHgue.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.usoll) : undefined;
                     if (regelungU) {
                         condEquip.pPccControl = VsPpccControlKind_1.VsPpccControlKind.udc;
-                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
-                        condEquip.targetUdc = (0, parser_utils_1.isNumericI7)(i7DataHgue.udc) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.udc) : condEquip.ratedUdc;
+                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
                     }
                     else if (regelungP) {
                         condEquip.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
-                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
+                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
                     }
-                    if (isRegulatingControl) { //voltage control for AC-side
+                    if ((spannungsregelungLokal || spannungsregelungRemote) && usoll == undefined) {
+                        //get rated voltage of controlled node.
                         let cterminal = undefined; //connection point terminal of this device
                         let tVMax = undefined; //maximum target voltage
                         let tVMin = undefined; //minimum target voltage
-                        //get rated voltage of controlled node.
+                        //get target voltage of controlled node.
                         if (knotenSpgGeregelt && spannungsregelungRemote) {
                             cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
-                            if (cterminal === undefined) {
-                                let stop = true;
-                            }
                             if (cterminal) {
                                 tCn = cterminal.getConnectivityNode();
                                 if (tCn) {
@@ -3300,9 +3140,7 @@ class ConverterIntegral7 {
                         if ((knotenSpgGeregelt || connectivityNode) && spannungsregelungLokal) {
                             switch (knotenSpgGeregelt) {
                                 case undefined: {
-                                    if (cpTerminal.connectivityNode.getConnectivityNodeContainer() instanceof Bay_1.Bay) {
-                                        cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
-                                    }
+                                    cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
                                     if (cterminal === undefined) {
                                         cterminal = (0, util_graph2tree_1.getControlledNode)(cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)), cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)));
                                     }
@@ -3324,10 +3162,10 @@ class ConverterIntegral7 {
                                 }
                             }
                         }
-                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
                     }
                     condEquip.targetUpcc = usoll;
-                    //(condEquip as VsConverter).targetQpcc = 0; //ReactivePower, ReactivePowerCapabilityCurve is set in advance
+                    condEquip.targetQpcc = 0; //ReactivePower, TODO: define ReactivePowerCapabilityCurve
+                    condEquip.targetUdc = (0, parser_utils_1.isNumericI7)(i7DataHgue.udc) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.udc) : condEquip.ratedUdc;
                     condEquip.targetPpcc = condEquip.baseS * -1;
                 }
             }
@@ -3427,10 +3265,47 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_STARR)) {
                 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), 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);
+                    /**const schaltzustand = convertToBooleanI7(i7Data.schaltzustand);
+            
+                     const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7Data.seliste)) as EquipmentContainer);
+            
+                     if (equipmentContainer) {
+                     equipmentContainer.addEquipment(junction);
+                     junction.equipmentContainer = equipmentContainer;
+                     } else {
+                     this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                     }
+                     const cnStart = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
+                     const cnZiel = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
+            
+                     if (cnStart) {
+                     const terminal = this.createConnection(cimModel, junction, cnStart, PhaseCode.ABC, true, 1);
+                     if (schaltzustand === false) {
+                     terminal.connected = schaltzustand;
+                     }
+                     } else {
+                     this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                     }
+                     if (cnZiel) {
+                     const terminal = this.createConnection(cimModel, junction, cnZiel, PhaseCode.ABC, true, 2);
+                     if (schaltzustand === false) {
+                     terminal.connected = schaltzustand;
+                     }
+                     } else {
+                     this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Zielknoten.`);
+                     }
+                     const baseVoltage = getTerminalUn(cimModel, junction);
+                     if (baseVoltage) {
+                     junction.baseVoltage = baseVoltage;
+                     }
+                     this.addIdMapping(i7Data.id, junction.mrid, Integral7TableNames.KNOTEN_STARR);
+                     cimModel.addJunction(junction);
+                     **/
                 }
             }
             else {
@@ -3539,7 +3414,7 @@ class ConverterIntegral7 {
                     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 = (0, util_create_1.createConnection)(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, 1);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
@@ -3548,7 +3423,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 = (0, util_create_1.createConnection)(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, 2);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
@@ -3565,7 +3440,7 @@ class ConverterIntegral7 {
                     const ukr = (0, parser_utils_1.isNumericI7)(i7Data.ukr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ukr) : undefined;
                     const pkr = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) : undefined;
                     seriesCompensator.r = (0, utils_2.calculateRSeriesCompensator)(ir, pkr);
-                    seriesCompensator.x = (0, utils_2.calculateXSeriesCompensator)(ur, ukr, ir, seriesCompensator.r);
+                    seriesCompensator.x = (0, utils_2.calculateXSeriesCompensator)(ur, ukr, ir);
                     seriesCompensator.varistorPresent = false;
                     /** EQ-SC */
                     seriesCompensator.r0 = seriesCompensator.r;
@@ -3651,8 +3526,8 @@ class ConverterIntegral7 {
                     const ukr = (0, parser_utils_1.isNumericI7)(i7Data.ukr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ukr) : undefined;
                     const pkr = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) : undefined;
                     seriesCompensator.r = (0, utils_2.calculateRSeriesCompensator)(ir, pkr);
-                    seriesCompensator.x = (0, utils_2.calculateXSeriesCompensator)(ur, ukr, ir * -1, seriesCompensator.r);
-                    //seriesCompensator.varistorPresent = false;
+                    seriesCompensator.x = (0, utils_2.calculateXSeriesCompensator)(ur, ukr, ir * -1);
+                    seriesCompensator.varistorPresent = false;
                     /** EQ-SC */
                     seriesCompensator.r0 = seriesCompensator.r;
                     seriesCompensator.x0 = seriesCompensator.x;
@@ -3717,14 +3592,28 @@ class ConverterIntegral7 {
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
-                            const keyConnectivityNode = cim_class_names_1.ClassNames.ConnectivityNode + i7DataSchiene.id;
+                            const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
+                            const keyConnectivityNode = cim_class_names_1.ClassNames.ConnectivityNode + i7DataSchiene.id + (equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getUUID()) || '';
                             const uuidConnectivityNode = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ConnectivityNode, this.configUuid, keyConnectivityNode);
-                            const name = (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_CN'], 32, false);
-                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuidConnectivityNode, name, name);
-                            connectivityNode.key = integral_prefix_1.CKnoten1PSO_PRAEFIX + i7DataSchiene.bezeichner;
+                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuidConnectivityNode, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_CN']));
+                            const keyJunction = cim_class_names_1.ClassNames.Junction + i7DataSchiene.id + (equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getUUID()) || '';
+                            const uuidJunction = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Junction, this.configUuid, keyJunction);
+                            const junction = new Junction_1.Junction(uuidJunction, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_J']));
+                            connectivityNode.setConnectivityNodeContainer(equipmentContainer);
+                            if (equipmentContainer) {
+                                equipmentContainer.addEquipment(junction);
+                                junction.equipmentContainer = equipmentContainer;
+                            }
+                            else {
+                                this.logger.debug(`Sternpunktschiene ${i7DataSchiene.id} besitzt keinen EquipmentContainer.`);
+                            }
                             // Verbindung herstellen
-                            integral7.sternPunktImpModel.stpSchieneIdConnectivityNode.set(i7DataSchiene.id, connectivityNode);
+                            const terminal = this.createConnection(cimModel, junction, connectivityNode, PhaseCode_1.PhaseCode.N, true);
+                            cimModel.terminals.delete(terminal.mrid); //TODO: complete/repair implementation of star point connections.
                             integral7.sternPunktImpModel.connectivityNodes.set(connectivityNode.mrid, connectivityNode);
+                            integral7.sternPunktImpModel.junctions.set(junction.mrid, junction);
+                            integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.set(i7DataSchiene.id, junction.mrid);
+                            integral7.sternPunktImpModel.stpSchieneTerminal.set(i7DataSchiene.id, terminal);
                             this.addIdMapping(i7DataSchiene.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE);
                         }
                         catch (e) {
@@ -3739,63 +3628,41 @@ class ConverterIntegral7 {
             }));
         });
     }
-    convertKdrossel(cimModel, integral7, stpSchienenID, defaultValuesConfig) {
+    convertKdrossel(cimModel, integral7, stpScheinenID) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ)) {
-                    if (stpSchienenID !== undefined && stpSchienenID.length > 0) {
-                        const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ), stpSchienenID));
+                    if (stpScheinenID.length) {
+                        const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ), stpScheinenID));
                         for (const i7Data of result) {
                             const kdType = this.kdrosseltypen.get(i7Data.nametyp);
-                            const iakt = (0, parser_utils_1.isNumericI7)(i7Data.iakt) ? i7Data.iakt : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.iakt) ? kdType === null || kdType === void 0 ? void 0 : kdType.iakt : undefined);
-                            const xne = (0, parser_utils_1.isNumericI7)(i7Data.xne) ? i7Data.xne : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? kdType === null || kdType === void 0 ? void 0 : kdType.xne : undefined);
-                            const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? (0, parser_utils_1.convertToNumberI7)(kdType === null || kdType === void 0 ? void 0 : kdType.xne) : undefined);
                             const imax = (0, parser_utils_1.isNumericI7)(i7Data.imax) ? i7Data.imax : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.imax) ? kdType === null || kdType === void 0 ? void 0 : kdType.imax : undefined);
                             const imin = (0, parser_utils_1.isNumericI7)(i7Data.imin) ? i7Data.imin : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.imin) ? kdType === null || kdType === void 0 ? void 0 : kdType.imin : undefined);
                             const connectivityNode = integral7.sternPunktImpModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
-                            let conductingEquip = undefined;
-                            if (iakt !== undefined && xne !== undefined || xne !== undefined && ur !== undefined || iakt !== undefined && ur !== undefined) {
+                            const junctionUUID = integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get((i7Data.anschluss));
+                            let conductingEquip;
+                            if (imax && imin) {
                                 /** PetersenCoil */
                                 const petersenCoil = new PetersenCoil_1.PetersenCoil((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname);
-                                if (xne !== undefined && ur !== undefined) {
-                                    petersenCoil.xGroundNominal = xne;
-                                    petersenCoil.nominalU = ur;
-                                    petersenCoil.xGroundMax = (0, parser_utils_1.isNumericI7)(imin) && (0, parser_utils_1.isNumericI7)(petersenCoil.nominalU) ? petersenCoil.nominalU * Math.pow(10, 3) / imin : undefined;
-                                    petersenCoil.xGroundMin = (0, parser_utils_1.isNumericI7)(imax) && (0, parser_utils_1.isNumericI7)(petersenCoil.nominalU) ? petersenCoil.nominalU * Math.pow(10, 3) / imax : undefined;
-                                }
-                                else if (iakt !== undefined && xne !== undefined) {
-                                    petersenCoil.xGroundNominal = xne;
-                                    petersenCoil.nominalU = iakt * xne * Math.pow(10, -3);
-                                    petersenCoil.xGroundMax = (0, parser_utils_1.isNumericI7)(imin) && (0, parser_utils_1.isNumericI7)(petersenCoil.nominalU) ? petersenCoil.nominalU * Math.pow(10, 3) / imin : undefined;
-                                    petersenCoil.xGroundMin = (0, parser_utils_1.isNumericI7)(imax) && (0, parser_utils_1.isNumericI7)(petersenCoil.nominalU) ? petersenCoil.nominalU * Math.pow(10, 3) / imax : undefined;
-                                }
-                                else if (iakt !== undefined && ur !== undefined) {
-                                    petersenCoil.nominalU = ur;
-                                    petersenCoil.xGroundNominal = petersenCoil.nominalU * Math.pow(10, 3) / iakt;
-                                    petersenCoil.xGroundMax = (0, parser_utils_1.isNumericI7)(imin) && (0, parser_utils_1.isNumericI7)(petersenCoil.nominalU) ? petersenCoil.nominalU * Math.pow(10, 3) / imin : undefined;
-                                    petersenCoil.xGroundMin = (0, parser_utils_1.isNumericI7)(imax) && (0, parser_utils_1.isNumericI7)(petersenCoil.nominalU) ? petersenCoil.nominalU * Math.pow(10, 3) / imax : undefined;
-                                }
-                                petersenCoil.mode = PetersenCoilModeKind_1.PetersenCoilModeKind.automaticPositioning;
+                                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);
                                 conductingEquip = petersenCoil;
                             }
                             else {
                                 /** GroundingImpedance */
                                 const groundingImpedance = new GroundingImpedance_1.GroundingImpedance((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_GI']), i7Data.kurzname);
-                                groundingImpedance.r = (0, parser_utils_1.isNumericI7)(i7Data.rne) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rne) : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? (0, parser_utils_1.convertToNumberI7)(kdType === null || kdType === void 0 ? void 0 : kdType.rne) : undefined);
-                                groundingImpedance.x = xne;
+                                groundingImpedance.r = (0, parser_utils_1.isNumericI7)(i7Data.rne) ? i7Data.rne : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? kdType === null || kdType === void 0 ? void 0 : kdType.rne : undefined);
+                                groundingImpedance.x = (0, parser_utils_1.isNumericI7)(i7Data.xne) ? i7Data.xne : ((0, parser_utils_1.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? kdType === null || kdType === void 0 ? void 0 : kdType.xne : undefined);
                                 integral7.sternPunktImpModel.groundingImpedances.set(groundingImpedance.mrid, groundingImpedance);
-                                //integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, groundingImpedance);
+                                integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, groundingImpedance);
                                 this.addIdMapping(i7Data.id, groundingImpedance.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
                                 conductingEquip = groundingImpedance;
                             }
-                            // Create connection for PetersenCoil and GroundingImpedance connected with 'Sternpunktschiene'. PetersenCoil and GroundingImpedance connected to 'Sternpunktknoten' is connected during convertTrafo2w and convertTrafo3w
+                            // Verbindung herstellen
                             if (connectivityNode) {
-                                this.createConnection(cimModel, conductingEquip, connectivityNode, PhaseCode_1.PhaseCode.N, true);
-                                integral7.sternPunktImpModel.stpSchieneUUIDStpImp.set(connectivityNode.getUUID(), conductingEquip);
-                            }
-                            else {
-                                integral7.sternPunktImpModel.stpKnotenStpImp.set(i7Data.anschluss, conductingEquip);
+                                const terminal = this.createConnection(cimModel, conductingEquip, connectivityNode, PhaseCode_1.PhaseCode.N, true);
+                                cimModel.terminals.delete(terminal.mrid); //TODO: complete/repair implementation of star point connections.
                             }
                         }
                     }
@@ -3816,37 +3683,26 @@ class ConverterIntegral7 {
         });
     }
     /** Den Schaltzuszand bestimmen und zuvor angelegten (convertSternpunktSchienen) Terminalinstanz zuweisen. */
-    convertStpSchaltelemente(cimModel, integral7, stpSchienenID) {
+    convertStpSchaltelemente(integral7, stpSchienenID) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER)) {
-                    if (stpSchienenID !== undefined && stpSchienenID.length > 0) {
+                    if (stpSchienenID.length) {
                         const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER), stpSchienenID));
                         for (const i7Data of result) {
-                            const connectivityNodeAbcn = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.aknoten)); //connection point of 'PowerTransformerEnd' is assigned during convertTrafo2w and convertTrafo3w
-                            const connectivityNodeN = integral7.sternPunktImpModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.eknoten)); //connection point of 'Sternpunktschiene'
-                            if (connectivityNodeN != undefined) {
-                                const schaltzustand = (0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand);
-                                const keyGroundDisconnector = cim_class_names_1.ClassNames.GroundDisconnector + i7Data.aknoten + i7Data.eknoten;
-                                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);
-                                //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 */
-                                integral7.sternPunktImpModel.stpSchaltelementeIdGroundDisconnectorUUID.set(i7Data.id, groundDisconnector.getUUID());
-                                /** SchaltelementID mit GroundDisconnector UUID verknüpfen, um Topologie des netz_knoten1pelem-Elements herstellen zu können */
-                                integral7.sternPunktImpModel.groundDisconnectorsUUIDsStpSchieneUUID.set(groundDisconnector.getUUID(), connectivityNodeN.getUUID());
-                                /** SternpunktknotenID mit GroundDisconnector UUID verknüpfen, um Topologie der AssetElemente herstellen zu können */
-                                integral7.sternPunktImpModel.GroundDisconnectorUuidStpSchieneId.set(groundDisconnector.getUUID(), i7Data.eknoten);
-                                /** set connection to terminal of powertransformerend*/
-                                let earthFaultCompensator = integral7.sternPunktImpModel.stpSchieneUUIDStpImp.get(connectivityNodeN.getUUID());
-                                integral7.sternPunktImpModel.groundDisconnectorUUIDstpImp.set(groundDisconnector.getUUID(), earthFaultCompensator);
-                                this.addIdMapping(i7Data.id, groundDisconnector.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER);
+                            const terminal = integral7.sternPunktImpModel.stpSchieneTerminal.get(i7Data.eknoten);
+                            if (terminal) {
+                                terminal.connected = (0, parser_utils_1.isBooleanI7)(i7Data.schaltzustand) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand) : true;
                             }
+                            /** SchaltelementID mit Junstion UUID verknüpfen, um Topologie des netz_knoten1pelem-Elements herstellen zu können */
+                            integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.set(i7Data.id, integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get(i7Data.eknoten));
+                            /** Sternpunktknoten mit Junstion UUID verknüpfen, um Topologie der AssetElemente herstellen zu können */
+                            integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.set(i7Data.aknoten, integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get(i7Data.eknoten));
                         }
                     }
+                    else {
+                        this.logger.debug(`StpSchaltelemente Keine Sternpunktschienen vorhanden.`);
+                    }
                 }
                 else {
                     this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER} ist nicht vorhanden.`);
@@ -3964,7 +3820,6 @@ 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;
                     /** Alle Stromkreisabschnitte */
                     const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
                     if (!((stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length) > 0))
@@ -3988,9 +3843,8 @@ class ConverterIntegral7 {
                         '-' +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
                     /** Wenn kein Stromkreisobjekt vorhanden ist, dann erstelle ein neues Objekt. */
-                    const uuidString = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Line, this.configUuid, i7Schluessel);
-                    let lineName = createLineName(i7Data, uuidString, lineNames);
-                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, lineName);
+                    const uuidString = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, i7Schluessel);
                     line.ukz = i7Data.ukz;
                     line.key = i7Schluessel;
                     let acLineSegments = [];
@@ -4003,7 +3857,7 @@ class ConverterIntegral7 {
                             '-' +
                             (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
                         const uuid = (0, parser_utils_1.getUUID)(stk.custom_guid_0120 + stk.custom_guid_2137, this.objectMappingConfig.standardiseUuid);
-                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuid, stk.bezeichner, i7Data.stkabname, i7Data.kommentar);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuid, stk.bezeichner, i7Data.stkabname, i7Schluessel);
                         const key = acLineSegment.getUUID();
                         const uuidWireObject = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.EVWireObject, this.configUuid, key);
                         acLineSegment.key = i7Schluessel;
@@ -4066,7 +3920,7 @@ class ConverterIntegral7 {
                         /**Connectivity Node to connect end of line and start of neighbouring line.*/
                         const key = acLineSegment1.getUUID() + acLineSegment2.getUUID();
                         const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ConnectivityNode, this.configUuid, key);
-                        const cn = new ConnectivityNode_1.ConnectivityNode(uuid, (0, util_create_1.createNotation)([acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, false));
+                        const cn = new ConnectivityNode_1.ConnectivityNode(uuid, (0, util_create_1.createNotation)([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
                         /**Connect end of aclinesegment i*/
                         cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
                         tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
@@ -4125,6 +3979,7 @@ class ConverterIntegral7 {
                     /** In any case assign Georegion to aclinesegments */
                     let idx = 0;
                     while (idx < acLineSegments.length && !(line.subGeographicalRegion)) {
+                        let jdx = 0;
                         let values = acLineSegments[idx].terminals.values();
                         let tmp_terminal = values.next();
                         while (tmp_terminal.value && !(line.subGeographicalRegion)) {
@@ -4194,9 +4049,6 @@ class ConverterIntegral7 {
                     let dcLineNeutral = undefined;
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                    if (dcLine.getUUID() === 'f125f0f3-a621-43e7-8af7-9873d52239a0') {
-                        const stop = true;
-                    }
                     /** operationMode der Anfangs- und Zielkopfstation setzen */
                     let converterStart = false;
                     let converterStartNeg = false;
@@ -4211,7 +4063,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.INTEGRALDCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidp, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, 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;
@@ -4220,21 +4072,19 @@ class ConverterIntegral7 {
                     dcLineSegment.capacitance = undefined;
                     dcLineSegment.inductance = undefined;
                     /**EQ: given directly by the INTEGRAL system model */
-                    dcLineSegment.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (bipole ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) / 2) : undefined;
-                    dcLineSegment.ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
+                    dcLineSegment.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : undefined;
                     dcLineSegment.equipmentContainer = dcLine;
                     //create second dcLineSegment in case this dcLine is a bipol.
                     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, i7Data.bezeichner);
-                        dcLineSegmentNeg = new DCLineSegment_1.INTEGRALDCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidn, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, (0, util_create_1.createNotation)([i7Data.kurzname, '_neg'], 12, true), i7Schluessel);
+                        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;
                         dcLineSegmentNeg.inductance = undefined;
-                        dcLineSegmentNeg.resistance = dcLineSegment.resistance;
-                        dcLineSegmentNeg.ur = dcLineSegment.ur;
+                        dcLineSegmentNeg.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : undefined;
                         dcLineSegmentNeg.equipmentContainer = dcLineNeg;
                     }
                     //create metallic return
@@ -4242,13 +4092,12 @@ class ConverterIntegral7 {
                     const dcLineNeutralUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCLine, this.configUuid, dcLineKey);
                     const dcLineSegmentUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCLineSegment, this.configUuid, dcLineNeutralUuid);
                     dcLineNeutral = new DCLine_1.DCLine(dcLineNeutralUuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCL']));
-                    dcLineSegmentNeutral = new DCLineSegment_1.INTEGRALDCLineSegment(dcLineSegmentUuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCLS'], 32, true), (0, util_create_1.createNotation)([i7Data.kurzname, '_mid'], 12, true), i7Schluessel);
+                    dcLineSegmentNeutral = new DCLineSegment_1.DCLineSegment(dcLineSegmentUuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCLS'], 32, true), (0, util_create_1.createNotation)([i7Data.kurzname, '_mid'], 12, true), i7Schluessel);
                     dcLineSegmentSet.push(dcLineSegmentNeutral);
                     dcLineSegmentNeutral.length = dcLineSegment.length;
                     dcLineSegmentNeutral.capacitance = undefined;
                     dcLineSegmentNeutral.inductance = undefined;
-                    dcLineSegmentNeutral.resistance = dcLineSegment.resistance;
-                    dcLineSegmentNeutral.ur = dcLineSegment.ur;
+                    dcLineSegmentNeutral.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : undefined;
                     dcLineSegmentNeutral.equipmentContainer = dcLineNeutral;
                     //get ACDCConverter at both ends of DCLine
                     const acDCConverterStart = cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) : undefined;
@@ -4426,10 +4275,8 @@ class ConverterIntegral7 {
                             const equipmentKey = dcTerminal.getUUID();
                             for (const elem of dcTerminal.dcNode.dcTerminals.values()) {
                                 if (elem instanceof ACDCConverterDCTerminal_1.ACDCConverterDCTerminal) {
-                                    //const pR: number = (elem as ACDCConverterDCTerminal).dCConductingEquipment.baseS; //apparent power is set equal to active power in MVA
-                                    //const uR: number = acDCConverterStart.ratedUdc; //voltage in kV
-                                    const pR = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
-                                    const uR = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
+                                    const pR = elem.dCConductingEquipment.baseS; //apparent power is set equal to active power in MVA
+                                    const uR = acDCConverterStart.ratedUdc; //voltage in kV
                                     if (pR != undefined && uR != undefined) {
                                         let ir = (pR * Math.pow(10, 6)) / (uR * Math.pow(10, 3)); //assumption: pr is BaseS
                                         if (bipole) {
@@ -4489,7 +4336,6 @@ class ConverterIntegral7 {
                     typTrafo.r0kr2 = i7Data.r0kr2;
                     typTrafo.r00r1 = i7Data.r00r1;
                     typTrafo.r00r2 = i7Data.r00r2;
-                    typTrafo.s_dauer = i7Data.s_dauer;
                     const typWicklung1 = new INTEGRALPowerTransformerEndInfo_1.INTEGRALPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
                     typWicklung1.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
@@ -4541,9 +4387,6 @@ class ConverterIntegral7 {
                     typTrafo.r0kr2 = i7Data.r0kr2;
                     typTrafo.r00r1 = i7Data.r00r1;
                     typTrafo.r00r2 = i7Data.r00r2;
-                    typTrafo.s_dauer_1 = i7Data.s_dauer_1;
-                    typTrafo.s_dauer_2 = i7Data.s_dauer_2;
-                    typTrafo.s_dauer_3 = i7Data.s_dauer_3;
                     const typWicklung1 = new INTEGRALPowerTransformerEndInfo_1.INTEGRALPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
                     typWicklung1.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr1, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
@@ -4662,18 +4505,30 @@ class ConverterIntegral7 {
                         integral_prefix_1.TRAFO2W_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     powerTransformer.key = i7Schluessel;
-                    if (powerTransformer.getUUID() === '21def4394e814e77b3f25acbad7bda16') {
+                    if (powerTransformer.getUUID() === '515508dc-5982-4686-ad26-08d39db91421') {
                         let stop = true;
-                    }
+                    } // kein Typ in D4
+                    if (powerTransformer.getUUID() === '012416f2d9584971baa93360fcf40be2') {
+                        let stop = true;
+                    } //Typ in D8
+                    if (powerTransformer.getUUID() === '00ebe00e-50fa-4fc0-9ed6-557528a9b460') {
+                        let stop = true;
+                    } //kein Typ in BE
+                    if (powerTransformer.getUUID() === '11e7be86-8bb7-41ba-898a-74cd5e8efbb9') {
+                        let stop = true;
+                    } //Typ in D7
                     if (powerTransformer.getUUID() === '8eca3fedd32c49369f8946ac4ce70e17') { //Stufenstellerkonvertierung fehlgeschlagen
                         let stop = true;
                     }
                     if (powerTransformer.getUUID() === 'b9d8bd48e1554af7b6153c1f7da052e1') {
                         let stop = true;
                     } //Phasenschieber zu falscher Winkel und falsches stepIncrement.
-                    if (powerTransformer.getUUID() === '012416f2d9584971baa93360fcf40be2') { //pkr, ukr, ... konnte nicht aus Typ ermittelt werden.
+                    if (powerTransformer.getUUID() === '2ACF34B9-9DC9-4607-9B8A-032EBC2C31A5') {
                         let stop = true;
                     } //Längsregeltransformator mit symmetrischem Phasenschieber.
+                    if (i7Data.nametyp) {
+                        const stop = true;
+                    }
                     const powerTransformerInfo = this.cimModelDefault.getPowerTransformerInfoByName(i7Data.nametyp);
                     if (powerTransformerInfo) {
                         facility.setAssetInfo(powerTransformerInfo);
@@ -4691,13 +4546,12 @@ class ConverterIntegral7 {
                     // Wicklung 1
                     const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1, this.objectMappingConfig.standardiseUuid), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
-                    const pkr = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, undefined, false);
-                    const ukr = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, undefined, false);
+                    const pkr = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '12', false);
+                    const ukr = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '12', false);
                     const sr = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
                     const ur = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 1);
                     const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 2);
-                    const sdauer1 = (0, utils_2.getSdauerTrafo)(i7Data, powerTransformerInfo, 1, false);
-                    const sdauer2 = (0, utils_2.getSdauerTrafo)(i7Data, powerTransformerInfo, 2, false);
+                    const sdauer = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer) : sr;
                     // P0 Lastverluste im I7 Modell p_leer
                     const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
                     // Leerlaufverluste
@@ -4745,7 +4599,7 @@ class ConverterIntegral7 {
                             const startTerminal = start ? this.createConnection(cimModel, powerTransformer, start, PhaseCode.ABC, true, 1) : undefined;*/
                     if (!startTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, startTerminal, sternpunktKnotenMap, integral7, sdauer1, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, startTerminal, sternpunktKnotenMap, integral7, sdauer, i7Data, defaultValuesConfig);
                     /**Add boundary equivalent injection if terminal is connected to boudary point. */
                     let equivalentInjection = undefined;
                     if (startTerminal) {
@@ -4777,7 +4631,7 @@ class ConverterIntegral7 {
                     const zielTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!zielTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Zielknoten.`);
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, zielTerminal, sternpunktKnotenMap, integral7, sdauer2, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, zielTerminal, sternpunktKnotenMap, integral7, undefined, i7Data, defaultValuesConfig);
                     /**Add boundary equivalent injection if terminal is connected to boudary point. */
                     if (zielTerminal) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
@@ -4792,6 +4646,9 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
                     powerTransformerEnd2.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
                     powerTransformerEnd2.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd2.endNumber);
+                    if (uuid === '402aec99-ba2c-42fa-b4ed-b4928901f47b') {
+                        let stop = true;
+                    }
                     // NullSystem Impedanzen (nur Reaktanzen)
                     let starconnectionCount = (0, utils_2.getGroundingCountFromWindingConnection)(powerTransformer) <= 1 ? (0, utils_2.getGroundingCountFromWindingConnection)(powerTransformer) : 1;
                     const retVal = (0, utils_2.calculateComplexZeroSequImpedanzenTrafo)([r0kr1, x0kr1, r0kr2, x0kr2], [r00r1, x00r1, r00r2, x00r2], [ur, ur2], starconnectionCount, powerTransformer);
@@ -4804,7 +4661,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
                     powerTransformerEnd2.r0 = zeroSequImpedanzWx.r02;
                     /** Transormator Anschlusspunkte nach Spannungsebene sortieren */
-                    //this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
+                    this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     // TODO
                     /** Stufenschalter werden vor der Sortierung der Wicklung nach der Spannungsebene angelegt,
                      * da sonst die Wicklungsnummern nicht mehr übereinstimmen könnten */
@@ -4878,9 +4735,6 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const sternpunktKnotenMap = new Map();
                     const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    if (uuid === 'b81485dd-5115-4241-b31a-c87a3eec9803' || uuid === '4eadc602-7dc5-41e4-bb8b-38993c03a80a') {
-                        const 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 substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
@@ -4931,16 +4785,13 @@ class ConverterIntegral7 {
                     const ur1 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 1);
                     const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 2);
                     const ur3 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 3);
-                    const sdauer1 = (0, utils_2.getSdauerTrafo)(i7Data, powerTransformerInfo, 1, true);
-                    const sdauer2 = (0, utils_2.getSdauerTrafo)(i7Data, powerTransformerInfo, 2, true);
-                    const sdauer3 = (0, utils_2.getSdauerTrafo)(i7Data, powerTransformerInfo, 3, true);
+                    const sdauer1 = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer_1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer_1) : sr1;
+                    const sdauer2 = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer_2) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer_2) : sr2;
+                    const sdauer3 = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer_3) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer_3) : sr3;
                     //Leerlaufverluste in kW
                     const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
                     // Leerlaufstrom bezogen auf Wicklung mit dem grössten Sr in %
                     const iLeer = (0, utils_2.getTrafoIleer)(i7Data, powerTransformerInfo);
-                    if (powerTransformer.getUUID() === 'c589d314-fb31-4efb-a463-edd3cb508347') {
-                        const stop = true;
-                    }
                     if (powerTransformer.getUUID() === '3f58ef46-918f-44d4-8b53-d4078caa2d92') {
                         const stop = true;
                     }
@@ -4991,7 +4842,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.r = impedanzW1.r;
                     powerTransformerEnd1.x = impedanzW1.x;
                     powerTransformerEnd1.g = impedanzW1.g;
-                    powerTransformerEnd1.b = -1 * impedanzW1.b;
+                    powerTransformerEnd1.b = impedanzW1.b;
                     powerTransformerEnd1.ratedU = ur1;
                     powerTransformerEnd1.ratedS = sr1;
                     this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, terminal1, sternpunktKnotenMap, integral7, sdauer1, i7Data, defaultValuesConfig, trafoWicklungen);
@@ -5038,7 +4889,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd2.r = impedanzW2.r;
                     powerTransformerEnd2.x = impedanzW2.x;
                     powerTransformerEnd2.g = impedanzW2.g;
-                    powerTransformerEnd2.b = -1 * impedanzW2.b;
+                    powerTransformerEnd2.b = impedanzW2.b;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     powerTransformerEnd2.powerTransformer = powerTransformer;
@@ -5086,7 +4937,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd3.r = impedanzW3.r;
                     powerTransformerEnd3.x = impedanzW3.x;
                     powerTransformerEnd3.g = impedanzW3.g;
-                    powerTransformerEnd3.b = -1 * impedanzW3.b;
+                    powerTransformerEnd3.b = impedanzW3.b;
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
                     powerTransformerEnd3.powerTransformer = powerTransformer;
@@ -5118,15 +4969,6 @@ class ConverterIntegral7 {
                     powerTransformerEnd3.r0 = zeroSequImpedanzWx.r03;
                     // Transormator Anschlusspunkte nach Spannungsebene sortieren
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
-                    // Set grounding for autotransformer
-                    const pTEnds = powerTransformer.getPowerTransformerEnd().filter(elem => elem.connectionKind === 'A');
-                    if (pTEnds.length > 0) {
-                        if (pTEnds.filter(elem => elem.grounded === true).length > 0) {
-                            for (const end of pTEnds) {
-                                end.grounded = true;
-                            }
-                        }
-                    }
                     //TODO
                     /** Stufenschalter werden vor der Sortierung der Wicklung nach der Spannungsebene angelegt,
                      * da sonst die Wicklungsnummern, nicht mehr übereinstimmen könnten */
@@ -5321,8 +5163,10 @@ class ConverterIntegral7 {
     sortTransformerEnd(powerTransformer, sortProperty, order) {
         // Store current order of power transformer ends.
         let winding_guids = new Array(powerTransformer.powerTransformerEnd.length);
+        let winding_guids_fixed = new Array(powerTransformer.powerTransformerEnd.length);
         for (let i = 0; i < powerTransformer.powerTransformerEnd.length; i++) {
             winding_guids[i] = powerTransformer.powerTransformerEnd[i].getUUID();
+            winding_guids_fixed[i] = powerTransformer.powerTransformerEnd[i].getUUID();
         }
         //Sort: This step maybe changes power transformer ends order for this power transformer.
         powerTransformer.powerTransformerEnd.sort(function (w1, w2) {
@@ -5346,19 +5190,8 @@ class ConverterIntegral7 {
             //  const isNull = true;
             //}
         }
-        let tmpMapping = new Array(powerTransformer.powerTransformerEnd.length);
-        for (let i = 0; i < winding_guids.length; i++) {
-            tmpMapping[i] = (winding_guids.indexOf(powerTransformer.powerTransformerEnd[i].getUUID()) + 1).toString();
-        }
-        return tmpMapping; //return mapping
     }
     setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, cable, defaultValuesConfig) {
-        if ((0, parser_utils_1.isBooleanI7)(data.ltgmonitoring) && (0, parser_utils_1.convertToBooleanI7)(data.ltgmonitoring)) {
-            acLineSegment.ltgmonitoring = (0, parser_utils_1.convertToBooleanI7)(data.ltgmonitoring);
-        }
-        else {
-            acLineSegment.ltgmonitoring = false;
-        }
         if ((0, parser_utils_1.isBooleanI7)(data.flag_impedanzlos) && (0, parser_utils_1.convertToBooleanI7)(data.flag_impedanzlos)) {
             data.flag_impedanzlos = 1;
         }
@@ -5459,8 +5292,8 @@ class ConverterIntegral7 {
      * @param equipmentKey Generierung einer persistenter UUID v5. Für PowerTransformer wird UUID des PowerTransformerEnds verwendet. Andernfalls die UUID des ConductingEquipments
      * */
     setConductingEquipmentOperationalLimit(cimModel, name, terminal, equipmentKey, limit, limitType, igrenz) {
-        if (!(limit !== undefined && limit > 0) || !(igrenz !== undefined && igrenz > 0))
-            return; //if 'limit' and 'igrenz' is not given leave
+        if ((limit !== undefined && limit > 0) && (igrenz !== undefined && igrenz > 0))
+            return;
         /** OperationalLimitSet erstellen */
         const operationalLimitSetKey = terminal.getUUID() + equipmentKey;
         const operationalLimitSetUUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.OperationalLimitSet, this.configUuid, operationalLimitSetKey);
@@ -5545,9 +5378,6 @@ class ConverterIntegral7 {
                 terminal.name = (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
             }
         }
-        if (terminal !== undefined && terminal.getUUID() === '7564eef1-6cd6-59c2-957e-825c6593fdf2') {
-            const stop = true;
-        }
         return terminal;
     }
     createBoundaryConnection(frame, conductingEquipment, i7ObjectID, phase) {
@@ -6064,7 +5894,7 @@ class ConverterIntegral7 {
             // Topologie
             powerTransformerEnd.terminal = terminal;
             this.setConductingEquipmentOperationalLimit(cimModel, `W${powerTransformerEnd.endNumber}${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`, terminal, powerTransformer.getUUID(), sdauer, cim_class_names_1.ClassNames.ApparentPowerLimit);
-            if (powerTransformer.getUUID() === '3c3928be-e691-453d-8216-df30bd11845e') {
+            if (powerTransformer.getUUID() === '4d14cd95-215c-45f3-8136-b06d69ee0191') {
                 const stop = true;
             }
             let isTrafo2w = i7Data.trafowicklung3w3 === undefined ? true : false;
@@ -6120,34 +5950,36 @@ class ConverterIntegral7 {
     }
     convertTapChangers(i7Data, transformerEnds, cimModel, transformerinfo, connectivityNode, spannungsband) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        if ((0, parser_utils_1.getUUID)(i7Data.guid) === 'c0ba4bd1102c4f4fa4fc66865a60f462') { //Zeile53 - Typ Meeden'
-            let stop = true;
-        }
-        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '2e8057ed695147f9903023cb5e9d4a0c') { //Zeile55 - SR und LR'
-            let stop = true;
+        /*if(getUUID(i7Data.guid) === '11e7be86-8bb7-41ba-898a-74cd5e8efbb9'){ //Zeile50
+          let stop = true; DONE
         }
-        if ((0, parser_utils_1.getUUID)(i7Data.guid).toLowerCase() === 'd7a25b80-b439-48a0-b67e-108903063237') { //Zeile81 - SR statt LR'
+        if(getUUID(i7Data.guid) === '1239F03C-ED5B-4FDF-9453-D97E611FCC36'){ //Zeile52 - Datenfehler: Transformatoren mit definierter Zusatzspannung und Stufungsbereich, jedoch 'Stufensteller nicht vorhanden'
+          let stop = true; DONE
+        }*/
+        /*if(getUUID(i7Data.guid)=== 'CFDAA56A-A0DA-4C5B-92CC-21138B6D6D07'){ //Standard LR
+          let stop = true;
+        }*/
+        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '00ebe00e-50fa-4fc0-9ed6-557528a9b460') { //Zeile53 - Typ Meeden'
             let stop = true;
         }
-        if ((0, parser_utils_1.getUUID)(i7Data.guid) === 'b81485dd-5115-4241-b31a-c87a3eec9803') {
+        /*if(getUUID(i7Data.guid) === '012416f2d9584971baa93360fcf40be2'){ //Zeile55 - SR statt LR'
+          let stop = true;
+        }*/
+        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '515508dc-5982-4686-ad26-08d39db91421') { //Zeile81 - SR statt LR'
             let stop = true;
         }
+        /*if(getUUID(i7Data.guid) === '5ec82d14-ee64-43b6-86ff-c7615d96f7ad'){ //Zeile58
+          let stop = true;
+        }*/
         let ratioPhaseTapChangerPresent = false;
         //Check if tap changer exists. (power transformer winding)
         let tapChangerNumberI7 = []; //Number of tap changer
         let tapChangerNumber = [];
-        //collect information about tap changers (without type)
+        //let transformerEndInfo:EVPowerTransformerEndInfo[] = [];
         for (let tapChangerPos = 1; tapChangerPos <= 2; tapChangerPos++) {
             if ((0, parser_utils_1.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerPos}`])) {
-                if (i7Data[`gestufte_seite_s${tapChangerPos}`] !== 0) {
-                    tapChangerNumberI7.push(i7Data[`gestufte_seite_s${tapChangerPos}`]);
-                    tapChangerNumber.push(i7Data[`gestufte_seite_s${tapChangerPos}`]);
-                }
-                else if (i7Data[`gestufte_seite_s${tapChangerPos}`] === 0) {
-                    const controlledSide = getHVSideNumber(transformerEnds);
-                    tapChangerNumberI7.push(controlledSide);
-                    tapChangerNumber.push(controlledSide);
-                }
+                tapChangerNumberI7.push(i7Data[`gestufte_seite_s${tapChangerPos}`]);
+                tapChangerNumber.push(i7Data[`gestufte_seite_s${tapChangerPos}`]);
             }
         }
         //collect information about tap changers (type)
@@ -6162,15 +5994,15 @@ class ConverterIntegral7 {
         //If there is a phase tap changer and a ratio tap changer reorder the tap changers to process ratio tap changer first.
         let index = undefined;
         if (tapChangerNumberI7.length > 1) {
-            for (let i = 0; i < tapChangerNumberI7.length; i++) {
+            for (let entry of tapChangerNumberI7) {
                 const spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
-                const transformerEndInfo = (_d = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _d === void 0 ? void 0 : _d.find(elem => elem.endNumber === tapChangerNumberI7[i]);
+                const transformerEndInfo = (_d = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _d === void 0 ? void 0 : _d.find(elem => elem.endNumber === entry);
                 const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-                const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${i + 1}`])
-                    ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${i + 1}`])
+                const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${entry}`])
+                    ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${entry}`])
                     : (_e = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _e === void 0 ? void 0 : _e.value;
-                if (!((0, parser_utils_1.isNumericI7)(angle) && (0, parser_utils_1.convertToNumberI7)(angle) != 0 || spezialRegelung) && i > 0) {
-                    index = i; //This only works for two tapchanger definitions per power transformer
+                if (!((0, parser_utils_1.isNumericI7)(angle) && (0, parser_utils_1.convertToNumberI7)(angle) != 0 || spezialRegelung) && tapChangerNumberI7.indexOf(entry) > 0) {
+                    index = tapChangerNumberI7.indexOf(entry);
                     ratioPhaseTapChangerPresent = true;
                 }
             }
@@ -6180,15 +6012,15 @@ class ConverterIntegral7 {
             tapChangerNumber[1] = tapChangerNumberI7[0];
         }
         /** I7 Modell max. 2 Stufenschalter */
-        for (let i = 0; i < tapChangerNumber.length; i++) {
+        for (let entry of tapChangerNumber) {
             /**
              * 0  Oberspannungsseite
              * 1  Seite 1
              * 2  Seite 2
              * -  Stufenschalter nicht vorhanden
              */
-            let entryI7 = i + 1;
-            let gestufteSeite = tapChangerNumberI7[i];
+            let entryI7 = tapChangerNumberI7.indexOf(entry) + 1;
+            let gestufteSeite = tapChangerNumberI7[entryI7 - 1];
             const transformerEndInfo = (_f = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _f === void 0 ? void 0 : _f.find(elem => elem.endNumber === entryI7);
             const transformerEnd = transformerEnds.find(elem => elem.endNumber === entryI7);
             if ((0, parser_utils_1.isNumericI7)(gestufteSeite)) {
@@ -6208,8 +6040,8 @@ class ConverterIntegral7 {
                 continue;
             }
             const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-            const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${i + 1}`])
-                ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${i + 1}`])
+            const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${entryI7}`])
+                ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${entryI7}`])
                 : (_h = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _h === void 0 ? void 0 : _h.value;
             const spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
             //const neutralU = transformerEnd.ratedU;
@@ -6496,99 +6328,65 @@ class ConverterIntegral7 {
      * @param sternpunktKnotenMap Map mit den Sterpunktknoten aus der I7 Datenbank
      * */
     convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, i7Modell, stpKnoten, defaultValuesConfig) {
-        /**
-         * Five cases for transformer grounding model has to be checked:
-         *  Case 1: no grounding ... no 'Sternpunktknoten' is present ... ''
-         *  Case 2: no grounding ... 'Sternpunktknoten', 'SternpunktSchaltelement', 'Sternpunktschiene' is present but no 'KDrossel' ... 'isoliert'
-         *  Case 3: grounding is present ... only 'Sternpunktknoten' is present and 'Sternpunktknoten.geerdet' == 1 ... 'starr' or 'direkt'
-         *  Case 4: grounding is present ... only 'Sternpunktknoten' and 'Kdrossel' is present ... 'über Impedanz'
-         *  Case 5: grounding is present ... 'Sternpunktknoten', 'Sternpunktschaltelement', 'Sternpunktschiene' and 'Kdrossel' is present ... 'über Impedanz'
-         *  Case 6: no grounding ... only 'Sternpunktknoten' is present and 'Sternpunktknoten.geerdet' == 0 ... ''
-         */
+        var _a, _b, _c, _d, _e, _f;
+        /** Trafo ist geerdet */
         const cimModel = frame.cimModel;
-        let groundDisconnectorUUID = undefined;
-        let connectivityNodeN = undefined;
-        let groundDisconnector = undefined;
-        let voltageLevel = undefined;
         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);
-            }
-            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.`);
-            }
-            else if (groundDisconnector !== undefined && groundDisconnector.getTerminals().size > 2) {
-                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 (stpKnoten && groundDisconnector === undefined) { //Case 3 and Case 4
-            const earthFaultCompensator = i7Modell.sternPunktImpModel.stpKnotenStpImp.get(stpKnoten.id);
-            if (earthFaultCompensator instanceof GroundingImpedance_1.GroundingImpedance) { //Case 4 ... 'Kdrossel' is modelled as a GroundingImpedanz
-                //cimModel.addGroundingImpedance(earthFaultCompensator as GroundingImpedance);//set grounded to 'true' if PetersenCoil is present
-                const groundingImpedance = earthFaultCompensator;
-                powerTransformerEnd.xground = groundingImpedance.x;
-                powerTransformerEnd.rground = groundingImpedance.r;
-                powerTransformerEnd.grounded = true;
-            }
-            else if (earthFaultCompensator instanceof PetersenCoil_1.PetersenCoil) { //Case 4 ... 'Kdrossel' is modelled as a PetersenCoil
-                //cimModel.addPetersenCoil(earthFaultCompensator as PetersenCoil); //set grounded to 'true' if GroundingImpedance is present
-                const petersenCoil = earthFaultCompensator;
-                powerTransformerEnd.xground = (0, parser_utils_1.isNumericI7)(petersenCoil.xGroundNominal) ? petersenCoil.xGroundNominal : (((0, parser_utils_1.isNumericI7)(petersenCoil.xGroundMax) && (0, parser_utils_1.isNumericI7)(petersenCoil.xGroundMin)) ? (petersenCoil.xGroundMax + petersenCoil.xGroundMin) / 2 : defaultValuesConfig.TransformerEnd.xground);
-                powerTransformerEnd.rground = petersenCoil.r;
-                powerTransformerEnd.grounded = true;
-            }
-            else if (stpKnoten.geerdet === 1) { //Case 3
-                powerTransformerEnd.rground = defaultValuesConfig.TransformerEnd.rground; //it is assumed that rground and xground is zero in case of solidly grounding
-                powerTransformerEnd.xground = defaultValuesConfig.TransformerEnd.xground; //it is assumed that rground and xground is zero in case of solidly grounding
-                powerTransformerEnd.grounded = true;
-            }
-            else { //Case 6
-                powerTransformerEnd.grounded = false;
-            }
-        }
-        else if (connectivityNodeN !== undefined && groundDisconnector !== undefined) {
-            const earthFaultCompensator = i7Modell.sternPunktImpModel.groundDisconnectorUUIDstpImp.get(groundDisconnectorUUID);
-            if (earthFaultCompensator instanceof GroundingImpedance_1.GroundingImpedance) { //Case 5 ... 'Kdrossel' is modelled as a GroundingImpedanz
-                cimModel.addGroundingImpedance(earthFaultCompensator);
-                cimModel.addGroundDisconnector(groundDisconnector);
-                cimModel.addConnectivityNode(connectivityNodeN);
-                powerTransformerEnd.grounded = true; //set grounded to 'true' if GroundingImpedance is present
-            }
-            else if (earthFaultCompensator instanceof PetersenCoil_1.PetersenCoil) { //Case 5 ... 'Kdrossel' is modelled as a PetersenCoil
-                cimModel.addPetersenCoil(earthFaultCompensator);
-                cimModel.addGroundDisconnector(groundDisconnector);
-                cimModel.addConnectivityNode(connectivityNodeN);
-                powerTransformerEnd.grounded = true; //set grounded to 'true' if PetersenCoil is present
-            }
-            else { //Case 2
-                powerTransformerEnd.grounded = false; //set grounded to 'false' if no GroundingImpedance or PetersenCoil is present ... 'isolierte Sternpunktschiene'
-            }
-            /** BaseVoltage */
-            if (voltageLevel !== undefined) {
-                groundDisconnector.baseVoltage = voltageLevel.baseVoltage ? voltageLevel.baseVoltage : powerTransformerEnd.baseVoltage;
-                groundDisconnector.equipmentContainer = voltageLevel;
-                if (earthFaultCompensator !== undefined) {
-                    earthFaultCompensator.equipmentContainer = voltageLevel;
-                }
-                connectivityNodeN.connectivityNodeContainer = voltageLevel;
-                connectivityNodeN.key = voltageLevel.key + connectivityNodeN.key;
+            const junctionUUID = i7Modell.sternPunktImpModel.stpSchieneJunctionUUIDs.get(stpKnoten.schaltelement1pelem);
+            const junction = i7Modell.sternPunktImpModel.junctions.get(junctionUUID);
+            powerTransformerEnd.grounded = true;
+            // TODO
+            powerTransformerEnd.rground = defaultValuesConfig.TransformerEnd.rground;
+            if (!junctionUUID) {
+                /** Fall 1 Wenn der Knoten kein Schaltelement hat, dann direkte Erdung */
+                //TODO
+                // rground und xground aus der default-config verwenden?
+                powerTransformerEnd.xground = defaultValuesConfig.TransformerEnd.xground;
             }
             else {
-                this.logger.debug(`PowerTransformerEnd ${powerTransformerEnd === null || powerTransformerEnd === void 0 ? void 0 : powerTransformerEnd.mrid} hat kein VoltageLevel`);
+                /** Fall 2 Trafo ist über eine Sternpunktschiene geerdet
+                 * Nur Verbindung zur Junction herstellen */
+                let terminal;
+                if (!((_a = powerTransformerEnd.terminal) === null || _a === void 0 ? void 0 : _a.connectivityNode) && this.UUID2Integral7ID.has((_b = powerTransformerEnd.terminal) === null || _b === void 0 ? void 0 : _b.connectivityNodeUUID)) {
+                    const i7ObjectID = (_d = this.UUID2Integral7ID.get((_c = powerTransformerEnd.terminal) === null || _c === void 0 ? void 0 : _c.connectivityNodeUUID)) === null || _d === void 0 ? void 0 : _d.find(elem => elem);
+                    terminal = this.createBoundaryConnection(frame, junction, i7ObjectID, PhaseCode_1.PhaseCode.ABC);
+                }
+                else {
+                    terminal = this.createConnection(cimModel, junction, (_e = powerTransformerEnd.terminal) === null || _e === void 0 ? void 0 : _e.connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+                }
+                if (terminal) {
+                    terminal.name = 't_stp_trafo';
+                    if (junction)
+                        junction.name = (junction === null || junction === void 0 ? void 0 : junction.name) + '/Trafo';
+                    const pSpuleGroundImpedance = i7Modell.sternPunktImpModel.junctionUUIDstpImp.get(junctionUUID);
+                    /** EquipmentContainer - Voltage Level*/
+                    const voltageLevel = this.getVoltageLevelByVoltage((_f = powerTransformer.equipmentContainer) === null || _f === void 0 ? void 0 : _f.voltageLevels, powerTransformerEnd.ratedU);
+                    if (!voltageLevel) {
+                        this.logger.debug(`Trafo ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat kein EquipmentContainer`);
+                    }
+                    /** BaseVoltage */
+                    if (junction && voltageLevel) {
+                        junction.baseVoltage = (voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage) ? voltageLevel.baseVoltage : powerTransformerEnd.baseVoltage;
+                        junction.equipmentContainer = voltageLevel;
+                        cimModel.addJunction(junction);
+                    }
+                    else {
+                        this.logger.debug(`TrafoObjektID ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat keine Junction ${junctionUUID} oder VoltageLevel`);
+                    }
+                    if (pSpuleGroundImpedance) {
+                        pSpuleGroundImpedance.baseVoltage = (voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage) ? voltageLevel.baseVoltage : powerTransformerEnd.baseVoltage;
+                        pSpuleGroundImpedance.equipmentContainer = voltageLevel;
+                        cimModel.addGroundingImpedance(pSpuleGroundImpedance);
+                    }
+                    else {
+                        this.logger.debug(`TrafoObjektID ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat keine pSpuleGroundImpedance.`);
+                    }
+                }
+                else {
+                    this.logger.error(`Die Erdnung TrafoObjekts ID ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} konnte nicht abgebildet werden, da der Anschluss nicht bestimmt werden konnte.`);
+                }
             }
         }
-        else { //Case 1
-            powerTransformerEnd.grounded = false; //set grounded to 'false' if there is no 'Sternpunktknoten'
-        }
-        if (powerTransformerEnd.grounded) {
-            powerTransformerEnd.terminal.phases = PhaseCode_1.PhaseCode.ABCN;
-        }
     }
     /** Equipment grounding
      * @param shnt ShuntCompensator object
@@ -6938,48 +6736,4 @@ function logExecutionTime(logger, startTime, text) {
     logger.debug(`${text} ${(perf_hooks.performance.now() - startTime) / 1000} seconds`);
     console.log(`${text} ${(perf_hooks.performance.now() - startTime) / 1000} seconds`);
 }
-function getHVSideNumber(transformerEnds) {
-    let retVal = undefined;
-    let urHv = 0;
-    for (let i = 0; i < transformerEnds.length; i++) {
-        if (urHv < transformerEnds[i].ratedU) {
-            retVal = transformerEnds[i].endNumber;
-            urHv = transformerEnds[i].ratedU;
-        }
-    }
-    return retVal;
-}
-function createLineName(i7Data, uuid, lineNames) {
-    let retVal = (0, util_create_1.createNotation)([i7Data.bezeichner], 32, false);
-    if (lineNames[retVal] === true) { //try to find another name with i7Data.stkabname as suffix
-        if (i7Data.bezeichner.length > 0 && i7Data.stkabname.length > 0) {
-            retVal = i7Data.bezeichner.substring(0, i7Data.bezeichner.length - (i7Data.bezeichner.length + (i7Data.stkabname.length + 1) - 32)) + '_' + i7Data.stkabname;
-        }
-        else if (i7Data.bezeichner.length > 0 && i7Data.stkabname.length <= 0) {
-            retVal = i7Data.bezeichner.substring(0, i7Data.stkabname.length - (i7Data.bezeichner.length - 32));
-        }
-        else if (i7Data.bezeichner.length <= 0 && i7Data.stkabname.length > 0) {
-            retVal = i7Data.stkabname.substring(0, i7Data.stkabname.length - (i7Data.stkabname.length - 32));
-        }
-    }
-    if (lineNames[retVal] === true) { //use uuid to create a unique name
-        if (retVal.length + 9 <= 32) {
-            retVal = retVal + '_' + normalizeUUID(uuid).substring(0, 8);
-        }
-        else {
-            retVal = retVal.substring(0, retVal.length - (retVal.length + 9 - 32)) + '_' + normalizeUUID(uuid).substring(0, 8);
-        }
-    }
-    return retVal;
-}
-function normalizeUUID(uuid) {
-    let retVal = '';
-    if (uuid != undefined && uuid.length > 0) {
-        retVal = uuid.replaceAll('_', '');
-        retVal = retVal.replaceAll('-', '');
-        retVal = retVal.toLowerCase();
-        retVal = retVal.trim();
-    }
-    return retVal;
-}
 //# sourceMappingURL=converter.integral7.js.map