@enervance/insight-cim-model 0.0.58 → 0.0.60

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

@@ -141,7 +141,7 @@ class ConverterI7 {
         this.exportFrames = new Map();
         this.exportFramesBoundary = new Map();
         this.cimModelDefault = new INTEGRALModel_1.INTEGRALModel();
-        this.availableTableNames = new Map();
+        this.availableTableNames = [];
         this.integralID2Type = new Map();
         this.coordinateSystem = 'EPSG:4326';
         this.integralID2UUID = new Map();
@@ -202,8 +202,11 @@ class ConverterI7 {
                     yield frame.closeXMLModel();
                     let endTime = perf_hooks_1.performance.now();
                     frame.cimModel.purgeData();
-                    console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
+                    console.log(`SerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
+                    let memoryUsed = process.memoryUsage();
+                    console.log(`heapUsed ${Math.round(memoryUsed['heapUsed'] / 1024 / 1024 * 100) / 100} MB`);
                 }
+                console.log('________________________________________________');
                 console.log('Serialize BD Profiles');
                 for (const entry of this.exportFramesBoundary.entries()) {
                     const geoRegionUUID = entry[0];
@@ -396,10 +399,6 @@ class ConverterI7 {
                 yield this.convertSVC(cimModel, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertSVC`);
             }
-            startTime = perf_hooks_1.performance.now();
-            if (standortIDs.length)
-                yield this.convertSchaltanlagen(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
-            logExecutionTime(this.logger, startTime, `convertSchaltanlagen(${standortIDs.length})`);
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
                 yield this.convertCsConverterDC(cimModel, integral7Modell, soSfKnoten);
@@ -432,67 +431,39 @@ class ConverterI7 {
             logExecutionTime(this.logger, startTime, `assignment of sequence number`);
             startTime = perf_hooks_1.performance.now();
             yield this.convertNetzvarianten(cimModel, integral7Modell);
-            logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
             for (const key of integral7Modell.i7SchemaID2UUID.keys()) {
-                startTime = perf_hooks_1.performance.now();
-                const convertAll = yield this.convertSchemaStandorte(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaStandorte`);
-                if (convertAll) {
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaKnotenSo(cimModel, integral7Modell, knotenSoIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaKnotenSo`);
-                    startTime = perf_hooks_1.performance.now();
-                    logExecutionTime(this.logger, startTime, `convertSchemaHgueKnotenSo`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaSchaltanlage(cimModel, integral7Modell, schaltanlagenIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlage`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlagenAbschnitte`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaSammelschienenAbschnitte`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaSchaltfeldElemente(cimModel, integral7Modell, schaltfeldIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaSchaltfeldElemente`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaQuerkupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaQuerkupplungen`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaLaengskupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaLaengskupplungen`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaTransformatoren2W(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren2W`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaTransformatoren3W(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren3W`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaQuerzweige(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaQuerzweige`);
-                    startTime = perf_hooks_1.performance.now();
-                    logExecutionTime(this.logger, startTime, `convertSchemaSternpunktSchiene`);
-                    startTime = perf_hooks_1.performance.now();
-                    logExecutionTime(this.logger, startTime, `convertSchemaSternpunktKnoten`);
-                    startTime = perf_hooks_1.performance.now();
-                    yield this.convertSchemaLeitungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                    logExecutionTime(this.logger, startTime, `convertSchemaLeitungen`);
-                    integral7Modell.integralLaengskupplungen.clear();
-                    integral7Modell.integralHgueLeitungen.clear();
+                yield this.convertSchemaStandorte(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaKnotenSo(cimModel, integral7Modell, knotenSoIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaSchaltanlage(cimModel, integral7Modell, schaltanlagenIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaSchaltfeldElemente(cimModel, integral7Modell, schaltfeldIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaQuerkupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaLaengskupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaTransformatoren2W(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaTransformatoren3W(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaQuerzweige(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaLeitungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                yield this.convertSchemaKnotenSo2(cimModel, integral7Modell, [...integral7Modell.integralAdditionalGrenzknotenIDs.values()], key, constants_1.NsgConstants.onlyEingeblendet);
+                integral7Modell.integralLaengskupplungen.clear();
+                integral7Modell.integralHgueLeitungen.clear();
+                integral7Modell.integralNSGSchaltanlage.clear();
+                integral7Modell.integralNSGSchaltfeld.clear();
+                integral7Modell.integralNSGSAAbschnitt.clear();
+                integral7Modell.integralNSGSsab.clear();
+                integral7Modell.integralNSGStpSchiene.clear();
+                integral7Modell.integralNSGStpKnoten.clear();
+                integral7Modell.integralNSGTrafos.clear();
+                integral7Modell.integralNSGQuerzweig.clear();
+                integral7Modell.integralAdditionalGrenzknotenIDs.clear();
+                if (!frame.boundary) {
+                    integral7Modell.integralNSGStandorte.clear();
                     integral7Modell.i7ID2UUID.clear();
                     integral7Modell.i7SchemaID2Type.clear();
-                    integral7Modell.integralNSGSchaltanlage.clear();
-                    integral7Modell.integralNSGSchaltfeld.clear();
-                    integral7Modell.integralNSGSAAbschnitt.clear();
-                    integral7Modell.integralNSGSsab.clear();
-                    integral7Modell.integralNSGStpSchiene.clear();
-                    integral7Modell.integralNSGStpKnoten.clear();
-                    integral7Modell.integralNSGTrafos.clear();
-                    integral7Modell.integralNSGQuerzweig.clear();
-                }
-                integral7Modell.integralNSGStandorte.clear();
-                integral7Modell.placedCIMObjectsForDLProfil.clear();
+                    integral7Modell.placedCIMObjectsForDLProfil.clear();
+                }
             }
+            logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
         });
     }
     assignTerminalSequenceNumber(cimModel) {
@@ -637,7 +608,7 @@ class ConverterI7 {
     convertNetzvarianten(cimModel, integral7) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NETZVARIANTEN)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NETZVARIANTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NETZVARIANTEN), [2]));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NETZVARIANTEN, [2]));
                 for (const i7Data of result) {
                     const diagram = new Diagram_1.Diagram(utils_1.getUUID(i7Data.guid), i7Data.name, String(i7Data.id));
                     diagram.orientation = OrientationKind_1.OrientationKind.negative;
@@ -653,37 +624,57 @@ class ConverterI7 {
     }
     convertSchemaStandorte(cimModel, integral7, standortIDs, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let retVal = false;
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STANDORT), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STANDORT, standortIDs));
                 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);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_STANDORT);
                     const standort = integral7.integralStandorte.get(i7Data.standort);
                     if (standort) {
                         standort.standortNsg = new StandortNsg_1.StandortNsgImpl(i7Data);
                         integral7.integralNSGStandorte.set(i7Data.id, standort.standortNsg);
                     }
                 }
-                if (filteredResults.length > 0) {
-                    retVal = true;
-                }
             }
             else {
                 this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STANDORT} ist nicht vorhanden.`);
             }
-            return retVal;
         });
     }
     convertSchemaKnotenSo(cimModel, integral7, knotenSoIDs, variantenNr, onlyEingeblendet = true) {
         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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO), knotenSoIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_SO, knotenSoIDs));
+                const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
+                for (const i7Data of filteredResults) {
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO);
+                    const cimObjectUUID = this.integralID2UUID.get(i7Data.knotenso);
+                    const nsgStandort = integral7.integralNSGStandorte.get(i7Data.nsgso);
+                    if (nsgStandort === undefined) {
+                        continue;
+                    }
+                    util_functions_1.DLUtilFunctions.convertNsgKnoten(cimModel, integral7, i7Data, cimObjectUUID, constants_1.NsgConstants.KNOTENSO_WIDTH, constants_1.NsgConstants.KNOTENSO_HEIGHT, nsgStandort.xrel, nsgStandort.yrel);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaKnotenSo2(cimModel, integral7, nsgKnotenSoIDs, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) && nsgKnotenSoIDs.length > 0) {
+                const result = yield this.mysqlController.execQuery(`SELECT variantennr, id, xrel, yrel, angezeigt, eingeblendet, knotenso, nsgso FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.NSG_KNOTEN_SO]} WHERE ${integral_sql_1.getWhereIDs('id', nsgKnotenSoIDs.map(arg => util_functions_1.DLUtilFunctions.parseSchemaKey(arg).id)).join(' OR ')};`);
                 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_SO);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO);
                     const cimObjectUUID = this.integralID2UUID.get(i7Data.knotenso);
-                    util_functions_1.DLUtilFunctions.convertNsgKnoten(cimModel, integral7, i7Data, cimObjectUUID, constants_1.NsgConstants.KNOTENSO_WIDTH, constants_1.NsgConstants.KNOTENSO_HEIGHT);
+                    const resultNsgStandort = yield this.mysqlController.execQuery(`SELECT variantennr, id, xrel, yrel, angezeigt, eingeblendet, standort FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.NSG_STANDORT]} WHERE ${integral_sql_1.getWhereIDs('id', [i7Data.nsgso]).join(' OR ')};`);
+                    const filteredResultNsgStandort = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultNsgStandort, variantenNr, onlyEingeblendet);
+                    if (filteredResultNsgStandort.length === 0) {
+                        continue;
+                    }
+                    util_functions_1.DLUtilFunctions.convertNsgKnoten(cimModel, integral7, i7Data, cimObjectUUID, constants_1.NsgConstants.KNOTENSO_WIDTH, constants_1.NsgConstants.KNOTENSO_HEIGHT, filteredResultNsgStandort[0].xrel, filteredResultNsgStandort[0].yrel);
                 }
             }
             else {
@@ -695,12 +686,16 @@ class ConverterI7 {
         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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE), nsgStandortIDs));
+                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);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), 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);
+                    const nsgStandort = integral7.integralNSGStandorte.get(i7Data.nsgso);
+                    if (nsgStandort === undefined) {
+                        continue;
+                    }
+                    util_functions_1.DLUtilFunctions.convertNsgKnoten(cimModel, integral7, i7Data, cimObjectUUID, constants_1.NsgConstants.HGUE_KNOTENSO_WIDTH, constants_1.NsgConstants.HGUE_KNOTENSO_HEIGHT, nsgStandort.xrel, nsgStandort.yrel);
                 }
             }
             else {
@@ -711,10 +706,10 @@ class ConverterI7 {
     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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE), saIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, saIDs));
                 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);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE);
                     const schaltanlage = integral7.integralSchaltanlagen.get(i7Data.schaltanlage);
                     if (schaltanlage) {
                         schaltanlage.schaltanlageNsg = new SchaltanlageNSG_1.SchaltanlageNsgImpl(i7Data);
@@ -730,10 +725,10 @@ class ConverterI7 {
     convertSchemaSchaltanlagenAbschnitte(cimModel, integral7, schaltanlagenabschnittIDs, variantenNr, onlyEingeblendet = true) {
         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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT), schaltanlagenabschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGENABSCHNITT, schaltanlagenabschnittIDs));
                 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);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT);
                     const saabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
                     if (saabschnitt) {
                         saabschnitt.schaltanlagenabschnittNsg = new SchaltanlagenabschnittNsg_1.SchaltanlagenabschnittNsg(i7Data);
@@ -794,40 +789,41 @@ class ConverterI7 {
             for (const queryResult of filteredResults) {
                 const nsgSa = integral7.integralNSGSchaltanlage.get(queryResult.nsgsa);
                 const nsgSo = integral7.integralNSGStandorte.get(nsgSa.nsgsoid);
-                if (nsgSa !== undefined && nsgSo !== undefined) {
-                    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 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);
-                    for (const p of points) {
-                        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 = 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);
-                    diagramObject.setIdentifiedObject(connectivityNode);
-                    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.`);
-                    }
+                if (nsgSo === undefined) {
+                    continue;
+                }
+                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 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);
+                for (const p of points) {
+                    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 = 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);
+                diagramObject.setIdentifiedObject(connectivityNode);
+                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.`);
                 }
             }
         });
@@ -843,11 +839,12 @@ 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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTFELD), schaltfeldIDs));
+                const resultsNsgSchaltfeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTFELD, schaltfeldIDs));
                 const filteredResultsNsgSchaltfeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgSchaltfeld, variantenNr, onlyEingeblendet);
-                let tmpcnt = 0;
                 for (const i7Data of filteredResultsNsgSchaltfeld) {
                     const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
+                    if (!nsgSaa)
+                        continue;
                     const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
                     if (nsgSa === undefined) {
                         continue;
@@ -856,7 +853,7 @@ class ConverterI7 {
                     if (nsgSo === undefined) {
                         continue;
                     }
-                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_SCHALTFELD);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_SCHALTFELD);
                     const nsgSchaltfeldObj = new SchaltfeldNsg_1.SchaltfeldNsgImpl(i7Data);
                     integral7.integralNSGSchaltfeld.set(i7Data.id, nsgSchaltfeldObj);
                     const nodePointMap = new Map();
@@ -874,57 +871,53 @@ class ConverterI7 {
                     const xPos = schaltfeldLeftOffset + (constants_1.NsgConstants.HORIZONTAL_OFFSET / 2);
                     let lastNode = undefined;
                     for (const node of onSSabNodes) {
-                        let tmp_node = integral7.integralNSGSsab.get(node.aknoten);
-                        if (tmp_node !== undefined) {
-                            const ssabYPos = tmp_node ? tmp_node.posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET : undefined;
-                            let yStackPos = 1;
-                            let prevNode = null;
-                            let crtNode = node;
-                            while (crtNode) {
-                                if (nodePointMap.get(crtNode.id) === undefined) {
-                                    let yPos = ssabYPos;
-                                    if (crtNode === node) {
-                                        yPos += shiftFromBusbar ? (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET : 0;
+                        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 yPos = ssabYPos;
+                                if (crtNode === node) {
+                                    yPos += shiftFromBusbar ? (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET : 0;
+                                }
+                                else {
+                                    const ssabOffset = schaltfeldDeltaausrichtung === 0 ? 0 : maxSSabPos;
+                                    yPos = ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (yStackPos) + ssabOffset) * constants_1.NsgConstants.VERTICAL_OFFSET;
+                                    yStackPos += 1;
+                                }
+                                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) !== undefined) ? 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 {
-                                        const ssabOffset = schaltfeldDeltaausrichtung === 0 ? 0 : maxSSabPos;
-                                        yPos = ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (yStackPos) + ssabOffset) * constants_1.NsgConstants.VERTICAL_OFFSET;
-                                        yStackPos += 1;
-                                    }
-                                    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) !== undefined) ? 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;
-                                        }
+                                        yPosAKnoten = (yPos - prevNodeY) / 2 + prevNodeY;
                                     }
-                                    lastNode = crtNode;
-                                    prevNode = crtNode;
-                                    crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
+                                    nodePointMap.set(crtNode.aknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPosAKnoten));
                                 }
                             }
+                            lastNode = crtNode;
+                            prevNode = crtNode;
+                            crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
                         }
                     }
-                    if (lastNode !== undefined) {
-                        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;
+                    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 && xPos !== undefined && integral7.integralNSGSsab.get(crtNode.aknoten) !== 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);
@@ -959,10 +952,10 @@ 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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG), integral7.querkupplungIDs));
+                const resultsNsgKpFeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERKUPPLUNG, integral7.querkupplungIDs));
                 const filteredResultsNsgKpFeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgKpFeld, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgKpFeld) {
-                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG);
                     const uuidPointsMap = new Map();
                     const kpFeldLeftOffset = i7Data.slotnummer * constants_1.NsgConstants.HORIZONTAL_OFFSET;
                     const kpFeldDeltaausrichtung = i7Data.deltaausrichtung;
@@ -972,6 +965,8 @@ class ConverterI7 {
                     ssabs.forEach(ssab => relevantSSabIDs.add(ssab.id));
                     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);
+                    if (!nsgSaa)
+                        continue;
                     const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
                     uuidPointsMap.forEach((entryDiagramObject, key) => {
                         if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
@@ -987,7 +982,7 @@ class ConverterI7 {
     convertSchemaLaengskupplungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const ssabIDs = [...integral7.integralNSGSAAbschnitt.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG) && integral7.laengskupplungIDs.length > 0 && [...integral7.integralNSGSAAbschnitt.keys()].length > 0) {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG) && integral7.laengskupplungIDs.length > 0 && ssabIDs.length > 0) {
                 const i7relevantTables = [
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
@@ -996,10 +991,10 @@ 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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG), ssabIDs));
+                const resultsNsgLKupplung = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, ssabIDs));
                 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);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), 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);
@@ -1010,92 +1005,97 @@ class ConverterI7 {
                         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)) {
-                            if (entryDiagramObject.rotation === undefined) {
-                                entryDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
-                            }
-                            else {
-                                entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                    const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa === null || nsgSaa === void 0 ? void 0 : nsgSaa.nsgsaid);
+                    if (!nsgSa) {
+                        uuidPointsMap.forEach((entryDiagramObject, key) => {
+                            if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
+                                if (entryDiagramObject.rotation === undefined) {
+                                    entryDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                                }
+                                else {
+                                    entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                                }
                             }
-                        }
-                    });
-                    util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap);
+                        });
+                        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* () {
-            try {
-                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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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 && t1CNdiagramObject !== undefined)
-                                utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t1CNdiagramObject.diagramObjectPoints);
-                            if (terminal1 !== undefined && t2CNdiagramObject !== undefined)
-                                utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+            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) {
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), 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);
+                    if (transformer === undefined)
+                        continue;
+                    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.getConnectivityNodeUUID());
+                        if (!t1CNdiagramObject) {
+                            t1CNdiagramObject = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFrames([...this.exportFramesBoundary.values()], terminal1.getConnectivityNodeUUID(), integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
                         }
-                        else {
-                            if (terminal1 !== undefined && t1CNdiagramObject !== undefined)
-                                utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
-                            if (terminal2 !== undefined && t2CNdiagramObject !== undefined)
-                                utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                        t1DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getUUID());
+                    }
+                    if (terminal2 !== undefined) {
+                        t2CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getConnectivityNodeUUID());
+                        if (!t2CNdiagramObject) {
+                            t2CNdiagramObject = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFrames([...this.exportFramesBoundary.values()], terminal2.getConnectivityNodeUUID(), integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
                         }
+                        t2DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getUUID());
+                    }
+                    if (trafo2wNsg.ausrichtung === 0 || trafo2wNsg.ausrichtung === 1) {
+                        if (terminal2 !== undefined && t1CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                        if (terminal1 !== undefined && t2CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                    }
+                    else {
+                        if (terminal1 !== undefined && t1CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                        if (terminal2 !== undefined && t2CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
                     }
-                }
-                else {
-                    this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_TRAFO2W} ist nicht vorhanden.`);
                 }
             }
-            catch (err) {
-                console.log(err);
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_TRAFO2W} ist nicht vorhanden.`);
             }
         });
     }
@@ -1103,12 +1103,12 @@ class ConverterI7 {
         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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_TRAFO3W), nsgStandortIDs));
+                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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), standortIDs));
+                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);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_TRAFO3W);
                     const uuidPointsMap = new Map();
                     const trafo3wNsg = new Trafo3wNsg_1.Trafo3wNsgImpl(i7Data);
                     integral7.integralNSGTrafos.set(i7Data.trafo3w, trafo3wNsg);
@@ -1129,52 +1129,66 @@ class ConverterI7 {
                             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]);
-                        if (terminal1 !== undefined) {
-                            uuidPointsMap.set(terminal1.getUUID(), terminal1DiagramObject);
-                        }
-                        if (terminal2 !== undefined) {
-                            uuidPointsMap.set(terminal2.getUUID(), terminal2DiagramObject);
-                        }
-                        if (terminal3 !== undefined) {
-                            uuidPointsMap.set(terminal3.getUUID(), terminal3DiagramObject);
+                    }
+                    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;
                         }
-                        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);
+                    }
+                    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) {
+                        let t1CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getConnectivityNodeUUID());
+                        if (!t1CNdiagramObject) {
+                            t1CNdiagramObject = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFrames([...this.exportFramesBoundary.values()], terminal1.getConnectivityNodeUUID(), integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
                         }
-                        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);
+                        const t1DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getUUID());
+                        if (t1CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                    }
+                    if (terminal2) {
+                        let t2CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getConnectivityNodeUUID());
+                        if (!t2CNdiagramObject) {
+                            t2CNdiagramObject = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFrames([...this.exportFramesBoundary.values()], terminal2.getConnectivityNodeUUID(), integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
                         }
-                        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);
+                        const t2DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getUUID());
+                        if (t2CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                    }
+                    if (terminal3) {
+                        let t3CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal3.getConnectivityNodeUUID());
+                        if (!t3CNdiagramObject) {
+                            t3CNdiagramObject = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFrames([...this.exportFramesBoundary.values()], terminal3.getConnectivityNodeUUID(), integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
                         }
+                        const t3DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal3.getUUID());
+                        if (t3CNdiagramObject !== undefined)
+                            utils_schema_1.copyDiagramObjectPoints(t3DiagramObject, t3CNdiagramObject.diagramObjectPoints);
                     }
                 }
             }
@@ -1189,14 +1203,14 @@ class ConverterI7 {
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LEITUNG), leitungIDs));
+                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);
                 if (nsgLeitungIDs.length > 0) {
-                    const leitungspktResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNGSPUNKT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT), nsgLeitungIDs));
+                    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);
+                        util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_LEITUNG);
                         let netzLeitung, aKnotenCimObjectUUID, eKnotenCimObjectUUID;
                         const isACLine = integral7.integralLeitungen.get(i7Data.leitung);
                         if (isACLine) {
@@ -1209,44 +1223,62 @@ class ConverterI7 {
                             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 anfSchemaType = util_functions_1.DLUtilFunctions.getObjectFromMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.anschlussanf, variantennr: variantenNr }));
+                        let endSchemaType = util_functions_1.DLUtilFunctions.getObjectFromMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.anschlussend, variantennr: variantenNr }));
                         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);
+                        if (anfSchemaType === undefined) {
+                            const tempAnf = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFramesI7IDBased([...this.exportFramesBoundary.values()], i7Data.anschlussanf, variantenNr, integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
+                            tempAnfDiagramObject = tempAnf.diagramObject;
+                            anfSchemaType = tempAnf.schemaType;
                         }
-                        else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
-                            tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(aKnotenCimObjectUUID);
+                        if (endSchemaType === undefined) {
+                            const tempEnd = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFramesI7IDBased([...this.exportFramesBoundary.values()], i7Data.anschlussend, variantenNr, integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
+                            tempEndDiagramObject = tempEnd.diagramObject;
+                            endSchemaType = tempEnd.schemaType;
                         }
-                        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 {
-                            this.logger.info(`nsg-line with a unknown/unhandled start reference-point (i7-NetzLeitungID ${netzLeitung.id}, i7-aKnotenID: ${netzLeitung.aknotenid})`);
-                            continue;
-                        }
-                        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);
+                        if (tempAnfDiagramObject === 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) {
+                                const uuid = util_functions_1.DLUtilFunctions.getObjectFromMapJSONBased(integral7.i7ID2UUID, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.anschlussanf, variantennr: variantenNr }));
+                                tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(uuid);
+                            }
+                            else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) {
+                                const uuid = util_functions_1.DLUtilFunctions.getObjectFromMapJSONBased(integral7.i7ID2UUID, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.anschlussanf, variantennr: variantenNr }));
+                                tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(uuid);
+                            }
+                            else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) {
+                                tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(aKnotenCimObjectUUID);
+                            }
+                            else {
+                                this.logger.info(`nsg-line with a unknown/unhandled start reference-point (i7-NetzLeitungID ${netzLeitung.id}, i7-aKnotenID: ${netzLeitung.aknotenid})`);
+                                continue;
+                            }
                         }
-                        else {
-                            this.logger.info(`nsg-line with a unknown/unhandled end reference-point (i7-NetzLeitungID ${netzLeitung.id}, i7-eKnotenID: ${netzLeitung.eknotenid})`);
-                            continue;
+                        if (tempEndDiagramObject === undefined) {
+                            if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
+                                const endSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.anschlussend);
+                                tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(endSchaltfeld.lastNodeCimUUID);
+                            }
+                            else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
+                                const uuid = util_functions_1.DLUtilFunctions.getObjectFromMapJSONBased(integral7.i7ID2UUID, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.anschlussend, variantennr: variantenNr }));
+                                tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(uuid);
+                            }
+                            else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) {
+                                const uuid = util_functions_1.DLUtilFunctions.getObjectFromMapJSONBased(integral7.i7ID2UUID, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.anschlussend, variantennr: variantenNr }));
+                                tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(uuid);
+                            }
+                            else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) {
+                                tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(eKnotenCimObjectUUID);
+                            }
+                            else {
+                                this.logger.info(`nsg-line with a unknown/unhandled end reference-point (i7-NetzLeitungID ${netzLeitung.id}, i7-eKnotenID: ${netzLeitung.eknotenid})`);
+                                continue;
+                            }
                         }
                         if (tempAnfDiagramObject === undefined || tempEndDiagramObject === undefined)
                             continue;
@@ -1292,19 +1324,16 @@ class ConverterI7 {
                             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;
-                            let tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                             if (cableAvailable && overheadAvailable) {
                                 type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG;
                             }
                             else if (cableAvailable) {
                                 type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL;
-                                tableName = integral_sql_1.Integral7TableNames.KABEL;
                             }
                             else if (overheadAvailable) {
                                 type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
-                                tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                             }
-                            const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, this.getAvailableColumnNames(tableName), [netzLeitung.id]));
+                            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;
@@ -1352,14 +1381,14 @@ class ConverterI7 {
     }
     convertSchemaQuerzweige(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const whereIDs = [...integral7.i7SchemaID2Type.keys()];
+            const whereIDs = [...integral7.i7SchemaID2Type.keys()].map(value => util_functions_1.DLUtilFunctions.parseSchemaKey(value).id);
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_QUERZWEIG), whereIDs));
+                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);
+                    util_functions_1.DLUtilFunctions.setObjectIntoMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.id, variantennr: variantenNr }), integral_sql_1.Integral7TableNames.NSG_QUERZWEIG);
                     integral7.integralNSGQuerzweig.set(i7Data.id, i7Data);
-                    const referenceType = integral7.i7SchemaID2Type.get(i7Data.bezugsobjekt);
+                    const referenceType = util_functions_1.DLUtilFunctions.getObjectFromMapJSONBased(integral7.i7SchemaID2Type, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.bezugsobjekt, variantennr: variantenNr }));
                     const uuidPointsMap = new Map();
                     const rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnQuerzweig(i7Data.ausrichtung);
                     let refXPos = 0;
@@ -1381,7 +1410,7 @@ class ConverterI7 {
                         nsgQuerzweigWidth = constants_1.NsgConstants.QUERZWEIG_OBJ_WIDTH;
                         nsgQuerzweigHeight = constants_1.NsgConstants.QUERZWEIG_OBJ_HEIGHT;
                     }
-                    if (referenceType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD && integral7.integralNSGSchaltfeld.get(i7Data.bezugsobjekt) !== undefined) {
+                    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];
@@ -1430,8 +1459,8 @@ class ConverterI7 {
                             }
                         }
                     }
-                    else if (referenceType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO && integral7.i7ID2UUID.get(i7Data.bezugsobjekt) !== undefined) {
-                        const nsgKnotenSoUUID = integral7.i7ID2UUID.get(i7Data.bezugsobjekt);
+                    else if (referenceType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
+                        const nsgKnotenSoUUID = util_functions_1.DLUtilFunctions.getObjectFromMapJSONBased(integral7.i7ID2UUID, util_functions_1.DLUtilFunctions.stringifySchemaKey({ id: i7Data.bezugsobjekt, variantennr: variantenNr }));
                         refCNNodeUUID = nsgKnotenSoUUID;
                         const lastDiagramObjectPointInsideBay = integral7.placedCIMObjectsForDLProfil.get(nsgKnotenSoUUID).diagramObjectPoints[0];
                         refXPos = lastDiagramObjectPointInsideBay.xPosition;
@@ -1449,7 +1478,7 @@ class ConverterI7 {
                     const querzweigObjectUUID = this.integralID2UUID.get(i7Data.querzweig);
                     const cimObject2LinkWith = cimModel.getObject(querzweigObjectUUID);
                     uuidPointsMap.set(querzweigObjectUUID, tempDiagramObject);
-                    if (cimObject2LinkWith !== undefined && cimModel.getConnectivityNode(refCNNodeUUID) !== undefined) {
+                    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()));
@@ -1487,7 +1516,7 @@ class ConverterI7 {
         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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STP_SCHIENE), nsgStandortIDs));
+                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);
@@ -1529,7 +1558,7 @@ class ConverterI7 {
         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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STP_KNOTEN), nsgStandortIDs));
+                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;
@@ -1564,32 +1593,30 @@ class ConverterI7 {
                     let centerPoint = new DiagramObjectPoint_1.DiagramObjectPoint(0, 0, 1);
                     const shiftOffset = constants_1.NsgConstants.STP_KNOTEN_WIDTH;
                     const trafoIDType = trafoIDTypeMap.get(i7Data.knoten);
-                    if (trafoIDType !== undefined) {
-                        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.`);
-                        }
+                    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.`);
                     }
                 }
             }
@@ -1601,7 +1628,7 @@ class ConverterI7 {
     convertStandorte(cimModel, integral7, whereID, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STANDORT)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STANDORT), whereID));
+                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 substation = new AMPRIONSubstation_1.AMPRIONSubstation(utils_1.getUUID(i7Data.guid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
@@ -1639,7 +1666,7 @@ class ConverterI7 {
     convertSchaltanlagen(cimModel, integral7, standortIDs, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTANLAGE)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGE), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGE, standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const object = cimModel.getObject(this.integralID2UUID.get(i7Data.standort));
@@ -1676,7 +1703,7 @@ class ConverterI7 {
     convertSchaltanlagenAbschnitte(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGENABSCHNITT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT), schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGENABSCHNITT, schaltanlagenIDs));
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     if (!voltageLevel) {
@@ -1700,7 +1727,7 @@ class ConverterI7 {
     convertSchaltfelder(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTFELD)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTFELD, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTFELD), schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTFELD, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (!voltageLevel) {
@@ -1735,7 +1762,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_SO)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_SO), standortIDs));
+                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);
@@ -1781,32 +1808,18 @@ class ConverterI7 {
             }
         });
     }
-    convertKnotenHgue(frame, integral7, standortIDs, defaultValuesConfig) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const cimModel = frame.cimModel;
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KNOTEN)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KNOTEN), standortIDs));
-                for (const i7Data of result) {
-                    const cimrdfid = utils_1.getUUID(i7Data.guid);
-                    const dcNode = new DCNode_1.DCNode(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_DC_Node'], 32, true), i7Data.kurzname);
-                    cimModel.addDCNode(dcNode);
-                    this.addIdMapping(i7Data.id, dcNode.mrid, integral_sql_1.Integral7TableNames.HGUE_KNOTEN);
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SO} ist nicht vorhanden.`);
-            }
-        });
-    }
     convertSammelschienenAbschnitte(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SAMMELSCHIENE)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
+                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);
                     busbarSection.ipMax = i7Data.limit_ip;
                     busbarSection.aggregate = false;
+                    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));
@@ -1870,7 +1883,7 @@ class ConverterI7 {
     convertKnotenKf(cimModel, querkupplungIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_KF), querkupplungIDs));
+                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 bay = cimModel.getBay(this.integralID2UUID.get(i7Data.kpfeld));
@@ -1893,7 +1906,7 @@ class ConverterI7 {
     convertKnotenLk(cimModel, laengskupplungIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_LK), laengskupplungIDs));
+                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 bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
@@ -1916,7 +1929,7 @@ class ConverterI7 {
     convertSchlaufen(cimModel, integral7, knotenSoIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHLAUFE)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHLAUFE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHLAUFE), knotenSoIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHLAUFE, knotenSoIDs));
                 for (const i7Data of result) {
                     const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_Schlaufe_T']), i7Data.kurzname, i7Data.kommentar);
                     terminal.connected = utils_2.convertToBooleanI7(i7Data.schaltzustand);
@@ -1944,7 +1957,7 @@ class ConverterI7 {
     convertBelastungen(cimModel, knotenSfIDs, defaultValuesConfig, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BELASTUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BELASTUNG), knotenSfIDs));
+                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']));
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
@@ -1956,8 +1969,8 @@ class ConverterI7 {
                     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;
+                    load.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] : undefined;
+                    load.q_mf = utils_2.isNumericI7(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;
@@ -1974,7 +1987,7 @@ class ConverterI7 {
     convertEinspeisungen(cimModel, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.EINSPEISUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.EINSPEISUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.EINSPEISUNG), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.EINSPEISUNG, knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertEinspeisungen2EquivalentInjection(cimModel, result);
@@ -1997,7 +2010,7 @@ class ConverterI7 {
     convertErsatzQuerZweige(cimModel, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZQUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZQUERZWEIG, knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, result);
@@ -2020,7 +2033,7 @@ class ConverterI7 {
     convertGeneratoren(cimModel, knotenSfIDs, energyTypesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.GENERATOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.GENERATOR), knotenSfIDs));
+                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 INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SM'], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
@@ -2114,8 +2127,8 @@ class ConverterI7 {
                     const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
                     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;
+                    synchronousMachine.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] * -1 : undefined;
+                    synchronousMachine.q_mf = utils_2.isNumericI7(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;
@@ -2283,8 +2296,8 @@ class ConverterI7 {
                     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.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] * -1 : undefined;
+                    asynchronousMachine.q_mf = utils_2.isNumericI7(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;
@@ -2315,7 +2328,7 @@ class ConverterI7 {
     convertKraftwerksbloecke(cimModel, knotenSfIDs, energyTypesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KWBLOCK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KWBLOCK), knotenSfIDs));
+                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);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
@@ -2461,7 +2474,7 @@ class ConverterI7 {
     convertBoundaryInjections(cimModel, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BOUNDARYINJECTION, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION), knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BOUNDARYINJECTION, knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertBoundaryInjections2EquivalentInjection(cimModel, result);
@@ -2521,7 +2534,7 @@ class ConverterI7 {
         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 > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG), integral7.ersatzZweigAnschlussKnotenIDs));
+                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 +
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
@@ -2558,7 +2571,7 @@ class ConverterI7 {
     convertKompensationsdrossel(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL), knotenSfIDs));
+                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);
                     shunt.normalSections = i7Data.aktstufe;
@@ -2592,7 +2605,7 @@ class ConverterI7 {
     convertKompensationskondensatoren(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR), knotenSfIDs));
+                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);
                     shunt.normalSections = i7Data.aktstufe;
@@ -2626,7 +2639,7 @@ class ConverterI7 {
     convertStatcom(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STATCOM)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STATCOM, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STATCOM), knotenSfIDs));
+                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 inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
@@ -2666,7 +2679,7 @@ class ConverterI7 {
     convertSVC(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SVC)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SVC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SVC), knotenSfIDs));
+                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 inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
@@ -2706,7 +2719,7 @@ class ConverterI7 {
     convertCsConverterDC(cimModel, integral7, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH), knotenSfIDs));
+                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 acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
@@ -2773,7 +2786,7 @@ class ConverterI7 {
         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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC), knotenSfIDs));
+                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 acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
@@ -2896,7 +2909,7 @@ class ConverterI7 {
                 try {
                     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.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);
+                    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;
@@ -2907,7 +2920,7 @@ class ConverterI7 {
                     }
                     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) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+                    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;
@@ -2942,8 +2955,7 @@ class ConverterI7 {
                     let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            const cimrdfid = utils_1.getUUID(externalNetworkInjection.getUUID());
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), util_create_1.createNotation([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_ENI_${externalNetworkInjection.getUUID().substring(0, 8)}`);
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -2974,8 +2986,8 @@ class ConverterI7 {
                     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;
+                    externalNetworkInjection.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] * -1 : undefined;
+                    externalNetworkInjection.q_mf = utils_2.isNumericI7(powerData[3]) ? powerData[3] * -1 : undefined;
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
                 }
@@ -3034,7 +3046,7 @@ class ConverterI7 {
     convertQuerkupplungen(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.QUERKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.QUERKUPPLUNG), schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     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');
@@ -3065,7 +3077,7 @@ class ConverterI7 {
     convertLaegskupplungen(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
                     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');
@@ -3098,7 +3110,7 @@ class ConverterI7 {
     convertStarreVerbindungen(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_STARR), containerIDs));
+                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');
                     yield this.convertSwitch(breaker, cimModel, i7Data);
@@ -3114,7 +3126,7 @@ class ConverterI7 {
     convertTrennerFi3f(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNERFI_3P), containerIDs));
+                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']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
@@ -3130,7 +3142,7 @@ class ConverterI7 {
     convertTrenner3f(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNER_3P)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNER_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNER_3P), containerIDs));
+                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']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
@@ -3146,7 +3158,7 @@ class ConverterI7 {
     convertLeistungsschalter(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER), containerIDs));
+                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']));
                     yield this.convertSwitch(breaker, cimModel, i7Data);
@@ -3200,7 +3212,7 @@ class ConverterI7 {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             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, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSDROSSEL), integral7.lDrosselAnschlussKnotenIDs));
+                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 start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
@@ -3262,7 +3274,7 @@ class ConverterI7 {
         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, this.getAvailableColumnNames(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));
@@ -3324,7 +3336,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenKdrossel() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KDROSSEL)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KDROSSEL), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KDROSSEL, []));
                 for (const i7Data of result) {
                     this.kdrosseltypen.set(i7Data.name, i7Data);
                 }
@@ -3339,7 +3351,7 @@ class ConverterI7 {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const stpSchieneIDs = [];
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE)) {
-                    const stpSchiene = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE), standortIDs));
+                    const stpSchiene = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHIENE, standortIDs));
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
@@ -3379,7 +3391,7 @@ class ConverterI7 {
                 try {
                     if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ)) {
                         if (stpScheinenID.length) {
-                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ), stpScheinenID));
+                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, stpScheinenID));
                             for (const i7Data of result) {
                                 const kdType = this.kdrosseltypen.get(i7Data.nametyp);
                                 const imax = utils_2.isNumericI7(i7Data.imax) ? i7Data.imax : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.imax) ? kdType === null || kdType === void 0 ? void 0 : kdType.imax : undefined);
@@ -3431,7 +3443,7 @@ class ConverterI7 {
                 try {
                     if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER)) {
                         if (stpSchienenID.length) {
-                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER), stpSchienenID));
+                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, stpSchienenID));
                             for (const i7Data of result) {
                                 const terminal = integral7.sternPunktImpModel.stpSchieneTerminal.get(i7Data.eknoten);
                                 if (terminal) {
@@ -3461,7 +3473,7 @@ class ConverterI7 {
     convertLaengskupplungen(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
                     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');
@@ -3494,7 +3506,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenLeitung() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_FREILEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_FREILEITUNG, []));
                 for (const i7Data of result) {
                     const typ = new EVWireInfo_1.EVWireInfo(utils_1.generateUUID(), i7Data.name);
                     this.setWireInfoProperties(typ, i7Data, 'Freileitung');
@@ -3505,7 +3517,7 @@ class ConverterI7 {
                 this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KABEL)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KABEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KABEL), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KABEL, []));
                 for (const i7Data of result) {
                     const typ = new EVWireInfo_1.EVWireInfo(utils_1.generateUUID(), i7Data.name);
                     this.setWireInfoProperties(typ, i7Data, 'Kabel');
@@ -3534,25 +3546,25 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) && integral7.leitungsAnschlussIDs.length) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEITUNG), integral7.leitungsAnschlussIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEITUNG, integral7.leitungsAnschlussIDs));
                 const leitungIDs = result.map(elem => elem.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;
-                let tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                 if (cableAvailable && overheadAvailable) {
                     type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG;
                 }
                 else if (cableAvailable) {
                     type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL;
-                    tableName = integral_sql_1.Integral7TableNames.KABEL;
                 }
                 else if (overheadAvailable) {
                     type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
-                    tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                 }
-                const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, this.getAvailableColumnNames(tableName), leitungIDs));
+                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) > 0))
                         continue;
@@ -3585,8 +3597,11 @@ class ConverterI7 {
                             utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                             '-' +
                             utils_2.ueberpruefeZeichenkette(stk.bezeichner);
-                        const cimrdfid = utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137);
-                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(cimrdfid, util_create_1.createNotation([name, '_' + stk.pos.toString(), '_' + cimrdfid.substring(0, 8), '_ACLS'], 32, true), 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);
@@ -3616,6 +3631,12 @@ 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);
                     const anzahl = acLineSegments.length;
@@ -3629,6 +3650,9 @@ class ConverterI7 {
                         if (tmp_terminal) {
                             tmp_terminal = undefined;
                         }
+                        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);
@@ -3706,8 +3730,11 @@ class ConverterI7 {
         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 > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_LEITUNG), integral7.hgueAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
+                    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 +
@@ -3776,7 +3803,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenTrafo() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO2W)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO2W), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO2W, []));
                 for (const i7Data of result) {
                     const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(utils_1.generateUUID(), i7Data.name);
                     typTrafo.ukr12 = i7Data.ukr;
@@ -3804,7 +3831,7 @@ class ConverterI7 {
                 this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO2W} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO3W)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO3W), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO3W, []));
                 for (const i7Data of result) {
                     const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(utils_1.generateUUID(), i7Data.name);
                     typTrafo.pLeer = i7Data.p_leer;
@@ -3844,7 +3871,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenGenerator() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_GENERATOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_GENERATOR), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_GENERATOR, []));
                 for (const i7Data of result) {
                     this.generatorTypen.set(i7Data.name, i7Data);
                 }
@@ -3857,7 +3884,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenAsynchronmotor() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_ASYNCHRONMOTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR), []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_ASYNCHRONMOTOR, []));
                 for (const i7Data of result) {
                     this.asynchronmotorTypen.set(i7Data.name, i7Data);
                 }
@@ -3870,7 +3897,7 @@ class ConverterI7 {
     convertMultiplikationsfaktoren() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR), []));
+                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) : undefined;
@@ -3892,14 +3919,14 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W)) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO2W), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO2W, standortIDs));
                 const trafoIDs = result.map(obj => obj['id']);
                 const sternpunktKnotenMap = new Map();
                 for (const elem of trafoIDs) {
                     sternpunktKnotenMap.set(elem, new Map());
                 }
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN) && trafoIDs.length) {
-                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), trafoIDs));
+                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, trafoIDs));
                     for (const spKnoten of sternpunktKnotenResult) {
                         (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
                     }
@@ -4002,13 +4029,12 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3W)) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, standortIDs));
                 const trafoIDs = result.map(obj => obj['id']);
                 const trafoWicklungen = new Map();
                 const trafoWicklungIDs = [];
-                const tableNameWicklung = integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG;
-                if (this.isTableAvailable(tableNameWicklung) && trafoIDs.length) {
-                    const wicklungenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3_WICKLUNG, this.getAvailableColumnNames(tableNameWicklung), trafoIDs));
+                if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) && trafoIDs.length) {
+                    const wicklungenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3_WICKLUNG, trafoIDs));
                     for (const wicklung of wicklungenResult) {
                         trafoWicklungen.set(wicklung.id, wicklung);
                         trafoWicklungIDs.push(wicklung.id);
@@ -4021,9 +4047,8 @@ class ConverterI7 {
                 for (const elem of trafoIDs) {
                     sternpunktKnotenMap.set(elem, new Map());
                 }
-                const tableNameStpKnoten = integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN;
-                if (this.isTableAvailable(tableNameStpKnoten) && trafoIDs.length) {
-                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(tableNameStpKnoten), trafoIDs));
+                if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN) && trafoIDs.length) {
+                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, trafoIDs));
                     for (const spKnoten of sternpunktKnotenResult) {
                         (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
                     }
@@ -4282,6 +4307,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++) {
@@ -4304,12 +4332,11 @@ class ConverterI7 {
         }
     }
     setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, defaultValuesConfig) {
-        if (utils_2.isBooleanI7(data.flag_impedanzlos) && utils_2.convertToBooleanI7(data.flag_impedanzlos)) {
-            data.flag_impedanzlos = 1;
+        if (acLineSegment.getUUID() === 'e2505f0f-c764-44da-b88b-d40e048193c9') {
+            let stop = true;
         }
-        else if (!utils_2.isNumericI7(data.laenge) && utils_2.isBooleanI7(data.flag_impedanzlos) && !utils_2.convertToBooleanI7(data.flag_impedanzlos)) {
-            data.flag_impedanzlos = 0;
-            data.laenge = 1;
+        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) {
             acLineSegment.length = data.laenge;
@@ -4435,6 +4462,9 @@ 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) {
@@ -4677,26 +4707,7 @@ class ConverterI7 {
             try {
                 const results = yield this.mysqlController.execQuery(`SHOW TABLES FROM  ${database}`);
                 for (const table of results) {
-                    this.availableTableNames.set(table[`Tables_in_${database}`], []);
-                }
-            }
-            catch (e) {
-                this.logger.error(e);
-                console.error('ERROR:' + e);
-            }
-        });
-    }
-    getAvailableTableColumnNames(database) {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const query = `SELECT table_name, column_name 
-                   FROM information_schema.columns
-                   WHERE table_schema = '${database}'
-                   ORDER BY table_name, ORDINAL_POSITION;`;
-            try {
-                const results = yield this.mysqlController.execQuery(query);
-                for (const table of results) {
-                    (_a = this.availableTableNames.get(table['table_name'])) === null || _a === void 0 ? void 0 : _a.push(table['column_name']);
+                    this.availableTableNames.push(table[`Tables_in_${database}`]);
                 }
             }
             catch (e) {
@@ -4712,7 +4723,6 @@ class ConverterI7 {
                 this.logger = logger;
                 this.initMySQLConnection(mySqlConfig);
                 yield this.getAvailableTableNames(mySqlConfig.database);
-                yield this.getAvailableTableColumnNames(mySqlConfig.database);
             }
             catch (e) {
                 status.status = 'error';
@@ -4814,7 +4824,7 @@ class ConverterI7 {
                 const offset = i * limit;
                 const currentLimit = (i + 1 === numberOfIntervals && restCount > 0) ? restCount : limit;
                 const partSchaltfeldIDs = ids.slice(offset, offset + currentLimit);
-                result.push(...yield this.mysqlController.execQuery(integral_sql_1.getI7Query(objectName, this.getAvailableColumnNames(objectName), partSchaltfeldIDs)));
+                result.push(...yield this.mysqlController.execQuery(integral_sql_1.getI7Query(objectName, partSchaltfeldIDs)));
             }
             return result;
         });
@@ -5330,10 +5340,7 @@ class ConverterI7 {
         return filteredRelevantTables;
     }
     isTableAvailable(tableName) {
-        return this.availableTableNames.has(tableName);
-    }
-    getAvailableColumnNames(tableName) {
-        return this.availableTableNames.get(tableName);
+        return this.availableTableNames.indexOf(tableName) > -1 ? true : false;
     }
     addIdMapping(i7ID, uuid, type) {
         if (this.integralID2UUID.has(i7ID)) {