@enervance/insight-cim-model 0.0.46 → 0.0.48

package/dist/converter/integral7/converter-i7.js

@@ -96,7 +96,6 @@ const ReactiveCapabilityCurve_1 = require("../../model/wires/ReactiveCapabilityC
 const RegulatingControl_1 = require("../../model/wires/RegulatingControl");
 const RegulatingControlModeKind_1 = require("../../model/wires/RegulatingControlModeKind");
 const StaticVarCompensator_1 = require("../../model/wires/StaticVarCompensator");
-const SynchronousMachine_1 = require("../../model/wires/SynchronousMachine");
 const SynchronousMachineKind_1 = require("../../model/wires/SynchronousMachineKind");
 const SynchronousMachineOperatingMode_1 = require("../../model/wires/SynchronousMachineOperatingMode");
 const TapChangerControl_1 = require("../../model/wires/TapChangerControl");
@@ -115,7 +114,6 @@ const data_structures_i7_1 = require("./interface-i7/data-structures-i7");
 const export_frame_i7_1 = require("./interface-i7/export-frame-i7");
 const KnotenSo_1 = require("./model/integral/KnotenSo");
 const Leitung_1 = require("./model/integral/Leitung");
-const Point_1 = require("./model/integral/Point");
 const Schaltanlage_1 = require("./model/integral/Schaltanlage");
 const Schaltanlagenabschnitt_1 = require("./model/integral/Schaltanlagenabschnitt");
 const SchaltanlagenabschnittNsg_1 = require("./model/integral/SchaltanlagenabschnittNsg");
@@ -129,10 +127,15 @@ const utils_schema_1 = require("./utils-schema");
 const utils_trafo3w_1 = require("./utils-trafo3w");
 const INTEGRALModel_1 = require("../../model/extensions/integral/model/INTEGRALModel");
 const constants_1 = require("./model/dl-utils/constants");
-const SsabNsg_1 = require("./model/dl-utils/SsabNsg");
+const util_functions_1 = require("./model/dl-utils/util-functions");
 const Laengskupplung_1 = require("./model/integral/Laengskupplung");
 const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel/INTEGRALConformLoad");
+const Trafo2wNsg_1 = require("./model/integral/Trafo2wNsg");
+const Trafo3wNsg_1 = require("./model/integral/Trafo3wNsg");
+const SchaltfeldNsg_1 = require("./model/integral/SchaltfeldNsg");
 const AngleDegrees_1 = require("../../model/domain/AngleDegrees");
+const AsynchronousMachineKind_1 = require("../../model/wires/AsynchronousMachineKind");
+const INTEGRALEquivalentInjection_1 = require("../../model/extensions/integral/equivalents/INTEGRALEquivalentInjection");
 class ConverterI7 {
     constructor() {
         this.exportFrames = new Map();
@@ -233,7 +236,7 @@ class ConverterI7 {
                 }
                 catch (e) {
                     this.logger.error(e);
-                    console.error("ERROR:" + e);
+                    console.error('ERROR:' + e);
                     reject({ status: 'error', message: e.toString() });
                 }
                 finally {
@@ -509,7 +512,7 @@ class ConverterI7 {
                         .then((result) => {
                         for (const i7Data of result) {
                             const i7Schluessel = integral_prefix_1.GEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_GR"]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
+                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_GR']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
                         }
@@ -534,7 +537,7 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
                 for (const i7Data of result) {
                     const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const ctrlarea = new ControlArea_1.ControlArea(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_RZ"]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
+                    const ctrlarea = new ControlArea_1.ControlArea(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_RZ']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
                     cimModel.addControlArea(ctrlarea);
                     this.addIdMapping(i7Data.id, ctrlarea.mrid, integral_sql_1.Integral7TableNames.REGELZONE);
                 }
@@ -553,11 +556,11 @@ class ConverterI7 {
                         .then((result) => {
                         for (const i7Data of result) {
                             const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_SGR"]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_SGR']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
                             const regionUUID = this.integralID2UUID.get(i7Data.georegion);
                             let region = regions.find(elem => elem.mrid === regionUUID);
                             if (!region) {
-                                region = utils_1.createIfNotExitsGeoregionByName(this.cimModelDefault, util_create_1.createNotation([defaultValuesConfig.GeographicalRegion.name, "_GR"]));
+                                region = utils_1.createIfNotExitsGeoregionByName(this.cimModelDefault, util_create_1.createNotation([defaultValuesConfig.GeographicalRegion.name, '_GR']));
                                 this.logger.debug(`SubGeographicalRegion UUID ${subregion.mrid} I7-ID ${i7Data.id} Name ${i7Data.bezeichner} hat keine Region.`);
                             }
                             subregion.region = region;
@@ -601,11 +604,9 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STANDORT) && standortIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STANDORT, standortIDs));
-                let filteredResults = result.filter(elem => elem.variantennr === variantenNr);
-                if (onlyEingeblendet) {
-                    filteredResults = filteredResults.filter(elem => elem.eingeblendet === 1);
-                }
+                const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_STANDORT);
                     const standort = integral7.integralStandorte.get(i7Data.standort);
                     if (standort) {
                         standort.standortNsg = new StandortNsg_1.StandortNsgImpl(i7Data);
@@ -622,34 +623,11 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) && knotenSoIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_SO, knotenSoIDs));
-                let filteredResults = result.filter(elem => elem.variantennr === variantenNr);
-                if (onlyEingeblendet) {
-                    filteredResults = filteredResults.filter(elem => elem.eingeblendet === 1);
-                }
+                const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
-                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
-                    const diagram = cimModel.getDiagram(diagramUUID);
-                    const nsgStandort = integral7.integralNSGStandorte.get(i7Data.nsgso);
-                    if (!diagram || !nsgStandort) {
-                        continue;
-                    }
-                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'Abzweig');
-                    diagramObject.diagramUUID = diagramUUID;
-                    diagramObject.setDiagram(diagram);
-                    const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(nsgStandort.xrel + i7Data.xrel, nsgStandort.yrel + i7Data.yrel);
-                    diagramObjectPoint.mrid = utils_1.generateUUID();
-                    diagramObjectPoint.diagramObject = diagramObject;
-                    diagramObject.addDiagramObjectPoint(diagramObjectPoint);
-                    cimModel.addDiagramObject(diagramObject);
-                    cimModel.addDiagramObjectPoint(diagramObjectPoint);
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO);
                     const cimObjectUUID = this.integralID2UUID.get(i7Data.knotenso);
-                    const cimObject = cimModel.getObject(cimObjectUUID);
-                    if (cimObject) {
-                        diagramObject.setIdentifiedObject(cimObject);
-                    }
-                    else {
-                        this.logger.debug(`KnotenSo/DiagramObject ${diagramObject.mrid} hat kein PSR-Objekt.`);
-                    }
+                    util_functions_1.DLUtilFunctions.convertNsgKnoten(cimModel, integral7, i7Data, cimObjectUUID, constants_1.NsgConstants.KNOTENSO_WIDTH, constants_1.NsgConstants.KNOTENSO_HEIGHT);
                 }
             }
             else {
@@ -657,15 +635,30 @@ class ConverterI7 {
             }
         });
     }
+    convertSchemaHgueKnotenSo(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) && nsgStandortIDs.length > 0) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_HGUE, nsgStandortIDs));
+                const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
+                for (const i7Data of filteredResults) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE);
+                    const cimObjectUUID = this.integralID2UUID.get(i7Data.knotenso);
+                    util_functions_1.DLUtilFunctions.convertNsgKnoten(cimModel, integral7, i7Data, cimObjectUUID, constants_1.NsgConstants.HGUE_KNOTENSO_WIDTH, constants_1.NsgConstants.HGUE_KNOTENSO_HEIGHT);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertSchemaSchaltanlage(cimModel, integral7, saIDs, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE) && saIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, saIDs));
-                let filteredResults = result.filter(elem => elem.variantennr === variantenNr);
-                if (onlyEingeblendet) {
-                    filteredResults = filteredResults.filter(elem => elem.eingeblendet === 1);
-                }
+                const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE);
                     const schaltanlage = integral7.integralSchaltanlagen.get(i7Data.schaltanlage);
                     if (schaltanlage) {
                         schaltanlage.schaltanlageNsg = new SchaltanlageNSG_1.SchaltanlageNsgImpl(i7Data);
@@ -682,16 +675,15 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT) && schaltanlagenabschnittIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGENABSCHNITT, schaltanlagenabschnittIDs));
-                let filteredResults = result.filter(elem => elem.variantennr === variantenNr);
-                if (onlyEingeblendet) {
-                    filteredResults = filteredResults.filter(elem => elem.eingeblendet === 1);
-                }
+                const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT);
                     const saabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
                     if (saabschnitt) {
                         saabschnitt.schaltanlagenabschnittNsg = new SchaltanlagenabschnittNsg_1.SchaltanlagenabschnittNsg(i7Data);
                         saabschnitt.schaltanlagenabschnittNsg.saabschnitt = saabschnitt;
                         saabschnitt.schaltanlagenabschnittNsg.nsgsa = integral7.integralNSGSchaltanlage.get(i7Data.nsgsa);
+                        saabschnitt.schaltanlagenabschnittNsg.nsgsa.saabNsg.push(saabschnitt.schaltanlagenabschnittNsg);
                         integral7.integralNSGSAAbschnitt.set(i7Data.id, saabschnitt.schaltanlagenabschnittNsg);
                     }
                 }
@@ -706,61 +698,75 @@ class ConverterI7 {
             if (schaltanlagenabschnittIDs.length <= 0)
                 return;
             const isEingeblendet = 1;
-            const innerSQLisEingeblendet = `IFNULL(
-                                      (SELECT max(slotnummer) + 1
-                                      FROM nsg_nsgschaltfeld AS nsg_nsgsf
-                                      WHERE nsg_nsgsf.nsgsaa = nsg_nsgsaab.id
-                                      AND nsg_nsgsf.eingeblendet = ${isEingeblendet}),
-                                    1)`;
-            const outerSQLisEingeblendet = `AND nsg_nsgsaab.eingeblendet = ${isEingeblendet}`;
-            const sqlStatement = `SELECT nsg_nsgsaab.variantennr,
-              nsg_nsgsaab.id,
-              ${onlyEingeblendet ? innerSQLisEingeblendet : 'nsg_nsgsaab.laenge'} as laenge,
-              nsg_nsgsaab.nslots,
-              nsg_nsgsaab.saabschnitt,
-              nsg_nsgsaab.nsgsa,
-              nsg_nsgsaab.eingeblendet,
-              nsg_nsgsaab.nsglkp,
-              netz_ssab.pos AS posSSAB,
-              netz_ssab.id  AS idSSAB
-       FROM nsg_nsgsaabschnitt AS nsg_nsgsaab
-                LEFT JOIN netz_ssab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
-       WHERE (${integral_sql_1.getWhereIDs('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')})
-           ${onlyEingeblendet ? outerSQLisEingeblendet : ''};`;
+            let sqlSelectGroupedMaxSlotSf = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
+                                     FROM nsg_nsgschaltfeld
+                                     WHERE ((${integral_sql_1.getWhereIDs('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
+            if (onlyEingeblendet) {
+                sqlSelectGroupedMaxSlotSf += ` AND (eingeblendet = ${isEingeblendet} OR (eingeblendet IS NULL AND angezeigt = ${isEingeblendet}))`;
+            }
+            sqlSelectGroupedMaxSlotSf += ` GROUP BY nsgsaa`;
+            const resultsMaxSlotsSf = yield this.mysqlController.execQuery(sqlSelectGroupedMaxSlotSf);
+            const mappedResultsMaxSlotsSf = new Map(resultsMaxSlotsSf.map(value => [value.nsgsaa, value.laenge]));
+            let sqlSelectGroupedMaxSlotKpF = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
+                                      FROM nsg_nsgkpfeld
+                                      WHERE ((${integral_sql_1.getWhereIDs('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
+            if (onlyEingeblendet) {
+                sqlSelectGroupedMaxSlotKpF += ` AND (eingeblendet = ${isEingeblendet} OR (eingeblendet IS NULL AND angezeigt = ${isEingeblendet}))`;
+            }
+            sqlSelectGroupedMaxSlotKpF += ` GROUP BY nsgsaa`;
+            const resultsMaxSlotsKpF = yield this.mysqlController.execQuery(sqlSelectGroupedMaxSlotKpF);
+            const mappedResultsMaxSlotsKpF = new Map(resultsMaxSlotsKpF.map(value => [value.nsgsaa, value.laenge]));
+            const sqlStatement = `SELECT nsg_nsgsaab.variantennr,
+              nsg_nsgsaab.id,
+              nsg_nsgsaab.laenge AS laenge,
+              nsg_nsgsaab.nslots,
+              nsg_nsgsaab.saabschnitt,
+              nsg_nsgsaab.nsgsa,
+              nsg_nsgsaab.angezeigt,
+              nsg_nsgsaab.eingeblendet,
+              nsg_nsgsaab.nsglkp,
+              netz_ssab.pos      AS posSSAB,
+              netz_ssab.id       AS idSSAB
+       FROM netz_ssab
+                LEFT JOIN nsg_nsgsaabschnitt AS nsg_nsgsaab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
+       WHERE (${integral_sql_1.getWhereIDs('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')});`;
             const queryResults = yield this.mysqlController.execQuery(sqlStatement);
-            const filteredResults = queryResults.filter(elem => elem.variantennr === variantenNr);
+            queryResults.forEach(value => {
+                value.laenge = Math.max((mappedResultsMaxSlotsSf.get(value.id) || 0), (mappedResultsMaxSlotsKpF.get(value.id) || 0), value.laenge);
+            });
+            const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(queryResults, variantenNr, onlyEingeblendet);
             for (const queryResult of filteredResults) {
-                const sa = integral7.integralNSGSchaltanlage.get(queryResult.nsgsa);
-                const so = integral7.integralNSGStandorte.get(sa.nsgsoid);
+                const nsgSa = integral7.integralNSGSchaltanlage.get(queryResult.nsgsa);
+                const nsgSo = integral7.integralNSGStandorte.get(nsgSa.nsgsoid);
                 const leftOffset = queryResult.nslots * constants_1.NsgConstants.HORIZONTAL_OFFSET;
                 const topOffset = queryResult.posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
                 const ssabLength = queryResult.laenge * constants_1.NsgConstants.HORIZONTAL_OFFSET;
-                let pointTopLeft = new Point_1.Point(leftOffset, topOffset);
-                let pointBottomRight = new Point_1.Point(leftOffset + ssabLength, topOffset);
+                let pointTopLeft = new DiagramObjectPoint_1.DiagramObjectPoint(leftOffset, topOffset, 1);
+                let pointBottomRight = new DiagramObjectPoint_1.DiagramObjectPoint(leftOffset + ssabLength, topOffset, 2);
+                let saaShiftOffset = 0;
+                for (const tempNsgSaa of nsgSa.saabNsg) {
+                    saaShiftOffset = saaShiftOffset < (tempNsgSaa.nslots + tempNsgSaa.laenge) ? (tempNsgSaa.nslots + tempNsgSaa.laenge) : saaShiftOffset;
+                }
                 const points = [];
                 points.push(pointTopLeft, pointBottomRight);
-                let maxX = 0;
-                for (const p of points) {
-                    maxX = maxX < p.x ? p.x : maxX;
-                    Point_1.Point.rotate(p, -90 * sa.ausrichtung);
-                }
-                const shiftValue = (queryResult.laenge + queryResult.nslots) * constants_1.NsgConstants.HORIZONTAL_OFFSET;
                 for (const p of points) {
-                    p.x += so.xrel + sa.xrel + (sa.ausrichtung === 2 ? maxX : 0);
-                    p.y += so.yrel + sa.yrel + (sa.ausrichtung === 3 ? maxX : 0);
+                    util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * nsgSa.ausrichtung);
+                    p.xPosition += nsgSo.xrel + nsgSa.xrel + (nsgSa.ausrichtung === 2 ? saaShiftOffset * constants_1.NsgConstants.HORIZONTAL_OFFSET : 0);
+                    p.yPosition += nsgSo.yrel + nsgSa.yrel + (nsgSa.ausrichtung === 3 ? saaShiftOffset * constants_1.NsgConstants.HORIZONTAL_OFFSET : 0);
                 }
                 integral7.integralNSGSsab.set(queryResult.idSSAB, queryResult);
                 const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'SSAB Diagram');
-                diagramObject.rotation = 90 * sa.ausrichtung;
+                diagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
                 const cnUUID = this.integralID2UUID.get(queryResult.idSSAB);
                 const connectivityNode = cimModel.getConnectivityNode(cnUUID);
-                utils_schema_1.createDiagramObjectPoints(diagramObject, points);
                 diagramObject.setIdentifiedObject(connectivityNode);
-                const diagramUUID = integral7.i7SchemaID2UUID.get(sa.variantennr);
+                const diagramUUID = integral7.i7SchemaID2UUID.get(nsgSa.variantennr);
                 const diagram = cimModel.getDiagram(diagramUUID);
                 if (diagram) {
                     diagramObject.setDiagram(diagram);
                     diagram.addDiagramObject(diagramObject);
+                    integral7.placedCIMObjectsForDLProfil.set(cnUUID, diagramObject);
                 }
                 else {
                     this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
@@ -780,12 +786,13 @@ class ConverterI7 {
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
                 const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, schaltfeldIDs));
                 const resultsNsgSchaltfeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTFELD, schaltfeldIDs));
-                let filteredResultsNsgSchaltfeld = resultsNsgSchaltfeld.filter(elem => elem.variantennr === variantenNr);
-                if (onlyEingeblendet) {
-                    filteredResultsNsgSchaltfeld = filteredResultsNsgSchaltfeld.filter(elem => elem.eingeblendet === 1);
-                }
+                const filteredResultsNsgSchaltfeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgSchaltfeld, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgSchaltfeld) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_SCHALTFELD);
+                    const nsgSchaltfeldObj = new SchaltfeldNsg_1.SchaltfeldNsgImpl(i7Data);
+                    integral7.integralNSGSchaltfeld.set(i7Data.id, nsgSchaltfeldObj);
                     const nodePointMap = new Map();
+                    const uuidPointsMap = new Map();
                     const schaltfeldLeftOffset = i7Data.slotnummer * constants_1.NsgConstants.HORIZONTAL_OFFSET;
                     const schaltfeldDeltaausrichtung = i7Data.deltaausrichtung;
                     const schaltfeldI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === i7Data.schaltfeld);
@@ -796,13 +803,15 @@ class ConverterI7 {
                     const ssabs = integral7.integralSchaltfelder.get(i7Data.schaltfeld).saabschnitt.ssab;
                     const maxSSabPos = Math.max(...ssabs.map(ssab => ssab.pos));
                     const onSSabNodes = schaltfeldI7KnotenBeziehungen.filter(elem => ssabs.find(ssab => ssab.id === elem.aknoten) !== undefined);
+                    const xPos = schaltfeldLeftOffset + (constants_1.NsgConstants.HORIZONTAL_OFFSET / 2);
+                    let lastNode = undefined;
                     for (const node of onSSabNodes) {
                         const ssabYPos = integral7.integralNSGSsab.get(node.aknoten).posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
                         let yStackPos = 1;
+                        let prevNode = null;
                         let crtNode = node;
                         while (crtNode) {
                             if (nodePointMap.get(crtNode.id) === undefined) {
-                                let xPos = schaltfeldLeftOffset + (constants_1.NsgConstants.HORIZONTAL_OFFSET / 2);
                                 let yPos = ssabYPos;
                                 if (crtNode === node) {
                                     yPos += shiftFromBusbar ? (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET : 0;
@@ -812,12 +821,59 @@ class ConverterI7 {
                                     yPos = ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (yStackPos) + ssabOffset) * constants_1.NsgConstants.VERTICAL_OFFSET;
                                     yStackPos += 1;
                                 }
-                                nodePointMap.set(crtNode.id, new Point_1.Point(xPos, yPos));
+                                nodePointMap.set(crtNode.id, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos, schaltfeldDeltaausrichtung * 180));
+                                const aKnotenUUID = this.integralID2UUID.get(crtNode.aknoten);
+                                if (!integral7.placedCIMObjectsForDLProfil.has(aKnotenUUID) && !nodePointMap.has(crtNode.aknoten)) {
+                                    let prevNodeY = prevNode !== null ? nodePointMap.get(prevNode.id).diagramObjectPoints[0].yPosition : 0;
+                                    let yPosAKnoten;
+                                    if (prevNode === node) {
+                                        yPosAKnoten = yPos - ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET) / 2;
+                                    }
+                                    else {
+                                        yPosAKnoten = (yPos - prevNodeY) / 2 + prevNodeY;
+                                    }
+                                    nodePointMap.set(crtNode.aknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPosAKnoten));
+                                }
+                            }
+                            lastNode = crtNode;
+                            prevNode = crtNode;
+                            crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
+                        }
+                    }
+                    const lastEKnotenUUID = this.integralID2UUID.get(lastNode.eknoten);
+                    if (!integral7.placedCIMObjectsForDLProfil.has(lastEKnotenUUID) && !nodePointMap.has(lastNode.eknoten)) {
+                        const yPos = (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (i7Data.hoehe);
+                        const heightAdjustement = schaltfeldDeltaausrichtung === 0 ? (constants_1.NsgConstants.VERTICAL_OFFSET * (maxSSabPos + 1)) : 0;
+                        nodePointMap.set(lastNode.eknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos + heightAdjustement));
+                    }
+                    nsgSchaltfeldObj.lastNodeID = lastNode.eknoten;
+                    nsgSchaltfeldObj.lastNodeCimUUID = lastEKnotenUUID;
+                    for (const node of onSSabNodes) {
+                        let crtNode = node;
+                        while (crtNode) {
+                            let aKnotenPos = undefined;
+                            if (crtNode === node) {
+                                aKnotenPos = new DiagramObjectPoint_1.DiagramObjectPoint(xPos, integral7.integralNSGSsab.get(crtNode.aknoten).posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET);
                             }
+                            util_functions_1.DLUtilFunctions.exportTerminals(crtNode, nodePointMap, uuidPointsMap, cimModel, this.integralID2UUID, aKnotenPos);
                             crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
                         }
                     }
-                    SsabNsg_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, this.integralID2UUID, variantenNr, i7Data.nsgsaa, nodePointMap);
+                    [...nodePointMap.entries()].forEach(entry => {
+                        uuidPointsMap.set(this.integralID2UUID.get(entry[0]), entry[1]);
+                    });
+                    const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
+                    const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
+                    nsgSchaltfeldObj.orientation = nsgSa.ausrichtung;
+                    if (i7Data.deltaausrichtung === 1) {
+                        nsgSchaltfeldObj.orientation = (nsgSchaltfeldObj.orientation + 2) % 4;
+                    }
+                    uuidPointsMap.forEach((entryDiagramObject, key) => {
+                        if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
+                            entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                        }
+                    });
+                    util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap, true);
                 }
             }
         });
@@ -834,20 +890,25 @@ class ConverterI7 {
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
                 const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, integral7.querkupplungIDs));
                 const resultsNsgKpFeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERKUPPLUNG, integral7.querkupplungIDs));
-                let filteredResultsNsgKpFeld = resultsNsgKpFeld.filter(elem => elem.variantennr === variantenNr);
-                if (onlyEingeblendet) {
-                    filteredResultsNsgKpFeld = filteredResultsNsgKpFeld.filter(elem => elem.eingeblendet === 1);
-                }
+                const filteredResultsNsgKpFeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgKpFeld, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgKpFeld) {
-                    const nodePointMap = new Map();
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG);
+                    const uuidPointsMap = new Map();
                     const kpFeldLeftOffset = i7Data.slotnummer * constants_1.NsgConstants.HORIZONTAL_OFFSET;
                     const kpFeldDeltaausrichtung = i7Data.deltaausrichtung;
                     const kpFeldI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === i7Data.kpfeld);
                     const ssabs = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa).saabschnitt.ssab;
                     const relevantSSabIDs = new Set();
                     ssabs.forEach(ssab => relevantSSabIDs.add(ssab.id));
-                    SsabNsg_1.DLUtilFunctions.placeKupplung(kpFeldI7KnotenBeziehungen, nodePointMap, relevantSSabIDs, integral7.integralNSGSsab, kpFeldDeltaausrichtung, kpFeldLeftOffset, false);
-                    SsabNsg_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, this.integralID2UUID, variantenNr, i7Data.nsgsaa, nodePointMap);
+                    util_functions_1.DLUtilFunctions.placeKupplung(kpFeldI7KnotenBeziehungen, uuidPointsMap, cimModel, relevantSSabIDs, integral7.integralNSGSsab, this.integralID2UUID, integral7.placedCIMObjectsForDLProfil, kpFeldDeltaausrichtung, kpFeldLeftOffset, false);
+                    const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
+                    const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
+                    uuidPointsMap.forEach((entryDiagramObject, key) => {
+                        if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
+                            entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                        }
+                    });
+                    util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap, true);
                 }
             }
         });
@@ -864,22 +925,635 @@ class ConverterI7 {
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
                 const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, integral7.laengskupplungIDs));
                 const resultsNsgLKupplung = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, [...integral7.integralNSGSAAbschnitt.keys()]));
-                let filteredResultsNsgLKupplung = resultsNsgLKupplung.filter(elem => elem.variantennr === variantenNr);
-                if (onlyEingeblendet) {
-                    filteredResultsNsgLKupplung = filteredResultsNsgLKupplung.filter(elem => elem.eingeblendet === 1);
-                }
-                const nodePointMap = new Map();
+                const filteredResultsNsgLKupplung = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgLKupplung, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgLKupplung) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG);
+                    const uuidPointsMap = new Map();
                     const schaltanlagenID = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa).nsgsa.schaltanlageid;
                     const netzLaengskupplungsObjs = [...integral7.integralLaengskupplungen.values()].filter(elem => elem.schaltanlagenID === schaltanlagenID);
                     for (const netzLaengskupplungObj of netzLaengskupplungsObjs) {
                         const lKupplungI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === netzLaengskupplungObj.id);
                         const relevantSSabIDs = new Set();
                         integral7.integralSchaltanlagen.get(schaltanlagenID).saab.forEach(netz_saab => netz_saab.ssab.forEach(ssab => relevantSSabIDs.add(ssab.id)));
-                        SsabNsg_1.DLUtilFunctions.placeKupplung(lKupplungI7KnotenBeziehungen, nodePointMap, relevantSSabIDs, integral7.integralNSGSsab, 0, 0, true);
+                        util_functions_1.DLUtilFunctions.placeKupplung(lKupplungI7KnotenBeziehungen, uuidPointsMap, cimModel, relevantSSabIDs, integral7.integralNSGSsab, this.integralID2UUID, integral7.placedCIMObjectsForDLProfil, 0, 0, true);
+                    }
+                    const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
+                    const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
+                    uuidPointsMap.forEach((entryDiagramObject, key) => {
+                        if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
+                            entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                        }
+                    });
+                    util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap);
+                }
+            }
+        });
+    }
+    convertSchemaTransformatoren2W(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO2W) && nsgStandortIDs.length > 0) {
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO2W, nsgStandortIDs));
+                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
+                for (const i7Data of filteredResults) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_TRAFO2W);
+                    const uuidPointsMap = new Map();
+                    const trafo2wNsg = new Trafo2wNsg_1.Trafo2wNsgImpl(i7Data);
+                    integral7.integralNSGTrafos.set(i7Data.trafo2w, trafo2wNsg);
+                    const trafoDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO2W_WIDTH / 2, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
+                    trafoDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnTrafo2W(trafo2wNsg.ausrichtung);
+                    const tempPoints = [];
+                    tempPoints.push(trafoDiagramObject.diagramObjectPoints[0]);
+                    const trafoUUID = this.integralID2UUID.get(trafo2wNsg.trafo2wid);
+                    const transformer = cimModel.getPowerTransformer(trafoUUID);
+                    const terminal1 = transformer.powerTransformerEnds[0].terminal;
+                    const terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(0, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
+                    tempPoints.push(terminal1DiagramObject.diagramObjectPoints[0]);
+                    const terminal2 = transformer.powerTransformerEnds[1].terminal;
+                    const terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO2W_WIDTH, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
+                    tempPoints.push(terminal2DiagramObject.diagramObjectPoints[0]);
+                    for (const p of tempPoints) {
+                        util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, 360 - (90 * trafo2wNsg.ausrichtung) % 360);
+                        p.xPosition += trafo2wNsg.xrel;
+                        p.yPosition += trafo2wNsg.yrel;
+                        p.xPosition += (trafo2wNsg.ausrichtung === 1 ? constants_1.NsgConstants.TRAFO2W_HEIGHT : 0);
+                        p.xPosition += (trafo2wNsg.ausrichtung === 2 ? constants_1.NsgConstants.TRAFO2W_WIDTH : 0);
+                        p.yPosition += (trafo2wNsg.ausrichtung === 2 ? constants_1.NsgConstants.TRAFO2W_HEIGHT : 0);
+                        p.yPosition += (trafo2wNsg.ausrichtung === 3 ? constants_1.NsgConstants.TRAFO2W_WIDTH : 0);
+                    }
+                    uuidPointsMap.set(this.integralID2UUID.get(trafo2wNsg.trafo2wid), trafoDiagramObject);
+                    if (terminal1 !== undefined) {
+                        uuidPointsMap.set(terminal1.getUUID(), terminal1DiagramObject);
+                    }
+                    if (terminal2 !== undefined) {
+                        uuidPointsMap.set(terminal2.getUUID(), terminal2DiagramObject);
+                    }
+                    util_functions_1.DLUtilFunctions.shiftAddBasedOnNsgSo(cimModel, integral7, variantenNr, trafo2wNsg.nsgsoid, uuidPointsMap);
+                    let t1CNdiagramObject, t1DiagramObject, t2CNdiagramObject, t2DiagramObject;
+                    if (terminal1 !== undefined) {
+                        t1CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.connectivityNode.getUUID());
+                        t1DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getUUID());
+                    }
+                    if (terminal2 !== undefined) {
+                        t2CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.connectivityNode.getUUID());
+                        t2DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getUUID());
+                    }
+                    if (trafo2wNsg.ausrichtung === 2 || trafo2wNsg.ausrichtung === 3) {
+                        if (terminal2 !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                        if (terminal1 !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                    }
+                    else {
+                        if (terminal1 !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                        if (terminal2 !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_TRAFO2W} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaTransformatoren3W(cimModel, integral7, standortIDs, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO3W) && nsgStandortIDs.length > 0 && standortIDs.length > 0) {
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO3W, nsgStandortIDs));
+                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
+                const netzTrafoResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, standortIDs));
+                const netzTrafos = new Map(netzTrafoResults.map(obj => [obj.id, obj]));
+                for (const i7Data of filteredResults) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_TRAFO3W);
+                    const uuidPointsMap = new Map();
+                    const trafo3wNsg = new Trafo3wNsg_1.Trafo3wNsgImpl(i7Data);
+                    integral7.integralNSGTrafos.set(i7Data.trafo3w, trafo3wNsg);
+                    const trafoDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO3W_WIDTH / 2, constants_1.NsgConstants.TRAFO3W_HEIGHT / 2);
+                    trafoDiagramObject.rotation = 360 - (constants_1.NsgConstants.TAFO3W_RotationOrder.indexOf(trafo3wNsg.ausrichtung) * 30) % 360;
+                    const tempPoints = [];
+                    tempPoints.push(trafoDiagramObject.diagramObjectPoints[0]);
+                    const trafo3wNetz = netzTrafos.get(trafo3wNsg.trafo3wid);
+                    const pteW1 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w1));
+                    const pteW2 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w2));
+                    const pteW3 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w3));
+                    const exchangeGroups = constants_1.NsgConstants.TRAFO3W_ExchangeGroups;
+                    let exchangeGroup = undefined;
+                    for (const key of Object.keys(exchangeGroups)) {
+                        if (exchangeGroups[key].indexOf(trafo3wNsg.ausrichtung) !== -1) {
+                            exchangeGroup = constants_1.NsgConstants.TRAFO3W_ExchangeMap[key];
+                            break;
+                        }
+                    }
+                    const rotationenGroups = constants_1.NsgConstants.TRAFO3W_RotationGroups;
+                    let rotationenGroup = undefined;
+                    for (const key of Object.keys(rotationenGroups)) {
+                        if (rotationenGroups[key].indexOf(trafo3wNsg.ausrichtung) !== -1) {
+                            rotationenGroup = constants_1.NsgConstants.TRAFO3W_RotationGroup2Positions[key];
+                            break;
+                        }
+                    }
+                    const xMirroring = trafo3wNsg.orientierung_cw === 1;
+                    const terminal1 = pteW1.terminal;
+                    const terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[1]]);
+                    tempPoints.push(terminal1DiagramObject.diagramObjectPoints[0]);
+                    const terminal2 = pteW2.terminal;
+                    const terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[xMirroring ? 3 : 2]]);
+                    tempPoints.push(terminal2DiagramObject.diagramObjectPoints[0]);
+                    const terminal3 = pteW3.terminal;
+                    const terminal3DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[xMirroring ? 2 : 3]]);
+                    tempPoints.push(terminal3DiagramObject.diagramObjectPoints[0]);
+                    for (const p of tempPoints) {
+                        p.xPosition += trafo3wNsg.xrel;
+                        p.yPosition += trafo3wNsg.yrel;
+                    }
+                    uuidPointsMap.set(this.integralID2UUID.get(trafo3wNsg.trafo3wid), trafoDiagramObject);
+                    if (terminal1 !== undefined) {
+                        uuidPointsMap.set(terminal1.getUUID(), terminal1DiagramObject);
+                    }
+                    if (terminal2 !== undefined) {
+                        uuidPointsMap.set(terminal2.getUUID(), terminal2DiagramObject);
+                    }
+                    if (terminal3 !== undefined) {
+                        uuidPointsMap.set(terminal3.getUUID(), terminal3DiagramObject);
+                    }
+                    util_functions_1.DLUtilFunctions.shiftAddBasedOnNsgSo(cimModel, integral7, variantenNr, trafo3wNsg.nsgsoid, uuidPointsMap);
+                    if (terminal1) {
+                        const t1CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getConnectivityNodeUUID());
+                        const t1DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getUUID());
+                        if (t1CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                    }
+                    if (terminal2) {
+                        const t2CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getConnectivityNodeUUID());
+                        const t2DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getUUID());
+                        if (t2CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                    }
+                    if (terminal3) {
+                        const t3CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal3.getConnectivityNodeUUID());
+                        const t3DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal3.getUUID());
+                        if (t3CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t3DiagramObject, t3CNdiagramObject.diagramObjectPoints);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_TRAFO3W} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaLeitungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
+        var _a, _b, _c;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const leitungIDs = [...integral7.integralLeitungen.keys(), ...integral7.integralHgueLeitungen.keys()];
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNG) && this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT)
+                && leitungIDs.length > 0) {
+                const leitungResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNG, leitungIDs));
+                let filteredLeitungResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungResults, variantenNr, onlyEingeblendet);
+                const nsgLeitungIDs = filteredLeitungResults.map(elem => elem.id);
+                const leitungspktResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNGSPUNKT, nsgLeitungIDs));
+                let filteredLeitungspktResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungspktResults, variantenNr, onlyEingeblendet);
+                for (const i7Data of filteredLeitungResults) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_LEITUNG);
+                    let netzLeitung, aKnotenCimObjectUUID, eKnotenCimObjectUUID;
+                    const isACLine = integral7.integralLeitungen.get(i7Data.leitung);
+                    if (isACLine) {
+                        netzLeitung = integral7.integralLeitungen.get(i7Data.leitung);
+                        aKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.aknotenid);
+                        eKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.eknotenid);
+                    }
+                    else {
+                        netzLeitung = integral7.integralHgueLeitungen.get(i7Data.leitung);
+                        aKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.anetzobjekt);
+                        eKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.enetzobjekt);
+                    }
+                    const anfSchemaType = integral7.i7SchemaID2Type.get(i7Data.anschlussanf);
+                    const endSchemaType = integral7.i7SchemaID2Type.get(i7Data.anschlussend);
+                    let tempDiagramObjectPoints = [];
+                    let tempAnfDiagramObject = undefined;
+                    let tempEndDiagramObject = undefined;
+                    if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
+                        const anfSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.anschlussanf);
+                        tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(anfSchaltfeld.lastNodeCimUUID);
+                    }
+                    else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
+                        tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(aKnotenCimObjectUUID);
+                    }
+                    else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) {
+                        tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(integral7.i7ID2UUID.get(i7Data.anschlussanf));
+                    }
+                    else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) {
+                        tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(aKnotenCimObjectUUID);
+                    }
+                    else {
+                    }
+                    if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
+                        const anfSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.anschlussend);
+                        tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(anfSchaltfeld.lastNodeCimUUID);
+                    }
+                    else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
+                        tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(eKnotenCimObjectUUID);
+                    }
+                    else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) {
+                        tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(integral7.i7ID2UUID.get(i7Data.anschlussend));
+                    }
+                    else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) {
+                        tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(eKnotenCimObjectUUID);
+                    }
+                    else {
+                    }
+                    if (tempAnfDiagramObject === undefined || tempEndDiagramObject === undefined)
+                        continue;
+                    tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(tempAnfDiagramObject.diagramObjectPoints[0].xPosition, tempAnfDiagramObject.diagramObjectPoints[0].yPosition));
+                    const relevantLeitungspkts = filteredLeitungspktResults.filter(elem => elem.nsgleitung === i7Data.id).sort((a, b) => a.pos - b.pos);
+                    for (let a = 0; a < relevantLeitungspkts.length; a++) {
+                        const nsgLeitungspkt = relevantLeitungspkts[a];
+                        if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 1) {
+                            const tempDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempAnfDiagramObject.diagramObjectPoints[0].xPosition, tempAnfDiagramObject.diagramObjectPoints[0].yPosition);
+                            const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(anfSchemaType, integral7, i7Data.anschlussanf, nsgLeitungspkt);
+                            tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
+                            tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
+                            tempDiagramObjectPoints.push(tempDiagramObjectPoint);
+                        }
+                        else if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 0) {
+                            const tempDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempEndDiagramObject.diagramObjectPoints[0].xPosition, tempEndDiagramObject.diagramObjectPoints[0].yPosition);
+                            const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(endSchemaType, integral7, i7Data.anschlussend, nsgLeitungspkt);
+                            tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
+                            tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
+                            tempDiagramObjectPoints.push(tempDiagramObjectPoint);
+                        }
+                        else {
+                            tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(nsgLeitungspkt.xrel, nsgLeitungspkt.yrel));
+                        }
+                    }
+                    tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(tempEndDiagramObject.diagramObjectPoints[0].xPosition, tempEndDiagramObject.diagramObjectPoints[0].yPosition));
+                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
+                    const diagram = cimModel.getDiagram(diagramUUID);
+                    if (isACLine) {
+                        const netzLeitungCimObj = cimModel.getLine(this.integralID2UUID.get(netzLeitung.id));
+                        const cableAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL);
+                        const overheadAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.FREILEITUNG);
+                        let type = integral_sql_1.I7Objects.STROMKREISABSCHNITT;
+                        if (cableAvailable && overheadAvailable) {
+                            type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG;
+                        }
+                        else if (cableAvailable) {
+                            type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL;
+                        }
+                        else if (overheadAvailable) {
+                            type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
+                        }
+                        const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, [netzLeitung.id]));
+                        leitungStromkreisabschnitt.sort((a, b) => a.pos - b.pos);
+                        const acSegmentPercentages = [];
+                        let completeLength = 0;
+                        for (let a = 0; a < leitungStromkreisabschnitt.length; ++a) {
+                            completeLength += leitungStromkreisabschnitt[a].laenge;
+                        }
+                        let crtLength = 0;
+                        for (let a = 0; a < leitungStromkreisabschnitt.length; ++a) {
+                            crtLength += leitungStromkreisabschnitt[a].laenge;
+                            acSegmentPercentages.push(crtLength / completeLength);
+                        }
+                        let completePixelLength = 0;
+                        for (let a = 1; a < tempDiagramObjectPoints.length; ++a) {
+                            const tempX = tempDiagramObjectPoints[a].xPosition - tempDiagramObjectPoints[a - 1].xPosition;
+                            const tempY = tempDiagramObjectPoints[a].yPosition - tempDiagramObjectPoints[a - 1].yPosition;
+                            completePixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
+                        }
+                        let lastB = 0;
+                        let b = 1;
+                        let crtPixelLength = 0;
+                        for (let a = 0; a < acSegmentPercentages.length; ++a) {
+                            let crtPixelPercentageSize = 0;
+                            let lastPixelPercentageSize;
+                            do {
+                                const tempX = tempDiagramObjectPoints[b].xPosition - tempDiagramObjectPoints[b - 1].xPosition;
+                                const tempY = tempDiagramObjectPoints[b].yPosition - tempDiagramObjectPoints[b - 1].yPosition;
+                                crtPixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
+                                lastPixelPercentageSize = crtPixelPercentageSize;
+                                crtPixelPercentageSize = (crtPixelLength / completePixelLength);
+                                b++;
+                            } while (crtPixelPercentageSize < acSegmentPercentages[a] && b < tempDiagramObjectPoints.length);
+                            const epsilon = 0.00001;
+                            if ((crtPixelLength / completePixelLength) <= acSegmentPercentages[a] + epsilon) {
+                                const conductorCimObj = netzLeitungCimObj.equipments[a];
+                                const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'DiagramObj ' + ((_a = conductorCimObj.shortName) !== null && _a !== void 0 ? _a : ''));
+                                diagramObject.setIdentifiedObject(conductorCimObj);
+                                diagramObject.setDiagram(diagram);
+                                diagram.addDiagramObject(diagramObject);
+                                let i = 1;
+                                for (let idx = lastB; idx < b; ++idx) {
+                                    const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, i);
+                                    diagramObjectPoint.mrid = utils_1.generateUUID();
+                                    diagramObjectPoint.diagramObject = diagramObject;
+                                    diagramObject.addDiagramObjectPoint(diagramObjectPoint);
+                                    ++i;
+                                }
+                            }
+                            else if ((crtPixelLength / completePixelLength) > acSegmentPercentages[a]) {
+                                let decreased = false;
+                                if (b === tempDiagramObjectPoints.length) {
+                                    b--;
+                                    decreased = true;
+                                }
+                                let tempX = tempDiagramObjectPoints[b].xPosition - tempDiagramObjectPoints[b - 1].xPosition;
+                                let tempY = tempDiagramObjectPoints[b].yPosition - tempDiagramObjectPoints[b - 1].yPosition;
+                                const percentageOfSegment = crtPixelPercentageSize - lastPixelPercentageSize;
+                                const tempRestX = tempX * (1 - percentageOfSegment);
+                                const tempRestY = tempY * (1 - percentageOfSegment);
+                                tempX = tempX * percentageOfSegment;
+                                tempY = tempY * percentageOfSegment;
+                                const newDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[b - 1].xPosition + tempX, tempDiagramObjectPoints[b - 1].yPosition + tempY);
+                                crtPixelLength -= Math.sqrt((tempRestX * tempRestX) + (tempRestY * tempRestY));
+                                tempDiagramObjectPoints.splice(b, 0, newDiagramObjectPoint);
+                                const conductorCimObj = netzLeitungCimObj.equipments[a];
+                                const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'DiagramObj ' + ((_b = conductorCimObj.shortName) !== null && _b !== void 0 ? _b : ''));
+                                diagramObject.setDiagram(diagram);
+                                diagramObject.setIdentifiedObject(conductorCimObj);
+                                diagram.addDiagramObject(diagramObject);
+                                let i = 1;
+                                if (decreased)
+                                    b++;
+                                for (let idx = lastB; idx < b; ++idx) {
+                                    const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, i);
+                                    diagramObjectPoint.mrid = utils_1.generateUUID();
+                                    diagramObjectPoint.diagramObject = diagramObject;
+                                    diagramObject.addDiagramObjectPoint(diagramObjectPoint);
+                                    ++i;
+                                }
+                            }
+                            lastB = b - 1;
+                        }
+                    }
+                    else {
+                        const netzLeitungCimObj = cimModel.getObject(this.integralID2UUID.get(netzLeitung.id));
+                        const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID());
+                        diagramObject.setDiagram(diagram);
+                        diagram.addDiagramObject(diagramObject);
+                        diagramObject.setIdentifiedObjectUUID(this.integralID2UUID.get(netzLeitung.id));
+                        if (netzLeitungCimObj !== undefined) {
+                            diagramObject.name = 'DiagramObj ' + ((_c = netzLeitungCimObj.shortName) !== null && _c !== void 0 ? _c : '');
+                        }
+                        else {
+                            diagramObject.name = 'DiagramObj HGUE-Leitung';
+                        }
+                        for (let idx = 0; idx < tempDiagramObjectPoints.length; ++idx) {
+                            const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, idx + 1);
+                            diagramObjectPoint.mrid = utils_1.generateUUID();
+                            diagramObjectPoint.diagramObject = diagramObject;
+                            diagramObject.addDiagramObjectPoint(diagramObjectPoint);
+                        }
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_LEITUNG} oder ${integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaQuerzweige(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const whereIDs = [...integral7.i7SchemaID2Type.keys()];
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) && whereIDs.length > 0) {
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERZWEIG, whereIDs));
+                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
+                for (const i7Data of filteredResults) {
+                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_QUERZWEIG);
+                    integral7.integralNSGQuerzweig.set(i7Data.id, i7Data);
+                    const referenceType = integral7.i7SchemaID2Type.get(i7Data.bezugsobjekt);
+                    const uuidPointsMap = new Map();
+                    const rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnQuerzweig(i7Data.ausrichtung);
+                    let refXPos = 0;
+                    let refYPos = 0;
+                    let xPos = i7Data.xrel;
+                    let yPos = i7Data.yrel;
+                    let refCNNodeUUID = undefined;
+                    const querzweigType = this.integralID2Type.get(i7Data.querzweig);
+                    let nsgQuerzweigWidth;
+                    let nsgQuerzweigHeight;
+                    if (querzweigType === integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC || querzweigType === integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH) {
+                        nsgQuerzweigWidth = constants_1.NsgConstants.HGUE_QUERZWEIG_OBJ_WIDTH;
+                        nsgQuerzweigHeight = constants_1.NsgConstants.HGUE_QUERZWEIG_OBJ_HEIGHT;
+                    }
+                    else {
+                        nsgQuerzweigWidth = constants_1.NsgConstants.QUERZWEIG_OBJ_WIDTH;
+                        nsgQuerzweigHeight = constants_1.NsgConstants.QUERZWEIG_OBJ_HEIGHT;
+                    }
+                    if (referenceType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
+                        const nsgSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.bezugsobjekt);
+                        refCNNodeUUID = nsgSchaltfeld.lastNodeCimUUID;
+                        const lastDiagramObjectPointInsideBay = integral7.placedCIMObjectsForDLProfil.get(nsgSchaltfeld.lastNodeCimUUID).diagramObjectPoints[0];
+                        refXPos = lastDiagramObjectPointInsideBay.xPosition;
+                        refYPos = lastDiagramObjectPointInsideBay.yPosition;
+                        xPos += refXPos;
+                        yPos += refYPos;
+                        if (querzweigType === integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC || querzweigType === integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH) {
+                            switch (nsgSchaltfeld.orientation) {
+                                case 3:
+                                    xPos += nsgQuerzweigWidth / 2;
+                                    break;
+                                case 0:
+                                    yPos += nsgQuerzweigHeight / 2;
+                                    break;
+                                case 1:
+                                    xPos += nsgQuerzweigWidth / 2;
+                                    xPos -= nsgSchaltfeld.hoehe;
+                                    break;
+                                case 2:
+                                    yPos += nsgQuerzweigHeight / 2;
+                                    yPos -= nsgSchaltfeld.hoehe;
+                                    break;
+                            }
+                        }
+                        else {
+                            switch (nsgSchaltfeld.orientation) {
+                                case 3:
+                                    xPos += nsgQuerzweigWidth / 2;
+                                    yPos -= nsgQuerzweigHeight / 2;
+                                    break;
+                                case 0:
+                                    xPos -= nsgQuerzweigWidth / 2;
+                                    yPos += nsgQuerzweigHeight / 2;
+                                    break;
+                                case 1:
+                                    xPos += nsgQuerzweigWidth / 2;
+                                    yPos -= nsgQuerzweigHeight / 2;
+                                    xPos -= nsgSchaltfeld.hoehe;
+                                    break;
+                                case 2:
+                                    xPos -= nsgQuerzweigWidth / 2;
+                                    yPos += nsgQuerzweigHeight / 2;
+                                    yPos -= nsgSchaltfeld.hoehe;
+                                    break;
+                            }
+                        }
+                    }
+                    else if (referenceType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
+                        const nsgKnotenSoUUID = integral7.i7ID2UUID.get(i7Data.bezugsobjekt);
+                        refCNNodeUUID = nsgKnotenSoUUID;
+                        const lastDiagramObjectPointInsideBay = integral7.placedCIMObjectsForDLProfil.get(nsgKnotenSoUUID).diagramObjectPoints[0];
+                        refXPos = lastDiagramObjectPointInsideBay.xPosition;
+                        refYPos = lastDiagramObjectPointInsideBay.yPosition;
+                        xPos += refXPos;
+                        yPos += refYPos;
+                        xPos -= nsgQuerzweigWidth / 2;
+                        yPos -= nsgQuerzweigHeight / 2;
+                    }
+                    else {
+                        continue;
+                        throw new Error(`unhandled reference type '${referenceType}' for id ${i7Data.bezugsobjekt} (nsg_nsgquerzweig.id ${i7Data.id})!`);
+                    }
+                    const tempDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos, rotation);
+                    const querzweigObjectUUID = this.integralID2UUID.get(i7Data.querzweig);
+                    const cimObject2LinkWith = cimModel.getObject(querzweigObjectUUID);
+                    uuidPointsMap.set(querzweigObjectUUID, tempDiagramObject);
+                    if (cimObject2LinkWith !== undefined) {
+                        let ceTerminals = new Set([...cimObject2LinkWith.terminals.values()].map(t => t.getUUID()));
+                        cimObject2LinkWith.terminalsUUIDs.forEach(tUUID => ceTerminals.add(tUUID));
+                        let cnTerminals = new Set([...cimModel.getConnectivityNode(refCNNodeUUID).terminals.values()].map(t => t.getUUID()));
+                        cimObject2LinkWith.terminalsUUIDs.forEach(tUUID => cnTerminals.add(tUUID));
+                        const terminalUUID = [...cnTerminals.values()].filter(tUUID => ceTerminals.has(tUUID))[0];
+                        let xOffset = 0;
+                        let yOffset = 0;
+                        switch (i7Data.ausrichtung) {
+                            case 0:
+                                xOffset = constants_1.NsgConstants.TERMINAL_CE_OFFSET;
+                                break;
+                            case 1:
+                                yOffset = constants_1.NsgConstants.TERMINAL_CE_OFFSET;
+                                break;
+                            case 2:
+                                xOffset = -constants_1.NsgConstants.TERMINAL_CE_OFFSET;
+                                break;
+                            case 3:
+                                yOffset = -constants_1.NsgConstants.TERMINAL_CE_OFFSET;
+                                break;
+                        }
+                        const terminalDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(tempDiagramObject.diagramObjectPoints[0].xPosition + xOffset, tempDiagramObject.diagramObjectPoints[0].yPosition + yOffset);
+                        terminalDiagramObject.diagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(refXPos, refYPos));
+                        uuidPointsMap.set(terminalUUID, terminalDiagramObject);
+                    }
+                    util_functions_1.DLUtilFunctions.addi7ObjectToCIMModel(uuidPointsMap, cimModel, integral7, i7Data.variantennr);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_QUERZWEIG} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaSternpunktSchiene(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STP_SCHIENE) && nsgStandortIDs.length > 0) {
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STP_SCHIENE, nsgStandortIDs));
+                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
+                for (const i7Data of filteredResults) {
+                    const nsgSo = integral7.integralNSGStandorte.get(i7Data.nsgso);
+                    const ssabLength = i7Data.laenge * constants_1.NsgConstants.HORIZONTAL_OFFSET;
+                    let pointTopLeft = new DiagramObjectPoint_1.DiagramObjectPoint(0, 0, 1);
+                    let pointBottomRight = new DiagramObjectPoint_1.DiagramObjectPoint(ssabLength, 0, 2);
+                    const points = [];
+                    points.push(pointTopLeft, pointBottomRight);
+                    for (const p of points) {
+                        util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * i7Data.ausrichtung);
+                        p.xPosition += i7Data.xrel + nsgSo.xrel + (i7Data.ausrichtung === 2 ? ssabLength : 0);
+                        p.yPosition += i7Data.yrel + nsgSo.yrel + (i7Data.ausrichtung === 3 ? ssabLength : 0);
+                    }
+                    integral7.integralNSGStpSchiene.set(i7Data.stpschiene, i7Data);
+                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'Stp-SSAB ');
+                    diagramObject.rotation = (360 - 90 * i7Data.ausrichtung) % 360;
+                    utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
+                    const uuid = this.integralID2UUID.get(i7Data.stpschiene);
+                    const cimObject = cimModel.getObject(uuid);
+                    diagramObject.setIdentifiedObjectUUID(uuid);
+                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
+                    const diagram = cimModel.getDiagram(diagramUUID);
+                    if (diagram) {
+                        diagramObject.setDiagram(diagram);
+                        diagram.addDiagramObject(diagramObject);
+                        integral7.placedCIMObjectsForDLProfil.set(uuid, diagramObject);
+                    }
+                    else {
+                        this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STP_SCHIENE} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaSternpunktKnoten(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STP_KNOTEN) && nsgStandortIDs.length > 0) {
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STP_KNOTEN, nsgStandortIDs));
+                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
+                if (filteredResults.length <= 0)
+                    return;
+                const knoten1pelemIDs = filteredResults.map(elem => elem.knoten);
+                let sqlStatement;
+                sqlStatement = `SELECT *
+                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.STERNPUNKT_KNOTEN]}
+                      WHERE ${integral_sql_1.getWhereIDs('id', knoten1pelemIDs).join(' OR ')};`;
+                const knoten1pelemResults = yield this.mysqlController.execQuery(sqlStatement);
+                const knoten1pelemMap = new Map();
+                for (const elem of knoten1pelemResults) {
+                    let arr = knoten1pelemMap.has(elem.netzobjekt) ? knoten1pelemMap.get(elem.netzobjekt) : [];
+                    arr.push(elem.id);
+                    knoten1pelemMap.set(elem.netzobjekt, arr);
+                }
+                sqlStatement = `SELECT id AS 'netzobjektID', trafo3w AS 'trafoID', 'netz_trafo3w' AS 'trafoType'
+                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}
+                      WHERE id IN (${knoten1pelemResults.map(elem => elem.netzobjekt).join(',')})
+                      UNION ALL
+                      SELECT id AS 'netzobjektID', id AS 'trafoID', 'netz_trafo2w' AS 'trafoType'
+                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}
+                      WHERE id IN (${knoten1pelemResults.map(elem => elem.netzobjekt).join(',')});`;
+                const trafoIDTypeResults = yield this.mysqlController.execQuery(sqlStatement);
+                const trafoIDTypeMap = new Map();
+                for (const trafoIDTypeResult of trafoIDTypeResults) {
+                    const netzobjektRelatedKnotenIDs = knoten1pelemMap.get(trafoIDTypeResult.netzobjektID);
+                    for (const netzobjektRelatedKnotenID of netzobjektRelatedKnotenIDs) {
+                        trafoIDTypeMap.set(netzobjektRelatedKnotenID, trafoIDTypeResult);
                     }
-                    SsabNsg_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, this.integralID2UUID, variantenNr, i7Data.nsgsaa, nodePointMap);
                 }
+                for (const i7Data of filteredResults) {
+                    let centerPoint = new DiagramObjectPoint_1.DiagramObjectPoint(0, 0, 1);
+                    const shiftOffset = constants_1.NsgConstants.STP_KNOTEN_WIDTH;
+                    const trafoIDType = trafoIDTypeMap.get(i7Data.knoten);
+                    const nsgTrafo = integral7.integralNSGTrafos.get(trafoIDType.trafoID);
+                    const nsgStandort = integral7.integralNSGStandorte.get(nsgTrafo.nsgsoid);
+                    const points = [];
+                    points.push(centerPoint);
+                    for (const p of points) {
+                        util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * i7Data.ausrichtung);
+                        p.xPosition += i7Data.xrel + nsgTrafo.xrel + nsgStandort.xrel + (i7Data.ausrichtung === 2 ? shiftOffset : 0);
+                        p.yPosition += i7Data.yrel + nsgTrafo.yrel + nsgStandort.yrel + (i7Data.ausrichtung === 3 ? shiftOffset : 0);
+                    }
+                    integral7.integralNSGStpKnoten.set(i7Data.id, i7Data);
+                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'Stp-SSAB');
+                    diagramObject.rotation = (360 - 90 * i7Data.ausrichtung) % 360;
+                    utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
+                    const uuid = this.integralID2UUID.get(i7Data.knoten);
+                    diagramObject.setIdentifiedObjectUUID(uuid);
+                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
+                    const diagram = cimModel.getDiagram(diagramUUID);
+                    if (diagram) {
+                        diagramObject.setDiagram(diagram);
+                        diagram.addDiagramObject(diagramObject);
+                        integral7.placedCIMObjectsForDLProfil.set(uuid, diagramObject);
+                    }
+                    else {
+                        this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STP_SCHALTFELD} ist nicht vorhanden.`);
             }
         });
     }
@@ -888,7 +1562,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STANDORT)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STANDORT, whereID));
                 for (const i7Data of result) {
-                    const i7name = util_create_1.createNotation([utils_2.getName(i7Data), "_", utils_2.ueberpruefeZeichenkette(i7Data.ukz)], 32);
+                    const i7name = util_create_1.createNotation([utils_2.getName(i7Data), '_', utils_2.ueberpruefeZeichenkette(i7Data.ukz)], 32);
                     const substation = new AMPRIONSubstation_1.AMPRIONSubstation(utils_1.getUUID(i7Data.guid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
                     let subregion = cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
@@ -929,7 +1603,7 @@ class ConverterI7 {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const object = cimModel.getObject(this.integralID2UUID.get(i7Data.standort));
                     if (!object) {
-                        this.logger.warn(`Schaltanlage ${i7Data.id}/${i7Data.guid} ist keinem Standort (${i7Data.standort}) zugeornet.`);
+                        this.logger.warn(`Schaltanlage ${i7Data.id}/${i7Data.guid} ist keinem Standort (${i7Data.standort}) zugeordnet.`);
                         continue;
                     }
                     else if (!(object instanceof Substation_1.Substation)) {
@@ -940,7 +1614,7 @@ class ConverterI7 {
                         i7Data.un +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_", i7Data.un.toString(), "_VL"]), i7Data.kurzname, i7Schluessel);
+                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname, i7Schluessel);
                     const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, un, this.exportFramesBoundary);
                     vl.baseVoltage = baseVoltage;
@@ -969,7 +1643,7 @@ class ConverterI7 {
                         continue;
                     }
                     else {
-                        voltageLevel.name = util_create_1.createNotation([voltageLevel.name, "_", i7Data.pos.toString()], 32, true);
+                        voltageLevel.name = util_create_1.createNotation([voltageLevel.name, '_', i7Data.pos.toString()], 32, true);
                     }
                     const schaltanlagenabschnitt = new Schaltanlagenabschnitt_1.SchaltanlagenabschnittImpl(i7Data);
                     schaltanlagenabschnitt.addSchaltanlage(integral7.integralSchaltanlagen.get(schaltanlagenabschnitt.schaltanlageid));
@@ -995,7 +1669,8 @@ class ConverterI7 {
                     const i7Schluessel = voltageLevel.description +
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"], 32, true), i7Data.kurzname, i7Schluessel);
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B'], 32, true), i7Data.kurzname, i7Schluessel);
                     bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     bay.voltageLevel = voltageLevel;
@@ -1022,8 +1697,9 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_SO, standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.un.toString(), "_VL"]), i7Data.kurzname);
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), i7Data.kurzname, i7Data.kommentar);
+                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_CN']), i7Data.kurzname, i7Data.kommentar);
                     connectivityNode.setConnectivityNodeContainer(vl);
                     vl.addConnectivityNode(connectivityNode);
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
@@ -1070,11 +1746,14 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SAMMELSCHIENE, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), "_BBS"]), i7Schaltanlagenabschnitt.kurzname);
+                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), '_BBS']), i7Schaltanlagenabschnitt.kurzname);
                     busbarSection.ipMax = i7Data.limit_ip;
                     busbarSection.aggregate = false;
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.pos.toString(), "_CN"]), i7Data.kurzname);
-                    const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+                    if (utils_1.getUUID(i7Data.guid) === '24206c79-3ac8-4436-aa02-3f60a9e85975') {
+                        let stop = true;
+                    }
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_' + i7Data.pos.toString(), '_' + rdfid.substring(0, 8), '_CN'], 32, true), i7Data.kurzname);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (voltageLevel) {
@@ -1094,6 +1773,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug('Sammelschiene ' + i7Data.id + ' besitzt keine Schaltanlage.');
                     }
+                    this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
                     this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.SAMMELSCHIENE);
                     cimModel.addConnectivityNode(connectivityNode);
                     cimModel.addBusbarSection(busbarSection);
@@ -1113,7 +1793,7 @@ class ConverterI7 {
                 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(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid_cn), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
@@ -1137,7 +1817,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_KF)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_KF, querkupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), 'knotenkf');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'knotenkf');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.kpfeld));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -1160,7 +1840,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_LK)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_LK, laengskupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), 'KnotenLk');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'KnotenLk');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -1195,7 +1875,6 @@ class ConverterI7 {
                     if (connectivityNode) {
                         connectivityNode.addTerminal(terminal);
                         terminal.setConnectivityNode(connectivityNode);
-                        terminal.name = util_create_1.createNotation([connectivityNode.name, "_Schlaufe_T"]);
                     }
                     else {
                         this.logger.debug(`Schlaufe ${i7Data.id} besitzt keinen anschluss.`);
@@ -1212,16 +1891,18 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BELASTUNG, knotenSfIDs));
                 for (const i7Data of result) {
-                    const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CL"])) : new EnergyConsumer_1.EnergyConsumer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_EC"]));
+                    const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CL'])) : new EnergyConsumer_1.EnergyConsumer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EC']));
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
                     const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf && targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
                         cimModel.addMultiplierFactor(mf);
-                        load.multiplierFactor = mf;
+                        load.multiplierFactorUUID = mf.getUUID();
                     }
                     const powerData = utils_2.getActiveReactivePower(i7Data, mf);
                     load.p = powerData[0];
                     load.q = powerData[1];
+                    load.p_mf = powerData[2] ? powerData[2] : undefined;
+                    load.q_mf = powerData[3] ? powerData[3] : undefined;
                     if (targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
                         const conformLoadGroup = cimModel.getObjectByName(defaultValuesConfig.ConformLoadGroup.name, cim_class_names_1.CIM_CLASS_NAMES.ConformLoadGroup);
                         load.loadGroup = conformLoadGroup;
@@ -1287,17 +1968,68 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.GENERATOR, knotenSfIDs));
                 for (const i7Data of result) {
                     const genType = this.generatorTypen.get(i7Data.nametyp);
-                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM"]), i7Data.kurzname, i7Data.nameprimaertyp);
-                    const isRotatingPhaseShifter = utils_2.isBooleanI7(i7Data.flag_phasenschieber) ? utils_2.convertToBooleanI7(i7Data.flag_phasenschieber) : false;
+                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SM'], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    if (isRotatingPhaseShifter) {
-                        synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.condenser;
+                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
+                    const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : 0;
+                    const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const p = powerData[0];
+                    const q = powerData[1];
+                    const flagCondenserOperationMode = utils_2.isBooleanI7(i7Data.flag_phasenschieber) ? utils_2.convertToBooleanI7(i7Data.flag_phasenschieber) : true;
+                    const isRotatingPhaseShifter = mf !== undefined && flagCondenserOperationMode && maxP === 0 && minP === 0;
+                    const isGenerator = (maxP >= 0 || maxP === undefined) && (minP >= 0 || minP === undefined);
+                    const isMotor = (maxP <= 0 || maxP === undefined) && (minP <= 0 || minP === undefined);
+                    synchronousMachine.nameprimaertyp = i7Data.nameprimaertyp;
+                    if (isRotatingPhaseShifter && isGenerator && isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor;
+                    }
+                    else if (isRotatingPhaseShifter && isGenerator && !isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenser;
+                    }
+                    else if (isRotatingPhaseShifter && !isGenerator && !isMotor) {
                         synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.condenser;
                     }
+                    else if (isRotatingPhaseShifter && !isGenerator && isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.motorOrCondenser;
+                    }
+                    else if (!isRotatingPhaseShifter && isGenerator && !isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
+                    }
+                    else if (!isRotatingPhaseShifter && !isGenerator && isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.motor;
+                    }
+                    else if (!isRotatingPhaseShifter && isGenerator && isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generatorOrMotor;
+                    }
                     else {
+                        synchronousMachine.type = undefined;
+                    }
+                    const condenserOperationMode = p !== undefined && p === 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.condenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motorOrCondenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
+                    const generatorOperationMode = p !== undefined && p >= 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generator
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrMotor
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
+                    const motorOperationMode = p !== undefined && p <= 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motor
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrMotor
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motorOrCondenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
+                    if (condenserOperationMode && !generatorOperationMode && !motorOperationMode) {
+                        synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.condenser;
+                    }
+                    else if (!condenserOperationMode && generatorOperationMode && !motorOperationMode) {
                         synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
                         synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
                     }
+                    else if (!condenserOperationMode && !generatorOperationMode && motorOperationMode) {
+                        synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.motor;
+                    }
+                    else {
+                        synchronousMachine.operatingMode = undefined;
+                    }
                     if (utils_2.convertToNumberI7(i7Data.blocktrafo_1)) {
                         this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_1));
                     }
@@ -1315,21 +2047,20 @@ class ConverterI7 {
                     }
                     const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
                     synchronousMachine.referencePriority = prio;
-                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
-                    const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : 0;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
                     const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
                     const maxQvonPmax = utils_2.isNumericI7(i7Data.qmax_von_pmax) ? utils_2.convertToNumberI7(i7Data.qmax_von_pmax) : undefined;
+                    const minQvonPmax = utils_2.isNumericI7(i7Data.qmin_von_pmax) ? utils_2.convertToNumberI7(i7Data.qmin_von_pmax) : undefined;
+                    const maxQvonPmin = utils_2.isNumericI7(i7Data.qmax_von_pmin) ? utils_2.convertToNumberI7(i7Data.qmax_von_pmin) : undefined;
                     const minQvonPmin = utils_2.isNumericI7(i7Data.qmin_von_pmin) ? utils_2.convertToNumberI7(i7Data.qmin_von_pmin) : undefined;
                     synchronousMachine.maxQ = maxQ ? maxQ : maxQvonPmax;
                     synchronousMachine.minQ = minQ ? minQ : minQvonPmin;
                     const pType = (genType === null || genType === void 0 ? void 0 : genType.sr) * (genType === null || genType === void 0 ? void 0 : genType.cosphir);
                     const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
-                    const p = powerData[0];
-                    const q = powerData[1];
                     synchronousMachine.setActivePower(p * -1);
                     synchronousMachine.setReactivePower(q * -1);
+                    synchronousMachine.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    synchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     const sr = utils_2.isNumericI7(i7Data.sr) ? utils_2.convertToNumberI7(i7Data.sr) : genType === null || genType === void 0 ? void 0 : genType.sr;
                     if (sr && sr >= 0) {
                         synchronousMachine.ratedS = sr;
@@ -1337,30 +2068,30 @@ class ConverterI7 {
                     else {
                         synchronousMachine.ratedS = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));
                     }
-                    const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : genType.ur;
-                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
+                    const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : utils_2.isNumericI7(genType === null || genType === void 0 ? void 0 : genType.ur) ? genType.ur : undefined;
+                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : ur;
                     const cosphir = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : genType.cosphir;
-                    synchronousMachine.ratedU = usoll ? usoll : ur;
+                    synchronousMachine.ratedU = ur ? ur : usoll;
                     synchronousMachine.aggregate = true;
                     synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
                     synchronousMachine.r = utils_2.isNumericI7(i7Data.rg) ? utils_2.convertToNumberI7(i7Data.rg) : genType === null || genType === void 0 ? void 0 : genType.rg;
-                    if (!isRotatingPhaseShifter) {
-                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), util_create_1.createNotation(['CurveData', synchronousMachine.mrid, "_RCC"]));
+                    if (minP && maxP && minQvonPmin && maxQvonPmax) {
+                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), 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;
                         reactiveCapabilityCurve.y2Unit = UnitSymbol_1.UnitSymbol.VAr;
                         const curveData1 = new CurveData_1.CurveData(utils_1.generateUUID());
                         curveData1.curve = reactiveCapabilityCurve;
-                        curveData1.xvalue = i7Data.p_min;
-                        curveData1.y1value = i7Data.qmin_von_pmin;
-                        curveData1.y2value = i7Data.qmax_von_pmin;
+                        curveData1.xvalue = minP;
+                        curveData1.y1value = minQvonPmin;
+                        curveData1.y2value = maxQvonPmin;
                         cimModel.addCurveData(curveData1);
                         const curveData2 = new CurveData_1.CurveData(utils_1.generateUUID());
                         curveData2.curve = reactiveCapabilityCurve;
-                        curveData2.xvalue = i7Data.p_max;
-                        curveData2.y1value = i7Data.qmin_von_pmax;
-                        curveData2.y2value = i7Data.qmax_von_pmax;
+                        curveData2.xvalue = maxP;
+                        curveData2.y1value = minQvonPmax;
+                        curveData2.y2value = maxQvonPmax;
                         cimModel.addCurveData(curveData2);
                         cimModel.addReactiveCapabilityCurve(reactiveCapabilityCurve);
                         synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
@@ -1368,7 +2099,7 @@ class ConverterI7 {
                     let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Gen_${synchronousMachine.getUUID().substring(0, 8)}`);
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), util_create_1.createNotation(['GEN'], 32, true));
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -1384,23 +2115,23 @@ class ConverterI7 {
                         }
                     }
                     let generatingUnit;
-                    if (!isRotatingPhaseShifter) {
+                    if (synchronousMachine.type !== SynchronousMachineKind_1.SynchronousMachineKind.condenser) {
                         const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
                         if (generatingUnitConfig) {
                             switch (generatingUnitConfig.class) {
                                 case 'ThermalGeneratingUnit': {
-                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_TGU"]), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_TGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     if (generatingUnitConfig.fuelType) {
                                         utils_2.generateFuelType(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                     }
                                     break;
                                 }
                                 case 'SolarGeneratingUnit': {
-                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_SGU"]), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_SGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     break;
                                 }
                                 case 'WindGeneratingUnit': {
-                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_WGU"]), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_WGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     switch (generatingUnitConfig.fuelType) {
                                         case 'onshore': {
                                             generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
@@ -1418,26 +2149,26 @@ class ConverterI7 {
                                     break;
                                 }
                                 case 'NuclearGeneratingUnit': {
-                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_NGU"]), i7Data.kurzname);
+                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_NGU']), i7Data.kurzname);
                                     break;
                                 }
                                 case 'HydroGeneratingUnit': {
-                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_HGU"]), i7Data.kurzname);
+                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_HGU']), i7Data.kurzname);
                                     generatingUnit.energyConversionCapability = HydroEnergyConversionKind_1.HydroEnergyConversionKind.pumpAndGenerator;
                                     break;
                                 }
                                 default: {
-                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_GU"]), i7Data.kurzname);
+                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_GU']), i7Data.kurzname);
                                     break;
                                 }
                             }
                         }
                         else {
-                            generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_GU"]), i7Data.kurzname);
+                            generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_GU']), i7Data.kurzname);
                         }
                         generatingUnit.initialP = utils_2.isNumericI7(i7Data.p0) ? utils_2.convertToNumberI7(i7Data.p0) : undefined;
-                        generatingUnit.maxOperatingP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
-                        generatingUnit.minOperatingP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
+                        generatingUnit.maxOperatingP = maxP;
+                        generatingUnit.minOperatingP = minP;
                         generatingUnit.nominalP = utils_2.isNumericI7(cosphir) && utils_2.isNumericI7(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
                         const kr = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
                         const fn = 50;
@@ -1460,6 +2191,10 @@ class ConverterI7 {
                     smtcr.xQuadSubtrans = utils_2.isNumericI7(i7Data.xqu2s) ? utils_2.convertToNumberI7(i7Data.xqu2s) : undefined;
                     smtcr.synchronousMachine = synchronousMachine;
                     synchronousMachine.synchronousMachineDynamics = smtcr;
+                    if (mf) {
+                        cimModel.addMultiplierFactor(mf);
+                        synchronousMachine.multiplierFactorUUID = mf.getUUID();
+                    }
                     cimModel.addGeneratingUnit(generatingUnit);
                     cimModel.addSynchronousMachine(synchronousMachine);
                     cimModel.addSynchronousMachineTimeConstantReactance(smtcr);
@@ -1474,12 +2209,13 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.ASYNCHRONMOTOR, 0, 0, knotenSfIDs));
                 for (const i7Data of result) {
                     const assetType = this.asynchronmotorTypen.get(i7Data.nametyp);
-                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_AM"]), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
+                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_AM']), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
                         asynchronousMachine.multiplierFactorUUID = mf.getUUID();
                     }
+                    asynchronousMachine.asynchronousMachineType = AsynchronousMachineKind_1.AsynchronousMachineKind.motor;
                     asynchronousMachine.efficiency = i7Data.wirkungsgrad * 100;
                     asynchronousMachine.iaIrRatio = utils_2.isNumericI7(i7Data.ilr_ir) ? i7Data.ilr_ir : assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir;
                     asynchronousMachine.polePairNumber = utils_2.isNumericI7(i7Data.polpaarz) ? i7Data.polpaarz : assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz;
@@ -1487,12 +2223,13 @@ class ConverterI7 {
                     asynchronousMachine.ratedPowerFactor = utils_2.isNumericI7(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
                     asynchronousMachine.ratedS = utils_2.isNumericI7(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
                     asynchronousMachine.ratedU = utils_2.isNumericI7(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
-                    const s0 = i7Data.s0;
-                    const cosPhi = i7Data.cos_phi;
-                    const cosPhiR = utils_2.isNumericI7(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
-                    asynchronousMachine.setActivePower(i7Data.p0 * -1);
-                    const fag_ind = utils_2.isNumericI7(i7Data.flag_ind) ? i7Data.flag_ind : assetType === null || assetType === void 0 ? void 0 : assetType.flag_ind;
-                    asynchronousMachine.setReactivePower((fag_ind === 1 ? i7Data.q0_ind : i7Data.q0_kap) * -1);
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const p = powerData[0];
+                    const q = powerData[1];
+                    asynchronousMachine.setActivePower(p * -1);
+                    asynchronousMachine.setReactivePower(q * -1);
+                    asynchronousMachine.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    asynchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     asynchronousMachine.controlEnabled = false;
                     const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : true;
                     asynchronousMachine.normallyInService = inBetrieb;
@@ -1525,7 +2262,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KWBLOCK, knotenSfIDs));
                 for (const i7Data of result) {
-                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM"]), i7Data.kurzname);
+                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SM']), i7Data.kurzname);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
@@ -1620,7 +2357,7 @@ class ConverterI7 {
     convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
-                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI"]), i7Data.kurzname);
+                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_ENI']), i7Data.kurzname);
                 const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
                 const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
                 externalNetworkInjection.governorSCD = governorscd;
@@ -1644,18 +2381,20 @@ class ConverterI7 {
                 const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
                 const r_ext = utils_2.isNumericI7(i7Data.r_ext) ? utils_2.convertToNumberI7(i7Data.r_ext) : undefined;
                 const x_ext = utils_2.isNumericI7(i7Data.x_ext) ? utils_2.convertToNumberI7(i7Data.x_ext) : undefined;
-                const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_EI"]), i7Data.kurzname);
+                const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EI']), i7Data.kurzname);
                 equivalentInjection.normallyInService = inBetrieb;
                 if (flag_lfl && usoll && (r_ext || x_ext)) {
                     equivalentInjection.regulationCapability = true;
                     equivalentInjection.regulationStatus = true;
                     equivalentInjection.regulationTarget = usoll;
-                    equivalentInjection.r = r_ext;
-                    equivalentInjection.r0 = 0;
-                    equivalentInjection.r2 = 0;
-                    equivalentInjection.x = x_ext;
-                    equivalentInjection.x0 = 0;
-                    equivalentInjection.x2 = 0;
+                    equivalentInjection.rExt = r_ext;
+                    equivalentInjection.r = 1e9;
+                    equivalentInjection.r0 = 1e9;
+                    equivalentInjection.r2 = 1e9;
+                    equivalentInjection.xExt = x_ext;
+                    equivalentInjection.x = 1e9;
+                    equivalentInjection.x0 = 1e9;
+                    equivalentInjection.x2 = 1e9;
                 }
                 equivalentInjection.aggregate = true;
                 this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
@@ -1726,8 +2465,7 @@ class ConverterI7 {
     convertErsatzLaengszweige(frame, integral7, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) && integral7.ersatzZweigAnschlussKnotenIDs.length) {
-                integral_sql_1.I7Objects.ERSATZLAENGSZWEIGDIFF;
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) && integral7.ersatzZweigAnschlussKnotenIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, integral7.ersatzZweigAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
@@ -1738,7 +2476,8 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([i7Data.bezeichner, '_EB', `_${cimModel.equivalentBranches.size}`]), i7Data.kurzname, i7Schluessel);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(rdfid, util_create_1.createNotation([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
                     const ur1 = utils_2.getU(i7Data.ur1, defaultValuesConfig.DefaultVoltage);
                     const ur2 = utils_2.getU(i7Data.ur2, defaultValuesConfig.DefaultVoltage);
                     const baseVoltageUr1 = util_create_1.createBaseVoltageIfNotExists(cimModel, ur1, this.exportFramesBoundary);
@@ -1752,6 +2491,7 @@ class ConverterI7 {
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     cimModel.addEquivalentBranch(equivalentBranch);
+                    this.checkErsatzZweigID(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, equivalentBranch.mrid, integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG);
                 }
             }
@@ -1765,7 +2505,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, knotenSfIDs));
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_LSC"]), i7Data.kurzname);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_LSC']), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
@@ -1773,9 +2513,9 @@ class ConverterI7 {
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     const spannungsregelungLokal = utils_2.isBooleanI7(i7Data.flag_lf) ? utils_2.convertToBooleanI7(i7Data.flag_lf) : false;
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
-                    let regulatingControl;
+                    let regulatingControl = undefined;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Kompdrossel_${i7Data.id}`);
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), util_create_1.createNotation(['LSC']));
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
                         regulatingControl.targetDeadband = i7Data.uband;
@@ -1799,7 +2539,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, knotenSfIDs));
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_LSC"]), i7Data.kurzname);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_LSC']), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
@@ -1833,7 +2573,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STATCOM)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STATCOM, knotenSfIDs));
                 for (const i7Data of result) {
-                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SVC"]), i7Data.kurzname);
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SVC']), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     const regulatingControl = utils_2.createRegulatingControl(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
@@ -1873,7 +2613,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SVC)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SVC, knotenSfIDs));
                 for (const i7Data of result) {
-                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SVC"]), i7Data.kurzname);
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SVC']), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     const regulatingControl = utils_2.createRegulatingControl(`RC_SVC ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
@@ -1913,7 +2653,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, knotenSfIDs));
                 for (const i7Data of result) {
-                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCCU"]));
+                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCCU']));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (acConnectivityNode) {
                         const equipmentContainer = this.determineEquipmentContainer('Substation', cimModel, acConnectivityNode.connectivityNodeContainer);
@@ -1927,7 +2667,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const csConverter = new CsConverter_1.CsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CSC"]), i7Data.kurzname);
+                    const csConverter = new CsConverter_1.CsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CSC']), i7Data.kurzname);
                     csConverter.equipmentContainer = dcConverterUnit;
                     csConverter.baseS = i7Data.pr;
                     csConverter.ratedUdc = i7Data.ur;
@@ -1956,10 +2696,10 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCN"]));
+                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
                     dcConverterUnit.dCNodes.set(dcNode.getUUID(), dcNode);
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_ACDCC-DCT"]));
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_ACDCC-DCT']));
                     acDCConverterDCTerminal.dCConductingEquipment = csConverter;
                     csConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     acDCConverterDCTerminal.dcNode = dcNode;
@@ -1975,11 +2715,12 @@ class ConverterI7 {
         });
     }
     convertVsConverterDC(cimModel, integral7, knotenSfIDs) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, knotenSfIDs));
                 for (const i7Data of result) {
-                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCCU"]));
+                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCCU']));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (acConnectivityNode) {
                         const equipmentContainer = this.determineEquipmentContainer('Substation', cimModel, acConnectivityNode.connectivityNodeContainer);
@@ -1993,7 +2734,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const vsConverter = new VsConverter_1.VsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_VSC"]), i7Data.kurzname);
+                    const vsConverter = new VsConverter_1.VsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_VSC']), i7Data.kurzname);
                     vsConverter.equipmentContainer = dcConverterUnit;
                     vsConverter.baseS = i7Data.pr;
                     utils_2.isNumericI7(i7Data.udc) ? vsConverter.ratedUdc = i7Data.udc : vsConverter.ratedUdc = i7Data.ur;
@@ -2017,6 +2758,13 @@ class ConverterI7 {
                         vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
                         vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
                     }
+                    vsConverter.droop = 0;
+                    vsConverter.droopCompensation = 0;
+                    vsConverter.qShare = 0;
+                    vsConverter.targetQpcc = 0;
+                    vsConverter.targetUpcc = (_a = acConnectivityNode === null || acConnectivityNode === void 0 ? void 0 : acConnectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getBaseVoltageAsNumber();
+                    vsConverter.targetPpcc = vsConverter.baseS;
+                    vsConverter.targetUdc = vsConverter.ratedUdc;
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     vsConverter.normallyInService = inBetrieb;
                     if (acConnectivityNode) {
@@ -2025,9 +2773,9 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCN"]));
+                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_ACDCC-DCT"]));
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_ACDCC-DCT']));
                     acDCConverterDCTerminal.dCConductingEquipmentUUID = vsConverter.mrid;
                     acDCConverterDCTerminal.dcNode = dcNode;
                     vsConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
@@ -2047,7 +2795,8 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const energySource = new EnergySource_1.EnergySource(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ES"]), i7Data.kurzname);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const energySource = new EnergySource_1.EnergySource(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
                     this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
                     energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
                     const prio = i7Data.einspprio;
@@ -2069,7 +2818,8 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EI', `_${cimModel.equivalentInjections.size}`]), i7Data.kurzname);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
                     const prio = i7Data.einspprio;
                     const usoll = i7Data.usoll;
                     const powerData = utils_2.getActiveReactivePower(i7Data);
@@ -2089,31 +2839,49 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI"]), i7Data.kurzname);
+                    const cn = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_' + cimrdfid, '_ENI'], 32, true), i7Data.kurzname);
+                    const un = cn.getVoltageLevel().getBaseVoltageAsNumber();
+                    externalNetworkInjection.nameprimaertyp = i7Data.nameprimaertyp;
                     let mf = undefined;
                     mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
                         externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
                     }
-                    const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
-                    externalNetworkInjection.governorSCD = governorscd;
                     const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
                     externalNetworkInjection.maxP = maxP;
+                    const governorscd = utils_2.isNumericI7(i7Data.kr) && maxP ? utils_2.calculateSigma(50, externalNetworkInjection.maxP, utils_2.convertToNumberI7(i7Data.kr)) : undefined;
+                    externalNetworkInjection.governorSCD = governorscd;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
                     externalNetworkInjection.maxQ = maxQ;
                     const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
                     externalNetworkInjection.minP = minP;
                     const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
                     externalNetworkInjection.minQ = minQ;
-                    const maxR0X0Ratio = undefined;
+                    const r0X0 = utils_2.isNumericI7(i7Data.x0_r0) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0) : undefined;
+                    const r1X1 = utils_2.isNumericI7(i7Data.x1_r1) ? 1 / utils_2.convertToNumberI7(i7Data.x1_r1) : undefined;
+                    const z0Z1 = utils_2.isNumericI7(i7Data.z0_z1) ? utils_2.convertToNumberI7(i7Data.z0_z1) : undefined;
+                    const maxR0X0Ratio = utils_2.isNumericI7(i7Data.x0_r0_max) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0_max) : r0X0;
                     externalNetworkInjection.maxR0ToX0Ratio = maxR0X0Ratio;
-                    const maxR1X1Ratio = undefined;
+                    const maxR1X1Ratio = utils_2.isNumericI7(i7Data.x1_r1_max) ? 1 / utils_2.convertToNumberI7(i7Data.x1_r1_max) : r1X1;
                     externalNetworkInjection.maxR1ToX1Ratio = maxR1X1Ratio;
-                    const maxZ0Z1Ratio = undefined;
+                    const maxZ0Z1Ratio = utils_2.isNumericI7(i7Data.z0_z1_max) ? utils_2.convertToNumberI7(i7Data.z0_z1_max) : z0Z1;
                     externalNetworkInjection.maxZ0ToZ1Ratio = maxZ0Z1Ratio;
-                    const minIkSecond = undefined;
+                    const minR0X0Ratio = utils_2.isNumericI7(i7Data.x0_r0_min) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0_min) : r0X0;
+                    externalNetworkInjection.minR0ToX0Ratio = minR0X0Ratio;
+                    const minR1X1Ratio = utils_2.isNumericI7(i7Data.x1_r1_min) ? utils_2.convertToNumberI7(i7Data.x1_r1_min) : r1X1;
+                    externalNetworkInjection.minR1ToX1Ratio = minR1X1Ratio;
+                    const minZ0Z1Ratio = utils_2.isNumericI7(i7Data.z0_z1_min) ? utils_2.convertToNumberI7(i7Data.z0_z1_min) : z0Z1;
+                    externalNetworkInjection.minZ0ToZ1Ratio = minZ0Z1Ratio;
+                    const skAkt = utils_2.isNumericI7(i7Data.sk_akt) ? utils_2.convertToNumberI7(i7Data.sk_akt) : undefined;
+                    const skMin = utils_2.isNumericI7(i7Data.sk_min) ? utils_2.convertToNumberI7(i7Data.sk_min) : skAkt;
+                    const skMax = utils_2.isNumericI7(i7Data.sk_max) ? utils_2.convertToNumberI7(i7Data.sk_max) : skAkt;
+                    const minIkSecond = utils_2.isNumericI7(i7Data.sk_min) ? utils_2.convertToNumberI7(skMin) / Math.sqrt(3) * skMin : undefined;
                     externalNetworkInjection.minInitialSymShCCurrent = minIkSecond;
+                    const maxIkSecond = utils_2.isNumericI7(i7Data.sk_max) ? utils_2.convertToNumberI7(skMax) / Math.sqrt(3) * skMax : undefined;
+                    externalNetworkInjection.maxInitialSymShCCurrent = maxIkSecond;
                     const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
                     const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : false;
                     let regulatingControl = undefined;
@@ -2136,14 +2904,22 @@ class ConverterI7 {
                         }
                     }
                     this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
-                    const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
-                    externalNetworkInjection.referencePriority = prio;
+                    let prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
                     if ((regulatingControl === null || regulatingControl === void 0 ? void 0 : regulatingControl.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
-                        externalNetworkInjection.referencePriority = prio;
+                        if (prio && prio > 0) {
+                            externalNetworkInjection.referencePriority = prio + 1;
+                        }
+                        else {
+                            prio = undefined;
+                        }
                     }
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
-                    externalNetworkInjection.p = powerData[0];
-                    externalNetworkInjection.q = powerData[1];
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const p = powerData[0];
+                    const q = powerData[1];
+                    externalNetworkInjection.setActivePower(p * -1);
+                    externalNetworkInjection.setReactivePower(q * -1);
+                    externalNetworkInjection.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    externalNetworkInjection.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
                 }
@@ -2154,14 +2930,16 @@ class ConverterI7 {
         });
     }
     setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, regulatingControl, generatingUnit) {
-        var _a, _b;
+        var _a, _b, _c;
         const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
         condEquip.normallyInService = inBetrieb;
         const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
         if (connectivityNode) {
             const terminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
-            if (regulatingControl)
+            if (regulatingControl) {
+                regulatingControl.name = util_create_1.createNotation([regulatingControl.name, '_', (_a = connectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
                 regulatingControl.terminal = terminal;
+            }
             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, connectivityNode.connectivityNodeContainer);
             if (equipmentContainer) {
                 condEquip.equipmentContainer = equipmentContainer;
@@ -2190,11 +2968,11 @@ class ConverterI7 {
                 }
             }
             else {
-                this.logger.error(`${(_a = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _a === void 0 ? void 0 : _a.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                this.logger.error(`${(_b = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _b === void 0 ? void 0 : _b.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
             }
         }
         else {
-            this.logger.error(`${(_b = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _b === void 0 ? void 0 : _b.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
+            this.logger.error(`${(_c = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _c === void 0 ? void 0 : _c.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
         }
     }
     convertQuerkupplungen(cimModel, integral7, schaltanlagenAbschnittIDs) {
@@ -2202,7 +2980,8 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.QUERKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), 'Querkupplung');
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), 'Querkupplung');
                     bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
@@ -2232,7 +3011,8 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), i7Data.kurzname, 'Laengskupplung');
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
@@ -2264,7 +3044,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_STARR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_STARR, containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_BR"]), 'Breaker', 'starre Verbindung');
+                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_BR']), 'Breaker', 'starre Verbindung');
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -2280,7 +3060,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNERFI_3P)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNERFI_3P, containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_D"]));
+                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_D']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNERFI_3P);
@@ -2296,7 +3076,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNER_3P)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNER_3P, containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_D"]));
+                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_D']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNER_3P);
@@ -2312,7 +3092,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_BR"]));
+                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_BR']));
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -2360,12 +3140,13 @@ class ConverterI7 {
             }
         });
     }
-    convertLaengsdrosseln(cimModel, knotenSfIDs, defaultValuesConfig) {
+    convertLaengsdrosseln(cimModel, integral7, defaultValuesConfig) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.LAENGSDROSSEL, 0, 0, []));
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) && integral7.lDrosselAnschlussKnotenIDs.length) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSDROSSEL, integral7.lDrosselAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC"]), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SC']), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
                     const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
@@ -2399,7 +3180,10 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
                     }
-                    const vlObject = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(startTerminal.connectivityNode.getConnectivityNodeContainerUUID()));
+                    if (!startTerminal.connectivityNode && terminal.connectivityNodeUUID) {
+                        startTerminal.connectivityNode = cimModel.getConnectivityNode(terminal.connectivityNodeUUID);
+                    }
+                    const vlObject = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject((_a = startTerminal.connectivityNode) === null || _a === void 0 ? void 0 : _a.getConnectivityNodeContainerUUID()));
                     if (vlObject) {
                         seriesCompensator.equipmentContainer = vlObject;
                         seriesCompensator.baseVoltage = baseVoltage;
@@ -2418,6 +3202,69 @@ class ConverterI7 {
             }
         });
     }
+    convertLaengskondensatoren(cimModel, integral7, defaultValuesConfig) {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs.length > 0) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKONDENSATOR, integral7.lKondensatorAnschlussKnotenIDs));
+                for (const i7Data of result) {
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SC']), i7Data.kurzname);
+                    const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
+                    let startTerminal;
+                    if (start) {
+                        startTerminal = this.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, true);
+                    }
+                    else {
+                        this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
+                    }
+                    const target = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
+                    let targetTerminal;
+                    if (target) {
+                        targetTerminal = this.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, true);
+                    }
+                    else {
+                        this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
+                    }
+                    const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
+                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, ur, this.exportFramesBoundary);
+                    const i = utils_2.isNumericI7(i7Data.ir) ? utils_2.convertToNumberI7(i7Data.ir) : undefined;
+                    const ukr = utils_2.isNumericI7(i7Data.ukr) ? utils_2.convertToNumberI7(i7Data.ukr) : undefined;
+                    if (i > 0 && ukr > 0) {
+                        const voltage = baseVoltage.nominalVoltage.value * 1000;
+                        const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * i * Math.sqrt(3));
+                        seriesCompensator.x = z;
+                    }
+                    seriesCompensator.varistorRatedCurrent = i;
+                    const terminal = startTerminal;
+                    if (terminal) {
+                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, i);
+                    }
+                    else {
+                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
+                    }
+                    const substationUUID = this.integralID2UUID.get(i7Data.standort);
+                    const voltageLevel = this.getVoltageLevelByVoltage((_a = (cimModel.getSubstation(substationUUID))) === null || _a === void 0 ? void 0 : _a.voltageLevels, ur);
+                    if (!voltageLevel) {
+                        this.logger.debug(`Längskondensator ${seriesCompensator === null || seriesCompensator === void 0 ? void 0 : seriesCompensator.mrid} hat kein EquipmentContainer`);
+                    }
+                    if (voltageLevel) {
+                        seriesCompensator.equipmentContainer = voltageLevel;
+                        seriesCompensator.baseVoltage = voltageLevel.baseVoltage;
+                    }
+                    else {
+                        this.logger.debug(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
+                    }
+                    const psrType = utils_1.createIfNotExitsPSRType(cimModel, 'Längskondensator');
+                    seriesCompensator.psrType = psrType;
+                    cimModel.addSeriesCompensator(seriesCompensator);
+                    this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertBetriebsmitteltypenKdrossel() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KDROSSEL)) {
@@ -2440,9 +3287,10 @@ class ConverterI7 {
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
-                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_CN"]), `StpSchiene_${i7DataSchiene.id}`);
-                            const junction = new Junction_1.Junction(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_J"]), `StpSchiene/${i7DataSchiene.id}`);
+                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), '_CN']));
+                            const junction = new Junction_1.Junction(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), '_J']));
                             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
+                            connectivityNode.setConnectivityNodeContainer(equipmentContainer);
                             if (equipmentContainer) {
                                 equipmentContainer.addEquipment(junction);
                                 junction.equipmentContainer = equipmentContainer;
@@ -2484,14 +3332,14 @@ class ConverterI7 {
                                 const junctionUUID = integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get((i7Data.anschluss));
                                 let conductingEquip;
                                 if (imax && imin) {
-                                    const petersenCoil = new PetersenCoil_1.PetersenCoil(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PC"]), i7Data.kurzname);
+                                    const petersenCoil = new PetersenCoil_1.PetersenCoil(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_PC']), i7Data.kurzname);
                                     integral7.sternPunktImpModel.petersenCoils.set(petersenCoil.mrid, petersenCoil);
                                     integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, petersenCoil);
                                     this.addIdMapping(i7Data.id, petersenCoil.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
                                     conductingEquip = petersenCoil;
                                 }
                                 else {
-                                    const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_GI"]), i7Data.kurzname);
+                                    const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_GI']), i7Data.kurzname);
                                     groundingImpedance.r = utils_2.isNumericI7(i7Data.rne) ? i7Data.rne : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? kdType === null || kdType === void 0 ? void 0 : kdType.rne : undefined);
                                     groundingImpedance.x = utils_2.isNumericI7(i7Data.xne) ? i7Data.xne : (utils_2.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);
@@ -2559,7 +3407,8 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), i7Data.kurzname, 'Laengskupplung');
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
@@ -2645,9 +3494,15 @@ class ConverterI7 {
                 }
                 const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, leitungIDs));
                 for (const i7Data of result) {
+                    if (i7Data.id === 943) {
+                        let stop = true;
+                    }
                     const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
-                    if (!(stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length))
+                    if (!((stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length) > 0))
                         continue;
+                    stromkreisabschnitte.sort(function (stka, stkb) {
+                        return stka['pos'] - stkb['pos'];
+                    });
                     const leitung = new Leitung_1.LeitungImpl(i7Data);
                     integral7.integralLeitungen.set(i7Data.id, leitung);
                     let i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
@@ -2663,7 +3518,8 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         '-' +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const line = new AMPRIONLine_1.AMPRIONLine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([name, "_L"]), i7Data.stkabname, i7Schluessel);
+                    const uuidString = utils_1.getUUID(i7Data.guid);
+                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, util_create_1.createNotation([name, uuidString.substring(0, 8), '_L'], 32, true), i7Data.stkabname, i7Schluessel);
                     line.ukz = i7Data.ukz;
                     let acLineSegments = [];
                     for (const stk of stromkreisabschnitte) {
@@ -2673,7 +3529,11 @@ class ConverterI7 {
                             utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                             '-' +
                             utils_2.ueberpruefeZeichenkette(stk.bezeichner);
-                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137), util_create_1.createNotation([name, stk.pos.toString(), "_ACLS"]), i7Data.stkabname, i7Schluessel);
+                        if (utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137).toLowerCase() === '8387376e-86bf-4da0-91f2-b19a3d490715') {
+                            let stop = true;
+                        }
+                        const uuidACLineString = utils_1.getUUID(i7Data.guid);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuidACLineString, util_create_1.createNotation([name, '_' + stk.pos.toString(), uuidACLineString, '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
                         let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(stk.multfaktor));
                         if (mf) {
                             cimModel.addMultiplierFactor(mf);
@@ -2686,12 +3546,11 @@ class ConverterI7 {
                     }
                     const acLineSegmentStart = acLineSegments[0];
                     const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
-                    let equivalentInjection = undefined;
                     if (startTerminal) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(startTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
-                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                         if (!acLineSegmentStart.baseVoltage) {
                             if (startTerminal.getConnectedNode())
@@ -2704,19 +3563,29 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
+                    if (acLineSegments[0].getUUID() === 'c6b755ed-b4fa-4649-8aa5-62ebcbd3b559') {
+                        let stop = true;
+                    }
+                    else if (acLineSegments[0].getUUID() === 'e1a65e81-1cec-4f1a-ab87-9c7b667ad64f') {
+                        let stop = true;
+                    }
+                    this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentStart, stromkreisabschnitte[0], defaultValuesConfig);
                     cimModel.addACLineSegment(acLineSegmentStart);
-                    this.setACLineSegmentProperties(this.cimModelDefault, acLineSegments[0], stromkreisabschnitte[0], defaultValuesConfig);
                     const anzahl = acLineSegments.length;
                     let tmp_terminal = undefined;
                     for (let i = 0; i < anzahl - 1; i++) {
-                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([name, "_CN"]));
                         const acLineSegment1 = acLineSegments[i];
+                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
+                        cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
                         tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
                             tmp_terminal = undefined;
                         }
-                        this.setACLineSegmentProperties(this.cimModelDefault, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
+                        if (acLineSegments[i].getUUID() === 'c6b755ed-b4fa-4649-8aa5-62ebcbd3b559') {
+                            let stop = true;
+                        }
+                        this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
                         const acLineSegment2 = acLineSegments[i + 1];
                         tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true);
                         cimModel.addACLineSegment(acLineSegment1);
@@ -2732,7 +3601,7 @@ class ConverterI7 {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(targetTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && 'boundaryPoint' in tmp_cn && tmp_cn.boundaryPoint) {
-                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                         if (!acLineSegmentZiel.baseVoltage) {
                             acLineSegmentZiel.baseVoltage = (_b = targetTerminal.getConnectivityNode()) === null || _b === void 0 ? void 0 : _b.getBaseVoltage();
@@ -2744,6 +3613,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentZiel.mrid} besitzt keinen Zielknoten.`);
                     }
+                    this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentZiel, stromkreisabschnitte[stromkreisabschnitte.length - 1], defaultValuesConfig);
                     cimModel.addACLineSegment(acLineSegmentZiel);
                     const stkBaseVoltage = acLineSegments.find(elem => elem.baseVoltage !== undefined);
                     if (!stkBaseVoltage) {
@@ -2788,84 +3658,29 @@ class ConverterI7 {
             }
         });
     }
-    convertLaengskondensatoren(cimModel, integral7, defaultValuesConfig) {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKONDENSATOR, integral7.lKondensatorAnschlussKnotenIDs));
-                for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC"]), i7Data.kurzname);
-                    const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
-                    let startTerminal;
-                    if (start) {
-                        startTerminal = this.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, true);
-                    }
-                    else {
-                        this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
-                    }
-                    const target = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
-                    let targetTerminal;
-                    if (target) {
-                        targetTerminal = this.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, true);
-                    }
-                    else {
-                        this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
-                    }
-                    const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, ur, this.exportFramesBoundary);
-                    const i = utils_2.isNumericI7(i7Data.ir) ? utils_2.convertToNumberI7(i7Data.ir) : undefined;
-                    const ukr = utils_2.isNumericI7(i7Data.ukr) ? utils_2.convertToNumberI7(i7Data.ukr) : undefined;
-                    if (i > 0 && ukr > 0) {
-                        const voltage = baseVoltage.nominalVoltage.value * 1000;
-                        const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * i * Math.sqrt(3));
-                        seriesCompensator.x = z;
-                    }
-                    seriesCompensator.varistorRatedCurrent = i;
-                    const terminal = startTerminal;
-                    if (terminal) {
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, i);
-                    }
-                    else {
-                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
-                    }
-                    const substationUUID = this.integralID2UUID.get(i7Data.standort);
-                    const voltageLevel = this.getVoltageLevelByVoltage((_a = (cimModel.getSubstation(substationUUID))) === null || _a === void 0 ? void 0 : _a.voltageLevels, ur);
-                    if (!voltageLevel) {
-                        this.logger.debug(`Längskondensator ${seriesCompensator === null || seriesCompensator === void 0 ? void 0 : seriesCompensator.mrid} hat kein EquipmentContainer`);
-                    }
-                    if (voltageLevel) {
-                        seriesCompensator.equipmentContainer = voltageLevel;
-                        seriesCompensator.baseVoltage = voltageLevel.baseVoltage;
-                    }
-                    else {
-                        this.logger.debug(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
-                    }
-                    const psrType = utils_1.createIfNotExitsPSRType(cimModel, 'Längskondensator');
-                    seriesCompensator.psrType = psrType;
-                    cimModel.addSeriesCompensator(seriesCompensator);
-                    this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR);
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR} ist nicht vorhanden.`);
-            }
-        });
-    }
     convertDCLines(cimModel, integral7, defaultValuesConfig) {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length) {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data.guid_dcline), util_create_1.createNotation([utils_2.getName(i7Data), "_DCL"]));
+                    console.log(utils_1.getUUID(i7Data.guid_dcline));
+                    if (utils_1.getUUID(i7Data.guid_dcline) === '6a5b7e1e-f8be-4165-9752-2e2359d9b4f8') {
+                        let stop = true;
+                    }
+                    integral7.integralHgueLeitungen.set(i7Data.id, i7Data);
+                    const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data.guid_dcline), util_create_1.createNotation([utils_2.getName(i7Data), '_DCL']));
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.getUUID(i7Data.guidp), util_create_1.createNotation([utils_2.getName(i7Data), "_DCLS"]), i7Data.kurzname, i7Schluessel);
-                    dcLineSegment.resistance = i7Data.rdc;
+                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.getUUID(i7Data.guidp), util_create_1.createNotation([utils_2.getName(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
+                    dcLineSegment.resistance = i7Data.rdc / 2;
                     dcLineSegment.equipmentContainer = dcLine;
                     const bipol = utils_2.convertToBooleanI7(i7Data.bipol);
                     const acDCConverterStart = cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt));
                     const acDCConverterTarget = cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt));
+                    if (acDCConverterStart === undefined || acDCConverterTarget === undefined) {
+                        continue;
+                    }
                     const converterUnitStart = (_a = acDCConverterStart) === null || _a === void 0 ? void 0 : _a.equipmentContainer;
                     const converterUnitTarget = (_b = acDCConverterTarget) === null || _b === void 0 ? void 0 : _b.equipmentContainer;
                     if (converterUnitStart && converterUnitTarget) {
@@ -2886,7 +3701,7 @@ class ConverterI7 {
                     }
                     const startDCNode = acDCConverterStart ? getDCNodeFromConverter(acDCConverterStart) : undefined;
                     if (startDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT"]));
+                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCT']));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = startDCNode;
@@ -2898,7 +3713,7 @@ class ConverterI7 {
                     }
                     const targetDCNode = acDCConverterTarget ? getDCNodeFromConverter(acDCConverterTarget) : undefined;
                     if (targetDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT"]));
+                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCT']));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = targetDCNode;
@@ -3018,11 +3833,11 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, []));
                 for (const i7Data of result) {
                     const multFaktor = new INTEGRALMultiplierFactor_1.INTEGRALMultiplierFactor(utils_1.getUUID(undefined), utils_2.getName(i7Data), i7Data.kurzname, i7Data.kommentar);
-                    multFaktor.p = utils_2.isNumericI7(i7Data.p) ? utils_2.convertToNumberI7(i7Data.p) : 1;
-                    multFaktor.qInd = utils_2.isNumericI7(i7Data.q_ind) ? utils_2.convertToNumberI7(i7Data.q_ind) : 1;
-                    multFaktor.qKap = utils_2.isNumericI7(i7Data.q_kap) ? utils_2.convertToNumberI7(i7Data.q_kap) : 1;
-                    multFaktor.cosPhiInd = utils_2.isNumericI7(i7Data.cos_phi_ind) ? utils_2.convertToNumberI7(i7Data.cos_phi_ind) : 1;
-                    multFaktor.cosPhiKap = utils_2.isNumericI7(i7Data.cos_phi_kap) ? utils_2.convertToNumberI7(i7Data.cos_phi_kap) : 1;
+                    multFaktor.p = utils_2.isNumericI7(i7Data.p) ? utils_2.convertToNumberI7(i7Data.p) : undefined;
+                    multFaktor.qInd = utils_2.isNumericI7(i7Data.q_ind) ? utils_2.convertToNumberI7(i7Data.q_ind) : undefined;
+                    multFaktor.qKap = utils_2.isNumericI7(i7Data.q_kap) ? utils_2.convertToNumberI7(i7Data.q_kap) : undefined;
+                    multFaktor.cosPhiInd = utils_2.isNumericI7(i7Data.cos_phi_ind) ? utils_2.convertToNumberI7(i7Data.cos_phi_ind) : undefined;
+                    multFaktor.cosPhiKap = utils_2.isNumericI7(i7Data.cos_phi_kap) ? utils_2.convertToNumberI7(i7Data.cos_phi_kap) : undefined;
                     this.cimModelDefault.addMultiplierFactor(multFaktor);
                     this.addIdMapping(i7Data.id, multFaktor.mrid, integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR);
                 }
@@ -3050,7 +3865,8 @@ class ConverterI7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT"]), i7Data.kurzname, i7Data.kommentar);
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -3093,7 +3909,7 @@ class ConverterI7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2${powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     const sr2 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
                     const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
@@ -3118,7 +3934,7 @@ class ConverterI7 {
                     powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
                     powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
-                    const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2];
+                    const powerTransformerEnds = [powerTransformer.powerTransformerEnds[0], powerTransformer.powerTransformerEnds[1]];
                     const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
@@ -3171,7 +3987,8 @@ class ConverterI7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT"]), i7Data.kurzname, i7Data.kommentar);
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -3207,7 +4024,7 @@ class ConverterI7 {
                     const impedanzW1 = utils_trafo3w_1.calculateImpedanzenTrafo3W(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
                     const impedanzW2 = utils_trafo3w_1.calculateImpedanzenTrafo3W(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
                     const impedanzW3 = utils_trafo3w_1.calculateImpedanzenTrafo3W(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1 ${powerTransformer.name}`);
+                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     const wicklung1 = trafoWicklungen.get(i7Data.trafowicklung3w1);
                     const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, PhaseCode_1.PhaseCode.ABC);
@@ -3234,7 +4051,7 @@ class ConverterI7 {
                     const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal2)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     powerTransformerEnd2.r = impedanzW2.r;
                     powerTransformerEnd2.x = impedanzW2.x;
@@ -3258,7 +4075,7 @@ class ConverterI7 {
                     const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal3)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer.name}`);
+                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd3.endNumber = 3;
                     powerTransformerEnd3.r = impedanzW3.r;
                     powerTransformerEnd3.x = impedanzW3.x;
@@ -3296,6 +4113,9 @@ class ConverterI7 {
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd3);
                     this.addIdMapping(i7Data.id, powerTransformer.mrid, integral_sql_1.Integral7TableNames.TRAFO3W);
+                    this.addIdMapping(i7Data.trafowicklung3w1, powerTransformerEnd1.mrid, undefined);
+                    this.addIdMapping(i7Data.trafowicklung3w2, powerTransformerEnd2.mrid, undefined);
+                    this.addIdMapping(i7Data.trafowicklung3w3, powerTransformerEnd3.mrid, undefined);
                 }
             }
             else {
@@ -3337,7 +4157,7 @@ class ConverterI7 {
             const cimModel = frame.cimModel;
             const substations = Array.from(cimModel.substations.values());
             for (const substation of substations) {
-                const line = new Line_1.Line(substation.mrid, substation.name + "_BD-L", substation.shortName, substation.description);
+                const line = new Line_1.Line(substation.mrid, substation.name + '_BD-L', substation.shortName, substation.description);
                 const subregion = substation.subGeographicalRegion;
                 line.subGeographicalRegion = subregion;
                 subregion.addLine(line);
@@ -3383,7 +4203,7 @@ class ConverterI7 {
                     line.addConnectivityNode(connectivityNode);
                     const junction = new Junction_1.Junction(utils_1.generateUUID(), `${line.name}_BD-J`, `Junction`, 'Junction for Geo');
                     junction.equipmentContainer = line;
-                    let terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([line.name, '_BD-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
+                    let terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([line.getUUID().substring(0, 8), '_BD-JCT-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
                     junction.terminals.set(terminal.getUUID(), terminal);
                     terminal.conductingEquipment = junction;
                     line.addEquipment(junction);
@@ -3420,6 +4240,9 @@ class ConverterI7 {
         });
     }
     sortTransformerEnd(powerTransformer, sortProperty, order) {
+        if (powerTransformer.getUUID() === '5b0e4820d43247188ded6b28db72fc95') {
+            let stop = true;
+        }
         let winding_guids = new Array(powerTransformer.powerTransformerEnds.length);
         let winding_guids_fixed = new Array(powerTransformer.powerTransformerEnds.length);
         for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
@@ -3435,19 +4258,17 @@ class ConverterI7 {
         const winding1_guid = winding_guids[0];
         const winding2 = powerTransformer.powerTransformerEnds[0];
         if (!(winding1_guid === winding2.getUUID())) {
-            const winding1 = powerTransformer.powerTransformerEnds.find(e => e.mrid === winding1_guid[0]);
-            if (winding1) {
-                let val = winding2.phaseAngleClock;
-                winding2.phaseAngleClock = 0;
-                winding1.phaseAngleClock = 12 - val;
-            }
-            else {
-                const isNull = true;
-            }
+            powerTransformer.powerTransformerEnds[0].endNumber = 1;
+            powerTransformer.powerTransformerEnds[1].endNumber = 2;
+            powerTransformer.powerTransformerEnds[1].phaseAngleClock = 12 - powerTransformer.powerTransformerEnds[0].phaseAngleClock;
+            powerTransformer.powerTransformerEnds[0].phaseAngleClock = 0;
         }
     }
-    setACLineSegmentProperties(defaultModel, acLineSegment, data, defaultValuesConfig) {
-        if (utils_2.isNumericI7(data.laenge) && data.laenge <= 0) {
+    setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, defaultValuesConfig) {
+        if (acLineSegment.getUUID() === 'e2505f0f-c764-44da-b88b-d40e048193c9') {
+            let stop = true;
+        }
+        if ((utils_2.isNumericI7(data.laenge) && data.laenge <= 0) || (utils_2.isBooleanI7(data.flag_impedanzlos) && utils_2.convertToBooleanI7(data.flag_impedanzlos))) {
             data.flag_impedanzlos = 1;
         }
         if (utils_2.isNumericI7(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
@@ -3522,12 +4343,12 @@ class ConverterI7 {
         }
         for (const terminal of acLineSegment.terminals.values()) {
             if (utils_2.isNumericI7(data.ir) && data.ir > 0) {
-                this.setConductingEquipmentCurrentLimit(defaultModel, acLineSegment.name, terminal, data.ir);
+                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, data.ir);
             }
             else if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
-                this.setConductingEquipmentCurrentLimit(defaultModel, acLineSegment.name, terminal, assetType.ratedCurrent);
+                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
             }
-            const psrType = utils_1.createIfNotExitsPSRType(defaultModel, data.typ);
+            const psrType = utils_1.createIfNotExitsPSRType(cimModel, data.typ);
             acLineSegment.psrTypeUUID = psrType.mrid;
         }
     }
@@ -3574,10 +4395,15 @@ class ConverterI7 {
         return operationalLimitType;
     }
     createConnection(cimModel, conductingEquipment, object, phase, connected) {
+        if (conductingEquipment.getUUID() === '66d3c196-8927-478a-a6bf-248ea34cdeb3') {
+            let stop = true;
+        }
+        let isNameSet = false;
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
             const cn = object;
-            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([cn.name, '_T']));
+            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_T']));
+            isNameSet = true;
             terminal.setConnectivityNode(cn);
             cn.addTerminal(terminal);
             cimModel.addTerminal(terminal);
@@ -3590,7 +4416,9 @@ class ConverterI7 {
             terminal.conductingEquipment = conductingEquipment;
             conductingEquipment.addTerminal(terminal);
             terminal.connected = connected;
-            terminal.name = util_create_1.createNotation([conductingEquipment.name, terminal.name], 32, true);
+            if (!isNameSet) {
+                terminal.name = util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
+            }
         }
         return terminal;
     }
@@ -3610,7 +4438,7 @@ class ConverterI7 {
                 const object = cimModelBD.getObject(anschlussUUID);
                 if (object instanceof ConnectivityNode_1.ConnectivityNode) {
                     cn = object;
-                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([cn.name, '_T']));
+                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
                     terminal.connectivityNodeUUID = cn.mrid;
                     terminal.phases = phase;
                     terminal.connected = true;
@@ -3627,6 +4455,7 @@ class ConverterI7 {
                         terminal.setConnectivityNodeUUID(cn.getUUID());
                         terminal.setConnectivityNode(undefined);
                     }
+                    terminal.name = util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
                     cimModelBD.terminals.delete(terminal.mrid);
                     cimModel.addTerminal(terminal);
                 }
@@ -3679,7 +4508,7 @@ class ConverterI7 {
                 equivalentInjection.baseVoltage = cn.getBaseVoltage();
                 equivalentInjection.normallyInService = false;
                 tmp_terminal.setConductingEquipment(equivalentInjection);
-                tmp_terminal.name = util_create_1.createNotation([cn.name.substring(0, 8), '_', equivalentInjection.name, '_BD-T'], 32, true);
+                tmp_terminal.name = util_create_1.createNotation([frame.tsoName, '_BD-EI-T'], 32, true);
                 cn.addTerminal(tmp_terminal);
                 frame.cimModel.addEquivalentInjection(equivalentInjection);
                 if (tmp_terminal.getConductingEquipmentUUID() !== undefined) {
@@ -3741,45 +4570,60 @@ class ConverterI7 {
                 let tempKnotenId = i7Data.spgreg_anschluss === 0 ? i7Data.aknoten :
                     (i7Data.spgreg_anschluss === 1 ? i7Data.eknoten : undefined);
                 if (tempKnotenId !== undefined) {
-                    let queryResult = yield this.mysqlController.execQuery(`SELECT id FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SF]} WHERE id = ${tempKnotenId};`);
+                    let queryResult = yield this.mysqlController.execQuery(`SELECT id
+                                                                FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SF]}
+                                                                WHERE id = ${tempKnotenId};`);
                     if (queryResult.length === 1) {
                         const tabName_NetzSSAB = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SAMMELSCHIENE];
                         const tabName_NetzSchaltfeld = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SCHALTFELD];
                         const tabName_NetzKnotenSf = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SF];
-                        const sqlStatement = `SELECT ${tabName_NetzSSAB}.id, ${tabName_NetzSSAB}.umin, ${tabName_NetzSSAB}.umax, ${tabName_NetzSSAB}.usoll
-                                          FROM  ${tabName_NetzSSAB}
-                                          LEFT JOIN ${tabName_NetzSchaltfeld} ON ${tabName_NetzSSAB}.saabschnitt = ${tabName_NetzSchaltfeld}.saabschnitt
-                                          LEFT JOIN ${tabName_NetzKnotenSf} ON  ${tabName_NetzKnotenSf}.schaltfeld = ${tabName_NetzSchaltfeld}.id
-                                          WHERE ${tabName_NetzKnotenSf}.id = ${tempKnotenId}`;
+                        const sqlStatement = `SELECT ${tabName_NetzSSAB}.id,
+                                       ${tabName_NetzSSAB}.umin,
+                                       ${tabName_NetzSSAB}.umax,
+                                       ${tabName_NetzSSAB}.usoll
+                                FROM ${tabName_NetzSSAB}
+                                         LEFT JOIN ${tabName_NetzSchaltfeld}
+                                                   ON ${tabName_NetzSSAB}.saabschnitt = ${tabName_NetzSchaltfeld}.saabschnitt
+                                         LEFT JOIN ${tabName_NetzKnotenSf}
+                                                   ON ${tabName_NetzKnotenSf}.schaltfeld = ${tabName_NetzSchaltfeld}.id
+                                WHERE ${tabName_NetzKnotenSf}.id = ${tempKnotenId}`;
                         minMaxSollResult = yield this.mysqlController.execQuery(sqlStatement);
                     }
                     else {
-                        queryResult = yield this.mysqlController.execQuery(`SELECT id FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_ZW]} WHERE id = ${tempKnotenId};`);
+                        queryResult = yield this.mysqlController.execQuery(`SELECT id
+                                                              FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_ZW]}
+                                                              WHERE id = ${tempKnotenId};`);
                         if (queryResult.length === 1) {
                             const tabName_NetzSo = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO];
                             const tabName_NetzSchlaufe = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SCHLAUFE];
                             const tabName_NetzKnotenZw = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_ZW];
-                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT ${tabName_NetzSo}.id, ${tabName_NetzSo}.umin, ${tabName_NetzSo}.umax, ${tabName_NetzSo}.usoll 
-                                       FROM ${tabName_NetzKnotenZw} 
-                                       LEFT JOIN ${tabName_NetzSchlaufe} ON 
-                                             ${tabName_NetzSchlaufe}.id = ${tabName_NetzKnotenZw}.schlaufe
-                                       LEFT JOIN ${tabName_NetzSo} ON 
-                                             ${tabName_NetzSchlaufe}.eknoten = ${tabName_NetzSo}.id 
-                                       WHERE ${tabName_NetzKnotenZw}.id = ${tempKnotenId};`);
+                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT ${tabName_NetzSo}.id, ${tabName_NetzSo}.umin, ${tabName_NetzSo}.umax, ${tabName_NetzSo}.usoll
+               FROM ${tabName_NetzKnotenZw}
+                        LEFT JOIN ${tabName_NetzSchlaufe} ON
+                   ${tabName_NetzSchlaufe}.id = ${tabName_NetzKnotenZw}.schlaufe
+                        LEFT JOIN ${tabName_NetzSo} ON
+                   ${tabName_NetzSchlaufe}.eknoten = ${tabName_NetzSo}.id
+               WHERE ${tabName_NetzKnotenZw}.id = ${tempKnotenId};`);
                         }
                         else {
-                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT id, umin, umax, usoll FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO]} where id = ${tempKnotenId};`);
+                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT id, umin, umax, usoll
+                                                                     FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO]}
+                                                                     where id = ${tempKnotenId};`);
                         }
                     }
                 }
                 else if (spgKnotenId !== undefined) {
                     const tabName_NetzSo = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO];
                     const tabName_NetzSSAB = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SAMMELSCHIENE];
-                    const query = ` SELECT Voltage.id, Voltage.umin,  Voltage.umax,  Voltage.usoll
-                                FROM (
-                                SELECT id, umin, umax, usoll FROM ${tabName_NetzSo} WHERE ${tabName_NetzSo}.id = ${spgKnotenId}
-                                UNION
-                                SELECT id, umin, umax, usoll FROM ${tabName_NetzSSAB} WHERE ${tabName_NetzSSAB}.id = ${spgKnotenId}) as Voltage`;
+                    const query = ` SELECT Voltage.id, Voltage.umin, Voltage.umax, Voltage.usoll
+                        FROM (
+                                 SELECT id, umin, umax, usoll
+                                 FROM ${tabName_NetzSo}
+                                 WHERE ${tabName_NetzSo}.id = ${spgKnotenId}
+                                 UNION
+                                 SELECT id, umin, umax, usoll
+                                 FROM ${tabName_NetzSSAB}
+                                 WHERE ${tabName_NetzSSAB}.id = ${spgKnotenId}) as Voltage`;
                     minMaxSollResult = yield this.mysqlController.execQuery(query);
                 }
                 if (minMaxSollResult && minMaxSollResult.length) {
@@ -3801,7 +4645,7 @@ class ConverterI7 {
             }
             catch (e) {
                 this.logger.error(e);
-                console.error("ERROR:" + e);
+                console.error('ERROR:' + e);
             }
         });
     }
@@ -3817,7 +4661,7 @@ class ConverterI7 {
                 status.status = 'error';
                 status.message = e.toString();
                 this.logger.error(e);
-                console.error("ERROR:" + e);
+                console.error('ERROR:' + e);
             }
             resolve(status);
         }));
@@ -3934,7 +4778,7 @@ class ConverterI7 {
                 this.createDropIndex('create index netz_leitung_aknoten_index on netz_leitung (aknoten);'),
                 this.createDropIndex('create index netz_leitung_eknoten_index on netz_leitung (eknoten);'),
                 this.createDropIndex('create index netz_freileitungabschnitt_leitung_index on netz_freileitungabschnitt (leitung);'),
-                this.createDropIndex('create index netz_kabelabschnitt_leitung_index on netz_kabelabschnitt (leitung);'),
+                this.createDropIndex('create index netz_kabelabschnitt_leitung_index on netz_kabelabschnitt (leitung);')
             ]);
         });
     }
@@ -3954,7 +4798,7 @@ class ConverterI7 {
                 this.createDropIndex('drop index netz_leitung_aknoten_index on netz_leitung;'),
                 this.createDropIndex('drop index netz_leitung_eknoten_index on netz_leitung;'),
                 this.createDropIndex('drop index netz_freileitungabschnitt_leitung_index on netz_freileitungabschnitt;'),
-                this.createDropIndex('drop index netz_kabelabschnitt_leitung_index on netz_kabelabschnitt;'),
+                this.createDropIndex('drop index netz_kabelabschnitt_leitung_index on netz_kabelabschnitt;')
             ]);
         });
     }
@@ -4004,7 +4848,7 @@ class ConverterI7 {
         const cimModel = frame.cimModel;
         if (terminal) {
             powerTransformerEnd.terminal = terminal;
-            this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + powerTransformer.name, terminal, ir);
+            this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + (powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name), terminal, ir);
             if (sternpunktKnotenMap.has(i7Data.id) && i7Data) {
                 if (sternpunktKnotenMap.get(i7Data.id).has(i7Data.aknknoten1p)) {
                     this.convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, integral7, sternpunktKnotenMap.get(i7Data.id).get(i7Data.aknknoten1p), defaultValuesConfig);
@@ -4042,7 +4886,7 @@ class ConverterI7 {
         powerTransformer.addPowerTransformerEnd(powerTransformerEnd);
     }
     convertTapChangers(i7Data, transformerEnds, cimModel, transformerinfo, connectivityNode, spannungsband) {
-        var _a, _b;
+        var _a, _b, _c;
         for (let tapChangerNumber = 1; tapChangerNumber <= 2; tapChangerNumber++) {
             const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
             const transformerEnd = transformerEnds.find(elem => elem.endNumber === tapChangerNumber);
@@ -4055,10 +4899,14 @@ class ConverterI7 {
                 this.logger.error(`Trafo ${i7Data.id}: Zum Stufenschalter ${gestufteSeite} keine Wicklung gefunden.`);
                 continue;
             }
+            else if (!gestufteSeite) {
+                this.logger.error(`Trafo ${i7Data.id}: Kein Stufenschalter ${gestufteSeite} zur Wicklung ${transformerEnd.getUUID()} an Transformator ${(_b = transformerEnd.powerTransformer) === null || _b === void 0 ? void 0 : _b.getUUID()} gefunden.`);
+                continue;
+            }
             const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
             const angle = utils_2.isNumericI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
                 ? utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
-                : (_b = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _b === void 0 ? void 0 : _b.value;
+                : (_c = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _c === void 0 ? void 0 : _c.value;
             const neutralU = transformerEnd.ratedU;
             let tapChanger;
             if (isFinite(angle) && angle !== 0) {
@@ -4082,7 +4930,9 @@ class ConverterI7 {
         let neutralStep = utils_2.isNumericI7(i7Data[`mittelstufe_s${tapChangerNumber}`])
             ? i7Data[`mittelstufe_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.neutralStep;
-        let currentStep = i7Data[`aktstufe_s${tapChangerNumber}`];
+        let currentStep = utils_2.isNumericI7(i7Data[`aktstufe_s${tapChangerNumber}`])
+            ? i7Data[`aktstufe_s${tapChangerNumber}`]
+            : neutralStep;
         const i7TapArray = utils_2.getTapChangerStepArray(lowStep, highStep);
         const lowerVoltageStepCount = utils_2.getTapChangerStepCount(lowStep, neutralStep);
         const increaseVoltageStepCount = utils_2.getTapChangerStepCount(neutralStep, highStep);
@@ -4294,7 +5144,8 @@ class ConverterI7 {
     }
     queryLeitungsAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEITUNG]}`) : [];
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+                                                                                                             FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEITUNG]}`) : [];
             for (const result of results) {
                 this.leitungAnschlussKnotenIDs.add(result[`aknoten`]);
                 this.leitungAnschlussKnotenIDs.add(result[`eknoten`]);
@@ -4303,14 +5154,14 @@ class ConverterI7 {
     }
     queryTrafosAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
-                                                                                                            FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}`) : [];
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+                                                                                                             FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}`) : [];
             for (const result of results) {
                 this.trafo2wAnschlussKnotenIDs.add(result[`aknoten`]);
                 this.trafo2wAnschlussKnotenIDs.add(result[`eknoten`]);
             }
-            results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
-                                                                                                                    FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}`) : [];
+            results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                 FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}`) : [];
             for (const result of results) {
                 this.trafo3wAnschlussKnotenIDs.add(result[`aknoten`]);
                 this.trafo3wAnschlussKnotenIDs.add(result[`eknoten`]);
@@ -4319,7 +5170,8 @@ class ConverterI7 {
     }
     queryHgueAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT anetzobjekt, enetzobjekt FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.HGUE_LEITUNG]}`) : [];
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT anetzobjekt, enetzobjekt
+                                                                                                                  FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.HGUE_LEITUNG]}`) : [];
             for (const result of results) {
                 this.hgueAnschlussKnotenIDs.add(result[`anetzobjekt`]);
                 this.hgueAnschlussKnotenIDs.add(result[`enetzobjekt`]);
@@ -4328,7 +5180,8 @@ class ConverterI7 {
     }
     queryLDroselAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSDROSSEL]}`) : [];
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                   FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSDROSSEL]}`) : [];
             for (const result of results) {
                 this.lDrosselAnschlussKnotenIDs.add(result[`aknoten`]);
                 this.lDrosselAnschlussKnotenIDs.add(result[`eknoten`]);
@@ -4337,7 +5190,8 @@ class ConverterI7 {
     }
     queryErsatzLaengsAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.ERSATZLAENGSZWEIG]}`) : [];
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                       FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.ERSATZLAENGSZWEIG]}`) : [];
             for (const result of results) {
                 this.ersatzZweigAnschlussKnotenIDs.add(result[`aknoten`]);
                 this.ersatzZweigAnschlussKnotenIDs.add(result[`eknoten`]);
@@ -4346,7 +5200,8 @@ class ConverterI7 {
     }
     queryLkondensatorAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSKONDENSATOR]}`) : [];
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                       FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSKONDENSATOR]}`) : [];
             for (const result of results) {
                 this.lKondensatorAnschlussKnotenIDs.add(result[`aknoten`]);
                 this.lKondensatorAnschlussKnotenIDs.add(result[`eknoten`]);
@@ -4423,6 +5278,7 @@ class ConverterI7 {
     addIdMapping(i7ID, uuid, type) {
         if (this.integralID2UUID.has(i7ID)) {
             console.log(`ID ${i7ID} existiert bereits. Typ ${this.integralID2Type.get(i7ID)} neuer Typ ${type}`);
+            this.logger.debug(`ID ${i7ID} existiert bereits. Typ ${this.integralID2Type.get(i7ID)} neuer Typ ${type}`);
         }
         else {
             this.integralID2UUID.set(i7ID, uuid);
@@ -4449,15 +5305,15 @@ class ConverterI7 {
             connectivityNode.toEndNameTso = tsoName;
         }
         else {
-            this.logger.error(`Grenzknoten ${connectivityNode.name} mit der UUID ${connectivityNode.mrid} ist bereits belegt:
-                         fromEndName ${connectivityNode.fromEndName} 
-                         fromEndIsoCode ${connectivityNode.fromEndIsoCode} 
-                         fromEndNameTso ${connectivityNode.fromEndNameTso} 
-                         toEndName ${connectivityNode.toEndName} 
-                         toEndIsoCode ${connectivityNode.toEndIsoCode} 
-                         toEndNameTso ${connectivityNode.toEndNameTso} 
-                         name ${name} 
-                         isoCode ${isoCode} 
+            this.logger.error(`Grenzknoten ${connectivityNode.name} mit der UUID ${connectivityNode.mrid} ist bereits belegt:
+                         fromEndName ${connectivityNode.fromEndName} 
+                         fromEndIsoCode ${connectivityNode.fromEndIsoCode} 
+                         fromEndNameTso ${connectivityNode.fromEndNameTso} 
+                         toEndName ${connectivityNode.toEndName} 
+                         toEndIsoCode ${connectivityNode.toEndIsoCode} 
+                         toEndNameTso ${connectivityNode.toEndNameTso} 
+                         name ${name} 
+                         isoCode ${isoCode} 
                          tsoName ${tsoName}`);
         }
     }