@enervance/insight-cim-model 0.0.61 → 0.0.62

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

@@ -7,7 +7,6 @@ const jszip_1 = tslib_1.__importDefault(require("jszip"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const perf_hooks_1 = require("perf_hooks");
 const cim_class_names_1 = require("../../constants/cim-class-names");
-const cim_constants_1 = require("../../constants/cim-constants");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const CoordinateSystem_1 = require("../../model/common/CoordinateSystem");
 const Location_1 = require("../../model/common/Location");
@@ -34,10 +33,6 @@ const DCTerminal_1 = require("../../model/dc/DCTerminal");
 const VsConverter_1 = require("../../model/dc/VsConverter");
 const VsPpccControlKind_1 = require("../../model/dc/VsPpccControlKind");
 const VsQpccControlKind_1 = require("../../model/dc/VsQpccControlKind");
-const Diagram_1 = require("../../model/diagram/Diagram");
-const DiagramObject_1 = require("../../model/diagram/DiagramObject");
-const DiagramObjectPoint_1 = require("../../model/diagram/DiagramObjectPoint");
-const OrientationKind_1 = require("../../model/diagram/OrientationKind");
 const ApparentPower_1 = require("../../model/domain/ApparentPower");
 const CurrentFlow_1 = require("../../model/domain/CurrentFlow");
 const UnitMultiplier_1 = require("../../model/domain/UnitMultiplier");
@@ -116,32 +111,25 @@ const KnotenSo_1 = require("./model/integral/KnotenSo");
 const Leitung_1 = require("./model/integral/Leitung");
 const Schaltanlage_1 = require("./model/integral/Schaltanlage");
 const Schaltanlagenabschnitt_1 = require("./model/integral/Schaltanlagenabschnitt");
-const SchaltanlagenabschnittNsg_1 = require("./model/integral/SchaltanlagenabschnittNsg");
-const SchaltanlageNSG_1 = require("./model/integral/SchaltanlageNSG");
 const Schaltfeld_1 = require("./model/integral/Schaltfeld");
 const Standort_1 = require("./model/integral/Standort");
-const StandortNsg_1 = require("./model/integral/StandortNsg");
 const integral_sql_1 = require("./sql/integral.sql");
 const utils_2 = require("./utils");
-const utils_schema_1 = require("./utils-schema");
 const utils_trafo3w_1 = require("./utils-trafo3w");
 const INTEGRALModel_1 = require("../../model/extensions/integral/model/INTEGRALModel");
-const constants_1 = require("./model/dl-utils/constants");
-const util_functions_1 = require("./model/dl-utils/util-functions");
 const Laengskupplung_1 = require("./model/integral/Laengskupplung");
 const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel/INTEGRALConformLoad");
-const Trafo2wNsg_1 = require("./model/integral/Trafo2wNsg");
-const Trafo3wNsg_1 = require("./model/integral/Trafo3wNsg");
-const SchaltfeldNsg_1 = require("./model/integral/SchaltfeldNsg");
 const AngleDegrees_1 = require("../../model/domain/AngleDegrees");
 const AsynchronousMachineKind_1 = require("../../model/wires/AsynchronousMachineKind");
 const INTEGRALEquivalentInjection_1 = require("../../model/extensions/integral/equivalents/INTEGRALEquivalentInjection");
+const dl_converter_i7_1 = require("./dl-convert/dl-converter-i7");
+const util_graph2tree_1 = require("../../util/collection/util-graph2tree");
 class ConverterI7 {
     constructor() {
         this.exportFrames = new Map();
         this.exportFramesBoundary = new Map();
         this.cimModelDefault = new INTEGRALModel_1.INTEGRALModel();
-        this.availableTableNames = [];
+        this.availableTableNames = new Map();
         this.integralID2Type = new Map();
         this.coordinateSystem = 'EPSG:4326';
         this.integralID2UUID = new Map();
@@ -157,6 +145,7 @@ class ConverterI7 {
         this.lKondensatorAnschlussKnotenIDs = new Set();
         this.ersatzZweigAnschlussKnotenIDs = new Set();
         this.blocktransformatoren = [];
+        this.dlConverterI7 = new dl_converter_i7_1.DLConverterI7();
     }
     convert(objectMappingConfig, defaultValuesConfig, energyTypesConfig, exportConfig, tempDirPath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -176,9 +165,11 @@ class ConverterI7 {
                 yield this.queryErsatzLaengsAnschlussIDs();
                 yield this.queryLkondensatorAnschlussIDs();
                 console.log('Convert BD Profiles');
+                let boundaryEqUUId = undefined;
                 for (const entry of this.exportFramesBoundary.entries()) {
                     const geoRegionUUID = entry[0];
                     const frame = entry[1];
+                    boundaryEqUUId = frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD);
                     const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
                     if (!geoRegion)
                         continue;
@@ -193,6 +184,9 @@ class ConverterI7 {
                         continue;
                     console.log(`Convert MAS profile: ${frame.mas}`);
                     yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
+                    if (boundaryEqUUId) {
+                        frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ, boundaryEqUUId);
+                    }
                     frame.validateCIMModel();
                     frame.purgeData();
                     const startTime = perf_hooks_1.performance.now();
@@ -202,11 +196,8 @@ class ConverterI7 {
                     yield frame.closeXMLModel();
                     let endTime = perf_hooks_1.performance.now();
                     frame.cimModel.purgeData();
-                    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(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
                 }
-                console.log('________________________________________________');
                 console.log('Serialize BD Profiles');
                 for (const entry of this.exportFramesBoundary.entries()) {
                     const geoRegionUUID = entry[0];
@@ -234,7 +225,7 @@ class ConverterI7 {
                         zip.file(`${xmlSerializer.fileName}`, readStreamEq);
                     }
                 }
-                resolve(yield utils_2.generateNodeStream(zip));
+                resolve(yield (0, utils_2.generateNodeStream)(zip));
             }));
         });
     }
@@ -312,6 +303,39 @@ class ConverterI7 {
                 logExecutionTime(this.logger, startTime, `convertStarreVerbindungen(${cimModel.junctions.size})`);
             }
             const soSfKnoten = [...knotenSoIDs, ...integral7Modell.knotenSfIDs];
+            if (eqiupmentContainerIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertTrenner3f(cimModel, eqiupmentContainerIDs);
+                logExecutionTime(this.logger, startTime, `convertTrenner3f()`);
+            }
+            if (eqiupmentContainerIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertTrennerFi3f(cimModel, eqiupmentContainerIDs);
+                logExecutionTime(this.logger, startTime, `convertTrennerFi3f`);
+            }
+            if (eqiupmentContainerIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertLeistungsschalter(cimModel, eqiupmentContainerIDs);
+                logExecutionTime(this.logger, startTime, `convertLeistungsschalter(${cimModel.breakers.size})`);
+            }
+            if (standortIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertTrafo2W(frame, integral7Modell, defaultValuesConfig, standortIDs);
+                logExecutionTime(this.logger, startTime, `convertTrafo2W`);
+            }
+            if (standortIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertTrafo3W(frame, integral7Modell, defaultValuesConfig, standortIDs);
+                logExecutionTime(this.logger, startTime, `convertTrafo3W`);
+            }
+            if (!frame.boundary) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertLeitungen(frame, integral7Modell, defaultValuesConfig);
+                logExecutionTime(this.logger, startTime, `convertLeitungen`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertErsatzLaengszweige(frame, integral7Modell, defaultValuesConfig);
+                logExecutionTime(this.logger, startTime, `convertErsatzlaengszweige`);
+            }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
                 yield this.convertBelastungen(cimModel, soSfKnoten, defaultValuesConfig, objectMappingConfig.Belastung.class);
@@ -349,29 +373,14 @@ class ConverterI7 {
             }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
-                yield this.convertKompensationsdrossel(cimModel, soSfKnoten);
+                yield this.convertKompensationsdrossel(cimModel, integral7Modell.targetVoltages, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertKompensationsdrossel`);
             }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
-                yield this.convertKompensationskondensatoren(cimModel, soSfKnoten);
+                yield this.convertKompensationskondensatoren(cimModel, integral7Modell.targetVoltages, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertKompensationskondensatoren`);
             }
-            if (eqiupmentContainerIDs.length > 0) {
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertTrenner3f(cimModel, eqiupmentContainerIDs);
-                logExecutionTime(this.logger, startTime, `convertTrenner3f()`);
-            }
-            if (eqiupmentContainerIDs.length > 0) {
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertTrennerFi3f(cimModel, eqiupmentContainerIDs);
-                logExecutionTime(this.logger, startTime, `convertTrennerFi3f`);
-            }
-            if (eqiupmentContainerIDs.length > 0) {
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertLeistungsschalter(cimModel, eqiupmentContainerIDs);
-                logExecutionTime(this.logger, startTime, `convertLeistungsschalter(${cimModel.breakers.size})`);
-            }
             if (standortIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
                 const stpSchieneID = yield this.convertSternpunktSchienen(cimModel, integral7Modell, standortIDs);
@@ -379,16 +388,6 @@ class ConverterI7 {
                 yield this.convertStpSchaltelemente(integral7Modell, stpSchieneID);
                 logExecutionTime(this.logger, startTime, `convertSternpunkte`);
             }
-            if (standortIDs.length > 0) {
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertTrafo2W(frame, integral7Modell, defaultValuesConfig, standortIDs);
-                logExecutionTime(this.logger, startTime, `convertTrafo2W`);
-            }
-            if (standortIDs.length > 0) {
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertTrafo3W(frame, integral7Modell, defaultValuesConfig, standortIDs);
-                logExecutionTime(this.logger, startTime, `convertTrafo3W`);
-            }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
                 yield this.convertStatcom(cimModel, soSfKnoten);
@@ -399,6 +398,10 @@ class ConverterI7 {
                 yield this.convertSVC(cimModel, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertSVC`);
             }
+            startTime = perf_hooks_1.performance.now();
+            if (standortIDs.length)
+                yield this.convertKnotenHgue(frame, integral7Modell, standortIDs, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `convertKnotenHgue(${standortIDs.length})`);
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
                 yield this.convertCsConverterDC(cimModel, integral7Modell, soSfKnoten);
@@ -409,14 +412,6 @@ class ConverterI7 {
                 yield this.convertVsConverterDC(cimModel, integral7Modell, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertVsConverterDC`);
             }
-            if (!frame.boundary) {
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertLeitungen(frame, integral7Modell, defaultValuesConfig);
-                logExecutionTime(this.logger, startTime, `convertLeitungen`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertErsatzLaengszweige(frame, integral7Modell, defaultValuesConfig);
-                logExecutionTime(this.logger, startTime, `convertErsatzlaengszweige`);
-            }
             startTime = perf_hooks_1.performance.now();
             yield this.convertDCLines(cimModel, integral7Modell, defaultValuesConfig);
             logExecutionTime(this.logger, startTime, `convertDCLines`);
@@ -429,40 +424,33 @@ class ConverterI7 {
             startTime = perf_hooks_1.performance.now();
             yield this.assignTerminalSequenceNumber(cimModel);
             logExecutionTime(this.logger, startTime, `assignment of sequence number`);
+            this.dlConverterI7.prepare(this.mysqlController, this.logger);
+            const powerTransformers = cimModel.powerTransformer;
+            const powerTransformerEnds = cimModel.powerTransformerEnds;
+            const lines = cimModel.lines;
+            const objects = cimModel.objects;
+            yield this.dlConverterI7.convert(this.availableTableNames, true, {
+                standortIDs,
+                schaltanlagenIDs,
+                schaltanlagenAbschnittIDs,
+                knotenSoIDs,
+                schaltfeldIDs,
+                laengskupplungIDs: integral7Modell.laengskupplungIDs,
+                querkupplungIDs: integral7Modell.querkupplungIDs,
+                integralID2UUID: this.integralID2UUID,
+                integralSchaltfelder: integral7Modell.integralSchaltfelder,
+                integralLaengskupplungen: integral7Modell.integralLaengskupplungen,
+                powerTransformers,
+                powerTransformerEnds,
+                integralLeitungen: integral7Modell.integralLeitungen,
+                integralHgueLeitungen: integral7Modell.integralHgueLeitungen,
+                lines,
+                objects
+            });
+            this.dlConverterI7.addCimObjects2Model(cimModel);
+            this.dlConverterI7.cleanUp();
             startTime = perf_hooks_1.performance.now();
             yield this.convertNetzvarianten(cimModel, integral7Modell);
-            for (const key of integral7Modell.i7SchemaID2UUID.keys()) {
-                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.placedCIMObjectsForDLProfil.clear();
-                }
-            }
             logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
         });
     }
@@ -530,11 +518,11 @@ class ConverterI7 {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const regions = [];
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.REGION)) {
-                    this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGION, 0, 0, []))
+                    this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.REGION, 0, 0, []))
                         .then((result) => {
                         for (const i7Data of result) {
-                            const i7Schluessel = integral_prefix_1.GEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_GR']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
+                            const i7Schluessel = integral_prefix_1.GEOREGION_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                            const region = new GeographicalRegion_1.GeographicalRegion((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_GR']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
                         }
@@ -556,10 +544,10 @@ class ConverterI7 {
     convertRegelzone(cimModel, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.REGELZONE)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
                 for (const i7Data of result) {
-                    const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const ctrlarea = new ControlArea_1.ControlArea(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_RZ']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
+                    const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                    const ctrlarea = new ControlArea_1.ControlArea((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_RZ']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
                     cimModel.addControlArea(ctrlarea);
                     this.addIdMapping(i7Data.id, ctrlarea.mrid, integral_sql_1.Integral7TableNames.REGELZONE);
                 }
@@ -574,15 +562,15 @@ class ConverterI7 {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const subRegions = [];
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SUBREGION)) {
-                    this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.SUBREGION, 0, 0, []))
+                    this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.SUBREGION, 0, 0, []))
                         .then((result) => {
                         for (const i7Data of result) {
-                            const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), '_SGR']), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                            const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_SGR']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluesel);
                             const regionUUID = this.integralID2UUID.get(i7Data.georegion);
                             let region = regions.find(elem => elem.mrid === regionUUID);
                             if (!region) {
-                                region = utils_1.createIfNotExitsGeoregionByName(this.cimModelDefault, util_create_1.createNotation([defaultValuesConfig.GeographicalRegion.name, '_GR']));
+                                region = (0, utils_1.createIfNotExitsGeoregionByName)(this.cimModelDefault, (0, util_create_1.createNotation)([defaultValuesConfig.GeographicalRegion.name, '_GR']));
                                 this.logger.debug(`SubGeographicalRegion UUID ${subregion.mrid} I7-ID ${i7Data.id} Name ${i7Data.bezeichner} hat keine Region.`);
                             }
                             subregion.region = region;
@@ -607,1046 +595,34 @@ 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, [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;
-                    diagram.diagramStyle = cimModel.getDiagramStyle(cim_constants_1.DIAGRAM_LAYOUT_TYPES.NODE_BREAKER);
-                    cimModel.addDiagram(diagram);
-                    integral7.i7SchemaID2UUID.set(i7Data.id, diagram.mrid);
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NETZVARIANTEN} ist nicht vorhanden.`);
-            }
         });
     }
     convertSchemaStandorte(cimModel, integral7, standortIDs, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STANDORT) && standortIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STANDORT, standortIDs));
-                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_STANDORT);
-                    const standort = integral7.integralStandorte.get(i7Data.standort);
-                    if (standort) {
-                        standort.standortNsg = new StandortNsg_1.StandortNsgImpl(i7Data);
-                        integral7.integralNSGStandorte.set(i7Data.id, standort.standortNsg);
-                    }
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STANDORT} ist nicht vorhanden.`);
-            }
-        });
-    }
-    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, 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) {
-                    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 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 {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertSchemaHgueKnotenSo(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) && nsgStandortIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_HGUE, nsgStandortIDs));
-                const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
-                for (const i7Data of filteredResults) {
-                    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);
-                    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 {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertSchemaSchaltanlage(cimModel, integral7, saIDs, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE) && saIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, saIDs));
-                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_SCHALTANLAGE);
-                    const schaltanlage = integral7.integralSchaltanlagen.get(i7Data.schaltanlage);
-                    if (schaltanlage) {
-                        schaltanlage.schaltanlageNsg = new SchaltanlageNSG_1.SchaltanlageNsgImpl(i7Data);
-                        integral7.integralNSGSchaltanlage.set(i7Data.id, schaltanlage.schaltanlageNsg);
-                    }
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE} ist nicht vorhanden.`);
-            }
-        });
-    }
-    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, schaltanlagenabschnittIDs));
-                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_SCHALTANLAGENABSCHNITT);
-                    const saabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    if (saabschnitt) {
-                        saabschnitt.schaltanlagenabschnittNsg = new SchaltanlagenabschnittNsg_1.SchaltanlagenabschnittNsg(i7Data);
-                        saabschnitt.schaltanlagenabschnittNsg.saabschnitt = saabschnitt;
-                        saabschnitt.schaltanlagenabschnittNsg.nsgsa = integral7.integralNSGSchaltanlage.get(i7Data.nsgsa);
-                        saabschnitt.schaltanlagenabschnittNsg.nsgsa.saabNsg.push(saabschnitt.schaltanlagenabschnittNsg);
-                        integral7.integralNSGSAAbschnitt.set(i7Data.id, saabschnitt.schaltanlagenabschnittNsg);
-                    }
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertSchemaSammelschienenAbschnitte(cimModel, integral7, schaltanlagenabschnittIDs, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (schaltanlagenabschnittIDs.length <= 0)
-                return;
-            const isEingeblendet = 1;
-            let sqlSelectGroupedMaxSlotSf = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
-                                     FROM nsg_nsgschaltfeld
-                                     WHERE ((${integral_sql_1.getWhereIDs('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
-            if (onlyEingeblendet) {
-                sqlSelectGroupedMaxSlotSf += ` AND (eingeblendet = ${isEingeblendet} OR (eingeblendet IS NULL AND angezeigt = ${isEingeblendet}))`;
-            }
-            sqlSelectGroupedMaxSlotSf += ` GROUP BY nsgsaa`;
-            const resultsMaxSlotsSf = yield this.mysqlController.execQuery(sqlSelectGroupedMaxSlotSf);
-            const mappedResultsMaxSlotsSf = new Map(resultsMaxSlotsSf.map(value => [value.nsgsaa, value.laenge]));
-            let sqlSelectGroupedMaxSlotKpF = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
-                                      FROM nsg_nsgkpfeld
-                                      WHERE ((${integral_sql_1.getWhereIDs('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
-            if (onlyEingeblendet) {
-                sqlSelectGroupedMaxSlotKpF += ` AND (eingeblendet = ${isEingeblendet} OR (eingeblendet IS NULL AND angezeigt = ${isEingeblendet}))`;
-            }
-            sqlSelectGroupedMaxSlotKpF += ` GROUP BY nsgsaa`;
-            const resultsMaxSlotsKpF = yield this.mysqlController.execQuery(sqlSelectGroupedMaxSlotKpF);
-            const mappedResultsMaxSlotsKpF = new Map(resultsMaxSlotsKpF.map(value => [value.nsgsaa, value.laenge]));
-            const sqlStatement = `SELECT nsg_nsgsaab.variantennr,
-              nsg_nsgsaab.id,
-              nsg_nsgsaab.laenge AS laenge,
-              nsg_nsgsaab.nslots,
-              nsg_nsgsaab.saabschnitt,
-              nsg_nsgsaab.nsgsa,
-              nsg_nsgsaab.angezeigt,
-              nsg_nsgsaab.eingeblendet,
-              nsg_nsgsaab.nsglkp,
-              netz_ssab.pos      AS posSSAB,
-              netz_ssab.id       AS idSSAB
-       FROM netz_ssab
-                LEFT JOIN nsg_nsgsaabschnitt AS nsg_nsgsaab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
-       WHERE (${integral_sql_1.getWhereIDs('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')});`;
-            const queryResults = yield this.mysqlController.execQuery(sqlStatement);
-            queryResults.forEach(value => {
-                value.laenge = Math.max((mappedResultsMaxSlotsSf.get(value.id) || 0), (mappedResultsMaxSlotsKpF.get(value.id) || 0), value.laenge);
-            });
-            const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(queryResults, variantenNr, onlyEingeblendet);
-            for (const queryResult of filteredResults) {
-                const nsgSa = integral7.integralNSGSchaltanlage.get(queryResult.nsgsa);
-                const nsgSo = integral7.integralNSGStandorte.get(nsgSa.nsgsoid);
-                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.`);
-                }
-            }
-        });
-    }
-    convertSchemaSchaltfeldElemente(cimModel, integral7, schaltfeldIDs, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) && schaltfeldIDs.length > 0) {
-                const i7relevantTables = [
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNERFI_3P],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
-                ];
-                const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
-                const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, schaltfeldIDs));
-                const resultsNsgSchaltfeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTFELD, schaltfeldIDs));
-                const filteredResultsNsgSchaltfeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgSchaltfeld, variantenNr, onlyEingeblendet);
-                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;
-                    }
-                    const nsgSo = integral7.integralNSGStandorte.get(nsgSa.nsgsoid);
-                    if (nsgSo === undefined) {
-                        continue;
-                    }
-                    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();
-                    const uuidPointsMap = new Map();
-                    const schaltfeldLeftOffset = i7Data.slotnummer * constants_1.NsgConstants.HORIZONTAL_OFFSET;
-                    const schaltfeldDeltaausrichtung = i7Data.deltaausrichtung;
-                    const schaltfeldI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === i7Data.schaltfeld);
-                    let shiftFromBusbar = false;
-                    if (schaltfeldI7KnotenBeziehungen.length == 1) {
-                        shiftFromBusbar = true;
-                    }
-                    const ssabs = integral7.integralSchaltfelder.get(i7Data.schaltfeld).saabschnitt.ssab;
-                    const maxSSabPos = Math.max(...ssabs.map(ssab => ssab.pos));
-                    const onSSabNodes = schaltfeldI7KnotenBeziehungen.filter(elem => ssabs.find(ssab => ssab.id === elem.aknoten) !== undefined);
-                    const xPos = schaltfeldLeftOffset + (constants_1.NsgConstants.HORIZONTAL_OFFSET / 2);
-                    let lastNode = undefined;
-                    for (const node of onSSabNodes) {
-                        const ssabYPos = integral7.integralNSGSsab.get(node.aknoten).posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
-                        let yStackPos = 1;
-                        let prevNode = null;
-                        let crtNode = node;
-                        while (crtNode) {
-                            if (nodePointMap.get(crtNode.id) === undefined) {
-                                let 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 {
-                                        yPosAKnoten = (yPos - prevNodeY) / 2 + prevNodeY;
-                                    }
-                                    nodePointMap.set(crtNode.aknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPosAKnoten));
-                                }
-                            }
-                            lastNode = crtNode;
-                            prevNode = crtNode;
-                            crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
-                        }
-                    }
-                    const lastEKnotenUUID = this.integralID2UUID.get(lastNode.eknoten);
-                    if (!integral7.placedCIMObjectsForDLProfil.has(lastEKnotenUUID) && !nodePointMap.has(lastNode.eknoten)) {
-                        const yPos = (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (i7Data.hoehe);
-                        const heightAdjustement = schaltfeldDeltaausrichtung === 0 ? (constants_1.NsgConstants.VERTICAL_OFFSET * (maxSSabPos + 1)) : 0;
-                        nodePointMap.set(lastNode.eknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos + heightAdjustement));
-                    }
-                    nsgSchaltfeldObj.lastNodeID = lastNode.eknoten;
-                    nsgSchaltfeldObj.lastNodeCimUUID = lastEKnotenUUID;
-                    for (const node of onSSabNodes) {
-                        let crtNode = node;
-                        while (crtNode) {
-                            let aKnotenPos = undefined;
-                            if (crtNode === node) {
-                                aKnotenPos = new DiagramObjectPoint_1.DiagramObjectPoint(xPos, integral7.integralNSGSsab.get(crtNode.aknoten).posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET);
-                            }
-                            util_functions_1.DLUtilFunctions.exportTerminals(crtNode, nodePointMap, uuidPointsMap, cimModel, this.integralID2UUID, aKnotenPos);
-                            crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
-                        }
-                    }
-                    [...nodePointMap.entries()].forEach(entry => {
-                        uuidPointsMap.set(this.integralID2UUID.get(entry[0]), entry[1]);
-                    });
-                    nsgSchaltfeldObj.orientation = nsgSa.ausrichtung;
-                    if (i7Data.deltaausrichtung === 1) {
-                        nsgSchaltfeldObj.orientation = (nsgSchaltfeldObj.orientation + 2) % 4;
-                    }
-                    uuidPointsMap.forEach((entryDiagramObject, key) => {
-                        if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
-                            entryDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSaNsgSf(nsgSa.ausrichtung, schaltfeldDeltaausrichtung);
-                        }
-                    });
-                    util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap, true);
-                }
-            }
-        });
-    }
-    convertSchemaQuerkupplungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG) && integral7.querkupplungIDs.length > 0) {
-                const i7relevantTables = [
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNERFI_3P],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
-                ];
-                const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
-                const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, integral7.querkupplungIDs));
-                const resultsNsgKpFeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERKUPPLUNG, integral7.querkupplungIDs));
-                const filteredResultsNsgKpFeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgKpFeld, variantenNr, onlyEingeblendet);
-                for (const i7Data of filteredResultsNsgKpFeld) {
-                    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;
-                    const kpFeldI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === i7Data.kpfeld);
-                    const ssabs = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa).saabschnitt.ssab;
-                    const relevantSSabIDs = new Set();
-                    ssabs.forEach(ssab => relevantSSabIDs.add(ssab.id));
-                    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)) {
-                            entryDiagramObject.rotation += (util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung) - 90 + 720);
-                            entryDiagramObject.rotation = entryDiagramObject.rotation % 360;
-                        }
-                    });
-                    util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap, true);
-                }
-            }
-        });
-    }
-    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 && ssabIDs.length > 0) {
-                const i7relevantTables = [
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNERFI_3P],
-                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
-                ];
-                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, ssabIDs));
-                const filteredResultsNsgLKupplung = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgLKupplung, variantenNr, onlyEingeblendet);
-                for (const i7Data of filteredResultsNsgLKupplung) {
-                    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);
-                    for (const netzLaengskupplungObj of netzLaengskupplungsObjs) {
-                        const lKupplungI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === netzLaengskupplungObj.id);
-                        const relevantSSabIDs = new Set();
-                        integral7.integralSchaltanlagen.get(schaltanlagenID).saab.forEach(netz_saab => netz_saab.ssab.forEach(ssab => relevantSSabIDs.add(ssab.id)));
-                        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 === 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);
-                    }
-                }
-            }
-        });
-    }
-    convertSchemaTransformatoren2W(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO2W) && nsgStandortIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO2W, nsgStandortIDs));
-                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
-                for (const i7Data of filteredResults) {
-                    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);
-                        }
-                        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.`);
-            }
-        });
-    }
-    convertSchemaTransformatoren3W(cimModel, integral7, standortIDs, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO3W) && nsgStandortIDs.length > 0 && standortIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO3W, nsgStandortIDs));
-                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
-                const netzTrafoResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, standortIDs));
-                const netzTrafos = new Map(netzTrafoResults.map(obj => [obj.id, obj]));
-                for (const i7Data of filteredResults) {
-                    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);
-                    const trafoDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO3W_WIDTH / 2, constants_1.NsgConstants.TRAFO3W_HEIGHT / 2);
-                    trafoDiagramObject.rotation = 360 - (constants_1.NsgConstants.TAFO3W_RotationOrder.indexOf(trafo3wNsg.ausrichtung) * 30) % 360;
-                    const tempPoints = [];
-                    tempPoints.push(trafoDiagramObject.diagramObjectPoints[0]);
-                    const trafo3wNetz = netzTrafos.get(trafo3wNsg.trafo3wid);
-                    if (trafo3wNetz === undefined)
-                        continue;
-                    const pteW1 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w1));
-                    const pteW2 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w2));
-                    const pteW3 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w3));
-                    const exchangeGroups = constants_1.NsgConstants.TRAFO3W_ExchangeGroups;
-                    let exchangeGroup = undefined;
-                    for (const key of Object.keys(exchangeGroups)) {
-                        if (exchangeGroups[key].indexOf(trafo3wNsg.ausrichtung) !== -1) {
-                            exchangeGroup = constants_1.NsgConstants.TRAFO3W_ExchangeMap[key];
-                            break;
-                        }
-                    }
-                    const rotationenGroups = constants_1.NsgConstants.TRAFO3W_RotationGroups;
-                    let rotationenGroup = undefined;
-                    for (const key of Object.keys(rotationenGroups)) {
-                        if (rotationenGroups[key].indexOf(trafo3wNsg.ausrichtung) !== -1) {
-                            rotationenGroup = constants_1.NsgConstants.TRAFO3W_RotationGroup2Positions[key];
-                            break;
-                        }
-                    }
-                    const xMirroring = trafo3wNsg.orientierung_cw === 1;
-                    const terminal1 = pteW1.terminal;
-                    const terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[1]]);
-                    tempPoints.push(terminal1DiagramObject.diagramObjectPoints[0]);
-                    const terminal2 = pteW2.terminal;
-                    const terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[xMirroring ? 3 : 2]]);
-                    tempPoints.push(terminal2DiagramObject.diagramObjectPoints[0]);
-                    const terminal3 = pteW3.terminal;
-                    const terminal3DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[xMirroring ? 2 : 3]]);
-                    tempPoints.push(terminal3DiagramObject.diagramObjectPoints[0]);
-                    for (const p of tempPoints) {
-                        p.xPosition += trafo3wNsg.xrel;
-                        p.yPosition += trafo3wNsg.yrel;
-                    }
-                    uuidPointsMap.set(this.integralID2UUID.get(trafo3wNsg.trafo3wid), trafoDiagramObject);
-                    if (terminal1 !== undefined) {
-                        uuidPointsMap.set(terminal1.getUUID(), terminal1DiagramObject);
-                    }
-                    if (terminal2 !== undefined) {
-                        uuidPointsMap.set(terminal2.getUUID(), terminal2DiagramObject);
-                    }
-                    if (terminal3 !== undefined) {
-                        uuidPointsMap.set(terminal3.getUUID(), terminal3DiagramObject);
-                    }
-                    util_functions_1.DLUtilFunctions.shiftAddBasedOnNsgSo(cimModel, integral7, variantenNr, trafo3wNsg.nsgsoid, uuidPointsMap);
-                    if (terminal1) {
-                        let t1CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getConnectivityNodeUUID());
-                        if (!t1CNdiagramObject) {
-                            t1CNdiagramObject = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFrames([...this.exportFramesBoundary.values()], terminal1.getConnectivityNodeUUID(), integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
-                        }
-                        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);
-                        }
-                        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);
-                    }
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_TRAFO3W} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertSchemaLeitungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const leitungIDs = [...integral7.integralLeitungen.keys(), ...integral7.integralHgueLeitungen.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNG) && this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT)
-                && leitungIDs.length > 0) {
-                const leitungResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNG, leitungIDs));
-                let filteredLeitungResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungResults, variantenNr, onlyEingeblendet);
-                const nsgLeitungIDs = filteredLeitungResults.map(elem => elem.id);
-                if (nsgLeitungIDs.length > 0) {
-                    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) {
-                        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) {
-                            netzLeitung = integral7.integralLeitungen.get(i7Data.leitung);
-                            aKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.aknotenid);
-                            eKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.eknotenid);
-                        }
-                        else {
-                            netzLeitung = integral7.integralHgueLeitungen.get(i7Data.leitung);
-                            aKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.anetzobjekt);
-                            eKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.enetzobjekt);
-                        }
-                        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 === undefined) {
-                            const tempAnf = util_functions_1.DLUtilFunctions.lookupKnotenSOInBoundaryFramesI7IDBased([...this.exportFramesBoundary.values()], i7Data.anschlussanf, variantenNr, integral7.placedCIMObjectsForDLProfil, integral7.integralAdditionalGrenzknotenIDs);
-                            tempAnfDiagramObject = tempAnf.diagramObject;
-                            anfSchemaType = tempAnf.schemaType;
-                        }
-                        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;
-                        }
-                        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;
-                            }
-                        }
-                        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;
-                        tempDiagramObjectPoints.push({
-                            xPosition: tempAnfDiagramObject.diagramObjectPoints[0].xPosition,
-                            yPosition: tempAnfDiagramObject.diagramObjectPoints[0].yPosition
-                        });
-                        const relevantLeitungspkts = filteredLeitungspktResults.filter(elem => elem.nsgleitung === i7Data.id).sort((a, b) => a.pos - b.pos);
-                        for (let a = 0; a < relevantLeitungspkts.length; a++) {
-                            const nsgLeitungspkt = relevantLeitungspkts[a];
-                            if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 1) {
-                                const tempDiagramObjectPoint = {
-                                    xPosition: tempAnfDiagramObject.diagramObjectPoints[0].xPosition,
-                                    yPosition: tempAnfDiagramObject.diagramObjectPoints[0].yPosition
-                                };
-                                const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(anfSchemaType, integral7, i7Data.anschlussanf, nsgLeitungspkt);
-                                tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
-                                tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
-                                tempDiagramObjectPoints.push(tempDiagramObjectPoint);
-                            }
-                            else if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 0) {
-                                const tempDiagramObjectPoint = {
-                                    xPosition: tempEndDiagramObject.diagramObjectPoints[0].xPosition,
-                                    yPosition: tempEndDiagramObject.diagramObjectPoints[0].yPosition
-                                };
-                                const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(endSchemaType, integral7, i7Data.anschlussend, nsgLeitungspkt);
-                                tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
-                                tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
-                                tempDiagramObjectPoints.push(tempDiagramObjectPoint);
-                            }
-                            else {
-                                tempDiagramObjectPoints.push({ xPosition: nsgLeitungspkt.xrel, yPosition: nsgLeitungspkt.yrel });
-                            }
-                        }
-                        tempDiagramObjectPoints.push({
-                            xPosition: tempEndDiagramObject.diagramObjectPoints[0].xPosition,
-                            yPosition: tempEndDiagramObject.diagramObjectPoints[0].yPosition
-                        });
-                        const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
-                        const diagram = cimModel.getDiagram(diagramUUID);
-                        if (isACLine) {
-                            const netzLeitungCimObj = cimModel.getLine(this.integralID2UUID.get(netzLeitung.id));
-                            const cableAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL);
-                            const overheadAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.FREILEITUNG);
-                            let type = integral_sql_1.I7Objects.STROMKREISABSCHNITT;
-                            if (cableAvailable && overheadAvailable) {
-                                type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG;
-                            }
-                            else if (cableAvailable) {
-                                type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL;
-                            }
-                            else if (overheadAvailable) {
-                                type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
-                            }
-                            const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, [netzLeitung.id]));
-                            leitungStromkreisabschnitt.sort((a, b) => a.pos - b.pos);
-                            const acSegmentPercentages = [];
-                            let completeLength = 0;
-                            for (let a = 0; a < leitungStromkreisabschnitt.length; ++a) {
-                                completeLength += leitungStromkreisabschnitt[a].laenge;
-                            }
-                            let crtLength = 0;
-                            for (let a = 0; a < leitungStromkreisabschnitt.length; ++a) {
-                                crtLength += leitungStromkreisabschnitt[a].laenge;
-                                acSegmentPercentages.push(crtLength / completeLength);
-                            }
-                            const eqUUIDs = netzLeitungCimObj.equipments.map(value => value.getUUID());
-                            const resultingDiagramObjects = util_functions_1.DLUtilFunctions.convertACLineSegment(completeLength, acSegmentPercentages, eqUUIDs, tempDiagramObjectPoints);
-                            for (const diagramObject of resultingDiagramObjects) {
-                                diagramObject.setDiagram(diagram);
-                                diagram.addDiagramObject(diagramObject);
-                            }
-                        }
-                        else {
-                            const netzLeitungCimObj = cimModel.getObject(this.integralID2UUID.get(netzLeitung.id));
-                            const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID());
-                            diagramObject.setDiagram(diagram);
-                            diagram.addDiagramObject(diagramObject);
-                            diagramObject.setIdentifiedObjectUUID(this.integralID2UUID.get(netzLeitung.id));
-                            if (netzLeitungCimObj !== undefined) {
-                                diagramObject.name = 'DiagramObj ' + ((_a = netzLeitungCimObj.shortName) !== null && _a !== void 0 ? _a : '');
-                            }
-                            else {
-                                diagramObject.name = 'DiagramObj HGUE-Leitung';
-                            }
-                            for (let idx = 0; idx < tempDiagramObjectPoints.length; ++idx) {
-                                const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, idx + 1);
-                                diagramObjectPoint.mrid = utils_1.generateUUID();
-                                diagramObjectPoint.diagramObject = diagramObject;
-                                diagramObject.addDiagramObjectPoint(diagramObjectPoint);
-                            }
-                        }
-                    }
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_LEITUNG} oder ${integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertSchemaQuerzweige(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const whereIDs = [...integral7.i7SchemaID2Type.keys()].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, whereIDs));
-                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_QUERZWEIG);
-                    integral7.integralNSGQuerzweig.set(i7Data.id, i7Data);
-                    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;
-                    let refYPos = 0;
-                    let xPos = i7Data.xrel;
-                    let yPos = i7Data.yrel;
-                    let refCNNodeUUID = undefined;
-                    const querzweigType = this.integralID2Type.get(i7Data.querzweig);
-                    if (querzweigType === undefined) {
-                        continue;
-                    }
-                    let nsgQuerzweigWidth;
-                    let nsgQuerzweigHeight;
-                    if (querzweigType === integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC || querzweigType === integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH) {
-                        nsgQuerzweigWidth = constants_1.NsgConstants.HGUE_QUERZWEIG_OBJ_WIDTH;
-                        nsgQuerzweigHeight = constants_1.NsgConstants.HGUE_QUERZWEIG_OBJ_HEIGHT;
-                    }
-                    else {
-                        nsgQuerzweigWidth = constants_1.NsgConstants.QUERZWEIG_OBJ_WIDTH;
-                        nsgQuerzweigHeight = constants_1.NsgConstants.QUERZWEIG_OBJ_HEIGHT;
-                    }
-                    if (referenceType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
-                        const nsgSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.bezugsobjekt);
-                        refCNNodeUUID = nsgSchaltfeld.lastNodeCimUUID;
-                        const lastDiagramObjectPointInsideBay = integral7.placedCIMObjectsForDLProfil.get(nsgSchaltfeld.lastNodeCimUUID).diagramObjectPoints[0];
-                        refXPos = lastDiagramObjectPointInsideBay.xPosition;
-                        refYPos = lastDiagramObjectPointInsideBay.yPosition;
-                        xPos += refXPos;
-                        yPos += refYPos;
-                        if (querzweigType === integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC || querzweigType === integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH) {
-                            switch (nsgSchaltfeld.orientation) {
-                                case 3:
-                                    xPos += nsgQuerzweigWidth / 2;
-                                    break;
-                                case 0:
-                                    yPos += nsgQuerzweigHeight / 2;
-                                    break;
-                                case 1:
-                                    xPos += nsgQuerzweigWidth / 2;
-                                    xPos -= nsgSchaltfeld.hoehe;
-                                    break;
-                                case 2:
-                                    yPos += nsgQuerzweigHeight / 2;
-                                    yPos -= nsgSchaltfeld.hoehe;
-                                    break;
-                            }
-                        }
-                        else {
-                            switch (nsgSchaltfeld.orientation) {
-                                case 3:
-                                    xPos += nsgQuerzweigWidth / 2;
-                                    yPos -= nsgQuerzweigHeight / 2;
-                                    break;
-                                case 0:
-                                    xPos -= nsgQuerzweigWidth / 2;
-                                    yPos += nsgQuerzweigHeight / 2;
-                                    break;
-                                case 1:
-                                    xPos += nsgQuerzweigWidth / 2;
-                                    yPos -= nsgQuerzweigHeight / 2;
-                                    xPos -= nsgSchaltfeld.hoehe;
-                                    break;
-                                case 2:
-                                    xPos -= nsgQuerzweigWidth / 2;
-                                    yPos += nsgQuerzweigHeight / 2;
-                                    yPos -= nsgSchaltfeld.hoehe;
-                                    break;
-                            }
-                        }
-                    }
-                    else if (referenceType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
-                        const nsgKnotenSoUUID = 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;
-                        refYPos = lastDiagramObjectPointInsideBay.yPosition;
-                        xPos += refXPos;
-                        yPos += refYPos;
-                        xPos -= nsgQuerzweigWidth / 2;
-                        yPos -= nsgQuerzweigHeight / 2;
-                    }
-                    else {
-                        continue;
-                        throw new Error(`unhandled reference type '${referenceType}' for id ${i7Data.bezugsobjekt} (nsg_nsgquerzweig.id ${i7Data.id})!`);
-                    }
-                    const tempDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos, rotation);
-                    const querzweigObjectUUID = this.integralID2UUID.get(i7Data.querzweig);
-                    const cimObject2LinkWith = cimModel.getObject(querzweigObjectUUID);
-                    uuidPointsMap.set(querzweigObjectUUID, tempDiagramObject);
-                    if (cimObject2LinkWith !== undefined) {
-                        let ceTerminals = new Set([...cimObject2LinkWith.terminals.values()].map(t => t.getUUID()));
-                        cimObject2LinkWith.terminalsUUIDs.forEach(tUUID => ceTerminals.add(tUUID));
-                        let cnTerminals = new Set([...cimModel.getConnectivityNode(refCNNodeUUID).terminals.values()].map(t => t.getUUID()));
-                        cimObject2LinkWith.terminalsUUIDs.forEach(tUUID => cnTerminals.add(tUUID));
-                        const terminalUUID = [...cnTerminals.values()].filter(tUUID => ceTerminals.has(tUUID))[0];
-                        let xOffset = 0;
-                        let yOffset = 0;
-                        switch (i7Data.ausrichtung) {
-                            case 0:
-                                xOffset = constants_1.NsgConstants.TERMINAL_CE_OFFSET;
-                                break;
-                            case 1:
-                                yOffset = constants_1.NsgConstants.TERMINAL_CE_OFFSET;
-                                break;
-                            case 2:
-                                xOffset = -constants_1.NsgConstants.TERMINAL_CE_OFFSET;
-                                break;
-                            case 3:
-                                yOffset = -constants_1.NsgConstants.TERMINAL_CE_OFFSET;
-                                break;
-                        }
-                        const terminalDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(tempDiagramObject.diagramObjectPoints[0].xPosition + xOffset, tempDiagramObject.diagramObjectPoints[0].yPosition + yOffset);
-                        terminalDiagramObject.diagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(refXPos, refYPos));
-                        uuidPointsMap.set(terminalUUID, terminalDiagramObject);
-                    }
-                    util_functions_1.DLUtilFunctions.addi7ObjectToCIMModel(uuidPointsMap, cimModel, integral7, i7Data.variantennr);
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_QUERZWEIG} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertSchemaSternpunktSchiene(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STP_SCHIENE) && nsgStandortIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STP_SCHIENE, nsgStandortIDs));
-                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
-                for (const i7Data of filteredResults) {
-                    const nsgSo = integral7.integralNSGStandorte.get(i7Data.nsgso);
-                    const ssabLength = i7Data.laenge * constants_1.NsgConstants.HORIZONTAL_OFFSET;
-                    let pointTopLeft = new DiagramObjectPoint_1.DiagramObjectPoint(0, 0, 1);
-                    let pointBottomRight = new DiagramObjectPoint_1.DiagramObjectPoint(ssabLength, 0, 2);
-                    const points = [];
-                    points.push(pointTopLeft, pointBottomRight);
-                    for (const p of points) {
-                        util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * i7Data.ausrichtung);
-                        p.xPosition += i7Data.xrel + nsgSo.xrel + (i7Data.ausrichtung === 2 ? ssabLength : 0);
-                        p.yPosition += i7Data.yrel + nsgSo.yrel + (i7Data.ausrichtung === 3 ? ssabLength : 0);
-                    }
-                    integral7.integralNSGStpSchiene.set(i7Data.stpschiene, i7Data);
-                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'Stp-SSAB ');
-                    diagramObject.rotation = (360 - 90 * i7Data.ausrichtung) % 360;
-                    utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
-                    const uuid = this.integralID2UUID.get(i7Data.stpschiene);
-                    const cimObject = cimModel.getObject(uuid);
-                    diagramObject.setIdentifiedObjectUUID(uuid);
-                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
-                    const diagram = cimModel.getDiagram(diagramUUID);
-                    if (diagram) {
-                        diagramObject.setDiagram(diagram);
-                        diagram.addDiagramObject(diagramObject);
-                        integral7.placedCIMObjectsForDLProfil.set(uuid, diagramObject);
-                    }
-                    else {
-                        this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
-                    }
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STP_SCHIENE} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertSchemaSternpunktKnoten(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STP_KNOTEN) && nsgStandortIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STP_KNOTEN, nsgStandortIDs));
-                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
-                if (filteredResults.length <= 0)
-                    return;
-                const knoten1pelemIDs = filteredResults.map(elem => elem.knoten);
-                let sqlStatement;
-                sqlStatement = `SELECT *
-                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.STERNPUNKT_KNOTEN]}
-                      WHERE ${integral_sql_1.getWhereIDs('id', knoten1pelemIDs).join(' OR ')};`;
-                const knoten1pelemResults = yield this.mysqlController.execQuery(sqlStatement);
-                const knoten1pelemMap = new Map();
-                for (const elem of knoten1pelemResults) {
-                    let arr = knoten1pelemMap.has(elem.netzobjekt) ? knoten1pelemMap.get(elem.netzobjekt) : [];
-                    arr.push(elem.id);
-                    knoten1pelemMap.set(elem.netzobjekt, arr);
-                }
-                sqlStatement = `SELECT id AS 'netzobjektID', trafo3w AS 'trafoID', 'netz_trafo3w' AS 'trafoType'
-                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}
-                      WHERE id IN (${knoten1pelemResults.map(elem => elem.netzobjekt).join(',')})
-                      UNION ALL
-                      SELECT id AS 'netzobjektID', id AS 'trafoID', 'netz_trafo2w' AS 'trafoType'
-                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}
-                      WHERE id IN (${knoten1pelemResults.map(elem => elem.netzobjekt).join(',')});`;
-                const trafoIDTypeResults = yield this.mysqlController.execQuery(sqlStatement);
-                const trafoIDTypeMap = new Map();
-                for (const trafoIDTypeResult of trafoIDTypeResults) {
-                    const netzobjektRelatedKnotenIDs = knoten1pelemMap.get(trafoIDTypeResult.netzobjektID);
-                    for (const netzobjektRelatedKnotenID of netzobjektRelatedKnotenIDs) {
-                        trafoIDTypeMap.set(netzobjektRelatedKnotenID, trafoIDTypeResult);
-                    }
-                }
-                for (const i7Data of filteredResults) {
-                    let centerPoint = new DiagramObjectPoint_1.DiagramObjectPoint(0, 0, 1);
-                    const shiftOffset = constants_1.NsgConstants.STP_KNOTEN_WIDTH;
-                    const trafoIDType = trafoIDTypeMap.get(i7Data.knoten);
-                    const nsgTrafo = integral7.integralNSGTrafos.get(trafoIDType.trafoID);
-                    const nsgStandort = integral7.integralNSGStandorte.get(nsgTrafo.nsgsoid);
-                    const points = [];
-                    points.push(centerPoint);
-                    for (const p of points) {
-                        util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * i7Data.ausrichtung);
-                        p.xPosition += i7Data.xrel + nsgTrafo.xrel + nsgStandort.xrel + (i7Data.ausrichtung === 2 ? shiftOffset : 0);
-                        p.yPosition += i7Data.yrel + nsgTrafo.yrel + nsgStandort.yrel + (i7Data.ausrichtung === 3 ? shiftOffset : 0);
-                    }
-                    integral7.integralNSGStpKnoten.set(i7Data.id, i7Data);
-                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'Stp-SSAB');
-                    diagramObject.rotation = (360 - 90 * i7Data.ausrichtung) % 360;
-                    utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
-                    const uuid = this.integralID2UUID.get(i7Data.knoten);
-                    diagramObject.setIdentifiedObjectUUID(uuid);
-                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
-                    const diagram = cimModel.getDiagram(diagramUUID);
-                    if (diagram) {
-                        diagramObject.setDiagram(diagram);
-                        diagram.addDiagramObject(diagramObject);
-                        integral7.placedCIMObjectsForDLProfil.set(uuid, diagramObject);
-                    }
-                    else {
-                        this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
-                    }
-                }
-            }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STP_SCHALTFELD} ist nicht vorhanden.`);
-            }
         });
     }
     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, whereID));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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);
+                    const i7name = (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz), '_S'], 32);
+                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation((0, utils_1.getUUID)(i7Data.guid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
                     let subregion = cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
-                        const region = utils_1.createIfNotExitsGeoregionByName(cimModel, defaultValuesConfig.GeographicalRegion.name);
-                        subregion = utils_1.createIfNotExitsSubGeoregionByName(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
+                        const region = (0, utils_1.createIfNotExitsGeoregionByName)(cimModel, defaultValuesConfig.GeographicalRegion.name);
+                        subregion = (0, utils_1.createIfNotExitsSubGeoregionByName)(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
                     }
                     substation.subGeographicalRegion = subregion;
                     subregion.addSubstation(substation);
-                    const coor = ConverterIntegral7_1.getGeoCoordinates(i7Data);
+                    const coor = (0, ConverterIntegral7_1.getGeoCoordinates)(i7Data);
                     if ((coor === null || coor === void 0 ? void 0 : coor.length) === 2) {
                         const coordinateSystem = cimModel.getCoordinateSystemByName(this.coordinateSystem);
-                        const location = new Location_1.Location(utils_1.generateUUID(), `Location of ${substation.name}`);
+                        const location = new Location_1.Location((0, utils_1.generateUUID)(), `Location of ${substation.name}`);
                         location.addPowerSystemResource(substation);
                         substation.location = location;
                         location.coordinateSystem = coordinateSystem;
-                        const positionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID());
+                        const positionPoint = new PositionPoint_1.PositionPoint((0, utils_1.generateUUID)());
                         positionPoint.xPosition = coor[0];
                         positionPoint.yPosition = coor[1];
                         positionPoint.location = location;
@@ -1666,7 +642,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, standortIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SCHALTANLAGE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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));
@@ -1681,10 +657,10 @@ class ConverterI7 {
                         integral_prefix_1.KNOTEN_STANDORT_PRAEFIX +
                         i7Data.un +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname, i7Schluessel);
-                    const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, un, this.exportFramesBoundary);
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                    const vl = new VoltageLevel_1.VoltageLevel((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname, i7Schluessel);
+                    const un = (0, utils_2.getU)(i7Data.un, defaultValuesConfig.DefaultVoltage);
+                    const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.exportFramesBoundary);
                     vl.baseVoltage = baseVoltage;
                     cimModel.addVoltageLevel(vl);
                     this.addIdMapping(i7Data.id, vl.mrid, integral_sql_1.Integral7TableNames.SCHALTANLAGE);
@@ -1703,7 +679,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, schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SCHALTANLAGENABSCHNITT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT), schaltanlagenIDs));
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     if (!voltageLevel) {
@@ -1711,7 +687,8 @@ class ConverterI7 {
                         continue;
                     }
                     else {
-                        voltageLevel.name = util_create_1.createNotation([voltageLevel.name, '_', i7Data.pos.toString()], 32, true);
+                        const tmp_vlname = voltageLevel.name.replace('_VL', '');
+                        voltageLevel.name = (0, util_create_1.createNotation)([tmp_vlname, '_', i7Data.pos.toString(), '_VL'], 32, true);
                     }
                     const schaltanlagenabschnitt = new Schaltanlagenabschnitt_1.SchaltanlagenabschnittImpl(i7Data);
                     schaltanlagenabschnitt.addSchaltanlage(integral7.integralSchaltanlagen.get(schaltanlagenabschnitt.schaltanlageid));
@@ -1727,7 +704,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, schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SCHALTFELD, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTFELD), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (!voltageLevel) {
@@ -1736,10 +713,10 @@ class ConverterI7 {
                     }
                     const i7Schluessel = voltageLevel.description +
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
-                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const cimrdfid = utils_1.getUUID(i7Data.guid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B'], 32, true), i7Data.kurzname, i7Schluessel);
-                    bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                    const cimrdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B'], 32, true), i7Data.kurzname, i7Schluessel);
+                    bay.number = (0, utils_2.isNumericI7)(i7Data.feldnummer) ? (0, utils_2.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     bay.voltageLevel = voltageLevel;
                     voltageLevel.addBay(bay);
@@ -1762,20 +739,20 @@ 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, standortIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_SO), standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
-                    const rdfid = utils_1.getUUID(i7Data.guid);
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_CN']), i7Data.kurzname, i7Data.kommentar);
+                    const vl = new VoltageLevel_1.VoltageLevel((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
+                    const rdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_CN']), i7Data.kurzname, i7Data.kommentar);
                     connectivityNode.setConnectivityNodeContainer(vl);
                     vl.addConnectivityNode(connectivityNode);
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (frame.boundary) {
                         connectivityNode.boundaryPoint = true;
                     }
-                    const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, un, this.exportFramesBoundary);
+                    const un = (0, utils_2.getU)(i7Data.un, defaultValuesConfig.DefaultVoltage);
+                    const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.exportFramesBoundary);
                     integral7.targetVoltages.set(i7Data.id, { usoll: i7Data.usoll, umin: i7Data.umin, umax: i7Data.umax });
                     vl.baseVoltage = baseVoltage;
                     if (substation) {
@@ -1785,14 +762,14 @@ class ConverterI7 {
                             integral_prefix_1.KNOTEN_STANDORT_PRAEFIX +
                             i7Data.un +
                             integral_prefix_1.MITTIGER_PUNKT +
-                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                         vl.description = i7Schluessel;
                         connectivityNode.description = i7Schluessel;
                     }
                     else {
                         this.logger.debug(`KnotenSo ${i7Data.id} ${vl.mrid} besitzt keine Substation.`);
                     }
-                    const psrType = utils_2.getPSRType(cimModel, 'Abzweigmast');
+                    const psrType = (0, utils_2.getPSRType)(cimModel, 'Abzweigmast');
                     vl.psrTypeUUID = psrType === null || psrType === void 0 ? void 0 : psrType.mrid;
                     const object = new KnotenSo_1.KnotenSoImpl(i7Data);
                     integral7.integralKnotenSo.set(i7Data.id, object);
@@ -1808,20 +785,34 @@ 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((0, 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 = (0, utils_1.getUUID)(i7Data.guid);
+                    const dcNode = new DCNode_1.DCNode(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_DCCN'], 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, schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), '_BBS']), i7Schaltanlagenabschnitt.kurzname);
+                    const busbarSection = new BusbarSection_1.BusbarSection((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, 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 rdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_' + i7Data.pos.toString(), '_' + rdfid.substring(0, 8), '_CN'], 32, true), i7Data.kurzname);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (voltageLevel) {
@@ -1833,7 +824,7 @@ class ConverterI7 {
                         voltageLevel.lowVoltageLimit = i7Data.umin;
                         const i7Schluessel = voltageLevel.description +
                             integral_prefix_1.SAMMELSCHIENENABSCHNITT_PRAEFIX +
-                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                         busbarSection.description = i7Schluessel;
                         connectivityNode.description = i7Schluessel;
                         integral7.targetVoltages.set(i7Data.id, { usoll: i7Data.usoll, umin: i7Data.umin, umax: i7Data.umax });
@@ -1861,7 +852,7 @@ class ConverterI7 {
                 const result = yield this.queryDataInChuncks(integral_sql_1.I7Objects.KNOTEN_SF, schaltfeldIDs);
                 for (const i7Data of result) {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.schaltfeld));
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid_cn), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, utils_1.getUUID)(i7Data.guid_cn), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
@@ -1883,9 +874,9 @@ 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, querkupplungIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_KF, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_KF), querkupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'knotenkf');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'knotenkf');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.kpfeld));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -1906,9 +897,9 @@ 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, laengskupplungIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_LK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_LK), laengskupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'KnotenLk');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'KnotenLk');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -1929,10 +920,10 @@ 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, knotenSoIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SCHLAUFE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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);
+                    const terminal = new Terminal_1.Terminal((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_Schlaufe_T']), i7Data.kurzname, i7Data.kommentar);
+                    terminal.connected = (0, utils_2.convertToBooleanI7)(i7Data.schaltzustand);
                     terminal.phases = PhaseCode_1.PhaseCode.ABC;
                     this.addIdMapping(i7Data.id, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
                     this.addIdMapping(i7Data.knotenzw, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
@@ -1957,20 +948,20 @@ 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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BELASTUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BELASTUNG), knotenSfIDs));
                 for (const i7Data of result) {
-                    const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CL'])) : new EnergyConsumer_1.EnergyConsumer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EC']));
+                    const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CL']), i7Data.kurzname) : new EnergyConsumer_1.EnergyConsumer((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EC']), i7Data.kurzname);
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
                     const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf && targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
                         cimModel.addMultiplierFactor(mf);
                         load.multiplierFactorUUID = mf.getUUID();
                     }
-                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
                     load.p = powerData[0];
                     load.q = powerData[1];
-                    load.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] : undefined;
-                    load.q_mf = utils_2.isNumericI7(powerData[3]) ? powerData[3] : undefined;
+                    load.p_mf = powerData[2] ? powerData[2] : undefined;
+                    load.q_mf = powerData[3] ? powerData[3] : undefined;
                     if (targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
                         const conformLoadGroup = cimModel.getObjectByName(defaultValuesConfig.ConformLoadGroup.name, cim_class_names_1.CIM_CLASS_NAMES.ConformLoadGroup);
                         load.loadGroup = conformLoadGroup;
@@ -1990,7 +981,7 @@ class ConverterI7 {
             const targetConfig = objectMappingConfig.Einspeisung;
             const targetClass = objectMappingConfig.Einspeisung.class;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.EINSPEISUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.EINSPEISUNG, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.EINSPEISUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.EINSPEISUNG), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertEinspeisungen2EquivalentInjection(cimModel, result);
@@ -2021,7 +1012,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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.ERSATZQUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, result);
@@ -2044,18 +1035,18 @@ 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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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);
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
-                    const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : 0;
+                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM'], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
+                    const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
+                    const maxP = (0, utils_2.isNumericI7)(i7Data.p_max) ? (0, utils_2.convertToNumberI7)(i7Data.p_max) : 0;
+                    const minP = (0, utils_2.isNumericI7)(i7Data.p_min) ? (0, utils_2.convertToNumberI7)(i7Data.p_min) : 0;
                     const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
-                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
-                    const flagCondenserOperationMode = utils_2.isBooleanI7(i7Data.flag_phasenschieber) ? utils_2.convertToBooleanI7(i7Data.flag_phasenschieber) : true;
+                    const flagCondenserOperationMode = (0, utils_2.isBooleanI7)(i7Data.flag_phasenschieber) ? (0, utils_2.convertToBooleanI7)(i7Data.flag_phasenschieber) : true;
                     const isRotatingPhaseShifter = mf !== undefined && flagCondenserOperationMode && maxP === 0 && minP === 0;
                     const isGenerator = (maxP >= 0 || maxP === undefined) && (minP >= 0 || minP === undefined);
                     const isMotor = (maxP <= 0 || maxP === undefined) && (minP <= 0 || minP === undefined);
@@ -2109,64 +1100,64 @@ class ConverterI7 {
                     else {
                         synchronousMachine.operatingMode = undefined;
                     }
-                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_1)) {
-                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_1));
+                    if ((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_1)) {
+                        this.blocktransformatoren.push((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_1));
                     }
-                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_2)) {
-                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_2));
+                    if ((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_2)) {
+                        this.blocktransformatoren.push((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_2));
                     }
-                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_3)) {
-                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_3));
+                    if ((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_3)) {
+                        this.blocktransformatoren.push((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_3));
                     }
-                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_4)) {
-                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_4));
+                    if ((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_4)) {
+                        this.blocktransformatoren.push((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_4));
                     }
-                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_5)) {
-                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_5));
+                    if ((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_5)) {
+                        this.blocktransformatoren.push((0, utils_2.convertToNumberI7)(i7Data.blocktrafo_5));
                     }
-                    const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                    const prio = (0, utils_2.isNumericI7)(i7Data.einspprio) ? (0, utils_2.convertToNumberI7)(i7Data.einspprio) : undefined;
                     synchronousMachine.referencePriority = prio;
-                    const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
-                    const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
-                    const maxQvonPmax = utils_2.isNumericI7(i7Data.qmax_von_pmax) ? utils_2.convertToNumberI7(i7Data.qmax_von_pmax) : undefined;
-                    const minQvonPmax = utils_2.isNumericI7(i7Data.qmin_von_pmax) ? utils_2.convertToNumberI7(i7Data.qmin_von_pmax) : undefined;
-                    const maxQvonPmin = utils_2.isNumericI7(i7Data.qmax_von_pmin) ? utils_2.convertToNumberI7(i7Data.qmax_von_pmin) : undefined;
-                    const minQvonPmin = utils_2.isNumericI7(i7Data.qmin_von_pmin) ? utils_2.convertToNumberI7(i7Data.qmin_von_pmin) : undefined;
+                    const maxQ = (0, utils_2.isNumericI7)(i7Data.q_max) ? (0, utils_2.convertToNumberI7)(i7Data.q_max) : undefined;
+                    const minQ = (0, utils_2.isNumericI7)(i7Data.q_min) ? (0, utils_2.convertToNumberI7)(i7Data.q_min) : undefined;
+                    const maxQvonPmax = (0, utils_2.isNumericI7)(i7Data.qmax_von_pmax) ? (0, utils_2.convertToNumberI7)(i7Data.qmax_von_pmax) : undefined;
+                    const minQvonPmax = (0, utils_2.isNumericI7)(i7Data.qmin_von_pmax) ? (0, utils_2.convertToNumberI7)(i7Data.qmin_von_pmax) : undefined;
+                    const maxQvonPmin = (0, utils_2.isNumericI7)(i7Data.qmax_von_pmin) ? (0, utils_2.convertToNumberI7)(i7Data.qmax_von_pmin) : undefined;
+                    const minQvonPmin = (0, utils_2.isNumericI7)(i7Data.qmin_von_pmin) ? (0, utils_2.convertToNumberI7)(i7Data.qmin_von_pmin) : undefined;
                     synchronousMachine.maxQ = maxQ ? maxQ : maxQvonPmax;
                     synchronousMachine.minQ = minQ ? minQ : minQvonPmin;
                     const pType = (genType === null || genType === void 0 ? void 0 : genType.sr) * (genType === null || genType === void 0 ? void 0 : genType.cosphir);
                     const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
                     synchronousMachine.setActivePower(p * -1);
                     synchronousMachine.setReactivePower(q * -1);
-                    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;
+                    synchronousMachine.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    synchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
+                    const sr = (0, utils_2.isNumericI7)(i7Data.sr) ? (0, utils_2.convertToNumberI7)(i7Data.sr) : genType === null || genType === void 0 ? void 0 : genType.sr;
                     if (sr && sr >= 0) {
                         synchronousMachine.ratedS = sr;
                     }
                     else {
                         synchronousMachine.ratedS = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));
                     }
-                    const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : utils_2.isNumericI7(genType === null || genType === void 0 ? void 0 : genType.ur) ? genType.ur : undefined;
-                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : ur;
-                    const cosphir = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : genType.cosphir;
+                    const ur = (0, utils_2.isNumericI7)(i7Data.ur) ? (0, utils_2.convertToNumberI7)(i7Data.ur) : (0, utils_2.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.ur) ? genType.ur : undefined;
+                    const usoll = (0, utils_2.isNumericI7)(i7Data.usoll) ? (0, utils_2.convertToNumberI7)(i7Data.usoll) : ur;
+                    const cosphir = (0, utils_2.isNumericI7)(i7Data.cosphir) ? (0, utils_2.convertToNumberI7)(i7Data.cosphir) : genType.cosphir;
                     synchronousMachine.ratedU = ur ? ur : usoll;
                     synchronousMachine.aggregate = true;
                     synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
-                    synchronousMachine.r = utils_2.isNumericI7(i7Data.rg) ? utils_2.convertToNumberI7(i7Data.rg) : genType === null || genType === void 0 ? void 0 : genType.rg;
+                    synchronousMachine.r = (0, utils_2.isNumericI7)(i7Data.rg) ? (0, utils_2.convertToNumberI7)(i7Data.rg) : genType === null || genType === void 0 ? void 0 : genType.rg;
                     if (minP && maxP && minQvonPmin && maxQvonPmax) {
-                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), util_create_1.createNotation(['CurveData', synchronousMachine.mrid, '_RCC']));
+                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)(['CurveData', synchronousMachine.mrid, '_RCC']));
                         reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                         reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
                         reactiveCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
                         reactiveCapabilityCurve.y2Unit = UnitSymbol_1.UnitSymbol.VAr;
-                        const curveData1 = new CurveData_1.CurveData(utils_1.generateUUID());
+                        const curveData1 = new CurveData_1.CurveData((0, utils_1.generateUUID)());
                         curveData1.curve = reactiveCapabilityCurve;
                         curveData1.xvalue = minP;
                         curveData1.y1value = minQvonPmin;
                         curveData1.y2value = maxQvonPmin;
                         cimModel.addCurveData(curveData1);
-                        const curveData2 = new CurveData_1.CurveData(utils_1.generateUUID());
+                        const curveData2 = new CurveData_1.CurveData((0, utils_1.generateUUID)());
                         curveData2.curve = reactiveCapabilityCurve;
                         curveData2.xvalue = maxP;
                         curveData2.y1value = minQvonPmax;
@@ -2178,7 +1169,7 @@ class ConverterI7 {
                     let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), util_create_1.createNotation(['GEN'], 32, true));
+                            regulatingControl = new RegulatingControl_1.RegulatingControl((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)(['GEN'], 32, true));
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -2199,18 +1190,18 @@ class ConverterI7 {
                         if (generatingUnitConfig) {
                             switch (generatingUnitConfig.class) {
                                 case 'ThermalGeneratingUnit': {
-                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_TGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit((0, utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_TGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     if (generatingUnitConfig.fuelType) {
-                                        utils_2.generateFuelType(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
+                                        (0, utils_2.generateFuelType)(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                     }
                                     break;
                                 }
                                 case 'SolarGeneratingUnit': {
-                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_SGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit((0, utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_SGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     break;
                                 }
                                 case 'WindGeneratingUnit': {
-                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_WGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit((0, utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_WGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     switch (generatingUnitConfig.fuelType) {
                                         case 'onshore': {
                                             generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
@@ -2228,46 +1219,46 @@ class ConverterI7 {
                                     break;
                                 }
                                 case 'NuclearGeneratingUnit': {
-                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_NGU']), i7Data.kurzname);
+                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit((0, utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_NGU']), i7Data.kurzname);
                                     break;
                                 }
                                 case 'HydroGeneratingUnit': {
-                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_HGU']), i7Data.kurzname);
+                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit((0, utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_HGU']), i7Data.kurzname);
                                     generatingUnit.energyConversionCapability = HydroEnergyConversionKind_1.HydroEnergyConversionKind.pumpAndGenerator;
                                     break;
                                 }
                                 default: {
-                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_GU']), i7Data.kurzname);
+                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_GU']), i7Data.kurzname);
                                     break;
                                 }
                             }
                         }
                         else {
-                            generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, '_GU']), i7Data.kurzname);
+                            generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_GU']), i7Data.kurzname);
                         }
-                        generatingUnit.initialP = utils_2.isNumericI7(i7Data.p0) ? utils_2.convertToNumberI7(i7Data.p0) : undefined;
+                        generatingUnit.initialP = (0, utils_2.isNumericI7)(i7Data.p0) ? (0, utils_2.convertToNumberI7)(i7Data.p0) : undefined;
                         generatingUnit.maxOperatingP = maxP;
                         generatingUnit.minOperatingP = minP;
-                        generatingUnit.nominalP = utils_2.isNumericI7(cosphir) && utils_2.isNumericI7(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
-                        const kr = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+                        generatingUnit.nominalP = (0, utils_2.isNumericI7)(cosphir) && (0, utils_2.isNumericI7)(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
+                        const kr = (0, utils_2.isNumericI7)(i7Data.kr) ? (0, utils_2.convertToNumberI7)(i7Data.kr) : undefined;
                         const fn = 50;
-                        generatingUnit.governorSCD = (utils_2.isNumericI7(kr) && utils_2.isNumericI7(generatingUnit.nominalP)) ? utils_2.calculateSigma(fn, generatingUnit.nominalP, kr) : undefined;
+                        generatingUnit.governorSCD = ((0, utils_2.isNumericI7)(kr) && (0, utils_2.isNumericI7)(generatingUnit.nominalP)) ? (0, utils_2.calculateSigma)(fn, generatingUnit.nominalP, kr) : undefined;
                         generatingUnit.addRotatingMachine(synchronousMachine);
                         synchronousMachine.generatingUnitUUID = generatingUnit.mrid;
                     }
                     this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, regulatingControl, generatingUnit);
-                    const smtcr = new SynchronousMachineTimeConstantReactance_1.SynchronousMachineTimeConstantReactance(utils_1.generateUUID(), `smtcr_${synchronousMachine.name}`);
+                    const smtcr = new SynchronousMachineTimeConstantReactance_1.SynchronousMachineTimeConstantReactance((0, utils_1.generateUUID)(), `smtcr_${synchronousMachine.name}`);
                     smtcr.enabled = inBetrieb;
-                    smtcr.tpdo = utils_2.isNumericI7(i7Data.td1s) ? utils_2.convertToNumberI7(i7Data.td1s) : undefined;
-                    smtcr.tppdo = utils_2.isNumericI7(i7Data.td2s) ? utils_2.convertToNumberI7(i7Data.td2s) : undefined;
-                    smtcr.tpqo = utils_2.isNumericI7(i7Data.tq1s) ? utils_2.convertToNumberI7(i7Data.tq1s) : undefined;
-                    smtcr.tppqo = utils_2.isNumericI7(i7Data.tq2s) ? utils_2.convertToNumberI7(i7Data.tq2s) : undefined;
-                    smtcr.xDirectSync = utils_2.isNumericI7(i7Data.xdu) ? utils_2.convertToNumberI7(i7Data.xdu) : undefined;
-                    smtcr.xDirectTrans = utils_2.isNumericI7(i7Data.xdu1s) ? utils_2.convertToNumberI7(i7Data.xdu1s) : undefined;
-                    smtcr.xDirectSubtrans = utils_2.isNumericI7(i7Data.xdu2s) ? utils_2.convertToNumberI7(i7Data.xdu2s) : undefined;
-                    smtcr.xQuadSync = utils_2.isNumericI7(i7Data.xqu) ? utils_2.convertToNumberI7(i7Data.xqu) : undefined;
-                    smtcr.xQuadTrans = utils_2.isNumericI7(i7Data.xqu1s) ? utils_2.convertToNumberI7(i7Data.xqu1s) : undefined;
-                    smtcr.xQuadSubtrans = utils_2.isNumericI7(i7Data.xqu2s) ? utils_2.convertToNumberI7(i7Data.xqu2s) : undefined;
+                    smtcr.tpdo = (0, utils_2.isNumericI7)(i7Data.td1s) ? (0, utils_2.convertToNumberI7)(i7Data.td1s) : undefined;
+                    smtcr.tppdo = (0, utils_2.isNumericI7)(i7Data.td2s) ? (0, utils_2.convertToNumberI7)(i7Data.td2s) : undefined;
+                    smtcr.tpqo = (0, utils_2.isNumericI7)(i7Data.tq1s) ? (0, utils_2.convertToNumberI7)(i7Data.tq1s) : undefined;
+                    smtcr.tppqo = (0, utils_2.isNumericI7)(i7Data.tq2s) ? (0, utils_2.convertToNumberI7)(i7Data.tq2s) : undefined;
+                    smtcr.xDirectSync = (0, utils_2.isNumericI7)(i7Data.xdu) ? (0, utils_2.convertToNumberI7)(i7Data.xdu) : undefined;
+                    smtcr.xDirectTrans = (0, utils_2.isNumericI7)(i7Data.xdu1s) ? (0, utils_2.convertToNumberI7)(i7Data.xdu1s) : undefined;
+                    smtcr.xDirectSubtrans = (0, utils_2.isNumericI7)(i7Data.xdu2s) ? (0, utils_2.convertToNumberI7)(i7Data.xdu2s) : undefined;
+                    smtcr.xQuadSync = (0, utils_2.isNumericI7)(i7Data.xqu) ? (0, utils_2.convertToNumberI7)(i7Data.xqu) : undefined;
+                    smtcr.xQuadTrans = (0, utils_2.isNumericI7)(i7Data.xqu1s) ? (0, utils_2.convertToNumberI7)(i7Data.xqu1s) : undefined;
+                    smtcr.xQuadSubtrans = (0, utils_2.isNumericI7)(i7Data.xqu2s) ? (0, utils_2.convertToNumberI7)(i7Data.xqu2s) : undefined;
                     smtcr.synchronousMachine = synchronousMachine;
                     synchronousMachine.synchronousMachineDynamics = smtcr;
                     if (mf) {
@@ -2285,10 +1276,10 @@ class ConverterI7 {
     convertAsynchronmotor(cimModel, knotenSfIDs, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.ASYNCHRONMOTOR, 0, 0, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.ASYNCHRONMOTOR, 0, 0, knotenSfIDs));
                 for (const i7Data of result) {
                     const assetType = this.asynchronmotorTypen.get(i7Data.nametyp);
-                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_AM']), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
+                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_AM']), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
@@ -2296,25 +1287,25 @@ class ConverterI7 {
                     }
                     asynchronousMachine.asynchronousMachineType = AsynchronousMachineKind_1.AsynchronousMachineKind.motor;
                     asynchronousMachine.efficiency = i7Data.wirkungsgrad * 100;
-                    asynchronousMachine.iaIrRatio = utils_2.isNumericI7(i7Data.ilr_ir) ? i7Data.ilr_ir : assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir;
-                    asynchronousMachine.polePairNumber = utils_2.isNumericI7(i7Data.polpaarz) ? i7Data.polpaarz : assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz;
-                    asynchronousMachine.ratedMechanicalPower = utils_2.isNumericI7(i7Data.p_mech) ? i7Data.p_mech : assetType === null || assetType === void 0 ? void 0 : assetType.p_mech;
-                    asynchronousMachine.ratedPowerFactor = utils_2.isNumericI7(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
-                    asynchronousMachine.ratedS = utils_2.isNumericI7(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
-                    asynchronousMachine.ratedU = utils_2.isNumericI7(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
-                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    asynchronousMachine.iaIrRatio = (0, utils_2.isNumericI7)(i7Data.ilr_ir) ? i7Data.ilr_ir : assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir;
+                    asynchronousMachine.polePairNumber = (0, utils_2.isNumericI7)(i7Data.polpaarz) ? i7Data.polpaarz : assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz;
+                    asynchronousMachine.ratedMechanicalPower = (0, utils_2.isNumericI7)(i7Data.p_mech) ? i7Data.p_mech : assetType === null || assetType === void 0 ? void 0 : assetType.p_mech;
+                    asynchronousMachine.ratedPowerFactor = (0, utils_2.isNumericI7)(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
+                    asynchronousMachine.ratedS = (0, utils_2.isNumericI7)(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
+                    asynchronousMachine.ratedU = (0, utils_2.isNumericI7)(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
+                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
                     asynchronousMachine.setActivePower(p * -1);
                     asynchronousMachine.setReactivePower(q * -1);
-                    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.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    asynchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     asynchronousMachine.controlEnabled = false;
-                    const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : true;
+                    const inBetrieb = (0, utils_2.isBooleanI7)(i7Data.betrieb) ? (0, utils_2.convertToBooleanI7)(i7Data.betrieb) : true;
                     asynchronousMachine.normallyInService = inBetrieb;
                     const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (connectivityNode) {
-                        util_create_1.createConnection(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC);
+                        (0, util_create_1.createConnection)(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC);
                         const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
                         if (equipmentContainer) {
                             equipmentContainer.addEquipment(asynchronousMachine);
@@ -2339,9 +1330,9 @@ 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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KWBLOCK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KWBLOCK), knotenSfIDs));
                 for (const i7Data of result) {
-                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SM']), i7Data.kurzname);
+                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM']), i7Data.kurzname);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
@@ -2349,19 +1340,19 @@ class ConverterI7 {
                     }
                     synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
                     synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
-                    synchronousMachine.referencePriority = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
-                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
-                    const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
-                    const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
+                    synchronousMachine.referencePriority = (0, utils_2.isNumericI7)(i7Data.einspprio) ? (0, utils_2.convertToNumberI7)(i7Data.einspprio) : undefined;
+                    const maxP = (0, utils_2.isNumericI7)(i7Data.p_max) ? (0, utils_2.convertToNumberI7)(i7Data.p_max) : 0;
+                    const maxQ = (0, utils_2.isNumericI7)(i7Data.q_max) ? (0, utils_2.convertToNumberI7)(i7Data.q_max) : undefined;
+                    const minQ = (0, utils_2.isNumericI7)(i7Data.q_min) ? (0, utils_2.convertToNumberI7)(i7Data.q_min) : undefined;
                     synchronousMachine.maxQ = maxQ;
                     synchronousMachine.minQ = minQ;
-                    const sr = utils_2.isNumericI7(i7Data.srg) ? utils_2.convertToNumberI7(i7Data.srg) : undefined;
+                    const sr = (0, utils_2.isNumericI7)(i7Data.srg) ? (0, utils_2.convertToNumberI7)(i7Data.srg) : undefined;
                     synchronousMachine.ratedS = sr;
-                    const ur = utils_2.isNumericI7(i7Data.urg) ? utils_2.convertToNumberI7(i7Data.urg) : undefined;
+                    const ur = (0, utils_2.isNumericI7)(i7Data.urg) ? (0, utils_2.convertToNumberI7)(i7Data.urg) : undefined;
                     synchronousMachine.ratedU = ur;
-                    const cosphir = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : undefined;
+                    const cosphir = (0, utils_2.isNumericI7)(i7Data.cosphir) ? (0, utils_2.convertToNumberI7)(i7Data.cosphir) : undefined;
                     synchronousMachine.aggregate = true;
-                    const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_KWBlock ${i7Data.id}`);
+                    const regulatingControl = new RegulatingControl_1.RegulatingControl((0, utils_1.generateUUID)(), `RC_KWBlock ${i7Data.id}`);
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
@@ -2377,18 +1368,18 @@ class ConverterI7 {
                     if (generatingUnitConfig) {
                         switch (generatingUnitConfig.class) {
                             case 'ThermalGeneratingUnit': {
-                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit((0, utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 if (generatingUnitConfig.fuelType) {
-                                    utils_2.generateFuelType(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
+                                    (0, utils_2.generateFuelType)(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                 }
                                 break;
                             }
                             case 'SolarGeneratingUnit': {
-                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit((0, utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 break;
                             }
                             case 'WindGeneratingUnit': {
-                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit((0, utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 switch (generatingUnitConfig.fuelType) {
                                     case 'onshore': {
                                         generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
@@ -2406,22 +1397,22 @@ class ConverterI7 {
                                 break;
                             }
                             case 'NuclearGeneratingUnit': {
-                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(utils_1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
+                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit((0, utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
                                 break;
                             }
                         }
                     }
                     if (!generatingUnit) {
-                        generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), 'KWBlock' + i7Data.bezeichner, i7Data.kurzname);
+                        generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, utils_1.getUUID)(''), 'KWBlock' + i7Data.bezeichner, i7Data.kurzname);
                     }
                     generatingUnit.genControlSource = GeneratorControlSource_1.GeneratorControlSource.unavailable;
-                    generatingUnit.initialP = utils_2.isNumericI7(i7Data.p0) ? utils_2.convertToNumberI7(i7Data.p0) : undefined;
-                    generatingUnit.maxOperatingP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
-                    generatingUnit.minOperatingP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
-                    generatingUnit.nominalP = utils_2.isNumericI7(cosphir) && utils_2.isNumericI7(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
-                    const kr = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+                    generatingUnit.initialP = (0, utils_2.isNumericI7)(i7Data.p0) ? (0, utils_2.convertToNumberI7)(i7Data.p0) : undefined;
+                    generatingUnit.maxOperatingP = (0, utils_2.isNumericI7)(i7Data.p_max) ? (0, utils_2.convertToNumberI7)(i7Data.p_max) : undefined;
+                    generatingUnit.minOperatingP = (0, utils_2.isNumericI7)(i7Data.p_min) ? (0, utils_2.convertToNumberI7)(i7Data.p_min) : undefined;
+                    generatingUnit.nominalP = (0, utils_2.isNumericI7)(cosphir) && (0, utils_2.isNumericI7)(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
+                    const kr = (0, utils_2.isNumericI7)(i7Data.kr) ? (0, utils_2.convertToNumberI7)(i7Data.kr) : undefined;
                     const fn = 50;
-                    generatingUnit.governorSCD = (utils_2.isNumericI7(kr) && utils_2.isNumericI7(generatingUnit.nominalP)) ? utils_2.calculateSigma(fn, generatingUnit.nominalP, kr) : undefined;
+                    generatingUnit.governorSCD = ((0, utils_2.isNumericI7)(kr) && (0, utils_2.isNumericI7)(generatingUnit.nominalP)) ? (0, utils_2.calculateSigma)(fn, generatingUnit.nominalP, kr) : undefined;
                     generatingUnit.addRotatingMachine(synchronousMachine);
                     synchronousMachine.generatingUnitUUID = generatingUnit.mrid;
                     this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, regulatingControl, generatingUnit);
@@ -2436,11 +1427,11 @@ class ConverterI7 {
     convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
-                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_ENI']), i7Data.kurzname);
-                const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
-                const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ENI']), i7Data.kurzname);
+                const usoll = (0, utils_2.isNumericI7)(i7Data.usoll) ? (0, utils_2.convertToNumberI7)(i7Data.usoll) : undefined;
+                const governorscd = (0, utils_2.isNumericI7)(i7Data.kr) ? (0, utils_2.convertToNumberI7)(i7Data.kr) : undefined;
                 externalNetworkInjection.governorSCD = governorscd;
-                const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                const prio = (0, utils_2.isNumericI7)(i7Data.einspprio) ? (0, utils_2.convertToNumberI7)(i7Data.einspprio) : undefined;
                 externalNetworkInjection.referencePriority = prio;
                 externalNetworkInjection.aggregate = true;
                 externalNetworkInjection.ikSecond = true;
@@ -2453,14 +1444,14 @@ class ConverterI7 {
     convertErsatzQuerZweige2EquivalentInjection(cimModel, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
-                const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                const einspeisePrio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : 1;
-                const flag_lfl = utils_2.convertToBooleanI7(i7Data.flag_lfl);
-                const flag_ks = utils_2.convertToBooleanI7(i7Data.flag_ks);
-                const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
-                const r_ext = utils_2.isNumericI7(i7Data.r_ext) ? utils_2.convertToNumberI7(i7Data.r_ext) : undefined;
-                const x_ext = utils_2.isNumericI7(i7Data.x_ext) ? utils_2.convertToNumberI7(i7Data.x_ext) : undefined;
-                const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EI']), i7Data.kurzname);
+                const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
+                const einspeisePrio = (0, utils_2.isNumericI7)(i7Data.einspprio) ? (0, utils_2.convertToNumberI7)(i7Data.einspprio) : 1;
+                const flag_lfl = (0, utils_2.convertToBooleanI7)(i7Data.flag_lfl);
+                const flag_ks = (0, utils_2.convertToBooleanI7)(i7Data.flag_ks);
+                const usoll = (0, utils_2.isNumericI7)(i7Data.usoll) ? (0, utils_2.convertToNumberI7)(i7Data.usoll) : undefined;
+                const r_ext = (0, utils_2.isNumericI7)(i7Data.r_ext) ? (0, utils_2.convertToNumberI7)(i7Data.r_ext) : undefined;
+                const x_ext = (0, utils_2.isNumericI7)(i7Data.x_ext) ? (0, utils_2.convertToNumberI7)(i7Data.x_ext) : undefined;
+                const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EI']), i7Data.kurzname);
                 equivalentInjection.normallyInService = inBetrieb;
                 if (flag_lfl && usoll && (r_ext || x_ext)) {
                     equivalentInjection.regulationCapability = true;
@@ -2485,7 +1476,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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BOUNDARYINJECTION, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertBoundaryInjections2EquivalentInjection(cimModel, result);
@@ -2507,11 +1498,11 @@ class ConverterI7 {
     }
     convertBoundaryInjections2EquivalentInjection(cimModel, result) {
         for (const i7Data of result) {
-            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), 'BD_EI']), i7Data.kurzname);
-            const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-            const einspeisePrio = utils_2.convertToNumberI7(i7Data.einspprio);
-            equivalentInjection.p = utils_2.convertToNumberI7(i7Data.p_ersatznetz) + utils_2.convertToNumberI7(i7Data.p_restnetz);
-            equivalentInjection.q = utils_2.convertToNumberI7(i7Data.q_ersatznetz) + utils_2.convertToNumberI7(i7Data.q_restnetz);
+            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), 'BD_EI']), i7Data.kurzname);
+            const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
+            const einspeisePrio = (0, utils_2.convertToNumberI7)(i7Data.einspprio);
+            equivalentInjection.p = (0, utils_2.convertToNumberI7)(i7Data.p_ersatznetz) + (0, utils_2.convertToNumberI7)(i7Data.p_restnetz);
+            equivalentInjection.q = (0, utils_2.convertToNumberI7)(i7Data.q_ersatznetz) + (0, utils_2.convertToNumberI7)(i7Data.q_restnetz);
             const kr = 0;
             this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
             cimModel.addEquivalentInjection(equivalentInjection);
@@ -2520,16 +1511,16 @@ class ConverterI7 {
     }
     convertBoundaryInjections2ExternalNetworkInjection(cimModel, result) {
         for (const i7Data of result) {
-            const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
-            const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-            const einspeisePrio = utils_2.convertToNumberI7(i7Data.einspprio);
-            externalNetworkInjection.p = utils_2.convertToNumberI7(i7Data.p_ersatznetz) + utils_2.convertToNumberI7(i7Data.p_restnetz);
-            externalNetworkInjection.q = utils_2.convertToNumberI7(i7Data.q_ersatznetz) + utils_2.convertToNumberI7(i7Data.q_restnetz);
-            const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+            const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, utils_1.getUUID)(i7Data.guid), (0, utils_2.getName)(i7Data), i7Data.kurzname);
+            const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
+            const einspeisePrio = (0, utils_2.convertToNumberI7)(i7Data.einspprio);
+            externalNetworkInjection.p = (0, utils_2.convertToNumberI7)(i7Data.p_ersatznetz) + (0, utils_2.convertToNumberI7)(i7Data.p_restnetz);
+            externalNetworkInjection.q = (0, utils_2.convertToNumberI7)(i7Data.q_ersatznetz) + (0, utils_2.convertToNumberI7)(i7Data.q_restnetz);
+            const governorscd = (0, utils_2.isNumericI7)(i7Data.kr) ? (0, utils_2.convertToNumberI7)(i7Data.kr) : undefined;
             externalNetworkInjection.governorSCD = governorscd;
             externalNetworkInjection.referencePriority = einspeisePrio;
-            externalNetworkInjection.maxZ0ToZ1Ratio = utils_2.convertToNumberI7(i7Data.z0_z1);
-            const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_BI_${i7Data.id}`);
+            externalNetworkInjection.maxZ0ToZ1Ratio = (0, utils_2.convertToNumberI7)(i7Data.z0_z1);
+            const regulatingControl = new RegulatingControl_1.RegulatingControl((0, utils_1.generateUUID)(), `RC_BI_${i7Data.id}`);
             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
             regulatingControl.discrete = true;
             regulatingControl.enabled = inBetrieb;
@@ -2545,22 +1536,22 @@ 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, integral7.ersatzZweigAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG), integral7.ersatzZweigAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
-                        utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.kurzname) +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const rdfid = utils_1.getUUID(i7Data.guid);
-                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(rdfid, util_create_1.createNotation([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
-                    const ur1 = utils_2.getU(i7Data.ur1, defaultValuesConfig.DefaultVoltage);
-                    const ur2 = utils_2.getU(i7Data.ur2, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltageUr1 = util_create_1.createBaseVoltageIfNotExists(cimModel, ur1, this.exportFramesBoundary);
-                    const baseVoltageUr2 = util_create_1.createBaseVoltageIfNotExists(cimModel, ur2, this.exportFramesBoundary);
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
+                    const rdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(rdfid, (0, util_create_1.createNotation)([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
+                    const ur1 = (0, utils_2.getU)(i7Data.ur1, defaultValuesConfig.DefaultVoltage);
+                    const ur2 = (0, utils_2.getU)(i7Data.ur2, defaultValuesConfig.DefaultVoltage);
+                    const baseVoltageUr1 = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, ur1, this.exportFramesBoundary);
+                    const baseVoltageUr2 = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, ur2, this.exportFramesBoundary);
                     if (baseVoltageUr1) {
                         equivalentBranch.baseVoltage = baseVoltageUr1;
                     }
@@ -2579,31 +1570,64 @@ class ConverterI7 {
             }
         });
     }
-    convertKompensationsdrossel(cimModel, knotenSfIDs) {
+    convertKompensationsdrossel(cimModel, targetVoltages, knotenSfIDs) {
+        var _a, _b;
         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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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;
-                    shunt.maximumSections = i7Data.maxstufe;
-                    shunt.nomU = i7Data.ur;
-                    shunt.gPerSection = i7Data.pr / Math.pow(i7Data.ur, 2);
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const spannungsregelungLokal = utils_2.isBooleanI7(i7Data.flag_lf) ? utils_2.convertToBooleanI7(i7Data.flag_lf) : false;
-                    const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_LSC']), i7Data.kurzname);
+                    const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
+                    const qr = (0, utils_2.isNumericI7)(i7Data.qr) ? i7Data.qr : undefined;
+                    const pr = (0, utils_2.isNumericI7)(i7Data.pr) ? i7Data.pr : undefined;
+                    shunt.nomU = (0, utils_2.isNumericI7)(i7Data.ur) ? i7Data.ur : undefined;
+                    shunt.normalSections = (0, utils_2.isNumericI7)(i7Data.aktstufe) ? i7Data.aktstufe : undefined;
+                    shunt.maximumSections = (0, utils_2.isNumericI7)(i7Data.maxstufe) ? i7Data.maxstufe : undefined;
+                    shunt.bPerSection = (0, utils_2.calculateBPerSection)(qr * -1, shunt.nomU, shunt.maximumSections);
+                    shunt.gPerSection = (0, utils_2.calculateGPerSection)(pr, shunt.nomU, shunt.maximumSections);
+                    const spannungsregelungLokal = (0, utils_2.isBooleanI7)(i7Data.flag_lf) ? (0, utils_2.convertToBooleanI7)(i7Data.flag_lf) : false;
+                    const spannungsregelungRemote = (0, utils_2.isBooleanI7)(i7Data.rpv_geregelt) ? (0, utils_2.convertToBooleanI7)(i7Data.rpv_geregelt) : false;
+                    let knotenSpgGeregelt = undefined;
+                    if (spannungsregelungRemote) {
+                        knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg));
+                    }
                     let regulatingControl = undefined;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), util_create_1.createNotation(['LSC']));
+                        regulatingControl = new RegulatingControl_1.RegulatingControl((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([shunt.getUUID().substring(0, 8), '_LSC']));
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
                         regulatingControl.targetDeadband = i7Data.uband;
                         regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
                         regulatingControl.enabled = inBetrieb;
+                        if (knotenSpgGeregelt) {
+                            const cn_point = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                            let visited_set = [];
+                            const terminal = (0, util_graph2tree_1.getControlledNode)(cn_point, knotenSpgGeregelt);
+                            if (terminal) {
+                                const cn = terminal.getConnectivityNode();
+                                regulatingControl.terminalUUID = terminal.getUUID();
+                                regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = cn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
+                                const tV = targetVoltages.get(this.UUID2Integral7ID.get(cn.getUUID()).find(elem => elem));
+                                if (tV && regulatingControl.targetValue === undefined) {
+                                    regulatingControl.targetValue = tV['usoll'];
+                                }
+                                regulatingControl.targetValue = targetVoltages.get((_b = this.UUID2Integral7ID.get(cn.getUUID())) === null || _b === void 0 ? void 0 : _b.find(elem => elem))['usoll'];
+                            }
+                        }
+                        regulatingControl.addRegulatingCondEq(shunt);
+                        shunt.regulatingControlUUID = regulatingControl.mrid;
+                        shunt.controlEnabled = inBetrieb;
                         shunt.regulatingControl = regulatingControl;
                         cimModel.addRegulatingControl(regulatingControl);
+                        const term = cimModel.terminals.get(regulatingControl.terminalUUID);
+                        if (term) {
+                            term.addRegulatingControl(regulatingControl);
+                        }
+                        else {
+                            let stop = true;
+                        }
                     }
-                    this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, regulatingControl);
+                    this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, shunt.regulatingControl, undefined, targetVoltages);
                     cimModel.addLinearShuntCompensator(shunt);
                     this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL);
                 }
@@ -2613,31 +1637,64 @@ class ConverterI7 {
             }
         });
     }
-    convertKompensationskondensatoren(cimModel, knotenSfIDs) {
+    convertKompensationskondensatoren(cimModel, targetVoltages, knotenSfIDs) {
+        var _a, _b;
         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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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;
-                    shunt.maximumSections = i7Data.maxstufe;
-                    shunt.nomU = i7Data.ur;
-                    shunt.gPerSection = i7Data.pr / Math.pow(i7Data.ur, 2);
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const spannungsregelungLokal = utils_2.isBooleanI7(i7Data.flag_lf) ? utils_2.convertToBooleanI7(i7Data.flag_lf) : false;
-                    const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
-                    let regulatingControl;
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_LSC']), i7Data.kurzname);
+                    const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
+                    const qr = (0, utils_2.isNumericI7)(i7Data.qr) ? i7Data.qr : undefined;
+                    const pr = (0, utils_2.isNumericI7)(i7Data.pr) ? i7Data.pr : undefined;
+                    shunt.nomU = (0, utils_2.isNumericI7)(i7Data.ur) ? i7Data.ur : undefined;
+                    shunt.normalSections = (0, utils_2.isNumericI7)(i7Data.aktstufe) ? i7Data.aktstufe : undefined;
+                    shunt.maximumSections = (0, utils_2.isNumericI7)(i7Data.maxstufe) ? i7Data.maxstufe : undefined;
+                    shunt.bPerSection = (0, utils_2.calculateBPerSection)(qr, shunt.nomU, shunt.maximumSections);
+                    shunt.gPerSection = (0, utils_2.calculateGPerSection)(pr, shunt.nomU, shunt.maximumSections);
+                    const spannungsregelungLokal = (0, utils_2.isBooleanI7)(i7Data.flag_lf) ? (0, utils_2.convertToBooleanI7)(i7Data.flag_lf) : false;
+                    const spannungsregelungRemote = (0, utils_2.isBooleanI7)(i7Data.rpv_geregelt) ? (0, utils_2.convertToBooleanI7)(i7Data.rpv_geregelt) : false;
+                    let knotenSpgGeregelt = undefined;
+                    if (spannungsregelungRemote) {
+                        knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg));
+                    }
+                    let regulatingControl = undefined;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_KompKondensator_${i7Data.id}`);
+                        regulatingControl = new RegulatingControl_1.RegulatingControl((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([shunt.getUUID().substring(0, 8), '_LSC']));
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
-                        regulatingControl.enabled = inBetrieb;
                         regulatingControl.targetDeadband = i7Data.uband;
                         regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
+                        regulatingControl.enabled = inBetrieb;
+                        if (knotenSpgGeregelt) {
+                            const cn_point = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                            let visited_set = [];
+                            const terminal = (0, util_graph2tree_1.getControlledNode)(cn_point, knotenSpgGeregelt);
+                            if (terminal) {
+                                const cn = terminal.getConnectivityNode();
+                                regulatingControl.terminalUUID = terminal.getUUID();
+                                regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = cn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
+                                const tV = targetVoltages.get(this.UUID2Integral7ID.get(cn.getUUID()).find(elem => elem));
+                                if (tV && regulatingControl.targetValue === undefined) {
+                                    regulatingControl.targetValue = tV['usoll'];
+                                }
+                                regulatingControl.targetValue = targetVoltages.get((_b = this.UUID2Integral7ID.get(cn.getUUID())) === null || _b === void 0 ? void 0 : _b.find(elem => elem))['usoll'];
+                            }
+                        }
+                        regulatingControl.addRegulatingCondEq(shunt);
+                        shunt.regulatingControlUUID = regulatingControl.mrid;
+                        shunt.controlEnabled = inBetrieb;
                         shunt.regulatingControl = regulatingControl;
                         cimModel.addRegulatingControl(regulatingControl);
+                        const term = cimModel.terminals.get(regulatingControl.terminalUUID);
+                        if (term) {
+                            term.addRegulatingControl(regulatingControl);
+                        }
+                        else {
+                            let stop = true;
+                        }
                     }
-                    this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data);
+                    this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, shunt.regulatingControl, undefined, targetVoltages);
                     cimModel.addLinearShuntCompensator(shunt);
                     this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL);
                 }
@@ -2650,16 +1707,18 @@ 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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STATCOM, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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);
-                    const regulatingControl = utils_2.createRegulatingControl(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
+                    const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
+                    const regulatingControl = (0, utils_2.createRegulatingControl)(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
-                    const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
+                    const uref = (0, utils_2.isNumericI7)(i7Data.uref) ? (0, utils_2.convertToNumberI7)(i7Data.uref) : undefined;
                     regulatingControl.targetValue = uref;
+                    regulatingControl.enabled = inBetrieb;
                     statVarCom.voltageSetPoint = uref;
-                    const flagOS = utils_2.convertToBooleanI7(i7Data.flag_os);
+                    statVarCom.controlEnabled = inBetrieb;
+                    const flagOS = (0, utils_2.convertToBooleanI7)(i7Data.flag_os);
                     if (flagOS && i7Data.trafo) {
                         const trafoUUID = this.integralID2UUID.get(i7Data.trafo);
                         const powerTransformer = cimModel.getObject(trafoUUID);
@@ -2669,6 +1728,7 @@ class ConverterI7 {
                                 const maxBv = Math.max(...bvNumbers);
                                 const powerTransformerEnd = powerTransformer.powerTransformerEnds[bvNumbers.indexOf(maxBv)];
                                 regulatingControl.terminal = powerTransformerEnd.terminal;
+                                powerTransformerEnd.terminal.addRegulatingControl(regulatingControl);
                             }
                             catch (e) {
                                 this.logger.debug(`Statcom Zuordnung zu Trafo fehlgeschlagen.`);
@@ -2690,16 +1750,18 @@ 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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SVC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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);
-                    const regulatingControl = utils_2.createRegulatingControl(`RC_SVC ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
+                    const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
+                    const regulatingControl = (0, utils_2.createRegulatingControl)(`RC_SVC ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
-                    const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
+                    const uref = (0, utils_2.isNumericI7)(i7Data.uref) ? (0, utils_2.convertToNumberI7)(i7Data.uref) : undefined;
                     regulatingControl.targetValue = uref;
+                    regulatingControl.enabled = inBetrieb;
                     statVarCom.voltageSetPoint = uref;
-                    const flagOS = utils_2.convertToBooleanI7(i7Data.flag_os);
+                    statVarCom.controlEnabled = inBetrieb;
+                    const flagOS = (0, utils_2.convertToBooleanI7)(i7Data.flag_os);
                     if (flagOS && i7Data.trafo) {
                         const trafoUUID = this.integralID2UUID.get(i7Data.trafo);
                         const powerTransformer = cimModel.getObject(trafoUUID);
@@ -2709,6 +1771,7 @@ class ConverterI7 {
                                 const maxBv = Math.max(...bvNumbers);
                                 const powerTransformerEnd = powerTransformer.powerTransformerEnds[bvNumbers.indexOf(maxBv)];
                                 regulatingControl.terminal = powerTransformerEnd.terminal;
+                                powerTransformerEnd.terminal.addRegulatingControl(regulatingControl);
                             }
                             catch (e) {
                                 this.logger.debug(`Statcom Zuordnung zu Trafo fehlgeschlagen.`);
@@ -2719,6 +1782,7 @@ class ConverterI7 {
                         }
                     }
                     cimModel.addStaticVarCompensator(statVarCom);
+                    cimModel.addRegulatingControl(regulatingControl);
                     this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.SVC);
                 }
             }
@@ -2730,9 +1794,9 @@ 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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH), knotenSfIDs));
                 for (const i7Data of result) {
-                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCCU']));
+                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (acConnectivityNode) {
                         const equipmentContainer = this.determineEquipmentContainer('Substation', cimModel, acConnectivityNode.connectivityNodeContainer);
@@ -2746,18 +1810,19 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const csConverter = new CsConverter_1.CsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CSC']), i7Data.kurzname);
+                    const csConverter = new CsConverter_1.CsConverter((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CSC']), i7Data.kurzname);
                     csConverter.equipmentContainer = dcConverterUnit;
                     csConverter.baseS = i7Data.pr;
                     csConverter.ratedUdc = i7Data.ur;
-                    csConverter.idleLoss = i7Data.p_leer;
+                    csConverter.idleLoss = i7Data.p_leer / 1000;
                     csConverter.maxUdc = csConverter.ratedUdc * 1.05;
                     csConverter.minUdc = csConverter.ratedUdc * 0.95;
                     csConverter.resistiveLoss = 0;
                     csConverter.switchingLoss = 0;
-                    const regelungU = utils_2.convertToBooleanI7(i7Data.u_geregelt);
-                    const regelungP = utils_2.convertToBooleanI7(i7Data.p_geregelt);
-                    const regelungW = utils_2.convertToBooleanI7(i7Data.grad_geregelt);
+                    csConverter.p = (0, utils_2.isNumericI7)(i7Data.pges) ? i7Data.pges * -1 : 0;
+                    csConverter.q = (0, utils_2.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
+                    const regelungU = (0, utils_2.convertToBooleanI7)(i7Data.u_geregelt);
+                    const regelungP = (0, utils_2.convertToBooleanI7)(i7Data.p_geregelt);
                     if (regelungU) {
                         csConverter.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.inverter;
                     }
@@ -2767,7 +1832,7 @@ class ConverterI7 {
                     else {
                         csConverter.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
                     }
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
                     csConverter.normallyInService = inBetrieb;
                     if (acConnectivityNode) {
                         csConverter.pccTerminal = this.createConnection(cimModel, csConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, true);
@@ -2775,10 +1840,10 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCN']));
+                    const dcNode = new DCNode_1.DCNode((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
                     dcConverterUnit.dCNodes.set(dcNode.getUUID(), dcNode);
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_ACDCC-DCT']));
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ACDCC-DCT']));
                     acDCConverterDCTerminal.dCConductingEquipment = csConverter;
                     csConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     acDCConverterDCTerminal.dcNode = dcNode;
@@ -2797,9 +1862,9 @@ 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, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC), knotenSfIDs));
                 for (const i7Data of result) {
-                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCCU']));
+                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (acConnectivityNode) {
                         const equipmentContainer = this.determineEquipmentContainer('Substation', cimModel, acConnectivityNode.connectivityNodeContainer);
@@ -2813,48 +1878,45 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const vsConverter = new VsConverter_1.VsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_VSC']), i7Data.kurzname);
+                    const vsConverter = new VsConverter_1.VsConverter((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_VSC']), i7Data.kurzname);
                     vsConverter.equipmentContainer = dcConverterUnit;
                     vsConverter.baseS = i7Data.pr;
-                    utils_2.isNumericI7(i7Data.udc) ? vsConverter.ratedUdc = i7Data.udc : vsConverter.ratedUdc = i7Data.ur;
-                    vsConverter.idleLoss = i7Data.p_leer;
+                    (0, utils_2.isNumericI7)(i7Data.udc) ? vsConverter.ratedUdc = i7Data.udc : vsConverter.ratedUdc = i7Data.ur;
+                    vsConverter.idleLoss = i7Data.p_leer / 1000;
                     vsConverter.maxUdc = vsConverter.ratedUdc * 1.05;
                     vsConverter.minUdc = vsConverter.ratedUdc * 0.95;
                     vsConverter.resistiveLoss = 0;
                     vsConverter.switchingLoss = 0;
-                    const regelungU = utils_2.convertToBooleanI7(i7Data.u_geregelt);
-                    const regelungP = utils_2.convertToBooleanI7(i7Data.p_geregelt);
-                    const regelungW = utils_2.convertToBooleanI7(i7Data.grad_geregelt);
+                    vsConverter.p = (0, utils_2.isNumericI7)(i7Data.pges) ? i7Data.pges * -1 : 0;
+                    vsConverter.q = (0, utils_2.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
+                    const regelungU = (0, utils_2.convertToBooleanI7)(i7Data.u_geregelt);
+                    const regelungP = (0, utils_2.convertToBooleanI7)(i7Data.p_geregelt);
                     if (regelungU) {
                         vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.udc;
                         vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
-                    }
-                    else if (regelungP) {
-                        vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
-                        vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
+                        vsConverter.targetUpcc = (_a = acConnectivityNode === null || acConnectivityNode === void 0 ? void 0 : acConnectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getBaseVoltageAsNumber();
+                        vsConverter.targetUdc = vsConverter.ratedUdc;
                     }
                     else {
                         vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
                         vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
+                        vsConverter.targetPpcc = vsConverter.baseS * -1;
+                        vsConverter.targetQpcc = 0;
                     }
                     vsConverter.droop = 0;
                     vsConverter.droopCompensation = 0;
                     vsConverter.qShare = 0;
-                    vsConverter.targetQpcc = 0;
-                    vsConverter.targetUpcc = (_a = acConnectivityNode === null || acConnectivityNode === void 0 ? void 0 : acConnectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getBaseVoltageAsNumber();
-                    vsConverter.targetPpcc = vsConverter.baseS;
-                    vsConverter.targetUdc = vsConverter.ratedUdc;
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
                     vsConverter.normallyInService = inBetrieb;
                     if (acConnectivityNode) {
-                        vsConverter.pccTerminal = util_create_1.createConnection(cimModel, vsConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, 1);
+                        vsConverter.pccTerminal = (0, util_create_1.createConnection)(cimModel, vsConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, 1);
                     }
                     else {
                         this.logger.debug(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCN']));
+                    const dcNode = new DCNode_1.DCNode((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_ACDCC-DCT']));
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ACDCC-DCT']));
                     acDCConverterDCTerminal.dCConductingEquipmentUUID = vsConverter.mrid;
                     acDCConverterDCTerminal.dcNode = dcNode;
                     vsConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
@@ -2874,18 +1936,22 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const rdfid = utils_1.getUUID(i7Data.guid);
-                    const energySource = new EnergySource_1.EnergySource(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
-                    this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
-                    energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
                     const prio = i7Data.einspprio;
-                    const usoll = i7Data.usoll;
-                    const spannungsgeregelt = utils_2.convertToBooleanI7(i7Data.spannungsgeregelt);
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
-                    energySource.activePower = powerData[0];
-                    energySource.reactivePower = powerData[1];
-                    cimModel.addEnergySource(energySource);
-                    this.addIdMapping(i7Data.id, energySource.mrid, integral_sql_1.Integral7TableNames.EINSPEISUNG);
+                    const inBetrieb = (0, utils_2.isBooleanI7)(i7Data.betrieb) ? (0, utils_2.convertToBooleanI7)(i7Data.betrieb) : false;
+                    if (prio > 0) {
+                        this.convertEnergySourceToExternalNetworkInjection(cimModel, i7Data, prio, inBetrieb);
+                    }
+                    else {
+                        const rdfid = (0, utils_1.getUUID)(i7Data.guid);
+                        const energySource = new EnergySource_1.EnergySource(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
+                        energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
+                        const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
+                        energySource.activePower = powerData[0];
+                        energySource.reactivePower = powerData[1];
+                        this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
+                        cimModel.addEnergySource(energySource);
+                        this.addIdMapping(i7Data.id, energySource.mrid, integral_sql_1.Integral7TableNames.EINSPEISUNG);
+                    }
                 }
                 catch (err) {
                     this.logger.error(`Err convertEinspeisungen2EnergySource ${i7Data.id} ${err}`);
@@ -2893,15 +1959,46 @@ class ConverterI7 {
             }
         });
     }
+    convertEnergySourceToExternalNetworkInjection(cimModel, i7Data, prio, inBetrieb) {
+        const rdfid = (0, utils_1.getUUID)(i7Data.guid);
+        const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
+        externalNetworkInjection.referencePriority = prio;
+        const usoll = i7Data.usoll;
+        let regulatingControl = undefined;
+        switch (i7Data.spannungsgeregelt) {
+            case 1: {
+                const cimrdfid = (0, utils_1.getUUID)(externalNetworkInjection.getUUID());
+                regulatingControl = new RegulatingControl_1.RegulatingControl((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
+                regulatingControl.targetValue = usoll;
+                regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+                regulatingControl.discrete = false;
+                regulatingControl.enabled = inBetrieb;
+                externalNetworkInjection.controlEnabled = inBetrieb;
+                regulatingControl.addRegulatingCondEq(externalNetworkInjection);
+                externalNetworkInjection.regulatingControl = regulatingControl;
+                cimModel.addRegulatingControl(regulatingControl);
+                break;
+            }
+            default: {
+                externalNetworkInjection.controlEnabled = false;
+            }
+        }
+        const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
+        externalNetworkInjection.p = powerData[0];
+        externalNetworkInjection.q = powerData[1];
+        this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
+        cimModel.addExternalNetworkInjection(externalNetworkInjection);
+        this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
+    }
     convertEinspeisungen2EquivalentInjection(cimModel, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const rdfid = utils_1.getUUID(i7Data.guid);
-                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
+                    const rdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
                     const prio = i7Data.einspprio;
                     const usoll = i7Data.usoll;
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
+                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
                     equivalentInjection.p = powerData[0];
                     equivalentInjection.q = powerData[1];
                     this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
@@ -2919,9 +2016,8 @@ class ConverterI7 {
             for (const i7Data of result) {
                 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, '_ENI'], 32, true), i7Data.kurzname);
-                    const un = cn.getVoltageLevel().getBaseVoltageAsNumber();
+                    const cimrdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);
                     externalNetworkInjection.nameprimaertyp = i7Data.nameprimaertyp;
                     let mf = undefined;
                     mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
@@ -2929,44 +2025,45 @@ class ConverterI7 {
                         cimModel.addMultiplierFactor(mf);
                         externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
                     }
-                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
+                    const maxP = (0, utils_2.isNumericI7)(i7Data.p_max) ? (0, utils_2.convertToNumberI7)(i7Data.p_max) : undefined;
                     externalNetworkInjection.maxP = maxP;
-                    const governorscd = utils_2.isNumericI7(i7Data.kr) && maxP ? utils_2.calculateSigma(50, externalNetworkInjection.maxP, utils_2.convertToNumberI7(i7Data.kr)) : undefined;
+                    const governorscd = (0, utils_2.isNumericI7)(i7Data.kr) ? (0, utils_2.convertToNumberI7)(i7Data.kr) : undefined;
                     externalNetworkInjection.governorSCD = governorscd;
-                    const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
+                    const maxQ = (0, utils_2.isNumericI7)(i7Data.q_max) ? (0, utils_2.convertToNumberI7)(i7Data.q_max) : undefined;
                     externalNetworkInjection.maxQ = maxQ;
-                    const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
+                    const minP = (0, utils_2.isNumericI7)(i7Data.p_min) ? (0, utils_2.convertToNumberI7)(i7Data.p_min) : undefined;
                     externalNetworkInjection.minP = minP;
-                    const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
+                    const minQ = (0, utils_2.isNumericI7)(i7Data.q_min) ? (0, utils_2.convertToNumberI7)(i7Data.q_min) : undefined;
                     externalNetworkInjection.minQ = minQ;
-                    const r0X0 = utils_2.isNumericI7(i7Data.x0_r0) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0) : undefined;
-                    const r1X1 = utils_2.isNumericI7(i7Data.x1_r1) ? 1 / utils_2.convertToNumberI7(i7Data.x1_r1) : undefined;
-                    const z0Z1 = utils_2.isNumericI7(i7Data.z0_z1) ? utils_2.convertToNumberI7(i7Data.z0_z1) : undefined;
-                    const maxR0X0Ratio = utils_2.isNumericI7(i7Data.x0_r0_max) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0_max) : r0X0;
+                    const r0X0 = (0, utils_2.isNumericI7)(i7Data.x0_r0) ? 1 / (0, utils_2.convertToNumberI7)(i7Data.x0_r0) : undefined;
+                    const r1X1 = (0, utils_2.isNumericI7)(i7Data.x1_r1) ? 1 / (0, utils_2.convertToNumberI7)(i7Data.x1_r1) : undefined;
+                    const z0Z1 = (0, utils_2.isNumericI7)(i7Data.z0_z1) ? (0, utils_2.convertToNumberI7)(i7Data.z0_z1) : undefined;
+                    const maxR0X0Ratio = (0, utils_2.isNumericI7)(i7Data.x0_r0_max) ? 1 / (0, utils_2.convertToNumberI7)(i7Data.x0_r0_max) : r0X0;
                     externalNetworkInjection.maxR0ToX0Ratio = maxR0X0Ratio;
-                    const maxR1X1Ratio = utils_2.isNumericI7(i7Data.x1_r1_max) ? 1 / utils_2.convertToNumberI7(i7Data.x1_r1_max) : r1X1;
+                    const maxR1X1Ratio = (0, utils_2.isNumericI7)(i7Data.x1_r1_max) ? 1 / (0, utils_2.convertToNumberI7)(i7Data.x1_r1_max) : r1X1;
                     externalNetworkInjection.maxR1ToX1Ratio = maxR1X1Ratio;
-                    const maxZ0Z1Ratio = utils_2.isNumericI7(i7Data.z0_z1_max) ? utils_2.convertToNumberI7(i7Data.z0_z1_max) : z0Z1;
+                    const maxZ0Z1Ratio = (0, utils_2.isNumericI7)(i7Data.z0_z1_max) ? (0, utils_2.convertToNumberI7)(i7Data.z0_z1_max) : z0Z1;
                     externalNetworkInjection.maxZ0ToZ1Ratio = maxZ0Z1Ratio;
-                    const minR0X0Ratio = utils_2.isNumericI7(i7Data.x0_r0_min) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0_min) : r0X0;
+                    const minR0X0Ratio = (0, utils_2.isNumericI7)(i7Data.x0_r0_min) ? 1 / (0, utils_2.convertToNumberI7)(i7Data.x0_r0_min) : r0X0;
                     externalNetworkInjection.minR0ToX0Ratio = minR0X0Ratio;
-                    const minR1X1Ratio = utils_2.isNumericI7(i7Data.x1_r1_min) ? utils_2.convertToNumberI7(i7Data.x1_r1_min) : r1X1;
+                    const minR1X1Ratio = (0, utils_2.isNumericI7)(i7Data.x1_r1_min) ? (0, utils_2.convertToNumberI7)(i7Data.x1_r1_min) : r1X1;
                     externalNetworkInjection.minR1ToX1Ratio = minR1X1Ratio;
-                    const minZ0Z1Ratio = utils_2.isNumericI7(i7Data.z0_z1_min) ? utils_2.convertToNumberI7(i7Data.z0_z1_min) : z0Z1;
+                    const minZ0Z1Ratio = (0, utils_2.isNumericI7)(i7Data.z0_z1_min) ? (0, utils_2.convertToNumberI7)(i7Data.z0_z1_min) : z0Z1;
                     externalNetworkInjection.minZ0ToZ1Ratio = minZ0Z1Ratio;
-                    const skAkt = utils_2.isNumericI7(i7Data.sk_akt) ? utils_2.convertToNumberI7(i7Data.sk_akt) : undefined;
-                    const skMin = utils_2.isNumericI7(i7Data.sk_min) ? utils_2.convertToNumberI7(i7Data.sk_min) : skAkt;
-                    const skMax = utils_2.isNumericI7(i7Data.sk_max) ? utils_2.convertToNumberI7(i7Data.sk_max) : skAkt;
-                    const minIkSecond = utils_2.isNumericI7(i7Data.sk_min) ? utils_2.convertToNumberI7(skMin) / Math.sqrt(3) * skMin : undefined;
+                    const skAkt = (0, utils_2.isNumericI7)(i7Data.sk_akt) ? (0, utils_2.convertToNumberI7)(i7Data.sk_akt) : undefined;
+                    const skMin = (0, utils_2.isNumericI7)(i7Data.sk_min) ? (0, utils_2.convertToNumberI7)(i7Data.sk_min) : skAkt;
+                    const skMax = (0, utils_2.isNumericI7)(i7Data.sk_max) ? (0, utils_2.convertToNumberI7)(i7Data.sk_max) : skAkt;
+                    const minIkSecond = (0, utils_2.isNumericI7)(i7Data.sk_min) ? (0, utils_2.convertToNumberI7)(skMin) / Math.sqrt(3) * skMin : undefined;
                     externalNetworkInjection.minInitialSymShCCurrent = minIkSecond;
-                    const maxIkSecond = utils_2.isNumericI7(i7Data.sk_max) ? utils_2.convertToNumberI7(skMax) / Math.sqrt(3) * skMax : undefined;
+                    const maxIkSecond = (0, utils_2.isNumericI7)(i7Data.sk_max) ? (0, utils_2.convertToNumberI7)(skMax) / Math.sqrt(3) * skMax : undefined;
                     externalNetworkInjection.maxInitialSymShCCurrent = maxIkSecond;
-                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
-                    const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : false;
+                    const usoll = (0, utils_2.isNumericI7)(i7Data.usoll) ? (0, utils_2.convertToNumberI7)(i7Data.usoll) : undefined;
+                    const inBetrieb = (0, utils_2.isBooleanI7)(i7Data.betrieb) ? (0, utils_2.convertToBooleanI7)(i7Data.betrieb) : false;
                     let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_ENI_${externalNetworkInjection.getUUID().substring(0, 8)}`);
+                            const cimrdfid = (0, utils_1.getUUID)(externalNetworkInjection.getUUID());
+                            regulatingControl = new RegulatingControl_1.RegulatingControl((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -2982,7 +2079,7 @@ class ConverterI7 {
                         }
                     }
                     this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
-                    let prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                    let prio = (0, utils_2.isNumericI7)(i7Data.einspprio) ? (0, utils_2.convertToNumberI7)(i7Data.einspprio) : undefined;
                     if ((regulatingControl === null || regulatingControl === void 0 ? void 0 : regulatingControl.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
                         if (prio && prio > 0) {
                             externalNetworkInjection.referencePriority = prio + 1;
@@ -2991,13 +2088,13 @@ class ConverterI7 {
                             prio = undefined;
                         }
                     }
-                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
                     externalNetworkInjection.setActivePower(p * -1);
                     externalNetworkInjection.setReactivePower(q * -1);
-                    externalNetworkInjection.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] * -1 : undefined;
-                    externalNetworkInjection.q_mf = utils_2.isNumericI7(powerData[3]) ? powerData[3] * -1 : undefined;
+                    externalNetworkInjection.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    externalNetworkInjection.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
                 }
@@ -3007,16 +2104,24 @@ class ConverterI7 {
             }
         });
     }
-    setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, regulatingControl, generatingUnit) {
+    setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, regulatingControl, generatingUnit, targetVoltages) {
         var _a, _b, _c;
-        const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+        const inBetrieb = (0, utils_2.convertToBooleanI7)(i7Data.betrieb);
         condEquip.normallyInService = inBetrieb;
         const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
         if (connectivityNode) {
             const terminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
             if (regulatingControl) {
-                regulatingControl.name = util_create_1.createNotation([regulatingControl.name, '_', (_a = connectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
-                regulatingControl.terminal = terminal;
+                if (regulatingControl.terminalUUID === undefined) {
+                    regulatingControl.terminalUUID = terminal.getUUID();
+                    regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = connectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
+                    if (regulatingControl.targetValue === undefined) {
+                        const tV = targetVoltages === null || targetVoltages === void 0 ? void 0 : targetVoltages.get(this.UUID2Integral7ID.get(connectivityNode.getUUID()).find(elem => elem));
+                        if (tV) {
+                            regulatingControl.targetValue = tV['usoll'];
+                        }
+                    }
+                }
             }
             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, connectivityNode.connectivityNodeContainer);
             if (equipmentContainer) {
@@ -3024,19 +2129,19 @@ class ConverterI7 {
                 equipmentContainer.addEquipment(condEquip);
                 let i7Schluessel = '';
                 if (condEquip instanceof EnergyConsumer_1.EnergyConsumer) {
-                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.BELASTUNG_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof EquivalentInjection_1.EquivalentInjection) {
-                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.ERSATZQUERZWEIG_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof StaticVarCompensator_1.StaticVarCompensator) {
-                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.STATCOM_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof ExternalNetworkInjection_1.ExternalNetworkInjection) {
-                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
                 }
                 condEquip.description = i7Schluessel;
@@ -3056,11 +2161,11 @@ 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, schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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');
-                    bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
+                    const cimrdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), 'Querkupplung');
+                    bay.number = (0, utils_2.isNumericI7)(i7Data.feldnummer) ? (0, utils_2.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (voltageLevel) {
@@ -3068,7 +2173,7 @@ class ConverterI7 {
                         voltageLevel.addBay(bay);
                         const i7Schluessel = voltageLevel.description +
                             '/QK-' +
-                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                         bay.description = i7Schluessel;
                     }
                     else {
@@ -3087,19 +2192,19 @@ 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, schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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');
+                    const cimrdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
+                    bay.number = (0, utils_2.isNumericI7)(i7Data.feldnummer) ? (0, utils_2.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     if (voltageLevel) {
                         bay.voltageLevel = voltageLevel;
                         voltageLevel.addBay(bay);
                         const i7Schluessel = voltageLevel.description +
                             '/LK-' +
-                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                         bay.description = i7Schluessel;
                     }
                     else {
@@ -3120,9 +2225,9 @@ 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, containerIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_STARR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_STARR), containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_BR']), 'Breaker', 'starre Verbindung');
+                    const breaker = new Breaker_1.Breaker((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_BR']), 'Breaker', 'starre Verbindung');
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -3136,9 +2241,9 @@ 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, containerIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRENNERFI_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNERFI_3P), containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_D']));
+                    const disconnector = new Disconnector_1.Disconnector((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_D']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNERFI_3P);
@@ -3152,9 +2257,9 @@ 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, containerIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRENNER_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNER_3P), containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_D']));
+                    const disconnector = new Disconnector_1.Disconnector((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_D']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNER_3P);
@@ -3168,9 +2273,9 @@ 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, containerIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER), containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_BR']));
+                    const breaker = new Breaker_1.Breaker((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_BR']));
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -3182,10 +2287,9 @@ class ConverterI7 {
         });
     }
     convertSwitch(swtch, cimModel, i7Data) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            swtch.normalOpen = !utils_2.convertToBooleanI7(i7Data.schaltzustand);
-            swtch.open = !utils_2.convertToBooleanI7(i7Data.schaltzustand);
+            swtch.normalOpen = !(0, utils_2.convertToBooleanI7)(i7Data.schaltzustand);
+            swtch.open = !(0, utils_2.convertToBooleanI7)(i7Data.schaltzustand);
             const equipmentContainer = cimModel.objects.get(this.integralID2UUID.get(i7Data.seliste));
             const cnStart = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
             const cnZiel = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
@@ -3208,7 +2312,7 @@ class ConverterI7 {
             else {
                 this.logger.debug(`Schalter ${i7Data.id} besitzt keinen Zielknoten.`);
             }
-            const voltageLevel = (_a = equipmentContainer) === null || _a === void 0 ? void 0 : _a.getVoltageLevel();
+            const voltageLevel = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getVoltageLevel();
             const baseVoltage = voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage;
             if (baseVoltage) {
                 swtch.baseVoltageUUID = baseVoltage.mrid;
@@ -3222,13 +2326,13 @@ 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, integral7.lDrosselAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSDROSSEL), integral7.lDrosselAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SC']), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SC']), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
                     const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
-                        startTerminal = util_create_1.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, 1);
+                        startTerminal = (0, util_create_1.createConnection)(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, 1);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
@@ -3236,15 +2340,15 @@ class ConverterI7 {
                     const target = cimModel.objects.get(this.integralID2UUID.get(i7Data.eknoten));
                     let targetTerminal;
                     if (target) {
-                        targetTerminal = util_create_1.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, 2);
+                        targetTerminal = (0, util_create_1.createConnection)(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, 2);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
                     }
-                    const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, ur, this.exportFramesBoundary);
-                    const ir = utils_2.isNumericI7(i7Data.ir) ? utils_2.convertToNumberI7(i7Data.ir) : defaultValuesConfig.SeriesCompensator.varistorRatedCurrent;
-                    const ukr = utils_2.isNumericI7(i7Data.ukr) ? utils_2.convertToNumberI7(i7Data.ukr) : 0;
+                    const ur = (0, utils_2.getU)(i7Data.ur, defaultValuesConfig.DefaultVoltage);
+                    const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, ur, this.exportFramesBoundary);
+                    const ir = (0, utils_2.isNumericI7)(i7Data.ir) ? (0, utils_2.convertToNumberI7)(i7Data.ir) : defaultValuesConfig.SeriesCompensator.varistorRatedCurrent;
+                    const ukr = (0, utils_2.isNumericI7)(i7Data.ukr) ? (0, utils_2.convertToNumberI7)(i7Data.ukr) : 0;
                     if (ir > 0 && ukr > 0) {
                         const voltage = baseVoltage.nominalVoltage.value * 1000;
                         const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * ir * Math.sqrt(3));
@@ -3269,7 +2373,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
-                    const psrType = utils_1.createIfNotExitsPSRType(cimModel, 'Längsdrossel');
+                    const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, 'Längsdrossel');
                     seriesCompensator.psrTypeUUID = psrType.mrid;
                     cimModel.addSeriesCompensator(seriesCompensator);
                     this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSDROSSEL);
@@ -3284,9 +2388,9 @@ 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, integral7.lKondensatorAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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 seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SC']), i7Data.kurzname);
                     const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
@@ -3303,10 +2407,10 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
                     }
-                    const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, ur, this.exportFramesBoundary);
-                    const i = utils_2.isNumericI7(i7Data.ir) ? utils_2.convertToNumberI7(i7Data.ir) : undefined;
-                    const ukr = utils_2.isNumericI7(i7Data.ukr) ? utils_2.convertToNumberI7(i7Data.ukr) : undefined;
+                    const ur = (0, utils_2.getU)(i7Data.ur, defaultValuesConfig.DefaultVoltage);
+                    const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, ur, this.exportFramesBoundary);
+                    const i = (0, utils_2.isNumericI7)(i7Data.ir) ? -1 * (0, utils_2.convertToNumberI7)(i7Data.ir) : undefined;
+                    const ukr = (0, utils_2.isNumericI7)(i7Data.ukr) ? (0, utils_2.convertToNumberI7)(i7Data.ukr) : undefined;
                     if (i > 0 && ukr > 0) {
                         const voltage = baseVoltage.nominalVoltage.value * 1000;
                         const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * i * Math.sqrt(3));
@@ -3332,7 +2436,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
-                    const psrType = utils_1.createIfNotExitsPSRType(cimModel, 'Längskondensator');
+                    const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, 'Längskondensator');
                     seriesCompensator.psrType = psrType;
                     cimModel.addSeriesCompensator(seriesCompensator);
                     this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR);
@@ -3346,7 +2450,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, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_KDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KDROSSEL), []));
                 for (const i7Data of result) {
                     this.kdrosseltypen.set(i7Data.name, i7Data);
                 }
@@ -3361,12 +2465,12 @@ 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, standortIDs));
+                    const stpSchiene = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_SCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE), standortIDs));
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
-                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), '_CN']));
-                            const junction = new Junction_1.Junction(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), '_J']));
+                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_CN']));
+                            const junction = new Junction_1.Junction((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_J']));
                             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
                             connectivityNode.setConnectivityNodeContainer(equipmentContainer);
                             if (equipmentContainer) {
@@ -3401,25 +2505,25 @@ 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, stpScheinenID));
+                            const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ), stpScheinenID));
                             for (const i7Data of result) {
                                 const kdType = this.kdrosseltypen.get(i7Data.nametyp);
-                                const 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);
-                                const imin = utils_2.isNumericI7(i7Data.imin) ? i7Data.imin : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.imin) ? kdType === null || kdType === void 0 ? void 0 : kdType.imin : undefined);
+                                const imax = (0, utils_2.isNumericI7)(i7Data.imax) ? i7Data.imax : ((0, utils_2.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.imax) ? kdType === null || kdType === void 0 ? void 0 : kdType.imax : undefined);
+                                const imin = (0, utils_2.isNumericI7)(i7Data.imin) ? i7Data.imin : ((0, utils_2.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.imin) ? kdType === null || kdType === void 0 ? void 0 : kdType.imin : undefined);
                                 const connectivityNode = integral7.sternPunktImpModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                                 const junctionUUID = integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get((i7Data.anschluss));
                                 let conductingEquip;
                                 if (imax && imin) {
-                                    const petersenCoil = new PetersenCoil_1.PetersenCoil(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_PC']), i7Data.kurzname);
+                                    const petersenCoil = new PetersenCoil_1.PetersenCoil((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_PC']), i7Data.kurzname);
                                     integral7.sternPunktImpModel.petersenCoils.set(petersenCoil.mrid, petersenCoil);
                                     integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, petersenCoil);
                                     this.addIdMapping(i7Data.id, petersenCoil.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
                                     conductingEquip = petersenCoil;
                                 }
                                 else {
-                                    const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_GI']), i7Data.kurzname);
-                                    groundingImpedance.r = utils_2.isNumericI7(i7Data.rne) ? i7Data.rne : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? kdType === null || kdType === void 0 ? void 0 : kdType.rne : undefined);
-                                    groundingImpedance.x = utils_2.isNumericI7(i7Data.xne) ? i7Data.xne : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? kdType === null || kdType === void 0 ? void 0 : kdType.xne : undefined);
+                                    const groundingImpedance = new GroundingImpedance_1.GroundingImpedance((0, utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_GI']), i7Data.kurzname);
+                                    groundingImpedance.r = (0, utils_2.isNumericI7)(i7Data.rne) ? i7Data.rne : ((0, utils_2.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? kdType === null || kdType === void 0 ? void 0 : kdType.rne : undefined);
+                                    groundingImpedance.x = (0, utils_2.isNumericI7)(i7Data.xne) ? i7Data.xne : ((0, utils_2.isNumericI7)(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? kdType === null || kdType === void 0 ? void 0 : kdType.xne : undefined);
                                     integral7.sternPunktImpModel.groundingImpedances.set(groundingImpedance.mrid, groundingImpedance);
                                     integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, groundingImpedance);
                                     this.addIdMapping(i7Data.id, groundingImpedance.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
@@ -3453,11 +2557,11 @@ 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, stpSchienenID));
+                            const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER), stpSchienenID));
                             for (const i7Data of result) {
                                 const terminal = integral7.sternPunktImpModel.stpSchieneTerminal.get(i7Data.eknoten);
                                 if (terminal) {
-                                    terminal.connected = utils_2.isBooleanI7(i7Data.schaltzustand) ? utils_2.convertToBooleanI7(i7Data.schaltzustand) : true;
+                                    terminal.connected = (0, utils_2.isBooleanI7)(i7Data.schaltzustand) ? (0, utils_2.convertToBooleanI7)(i7Data.schaltzustand) : true;
                                 }
                                 integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.set(i7Data.id, integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get(i7Data.eknoten));
                                 integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.set(i7Data.aknoten, integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get(i7Data.eknoten));
@@ -3483,19 +2587,19 @@ 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, schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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');
+                    const cimrdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
+                    bay.number = (0, utils_2.isNumericI7)(i7Data.feldnummer) ? (0, utils_2.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     if (voltageLevel) {
                         bay.voltageLevel = voltageLevel;
                         voltageLevel.addBay(bay);
                         const i7Schluessel = voltageLevel.description +
                             '/LK-' +
-                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                         bay.description = i7Schluessel;
                     }
                     else {
@@ -3516,9 +2620,9 @@ 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, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_FREILEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG), []));
                 for (const i7Data of result) {
-                    const typ = new EVWireInfo_1.EVWireInfo(utils_1.generateUUID(), i7Data.name);
+                    const typ = new EVWireInfo_1.EVWireInfo((0, utils_1.generateUUID)(), i7Data.name);
                     this.setWireInfoProperties(typ, i7Data, 'Freileitung');
                     this.cimModelDefault.addEVWireInfo(typ);
                 }
@@ -3527,9 +2631,9 @@ 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, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_KABEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KABEL), []));
                 for (const i7Data of result) {
-                    const typ = new EVWireInfo_1.EVWireInfo(utils_1.generateUUID(), i7Data.name);
+                    const typ = new EVWireInfo_1.EVWireInfo((0, utils_1.generateUUID)(), i7Data.name);
                     this.setWireInfoProperties(typ, i7Data, 'Kabel');
                     this.cimModelDefault.addEVWireInfo(typ);
                 }
@@ -3556,25 +2660,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, integral7.leitungsAnschlussIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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, leitungIDs));
+                const leitungStromkreisabschnitt = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(type, this.getAvailableColumnNames(tableName), 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;
@@ -3584,34 +2688,34 @@ class ConverterI7 {
                     const leitung = new Leitung_1.LeitungImpl(i7Data);
                     integral7.integralLeitungen.set(i7Data.id, leitung);
                     let i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
-                        utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.kurzname) +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    let name = utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
+                    let name = (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz) +
                         '-' +
-                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
                         '-' +
-                        utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const uuidString = utils_1.getUUID(i7Data.guid);
-                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, util_create_1.createNotation([name, uuidString.substring(0, 8), '_L'], 32, true), i7Data.stkabname, i7Schluessel);
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
+                    const uuidString = (0, utils_1.getUUID)(i7Data.guid);
+                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, (0, util_create_1.createNotation)([name, '_', uuidString.substring(0, 8), '_L'], 32, true), i7Data.stkabname, i7Schluessel);
                     line.ukz = i7Data.ukz;
                     let acLineSegments = [];
                     for (const stk of stromkreisabschnitte) {
-                        i7Schluessel += integral_prefix_1.LEITUNGSABSCHNITT_PRAEFIX + utils_2.ueberpruefeZeichenkette(stk.bezeichner);
-                        name = utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
+                        i7Schluessel += integral_prefix_1.LEITUNGSABSCHNITT_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
+                        name = (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz) +
                             '-' +
-                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
+                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
                             '-' +
-                            utils_2.ueberpruefeZeichenkette(stk.bezeichner);
-                        if (utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137).toLowerCase() === '8387376e-86bf-4da0-91f2-b19a3d490715') {
-                            let stop = true;
+                            (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
+                        const cimrdfid = (0, utils_1.getUUID)(stk.custom_guid_0120 + stk.custom_guid_2137);
+                        if (cimrdfid === 'C7E21969-4389-45BA-A693-5D72BEEA8158') {
+                            const 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);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(cimrdfid, (0, util_create_1.createNotation)([name, '_' + stk.pos.toString(), '_' + cimrdfid.substring(0, 8), '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
                         let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(stk.multfaktor));
                         if (mf) {
                             cimModel.addMultiplierFactor(mf);
@@ -3641,28 +2745,19 @@ 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;
                     let tmp_terminal = undefined;
                     for (let i = 0; i < anzahl - 1; i++) {
                         const acLineSegment1 = acLineSegments[i];
-                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
+                        const cn = new ConnectivityNode_1.ConnectivityNode((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
                         cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
                         tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
                             tmp_terminal = undefined;
                         }
-                        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);
@@ -3737,29 +2832,25 @@ class ConverterI7 {
         });
     }
     convertDCLines(cimModel, integral7, defaultValuesConfig) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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 dcLine = new DCLine_1.DCLine((0, utils_1.getUUID)(i7Data.guid_dcline), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCL']));
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
-                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.getUUID(i7Data.guidp), util_create_1.createNotation([utils_2.getName(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                    const bipol = (0, utils_2.convertToBooleanI7)(i7Data.bipol);
+                    const dcLineSegment = new DCLineSegment_1.DCLineSegment((0, utils_1.getUUID)(i7Data.guidp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
                     dcLineSegment.resistance = i7Data.rdc / 2;
                     dcLineSegment.equipmentContainer = dcLine;
-                    const bipol = utils_2.convertToBooleanI7(i7Data.bipol);
-                    const acDCConverterStart = cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt));
-                    const acDCConverterTarget = cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt));
+                    const acDCConverterStart = cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) : undefined;
+                    const acDCConverterTarget = cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt)) : undefined;
                     if (acDCConverterStart === undefined || acDCConverterTarget === undefined) {
                         continue;
                     }
-                    const converterUnitStart = (_a = acDCConverterStart) === null || _a === void 0 ? void 0 : _a.equipmentContainer;
-                    const converterUnitTarget = (_b = acDCConverterTarget) === null || _b === void 0 ? void 0 : _b.equipmentContainer;
+                    const converterUnitStart = acDCConverterStart.equipmentContainer ? acDCConverterStart.equipmentContainer : undefined;
+                    const converterUnitTarget = acDCConverterTarget.equipmentContainer ? acDCConverterTarget.equipmentContainer : undefined;
                     if (converterUnitStart && converterUnitTarget) {
                         switch (bipol) {
                             case (true): {
@@ -3778,7 +2869,7 @@ class ConverterI7 {
                     }
                     const startDCNode = acDCConverterStart ? getDCNodeFromConverter(acDCConverterStart) : undefined;
                     if (startDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCT']));
+                        const dcTerminal = new DCTerminal_1.DCTerminal((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = startDCNode;
@@ -3790,7 +2881,7 @@ class ConverterI7 {
                     }
                     const targetDCNode = acDCConverterTarget ? getDCNodeFromConverter(acDCConverterTarget) : undefined;
                     if (targetDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCT']));
+                        const dcTerminal = new DCTerminal_1.DCTerminal((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = targetDCNode;
@@ -3813,21 +2904,29 @@ 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, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO2W), []));
                 for (const i7Data of result) {
-                    const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(utils_1.generateUUID(), i7Data.name);
-                    typTrafo.ukr12 = i7Data.ukr;
-                    typTrafo.pkr12 = i7Data.pkr;
+                    const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo((0, utils_1.generateUUID)(), i7Data.name);
                     typTrafo.pLeer = i7Data.p_leer;
                     typTrafo.iLeer = i7Data.i_leer;
+                    typTrafo.ukr12 = i7Data.ukr;
+                    typTrafo.pkr12 = i7Data.pkr;
                     typTrafo.schaltgruppe = i7Data.schaltgr;
                     typTrafo.spezialRegelung = i7Data.trafo_spezial;
-                    const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(utils_1.generateUUID());
+                    typTrafo.x00r1 = i7Data.x00r1;
+                    typTrafo.x00r2 = i7Data.x00r2;
+                    typTrafo.x0kr1 = i7Data.x0kr1;
+                    typTrafo.x0kr2 = i7Data.x0kr2;
+                    typTrafo.r0kr1 = i7Data.r0kr1;
+                    typTrafo.r0kr2 = i7Data.r0kr2;
+                    typTrafo.r00r1 = i7Data.r00r1;
+                    typTrafo.r00r2 = i7Data.r00r2;
+                    const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo((0, utils_1.generateUUID)());
                     typWicklung1.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
                     typWicklung1.powerTransformerInfo = typTrafo;
                     typTrafo.addTransformerEndInfo(typWicklung1);
-                    const typWicklung2 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(utils_1.generateUUID());
+                    const typWicklung2 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo((0, utils_1.generateUUID)());
                     typWicklung2.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung2, i7Data, 2);
                     typWicklung2.powerTransformerInfo = typTrafo;
@@ -3841,9 +2940,9 @@ 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, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO3W), []));
                 for (const i7Data of result) {
-                    const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(utils_1.generateUUID(), i7Data.name);
+                    const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo((0, utils_1.generateUUID)(), i7Data.name);
                     typTrafo.pLeer = i7Data.p_leer;
                     typTrafo.iLeer = i7Data.i_leer;
                     typTrafo.ukr12 = i7Data.ukr12;
@@ -3852,17 +2951,25 @@ class ConverterI7 {
                     typTrafo.pkr12 = i7Data.pkr12;
                     typTrafo.pkr13 = i7Data.pkr13;
                     typTrafo.pkr23 = i7Data.pkr23;
-                    const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(utils_1.generateUUID());
+                    typTrafo.x00r1 = i7Data.x00r1;
+                    typTrafo.x00r2 = i7Data.x00r2;
+                    typTrafo.x0kr1 = i7Data.x0kr1;
+                    typTrafo.x0kr2 = i7Data.x0kr2;
+                    typTrafo.r0kr1 = i7Data.r0kr1;
+                    typTrafo.r0kr2 = i7Data.r0kr2;
+                    typTrafo.r00r1 = i7Data.r00r1;
+                    typTrafo.r00r2 = i7Data.r00r2;
+                    const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo((0, utils_1.generateUUID)());
                     typWicklung1.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr1, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
                     typWicklung1.powerTransformerInfo = typTrafo;
                     typTrafo.addTransformerEndInfo(typWicklung1);
-                    const typWicklung2 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(utils_1.generateUUID());
+                    const typWicklung2 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo((0, utils_1.generateUUID)());
                     typWicklung2.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr2, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung2, i7Data, 2);
                     typWicklung2.powerTransformerInfo = typTrafo;
                     typTrafo.addTransformerEndInfo(typWicklung2);
-                    const typWicklung3 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(utils_1.generateUUID());
+                    const typWicklung3 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo((0, utils_1.generateUUID)());
                     typWicklung3.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr3, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung3, i7Data, 3);
                     typWicklung3.powerTransformerInfo = typTrafo;
@@ -3881,7 +2988,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, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_GENERATOR), []));
                 for (const i7Data of result) {
                     this.generatorTypen.set(i7Data.name, i7Data);
                 }
@@ -3894,7 +3001,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, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_ASYNCHRONMOTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR), []));
                 for (const i7Data of result) {
                     this.asynchronmotorTypen.set(i7Data.name, i7Data);
                 }
@@ -3907,14 +3014,14 @@ 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, []));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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;
-                    multFaktor.qInd = utils_2.isNumericI7(i7Data.q_ind) ? utils_2.convertToNumberI7(i7Data.q_ind) : undefined;
-                    multFaktor.qKap = utils_2.isNumericI7(i7Data.q_kap) ? utils_2.convertToNumberI7(i7Data.q_kap) : undefined;
-                    multFaktor.cosPhiInd = utils_2.isNumericI7(i7Data.cos_phi_ind) ? utils_2.convertToNumberI7(i7Data.cos_phi_ind) : undefined;
-                    multFaktor.cosPhiKap = utils_2.isNumericI7(i7Data.cos_phi_kap) ? utils_2.convertToNumberI7(i7Data.cos_phi_kap) : undefined;
+                    const multFaktor = new INTEGRALMultiplierFactor_1.INTEGRALMultiplierFactor((0, utils_1.getUUID)(undefined), (0, utils_2.getName)(i7Data), i7Data.kurzname, i7Data.kommentar);
+                    multFaktor.p = (0, utils_2.isNumericI7)(i7Data.p) ? (0, utils_2.convertToNumberI7)(i7Data.p) : undefined;
+                    multFaktor.qInd = (0, utils_2.isNumericI7)(i7Data.q_ind) ? (0, utils_2.convertToNumberI7)(i7Data.q_ind) : undefined;
+                    multFaktor.qKap = (0, utils_2.isNumericI7)(i7Data.q_kap) ? (0, utils_2.convertToNumberI7)(i7Data.q_kap) : undefined;
+                    multFaktor.cosPhiInd = (0, utils_2.isNumericI7)(i7Data.cos_phi_ind) ? (0, utils_2.convertToNumberI7)(i7Data.cos_phi_ind) : undefined;
+                    multFaktor.cosPhiKap = (0, utils_2.isNumericI7)(i7Data.cos_phi_kap) ? (0, utils_2.convertToNumberI7)(i7Data.cos_phi_kap) : undefined;
                     this.cimModelDefault.addMultiplierFactor(multFaktor);
                     this.addIdMapping(i7Data.id, multFaktor.mrid, integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR);
                 }
@@ -3929,21 +3036,21 @@ 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, standortIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.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, trafoIDs));
+                    const sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), trafoIDs));
                     for (const spKnoten of sternpunktKnotenResult) {
                         (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
                     }
                 }
                 for (const i7Data of result) {
-                    const cimrdfid = utils_1.getUUID(i7Data.guid);
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
+                    const cimrdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -3951,29 +3058,34 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
+                    if (i7Data.nametyp) {
+                        const stop = true;
+                    }
                     const powerTransformerInfo = this.cimModelDefault.getPowerTransformerInfoByName(i7Data.nametyp);
-                    if (this.blocktransformatoren.includes(utils_2.convertToNumberI7(i7Data.id))) {
+                    if (this.blocktransformatoren.includes((0, utils_2.convertToNumberI7)(i7Data.id))) {
                         powerTransformer.isPartOfGeneratorUnit = true;
                     }
                     else {
                         powerTransformer.isPartOfGeneratorUnit = false;
                     }
                     const schaltgruppe = ((_b = i7Data.schaltgr) === null || _b === void 0 ? void 0 : _b.length) ? i7Data.schaltgr : powerTransformerInfo === null || powerTransformerInfo === void 0 ? void 0 : powerTransformerInfo.schaltgruppe;
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, utils_1.getUUID)(i7Data.guid_w1), `W1${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
-                    const pkr = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '');
-                    const ukr = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '') / 100;
-                    const sr = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
-                    const ur = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
+                    const pkr = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '');
+                    const ukr = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '');
+                    const sr = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
+                    const ur = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
                     const ir1 = sr * 1000000 / (ur * 1000 * Math.sqrt(3));
-                    const pLeer = utils_2.isNumericI7(i7Data.p_leer) ? utils_2.getTrafoPleer(i7Data, powerTransformerInfo) : 0;
-                    const iLeer = utils_2.isNumericI7(i7Data.i_leer) ? utils_2.getTrafoIleer(i7Data, powerTransformerInfo) : 0;
-                    powerTransformerEnd1.r = utils_2.calculateR(ur, pkr, sr);
-                    powerTransformerEnd1.x = utils_2.calculateX(ur, ukr, sr, powerTransformerEnd1.r);
-                    powerTransformerEnd1.g = utils_2.calculateG(ur, pLeer);
-                    powerTransformerEnd1.b = utils_2.calculateB(ur, sr, iLeer, pLeer);
+                    const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
+                    const iLeer = (0, utils_2.getTrafoIleer)(i7Data, powerTransformerInfo);
+                    powerTransformerEnd1.r = (0, utils_2.calculateR)(ur, pkr, sr);
+                    powerTransformerEnd1.x = (0, utils_2.calculateX)(ur, ukr, sr, powerTransformerEnd1.r);
+                    powerTransformerEnd1.g = (0, utils_2.calculateG)(ur, pLeer);
+                    powerTransformerEnd1.b = (0, utils_2.calculateB)(ur, sr, iLeer, pLeer);
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
+                    powerTransformerEnd1.x0 = (0, utils_2.isNumericI7)(i7Data.x00r1) ? i7Data.x00r1 : 0;
+                    powerTransformerEnd1.r0 = (0, utils_2.isNumericI7)(i7Data.r00r1) ? i7Data.r00r1 : 0;
                     const startTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!startTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
@@ -3986,10 +3098,10 @@ class ConverterI7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, utils_1.getUUID)(i7Data.guid_w2), `W2${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
-                    const sr2 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
-                    const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
+                    const sr2 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
+                    const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
                     powerTransformerEnd2.r = 0;
                     powerTransformerEnd2.x = 0;
                     powerTransformerEnd2.ratedS = sr2;
@@ -4006,10 +3118,10 @@ class ConverterI7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
-                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
-                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
-                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
-                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
+                    powerTransformerEnd1.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
+                    powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
+                    powerTransformerEnd2.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
+                    powerTransformerEnd2.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd2.endNumber);
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     const powerTransformerEnds = [powerTransformer.powerTransformerEnds[0], powerTransformer.powerTransformerEnds[1]];
                     const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
@@ -4035,16 +3147,17 @@ class ConverterI7 {
         });
     }
     convertTrafo3W(frame, integral7, defaultValuesConfig, standortIDs) {
-        var _a;
         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, standortIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), standortIDs));
                 const trafoIDs = result.map(obj => obj['id']);
+                const tableNameStpKnoten = integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN;
                 const trafoWicklungen = new Map();
                 const trafoWicklungIDs = [];
-                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));
+                const tableNameWicklung = integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG;
+                if (this.isTableAvailable(tableNameWicklung) && trafoIDs.length) {
+                    const wicklungenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRAFO3_WICKLUNG, this.getAvailableColumnNames(tableNameWicklung), trafoIDs));
                     for (const wicklung of wicklungenResult) {
                         trafoWicklungen.set(wicklung.id, wicklung);
                         trafoWicklungIDs.push(wicklung.id);
@@ -4053,19 +3166,14 @@ class ConverterI7 {
                 else {
                     this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG} ist nicht vorhanden.`);
                 }
-                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, trafoIDs));
-                    for (const spKnoten of sternpunktKnotenResult) {
-                        (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
-                    }
+                let sternpunktKnotenResult;
+                if (this.isTableAvailable(tableNameStpKnoten) && trafoWicklungIDs.length > 0) {
+                    sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(tableNameStpKnoten), trafoWicklungIDs));
                 }
                 for (const i7Data of result) {
-                    const cimrdfid = utils_1.getUUID(i7Data.guid);
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
+                    const sternpunktKnotenMap = new Map();
+                    const cimrdfid = (0, utils_1.getUUID)(i7Data.guid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -4075,35 +3183,60 @@ class ConverterI7 {
                     }
                     const powerTransformerInfo = this.cimModelDefault.getPowerTransformerInfoByName(i7Data.nametyp);
                     const schaltgruppe = i7Data.schaltgr;
-                    if (this.blocktransformatoren.includes(utils_2.convertToNumberI7(i7Data.id))) {
+                    if (this.blocktransformatoren.includes((0, utils_2.convertToNumberI7)(i7Data.id))) {
                         powerTransformer.isPartOfGeneratorUnit = true;
                     }
                     else {
                         powerTransformer.isPartOfGeneratorUnit = false;
                     }
-                    const pkr12 = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '12');
-                    const pkr13 = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '13');
-                    const pkr23 = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '23');
-                    const ukr12 = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '12');
-                    const ukr13 = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '13');
-                    const ukr23 = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '23');
-                    const sr1 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, 1, true);
-                    const sr2 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, 2, true);
-                    const sr3 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, 3, true);
-                    const ur1 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 1);
-                    const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 2);
-                    const ur3 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 3);
+                    if (i7Data.nametyp) {
+                        const stop = true;
+                    }
+                    const x00r1 = (0, utils_2.isNumericI7)(i7Data.x00r1) ? i7Data.x00r1 : 0;
+                    const x0kr1 = (0, utils_2.isNumericI7)(i7Data.x0kr1) ? i7Data.x0kr1 : 0;
+                    const x00r2 = (0, utils_2.isNumericI7)(i7Data.x00r2) ? i7Data.x00r2 : 0;
+                    const r00r1 = (0, utils_2.isNumericI7)(i7Data.r00r1) ? i7Data.r00r1 : 0;
+                    const r0kr1 = (0, utils_2.isNumericI7)(i7Data.r0kr1) ? i7Data.r0kr1 : 0;
+                    const r00r2 = (0, utils_2.isNumericI7)(i7Data.r00r2) ? i7Data.r00r2 : 0;
+                    const pkr12 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '12');
+                    const pkr13 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '13');
+                    const pkr23 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '23');
+                    const ukr12 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '12');
+                    const ukr13 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '13');
+                    const ukr23 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '23');
+                    const sr1 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 1, true);
+                    const sr2 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 2, true);
+                    const sr3 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 3, true);
+                    const ur1 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 1);
+                    const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 2);
+                    const ur3 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 3);
                     const ir1 = sr1 * Math.pow(10, 6) / ((ur1 * Math.pow(10, 3)) * Math.sqrt(3));
                     const ir2 = sr2 * Math.pow(10, 6) / ((ur2 * Math.pow(10, 3)) * Math.sqrt(3));
                     const ir3 = sr3 * Math.pow(10, 6) / ((ur3 * Math.pow(10, 3)) * Math.sqrt(3));
-                    const pLeer = utils_2.getTrafoPleer(i7Data, powerTransformerInfo);
-                    const iLeer = utils_2.getTrafoIleer(i7Data, powerTransformerInfo);
-                    const impedanzW1 = utils_trafo3w_1.calculateImpedanzenTrafo3W(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
-                    const impedanzW2 = utils_trafo3w_1.calculateImpedanzenTrafo3W(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
-                    const impedanzW3 = utils_trafo3w_1.calculateImpedanzenTrafo3W(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
+                    const iLeer = (0, utils_2.getTrafoIleer)(i7Data, powerTransformerInfo);
+                    const impedanzW1 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
+                    const impedanzW2 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
+                    const impedanzW3 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
+                    const zeroSequImpedanzWx = (0, utils_trafo3w_1.calculateZeroSequImpedanzenTrafo3W)(r00r1, r0kr1, r00r2, x00r1, x0kr1, x00r2, ur1, ur2, sr1);
+                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, utils_1.getUUID)(i7Data.guid_w1), `W1 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     const wicklung1 = trafoWicklungen.get(i7Data.trafowicklung3w1);
+                    if (wicklung1) {
+                        if (sternpunktKnotenMap.get(i7Data.id) === undefined) {
+                            sternpunktKnotenMap.set(i7Data.id, new Map());
+                        }
+                        let spKnoten = undefined;
+                        for (const elem of sternpunktKnotenResult) {
+                            if (elem.netzobjekt !== undefined && elem.netzobjekt === wicklung1.id && sternpunktKnotenMap.get(i7Data.id).get(wicklung1.id) === undefined) {
+                                spKnoten = elem;
+                                break;
+                            }
+                        }
+                        if (sternpunktKnotenMap.get(i7Data.id).get(wicklung1.id) === undefined) {
+                            sternpunktKnotenMap.get(i7Data.id).set(wicklung1.id, spKnoten);
+                        }
+                    }
                     const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal1)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
@@ -4111,9 +3244,10 @@ class ConverterI7 {
                     powerTransformerEnd1.x = impedanzW1.x;
                     powerTransformerEnd1.g = impedanzW1.g;
                     powerTransformerEnd1.b = impedanzW1.b;
+                    powerTransformerEnd1.x0 = zeroSequImpedanzWx.x01;
                     powerTransformerEnd1.ratedU = ur1;
                     powerTransformerEnd1.ratedS = sr1;
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, terminal1, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, terminal1, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig, trafoWicklungen);
                     let equivalentInjection = undefined;
                     if (terminal1) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(wicklung1.aknoten));
@@ -4122,22 +3256,38 @@ class ConverterI7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
-                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
-                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
+                    powerTransformerEnd1.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
+                    powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
                     const wicklung2 = trafoWicklungen.get(i7Data.trafowicklung3w2);
+                    if (wicklung2) {
+                        if (sternpunktKnotenMap.get(i7Data.id) === undefined) {
+                            sternpunktKnotenMap.set(i7Data.id, new Map());
+                        }
+                        let spKnoten = undefined;
+                        for (const elem of sternpunktKnotenResult) {
+                            if (elem.netzobjekt !== undefined && elem.netzobjekt === wicklung2.id && sternpunktKnotenMap.get(i7Data.id).get(wicklung2.id) === undefined) {
+                                spKnoten = elem;
+                                break;
+                            }
+                        }
+                        if (sternpunktKnotenMap.get(i7Data.id).get(wicklung2.id) === undefined) {
+                            sternpunktKnotenMap.get(i7Data.id).set(wicklung2.id, spKnoten);
+                        }
+                    }
                     const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal2)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, utils_1.getUUID)(i7Data.guid_w2), `W2 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     powerTransformerEnd2.r = impedanzW2.r;
                     powerTransformerEnd2.x = impedanzW2.x;
                     powerTransformerEnd2.g = impedanzW2.g;
                     powerTransformerEnd2.b = impedanzW2.b;
+                    powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     powerTransformerEnd2.powerTransformer = powerTransformer;
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, terminal2, sternpunktKnotenMap, integral7, ir2, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, terminal2, sternpunktKnotenMap, integral7, ir2, i7Data, defaultValuesConfig, trafoWicklungen);
                     equivalentInjection = undefined;
                     if (terminal2) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(wicklung2.aknoten));
@@ -4146,22 +3296,38 @@ class ConverterI7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
-                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
-                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
+                    powerTransformerEnd2.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
+                    powerTransformerEnd2.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd2.endNumber);
                     const wicklung3 = trafoWicklungen.get(i7Data.trafowicklung3w3);
+                    if (wicklung3) {
+                        if (sternpunktKnotenMap.get(i7Data.id) === undefined) {
+                            sternpunktKnotenMap.set(i7Data.id, new Map());
+                        }
+                        let spKnoten = undefined;
+                        for (const elem of sternpunktKnotenResult) {
+                            if (elem.netzobjekt !== undefined && elem.netzobjekt === wicklung3.id && sternpunktKnotenMap.get(i7Data.id).get(wicklung3.id) === undefined) {
+                                spKnoten = elem;
+                                break;
+                            }
+                        }
+                        if (sternpunktKnotenMap.get(i7Data.id).get(wicklung3.id) === undefined) {
+                            sternpunktKnotenMap.get(i7Data.id).set(wicklung3.id, spKnoten);
+                        }
+                    }
                     const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal3)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd((0, utils_1.getUUID)(i7Data.guid_w3), `Wicklung 3 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd3.endNumber = 3;
                     powerTransformerEnd3.r = impedanzW3.r;
                     powerTransformerEnd3.x = impedanzW3.x;
                     powerTransformerEnd3.g = impedanzW3.g;
                     powerTransformerEnd3.b = impedanzW3.b;
+                    powerTransformerEnd3.x0 = zeroSequImpedanzWx.x03;
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
                     powerTransformerEnd3.powerTransformer = powerTransformer;
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd3, powerTransformer, terminal3, sternpunktKnotenMap, integral7, ir3, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd3, powerTransformer, terminal3, sternpunktKnotenMap, integral7, ir3, i7Data, defaultValuesConfig, trafoWicklungen);
                     equivalentInjection = undefined;
                     if (terminal3) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(wicklung3.aknoten));
@@ -4170,8 +3336,8 @@ class ConverterI7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
-                    powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
-                    powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd3.endNumber);
+                    powerTransformerEnd3.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
+                    powerTransformerEnd3.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd3.endNumber);
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2, powerTransformerEnd3];
                     const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
@@ -4211,12 +3377,12 @@ class ConverterI7 {
         const ur = `ur${endNumber}`;
         powerTransformerEndInfo.endNumber = endNumber;
         powerTransformerEndInfo.ratedU = new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
-        powerTransformerEndInfo.gestufteSeite = utils_2.convertToNumberI7(data[gestufteSeite]);
-        const tapChangerInfo = new EVTapChangerInfo_1.EVTapChangerInfo(utils_1.generateUUID(), `TapChangerInfo_${data['id']}`);
-        tapChangerInfo.highStep = utils_2.convertToNumberI7(data[maxstufe]);
-        tapChangerInfo.lowStep = utils_2.convertToNumberI7(data[minstufe]);
-        tapChangerInfo.neutralStep = utils_2.convertToNumberI7(data[neutralstufe]);
-        tapChangerInfo.stepPhaseIncrement = utils_2.isNumericI7(data[winkel]) ? new AngleDegrees_1.AngleDegrees(data[winkel], UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.deg) : undefined;
+        powerTransformerEndInfo.gestufteSeite = (0, utils_2.convertToNumberI7)(data[gestufteSeite]);
+        const tapChangerInfo = new EVTapChangerInfo_1.EVTapChangerInfo((0, utils_1.generateUUID)(), `TapChangerInfo_${data['id']}`);
+        tapChangerInfo.highStep = (0, utils_2.convertToNumberI7)(data[maxstufe]);
+        tapChangerInfo.lowStep = (0, utils_2.convertToNumberI7)(data[minstufe]);
+        tapChangerInfo.neutralStep = (0, utils_2.convertToNumberI7)(data[neutralstufe]);
+        tapChangerInfo.stepPhaseIncrement = (0, utils_2.isNumericI7)(data[winkel]) ? new AngleDegrees_1.AngleDegrees(data[winkel], UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.deg) : undefined;
         tapChangerInfo.uMax = data[umax];
         tapChangerInfo.uMin = data[umin];
         tapChangerInfo.setPowerTransfomerEndInfo(powerTransformerEndInfo);
@@ -4278,17 +3444,17 @@ class ConverterI7 {
                     const connectivityNode = connectivityNodes[i];
                     connectivityNode.connectivityNodeContainer = line;
                     line.addConnectivityNode(connectivityNode);
-                    const junction = new Junction_1.Junction(utils_1.generateUUID(), `${line.name}_BD-J`, `Junction`, 'Junction for Geo');
+                    const junction = new Junction_1.Junction((0, utils_1.generateUUID)(), `${line.name}_BD-J`, `Junction`, 'Junction for Geo');
                     junction.equipmentContainer = line;
-                    let terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([line.getUUID().substring(0, 8), '_BD-JCT-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
+                    let terminal = new Terminal_1.Terminal((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([line.getUUID().substring(0, 8), '_BD-JCT-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
                     junction.terminals.set(terminal.getUUID(), terminal);
                     terminal.conductingEquipment = junction;
                     line.addEquipment(junction);
                     if (location && location.positionPoints.length) {
-                        const clonedLocation = new Location_1.Location(utils_1.generateUUID(), `Location_${i + 1}`);
+                        const clonedLocation = new Location_1.Location((0, utils_1.generateUUID)(), `Location_${i + 1}`);
                         clonedLocation.addPowerSystemResource(junction);
                         clonedLocation.coordinateSystem = location.coordinateSystem;
-                        const clonedPositionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID(), `PositionPoint ${i + 1}`);
+                        const clonedPositionPoint = new PositionPoint_1.PositionPoint((0, utils_1.generateUUID)(), `PositionPoint ${i + 1}`);
                         clonedPositionPoint.xPosition = location.positionPoints[0].xPosition;
                         clonedPositionPoint.yPosition = location.positionPoints[0].yPosition;
                         clonedPositionPoint.location = clonedLocation;
@@ -4317,9 +3483,6 @@ 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++) {
@@ -4342,20 +3505,21 @@ class ConverterI7 {
         }
     }
     setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, defaultValuesConfig) {
-        if (acLineSegment.getUUID() === 'e2505f0f-c764-44da-b88b-d40e048193c9') {
-            let stop = true;
-        }
-        if ((utils_2.isNumericI7(data.laenge) && data.laenge <= 0) || (utils_2.isBooleanI7(data.flag_impedanzlos) && utils_2.convertToBooleanI7(data.flag_impedanzlos))) {
+        if ((0, utils_2.isBooleanI7)(data.flag_impedanzlos) && (0, utils_2.convertToBooleanI7)(data.flag_impedanzlos)) {
             data.flag_impedanzlos = 1;
         }
-        if (utils_2.isNumericI7(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
+        else if (!(0, utils_2.isNumericI7)(data.laenge) && (0, utils_2.isBooleanI7)(data.flag_impedanzlos) && !(0, utils_2.convertToBooleanI7)(data.flag_impedanzlos)) {
+            data.flag_impedanzlos = 0;
+            data.laenge = 1;
+        }
+        if ((0, utils_2.isNumericI7)(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
             acLineSegment.length = data.laenge;
         }
         else {
             acLineSegment.length = 1;
         }
         const assetType = defaultModel.getWireInfoByName(data.nametyp);
-        if (utils_2.isNumericI7(data.r0) && data.r0 > 0 && !data.flag_impedanzlos) {
+        if ((0, utils_2.isNumericI7)(data.r0) && data.r0 > 0 && !data.flag_impedanzlos) {
             acLineSegment.r0 = data.r0;
         }
         else if (assetType && !data.flag_impedanzlos) {
@@ -4364,7 +3528,7 @@ class ConverterI7 {
         else {
             acLineSegment.r0 = 0;
         }
-        if (utils_2.isNumericI7(data.x0) && data.x0 > 0 && !data.flag_impedanzlos) {
+        if ((0, utils_2.isNumericI7)(data.x0) && data.x0 > 0 && !data.flag_impedanzlos) {
             acLineSegment.x0 = data.x0;
         }
         else if (assetType && !data.flag_impedanzlos) {
@@ -4373,25 +3537,25 @@ class ConverterI7 {
         else {
             acLineSegment.x0 = 0;
         }
-        if (utils_2.isNumericI7(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
-            acLineSegment.b0ch = utils_2.calculateBC(data.c0, 50);
+        if ((0, utils_2.isNumericI7)(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.b0ch = (0, utils_2.calculateBC)(data.c0, 50);
         }
         else if (assetType && !data.flag_impedanzlos) {
-            acLineSegment.b0ch = utils_2.calculateBC(assetType.c0, 50) * data.laenge;
+            acLineSegment.b0ch = (0, utils_2.calculateBC)(assetType.c0, 50) * data.laenge;
         }
         else {
             acLineSegment.b0ch = 0;
         }
-        if (utils_2.isNumericI7(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
-            acLineSegment.g0ch = utils_2.calculateG0ch(data.r0);
+        if ((0, utils_2.isNumericI7)(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.g0ch = (0, utils_2.calculateG0ch)(data.r0);
         }
         else if (assetType && !data.flag_impedanzlos) {
-            acLineSegment.g0ch = utils_2.calculateG0ch(assetType.r0) * data.laenge;
+            acLineSegment.g0ch = (0, utils_2.calculateG0ch)(assetType.r0) * data.laenge;
         }
         else {
             acLineSegment.g0ch = 0;
         }
-        if (utils_2.isNumericI7(data.r1) && data.r1 > 0 && !data.flag_impedanzlos) {
+        if ((0, utils_2.isNumericI7)(data.r1) && data.r1 > 0 && !data.flag_impedanzlos) {
             acLineSegment.r = data.r1;
         }
         else if (assetType && !data.flag_impedanzlos) {
@@ -4400,7 +3564,7 @@ class ConverterI7 {
         else {
             acLineSegment.r = 0;
         }
-        if (utils_2.isNumericI7(data.x1) && data.x1 > 0 && !data.flag_impedanzlos) {
+        if ((0, utils_2.isNumericI7)(data.x1) && data.x1 > 0 && !data.flag_impedanzlos) {
             acLineSegment.x = data.x1;
         }
         else if (assetType && !data.flag_impedanzlos) {
@@ -4409,31 +3573,31 @@ class ConverterI7 {
         else {
             acLineSegment.x = 0;
         }
-        if (utils_2.isNumericI7(data.c1) && data.c1 > 0 && !data.flag_impedanzlos) {
-            acLineSegment.bch = utils_2.calculateBC(data.c1, 50);
+        if ((0, utils_2.isNumericI7)(data.c1) && data.c1 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.bch = (0, utils_2.calculateBC)(data.c1, 50);
         }
         else if (assetType && !data.flag_impedanzlos) {
-            acLineSegment.bch = utils_2.calculateBC(assetType.c1, 50) * data.laenge;
+            acLineSegment.bch = (0, utils_2.calculateBC)(assetType.c1, 50) * data.laenge;
         }
         else {
             acLineSegment.bch = 0;
         }
         for (const terminal of acLineSegment.terminals.values()) {
-            if (utils_2.isNumericI7(data.ir) && data.ir > 0) {
+            if ((0, utils_2.isNumericI7)(data.ir) && data.ir > 0) {
                 this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, data.ir);
             }
             else if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
                 this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
             }
-            const psrType = utils_1.createIfNotExitsPSRType(cimModel, data.typ);
+            const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, data.typ);
             acLineSegment.psrTypeUUID = psrType.mrid;
         }
     }
     setConductingEquipmentCurrentLimit(cimModel, name, terminal, ir) {
-        const currentLimit = new CurrentLimit_1.CurrentLimit(utils_1.generateUUID(), `${name}`);
+        const currentLimit = new CurrentLimit_1.CurrentLimit((0, utils_1.generateUUID)(), `${name}`);
         cimModel.addCurrentLimit(currentLimit);
         currentLimit.value = new CurrentFlow_1.CurrentFlow(ir, UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
-        const operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(utils_1.generateUUID(), `${name}`);
+        const operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet((0, utils_1.generateUUID)(), `${name}`);
         cimModel.addOperationalLimitSet(operationalLimitSet);
         operationalLimitSet.addOperationalLimit(currentLimit);
         currentLimit.operationalLimitSet = operationalLimitSet;
@@ -4443,10 +3607,10 @@ class ConverterI7 {
         operationalLimitSet.terminal = terminal;
     }
     setVoltageLimit(cimModel, name, terminal, voltage, type, direction) {
-        const voltageLimit = new VoltageLimit_1.VoltageLimit(utils_1.generateUUID(), `${name}`);
+        const voltageLimit = new VoltageLimit_1.VoltageLimit((0, utils_1.generateUUID)(), `${name}`);
         cimModel.addVoltageLimit(voltageLimit);
         voltageLimit.value = voltage;
-        const operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(utils_1.generateUUID(), `${name}`);
+        const operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet((0, utils_1.generateUUID)(), `${name}`);
         cimModel.addOperationalLimitSet(operationalLimitSet);
         operationalLimitSet.addOperationalLimit(voltageLimit);
         voltageLimit.operationalLimitSet = operationalLimitSet;
@@ -4464,7 +3628,7 @@ class ConverterI7 {
     createIfNotExistOperationalLimitType(cimModel, name, type, direction) {
         let operationalLimitType = cimModel.getOperationalLimitTypeByName(name);
         if (!operationalLimitType) {
-            operationalLimitType = new OperationalLimitType_1.OperationalLimitType(utils_1.generateUUID(), name);
+            operationalLimitType = new OperationalLimitType_1.OperationalLimitType((0, utils_1.generateUUID)(), name);
             operationalLimitType.direction = direction;
             operationalLimitType.limitType = type;
             cimModel.addOperationalLimitType(operationalLimitType);
@@ -4472,14 +3636,11 @@ class ConverterI7 {
         return operationalLimitType;
     }
     createConnection(cimModel, conductingEquipment, object, phase, connected) {
-        if (conductingEquipment.getUUID() === '66d3c196-8927-478a-a6bf-248ea34cdeb3') {
-            let stop = true;
-        }
         let isNameSet = false;
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
             const cn = object;
-            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_T']));
+            terminal = new Terminal_1.Terminal((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_T']));
             isNameSet = true;
             terminal.setConnectivityNode(cn);
             cn.addTerminal(terminal);
@@ -4494,7 +3655,7 @@ class ConverterI7 {
             conductingEquipment.addTerminal(terminal);
             terminal.connected = connected;
             if (!isNameSet) {
-                terminal.name = util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
+                terminal.name = (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
             }
         }
         return terminal;
@@ -4515,7 +3676,7 @@ class ConverterI7 {
                 const object = cimModelBD.getObject(anschlussUUID);
                 if (object instanceof ConnectivityNode_1.ConnectivityNode) {
                     cn = object;
-                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
+                    terminal = new Terminal_1.Terminal((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
                     terminal.connectivityNodeUUID = cn.mrid;
                     terminal.phases = phase;
                     terminal.connected = true;
@@ -4532,7 +3693,7 @@ class ConverterI7 {
                         terminal.setConnectivityNodeUUID(cn.getUUID());
                         terminal.setConnectivityNode(undefined);
                     }
-                    terminal.name = util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
+                    terminal.name = (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
                     cimModelBD.terminals.delete(terminal.mrid);
                     cimModel.addTerminal(terminal);
                 }
@@ -4572,12 +3733,12 @@ class ConverterI7 {
                 }
             });
             if (!equivinj_exists) {
-                let tmp_terminal = new Terminal_1.Terminal(utils_1.generateUUID());
+                let tmp_terminal = new Terminal_1.Terminal((0, utils_1.generateUUID)());
                 tmp_terminal.setConnectivityNodeUUID(cn.mrid);
                 tmp_terminal.phases = PhaseCode_1.PhaseCode.ABC;
                 tmp_terminal.connected = true;
                 tmp_terminal.sequenceNumber = 1;
-                equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.generateUUID(), util_create_1.createNotation([frame.tsoName, '_BD-EI', '_' + cn.mrid.substring(0, 8)], 32, true));
+                equivalentInjection = new EquivalentInjection_1.EquivalentInjection((0, utils_1.generateUUID)(), (0, util_create_1.createNotation)([frame.tsoName, '_BD-EI', '_' + cn.mrid.substring(0, 8)], 32, true));
                 equivalentInjection.p = 0;
                 equivalentInjection.q = 0;
                 equivalentInjection.regulationStatus = false;
@@ -4585,7 +3746,7 @@ class ConverterI7 {
                 equivalentInjection.baseVoltage = cn.getBaseVoltage();
                 equivalentInjection.normallyInService = false;
                 tmp_terminal.setConductingEquipment(equivalentInjection);
-                tmp_terminal.name = util_create_1.createNotation([frame.tsoName, '_BD-EI-T'], 32, true);
+                tmp_terminal.name = (0, util_create_1.createNotation)([frame.tsoName, '_BD-EI-T'], 32, true);
                 cn.addTerminal(tmp_terminal);
                 frame.cimModel.addEquivalentInjection(equivalentInjection);
                 if (tmp_terminal.getConductingEquipmentUUID() !== undefined) {
@@ -4717,7 +3878,26 @@ class ConverterI7 {
             try {
                 const results = yield this.mysqlController.execQuery(`SHOW TABLES FROM  ${database}`);
                 for (const table of results) {
-                    this.availableTableNames.push(table[`Tables_in_${database}`]);
+                    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']);
                 }
             }
             catch (e) {
@@ -4733,6 +3913,7 @@ class ConverterI7 {
                 this.logger = logger;
                 this.initMySQLConnection(mySqlConfig);
                 yield this.getAvailableTableNames(mySqlConfig.database);
+                yield this.getAvailableTableColumnNames(mySqlConfig.database);
             }
             catch (e) {
                 status.status = 'error';
@@ -4794,7 +3975,7 @@ class ConverterI7 {
                             this.logger.error(`Kein ${exportEntry.objectType} mit dem Namen ${exportObject.name} gefunden.`);
                             continue;
                         }
-                        const geoRegionNew = util_create_1.createGeoregion(utils_1.generateUUID(), exportObject.name, exportObject.name, 'Default GeographicalRegion');
+                        const geoRegionNew = (0, util_create_1.createGeoregion)((0, utils_1.generateUUID)(), exportObject.name, exportObject.name, 'Default GeographicalRegion');
                         subGeoRegion.region.removeSubGeographicalRegion(subGeoRegion);
                         geoRegionNew.addSubGeographicalRegion(subGeoRegion);
                         subGeoRegion.region = geoRegionNew;
@@ -4834,7 +4015,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, partSchaltfeldIDs)));
+                result.push(...yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(objectName, this.getAvailableColumnNames(objectName), partSchaltfeldIDs)));
             }
             return result;
         });
@@ -4899,25 +4080,25 @@ class ConverterI7 {
         this.addDefaultObjectsGeo(cimModel, defaultValuesConfig);
     }
     addDefaultObjectsRegion(cimModel, defaultValuesConfig) {
-        const region = utils_1.createIfNotExitsGeoregionByName(cimModel, defaultValuesConfig.GeographicalRegion.name);
+        const region = (0, utils_1.createIfNotExitsGeoregionByName)(cimModel, defaultValuesConfig.GeographicalRegion.name);
         region.description = defaultValuesConfig.GeographicalRegion.description;
-        const subregion = utils_1.createIfNotExitsSubGeoregionByName(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
+        const subregion = (0, utils_1.createIfNotExitsSubGeoregionByName)(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
         subregion.shortName = defaultValuesConfig.SubGeographicalRegion.shortName;
         subregion.description = defaultValuesConfig.SubGeographicalRegion.description;
     }
     addDefaultObjectsLoadModel(cimModel, defaultValuesConfig) {
-        const loadArea = new LoadArea_1.LoadArea(utils_1.generateUUID(), defaultValuesConfig.LoadArea.name);
+        const loadArea = new LoadArea_1.LoadArea((0, utils_1.generateUUID)(), defaultValuesConfig.LoadArea.name);
         cimModel.addLoadArea(loadArea);
-        const subLoadArea = new SubLoadArea_1.SubLoadArea(utils_1.generateUUID(), defaultValuesConfig.SubLoadArea.name);
+        const subLoadArea = new SubLoadArea_1.SubLoadArea((0, utils_1.generateUUID)(), defaultValuesConfig.SubLoadArea.name);
         subLoadArea.loadArea = loadArea;
         cimModel.addSubLoadArea(subLoadArea);
-        const conformLoadGroup = new ConformLoadGroup_1.ConformLoadGroup(utils_1.generateUUID(), defaultValuesConfig.ConformLoadGroup.name);
+        const conformLoadGroup = new ConformLoadGroup_1.ConformLoadGroup((0, utils_1.generateUUID)(), defaultValuesConfig.ConformLoadGroup.name);
         conformLoadGroup.subLoadArea = subLoadArea;
         cimModel.addConformLoadGroup(conformLoadGroup);
     }
     addDefaultObjectsGeo(cimModel, defaultValuesConfig) {
         const crsUrn = 'urn:ogc:def:crs:EPSG::4326';
-        const coordinateSystem = new CoordinateSystem_1.CoordinateSystem(utils_1.generateUUID(), this.coordinateSystem);
+        const coordinateSystem = new CoordinateSystem_1.CoordinateSystem((0, utils_1.generateUUID)(), this.coordinateSystem);
         coordinateSystem.crsUrn = crsUrn;
         cimModel.addCoordinateSystem(coordinateSystem);
     }
@@ -4925,24 +4106,35 @@ class ConverterI7 {
         const cimModel = frame.cimModel;
         if (terminal) {
             powerTransformerEnd.terminal = terminal;
-            this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + (powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name), terminal, ir);
-            if (sternpunktKnotenMap.has(i7Data.id) && i7Data) {
-                if (sternpunktKnotenMap.get(i7Data.id).has(i7Data.aknknoten1p)) {
-                    this.convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, integral7, sternpunktKnotenMap.get(i7Data.id).get(i7Data.aknknoten1p), defaultValuesConfig);
+            this.setConductingEquipmentCurrentLimit(cimModel, `W${powerTransformerEnd.endNumber}` + (powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name), terminal, ir);
+            let obj = i7Data;
+            let isTrafo2w = i7Data.trafowicklung3w3 === undefined ? true : false;
+            if (sternpunktKnotenMap.has(i7Data.id) && isTrafo2w) {
+                let transformer = i7Data;
+                let winding = '';
+                if (powerTransformerEnd.endNumber === 1) {
+                    winding = 'aknknoten1p';
+                }
+                else {
+                    winding = 'eknknoten1p';
+                }
+                if (sternpunktKnotenMap.get(i7Data.id).has(eval(`transformer.${winding}`))) {
+                    this.convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, integral7, sternpunktKnotenMap.get(i7Data.id).get(eval(`transformer.${winding}`)), defaultValuesConfig);
                 }
             }
-            else if (sternpunktKnotenMap.has(i7Data.id) && i7Data) {
+            else if (sternpunktKnotenMap.has(i7Data.id) && !isTrafo2w) {
+                let transformer = i7Data;
                 let winding = undefined;
                 if (powerTransformerEnd.endNumber === 1) {
-                    winding = windings.get(i7Data.trafowicklung3w1);
+                    winding = windings.get(transformer.trafowicklung3w1);
                 }
                 else if (powerTransformerEnd.endNumber === 2) {
-                    winding = windings.get(i7Data.trafowicklung3w2);
+                    winding = windings.get(transformer.trafowicklung3w2);
                 }
                 else if (powerTransformerEnd.endNumber === 3) {
-                    winding = windings.get(i7Data.trafowicklung3w3);
+                    winding = windings.get(transformer.trafowicklung3w3);
                 }
-                if (sternpunktKnotenMap.get(i7Data.id).has(winding)) {
+                if (sternpunktKnotenMap.get(i7Data.id).has(winding.id)) {
                     this.convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, integral7, sternpunktKnotenMap.get(i7Data.id).get(winding.id), defaultValuesConfig);
                 }
             }
@@ -4954,7 +4146,7 @@ class ConverterI7 {
             this.logger.debug(`Wicklung2W ${i7Data.id} ${powerTransformerEnd.endNumber} ${powerTransformerEnd.mrid} keine Terminalinstanz.`);
         }
         if (powerTransformerEnd.ratedU) {
-            powerTransformerEnd.baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, powerTransformerEnd.ratedU, this.exportFramesBoundary);
+            powerTransformerEnd.baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, powerTransformerEnd.ratedU, this.exportFramesBoundary);
         }
         else {
             this.logger.debug(`Wicklung ${powerTransformerEnd.mrid} Nr. ${powerTransformerEnd.endNumber} keine Spannungsangabe.`);
@@ -4967,10 +4159,10 @@ class ConverterI7 {
         for (let tapChangerNumber = 1; tapChangerNumber <= 2; tapChangerNumber++) {
             const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
             const transformerEnd = transformerEnds.find(elem => elem.endNumber === tapChangerNumber);
-            let gestufteSeite = utils_2.isNumericI7(i7Data[`gestufte_seite_s${tapChangerNumber}`])
+            let gestufteSeite = (0, utils_2.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerNumber}`])
                 ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
                 : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
-            if (utils_2.isNumericI7(gestufteSeite))
+            if ((0, utils_2.isNumericI7)(gestufteSeite))
                 gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
             if (!transformerEnd) {
                 this.logger.error(`Trafo ${i7Data.id}: Zum Stufenschalter ${gestufteSeite} keine Wicklung gefunden.`);
@@ -4981,8 +4173,8 @@ class ConverterI7 {
                 continue;
             }
             const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-            const angle = utils_2.isNumericI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
-                ? utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+            const angle = (0, utils_2.isNumericI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+                ? (0, utils_2.convertToNumberI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
                 : (_c = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _c === void 0 ? void 0 : _c.value;
             const neutralU = transformerEnd.ratedU;
             let tapChanger;
@@ -4998,25 +4190,25 @@ class ConverterI7 {
         }
     }
     setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, tapChangerInfo) {
-        let lowStep = utils_2.isNumericI7(i7Data[`minstufe_s${tapChangerNumber}`])
+        let lowStep = (0, utils_2.isNumericI7)(i7Data[`minstufe_s${tapChangerNumber}`])
             ? i7Data[`minstufe_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.lowStep;
-        let highStep = utils_2.isNumericI7(i7Data[`maxstufe_s${tapChangerNumber}`])
+        let highStep = (0, utils_2.isNumericI7)(i7Data[`maxstufe_s${tapChangerNumber}`])
             ? i7Data[`maxstufe_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.highStep;
-        let neutralStep = utils_2.isNumericI7(i7Data[`mittelstufe_s${tapChangerNumber}`])
+        let neutralStep = (0, utils_2.isNumericI7)(i7Data[`mittelstufe_s${tapChangerNumber}`])
             ? i7Data[`mittelstufe_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.neutralStep;
-        let currentStep = utils_2.isNumericI7(i7Data[`aktstufe_s${tapChangerNumber}`])
+        let currentStep = (0, utils_2.isNumericI7)(i7Data[`aktstufe_s${tapChangerNumber}`])
             ? i7Data[`aktstufe_s${tapChangerNumber}`]
             : neutralStep;
-        const i7TapArray = utils_2.getTapChangerStepArray(lowStep, highStep);
-        const lowerVoltageStepCount = utils_2.getTapChangerStepCount(lowStep, neutralStep);
-        const increaseVoltageStepCount = utils_2.getTapChangerStepCount(neutralStep, highStep);
-        const uMin = utils_2.isNumericI7(i7Data[`umin_s${tapChangerNumber}`])
+        const i7TapArray = (0, utils_2.getTapChangerStepArray)(lowStep, highStep);
+        const lowerVoltageStepCount = (0, utils_2.getTapChangerStepCount)(lowStep, neutralStep);
+        const increaseVoltageStepCount = (0, utils_2.getTapChangerStepCount)(neutralStep, highStep);
+        const uMin = (0, utils_2.isNumericI7)(i7Data[`umin_s${tapChangerNumber}`])
             ? i7Data[`umin_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMin;
-        const uMax = utils_2.isNumericI7(i7Data[`umax_s${tapChangerNumber}`])
+        const uMax = (0, utils_2.isNumericI7)(i7Data[`umax_s${tapChangerNumber}`])
             ? i7Data[`umax_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMax;
         const lowerVoltageStepIncrement = Math.abs(uMin) / lowerVoltageStepCount * -1;
@@ -5025,14 +4217,14 @@ class ConverterI7 {
         if (tapChanger instanceof RatioTapChanger_1.RatioTapChanger) {
             const ratioTapChanger = tapChanger;
             if (Math.abs(lowerVoltageStepIncrement) !== Math.abs(increaseVoltageStepIncrement)) {
-                const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable(utils_1.generateUUID(), `${i7Data.bezeichner} W_${tapChangerNumber}`);
+                const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable((0, utils_1.generateUUID)(), `${i7Data.bezeichner} W_${tapChangerNumber}`);
                 for (let i = 0; i < lowerVoltageStepCount; i++) {
-                    util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, i + 1, (lowerVoltageStepIncrement * (lowerVoltageStepCount - i)));
+                    (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i + 1, (lowerVoltageStepIncrement * (lowerVoltageStepCount - i)));
                 }
-                util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, lowerVoltageStepCount + 1, 1);
+                (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, lowerVoltageStepCount + 1, 1);
                 for (let i = 0; i < increaseVoltageStepCount; i++) {
                     const step = (lowerVoltageStepCount + 1) + (i + 1);
-                    util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, step, (increaseVoltageStepIncrement * (i + 1)));
+                    (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, step, (increaseVoltageStepIncrement * (i + 1)));
                 }
                 lowStep = 1;
                 highStep = ratioTapChangerTable.ratioTapChangerTablePoints.length;
@@ -5060,11 +4252,11 @@ class ConverterI7 {
         var _a, _b, _c;
         const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
         const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-        let gestufteSeite = utils_2.isNumericI7(i7Data[`gestufte_seite_s${tapChangerNumber}`])
+        let gestufteSeite = (0, utils_2.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerNumber}`])
             ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
             : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
         gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
-        const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+        const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger((0, utils_1.generateUUID)(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
         ratioTapChanger.ltcFlag = false;
         ratioTapChanger.transformerEnd = transformerEnd;
         transformerEnd.ratioTapChanger = ratioTapChanger;
@@ -5073,7 +4265,7 @@ class ConverterI7 {
         const regelung = +i7Data[`regelung_s${gestufteSeite}`];
         const regulatingTerminal = ((_b = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _b === void 0 ? void 0 : _b.size) ? [...(_c = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _c === void 0 ? void 0 : _c.values()].find(elem => elem.connected) : undefined;
         if (isFinite(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.usoll) && regulatingTerminal) {
-            const tapChangerControl = new TapChangerControl_1.TapChangerControl(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+            const tapChangerControl = new TapChangerControl_1.TapChangerControl((0, utils_1.generateUUID)(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
             tapChangerControl.discrete = true;
             const regulatingControlEnabled = regelung === 0 ? false : true;
             tapChangerControl.enabled = regulatingControlEnabled;
@@ -5097,34 +4289,34 @@ class ConverterI7 {
         var _a;
         const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
         const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-        let gestufteSeite = utils_2.isNumericI7(i7Data[`gestufte_seite_s${tapChangerNumber}`])
+        let gestufteSeite = (0, utils_2.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerNumber}`])
             ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
             : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
         gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
         const transformerEnd = transformerEnds.find(elem => elem.endNumber === gestufteSeite);
         const is3WTransformer = transformerEnds.length > 2 ? true : false;
         let phaseTapChanger;
-        let spezialregelung = utils_2.isNumericI7(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
+        let spezialregelung = (0, utils_2.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
         spezialregelung = spezialregelung ? spezialregelung : (is3WTransformer ? 2 : undefined);
-        const winkel = utils_2.isNumericI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+        const winkel = (0, utils_2.isNumericI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
             ? i7Data[`uzus_winkel_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement;
         switch (spezialregelung) {
             case (1): {
-                const phaseTapChangerSync = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                const phaseTapChangerSync = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical((0, utils_1.generateUUID)(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
                 phaseTapChanger = phaseTapChangerSync;
                 cimModel.addPhaseTapChangerSymmetrical(phaseTapChangerSync);
                 break;
             }
             case (2): {
-                const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical((0, utils_1.generateUUID)(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
                 phaseTapChangerAsync.windingConnectionAngle = winkel;
                 phaseTapChanger = phaseTapChangerAsync;
                 cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
                 break;
             }
             default: {
-                const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical((0, utils_1.generateUUID)(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
                 phaseTapChangerAsync.windingConnectionAngle = winkel;
                 phaseTapChanger = phaseTapChangerAsync;
                 cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
@@ -5136,14 +4328,14 @@ class ConverterI7 {
         const pRegulationFromNode = i7Data.von_a_nr;
         const pRegulationToNode = i7Data.nach_a_nr;
         const regulatingTransformerEnd = transformerEnds.find(elem => elem.endNumber === pRegulationToNode);
-        let pVorgabe = utils_2.isNumericI7(i7Data[`p_vorgabe`]) ? +i7Data[`p_vorgabe`] : undefined;
+        let pVorgabe = (0, utils_2.isNumericI7)(i7Data[`p_vorgabe`]) ? +i7Data[`p_vorgabe`] : undefined;
         if (is3WTransformer && tapChangerNumber > 1) {
-            pVorgabe = utils_2.isNumericI7(i7Data[`p_vorgabe_2`]) ? +i7Data[`p_vorgabe_2`] : undefined;
+            pVorgabe = (0, utils_2.isNumericI7)(i7Data[`p_vorgabe_2`]) ? +i7Data[`p_vorgabe_2`] : undefined;
         }
         if (isFinite(pVorgabe) && regulatingTransformerEnd) {
             const regulatingTerminal = regulatingTransformerEnd === null || regulatingTransformerEnd === void 0 ? void 0 : regulatingTransformerEnd.terminal;
             const regelung = +i7Data[`regelung_s${tapChangerNumber}`];
-            const tapChangerControl = new TapChangerControl_1.TapChangerControl(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+            const tapChangerControl = new TapChangerControl_1.TapChangerControl((0, utils_1.generateUUID)(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
             tapChangerControl.discrete = true;
             const regulatingControlEnabled = regelung === 0 ? false : true;
             tapChangerControl.enabled = regulatingControlEnabled;
@@ -5350,7 +4542,10 @@ class ConverterI7 {
         return filteredRelevantTables;
     }
     isTableAvailable(tableName) {
-        return this.availableTableNames.indexOf(tableName) > -1 ? true : false;
+        return this.availableTableNames.has(tableName);
+    }
+    getAvailableColumnNames(tableName) {
+        return this.availableTableNames.get(tableName);
     }
     addIdMapping(i7ID, uuid, type) {
         if (this.integralID2UUID.has(i7ID)) {
@@ -5420,11 +4615,15 @@ class ConverterI7 {
 }
 exports.ConverterI7 = ConverterI7;
 function getDCNodeFromConverter(acDcConverter) {
-    for (const terminal of acDcConverter.dCTerminals.values()) {
-        if (terminal.dcNode)
-            return terminal.dcNode;
+    let ret_val = undefined;
+    if (acDcConverter.dCTerminals) {
+        for (const terminal of acDcConverter.dCTerminals.values()) {
+            if (terminal.dcNode) {
+                ret_val = terminal.dcNode;
+            }
+        }
     }
-    return;
+    return ret_val;
 }
 function logExecutionTime(logger, startTime, text) {
     logger.debug(`${text} ${(perf_hooks_1.performance.now() - startTime) / 1000} seconds`);