@enervance/insight-cim-model 0.0.30 → 0.0.32

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

@@ -4,6 +4,7 @@ exports.ConverterI7 = void 0;
 const tslib_1 = require("tslib");
 const Model_1 = require("../../model/model/Model");
 const export_frame_i7_1 = require("./interface-i7/export-frame-i7");
+const data_structures_i7_1 = require("./interface-i7/data-structures-i7");
 const mysql_controller_1 = require("../../util/database/mysql-controller");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const utils_1 = require("../../util/utils");
@@ -104,16 +105,23 @@ const DCLineSegment_1 = require("../../model/dc/DCLineSegment");
 const DCConverterOperatingModeKind_1 = require("../../model/dc/DCConverterOperatingModeKind");
 const DCTerminal_1 = require("../../model/dc/DCTerminal");
 const AMPRIONSeriesCompensator_1 = require("../../model/extensions/amprion/wires/AMPRIONSeriesCompensator");
+const jszip_1 = tslib_1.__importDefault(require("jszip"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const AsynchronousMachine_1 = require("../../model/wires/AsynchronousMachine");
+const EquivalentBranch_1 = require("../../model/equivalents/EquivalentBranch");
+const AMPRIONLine_1 = require("../../model/extensions/amprion/core/AMPRIONLine");
+const ControlArea_1 = require("../../model/operations/ControlArea");
 class ConverterI7 {
     constructor() {
         this.exportFrames = new Map();
+        this.exportFramesBoundary = new Map();
         this.cimModelDefault = new Model_1.Model();
         this.availableTableNames = [];
         this.integralID2Type = new Map();
         this.coordinateSystem = 'EPSG:4326';
         this.integralID2UUID = new Map();
         this.UUID2Integral7ID = new Map();
-        this.integral7Modells = new Map();
         this.kdrosseltypen = new Map();
         this.leitungAnschlussKnotenIDs = new Set();
         this.trafo2wAnschlussKnotenIDs = new Set();
@@ -122,18 +130,15 @@ class ConverterI7 {
         this.lDrosselAnschlussKnotenIDs = new Set();
         this.lKondensatorAnschlussKnotenIDs = new Set();
         this.ersatzZweigAnschlussKnotenIDs = new Set();
+        this.blocktransformatoren = [];
     }
-    convert(objectMappingConfig, defaultValuesConfig, energyTypesConfig, ukzExportConfig, tempDirPath) {
+    convert(objectMappingConfig, defaultValuesConfig, energyTypesConfig, exportConfig, tempDirPath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
                 try {
                     yield this.createColumnIndex();
-                    const ukz2GeoregionMapping = yield this.mysqlController.execQuery(`
-                                                                            SELECT gr.id AS georegion_id, sgr.id AS subgeoregion_id, group_concat(DISTINCT standort.ukz) AS ukzCSV
-                                                                            FROM netz_subgeoregion sgr
-                                                                            LEFT OUTER JOIN netz_georegion gr ON sgr.georegion = gr.id
-                                                                            LEFT OUTER JOIN netz_standort standort ON sgr.id = standort.subgeoregion
-                                                                            GROUP BY georegion_id;                                                               `);
+                    yield this.configExportFrames(exportConfig, defaultValuesConfig, tempDirPath);
                     yield this.convertBetriebsmitteltypenKdrossel();
                     yield this.convertBetriebsmitteltypenLeitung();
                     yield this.convertBetriebsmitteltypenTrafo();
@@ -143,257 +148,258 @@ class ConverterI7 {
                     yield this.queryLDroselAnschlussIDs();
                     yield this.queryErsatzLaengsAnschlussIDs();
                     yield this.queryLkondensatorAnschlussIDs();
-                    ukz2GeoregionMapping.map(elem => elem.ukzArray = elem.ukzCSV.split(','));
-                    const allGeoRegions = yield this.convertGeoRegionen();
-                    const allSubGeoRegions = yield this.convertSubGeoRegionen(allGeoRegions, defaultValuesConfig);
-                    const boundaryGeoRegionSet = new Set();
-                    const internalGeoRegionSet = new Set();
-                    for (const ukzRegionMap of ukz2GeoregionMapping) {
-                        for (const bdUkz of ukzExportConfig.boundaryUkz) {
-                            const geoRegionUUID = this.integralID2UUID.get(ukzRegionMap.georegion_id);
-                            const geoRegion = allGeoRegions.find(elem => elem.mrid === geoRegionUUID);
-                            if (!geoRegion)
-                                continue;
-                            if (ukzRegionMap.ukzArray.indexOf(bdUkz.name) > -1) {
-                                if (!boundaryGeoRegionSet.has(geoRegion)) {
-                                    boundaryGeoRegionSet.add(geoRegion);
-                                }
-                            }
-                            else {
-                                internalGeoRegionSet.add(geoRegion);
-                            }
-                        }
-                    }
-                    const boundaryGeoRegions = Array.from(boundaryGeoRegionSet);
-                    const profileGeoRegions = Array.from(internalGeoRegionSet);
-                    this.logger.debug(`BoundaryGeoRegions ${boundaryGeoRegions.map(elem => elem.name).join()}`);
-                    this.logger.debug(`ProfileGeoRegions ${profileGeoRegions.map(elem => elem.name).join()}`);
-                    const bdExportFrame = new export_frame_i7_1.I7ExportFrame('Boundary', [rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_EQ_BD], tempDirPath, new Map());
-                    for (const bdRegion of boundaryGeoRegions) {
-                        bdExportFrame.cimModel.addGeographicalRegion(bdRegion);
-                        for (const subGeoRegion of bdRegion.regions) {
-                            bdExportFrame.cimModel.addSubGeographicalRegion(subGeoRegion);
-                        }
-                        this.addDefaultObjectsGeo(bdExportFrame.cimModel, defaultValuesConfig);
-                        this.exportFrames.set(bdRegion.mrid, bdExportFrame);
-                    }
-                    const cgmesExportProfiles = [rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_SV, rdf_xml_1.RDF_XML.PROFILE_DL, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7];
-                    const dependentOnModels = new Map();
-                    dependentOnModels.set(rdf_xml_1.RDF_XML.PROFILE_EQ_BD, [bdExportFrame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD)]);
-                    for (const pRegion of profileGeoRegions) {
-                        if (!ukzExportConfig.exportGeoRegion.find(elem => elem.name === pRegion.name))
+                    for (const entry of this.exportFramesBoundary.entries()) {
+                        const geoRegionUUID = entry[0];
+                        const frame = entry[1];
+                        const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
+                        if (!geoRegion)
                             continue;
-                        const exportFrame = new export_frame_i7_1.I7ExportFrame(pRegion.name, cgmesExportProfiles, tempDirPath, dependentOnModels);
-                        exportFrame.cimModel.addGeographicalRegion(pRegion);
-                        for (const subGeoRegion of pRegion.regions) {
-                            exportFrame.cimModel.addSubGeographicalRegion(subGeoRegion);
-                        }
-                        this.addDefaultObjectsLoadModel(exportFrame.cimModel, defaultValuesConfig);
-                        this.addDefaultObjectsGeo(exportFrame.cimModel, defaultValuesConfig);
-                        this.exportFrames.set(pRegion.mrid, exportFrame);
+                        yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
                     }
                     for (const entry of this.exportFrames.entries()) {
                         const geoRegionUUID = entry[0];
                         const frame = entry[1];
-                        const cimModel = frame.cimModel;
-                        const geoRegion = cimModel.getGeographicalRegion(geoRegionUUID);
+                        const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
                         if (!geoRegion)
                             continue;
-                        const integral7Modell = {
-                            integralStandorte: new Map(),
-                            integralSchaltanlagen: new Map(),
-                            integralSchaltanlagenAbschnitte: new Map(),
-                            integralSchaltfelder: new Map(),
-                            integralKnotenSo: new Map(),
-                            integralLeitungen: new Map(),
-                            knotenSfIDs: [],
-                            kontenZwIDs: [],
-                            querkupplungIDs: [],
-                            laengskupplungIDs: [],
-                            leitungsAnschlussIDs: [],
-                            trafo2wAnschlussKnotenIDs: [],
-                            trafo3wAnschlussKnotenIDs: [],
-                            hgueAnschlussKnotenIDs: [],
-                            lDrosselAnschlussKnotenIDs: [],
-                            lKondensatorAnschlussKnotenIDs: [],
-                            ersatzZweigAnschlussKnotenIDs: [],
-                            targetVoltages: new Map(),
-                            sternPunktImpModel: {
-                                stpSchieneJunctionUUIDs: new Map(),
-                                stpSchieneTerminal: new Map(),
-                                junctionUUIDstpImp: new Map(),
-                                petersenCoils: new Map(),
-                                junctions: new Map(),
-                                groundingImpedances: new Map(),
-                                connectivityNodes: new Map(),
-                            },
-                        };
-                        this.integral7Modells.set(geoRegionUUID, integral7Modell);
-                        const subGeoRegionsUUIDs = geoRegion.regions.map(elem => elem.mrid);
-                        const subGeoRegionsI7IDs = [];
-                        for (const uuid of subGeoRegionsUUIDs) {
-                            subGeoRegionsI7IDs.push(...this.UUID2Integral7ID.get(uuid));
-                        }
-                        let startTime = perf_hooks_1.performance.now();
-                        yield this.convertStandorte(cimModel, integral7Modell, subGeoRegionsI7IDs, defaultValuesConfig);
-                        logExecutionTime(this.logger, startTime, `convertStandorte(${cimModel.substations.size + cimModel.lines.size})`);
-                        startTime = perf_hooks_1.performance.now();
-                        const standortIDs = [...integral7Modell.integralStandorte.keys()];
-                        if (standortIDs.length)
-                            yield this.covertSchaltanlagen(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
-                        logExecutionTime(this.logger, startTime, `covertSchaltanlagen(${standortIDs.length})`);
-                        startTime = perf_hooks_1.performance.now();
-                        const schaltanlagenIDs = [...integral7Modell.integralSchaltanlagen.keys()];
-                        if (schaltanlagenIDs.length)
-                            yield this.convertSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenIDs);
-                        logExecutionTime(this.logger, startTime, `convertSchaltanlagenAbschnitte(${schaltanlagenIDs.length})`);
-                        startTime = perf_hooks_1.performance.now();
-                        const schaltanlagenAbschnittIDs = [...integral7Modell.integralSchaltanlagenAbschnitte.keys()];
-                        if (schaltanlagenAbschnittIDs.length > 0)
-                            yield this.convertSchaltfelder(cimModel, integral7Modell, schaltanlagenAbschnittIDs);
-                        logExecutionTime(this.logger, startTime, `convertSchaltfelder()`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (schaltanlagenAbschnittIDs.length > 0) {
-                            yield this.convertQuerkupplungen(cimModel, integral7Modell, schaltanlagenAbschnittIDs);
-                            yield this.convertLaegskupplungen(cimModel, integral7Modell, schaltanlagenAbschnittIDs);
-                        }
-                        logExecutionTime(this.logger, startTime, `convertKupplungen()`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (standortIDs.length)
-                            yield this.convertKnotenSo(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
-                        logExecutionTime(this.logger, startTime, `convertKupplungen()`);
-                        const knotenSoIDs = [...integral7Modell.integralKnotenSo.keys()];
-                        startTime = perf_hooks_1.performance.now();
-                        const schaltfeldIDs = [...integral7Modell.integralSchaltfelder.keys()];
-                        if (knotenSoIDs.length)
-                            yield this.convertKnotenSf(cimModel, integral7Modell, schaltfeldIDs);
-                        logExecutionTime(this.logger, startTime, `convertKnotenSf()`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (integral7Modell.querkupplungIDs.length > 0) {
-                            yield this.convertKnotenKf(cimModel, integral7Modell.querkupplungIDs);
-                        }
-                        logExecutionTime(this.logger, startTime, `convertKnotenKf()`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (integral7Modell.laengskupplungIDs.length > 0) {
-                            yield this.convertKnotenLk(cimModel, integral7Modell.laengskupplungIDs);
-                        }
-                        logExecutionTime(this.logger, startTime, `convertKnotenLk()`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (knotenSoIDs.length > 0)
-                            yield this.convertSchlaufen(cimModel, integral7Modell, knotenSoIDs);
-                        logExecutionTime(this.logger, startTime, `convertSchlaufen()`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (schaltanlagenAbschnittIDs.length > 0)
-                            yield this.convertSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs);
-                        logExecutionTime(this.logger, startTime, `convertSammelschienenAbschnitte(${cimModel.busbarSections.size})`);
-                        startTime = perf_hooks_1.performance.now();
-                        const eqiupmentContainerIDs = [...schaltfeldIDs, ...integral7Modell.querkupplungIDs, ...integral7Modell.laengskupplungIDs];
-                        if (eqiupmentContainerIDs.length > 0) {
-                            yield this.convertStarreVerbindungen(cimModel, eqiupmentContainerIDs);
-                        }
-                        logExecutionTime(this.logger, startTime, `convertStarreVerbindungen(${cimModel.junctions.size})`);
-                        const soSfKonoten = [...knotenSoIDs, ...integral7Modell.knotenSfIDs];
-                        startTime = perf_hooks_1.performance.now();
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertBelastungen(cimModel, soSfKonoten, defaultValuesConfig, objectMappingConfig.Belastung.class);
-                        }
-                        logExecutionTime(this.logger, startTime, `convertBelastungen()`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertEinspeisungen(cimModel, soSfKonoten, objectMappingConfig.Einspeisung.class);
-                        }
-                        logExecutionTime(this.logger, startTime, `convertEinspeisungen()`);
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertGeneratoren(cimModel, soSfKonoten, energyTypesConfig);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertKraftwerksbloecke(cimModel, soSfKonoten, energyTypesConfig);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertErsatzQuerZweige(cimModel, soSfKonoten);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertBoundaryInjections(cimModel, soSfKonoten);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertKompensationsdrossel(cimModel, soSfKonoten);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertKompensationskondensatoren(cimModel, soSfKonoten);
-                        }
-                        startTime = perf_hooks_1.performance.now();
-                        if (eqiupmentContainerIDs.length > 0) {
-                            yield this.convertTrenner3f(cimModel, eqiupmentContainerIDs);
-                        }
-                        logExecutionTime(this.logger, startTime, `convertTrenner3f()`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (eqiupmentContainerIDs.length > 0) {
-                            yield this.convertTrennerFi3f(cimModel, eqiupmentContainerIDs);
-                        }
-                        logExecutionTime(this.logger, startTime, `convertTrennerFi3f(`);
-                        startTime = perf_hooks_1.performance.now();
-                        if (eqiupmentContainerIDs.length > 0) {
-                            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);
-                            yield this.convertKdrossel(cimModel, integral7Modell, stpSchieneID);
-                            yield this.convertStpSchaltelemente(integral7Modell, stpSchieneID);
-                            logExecutionTime(this.logger, startTime, `convertSternpunktImp-Modell()`);
-                        }
-                        if (standortIDs.length > 0) {
-                            startTime = perf_hooks_1.performance.now();
-                            yield this.convertTrafo2W(cimModel, integral7Modell, defaultValuesConfig, standortIDs);
-                            logExecutionTime(this.logger, startTime, `convertTrafo2W-Modell`);
-                        }
-                        if (standortIDs.length > 0) {
-                            startTime = perf_hooks_1.performance.now();
-                            yield this.convertTrafo3W(cimModel, integral7Modell, defaultValuesConfig, standortIDs);
-                            logExecutionTime(this.logger, startTime, `convertTrafo3W-Modell`);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertStatcom(cimModel, soSfKonoten);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertSVC(cimModel, soSfKonoten);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertCsConverterDC(cimModel, soSfKonoten);
-                        }
-                        if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                            yield this.convertVsConverterDC(cimModel, soSfKonoten);
-                        }
-                        if (bdExportFrame !== frame) {
-                            startTime = perf_hooks_1.performance.now();
-                            yield this.convertLeitungen(cimModel, integral7Modell, defaultValuesConfig);
-                            logExecutionTime(this.logger, startTime, `convertLeitungen`);
-                        }
-                        yield this.convertDCLines(cimModel, integral7Modell, defaultValuesConfig);
-                        yield this.convertLaengskondensatoren(cimModel, integral7Modell, defaultValuesConfig);
-                        if (boundaryGeoRegions.indexOf(geoRegion) > -1) {
-                            yield this.transformBoundaryModel(frame.cimModel, defaultValuesConfig);
-                        }
-                        startTime = perf_hooks_1.performance.now();
+                        frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ_BD, (_a = this.exportFramesBoundary.entries().next()) === null || _a === void 0 ? void 0 : _a.value[1].getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
+                        yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
+                        frame.validateCIMModel();
+                        const startTime = perf_hooks_1.performance.now();
+                        frame.openXMLModel();
+                        frame.serializeModel(defaultValuesConfig);
+                        yield frame.closeXMLModel();
+                        let endTime = perf_hooks_1.performance.now();
+                        frame.cimModel.purgeData();
+                        console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
+                    }
+                    for (const entry of this.exportFramesBoundary.entries()) {
+                        const geoRegionUUID = entry[0];
+                        const frame = entry[1];
+                        const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
+                        if (!geoRegion)
+                            continue;
+                        yield this.transformBoundaryModel(frame, (_b = this.exportFrames.entries().next()) === null || _b === void 0 ? void 0 : _b.value[1]);
+                        frame.validateCIMModel();
+                        const startTime = perf_hooks_1.performance.now();
                         frame.openXMLModel();
                         frame.serializeModel(defaultValuesConfig);
                         yield frame.closeXMLModel();
                         let endTime = perf_hooks_1.performance.now();
-                        console.log(`\tSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds`);
+                        console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
                     }
+                    const zip = new jszip_1.default();
+                    const gridFrames = [...this.exportFrames.values(), ...this.exportFramesBoundary.values()]
+                        .filter((value, index, self) => self.indexOf(value) === index);
+                    for (const frame of gridFrames) {
+                        for (const xmlSerializer of frame.profileXmlSerializers.values()) {
+                            const readStreamEq = fs_1.default.createReadStream(xmlSerializer.filePath);
+                            zip.file(`${xmlSerializer.fileName}`, readStreamEq);
+                        }
+                    }
+                    resolve(yield utils_2.generateNodeStream(zip));
                 }
                 catch (e) {
                     this.logger.error(e);
                     console.error("ERROR:" + e);
+                    reject({ status: 'error', message: e.toString() });
                 }
                 finally {
                     yield this.dropColumnIndex();
-                    resolve();
                 }
             }));
         });
     }
+    convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const integral7Modell = frame.getI7Model();
+            const cimModel = frame.cimModel;
+            const subGeoRegionsUUIDs = geoRegion.regions.map(elem => elem.mrid);
+            const subGeoRegionsI7IDs = [];
+            for (const uuid of subGeoRegionsUUIDs) {
+                subGeoRegionsI7IDs.push(...this.UUID2Integral7ID.get(uuid));
+            }
+            let startTime = perf_hooks_1.performance.now();
+            logExecutionTime(this.logger, startTime, `convertRegelzone(${cimModel.controlArea.size})`);
+            startTime = perf_hooks_1.performance.now();
+            yield this.convertStandorte(cimModel, integral7Modell, subGeoRegionsI7IDs, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `convertStandorte(${cimModel.substations.size + cimModel.lines.size})`);
+            startTime = perf_hooks_1.performance.now();
+            const standortIDs = [...integral7Modell.integralStandorte.keys()];
+            if (standortIDs.length)
+                yield this.covertSchaltanlagen(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `covertSchaltanlagen(${standortIDs.length})`);
+            startTime = perf_hooks_1.performance.now();
+            const schaltanlagenIDs = [...integral7Modell.integralSchaltanlagen.keys()];
+            if (schaltanlagenIDs.length)
+                yield this.convertSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenIDs);
+            logExecutionTime(this.logger, startTime, `convertSchaltanlagenAbschnitte(${schaltanlagenIDs.length})`);
+            startTime = perf_hooks_1.performance.now();
+            const schaltanlagenAbschnittIDs = [...integral7Modell.integralSchaltanlagenAbschnitte.keys()];
+            if (schaltanlagenAbschnittIDs.length > 0)
+                yield this.convertSchaltfelder(cimModel, integral7Modell, schaltanlagenAbschnittIDs);
+            logExecutionTime(this.logger, startTime, `convertSchaltfelder()`);
+            if (schaltanlagenAbschnittIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertQuerkupplungen(cimModel, integral7Modell, schaltanlagenAbschnittIDs);
+                logExecutionTime(this.logger, startTime, `convertQuerkupplungen()`);
+            }
+            if (schaltanlagenIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertLaengskupplungen(cimModel, integral7Modell, schaltanlagenIDs);
+                logExecutionTime(this.logger, startTime, `convertLaengskupplungen()`);
+            }
+            startTime = perf_hooks_1.performance.now();
+            if (standortIDs.length)
+                yield this.convertKnotenSo(frame, integral7Modell, standortIDs, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `convertKnotenSO()`);
+            const knotenSoIDs = [...integral7Modell.integralKnotenSo.keys()];
+            startTime = perf_hooks_1.performance.now();
+            const schaltfeldIDs = [...integral7Modell.integralSchaltfelder.keys()];
+            if (schaltfeldIDs.length)
+                yield this.convertKnotenSf(cimModel, integral7Modell, schaltfeldIDs);
+            logExecutionTime(this.logger, startTime, `convertKnotenSf()`);
+            if (integral7Modell.querkupplungIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertKnotenKf(cimModel, integral7Modell.querkupplungIDs);
+                logExecutionTime(this.logger, startTime, `convertKnotenKf`);
+            }
+            if (integral7Modell.laengskupplungIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertKnotenLk(cimModel, integral7Modell.laengskupplungIDs);
+                logExecutionTime(this.logger, startTime, `convertKnotenLk`);
+            }
+            startTime = perf_hooks_1.performance.now();
+            if (knotenSoIDs.length > 0)
+                yield this.convertSchlaufen(cimModel, integral7Modell, knotenSoIDs);
+            logExecutionTime(this.logger, startTime, `convertSchlaufen()`);
+            startTime = perf_hooks_1.performance.now();
+            if (schaltanlagenAbschnittIDs.length > 0)
+                yield this.convertSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs);
+            logExecutionTime(this.logger, startTime, `convertSammelschienenAbschnitte(${cimModel.busbarSections.size})`);
+            const eqiupmentContainerIDs = [...schaltfeldIDs, ...integral7Modell.querkupplungIDs, ...integral7Modell.laengskupplungIDs];
+            if (eqiupmentContainerIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertStarreVerbindungen(cimModel, eqiupmentContainerIDs);
+                logExecutionTime(this.logger, startTime, `convertStarreVerbindungen(${cimModel.junctions.size})`);
+            }
+            const soSfKnoten = [...knotenSoIDs, ...integral7Modell.knotenSfIDs];
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertBelastungen(cimModel, soSfKnoten, defaultValuesConfig, objectMappingConfig.Belastung.class);
+                logExecutionTime(this.logger, startTime, `convertBelastungen()`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertAsynchronmotor(cimModel, soSfKnoten, defaultValuesConfig);
+                logExecutionTime(this.logger, startTime, `convertAsynchronmotor`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertEinspeisungen(cimModel, soSfKnoten, objectMappingConfig.Einspeisung.class);
+                logExecutionTime(this.logger, startTime, `convertEinspeisungen`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertGeneratoren(cimModel, soSfKnoten, energyTypesConfig);
+                logExecutionTime(this.logger, startTime, `convertGeneratoren`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertKraftwerksbloecke(cimModel, soSfKnoten, energyTypesConfig);
+                logExecutionTime(this.logger, startTime, `convertKraftwerksbloecke`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertErsatzQuerZweige(cimModel, soSfKnoten);
+                logExecutionTime(this.logger, startTime, `convertErsatzQuerZweige`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertBoundaryInjections(cimModel, soSfKnoten, objectMappingConfig.Randnetzeinspeisung.class);
+                logExecutionTime(this.logger, startTime, `convertBoundaryInjections`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertKompensationsdrossel(cimModel, 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);
+                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);
+                yield this.convertKdrossel(cimModel, integral7Modell, stpSchieneID);
+                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);
+                logExecutionTime(this.logger, startTime, `convertStatcom`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSVC(cimModel, soSfKnoten);
+                logExecutionTime(this.logger, startTime, `convertSVC`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertCsConverterDC(cimModel, integral7Modell, soSfKnoten);
+                logExecutionTime(this.logger, startTime, `convertCsConverterDC`);
+            }
+            if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
+                startTime = perf_hooks_1.performance.now();
+                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(cimModel, integral7Modell, defaultValuesConfig);
+                logExecutionTime(this.logger, startTime, `convertErsatzlaengszweige`);
+            }
+            startTime = perf_hooks_1.performance.now();
+            yield this.convertDCLines(cimModel, integral7Modell, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `convertDCLines`);
+            startTime = perf_hooks_1.performance.now();
+            yield this.convertLaengsdrosseln(cimModel, integral7Modell, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `convertLaengsdrosseln`);
+            startTime = perf_hooks_1.performance.now();
+            yield this.convertLaengskondensatoren(cimModel, integral7Modell, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `convertLaengskondensatoren`);
+        });
+    }
     convertGeoRegionen() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -402,7 +408,8 @@ class ConverterI7 {
                     this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGION, 0, 0, []))
                         .then((result) => {
                         for (const i7Data of result) {
-                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), i7Data.bezeichner, i7Data.kurzname);
+                            const i7Schluesel = integral_prefix_1.GEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
                         }
@@ -421,6 +428,22 @@ 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, []));
+                for (const i7Data of result) {
+                    const i7Schluesel = integral_prefix_1.REGELZONE_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                    const ctrlarea = new ControlArea_1.ControlArea(utils_1.getUUID(i7Data.guid), 'RZ_' + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                    cimModel.addControlArea(ctrlarea);
+                    this.addIdMapping(i7Data.id, ctrlarea.mrid, integral_sql_1.Integral7TableNames.REGELZONE);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.REGELZONE} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertSubGeoRegionen(regions, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -429,7 +452,8 @@ class ConverterI7 {
                     this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.SUBREGION, 0, 0, []))
                         .then((result) => {
                         for (const i7Data of result) {
-                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), i7Data.bezeichner, i7Data.kurzname);
+                            const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
                             const regionUUID = this.integralID2UUID.get(i7Data.georegion);
                             let region = regions.find(elem => elem.mrid === regionUUID);
                             if (!region) {
@@ -465,7 +489,8 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Schluessel, i7Data.stationsnummer);
+                    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.id + '', i7Schluessel, i7Data.stationsnummer, i7Data.ukz);
                     let subregion = cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
                         const region = utils_1.createIfNotExitsGeoregionByName(cimModel, defaultValuesConfig.GeographicalRegion.name);
@@ -518,7 +543,7 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                     const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Schluessel);
                     const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, un);
+                    const baseVoltage = 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);
@@ -569,7 +594,7 @@ class ConverterI7 {
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                     const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Schluessel);
-                    bay.number = i7Data.feldnummer;
+                    bay.number = i7Data.feldnummer + '';
                     bay.locationID = i7Data.ips_folder_id;
                     bay.voltageLevel = voltageLevel;
                     voltageLevel.addBay(bay);
@@ -588,19 +613,23 @@ class ConverterI7 {
             }
         });
     }
-    convertKnotenSo(cimModel, integral7, standortIDs, defaultValuesConfig) {
+    convertKnotenSo(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.KNOTEN_SO)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_SO, standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), substation.name + "/" + utils_2.getName(i7Data), i7Data.kurzname);
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.generateUUID(), 'Abzweig', String(i7Data.id));
-                    connectivityNode.connectivityNodeContainer = vl;
-                    connectivityNode.nodeNumber = i7Data.id_psse_cape;
+                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), substation.name + "/" + utils_2.getName(i7Data), i7Data.kurzname);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), 'Abzweig', String(i7Data.id));
+                    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);
+                    const baseVoltage = 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) {
@@ -624,6 +653,7 @@ class ConverterI7 {
                     object.standort = integral7.integralStandorte.get(object.standortid);
                     cimModel.addVoltageLevel(vl);
                     cimModel.addConnectivityNode(connectivityNode);
+                    this.checkAnschlussIDs(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.KNOTEN_SO);
                 }
             }
@@ -637,12 +667,13 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SAMMELSCHIENE)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SAMMELSCHIENE, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
-                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
+                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), utils_2.getName(i7Schaltanlagenabschnitt), i7Schaltanlagenabschnitt.kurzname);
                     busbarSection.ipMax = i7Data.limit_ip;
                     busbarSection.aggregate = false;
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.generateUUID(), 'ssab cn');
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
-                    const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
+                    const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (voltageLevel) {
                         busbarSection.equipmentContainer = voltageLevel;
@@ -761,7 +792,7 @@ class ConverterI7 {
                     const connectivityNode = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
                     if (connectivityNode) {
                         connectivityNode.addTerminal(terminal);
-                        terminal.connectivityNode = connectivityNode;
+                        terminal.setConnectivityNode(connectivityNode);
                     }
                     else {
                         this.logger.debug(`Schlaufe ${i7Data.id} besitzt keinen anschluss.`);
@@ -827,8 +858,24 @@ class ConverterI7 {
                     const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Data.nameprimaertyp);
                     synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
                     synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
+                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_1)) {
+                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_1));
+                    }
+                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_2)) {
+                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_2));
+                    }
+                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_3)) {
+                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_3));
+                    }
+                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_4)) {
+                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_4));
+                    }
+                    if (utils_2.convertToNumberI7(i7Data.blocktrafo_5)) {
+                        this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_5));
+                    }
                     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 minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : 0;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
                     const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
                     const maxQvonPmax = utils_2.isNumericI7(i7Data.qmax_von_pmax) ? utils_2.convertToNumberI7(i7Data.qmax_von_pmax) : undefined;
@@ -838,8 +885,8 @@ class ConverterI7 {
                     const powerData = utils_2.getActiveReactivePower(i7Data);
                     const p = powerData[0];
                     const q = powerData[1];
-                    synchronousMachine.p = p;
-                    synchronousMachine.q = q;
+                    synchronousMachine.setActivePower(p * -1);
+                    synchronousMachine.setReactivePower(q * -1);
                     const sr = utils_2.isNumericI7(i7Data.sr) ? utils_2.convertToNumberI7(i7Data.sr) : undefined;
                     if (sr && sr >= 0) {
                         synchronousMachine.ratedS = sr;
@@ -847,9 +894,6 @@ class ConverterI7 {
                     else {
                         synchronousMachine.ratedS = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));
                     }
-                    if (!utils_2.isNumericI7(synchronousMachine.ratedS)) {
-                        console.log();
-                    }
                     const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : undefined;
                     const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
                     synchronousMachine.ratedU = usoll ? usoll : ur;
@@ -876,18 +920,25 @@ class ConverterI7 {
                     cimModel.addReactiveCapabilityCurve(reactiveCapabilityCurve);
                     synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RG_Gen_${i7Data.id}`);
+                    const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Gen_${i7Data.id}`);
                     regulatingControl.enabled = inBetrieb;
                     regulatingControl.targetValue = usoll;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+                            regulatingControl.discrete = false;
+                            regulatingControl.enabled = inBetrieb;
+                            synchronousMachine.controlEnabled = inBetrieb;
                             break;
                         }
                         default: {
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+                            regulatingControl.discrete = false;
+                            regulatingControl.enabled = inBetrieb;
+                            synchronousMachine.controlEnabled = inBetrieb;
                         }
                     }
+                    regulatingControl.addRegulatingCondEq(synchronousMachine);
                     synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
                     const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
                     let generatingUnit;
@@ -936,7 +987,6 @@ class ConverterI7 {
                     if (!generatingUnit) {
                         generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), 'Generator_' + 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;
@@ -971,6 +1021,47 @@ 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));
+                for (const i7Data of result) {
+                    const asynchronousMachine = new AsynchronousMachine_1.AsynchronousMachine(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
+                    asynchronousMachine.efficiency = i7Data.wirkungsgrad * 100;
+                    asynchronousMachine.iaIrRatio = i7Data.ilr_ir;
+                    asynchronousMachine.polePairNumber = i7Data.polpaarz;
+                    asynchronousMachine.ratedMechanicalPower = i7Data.p_mech;
+                    asynchronousMachine.ratedPowerFactor = i7Data.cos_phir;
+                    asynchronousMachine.ratedS = i7Data.sr;
+                    asynchronousMachine.ratedU = i7Data.ur;
+                    asynchronousMachine.setActivePower(i7Data.p0 * -1);
+                    asynchronousMachine.setReactivePower((i7Data.flag_ind === 1 ? i7Data.q0_ind : i7Data.q0_kap) * -1);
+                    asynchronousMachine.controlEnabled = false;
+                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    util_create_1.createSvStatus(cimModel, inBetrieb, asynchronousMachine);
+                    const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                    if (connectivityNode) {
+                        util_create_1.createConnection(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC);
+                        const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
+                        if (equipmentContainer) {
+                            asynchronousMachine.equipmentContainerUUID = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.mrid;
+                            cimModel.addAsynchronousMachine(asynchronousMachine);
+                            this.addIdMapping(i7Data.id, asynchronousMachine.mrid, integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR);
+                        }
+                        else {
+                            this.logger.debug(`AsynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        }
+                    }
+                    else {
+                        this.logger.debug(`AsynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertKraftwerksbloecke(cimModel, knotenSfIDs, energyTypesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
@@ -990,7 +1081,7 @@ class ConverterI7 {
                     const ur = utils_2.isNumericI7(i7Data.urg) ? utils_2.convertToNumberI7(i7Data.urg) : undefined;
                     synchronousMachine.ratedU = ur;
                     synchronousMachine.aggregate = true;
-                    const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RG_KWBlock ${i7Data.id}`);
+                    const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_KWBlock ${i7Data.id}`);
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
@@ -1086,34 +1177,109 @@ class ConverterI7 {
             }
         });
     }
-    convertBoundaryInjections(cimModel, knotenSfIDs) {
+    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));
+                switch (targetClass) {
+                    case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
+                        yield this.convertBoundaryInjections2EquivalentInjection(cimModel, result);
+                        break;
+                    }
+                    case cim_class_names_1.CIM_CLASS_NAMES.ExternalNetworkInjection: {
+                        yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, result);
+                        break;
+                    }
+                    default: {
+                        yield this.convertBoundaryInjections2EquivalentInjection(cimModel, result);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.BOUNDARYINJECTION} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertBoundaryInjections2EquivalentInjection(cimModel, result) {
+        for (const i7Data of result) {
+            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(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);
+            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 kr = 0;
+            this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
+            cimModel.addEquivalentInjection(equivalentInjection);
+            this.addIdMapping(i7Data.id, equivalentInjection.mrid, integral_sql_1.Integral7TableNames.BOUNDARYINJECTION);
+        }
+    }
+    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 kr = 0;
+            externalNetworkInjection.governorSCD = kr;
+            externalNetworkInjection.referencePriority = einspeisePrio;
+            externalNetworkInjection.maxZ0ToZ1Ratio = utils_2.convertToNumberI7(i7Data.z0_z1);
+            const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_BI_${i7Data.id}`);
+            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+            regulatingControl.discrete = true;
+            regulatingControl.enabled = inBetrieb;
+            regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
+            externalNetworkInjection.regulatingControl = regulatingControl;
+            this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
+            cimModel.addExternalNetworkInjection(externalNetworkInjection);
+            cimModel.addRegulatingControl(regulatingControl);
+            this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.BOUNDARYINJECTION);
+        }
+    }
+    convertErsatzLaengszweige(cimModel, knotenSfIDs, defaultValuesConfig) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG)) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, 0, 0, []));
                 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 kr = 0;
-                    externalNetworkInjection.governorSCD = kr;
-                    externalNetworkInjection.referencePriority = einspeisePrio;
-                    externalNetworkInjection.maxZ0ToZ1Ratio = utils_2.convertToNumberI7(i7Data.z0_z1);
-                    const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RG_BI_${i7Data.id}`);
-                    regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                    regulatingControl.discrete = true;
-                    regulatingControl.enabled = inBetrieb;
-                    regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
-                    externalNetworkInjection.regulatingControl = regulatingControl;
-                    this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
-                    cimModel.addExternalNetworkInjection(externalNetworkInjection);
-                    cimModel.addRegulatingControl(regulatingControl);
-                    this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.BOUNDARYINJECTION);
+                    const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
+                        utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
+                        integral_prefix_1.MITTIGER_PUNKT +
+                        utils_2.ueberpruefeZeichenkette(i7Data.kurzname) +
+                        integral_prefix_1.MITTIGER_PUNKT +
+                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
+                        integral_prefix_1.MITTIGER_PUNKT +
+                        utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
+                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(utils_1.getUUID(i7Data.guid), i7Data.bezeichner, 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);
+                    if (baseVoltageUr1) {
+                        equivalentBranch.baseVoltage = baseVoltageUr1;
+                    }
+                    else if (baseVoltageUr2) {
+                        equivalentBranch.baseVoltage = baseVoltageUr2;
+                    }
+                    const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
+                    if (start) {
+                        util_create_1.createConnection(cimModel, equivalentBranch, start, PhaseCode_1.PhaseCode.ABC, 1);
+                    }
+                    else {
+                        this.logger.debug(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
+                    }
+                    const target = cimModel.objects.get(this.integralID2UUID.get(i7Data.eknoten));
+                    if (target) {
+                        util_create_1.createConnection(cimModel, equivalentBranch, target, PhaseCode_1.PhaseCode.ABC, 2);
+                    }
+                    else {
+                        this.logger.debug(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Zielknoten.`);
+                    }
+                    cimModel.addEquivalentBranch(equivalentBranch);
+                    this.addIdMapping(i7Data.id, equivalentBranch.mrid, integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG);
                 }
             }
             else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG} ist nicht vorhanden.`);
             }
         });
     }
@@ -1122,7 +1288,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, knotenSfIDs));
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Data.kommentar);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
@@ -1132,7 +1298,7 @@ class ConverterI7 {
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     let regulatingControl;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RG_Kompdrossel ${i7Data.id}`);
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Kompdrossel ${i7Data.id}`);
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
                         regulatingControl.targetDeadband = i7Data.uband;
@@ -1156,7 +1322,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, knotenSfIDs));
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Data.kommentar);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
@@ -1166,7 +1332,7 @@ class ConverterI7 {
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     let regulatingControl;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RG_Kompkond ${i7Data.id}`);
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_${i7Data.bezeichner}`);
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
                         regulatingControl.enabled = inBetrieb;
@@ -1192,7 +1358,7 @@ class ConverterI7 {
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const regulatingControl = utils_2.createRegulatingControl(`RG_Statcom ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
+                    const regulatingControl = utils_2.createRegulatingControl(`RC_Statcom ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
                     const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
                     regulatingControl.targetValue = uref;
@@ -1232,7 +1398,7 @@ class ConverterI7 {
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const regulatingControl = utils_2.createRegulatingControl(`RG_SVC ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
+                    const regulatingControl = utils_2.createRegulatingControl(`RC_SVC ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
                     const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
                     regulatingControl.targetValue = uref;
@@ -1265,7 +1431,7 @@ class ConverterI7 {
             }
         });
     }
-    convertCsConverterDC(cimModel, knotenSfIDs) {
+    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));
@@ -1309,7 +1475,7 @@ class ConverterI7 {
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     util_create_1.createSvStatus(cimModel, inBetrieb, csConverter);
                     if (acConnectivityNode) {
-                        this.createConnection(cimModel, csConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
+                        csConverter.pccTerminal = this.createConnection(cimModel, csConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
                     }
                     else {
                         this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
@@ -1327,12 +1493,13 @@ class ConverterI7 {
                     cimModel.addCSConverter(csConverter);
                     cimModel.addDCNode(dcNode);
                     cimModel.addACDCConverterDCTerminal(acDCConverterDCTerminal);
+                    this.checkAnschlussIDs(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, csConverter.mrid, integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH);
                 }
             }
         });
     }
-    convertVsConverterDC(cimModel, knotenSfIDs) {
+    convertVsConverterDC(cimModel, integral7, knotenSfIDs) {
         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));
@@ -1355,7 +1522,7 @@ class ConverterI7 {
                     const vsConverter = new VsConverter_1.VsConverter(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     vsConverter.equipmentContainer = dcConverterUnit;
                     vsConverter.baseS = i7Data.pr;
-                    vsConverter.ratedUdc = i7Data.ur;
+                    utils_2.isNumericI7(i7Data.udc) ? vsConverter.ratedUdc = i7Data.udc : vsConverter.ratedUdc = i7Data.ur;
                     vsConverter.idleLoss = i7Data.p_leer;
                     vsConverter.maxUdc = vsConverter.ratedUdc * 1.05;
                     vsConverter.minUdc = vsConverter.ratedUdc * 0.95;
@@ -1379,7 +1546,7 @@ class ConverterI7 {
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     util_create_1.createSvStatus(cimModel, inBetrieb, vsConverter);
                     if (acConnectivityNode) {
-                        util_create_1.createConnection(cimModel, vsConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, 1);
+                        vsConverter.pccTerminal = 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.`);
@@ -1389,11 +1556,14 @@ class ConverterI7 {
                     const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), 'ACDCConvTerminal');
                     acDCConverterDCTerminal.sequenceNumber = 1;
                     acDCConverterDCTerminal.dCConductingEquipmentUUID = vsConverter.mrid;
-                    acDCConverterDCTerminal.dcNodeUUID = dcNode.mrid;
+                    acDCConverterDCTerminal.dcNode = dcNode;
+                    vsConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
+                    dcNode.dcTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     cimModel.addDCConverterUnit(dcConverterUnit);
                     cimModel.addVSConverter(vsConverter);
                     cimModel.addDCNode(dcNode);
                     cimModel.addACDCConverterDCTerminal(acDCConverterDCTerminal);
+                    this.checkAnschlussIDs(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, vsConverter.mrid, integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC);
                 }
             }
@@ -1453,6 +1623,7 @@ class ConverterI7 {
                     const powerData = utils_2.getActiveReactivePower(i7Data);
                     externalNetworkInjection.p = powerData[0];
                     externalNetworkInjection.q = powerData[1];
+                    externalNetworkInjection.controlEnabled = false;
                     this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data);
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
@@ -1498,7 +1669,7 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), 'Querkupplung');
-                    bay.number = i7Data.feldnummer;
+                    bay.number = i7Data.feldnummer + '';
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (voltageLevel) {
@@ -1529,7 +1700,7 @@ class ConverterI7 {
                 for (const i7Data of result) {
                     const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    bay.number = i7Data.feldnummer;
+                    bay.number = i7Data.feldnummer + '';
                     bay.locationID = i7Data.ips_folder_id;
                     if (voltageLevel) {
                         bay.voltageLevel = voltageLevel;
@@ -1605,7 +1776,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNERFI_3P)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNERFI_3P, containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.generateUUID(), i7Data.bezeichner);
+                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), i7Data.bezeichner);
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNERFI_3P);
@@ -1637,7 +1808,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker(utils_1.generateUUID(), i7Data.bezeichner);
+                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), i7Data.bezeichner);
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -1685,6 +1856,64 @@ class ConverterI7 {
             }
         });
     }
+    convertLaengsdrosseln(cimModel, knotenSfIDs, defaultValuesConfig) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL)) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.LAENGSDROSSEL, 0, 0, []));
+                for (const i7Data of result) {
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', '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);
+                    }
+                    else {
+                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
+                    }
+                    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);
+                    }
+                    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 i = 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;
+                    if (i > 0 && ukr > 0) {
+                        const voltage = baseVoltage.nominalVoltage.value * 1000;
+                        const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * i * Math.sqrt(3));
+                        seriesCompensator.x = z;
+                    }
+                    seriesCompensator.varistorRatedCurrent = i;
+                    const terminal = startTerminal;
+                    if (terminal) {
+                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal.mrid, i);
+                    }
+                    else {
+                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
+                    }
+                    const vlObject = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(startTerminal.connectivityNode.getConnectivityNodeContainerUUID()));
+                    if (vlObject) {
+                        seriesCompensator.equipmentContainer = vlObject;
+                        seriesCompensator.baseVoltage = baseVoltage;
+                    }
+                    else {
+                        this.logger.debug(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
+                    }
+                    const psrType = utils_1.createIfNotExitsPSRType(cimModel, 'Längsdrossel');
+                    seriesCompensator.psrTypeUUID = psrType.mrid;
+                    cimModel.addSeriesCompensator(seriesCompensator);
+                    this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSDROSSEL);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSDROSSEL} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertBetriebsmitteltypenKdrossel() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KDROSSEL)) {
@@ -1709,6 +1938,14 @@ class ConverterI7 {
                             stpSchieneIDs.push(i7DataSchiene.id);
                             const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), utils_2.getName(i7DataSchiene), `StpSchiene_${i7DataSchiene.id}`);
                             const junction = new Junction_1.Junction(utils_1.generateUUID(), `StpSchiene/${i7DataSchiene.id}`, `${i7DataSchiene.bezeichner}`);
+                            const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
+                            if (equipmentContainer) {
+                                equipmentContainer.addEquipment(junction);
+                                junction.equipmentContainer = equipmentContainer;
+                            }
+                            else {
+                                this.logger.debug(`Sternpunktschiene ${i7DataSchiene.id} besitzt keinen EquipmentContainer.`);
+                            }
                             const terminal = this.createConnection(cimModel, junction, connectivityNode, PhaseCode_1.PhaseCode.N, true);
                             integral7.sternPunktImpModel.connectivityNodes.set(connectivityNode.mrid, connectivityNode);
                             integral7.sternPunktImpModel.junctions.set(junction.mrid, junction);
@@ -1780,13 +2017,13 @@ class ConverterI7 {
             }));
         });
     }
-    convertStpSchaltelemente(integral7, stpScheinenID) {
+    convertStpSchaltelemente(integral7, stpSchienenID) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 try {
                     if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER)) {
-                        if (stpScheinenID.length) {
-                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, stpScheinenID));
+                        if (stpSchienenID.length) {
+                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, stpSchienenID));
                             for (const i7Data of result) {
                                 const terminal = integral7.sternPunktImpModel.stpSchieneTerminal.get(i7Data.eknoten);
                                 if (terminal) {
@@ -1813,6 +2050,36 @@ 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));
+                for (const i7Data of result) {
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, 'Laengskupplung');
+                    const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
+                    bay.number = i7Data.feldnummer + '';
+                    bay.locationID = i7Data.ips_folder_id;
+                    if (voltageLevel) {
+                        bay.voltageLevel = voltageLevel;
+                        voltageLevel.addBay(bay);
+                        const i7Schluessel = voltageLevel.description +
+                            '/LK-' +
+                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                        bay.description = i7Schluessel;
+                    }
+                    else {
+                        this.logger.debug(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
+                    }
+                    integral7.laengskupplungIDs.push(i7Data.id);
+                    this.addIdMapping(i7Data.id, bay.mrid, integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG);
+                    cimModel.addBay(bay);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertBetriebsmitteltypenLeitung() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG)) {
@@ -1851,21 +2118,33 @@ class ConverterI7 {
         object.c0 = +data.c0;
         object.ratedCurrent = +data.ir;
     }
-    convertLeitungen(cimModel, integral7, defaultValuesConfig) {
-        var _a, _b;
+    convertLeitungen(frame, integral7, defaultValuesConfig) {
+        var _a, _b, _c;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) && integral7.leitungsAnschlussIDs.length) {
-                const limit = 3000;
+                const cimModel = frame.cimModel;
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEITUNG, integral7.leitungsAnschlussIDs));
                 const leitungIDs = result.map(elem => elem.id);
-                const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STROMKREISABSCHNITT, leitungIDs));
+                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, leitungIDs));
                 for (const i7Data of result) {
                     const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
                     if (!(stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length))
                         continue;
                     const leitung = new Leitung_1.LeitungImpl(i7Data);
                     integral7.integralLeitungen.set(i7Data.id, leitung);
-                    const i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
+                    let i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.kurzname) +
@@ -1873,81 +2152,135 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const name = integral_prefix_1.LEITUNG_PRAEFIX +
+                    let name = integral_prefix_1.LEITUNG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
-                        integral_prefix_1.MITTIGER_PUNKT +
+                        '-' +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
-                        integral_prefix_1.MITTIGER_PUNKT +
+                        '-' +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const line = new Line_1.Line(utils_1.getUUID(i7Data.guid), i7Data.name);
-                    const acLineSegments = [];
+                    const line = new AMPRIONLine_1.AMPRIONLine(utils_1.getUUID(i7Data.guid), name, 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) +
+                            '-' +
+                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
+                            '-' +
+                            utils_2.ueberpruefeZeichenkette(stk.bezeichner);
                         const acLineSegment = new ACLineSegment_1.ACLineSegment(utils_1.generateUUID(), name, i7Data.stkabname, i7Schluessel);
-                        this.setACLineSegmentProperties(cimModel, acLineSegment, stk, defaultValuesConfig);
-                        acLineSegment.description = stk.nametyp;
                         acLineSegment.equipmentContainer = line;
                         line.addEquipment(acLineSegment);
                         acLineSegments.push(acLineSegment);
                         this.addIdMapping(stk.id, acLineSegment.mrid, integral_sql_1.Integral7TableNames.LEITUNG);
-                        cimModel.addACLineSegment(acLineSegment);
                     }
-                    cimModel.addLine(line);
+                    let tmp_sequence_number = 1;
+                    const acLineSegmentStart = acLineSegments[0];
+                    const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC, tmp_sequence_number);
+                    let equivalentInjection = undefined;
+                    if (startTerminal) {
+                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegmentStart, acLineSegmentStart.description, startTerminal);
+                        tmp_sequence_number++;
+                        let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
+                        let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(startTerminal.getConnectivityNodeUUID());
+                        if (tmp_cn && tmp_cn.boundaryPoint) {
+                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                        }
+                        if (!acLineSegmentStart.baseVoltage) {
+                            if (startTerminal.getConnectedNode())
+                                acLineSegmentStart.baseVoltage = (_a = startTerminal.getConnectivityNode()) === null || _a === void 0 ? void 0 : _a.getBaseVoltage();
+                            if (!acLineSegmentStart.baseVoltage) {
+                                this.logger.debug(`(acLineSegmentStart) Anschlussknoten ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)} besitzt keine Spannungsangabe in Knotenspannungen Map.`);
+                            }
+                        }
+                    }
+                    else {
+                        this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
+                    }
+                    cimModel.addACLineSegment(acLineSegmentStart);
                     const anzahl = acLineSegments.length;
+                    let tmp_terminal = undefined;
                     for (let i = 0; i < anzahl - 1; i++) {
                         const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), 'CN_Lt');
                         const acLineSegment1 = acLineSegments[i];
-                        const t1 = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
-                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegment1, acLineSegment1.description, t1);
+                        tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true, tmp_sequence_number);
+                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegment1, acLineSegment1.description, tmp_terminal);
+                        cimModel.addACLineSegment(acLineSegment1);
+                        if (tmp_terminal) {
+                            tmp_sequence_number++;
+                            tmp_terminal = undefined;
+                        }
+                        this.setACLineSegmentProperties(cimModel, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
                         const acLineSegment2 = acLineSegments[i + 1];
-                        const t2 = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true);
-                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegment2, acLineSegment2.description, t2);
+                        tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true, tmp_sequence_number);
+                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegment2, acLineSegment2.description, tmp_terminal);
+                        cimModel.addACLineSegment(acLineSegment1);
+                        if (tmp_terminal) {
+                            tmp_sequence_number++;
+                            tmp_terminal = undefined;
+                        }
                         cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
                         cimModel.addConnectivityNode(cn);
                     }
-                    const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
-                    const acLineSegmentStart = acLineSegments[0];
-                    if (start) {
-                        const terminal = this.createConnection(cimModel, acLineSegmentStart, start, PhaseCode_1.PhaseCode.ABC, acLineSegmentStart.terminalsUUIDs.length + 1);
-                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegmentStart, acLineSegmentStart.description, terminal);
-                        if (!acLineSegmentStart.baseVoltage) {
-                            acLineSegmentStart.baseVoltage = (_a = terminal === null || terminal === void 0 ? void 0 : terminal.connectivityNode) === null || _a === void 0 ? void 0 : _a.getBaseVoltage();
-                            ;
-                        }
-                    }
-                    else {
-                        this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
-                    }
-                    const target = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
                     const acLineSegmentZiel = acLineSegments[anzahl - 1];
-                    if (target) {
-                        const terminal = this.createConnection(cimModel, acLineSegmentZiel, target, PhaseCode_1.PhaseCode.ABC, acLineSegmentStart.terminalsUUIDs.length + 2);
-                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegmentZiel, acLineSegmentZiel.description, terminal);
+                    const targetTerminal = this.createBoundaryConnection(frame, acLineSegmentZiel, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC, tmp_sequence_number);
+                    if (targetTerminal) {
+                        this.setACLineSegmentCurrentLimt(cimModel, acLineSegmentZiel, acLineSegmentZiel.description, targetTerminal);
+                        let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten));
+                        let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(targetTerminal.getConnectivityNodeUUID());
+                        if (tmp_cn && 'boundaryPoint' in tmp_cn && tmp_cn.boundaryPoint) {
+                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                        }
                         if (!acLineSegmentZiel.baseVoltage) {
-                            acLineSegmentZiel.baseVoltage = (_b = terminal === null || terminal === void 0 ? void 0 : terminal.connectivityNode) === null || _b === void 0 ? void 0 : _b.getBaseVoltage();
+                            acLineSegmentZiel.baseVoltage = (_b = targetTerminal.getConnectivityNode()) === null || _b === void 0 ? void 0 : _b.getBaseVoltage();
+                            if (!acLineSegmentZiel.baseVoltage) {
+                                this.logger.debug(`(acLineSegmentZiel) Anschlussknoten ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)} besitzt keine Spannungsangabe in Knotenspannungen Map.`);
+                            }
                         }
                     }
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentZiel.mrid} besitzt keinen Zielknoten.`);
                     }
+                    cimModel.addACLineSegment(acLineSegmentZiel);
                     const stkBaseVoltage = acLineSegments.find(elem => elem.baseVoltage !== undefined);
                     if (!stkBaseVoltage) {
-                        this.logger.error(`Leitung ${i7Data.id}: Spannung konnte nicht bestimmt werden.`);
-                        continue;
+                        this.logger.error(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid}: Spannung konnte nicht bestimmt werden.`);
                     }
-                    for (const acLineSegment of acLineSegments) {
-                        acLineSegment.baseVoltage = stkBaseVoltage.baseVoltage;
-                        for (const terminal of acLineSegment.terminals.values()) {
-                        }
-                        const terminals = [...acLineSegment.terminals.values()];
-                        for (let i = 0; i < terminals.length; i++) {
-                            let terminal = terminals[i];
-                            if (terminal)
-                                terminal.sequenceNumber = i + 1;
+                    else {
+                        for (const acLineSegment of acLineSegments) {
+                            acLineSegment.baseVoltage = stkBaseVoltage.baseVoltage;
+                        }
+                        if (equivalentInjection) {
+                            equivalentInjection.baseVoltage = stkBaseVoltage.baseVoltage;
+                        }
+                    }
+                    let idx = 0;
+                    while (idx < acLineSegments.length && !(line.subGeographicalRegion)) {
+                        let jdx = 0;
+                        let values = acLineSegments[idx].terminals.values();
+                        let tmp_terminal = values.next();
+                        while (tmp_terminal.value && !(line.subGeographicalRegion)) {
+                            let terminal = tmp_terminal.value;
+                            const connectivityNodeContainer = (_c = terminal.connectivityNode) === null || _c === void 0 ? void 0 : _c.connectivityNodeContainer;
+                            if (connectivityNodeContainer && !(connectivityNodeContainer instanceof Line_1.Line)) {
+                                const substation = this.determineEquipmentContainer('Substation', cimModel, connectivityNodeContainer);
+                                if (substation) {
+                                    line.subGeographicalRegion = substation.subGeographicalRegion;
+                                    substation.subGeographicalRegion.addLine(line);
+                                }
+                            }
+                            else {
+                                this.logger.error(`Leitung ${line.getUUID()} with Terminal ${terminal.getUUID()}: ConnectivityNode konnte nicht bestimmt werden.`);
+                            }
+                            tmp_terminal = values.next();
                         }
+                        idx++;
+                    }
+                    cimModel.addLine(line);
+                    this.addIdMapping(i7Data.id, line.getUUID(), integral_sql_1.Integral7TableNames.LEITUNG);
+                    if (!line.subGeographicalRegion) {
+                        this.logger.error(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid}: SubGeographicalRegion konnte nicht bestimmt werden.`);
                     }
-                    const region = utils_1.createIfNotExitsGeoregionByName(cimModel, defaultValuesConfig.GeographicalRegion.name);
-                    const subregion = utils_1.createIfNotExitsSubGeoregionByName(cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
-                    line.subGeographicalRegion = subregion;
                 }
             }
             else {
@@ -1979,7 +2312,7 @@ class ConverterI7 {
                         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);
+                    const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, ur, this.exportFramesBoundary);
                     const i = utils_2.isNumericI7(i7Data.ir) ? utils_2.convertToNumberI7(i7Data.ir) : undefined;
                     const ukr = utils_2.isNumericI7(i7Data.ukr) ? utils_2.convertToNumberI7(i7Data.ukr) : undefined;
                     if (i > 0 && ukr > 0) {
@@ -2024,14 +2357,10 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data['guid_dcline']), 'DCLine');
-                    const i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
-                        utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
-                        integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.kurzname) +
-                        integral_prefix_1.MITTIGER_PUNKT +
+                    const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data['guid_dcline']), i7Data.bezeichner);
+                    const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.getUUID(i7Data.guid), i7Data.bezeichner, i7Data.kurzname, i7Schluessel);
+                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.generateUUID(), i7Data.bezeichner, i7Data.id.toString(), i7Schluessel);
                     dcLineSegment.resistance = i7Data.rdc;
                     dcLineSegment.equipmentContainer = dcLine;
                     const bipol = utils_2.convertToBooleanI7(i7Data.bipol);
@@ -2039,16 +2368,22 @@ class ConverterI7 {
                     const acDCConverterTarget = cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt));
                     const converterUnitStart = (_a = acDCConverterStart) === null || _a === void 0 ? void 0 : _a.equipmentContainer;
                     const converterUnitTarget = (_b = acDCConverterTarget) === null || _b === void 0 ? void 0 : _b.equipmentContainer;
-                    switch (bipol) {
-                        case (true): {
-                            converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
-                            converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
-                        }
-                        default: {
-                            converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
-                            converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
+                    if (converterUnitStart && converterUnitTarget) {
+                        switch (bipol) {
+                            case (true): {
+                                converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
+                                converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
+                                break;
+                            }
+                            default: {
+                                converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
+                                converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
+                            }
                         }
                     }
+                    else {
+                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r Konverter konnte nicht ermittelt werden.`);
+                    }
                     const startDCNode = getDCNodeFromConverter(acDCConverterStart);
                     if (startDCNode) {
                         const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), 'DCTerminal_HGÜ_Leitung');
@@ -2056,18 +2391,20 @@ class ConverterI7 {
                         dcTerminal.sequenceNumber = 1;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = startDCNode;
+                        startDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         cimModel.addDCTerminal(dcTerminal);
                     }
                     else {
                         this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
                     }
-                    const tartgetDCNode = getDCNodeFromConverter(acDCConverterTarget);
-                    if (tartgetDCNode) {
+                    const targetDCNode = getDCNodeFromConverter(acDCConverterTarget);
+                    if (targetDCNode) {
                         const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), 'DCTerminal_HGÜ_Leitung');
                         dcTerminal.connected = true;
                         dcTerminal.sequenceNumber = 2;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
-                        dcTerminal.dcNode = tartgetDCNode;
+                        dcTerminal.dcNode = targetDCNode;
+                        targetDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         cimModel.addDCTerminal(dcTerminal);
                     }
                     else {
@@ -2149,10 +2486,11 @@ class ConverterI7 {
             }
         });
     }
-    convertTrafo2W(cimModel, integral7, defaultValuesConfig, standortIDs) {
+    convertTrafo2W(frame, integral7, defaultValuesConfig, standortIDs) {
         var _a;
         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 trafoIDs = result.map(obj => obj['id']);
                 const sternpunktKnotenMap = new Map();
@@ -2175,6 +2513,13 @@ class ConverterI7 {
                         this.logger.debug(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
                     const powerTransformerInfo = this.cimModelDefault.getPowerTransformerInfoByName(i7Data.nametyp);
+                    if (this.blocktransformatoren.includes(utils_2.convertToNumberI7(i7Data.id))) {
+                        powerTransformer.isPartOfGeneratorUnit = true;
+                    }
+                    else {
+                        powerTransformer.isPartOfGeneratorUnit = false;
+                    }
+                    const schaltgruppe = i7Data.schaltgr;
                     const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1${powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     const pkr = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '');
@@ -2186,16 +2531,24 @@ class ConverterI7 {
                     const iLeer = utils_2.isNumericI7(i7Data.i_leer) ? utils_2.convertToNumberI7(i7Data.i_leer) : 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, p0) * 1000000;
-                    powerTransformerEnd1.b = utils_2.calculateB(ur, sr, iLeer, p0) * 1000000;
+                    powerTransformerEnd1.g = utils_2.calculateG(ur, p0);
+                    powerTransformerEnd1.b = utils_2.calculateB(ur, sr, iLeer, p0);
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
-                    const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
-                    const startTerminal = start ? this.createConnection(cimModel, powerTransformer, start, PhaseCode_1.PhaseCode.ABC, true, 1) : undefined;
+                    const startTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC, 1);
                     if (!startTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    this.setPowerTransformerEndProperties(cimModel, powerTransformerEnd1, powerTransformer, startTerminal, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
-                    const schaltgruppe = i7Data.schaltgr;
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, startTerminal, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
+                    let equivalentInjection = undefined;
+                    if (startTerminal) {
+                        let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
+                        let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(startTerminal.getConnectivityNodeUUID());
+                        if (tmp_cn && tmp_cn.boundaryPoint) {
+                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            let baseVoltage = powerTransformerEnd1.getBaseVoltage();
+                            equivalentInjection.baseVoltage = baseVoltage;
+                        }
+                    }
                     const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2${powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     const sr2 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
@@ -2204,16 +2557,24 @@ class ConverterI7 {
                     powerTransformerEnd2.x = 0;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
-                    const ir2 = (sr * Math.pow(10, 6) / ur * 1000) / Math.sqrt(3);
-                    const ziel = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
-                    const zielTerminal = ziel ? this.createConnection(cimModel, powerTransformer, ziel, PhaseCode_1.PhaseCode.ABC, true, 2) : undefined;
+                    const ir2 = (sr * Math.pow(10, 6) / ur2 * 1000) / Math.sqrt(3);
+                    const zielTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC, 2);
                     if (!zielTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Zielknoten.`);
-                    this.setPowerTransformerEndProperties(cimModel, powerTransformerEnd2, powerTransformer, zielTerminal, sternpunktKnotenMap, integral7, ir2, i7Data, defaultValuesConfig);
-                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU]);
-                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU]);
-                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU]);
-                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU]);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, zielTerminal, sternpunktKnotenMap, integral7, ir2, i7Data, defaultValuesConfig);
+                    if (zielTerminal) {
+                        let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
+                        let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(zielTerminal.getConnectivityNodeUUID());
+                        if (tmp_cn && tmp_cn.boundaryPoint) {
+                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            let baseVoltage = powerTransformerEnd2.getBaseVoltage();
+                            equivalentInjection.baseVoltage = baseVoltage;
+                        }
+                    }
+                    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);
                     powerTransformer.sortTransformerEnd('ratedU', 'desc');
                     const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2];
                     const terminals = [startTerminal, zielTerminal];
@@ -2243,9 +2604,8 @@ class ConverterI7 {
                             }
                         }
                     }
-                    for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
-                        const powerTransformerEnd = powerTransformer.powerTransformerEnds[i];
-                        powerTransformerEnd.endNumber = i + 1;
+                    for (let i = 1; i <= powerTransformer.powerTransformerEnds.length; i++) {
+                        powerTransformer.powerTransformerEnds[i - 1].endNumber = i;
                     }
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
@@ -2258,9 +2618,11 @@ class ConverterI7 {
             }
         });
     }
-    convertTrafo3W(cimModel, integral7, defaultValuesConfig, standortIDs) {
+    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 trafoIDs = result.map(obj => obj['id']);
                 const trafoWicklungen = new Map();
@@ -2276,10 +2638,13 @@ class ConverterI7 {
                     this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG} ist nicht vorhanden.`);
                 }
                 const sternpunktKnotenMap = new Map();
-                if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN) && trafoWicklungIDs.length) {
-                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, trafoWicklungIDs));
+                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) {
-                        sternpunktKnotenMap.set(spKnoten.netzobjekt, spKnoten);
+                        (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
                     }
                 }
                 for (const i7Data of result) {
@@ -2292,6 +2657,13 @@ class ConverterI7 {
                         this.logger.debug(`Trafo3W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
                     const powerTransformerInfo = this.cimModelDefault.getPowerTransformerInfoByName(i7Data.nametyp);
+                    const schaltgruppe = i7Data.schaltgr;
+                    if (this.blocktransformatoren.includes(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');
@@ -2304,100 +2676,91 @@ class ConverterI7 {
                     const ur1 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 1);
                     const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 2);
                     const ur3 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 3);
-                    const ir1 = sr1 * 1000000 / ((ur1 * 1000) * Math.sqrt(3));
-                    const ir2 = sr2 * 1000000 / ((ur2 * 1000) * Math.sqrt(3));
-                    const ir3 = sr3 * 1000000 / ((ur3 * 1000) * Math.sqrt(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, pLeer, iLeer);
-                    const impedanzW3 = utils_trafo3w_1.calculateImpedanzenTrafo3W(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
-                    const schaltgruppe = i7Data.schaltgr;
+                    const impedanzW2 = utils_trafo3w_1.calculateImpedanzenTrafo3W(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
+                    const impedanzW3 = utils_trafo3w_1.calculateImpedanzenTrafo3W(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
                     const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1 ${powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     const wicklung1 = trafoWicklungen.get(i7Data.trafowicklung3w1);
-                    const knotenUUID = this.integralID2UUID.get(wicklung1.aknoten);
-                    const start = cimModel.getObject(knotenUUID);
-                    const terminal1 = start ? this.createConnection(cimModel, powerTransformer, start, PhaseCode_1.PhaseCode.ABC, true, 1) : undefined;
+                    const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, PhaseCode_1.PhaseCode.ABC, 1);
                     if (!terminal1)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                     powerTransformerEnd1.r = impedanzW1.r;
                     powerTransformerEnd1.x = impedanzW1.x;
-                    powerTransformerEnd1.g = impedanzW1.g * 1000000;
-                    powerTransformerEnd1.b = impedanzW1.b * 1000000;
+                    powerTransformerEnd1.g = impedanzW1.g;
+                    powerTransformerEnd1.b = impedanzW1.b;
                     powerTransformerEnd1.ratedU = ur1;
                     powerTransformerEnd1.ratedS = sr1;
-                    this.setBaseVoltagePowerTransformerEnd(cimModel, powerTransformerEnd1);
-                    powerTransformerEnd1.powerTransformer = powerTransformer;
-                    powerTransformer.addPowerTransformerEnd(powerTransformerEnd1);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, terminal1, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
+                    let equivalentInjection = undefined;
                     if (terminal1) {
-                        powerTransformerEnd1.terminal = terminal1;
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + powerTransformer.name, terminal1, ir1);
-                        if (sternpunktKnotenMap.has(wicklung1.id)) {
-                            this.convertTrafoGrounding(cimModel, powerTransformer, powerTransformerEnd1, integral7, sternpunktKnotenMap.get(wicklung1.id), defaultValuesConfig);
+                        let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(wicklung1.aknoten));
+                        let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(terminal1.getConnectivityNodeUUID());
+                        if (tmp_cn && tmp_cn.boundaryPoint) {
+                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            let baseVoltage = powerTransformerEnd1.getBaseVoltage();
+                            equivalentInjection.baseVoltage = baseVoltage;
                         }
                     }
-                    else {
-                        this.logger.debug(`Wicklung3W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
-                    }
+                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
+                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
                     const wicklung2 = trafoWicklungen.get(i7Data.trafowicklung3w2);
-                    const start2 = cimModel.getObject(this.integralID2UUID.get(wicklung2.aknoten));
-                    const terminal2 = start ? this.createConnection(cimModel, powerTransformer, start2, PhaseCode_1.PhaseCode.ABC, true, 2) : undefined;
+                    const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC, 2);
                     if (!terminal2)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                     const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     powerTransformerEnd2.r = impedanzW2.r;
                     powerTransformerEnd2.x = impedanzW2.x;
-                    powerTransformerEnd2.g = impedanzW2.g * 1000000;
-                    powerTransformerEnd2.b = impedanzW2.b * 1000000;
+                    powerTransformerEnd2.g = impedanzW2.g;
+                    powerTransformerEnd2.b = impedanzW2.b;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
-                    this.setBaseVoltagePowerTransformerEnd(cimModel, powerTransformerEnd2);
                     powerTransformerEnd2.powerTransformer = powerTransformer;
-                    powerTransformer.addPowerTransformerEnd(powerTransformerEnd2);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, terminal2, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
+                    equivalentInjection = undefined;
                     if (terminal2) {
-                        powerTransformerEnd2.terminal = terminal2;
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + powerTransformer.name, terminal2, ir2);
-                        if (sternpunktKnotenMap.has(wicklung2.id)) {
-                            this.convertTrafoGrounding(cimModel, powerTransformer, powerTransformerEnd2, integral7, sternpunktKnotenMap.get(wicklung2.id), defaultValuesConfig);
+                        let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(wicklung2.aknoten));
+                        let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(terminal2.getConnectivityNodeUUID());
+                        if (tmp_cn && tmp_cn.boundaryPoint) {
+                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            let baseVoltage = powerTransformerEnd2.getBaseVoltage();
+                            equivalentInjection.baseVoltage = baseVoltage;
                         }
                     }
-                    else {
-                        this.logger.debug(`Wicklung3W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
-                    }
+                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
+                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     const wicklung3 = trafoWicklungen.get(i7Data.trafowicklung3w3);
-                    const start3 = cimModel.getObject(this.integralID2UUID.get(wicklung2.aknoten));
-                    const terminal3 = start ? this.createConnection(cimModel, powerTransformer, start3, PhaseCode_1.PhaseCode.ABC, true, 3) : undefined;
+                    const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC, 3);
                     if (!terminal3)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                     const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer.name}`);
                     powerTransformerEnd3.endNumber = 3;
                     powerTransformerEnd3.r = impedanzW3.r;
                     powerTransformerEnd3.x = impedanzW3.x;
-                    powerTransformerEnd3.g = impedanzW3.g * 1000000;
-                    powerTransformerEnd3.b = impedanzW3.b * 1000000;
+                    powerTransformerEnd3.g = impedanzW3.g;
+                    powerTransformerEnd3.b = impedanzW3.b;
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
-                    this.setBaseVoltagePowerTransformerEnd(cimModel, powerTransformerEnd3);
                     powerTransformerEnd3.powerTransformer = powerTransformer;
-                    powerTransformer.addPowerTransformerEnd(powerTransformerEnd3);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd3, powerTransformer, terminal3, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
+                    equivalentInjection = undefined;
                     if (terminal3) {
-                        powerTransformerEnd3.terminal = terminal3;
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + powerTransformer.name, terminal3, ir3);
-                        if (sternpunktKnotenMap.has(wicklung3.id)) {
-                            this.convertTrafoGrounding(cimModel, powerTransformer, powerTransformerEnd3, integral7, sternpunktKnotenMap.get(wicklung3.id), defaultValuesConfig);
+                        let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(wicklung3.aknoten));
+                        let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(terminal3.getConnectivityNodeUUID());
+                        if (tmp_cn && tmp_cn.boundaryPoint) {
+                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            let baseVoltage = powerTransformerEnd3.getBaseVoltage();
+                            equivalentInjection.baseVoltage = baseVoltage;
                         }
                     }
-                    else {
-                        this.logger.debug(`Wicklung3W ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Terminalinstanz.`);
-                    }
-                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
-                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
-                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
-                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
-                    powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
-                    powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
+                    powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
+                    powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd3.endNumber);
                     powerTransformer.sortTransformerEnd('ratedU', 'desc');
                     const terminals = [terminal1, terminal2, terminal3];
                     const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2, powerTransformerEnd3];
@@ -2427,8 +2790,8 @@ class ConverterI7 {
                             }
                         }
                     }
-                    for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
-                        powerTransformer.powerTransformerEnds[i].endNumber = i + 1;
+                    for (let i = 1; i <= powerTransformer.powerTransformerEnds.length; i++) {
+                        powerTransformer.powerTransformerEnds[i - 1].endNumber = i;
                     }
                     cimModel.addPowerTransformer(powerTransformer);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
@@ -2444,7 +2807,7 @@ class ConverterI7 {
     }
     setTransformerEndInfoProperties(wicklung, data, endNumber) {
         const minstufe = `minstufe_s${endNumber}`;
-        const mittelstufe = `mittelstufe_s${endNumber}`;
+        const neutralstufe = `mittelstufe_s${endNumber}`;
         const maxstufe = `maxstufe_s${endNumber}`;
         const umax = `umax_s${endNumber}`;
         const umin = `umin_s${endNumber}`;
@@ -2454,14 +2817,15 @@ class ConverterI7 {
         wicklung.ratedU = new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
         wicklung.tapActive = utils_2.convertToBooleanI7(data[gestufte_seite]);
         const tapChangerInfo = new TapChangerInfo_1.TapChangerInfo(utils_1.generateUUID(), `TapChangerInfo_${data['id']}`);
-        tapChangerInfo.highStep = data[maxstufe];
-        tapChangerInfo.lowStep = data[minstufe];
-        tapChangerInfo.neutralStep = data[mittelstufe];
+        tapChangerInfo.highStep = utils_2.convertToNumberI7(data[maxstufe]);
+        tapChangerInfo.lowStep = utils_2.convertToNumberI7(data[minstufe]);
+        tapChangerInfo.neutralStep = utils_2.convertToNumberI7(data[neutralstufe]);
         wicklung.uMax = data[umax];
         wicklung.uMin = data[umin];
     }
-    transformBoundaryModel(cimModel, defaultValuesConfig) {
+    transformBoundaryModel(frame, masFrame) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const cimModel = frame.cimModel;
             const substations = Array.from(cimModel.substations.values());
             for (const substation of substations) {
                 const line = new Line_1.Line(substation.mrid, substation.name, substation.shortName, substation.description);
@@ -2503,84 +2867,149 @@ class ConverterI7 {
                     equipment.equipmentContainer = undefined;
                     cimModel.removeObject(equipment);
                 }
+                let cnt = 1;
                 for (const connectivityNode of connectivityNodes) {
                     connectivityNode.connectivityNodeContainer = line;
                     line.addConnectivityNode(connectivityNode);
+                    const junction = new Junction_1.Junction(utils_1.generateUUID(), `${line.name} BD_Junc`, `Junction`, 'Junction for Geo');
+                    junction.equipmentContainer = line;
+                    const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'boundary_junction_label', 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
+                    terminal.conductingEquipment = junction;
+                    terminal.connectivityNode = connectivityNode;
+                    junction.terminals.set(terminal.getUUID(), terminal);
+                    line.addEquipment(junction);
+                    const location = substation.location;
+                    if (location) {
+                        const clonedLocation = new Location_1.Location(utils_1.generateUUID(), `Location ${cnt}`);
+                        clonedLocation.addPowerSystemResource(junction);
+                        clonedLocation.coordinateSystem = location.coordinateSystem;
+                        const clonedPositionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID(), `PositionPoint ${cnt}`);
+                        clonedPositionPoint.xPosition = location.positionPoints[0].xPosition;
+                        clonedPositionPoint.yPosition = location.positionPoints[0].yPosition;
+                        clonedPositionPoint.location = clonedLocation;
+                        clonedLocation.addPositionPoint(clonedPositionPoint);
+                        masFrame.cimModel.addLocation(clonedLocation);
+                    }
+                    if (location && location.powerSystemResources.size && location.powerSystemResources.get(substation.mrid) !== undefined) {
+                        location.addPowerSystemResource(junction);
+                        junction.location = location;
+                        masFrame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ_BD, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
+                        location.powerSystemResources.delete(substation.mrid);
+                        substation.location = undefined;
+                        cimModel.locations.delete(location.mrid);
+                        cimModel.removeObject(location);
+                        for (const positionPoint of location.positionPoints) {
+                            const idx = frame.cimModel.positionPoints.indexOf(positionPoint);
+                            if (idx > -1) {
+                                frame.cimModel.positionPoints.splice(idx, 1);
+                            }
+                        }
+                        masFrame.cimModel.addLocation(location);
+                    }
+                    else if (location) {
+                        const additionalLocation = new Location_1.Location(utils_1.generateUUID(), `Location ${cnt}`);
+                        additionalLocation.addPowerSystemResource(junction);
+                        additionalLocation.coordinateSystem = location.coordinateSystem;
+                        const additionalPositionPoint = new PositionPoint_1.PositionPoint(utils_1.generateUUID(), `PositionPoint ${cnt}`);
+                        additionalPositionPoint.xPosition = location.positionPoints[0].xPosition;
+                        additionalPositionPoint.yPosition = location.positionPoints[0].yPosition;
+                        additionalPositionPoint.location = additionalLocation;
+                        additionalLocation.addPositionPoint(additionalPositionPoint);
+                        masFrame.cimModel.addLocation(additionalLocation);
+                    }
+                    cimModel.addJunction(junction);
+                    cnt++;
                 }
                 cimModel.substations.delete(substation.mrid);
                 cimModel.removeObject(substation);
-                const junction = new Junction_1.Junction(utils_1.generateUUID(), `BD_Junc/`, `Junction`, 'Junction for Geo');
-                junction.equipmentContainer = line;
-                line.addEquipment(junction);
-                const location = substation.location;
-                if (!location)
-                    continue;
-                location.powerSystemResources.delete(substation.mrid);
-                location.addPowerSystemResource(junction);
-                junction.location = location;
-                cimModel.addJunction(junction);
                 cimModel.addLine(line);
             }
         });
     }
     setACLineSegmentProperties(cimModel, acLineSegment, data, defaultValuesConfig) {
-        const assetType = this.cimModelDefault.getWireInfoByName(data.nametyp);
-        let voltage = defaultValuesConfig.DefaultVoltage;
-        if (!acLineSegment.baseVoltage) {
-            if (data.un && data.un > 0) {
-                voltage = data.un;
-            }
-            else if (assetType === null || assetType === void 0 ? void 0 : assetType.voltage) {
-                voltage = assetType.voltage;
-            }
-            const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, voltage);
-            acLineSegment.baseVoltage = baseVoltage;
+        if (utils_2.isNumericI7(data.laenge) && data.laenge <= 0) {
+            data.flag_impedanzlos = 1;
         }
-        if (data.laenge) {
+        if (utils_2.isNumericI7(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
             acLineSegment.length = data.laenge;
         }
-        if (data.r0 && data.r0 !== 0) {
-            acLineSegment.r0 = data.laenge <= 0 ? data.r0 : data.r0;
+        else {
+            acLineSegment.length = 1;
+        }
+        const assetType = cimModel.getWireInfoByName(data.nametyp);
+        if (utils_2.isNumericI7(data.r0) && data.r0 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.r0 = data.r0;
+        }
+        else if (assetType && !data.flag_impedanzlos) {
+            acLineSegment.r0 = assetType.r0 * acLineSegment.length;
         }
         else {
-            if (assetType) {
-                acLineSegment.r0 = assetType.r0 * acLineSegment.length;
-            }
+            acLineSegment.r0 = 0;
         }
-        if (data.x0 && data.x0 !== 0) {
-            acLineSegment.x0 = data.laenge <= 0 ? data.x0 : data.x0;
+        if (utils_2.isNumericI7(data.x0) && data.x0 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.x0 = data.x0;
+        }
+        else if (assetType && !data.flag_impedanzlos) {
+            acLineSegment.x0 = assetType.x0 * acLineSegment.length;
         }
         else {
-            if (assetType) {
-                acLineSegment.x0 = assetType.x0 * acLineSegment.length;
-            }
+            acLineSegment.x0 = 0;
+        }
+        if (utils_2.isNumericI7(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.b0ch = utils_2.calculateBC(data.c0, 50);
         }
-        if (data.r1 && data.r1 !== 0) {
-            acLineSegment.r = data.laenge <= 0 ? data.r1 : data.r1;
+        else if (assetType && !data.flag_impedanzlos) {
+            acLineSegment.b0ch = utils_2.calculateBC(assetType.c0, 50) * data.laenge;
         }
         else {
-            if (assetType) {
-                acLineSegment.r = assetType.r1 * data.laenge;
-            }
+            acLineSegment.b0ch = 0;
+        }
+        if (utils_2.isNumericI7(data.c0) && data.c0 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.g0ch = utils_2.calculateG0ch(data.r0);
         }
-        if (data.x1 && data.x1 !== 0) {
-            acLineSegment.x = data.laenge <= 0 ? data.x1 : data.x1;
+        else if (assetType && !data.flag_impedanzlos) {
+            acLineSegment.g0ch = utils_2.calculateG0ch(assetType.r0) * data.laenge;
         }
         else {
-            if (assetType) {
-                acLineSegment.x = assetType.x1 * data.laenge;
-            }
+            acLineSegment.g0ch = 0;
+        }
+        if (utils_2.isNumericI7(data.r1) && data.r1 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.r = data.r1;
+        }
+        else if (assetType && !data.flag_impedanzlos) {
+            acLineSegment.r = assetType.r1 * data.laenge;
+        }
+        else {
+            acLineSegment.r = 0;
+        }
+        if (utils_2.isNumericI7(data.x1) && data.x1 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.x = data.x1;
+        }
+        else if (assetType && !data.flag_impedanzlos) {
+            acLineSegment.x = assetType.x1 * data.laenge;
+        }
+        else {
+            acLineSegment.x = 0;
+        }
+        if (utils_2.isNumericI7(data.c1) && data.c1 > 0 && !data.flag_impedanzlos) {
+            acLineSegment.bch = utils_2.calculateBC(data.c1, 50);
         }
-        for (const terminal of acLineSegment.terminals.values()) {
-            if (data.ir && data.ir !== 0) {
-                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, data.ir);
+        else if (assetType && !data.flag_impedanzlos) {
+            acLineSegment.bch = utils_2.calculateBC(assetType.c1, 50) * data.laenge;
+        }
+        else {
+            acLineSegment.bch = 0;
+        }
+        for (const terminalUUID of acLineSegment.terminalsUUIDs) {
+            if (utils_2.isNumericI7(data.ir) && data.ir > 0) {
+                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, cimModel.terminals.get(terminalUUID), data.ir);
             }
             else if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
-                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
+                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, cimModel.terminals.get(terminalUUID), assetType.ratedCurrent);
             }
+            const psrType = utils_1.createIfNotExitsPSRType(cimModel, data.typ);
+            acLineSegment.psrTypeUUID = psrType.mrid;
         }
-        const psrType = 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}`);
@@ -2629,7 +3058,7 @@ class ConverterI7 {
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
             const cn = object;
             terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'T');
-            terminal.connectivityNode = cn;
+            terminal.setConnectivityNode(cn);
             cn.addTerminal(terminal);
             cimModel.addTerminal(terminal);
         }
@@ -2645,37 +3074,137 @@ class ConverterI7 {
         }
         return terminal;
     }
+    createBoundaryConnection(frame, conductingEquipment, i7ObjectID, phase, sequenceNumber) {
+        const cimModel = frame.cimModel;
+        const anschlussUUID = this.integralID2UUID.get(i7ObjectID);
+        let terminal;
+        if (cimModel.objects.has(anschlussUUID)) {
+            terminal = this.createConnection(cimModel, conductingEquipment, cimModel.getObject(anschlussUUID), phase, true, sequenceNumber);
+        }
+        else {
+            const frameBD = this.getConnectedBoundaryModel(anschlussUUID);
+            if (frameBD) {
+                const cimModelBD = frameBD.cimModel;
+                const object = cimModelBD.getObject(anschlussUUID);
+                let cn;
+                if (object instanceof ConnectivityNode_1.ConnectivityNode) {
+                    cn = object;
+                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'T');
+                    terminal.connectivityNodeUUID = cn.mrid;
+                    terminal.phases = phase;
+                    terminal.connected = true;
+                    terminal.sequenceNumber = sequenceNumber ? sequenceNumber : 1;
+                    cimModel.addTerminal(terminal);
+                }
+                else if (object instanceof Terminal_1.Terminal) {
+                    terminal = object;
+                    cn = terminal.connectivityNode;
+                    cn === null || cn === void 0 ? void 0 : cn.terminals.delete(terminal.mrid);
+                    terminal.setConnectivityNode(undefined);
+                    terminal.setConnectivityNodeUUID(cn.getUUID());
+                    cimModelBD.terminals.delete(terminal.mrid);
+                    cimModel.addTerminal(terminal);
+                }
+                if (cn) {
+                    this.annotateBoundaryNode(frame.name, frame.isoCode, frame.tsoName, cn);
+                }
+                else {
+                    this.logger.error(`Für das Objekt ${conductingEquipment.constructor.name} ${conductingEquipment.getUUID()} konnte am I7-Objekt ${i7ObjectID} kein Grenz ConnenctivityNode bestimmt werden`);
+                }
+                if (terminal) {
+                    terminal.conductingEquipment = conductingEquipment;
+                    conductingEquipment.addTerminal(terminal);
+                }
+            }
+            else {
+                this.logger.error(`Für das Objekt ${conductingEquipment.constructor.name} ${conductingEquipment.getUUID()} konnte am I7-Objekt ${i7ObjectID} kein Grenzknoten bestimmt werden`);
+            }
+        }
+        return terminal;
+    }
+    getConnectedBoundaryModel(anschlussUUID) {
+        for (const frame of this.exportFramesBoundary.values()) {
+            if (frame.cimModel.objects.has(anschlussUUID)) {
+                return frame;
+            }
+        }
+        return undefined;
+    }
+    createBoundaryEquivalentInjection(frame, cn) {
+        let equivinj_exists = false;
+        let equivalentInjection = undefined;
+        frame.cimModel.equivalentInjections.forEach((equivinj, uuid) => {
+            var _a;
+            if (equivinj.name.match(frame.tsoName).length > 0 && ((_a = equivinj.terminals.values()) === null || _a === void 0 ? void 0 : _a.next().value.getConnectivityNodeUUID()) === cn.getUUID()) {
+                equivinj_exists = true;
+            }
+        });
+        if (!equivinj_exists) {
+            let tmp_terminal = new Terminal_1.Terminal(utils_1.generateUUID(), 'T');
+            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(), `BDInj_${frame.tsoName}`);
+            equivalentInjection.p = 0;
+            equivalentInjection.q = 0;
+            equivalentInjection.regulationStatus = false;
+            equivalentInjection.addTerminal(tmp_terminal);
+            tmp_terminal.setConductingEquipment(equivalentInjection);
+            cn.addTerminal(tmp_terminal);
+            frame.cimModel.addEquivalentInjection(equivalentInjection);
+            if (tmp_terminal.getConductingEquipmentUUID() !== undefined) {
+                frame.cimModel.addTerminal(tmp_terminal);
+            }
+            else {
+                let stop = true;
+            }
+        }
+        return equivalentInjection;
+    }
     determineEquipmentContainer(equipmentContainerType, cimModel, equipmentContainer) {
+        let ret_val;
         switch (equipmentContainerType) {
             case ('Bay'): {
-                return equipmentContainer;
+                if (equipmentContainer instanceof Bay_1.Bay) {
+                    ret_val = equipmentContainer;
+                }
+                else {
+                    ret_val = undefined;
+                }
+                break;
             }
             case ('VoltageLevel'): {
                 if (equipmentContainer instanceof Bay_1.Bay) {
-                    return equipmentContainer.getVoltageLevel();
+                    ret_val = equipmentContainer.getVoltageLevel();
+                }
+                else if (equipmentContainer instanceof VoltageLevel_1.VoltageLevel) {
+                    ret_val = equipmentContainer;
                 }
-                return equipmentContainer;
+                else {
+                    ret_val = undefined;
+                }
+                break;
             }
             case ('Substation'): {
                 if (equipmentContainer instanceof Bay_1.Bay) {
                     const voltageLevel = equipmentContainer.getVoltageLevel();
-                    return voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.substation;
+                    const subst_uuid = voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.getSubstationUUID();
+                    ret_val = cimModel.getObject(subst_uuid);
                 }
                 else if (equipmentContainer instanceof VoltageLevel_1.VoltageLevel) {
-                    return equipmentContainer.getSubstation();
+                    ret_val = cimModel.getObject(equipmentContainer.getSubstationUUID());
                 }
                 else {
-                    return equipmentContainer;
+                    ret_val = equipmentContainer;
                 }
+                break;
             }
             default: {
-                return equipmentContainer;
+                ret_val = undefined;
             }
         }
-        if (equipmentContainer instanceof Bay_1.Bay) {
-            return cimModel.getObject(equipmentContainer.voltageLevelUUID);
-        }
-        return equipmentContainer;
+        return ret_val;
     }
     getSpannungsbandTrafo2W(i7Data) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -2766,6 +3295,83 @@ class ConverterI7 {
             resolve(status);
         }));
     }
+    configExportFrames(exportConfig, defaultValuesConfig, tempDirPath) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const geoRegions = yield this.convertGeoRegionen();
+            const allSubGeoRegions = yield this.convertSubGeoRegionen(geoRegions, defaultValuesConfig);
+            const boundaryExports = exportConfig.filter(elem => elem.boundary === true);
+            const gridExports = exportConfig.filter(elem => elem.boundary === false);
+            const boundaryFrames = this.initExportFrames(boundaryExports, geoRegions, allSubGeoRegions);
+            for (const frame of boundaryFrames) {
+                this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
+                this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
+                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_EQ_BD], tempDirPath);
+            }
+            this.exportFramesBoundary = this.associateGeoRegionsToExportFrames(boundaryFrames);
+            const gridFrames = this.initExportFrames(gridExports, geoRegions, allSubGeoRegions);
+            for (const frame of gridFrames) {
+                this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
+                this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
+                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7, rdf_xml_1.RDF_XML.PROFILE_DY], tempDirPath);
+            }
+            this.exportFrames = this.associateGeoRegionsToExportFrames(gridFrames);
+        });
+    }
+    initExportFrames(exportConfig, geoRegions, subGeoRegions) {
+        const frames = [];
+        for (const exportEntry of exportConfig) {
+            const exportFrame = new export_frame_i7_1.I7ExportFrame(exportEntry.name);
+            exportFrame.tsoName = exportEntry.tsoName;
+            exportFrame.isoCode = exportEntry.isoCode;
+            exportFrame.boundary = exportEntry.boundary;
+            for (const exportObject of exportEntry.objects) {
+                switch (exportEntry.objectType) {
+                    case data_structures_i7_1.ExportObjectType.georegion: {
+                        const geoRegion = geoRegions.find(elem => elem.name === exportObject.name);
+                        if (!geoRegion) {
+                            this.logger.error(`Kein ${exportEntry.objectType} mit dem Namen ${exportObject.name} gefunden.`);
+                            continue;
+                        }
+                        exportFrame.cimModel.addGeographicalRegion(geoRegion);
+                        for (const subGeoRegion of geoRegion.regions) {
+                            exportFrame.cimModel.addSubGeographicalRegion(subGeoRegion);
+                        }
+                        break;
+                    }
+                    case data_structures_i7_1.ExportObjectType.subgeoregion: {
+                        const subGeoRegion = subGeoRegions.find(elem => elem.name === exportObject.name);
+                        if (!subGeoRegion) {
+                            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');
+                        subGeoRegion.region.removeSubGeographicalRegion(subGeoRegion);
+                        geoRegionNew.addSubGeographicalRegion(subGeoRegion);
+                        subGeoRegion.region = geoRegionNew;
+                        exportFrame.cimModel.addGeographicalRegion(geoRegionNew);
+                        exportFrame.cimModel.addSubGeographicalRegion(subGeoRegion);
+                        break;
+                    }
+                }
+            }
+            if (exportFrame.cimModel.subgeographicalRegions.size > 0) {
+                frames.push(exportFrame);
+            }
+            else {
+                this.logger.error(`Kein Export für ${exportEntry.name} möglich, da keine I7 ${exportEntry.objectType}-Objekte für ${exportEntry.objects.map(elem => elem.name).join(', ')} gefunden werden konnten`);
+            }
+        }
+        return frames;
+    }
+    associateGeoRegionsToExportFrames(frames) {
+        const exportFrames = new Map();
+        for (const frame of frames) {
+            for (const geoRegion of frame.cimModel.geographicalRegions.values()) {
+                exportFrames.set(geoRegion.getUUID(), frame);
+            }
+        }
+        return exportFrames;
+    }
     queryDataInChuncks(objectName, ids) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const limit = 500;
@@ -2865,31 +3471,46 @@ class ConverterI7 {
         coordinateSystem.crsUrn = crsUrn;
         cimModel.addCoordinateSystem(coordinateSystem);
     }
-    setPowerTransformerEndProperties(cimModel, powerTransformerEnd, powerTransformer, terminal, sternpunktKnotenMap, integral7, ir, i7Data, defaultValuesConfig) {
+    setPowerTransformerEndProperties(frame, powerTransformerEnd, powerTransformer, terminal, sternpunktKnotenMap, integral7, ir, i7Data, defaultValuesConfig, windings) {
+        const cimModel = frame.cimModel;
         if (terminal) {
             powerTransformerEnd.terminal = terminal;
             this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + powerTransformer.name, terminal, ir);
-            if (sternpunktKnotenMap.has(i7Data.id)) {
+            if (sternpunktKnotenMap.has(i7Data.id) && i7Data) {
                 if (sternpunktKnotenMap.get(i7Data.id).has(i7Data.aknknoten1p)) {
-                    this.convertTrafoGrounding(cimModel, powerTransformer, powerTransformerEnd, integral7, sternpunktKnotenMap.get(i7Data.id).get(i7Data.aknknoten1p), defaultValuesConfig);
+                    this.convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, integral7, sternpunktKnotenMap.get(i7Data.id).get(i7Data.aknknoten1p), defaultValuesConfig);
+                }
+            }
+            else if (sternpunktKnotenMap.has(i7Data.id) && i7Data) {
+                let winding = undefined;
+                if (powerTransformerEnd.endNumber === 1) {
+                    winding = windings.get(i7Data.trafowicklung3w1);
+                }
+                else if (powerTransformerEnd.endNumber === 2) {
+                    winding = windings.get(i7Data.trafowicklung3w2);
+                }
+                else if (powerTransformerEnd.endNumber === 3) {
+                    winding = windings.get(i7Data.trafowicklung3w3);
+                }
+                if (sternpunktKnotenMap.get(i7Data.id).has(winding)) {
+                    this.convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, integral7, sternpunktKnotenMap.get(i7Data.id).get(winding.id), defaultValuesConfig);
                 }
             }
+            else {
+                this.logger.debug(`Transformator ${i7Data.id} ${powerTransformer.mrid} hat eine unerwartete Wicklungszahl.`);
+            }
         }
         else {
             this.logger.debug(`Wicklung2W ${i7Data.id} ${powerTransformerEnd.endNumber} ${powerTransformerEnd.mrid} keine Terminalinstanz.`);
         }
-        this.setBaseVoltagePowerTransformerEnd(cimModel, powerTransformerEnd);
-        powerTransformerEnd.powerTransformer = powerTransformer;
-        powerTransformer.addPowerTransformerEnd(powerTransformerEnd);
-    }
-    setBaseVoltagePowerTransformerEnd(cimModel, powerTransformerEnd) {
         if (powerTransformerEnd.ratedU) {
-            const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, powerTransformerEnd.ratedU);
-            powerTransformerEnd.baseVoltage = baseVoltage;
+            powerTransformerEnd.baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, powerTransformerEnd.ratedU, this.exportFramesBoundary);
         }
         else {
             this.logger.debug(`Wicklung ${powerTransformerEnd.mrid} Nr. ${powerTransformerEnd.endNumber} keine Spannungsangabe.`);
         }
+        powerTransformerEnd.powerTransformer = powerTransformer;
+        powerTransformer.addPowerTransformerEnd(powerTransformerEnd);
     }
     createPhaseTapChanger(i7Data, transformerEnd, cimModel, neutralU, connectivityNode, spannungsband) {
         var _a, _b;
@@ -2914,11 +3535,11 @@ class ConverterI7 {
                 }
             }
             phaseTapChanger.ltcFlag = false;
-            phaseTapChanger.lowStep = i7Data[`minstufe_s${transformerEnd.endNumber}`];
-            phaseTapChanger.highStep = i7Data[`maxstufe_s${transformerEnd.endNumber}`];
-            phaseTapChanger.neutralStep = i7Data[`mittelstufe_s${transformerEnd.endNumber}`];
-            phaseTapChanger.normalStep = phaseTapChanger.neutralStep;
-            phaseTapChanger.step = i7Data[`aktstufe_s${transformerEnd.endNumber}`];
+            phaseTapChanger.lowStep = utils_2.convertToNumberI7(i7Data[`minstufe_s${transformerEnd.endNumber}`]);
+            phaseTapChanger.highStep = utils_2.convertToNumberI7(i7Data[`maxstufe_s${transformerEnd.endNumber}`]);
+            phaseTapChanger.neutralStep = utils_2.convertToNumberI7(i7Data[`mittelstufe_s${transformerEnd.endNumber}`]);
+            phaseTapChanger.normalStep = utils_2.convertToNumberI7(phaseTapChanger.neutralStep);
+            phaseTapChanger.step = utils_2.convertToNumberI7(i7Data[`aktstufe_s${transformerEnd.endNumber}`]);
             phaseTapChanger.neutralU = neutralU;
             transformerEnd.phaseTapChanger = phaseTapChanger;
             phaseTapChanger.transformerEndUUID = transformerEnd.mrid;
@@ -2988,38 +3609,54 @@ class ConverterI7 {
             tapChanger.tapChangerControl.terminal = terminal;
         }
     }
-    convertTrafoGrounding(cimModel, powerTransformer, powerTransformerEnd, i7Modell, stpKnoten, defaultValuesConfig) {
-        var _a, _b;
+    convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, i7Modell, stpKnoten, defaultValuesConfig) {
+        var _a, _b, _c, _d, _e, _f;
+        const cimModel = frame.cimModel;
         if (stpKnoten) {
             const junctionUUID = i7Modell.sternPunktImpModel.stpSchieneJunctionUUIDs.get(stpKnoten.schaltelement1pelem);
             const junction = i7Modell.sternPunktImpModel.junctions.get(junctionUUID);
             powerTransformerEnd.grounded = true;
             powerTransformerEnd.rground = defaultValuesConfig.TransformerEnd.rground;
             if (!junctionUUID) {
+                powerTransformerEnd.xground = defaultValuesConfig.TransformerEnd.xground;
             }
             else {
-                const terminal = this.createConnection(cimModel, junction, (_a = powerTransformerEnd.terminal) === null || _a === void 0 ? void 0 : _a.connectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
-                terminal.name = 't_stp_trafo';
-                if (junction)
-                    junction.name = (junction === null || junction === void 0 ? void 0 : junction.name) + '/Trafo';
-                const pSpuleGroundImpedance = i7Modell.sternPunktImpModel.junctionUUIDstpImp.get(junctionUUID);
-                const voltageLevel = this.getVoltageLevelByVoltage((_b = powerTransformer.equipmentContainer) === null || _b === void 0 ? void 0 : _b.voltageLevels, powerTransformerEnd.ratedU);
-                if (!voltageLevel) {
-                    this.logger.debug(`Trafo ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat kein EquipmentContainer`);
-                }
-                if (junction && voltageLevel) {
-                    junction.baseVoltage = (voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage) ? voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage : powerTransformerEnd.baseVoltage;
-                    junction.equipmentContainer = voltageLevel;
+                let terminal;
+                if (!((_a = powerTransformerEnd.terminal) === null || _a === void 0 ? void 0 : _a.connectivityNode) && this.UUID2Integral7ID.has((_b = powerTransformerEnd.terminal) === null || _b === void 0 ? void 0 : _b.connectivityNodeUUID)) {
+                    const i7ObjectID = (_d = this.UUID2Integral7ID.get((_c = powerTransformerEnd.terminal) === null || _c === void 0 ? void 0 : _c.connectivityNodeUUID)) === null || _d === void 0 ? void 0 : _d.find(elem => elem);
+                    terminal = this.createBoundaryConnection(frame, junction, i7ObjectID, PhaseCode_1.PhaseCode.ABC, 1);
                 }
                 else {
-                    this.logger.debug(`TrafoObjektID ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat keine Junction ${junctionUUID} oder VoltageLevel`);
-                }
-                if (pSpuleGroundImpedance) {
-                    pSpuleGroundImpedance.baseVoltage = (voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage) ? voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage : powerTransformerEnd.baseVoltage;
-                    pSpuleGroundImpedance.equipmentContainer = voltageLevel;
+                    terminal = this.createConnection(cimModel, junction, (_e = powerTransformerEnd.terminal) === null || _e === void 0 ? void 0 : _e.connectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
+                }
+                if (terminal) {
+                    terminal.name = 't_stp_trafo';
+                    if (junction)
+                        junction.name = (junction === null || junction === void 0 ? void 0 : junction.name) + '/Trafo';
+                    const pSpuleGroundImpedance = i7Modell.sternPunktImpModel.junctionUUIDstpImp.get(junctionUUID);
+                    const voltageLevel = this.getVoltageLevelByVoltage((_f = powerTransformer.equipmentContainer) === null || _f === void 0 ? void 0 : _f.voltageLevels, powerTransformerEnd.ratedU);
+                    if (!voltageLevel) {
+                        this.logger.debug(`Trafo ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat kein EquipmentContainer`);
+                    }
+                    if (junction && voltageLevel) {
+                        junction.baseVoltage = (voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage) ? voltageLevel.baseVoltage : powerTransformerEnd.baseVoltage;
+                        junction.equipmentContainer = voltageLevel;
+                        cimModel.addJunction(junction);
+                    }
+                    else {
+                        this.logger.debug(`TrafoObjektID ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat keine Junction ${junctionUUID} oder VoltageLevel`);
+                    }
+                    if (pSpuleGroundImpedance) {
+                        pSpuleGroundImpedance.baseVoltage = (voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.baseVoltage) ? voltageLevel.baseVoltage : powerTransformerEnd.baseVoltage;
+                        pSpuleGroundImpedance.equipmentContainer = voltageLevel;
+                        cimModel.addGroundingImpedance(pSpuleGroundImpedance);
+                    }
+                    else {
+                        this.logger.debug(`TrafoObjektID ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat keine pSpuleGroundImpedance.`);
+                    }
                 }
                 else {
-                    this.logger.debug(`TrafoObjektID ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} hat keine pSpuleGroundImpedance`);
+                    this.logger.error(`Die Erdnung TrafoObjekts ID ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.mrid} konnte nicht abgebildet werden, da der Anschluss nicht bestimmt werden konnte.`);
                 }
             }
         }
@@ -3158,6 +3795,55 @@ class ConverterI7 {
             this.UUID2Integral7ID.set(uuid, [i7ID]);
         }
     }
+    annotateBoundaryNode(name, isoCode, tsoName, connectivityNode) {
+        if (connectivityNode.fromEndName === undefined) {
+            connectivityNode.boundaryPoint = true;
+            connectivityNode.fromEndName = name;
+            connectivityNode.fromEndIsoCode = isoCode;
+            connectivityNode.fromEndNameTso = tsoName;
+        }
+        else if (connectivityNode.toEndName === undefined) {
+            connectivityNode.boundaryPoint = true;
+            connectivityNode.toEndName = name;
+            connectivityNode.toEndIsoCode = isoCode;
+            connectivityNode.toEndNameTso = tsoName;
+        }
+        else {
+            this.logger.error(`Grenzknoten ${connectivityNode.name} mit der UUID ${connectivityNode.mrid} ist bereits belegt:
+                         fromEndName ${connectivityNode.fromEndName} 
+                         fromEndIsoCode ${connectivityNode.fromEndIsoCode} 
+                         fromEndNameTso ${connectivityNode.fromEndNameTso} 
+                         toEndName ${connectivityNode.toEndName} 
+                         toEndIsoCode ${connectivityNode.toEndIsoCode} 
+                         toEndNameTso ${connectivityNode.toEndNameTso} 
+                         name ${name} 
+                         isoCode ${isoCode} 
+                         tsoName ${tsoName}`);
+        }
+    }
+    release(tempDirPath) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.mysqlController.closeConnection();
+                    this.cimModelDefault.purgeData();
+                    if (tempDirPath) {
+                        try {
+                            fs_1.default.rmdirSync(tempDirPath, { recursive: true });
+                            this.logger.debug(`${path_1.default} is deleted!`);
+                        }
+                        catch (err) {
+                            console.error(`Error while deleting ${path_1.default}.`);
+                        }
+                    }
+                    resolve({ status: 'successful', message: 'ok' });
+                }
+                catch (e) {
+                    reject({ status: 'error', message: JSON.stringify(e) });
+                }
+            }));
+        });
+    }
 }
 exports.ConverterI7 = ConverterI7;
 function getDCNodeFromConverter(acDcConverter) {