@enervance/insight-cim-model 0.0.21 → 0.0.23

package/dist/converter/integral7/ConverterIntegral7.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVoltageLevelByVoltage = exports.ConverterIntegral7 = void 0;
+exports.validateInMemoryObjects = exports.getValidTerminals = exports.getGeoCoordinates = exports.getVoltageLevelByVoltage = exports.ConverterIntegral7 = void 0;
 const tslib_1 = require("tslib");
 const __1 = require("../..");
 const mysql = tslib_1.__importStar(require("mysql"));
@@ -51,6 +51,10 @@ const SynchronousMachineOperatingMode_1 = require("../../model/wires/Synchronous
 const StaticVarCompensator_1 = require("../../model/wires/StaticVarCompensator");
 const PetersenCoil_1 = require("../../model/wires/PetersenCoil");
 const GroundingImpedance_1 = require("../../model/wires/GroundingImpedance");
+const EVPowerTransformerEndInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo");
+const util_create_1 = require("../../util/util-create");
+const EVPowerTransformerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerInfo");
+const EVWireInfo_1 = require("../../model/extensions/enervance/assetinfo/EVWireInfo");
 class ConverterIntegral7 {
     constructor() {
         this.limit = 100;
@@ -75,7 +79,7 @@ class ConverterIntegral7 {
         this.integralNsgSchaltfelder = new Map();
         this.integralNsgKnotenSo = new Map();
         this.integralLeitungen = new Map();
-        this.memoryObjects = new Map();
+        this.inmemoryObjects = new Map();
         this.leitungAnschlussKnotenIDs = new Set();
         this.stpImpModel = {
             stpSchieneJunctionUUIDs: new Map(),
@@ -89,13 +93,17 @@ class ConverterIntegral7 {
         };
         this.knotenSpannung = new Map();
         this.substationVoltagelevels = new Map();
+        this.eqSpannungsBander = new Map();
+        this.substationNames = new Map();
+        this.coordinateSystemName = 'EPSG:4326';
         this.cimModel = new __1.Model();
         this.availableTableNames = [];
     }
-    init(mySqlConfig) {
+    init(mySqlConfig, logger) {
         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.logger = logger;
                     this.initDbConnection(mySqlConfig);
                     this.openConnection();
                     yield this.getAvailableTableNames(mySqlConfig.database);
@@ -116,31 +124,36 @@ class ConverterIntegral7 {
             }));
         });
     }
-    convert(defaultValuesConfig, energyTypesConfig, tempDirPath) {
+    convert(defaultValuesConfig, energyTypesConfig, tempDirPath, gridName) {
         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 {
-                    const eqProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, 'eq.xml');
+                    const eqProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, `${gridName}_eq.xml`);
                     this.writeHeaderStart(eqProfileExportObjects.xmlWriter);
                     const modelEQUUID = __1.generateUUID();
                     const profilesEQ = [__1.RDF_XML.EQ_CORE_PROFILE_URI, __1.RDF_XML.EQ_SC_PROFILE_URI, __1.RDF_XML.EQ_OPER_PROFILE_URI];
                     this.cimModel.toCIMXML(eqProfileExportObjects.xmlWriter, modelEQUUID, profilesEQ, undefined, __1.RDF_XML.AMP_MAS);
-                    const dlProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, 'dl.xml');
+                    const dlProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, `${gridName}_dl.xml`);
                     this.writeHeaderStart(dlProfileExportObjects.xmlWriter);
                     const modelDLUUID = __1.generateUUID();
                     const profilesDl = [__1.RDF_XML.DL_OPER_PROFILE_URI];
                     this.cimModel.toCIMXML(dlProfileExportObjects.xmlWriter, modelDLUUID, profilesDl, [modelEQUUID], __1.RDF_XML.AMP_MAS);
-                    const sshProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, 'ssh.xml');
+                    const glProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, `${gridName}_gl.xml`);
+                    this.writeHeaderStart(glProfileExportObjects.xmlWriter);
+                    const modelGLUUID = __1.generateUUID();
+                    const profilesGl = [__1.RDF_XML.GL_OPER_PROFILE_URI];
+                    this.cimModel.toCIMXML(glProfileExportObjects.xmlWriter, modelGLUUID, profilesGl, [modelEQUUID], __1.RDF_XML.AMP_MAS);
+                    const sshProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, `${gridName}_ssh.xml`);
                     this.writeHeaderStart(sshProfileExportObjects.xmlWriter);
                     const modelSSHUUID = __1.generateUUID();
                     const profilesSSH = [__1.RDF_XML.SSH_OPER_PROFILE_URI];
                     this.cimModel.toCIMXML(sshProfileExportObjects.xmlWriter, modelSSHUUID, profilesSSH, [modelEQUUID], __1.RDF_XML.AMP_MAS);
-                    const svProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, 'sv.xml');
+                    const svProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, `${gridName}_sv.xml`);
                     this.writeHeaderStart(svProfileExportObjects.xmlWriter);
                     const modelSVUUID = __1.generateUUID();
                     const profilesSV = [__1.RDF_XML.SV_OPER_PROFILE_URI];
                     this.cimModel.toCIMXML(svProfileExportObjects.xmlWriter, modelSVUUID, profilesSV, [modelEQUUID, modelSSHUUID], __1.RDF_XML.AMP_MAS);
-                    const ampI7ProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, 'amp_i7.xml');
+                    const ampI7ProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, `${gridName}_nonstandard.xml`);
                     this.writeHeaderStart(ampI7ProfileExportObjects.xmlWriter, __1.RDF_XML.AMP_I7_PROFILE_URI);
                     const modelAmpI7UUID = __1.generateUUID();
                     const profilesAmpI7UUID = [__1.RDF_XML.AMP_I7_PROFILE_URI];
@@ -153,6 +166,7 @@ class ConverterIntegral7 {
                     yield this.convertBetriebsmitteltypenTrafo();
                     yield this.convertBetriebsmitteltypenKdrossel();
                     yield this.convertNetzvarianten();
+                    this.objectToCIMXML(glProfileExportObjects.xmlWriter, this.cimModel.coordinateSystems, __1.RDF_XML.PROFILE_GL, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.geographicalRegions, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.subgeographicalRegions, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.lines, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
@@ -206,7 +220,8 @@ class ConverterIntegral7 {
                             yield this.convertSammelschienenAbschnitte(schaltanlagenAbschnittIDs);
                         }
                         if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
-                            yield this.convertBelastungen([...knotenSoIDs, ...this.knotenSfIDs], defaultValuesConfig);
+                            const querZweigID2ErgebnisLflID = yield this.convertBelastungen([...knotenSoIDs, ...this.knotenSfIDs], defaultValuesConfig, false);
+                            yield this.convertQuerzweigErgebnisData(querZweigID2ErgebnisLflID, 1, 0);
                         }
                         if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
                             yield this.convertEinspeisungen([...knotenSoIDs, ...this.knotenSfIDs]);
@@ -215,11 +230,14 @@ class ConverterIntegral7 {
                             yield this.convertGeneratoren([...knotenSoIDs, ...this.knotenSfIDs], energyTypesConfig);
                         }
                         if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
-                            yield this.convertKraftwerksbloeke([...knotenSoIDs, ...this.knotenSfIDs], energyTypesConfig);
+                            yield this.convertKraftwerksbloecke([...knotenSoIDs, ...this.knotenSfIDs], energyTypesConfig);
                         }
                         if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
                             yield this.convertErsatzQuerweige([...knotenSoIDs, ...this.knotenSfIDs]);
                         }
+                        if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
+                            yield this.convertBoundaryInjections([...knotenSoIDs, ...this.knotenSfIDs]);
+                        }
                         if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
                             yield this.convertAsynchronmotor([...knotenSoIDs, ...this.knotenSfIDs]);
                         }
@@ -289,6 +307,7 @@ class ConverterIntegral7 {
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.solarGeneratingUnit, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.linearShuntCompensators, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.staticVarCompensator, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        validateRegulatingControls(this.cimModel.regulatingControl, this.logger, 'Allgemein');
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectArrayToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.fossilFuel, __1.RDF_XML.PROFILE_EQ);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.reactiveCapabilityCurve, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
@@ -296,17 +315,20 @@ class ConverterIntegral7 {
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.connectivityNodes, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(dlProfileExportObjects.xmlWriter, this.cimModel.diagramObjects, __1.RDF_XML.PROFILE_DL, defaultValuesConfig);
+                        this.objectToCIMXML(glProfileExportObjects.xmlWriter, this.cimModel.locations, __1.RDF_XML.PROFILE_GL, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.energyConsumers, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.conformLoads, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.energySources, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.disconnectors, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.breakers, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.staticVarCompensator, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.staticVarCompensator, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectArrayToCIMXML(svProfileExportObjects.xmlWriter, this.cimModel.svStatus, __1.RDF_XML.PROFILE_SV);
+                        this.objectArrayToCIMXML(svProfileExportObjects.xmlWriter, this.cimModel.svPowerFlow, __1.RDF_XML.PROFILE_SV);
                         this.objectArrayToCIMXML(svProfileExportObjects.xmlWriter, this.cimModel.svTapSteps, __1.RDF_XML.PROFILE_SV);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.bays, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.connectivityNodes, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
@@ -338,6 +360,7 @@ class ConverterIntegral7 {
                         this.cimModel.connectivityNodes.clear();
                         this.cimModel.terminals.clear();
                         this.cimModel.diagramObjects.clear();
+                        this.cimModel.locations.clear();
                         this.cimModel.objects.clear();
                         this.cimModel.svStatus.length = 0;
                         this.cimModel.svTapSteps.length = 0;
@@ -356,19 +379,21 @@ class ConverterIntegral7 {
                         this.integralNsgSchaltanlagenabschnitt.clear();
                         this.integralNsgSchaltfelder.clear();
                         this.integralNsgKnotenSo.clear();
-                        console.log(`Offset ${offset} done`);
+                        this.eqSpannungsBander.clear();
+                        this.logger.info(`Offset ${offset} done`);
                     }
                     const restCountELZ = this.ersatzlaengszweigAnzahl < this.limit ? this.ersatzlaengszweigAnzahl : (this.ersatzlaengszweigAnzahl % this.limit);
                     const intervalCountELZ = (this.ersatzlaengszweigAnzahl - restCountELZ) / this.limit;
                     const numberOfIntervalsELZ = restCountELZ > 0 ? intervalCountELZ + 1 : intervalCountELZ;
-                    console.log('Convert Ersatzlaengszweige ' + this.ersatzlaengszweigAnzahl);
+                    this.logger.info('Convert Ersatzlaengszweige ' + this.ersatzlaengszweigAnzahl);
                     for (let i = 0; i < numberOfIntervalsELZ; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsELZ && restCountELZ > 0) ? restCountELZ : this.limit;
                         yield this.convertErsatzLaengszweige(currentLimit, offset, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.equivalentBranches, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.equivalentBranches.clear();
                         this.cimModel.connectivityNodes.clear();
                         this.cimModel.terminals.clear();
@@ -377,7 +402,7 @@ class ConverterIntegral7 {
                     const restCountLeitung = this.leitungsAnzahl < this.limit ? this.leitungsAnzahl : (this.leitungsAnzahl % this.limit);
                     const intervalCountLeitung = (this.leitungsAnzahl - restCountLeitung) / this.limit;
                     const numberOfIntervalsLeitung = restCountLeitung > 0 ? intervalCountLeitung + 1 : intervalCountLeitung;
-                    console.log('Convert ACLineSegments ' + this.leitungsAnzahl);
+                    this.logger.info('Convert ACLineSegments ' + this.leitungsAnzahl);
                     for (let i = 0; i < numberOfIntervalsLeitung; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsLeitung && restCountLeitung > 0) ? restCountLeitung : this.limit;
@@ -386,8 +411,9 @@ class ConverterIntegral7 {
                         if (this.leitungsIDs.length > 0)
                             yield this.determineLeitungsTypen(this.leitungsIDs, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.acLineSegments, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.acLineSegments, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.cimModel.acLineSegments.clear();
                         this.cimModel.connectivityNodes.clear();
@@ -400,7 +426,7 @@ class ConverterIntegral7 {
                     const restCountHgueLeitung = this.hgueLeitungsAnzahl < this.limit ? this.hgueLeitungsAnzahl : (this.hgueLeitungsAnzahl % this.limit);
                     const intervalCountHgueLeitung = (this.hgueLeitungsAnzahl - restCountHgueLeitung) / this.limit;
                     const numberOfIntervalsHgueLeitung = restCountHgueLeitung > 0 ? intervalCountHgueLeitung + 1 : intervalCountHgueLeitung;
-                    console.log('Convert ACLineSegments ' + this.hgueLeitungsAnzahl);
+                    this.logger.info('Convert ACLineSegments ' + this.hgueLeitungsAnzahl);
                     for (let i = 0; i < numberOfIntervalsHgueLeitung; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsHgueLeitung && restCountHgueLeitung > 0) ? restCountHgueLeitung : this.limit;
@@ -415,17 +441,18 @@ class ConverterIntegral7 {
                     const restCountLD = this.laengsdrosselAnzahl < this.limit ? this.laengsdrosselAnzahl : (this.laengsdrosselAnzahl % this.limit);
                     const intervalCountLD = (this.laengsdrosselAnzahl - restCountLD) / this.limit;
                     const numberOfIntervalsLD = restCountLD > 0 ? intervalCountLD + 1 : intervalCountLD;
-                    console.log('Convert Längsdrossel ' + this.laengsdrosselAnzahl);
+                    this.logger.info('Convert Längsdrossel ' + this.laengsdrosselAnzahl);
                     for (let i = 0; i < numberOfIntervalsLD; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsLD && restCountLD > 0) ? restCountLD : this.limit;
                         yield this.convertLaengsdrosseln(currentLimit, offset, defaultValuesConfig);
-                        console.log('Export Längsdrossel ' + this.cimModel.seriesCompensators.size);
+                        this.logger.info('Export Längsdrossel ' + this.cimModel.seriesCompensators.size);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.seriesCompensators, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.seriesCompensators, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.cimModel.seriesCompensators.clear();
                         this.cimModel.operationalLimitSets.clear();
@@ -436,7 +463,7 @@ class ConverterIntegral7 {
                     const restCountLK = this.laengskondensatorAnzahl < this.limit ? this.laengskondensatorAnzahl : (this.laengskondensatorAnzahl % this.limit);
                     const intervalCountLK = (this.laengskondensatorAnzahl - restCountLK) / this.limit;
                     const numberOfIntervalsLK = restCountLK > 0 ? intervalCountLK + 1 : intervalCountLK;
-                    console.log('Convert Längskondensator ' + this.laengskondensatorAnzahl);
+                    this.logger.info('Convert Längskondensator ' + this.laengskondensatorAnzahl);
                     for (let i = 0; i < numberOfIntervalsLK; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsLK && restCountLK > 0) ? restCountLK : this.limit;
@@ -444,8 +471,9 @@ class ConverterIntegral7 {
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.seriesCompensators, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.seriesCompensators, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.cimModel.seriesCompensators.clear();
                         this.cimModel.operationalLimitSets.clear();
@@ -456,22 +484,24 @@ class ConverterIntegral7 {
                     const restCountTrafo2W = this.trafo2WAnzahl < this.limit ? this.trafo2WAnzahl : (this.trafo2WAnzahl % this.limit);
                     const intervalCountTrafo2W = (this.trafo2WAnzahl - restCountTrafo2W) / this.limit;
                     const numberOfIntervalsTrafo2W = restCountTrafo2W > 0 ? intervalCountTrafo2W + 1 : intervalCountTrafo2W;
-                    console.log('Convert Transformers');
+                    this.logger.info('Convert Transformers');
                     for (let i = 0; i < numberOfIntervalsTrafo2W; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsTrafo2W && restCountTrafo2W > 0) ? restCountTrafo2W : this.limit;
                         yield this.convertTrafo2W(currentLimit, offset);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.powerTransformer, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.powerTransformerEnds, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.tapChangerControls, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangers, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangerTables, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        validateRegulatingControls(this.cimModel.regulatingControl, this.logger, '2W Trafo');
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.powerTransformer.clear();
                         this.cimModel.powerTransformerEnds.clear();
                         this.cimModel.currentLimits.clear();
@@ -490,7 +520,7 @@ class ConverterIntegral7 {
                     const restCountTrafo3W = this.trafo2WAnzahl < this.limit ? this.trafo3WAnzahl : (this.trafo3WAnzahl % this.limit);
                     const intervalCountTrafo3W = (this.trafo3WAnzahl - restCountTrafo3W) / this.limit;
                     const numberOfIntervalsTrafo3W = restCountTrafo3W > 0 ? intervalCountTrafo3W + 1 : intervalCountTrafo3W;
-                    console.log('Convert Transformers3W');
+                    this.logger.info('Convert Transformers3W');
                     for (let i = 0; i < numberOfIntervalsTrafo3W; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsTrafo3W && restCountTrafo3W > 0) ? restCountTrafo3W : this.limit;
@@ -501,7 +531,9 @@ class ConverterIntegral7 {
                         this.cimModel.powerTransformerEnds.clear();
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.cimModel.currentLimits.clear();
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.terminals.clear();
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.tapChangerControls, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.cimModel.tapChangerControls.clear();
@@ -509,10 +541,10 @@ class ConverterIntegral7 {
                         this.cimModel.ratioTapChangers.clear();
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangerTables, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        validateRegulatingControls(this.cimModel.regulatingControl, this.logger, '3W Trafo');
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.regulatingControl.clear();
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.terminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.operationalLimitSets.clear();
                         for (const table of this.cimModel.ratioTapChangerTables.values()) {
                             table.ratioTapChangerTablePoints = [];
@@ -521,19 +553,7 @@ class ConverterIntegral7 {
                         this.cimModel.svTapSteps.length = 0;
                         this.cimModel.objects.clear();
                     }
-                    const memoryTerminals = new Map();
-                    for (const entry of this.memoryObjects.entries()) {
-                        const value = entry[1];
-                        if (value instanceof __1.Terminal) {
-                            const terminal = value;
-                            if (terminal.conductingEquipment || terminal.conductingEquipmentUUID) {
-                                memoryTerminals.set(value.mrid, value);
-                            }
-                            else {
-                                console.log(`Terminal ohne conductingEquipment UUID ${terminal.mrid} shortName ${terminal.shortName} ID | ${entry[0]}`);
-                            }
-                        }
-                    }
+                    const memoryTerminals = validateInMemoryObjects(this.inmemoryObjects);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitTypes, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.baseVoltages, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, memoryTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
@@ -543,46 +563,74 @@ class ConverterIntegral7 {
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.csConverter, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.acDCConverterDCTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.dcNodes, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                    this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.stpImpModel.connectivityNodes, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                    this.stpImpModel.connectivityNodes.clear();
-                    this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.stpImpModel.junctions, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                    for (const junction of this.stpImpModel.junctions.values()) {
+                        if (junction.baseVoltageUUID && junction.equipmentContainerUUID) {
+                            this.cimModel.addJunction(junction);
+                        }
+                    }
+                    this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.junctions, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.stpImpModel.junctions.clear();
+                    this.cimModel.junctions.clear();
+                    for (const cn of this.stpImpModel.connectivityNodes.values()) {
+                        if (cn.connectivityNodeContainerUUID) {
+                            this.cimModel.addConnectivityNode(cn);
+                        }
+                    }
+                    this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.connectivityNodes, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                    this.stpImpModel.connectivityNodes.clear();
+                    this.cimModel.connectivityNodes.clear();
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.stpImpModel.petersenCoils, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.stpImpModel.petersenCoils.clear();
-                    this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.stpImpModel.groundingImpedances, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                    for (const groundingImpedance of this.stpImpModel.groundingImpedances.values()) {
+                        if (groundingImpedance.baseVoltageUUID && groundingImpedance.equipmentContainerUUID) {
+                            this.cimModel.addGroundingImpedance(groundingImpedance);
+                        }
+                    }
+                    this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.groundingImpedances, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.stpImpModel.groundingImpedances.clear();
+                    this.cimModel.groundingImpedances.clear();
                     this.cimModel.dcConverterUnit.clear();
                     this.cimModel.vsConverter.clear();
                     this.cimModel.csConverter.clear();
                     this.cimModel.acDCConverterDCTerminals.clear();
                     this.cimModel.dcNodes.clear();
                     this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.psrTypes, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
+                    this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.evWireInfos, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
+                    this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.cableInfos, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
+                    this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.overheadWireInfos, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
+                    this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.evPowerTransformerInfos, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
+                    this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.evPowerTransformerEndInfos, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
+                    this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.evTapChangerInfo, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                     this.cimModel.operationalLimitTypes.clear();
                     this.cimModel.baseVoltages.clear();
                     memoryTerminals.clear();
                     this.writeHeaderEnd(eqProfileExportObjects.xmlWriter);
                     this.writeHeaderEnd(dlProfileExportObjects.xmlWriter);
+                    this.writeHeaderEnd(glProfileExportObjects.xmlWriter);
                     this.writeHeaderEnd(sshProfileExportObjects.xmlWriter);
                     this.writeHeaderEnd(svProfileExportObjects.xmlWriter);
                     this.writeHeaderEnd(ampI7ProfileExportObjects.xmlWriter);
                     yield Promise.all([
                         utils_2.createWriteStreamPromise(eqProfileExportObjects.writeStream),
                         utils_2.createWriteStreamPromise(dlProfileExportObjects.writeStream),
+                        utils_2.createWriteStreamPromise(glProfileExportObjects.writeStream),
                         utils_2.createWriteStreamPromise(sshProfileExportObjects.writeStream),
                         utils_2.createWriteStreamPromise(svProfileExportObjects.writeStream),
                         utils_2.createWriteStreamPromise(ampI7ProfileExportObjects.writeStream),
                     ]);
                     const zip = new jszip_1.default();
                     const readStreamEq = fs_1.default.createReadStream(eqProfileExportObjects.filePath);
-                    zip.file('EQ.xml', readStreamEq);
+                    zip.file(`${gridName}_eq.xml`, readStreamEq);
                     const readStreamDl = fs_1.default.createReadStream(dlProfileExportObjects.filePath);
-                    zip.file('DL.xml', readStreamDl);
+                    zip.file(`${gridName}_dl.xml`, readStreamDl);
+                    const readStreamGl = fs_1.default.createReadStream(glProfileExportObjects.filePath);
+                    zip.file(`${gridName}_gl.xml`, readStreamGl);
                     const readStreamSSH = fs_1.default.createReadStream(sshProfileExportObjects.filePath);
-                    zip.file('SSH.xml', readStreamSSH);
+                    zip.file(`${gridName}_ssh.xml`, readStreamSSH);
                     const readStreamSV = fs_1.default.createReadStream(svProfileExportObjects.filePath);
-                    zip.file('SV.xml', readStreamSV);
+                    zip.file(`${gridName}_sv.xml`, readStreamSV);
                     const readStreamAmpI7 = fs_1.default.createReadStream(ampI7ProfileExportObjects.filePath);
-                    zip.file('AMP_I7.xml', readStreamAmpI7);
+                    zip.file('nonstandard.xml', readStreamAmpI7);
                     resolve(yield utils_2.generateNodeStream(zip));
                 }
                 catch (e) {
@@ -600,7 +648,7 @@ class ConverterIntegral7 {
                     if (tempDirPath) {
                         try {
                             fs_1.default.rmdirSync(tempDirPath, { recursive: true });
-                            console.log(`${path_1.default} is deleted!`);
+                            this.logger.info(`${path_1.default} is deleted!`);
                         }
                         catch (err) {
                             console.error(`Error while deleting ${path_1.default}.`);
@@ -703,8 +751,8 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.REGION} ist nicht vorhanden.`);
-                console.log(`Erstelle Standard Georegion ${defaultValuesConfig.GeographicalRegion.name} .`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.REGION} ist nicht vorhanden.`);
+                this.logger.info(`Erstelle Standard Georegion ${defaultValuesConfig.GeographicalRegion.name} .`);
                 __1.createGeoregion(__1.generateUUID(), defaultValuesConfig.GeographicalRegion.name, undefined, defaultValuesConfig.GeographicalRegion.description, this.cimModel);
             }
         });
@@ -726,8 +774,8 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.SUBREGION} ist nicht vorhanden.`);
-                console.log(`Erstelle Standard SubGeographicalRegion ${defaultValuesConfig.SubGeographicalRegion.name}.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SUBREGION} ist nicht vorhanden.`);
+                this.logger.info(`Erstelle Standard SubGeographicalRegion ${defaultValuesConfig.SubGeographicalRegion.name}.`);
                 const region = utils_1.createIfNotExitsGeoregionByName(this.cimModel, defaultValuesConfig.GeographicalRegion.name);
                 const subRegion = utils_1.createIfNotExitsSubGeoregionByName(this.cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
                 subRegion.shortName = defaultValuesConfig.SubGeographicalRegion.shortName;
@@ -745,12 +793,27 @@ class ConverterIntegral7 {
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                     const substation = new __1.Substation(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Schluessel);
+                    this.substationNames.set(substation.mrid, substation.name);
                     let subregion = this.cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
                         const region = utils_1.createIfNotExitsGeoregionByName(this.cimModel, defaultValuesConfig.GeographicalRegion.name);
                         subregion = utils_1.createIfNotExitsSubGeoregionByName(this.cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
                     }
                     substation.subGeographicalRegionUUID = subregion.mrid;
+                    const coor = getGeoCoordinates(i7Data);
+                    if ((coor === null || coor === void 0 ? void 0 : coor.length) === 2) {
+                        const coordinateSystem = this.cimModel.getCoordinateSystemByName(this.coordinateSystemName);
+                        const location = new __1.Location(__1.generateUUID(), `Location of ${substation.name}`);
+                        location.addPowerSystemResource(substation);
+                        substation.location = location;
+                        location.coordinateSystem = coordinateSystem;
+                        const positionPoint = new __1.PositionPoint(__1.generateUUID());
+                        positionPoint.xPosition = coor[0];
+                        positionPoint.yPosition = coor[1];
+                        positionPoint.location = location;
+                        location.addPositionPoint(positionPoint);
+                        this.cimModel.addLocation(location);
+                    }
                     this.substationVoltagelevels.set(i7Data.id, []);
                     this.cimModel.addSubstation(substation);
                     this.integralID2UUID.set(i7Data.id, substation.mrid);
@@ -760,7 +823,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.STANDORT} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STANDORT} ist nicht vorhanden.`);
             }
         });
     }
@@ -772,7 +835,9 @@ class ConverterIntegral7 {
                     const object = new KnotenSo_1.KnotenSoImpl(i7Data);
                     this.integralKnotenSo.set(i7Data.id, object);
                     object.standort = this.integralStandorte.get(object.standortid);
-                    const vl = new __1.VoltageLevel(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const substation = this.cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
+                    const substationName = this.substationNames.get(substation.mrid);
+                    const vl = new __1.VoltageLevel(__1.getUUID(i7Data.guid), substationName + "/" + utils_2.getName(i7Data), i7Data.kurzname);
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(__1.generateUUID(), 'Abzweig', String(i7Data.id));
                     connectivityNode.connectivityNodeContainer = vl;
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
@@ -780,7 +845,13 @@ class ConverterIntegral7 {
                     const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, un);
                     vl.baseVoltage = baseVoltage;
-                    const substation = this.cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
+                    this.eqSpannungsBander.set(vl.mrid, [
+                        {
+                            usoll: i7Data.usoll,
+                            umin: i7Data.umin,
+                            umax: i7Data.umax
+                        }
+                    ]);
                     if (substation) {
                         vl.substation = substation;
                         substation.addVoltageLevel(vl);
@@ -793,7 +864,7 @@ class ConverterIntegral7 {
                         connectivityNode.description = i7Schluessel;
                     }
                     else {
-                        console.log(`KnotenSo ${i7Data.id} ${vl.mrid} besitzt keine Substation.`);
+                        this.logger.info(`KnotenSo ${i7Data.id} ${vl.mrid} besitzt keine Substation.`);
                     }
                     const psrType = utils_2.getPSRType(this.cimModel, 'Abzweigmast');
                     vl.psrTypeUUID = psrType === null || psrType === void 0 ? void 0 : psrType.mrid;
@@ -806,7 +877,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SO} ist nicht vorhanden.`);
             }
         });
     }
@@ -819,7 +890,7 @@ class ConverterIntegral7 {
                     try {
                         stpSchieneIDs.push(i7DataSchiene.id);
                         const connectivityNode = new __1.ConnectivityNode(__1.generateUUID(), utils_2.getName(i7DataSchiene), `StpSchiene_${i7DataSchiene.id}`);
-                        const junction = new __1.Junction(__1.generateUUID(), 'StpJunction', `${i7DataSchiene.bezeichner}`);
+                        const junction = new __1.Junction(__1.generateUUID(), `StpSchiene/${i7DataSchiene.id}`, `${i7DataSchiene.bezeichner}`);
                         const terminal = __1.createConnection(this.cimModel, junction, connectivityNode, __1.PhaseCode.N);
                         this.stpImpModel.connectivityNodes.set(connectivityNode.mrid, connectivityNode);
                         this.stpImpModel.junctions.set(junction.mrid, junction);
@@ -828,12 +899,12 @@ class ConverterIntegral7 {
                         this.stpImpModel.stpSchieneTerminal.set(i7DataSchiene.id, terminal);
                     }
                     catch (e) {
-                        console.log(e);
+                        this.logger.info(e);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE} ist nicht vorhanden.`);
             }
             resolve(stpSchieneIDs);
         }));
@@ -870,15 +941,15 @@ class ConverterIntegral7 {
                             }
                         }
                         else {
-                            console.log(`Kdrossel Keine Sternpunktschienen vorhanden.`);
+                            this.logger.info(`Kdrossel Keine Sternpunktschienen vorhanden.`);
                         }
                     }
                     else {
-                        console.log(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ} ist nicht vorhanden.`);
+                        this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ} ist nicht vorhanden.`);
                     }
                 }
                 catch (e) {
-                    console.log(e);
+                    this.logger.info(e);
                 }
                 finally {
                     resolve('');
@@ -902,15 +973,15 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`StpSchaltelemente Keine Sternpunktschienen vorhanden.`);
+                        this.logger.info(`StpSchaltelemente Keine Sternpunktschienen vorhanden.`);
                     }
                 }
                 else {
-                    console.log(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER} ist nicht vorhanden.`);
+                    this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER} ist nicht vorhanden.`);
                 }
             }
             catch (e) {
-                console.log(e);
+                this.logger.info(e);
             }
             finally {
                 resolve('');
@@ -922,14 +993,16 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTANLAGE)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.SCHALTANLAGE, 0, 0, standortIDs));
                 for (const i7Data of result) {
-                    const vl = new __1.VoltageLevel(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const substation = this.cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
+                    const substationName = this.substationNames.get(substation.mrid);
+                    const vl = new __1.VoltageLevel(__1.getUUID(i7Data.guid), substationName + "/" + utils_2.getName(i7Data), i7Data.kurzname);
                     const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, un);
                     vl.baseVoltageUUID = baseVoltage.mrid;
                     this.cimModel.addVoltageLevel(vl);
                     this.integralID2UUID.set(i7Data.id, vl.mrid);
                     utils_2.putUUIDtoI7Ids(vl.mrid, i7Data.id, this.UUID2IntegralID);
-                    const substation = this.cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
+                    this.eqSpannungsBander.set(vl.mrid, []);
                     if (substation) {
                         vl.substationUUID = substation.mrid;
                         const i7Schluessel = substation.description +
@@ -945,15 +1018,16 @@ class ConverterIntegral7 {
                         subVlData.push({
                             un: i7Data.un,
                             vlUUID: vl.mrid,
+                            baseVoltageUUID: vl.baseVoltageUUID
                         });
                     }
                     else {
-                        console.log(`VoltageLevel ${i7Data.id} ${vl.mrid} besitzt keine Umspannanlage.`);
+                        this.logger.info(`VoltageLevel ${i7Data.id} ${vl.mrid} besitzt keine Umspannanlage.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTANLAGE} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTANLAGE} ist nicht vorhanden.`);
             }
         });
     }
@@ -971,7 +1045,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT} ist nicht vorhanden.`);
             }
         });
     }
@@ -989,7 +1063,9 @@ class ConverterIntegral7 {
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (voltageLevel) {
                         busbarSection.equipmentContainerUUID = voltageLevel.mrid;
+                        voltageLevel.addEquipment(busbarSection);
                         connectivityNode.connectivityNodeContainerUUID = voltageLevel.mrid;
+                        voltageLevel.addConnectivityNode(connectivityNode);
                         voltageLevel.highVoltageLimit = i7Data.umax;
                         voltageLevel.lowVoltageLimit = i7Data.umin;
                         const i7Schluessel = voltageLevel.description +
@@ -997,9 +1073,20 @@ class ConverterIntegral7 {
                             utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                         busbarSection.description = i7Schluessel;
                         connectivityNode.description = i7Schluessel;
+                        const usollValues = this.eqSpannungsBander.get(voltageLevel.mrid);
+                        if (usollValues) {
+                            usollValues.push({
+                                usoll: i7Data.usoll,
+                                umin: i7Data.umin,
+                                umax: i7Data.umax
+                            });
+                        }
+                        else {
+                            this.logger.info('Sammelschiene ' + i7Data.id + ' besitzt kein Objekt für Sollspannungen.');
+                        }
                     }
                     else {
-                        console.log('Sammelschiene ' + i7Data.id + ' besitzt keine Schaltanlage.');
+                        this.logger.info('Sammelschiene ' + i7Data.id + ' besitzt keine Schaltanlage.');
                     }
                     this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
                     utils_2.putUUIDtoI7Ids(busbarSection.mrid, i7Data.id, this.UUID2IntegralID);
@@ -1011,7 +1098,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.SAMMELSCHIENE} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SAMMELSCHIENE} ist nicht vorhanden.`);
             }
         });
     }
@@ -1030,7 +1117,7 @@ class ConverterIntegral7 {
                         sfImpl.saabschnitt.schaltfelder.push(sfImpl);
                     }
                     else {
-                        console.log(`Schaltfeld ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.info(`Schaltfeld ${i7Data.id} besitzt keine Anlage.`);
                     }
                     const voltageLevel = this.cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (voltageLevel) {
@@ -1041,14 +1128,14 @@ class ConverterIntegral7 {
                         bay.description = i7Schluessel;
                     }
                     else {
-                        console.log(`Schaltfeld ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.info(`Schaltfeld ${i7Data.id} besitzt keine Anlage.`);
                     }
                     this.cimModel.addBay(bay);
                     this.integralID2UUID.set(i7Data.id, bay.mrid);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTFELD} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTFELD} ist nicht vorhanden.`);
             }
         });
     }
@@ -1069,7 +1156,7 @@ class ConverterIntegral7 {
                         bay.description = i7Schluessel;
                     }
                     else {
-                        console.log(`Querkupplung ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.info(`Querkupplung ${i7Data.id} besitzt keine Anlage.`);
                     }
                     this.querkupplungIDs.push(i7Data.id);
                     this.cimModel.addBay(bay);
@@ -1077,7 +1164,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.QUERKUPPLUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.QUERKUPPLUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -1098,7 +1185,7 @@ class ConverterIntegral7 {
                         bay.description = i7Schluessel;
                     }
                     else {
-                        console.log(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.info(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
                     }
                     this.laengskupplungIDs.push(i7Data.id);
                     this.integralID2UUID.set(i7Data.id, bay.mrid);
@@ -1106,47 +1193,77 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG} ist nicht vorhanden.`);
             }
         });
     }
-    convertBelastungen(knotenSfIDs, defaultValuesConfig) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+    convertBelastungen(knotenSfIDs, defaultValuesConfig, conformLoadMapping) {
+        return new Promise((resolve) => {
+            const querZweigID2LflID = new Map();
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
-                const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.BELASTUNG, 0, 0, knotenSfIDs));
-                for (const i7Data of result) {
-                    const conformLoad = new ConformLoad_1.ConformLoad(__1.getUUID(i7Data.guid), utils_2.getName(i7Data));
-                    const conformLoadGroup = this.cimModel.getObjectByName(defaultValuesConfig.ConformLoadGroup.name, __1.CIM_CLASS_NAMES.ConformLoadGroup);
-                    conformLoad.loadGroupUUID = conformLoadGroup.mrid;
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    __1.createSvStatus(this.cimModel, inBetrieb, conformLoad);
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
-                    conformLoad.p = powerData[0];
-                    conformLoad.q = powerData[1];
-                    const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                    if (connectivityNode) {
-                        __1.createConnection(this.cimModel, conformLoad, connectivityNode, __1.PhaseCode.ABC);
-                        const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
-                        if (equipmentContainer) {
-                            conformLoad.equipmentContainerUUID = equipmentContainer.mrid;
-                            const i7Schluesel = utils_2.getDescription(equipmentContainer.getSubstation()) +
-                                integral_prefix_1.BELASTUNG_PRAEFIX + i7Data.bezeichner;
-                            conformLoad.description = i7Schluesel;
+                this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.BELASTUNG, 0, 0, knotenSfIDs)).then((result) => {
+                    for (const i7Data of result) {
+                        const conformLoad = conformLoadMapping ? new ConformLoad_1.ConformLoad(__1.getUUID(i7Data.guid), utils_2.getName(i7Data)) : new __1.EnergyConsumer(__1.getUUID(i7Data.guid), utils_2.getName(i7Data));
+                        if (conformLoadMapping) {
+                            const conformLoadGroup = this.cimModel.getObjectByName(defaultValuesConfig.ConformLoadGroup.name, __1.CIM_CLASS_NAMES.ConformLoadGroup);
+                            conformLoad.loadGroupUUID = conformLoadGroup.mrid;
+                        }
+                        const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                        __1.createSvStatus(this.cimModel, inBetrieb, conformLoad);
+                        const powerData = utils_2.getActiveReactivePower(i7Data);
+                        conformLoad.p = powerData[0];
+                        conformLoad.q = powerData[1];
+                        const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                        if (connectivityNode) {
+                            __1.createConnection(this.cimModel, conformLoad, connectivityNode, __1.PhaseCode.ABC);
+                            const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
+                            if (equipmentContainer) {
+                                conformLoad.equipmentContainerUUID = equipmentContainer.mrid;
+                                const i7Schluesel = utils_2.getDescription(equipmentContainer.getSubstation()) +
+                                    integral_prefix_1.BELASTUNG_PRAEFIX + i7Data.bezeichner;
+                                conformLoad.description = i7Schluesel;
+                            }
+                            else {
+                                this.logger.info(`EnergyConsumer ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            }
                         }
                         else {
-                            console.log(`EnergyConsumer ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`EnergyConsumer ${i7Data.id} besitzt keinen ConnectivityNode.`);
                         }
+                        if (conformLoadMapping) {
+                            this.cimModel.addConformLoad(conformLoad);
+                        }
+                        else {
+                            this.cimModel.addEnergyConsumer(conformLoad);
+                        }
+                        this.integralID2UUID.set(i7Data.id, conformLoad.mrid);
+                        querZweigID2LflID.set(i7Data.flussinfo3p, i7Data.id);
                     }
-                    else {
-                        console.log(`EnergyConsumer ${i7Data.id} besitzt keinen ConnectivityNode.`);
-                    }
-                    this.cimModel.addConformLoad(conformLoad);
-                    this.integralID2UUID.set(i7Data.id, conformLoad.mrid);
-                }
+                    resolve(querZweigID2LflID);
+                });
             }
-            else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.BELASTUNG} ist nicht vorhanden.`);
+        });
+    }
+    convertQuerzweigErgebnisData(pfResultID2querZweigID, ergebnisID, teilNr) {
+        return new Promise((resolve) => {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERG_LFL_ANSCHLUSS)) {
+                const whereIDs = [...pfResultID2querZweigID.keys()];
+                if (whereIDs.length) {
+                    this.queryFunctionWrapper(integral_sql_1.queryResultData(ergebnisID, teilNr, whereIDs))
+                        .then((result) => {
+                        for (const i7Data of result) {
+                            const conductingEquipmentUUID = this.integralID2UUID.get(pfResultID2querZweigID.get(i7Data.id));
+                            const conductingEquipment = this.cimModel.getObject(conductingEquipmentUUID);
+                            if (conductingEquipment.terminalsUUIDs.length) {
+                                util_create_1.createSvPowerFlow(this.cimModel, i7Data.p, i7Data.q, conductingEquipment.terminalsUUIDs[0]);
+                            }
+                        }
+                        pfResultID2querZweigID.clear();
+                        resolve();
+                    });
+                }
             }
+            resolve();
         });
     }
     convertEinspeisungen(knotenSfIDs) {
@@ -1175,18 +1292,18 @@ class ConverterIntegral7 {
                             energySource.description = i7Schluesel;
                         }
                         else {
-                            console.log(`EnergySource ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`EnergySource ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`EnergySource ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`EnergySource ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     this.cimModel.addEnergySource(energySource);
                     this.integralID2UUID.set(i7Data.id, energySource.mrid);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -1231,12 +1348,15 @@ class ConverterIntegral7 {
                     synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     __1.createSvStatus(this.cimModel, inBetrieb, synchronousMachine);
-                    const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RC_${synchronousMachine.name}`);
+                    const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_Gen ${i7Data.id}`);
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
                             regulatingControl.mode = __1.RegulatingControlModeKind.voltage;
                             break;
                         }
+                        default: {
+                            regulatingControl.mode = __1.RegulatingControlModeKind.timeScheduled;
+                        }
                     }
                     synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
                     const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
@@ -1303,15 +1423,15 @@ class ConverterIntegral7 {
                                 generatingUnit.equipmentContainerUUID = equipmentContainergenUnitUUID;
                             }
                             else {
-                                console.log(`GeneratingUnit ${i7Data.id} besitzt keinen EquipmentContainer/Substation.`);
+                                this.logger.info(`GeneratingUnit ${i7Data.id} besitzt keinen EquipmentContainer/Substation.`);
                             }
                         }
                         else {
-                            console.log(`SynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`SynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`SynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`Generator ${i7Data.id} besitzt keinen ConnectivityNode/Terminal Instanz.`);
                     }
                     this.cimModel.addRegulatingControl(regulatingControl);
                     this.cimModel.addGeneratingUnit(generatingUnit);
@@ -1321,7 +1441,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertKraftwerksbloeke(knotenSfIDs, energyTypesConfig) {
+    convertKraftwerksbloecke(knotenSfIDs, energyTypesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.KWBLOCK, 0, 0, knotenSfIDs));
@@ -1341,12 +1461,15 @@ class ConverterIntegral7 {
                     synchronousMachine.aggregate = true;
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     __1.createSvStatus(this.cimModel, inBetrieb, synchronousMachine);
-                    const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RC_${synchronousMachine.name}`);
+                    const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_KWBlock ${i7Data.id}`);
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
                             regulatingControl.mode = __1.RegulatingControlModeKind.voltage;
                             break;
                         }
+                        default: {
+                            regulatingControl.mode = __1.RegulatingControlModeKind.timeScheduled;
+                        }
                     }
                     synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
                     const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
@@ -1413,15 +1536,15 @@ class ConverterIntegral7 {
                                 generatingUnit.equipmentContainerUUID = equipmentContainergenUnitUUID;
                             }
                             else {
-                                console.log(`GeneratingUnit ${i7Data.id} besitzt keinen EquipmentContainer/Substation.`);
+                                this.logger.info(`GeneratingUnit ${i7Data.id} besitzt keinen EquipmentContainer/Substation.`);
                             }
                         }
                         else {
-                            console.log(`SynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`SynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`SynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`Kraftwerksblock/SynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode/Terminal`);
                     }
                     this.cimModel.addRegulatingControl(regulatingControl);
                     this.cimModel.addGeneratingUnit(generatingUnit);
@@ -1456,18 +1579,18 @@ class ConverterIntegral7 {
                             externalNetworkInjection.description = i7Schluesel;
                         }
                         else {
-                            console.log(`ExternalNetworkInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`ExternalNetworkInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`ExternalNetworkInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`ExternalNetworkInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     this.cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.integralID2UUID.set(i7Data.id, externalNetworkInjection.mrid);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -1488,13 +1611,13 @@ class ConverterIntegral7 {
                             statVarCom.equipmentContainerUUID = equipmentContainer.mrid;
                         }
                         else {
-                            console.log(`Statcom ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`Statcom ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`Statcom ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`Statcom ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const regulatingControl = utils_2.createRegulatingControl(`RC_${statVarCom.name}`, inBetrieb, __1.UnitMultiplier.k, __1.RegulatingControlModeKind.voltage, this.cimModel, statVarCom);
+                    const regulatingControl = utils_2.createRegulatingControl(`RG_Statcom ${i7Data.id}`, inBetrieb, __1.UnitMultiplier.k, __1.RegulatingControlModeKind.voltage, this.cimModel, statVarCom);
                     const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
                     regulatingControl.targetValue = uref;
                     statVarCom.voltageSetPoint = uref;
@@ -1507,14 +1630,15 @@ class ConverterIntegral7 {
                         regulatingControl.terminalUUID = terminal.mrid;
                     }
                     else {
-                        console.log(`Statcom RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
+                        this.logger.info(`Statcom RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
+                        this.logger.info(`Statcom RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
                     }
                     this.cimModel.addStaticVarCompensator(statVarCom);
                     this.integralID2UUID.set(i7Data.id, statVarCom.mrid);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
             }
         });
     }
@@ -1535,13 +1659,13 @@ class ConverterIntegral7 {
                             statVarCom.equipmentContainerUUID = equipmentContainer.mrid;
                         }
                         else {
-                            console.log(`SVC ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`SVC ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`SVC ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`SVC ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const regulatingControl = utils_2.createRegulatingControl(`SVC_${statVarCom.name}`, inBetrieb, __1.UnitMultiplier.k, __1.RegulatingControlModeKind.voltage, this.cimModel, statVarCom);
+                    const regulatingControl = utils_2.createRegulatingControl(`RG_SVC ${i7Data.id}`, inBetrieb, __1.UnitMultiplier.k, __1.RegulatingControlModeKind.voltage, this.cimModel, statVarCom);
                     const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
                     regulatingControl.targetValue = uref;
                     statVarCom.voltageSetPoint = uref;
@@ -1554,14 +1678,14 @@ class ConverterIntegral7 {
                         regulatingControl.terminalUUID = terminal.mrid;
                     }
                     else {
-                        console.log(`Statcom RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
+                        this.logger.info(`SVC RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
                     }
                     this.cimModel.addStaticVarCompensator(statVarCom);
                     this.integralID2UUID.set(i7Data.id, statVarCom.mrid);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
             }
         });
     }
@@ -1608,16 +1732,27 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`KnotenSf ${i7Data.id} besitzt kein Schaltfeld.`);
+                        this.logger.info(`KnotenSf ${i7Data.id} besitzt kein Schaltfeld.`);
                     }
                     this.knotenSfIDs.push(i7Data.id);
                     this.cimModel.addConnectivityNode(connectivityNode);
                     this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
-                    this.knotenSpannung.set(connectivityNode.mrid, connectivityNode.getBaseVoltage());
+                    const connectivityNodeContainer = this.cimModel.getObject(connectivityNode.connectivityNodeContainerUUID);
+                    if (connectivityNodeContainer) {
+                        let baseVoltage;
+                        if (connectivityNodeContainer instanceof __1.VoltageLevel) {
+                            baseVoltage = this.cimModel.getObject(connectivityNodeContainer.baseVoltageUUID);
+                        }
+                        else if (connectivityNodeContainer instanceof __1.Bay) {
+                            const vl = this.cimModel.getObject(connectivityNodeContainer.voltageLevelUUID);
+                            baseVoltage = this.cimModel.getObject(vl === null || vl === void 0 ? void 0 : vl.baseVoltageUUID);
+                        }
+                        this.knotenSpannung.set(connectivityNode.mrid, baseVoltage);
+                    }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SF} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SF} ist nicht vorhanden.`);
             }
         });
     }
@@ -1632,14 +1767,14 @@ class ConverterIntegral7 {
                         connectivityNode.connectivityNodeContainerUUID = bay.mrid;
                     }
                     else {
-                        console.log(`KnotenKf ${i7Data.id} besitzt kein Schaltfeld.`);
+                        this.logger.info(`KnotenKf ${i7Data.id} besitzt kein Schaltfeld.`);
                     }
                     this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
                     this.cimModel.addConnectivityNode(connectivityNode);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_KF} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_KF} ist nicht vorhanden.`);
             }
         });
     }
@@ -1654,14 +1789,14 @@ class ConverterIntegral7 {
                         connectivityNode.connectivityNodeContainerUUID = bay.mrid;
                     }
                     else {
-                        console.log(`KnotenLk ${i7Data.id} besitzt kein Schaltfeld.`);
+                        this.logger.info(`KnotenLk ${i7Data.id} besitzt kein Schaltfeld.`);
                     }
                     this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
                     this.cimModel.addConnectivityNode(connectivityNode);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_LK} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_LK} ist nicht vorhanden.`);
             }
         });
     }
@@ -1675,8 +1810,8 @@ class ConverterIntegral7 {
                     terminal.phases = __1.PhaseCode.ABC;
                     this.integralID2UUID.set(i7Data.id, terminal.mrid);
                     this.integralID2UUID.set(i7Data.knotenzw, terminal.mrid);
-                    this.memoryObjects.set(i7Data.id, terminal);
-                    this.memoryObjects.set(i7Data.knotenzw, terminal);
+                    this.inmemoryObjects.set(i7Data.id, terminal);
+                    this.inmemoryObjects.set(i7Data.knotenzw, terminal);
                     const eknotenUUID = this.integralID2UUID.get(i7Data.eknoten);
                     if (eknotenUUID) {
                         terminal.connectivityNodeUUID = eknotenUUID;
@@ -1684,12 +1819,12 @@ class ConverterIntegral7 {
                         this.knotenSpannung.set(connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.mrid, connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getBaseVoltage());
                     }
                     else {
-                        console.log(`Schlaufe ${i7Data.id} besitzt kein KnotenSO).`);
+                        this.logger.info(`Schlaufe ${i7Data.id} besitzt kein KnotenSO).`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.SCHLAUFE} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SCHLAUFE} ist nicht vorhanden.`);
             }
         });
     }
@@ -1705,12 +1840,12 @@ class ConverterIntegral7 {
                         standortNsgImpl.standort.standortNsg = standortNsgImpl;
                     }
                     else {
-                        console.log(`standortNsg/DiagramObject ${standortNsgImpl.id} hat keine Standort-Instanz.`);
+                        this.logger.info(`standortNsg/DiagramObject ${standortNsgImpl.id} hat keine Standort-Instanz.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STANDORT} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STANDORT} ist nicht vorhanden.`);
             }
         });
     }
@@ -1725,7 +1860,7 @@ class ConverterIntegral7 {
                         knotenSoNsgImpl.knotenso = this.integralKnotenSo.get(knotenSoNsgImpl.knotensoid);
                         knotenSoNsgImpl.knotenso.knotenSoNsg = knotenSoNsgImpl;
                     }
-                    const diagramObject = new __1.DiagramObject(__1.getUUID(i7Data.guid), 'Abzweig', String(i7Data.variantennr));
+                    const diagramObject = new __1.DiagramObject(__1.getUUID(i7Data.guid), 'Abzweig');
                     this.cimModel.addDiagramObject(diagramObject);
                     const nsgStandortData = this.integralNsgStandort.get(i7Data.nsgso);
                     if (nsgStandortData) {
@@ -1739,7 +1874,7 @@ class ConverterIntegral7 {
                             diagramObject.identifiedObjectUUID = cn.mrid;
                         }
                         else {
-                            console.log(`KnotenSo/DiagramObject ${diagramObject.mrid} hat kein PSR-Objekt.`);
+                            this.logger.info(`KnotenSo/DiagramObject ${diagramObject.mrid} hat kein PSR-Objekt.`);
                         }
                         const diagramUUID = this.integralID2UUID.get(i7Data.variantennr);
                         const diagram = this.cimModel.getDiagram(diagramUUID);
@@ -1754,7 +1889,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
             }
         });
     }
@@ -1770,19 +1905,19 @@ class ConverterIntegral7 {
                         saNsgImpl.schaltanlage.schaltanlageNsg = saNsgImpl;
                     }
                     else {
-                        console.log(`SchaltanlageNSG  ${i7Data.id} hat keine PSR Instanz.`);
+                        this.logger.info(`SchaltanlageNSG  ${i7Data.id} hat keine PSR Instanz.`);
                     }
                     if (this.integralNsgStandort.has(saNsgImpl.nsgsoid)) {
                         saNsgImpl.nsgso = this.integralNsgStandort.get(saNsgImpl.nsgsoid);
                         saNsgImpl.nsgso.schaltanlagenNsg.push(saNsgImpl);
                     }
                     else {
-                        console.log(`SchaltanlageNSG  ${i7Data.id} hat keine standortNsg Instanz.`);
+                        this.logger.info(`SchaltanlageNSG  ${i7Data.id} hat keine standortNsg Instanz.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
             }
         });
     }
@@ -1798,7 +1933,7 @@ class ConverterIntegral7 {
                         saabNsgImpl.saabschnitt.schaltanlagenabschnittNsg = saabNsgImpl;
                     }
                     else {
-                        console.log(`NSG Schaltanlagenabschnitt hat keinen PSR-Abschnitt`);
+                        this.logger.info(`NSG Schaltanlagenabschnitt hat keinen PSR-Abschnitt`);
                     }
                     if (saabNsgImpl.saabschnitt && saabNsgImpl.saabschnitt.schaltanlage) {
                         if (saabNsgImpl.saabschnitt.schaltanlage.schaltanlageNsg) {
@@ -1809,7 +1944,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
             }
         });
     }
@@ -1830,7 +1965,7 @@ class ConverterIntegral7 {
                             const laenge = saab.schaltanlagenabschnittNsg.laenge;
                             const delta = sa.getDelta(saab);
                             const hoehe = saab.ssab.length * 8;
-                            const diagramObject = new __1.DiagramObject(__1.getUUID(''), 'SSAB Diagram', String(sa.schaltanlageNsg.variantennr));
+                            const diagramObject = new __1.DiagramObject(__1.getUUID(''), 'SSAB Diagram');
                             const points = [];
                             if (saAusrichtung === 0) {
                                 points.push(new Point_1.Point(ssabPoint.x - 8 + (offset * 16), ssabPoint.y + 4 - hoehe + ssab.pos * 8 + delta));
@@ -1921,7 +2056,7 @@ class ConverterIntegral7 {
                                 points.push(new Point_1.Point(pointLinksOben.x, pointLinksOben.y));
                                 points.push(new Point_1.Point(pointLinksOben.x + 16, pointLinksOben.y));
                                 points.push(new Point_1.Point(pointLinksOben.x + 16, pointRechtsUnten.y));
-                                const diagramObject = new __1.DiagramObject(__1.getUUID(''), 'Schaltfeld', String(sa.schaltanlageNsg.variantennr));
+                                const diagramObject = new __1.DiagramObject(__1.getUUID(''), 'Schaltfeld');
                                 const bayUUID = this.integralID2UUID.get(sf.id);
                                 const bay = this.cimModel.getBay(bayUUID);
                                 if (bay) {
@@ -1936,7 +2071,7 @@ class ConverterIntegral7 {
                                     }
                                 }
                                 else {
-                                    console.log(`DiagramObject Schaltfeld ${diagramObject.mrid} mit der VariantenNr ${sa.schaltanlageNsg.variantennr} hat kein CIM Schaltfeld ${sf.id} ${bayUUID}.`);
+                                    this.logger.info(`DiagramObject Schaltfeld ${diagramObject.mrid} mit der VariantenNr ${sa.schaltanlageNsg.variantennr} hat kein CIM Schaltfeld ${sf.id} ${bayUUID}.`);
                                 }
                             }
                         }
@@ -1944,7 +2079,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
             }
         });
     }
@@ -1953,7 +2088,7 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_STARR)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.KNOTEN_STARR, 0, 0, containerIDs));
                 for (const i7Data of result) {
-                    const junction = new __1.Junction(__1.getUUID(i7Data.guid), i7Data.bezeichner, 'JNCT', 'starre Verbindung');
+                    const junction = new __1.Junction(__1.getUUID(i7Data.guid), `${i7Data.bezeichner}/${i7Data.id}`, 'JNCT', 'starre Verbindung');
                     const schaltzustand = utils_2.convertToBooleanI7(i7Data.schaltzustand);
                     const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(this.integralID2UUID.get(i7Data.seliste)));
                     const cnStart = this.cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
@@ -1962,7 +2097,7 @@ class ConverterIntegral7 {
                         junction.equipmentContainerUUID = equipmentContainer.mrid;
                     }
                     else {
-                        console.log(`Starre verbindung ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        this.logger.info(`Starre verbindung ${i7Data.id} besitzt keinen EquipmentContainer.`);
                     }
                     if (cnStart) {
                         const terminal = __1.createConnection(this.cimModel, junction, cnStart, __1.PhaseCode.ABC, 1);
@@ -1971,7 +2106,7 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`Starre verbindung ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                        this.logger.info(`Starre verbindung ${i7Data.id} besitzt keinen Anfangsknoten.`);
                     }
                     if (cnZiel) {
                         const terminal = __1.createConnection(this.cimModel, junction, cnZiel, __1.PhaseCode.ABC, 2);
@@ -1980,7 +2115,7 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`Starre verbindung ${i7Data.id} besitzt keinen Zielknoten.`);
+                        this.logger.info(`Starre verbindung ${i7Data.id} besitzt keinen Zielknoten.`);
                     }
                     const baseVoltage = utils_2.getTerminalUn(this.cimModel, junction);
                     if (baseVoltage) {
@@ -1991,7 +2126,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_STARR} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_STARR} ist nicht vorhanden.`);
             }
         });
     }
@@ -2019,26 +2154,26 @@ class ConverterIntegral7 {
                     else if (baseVoltageUr2) {
                         equivalentBranch.baseVoltage = baseVoltageUr2;
                     }
-                    const start = this.memoryObjects.get(i7Data.aknoten);
+                    const start = this.inmemoryObjects.get(i7Data.aknoten);
                     if (start) {
                         __1.createConnection(this.cimModel, equivalentBranch, start, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
+                        this.logger.info(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
-                    const target = this.memoryObjects.get(i7Data.eknoten);
+                    const target = this.inmemoryObjects.get(i7Data.eknoten);
                     if (target) {
                         __1.createConnection(this.cimModel, equivalentBranch, target, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        console.log(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.info(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Zielknoten.`);
                     }
                     this.cimModel.addEquivalentBranch(equivalentBranch);
                     this.integralID2UUID.set(i7Data.id, equivalentBranch.mrid);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG} ist nicht vorhanden.`);
             }
         });
     }
@@ -2067,7 +2202,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.LEITUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LEITUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -2076,24 +2211,24 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TYP_FREILEITUNG, 0, 0, []));
                 for (const i7Data of result) {
-                    const typ = new __1.OverheadWireInfo(__1.generateUUID(), i7Data.name);
-                    this.setWireInfoProperties(typ, i7Data);
-                    this.cimModel.addOverheadWireInfo(typ);
+                    const typ = new EVWireInfo_1.EVWireInfo(__1.generateUUID(), i7Data.name);
+                    this.setWireInfoProperties(typ, i7Data, 'Freileitung');
+                    this.cimModel.addEVWireInfo(typ);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KABEL)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TYP_KABEL, 0, 0, []));
                 for (const i7Data of result) {
-                    const typ = new __1.CableInfo(__1.generateUUID(), i7Data.name);
-                    this.setWireInfoProperties(typ, i7Data);
-                    this.cimModel.addCableInfo(typ);
+                    const typ = new EVWireInfo_1.EVWireInfo(__1.generateUUID(), i7Data.name);
+                    this.setWireInfoProperties(typ, i7Data, 'Kabel');
+                    this.cimModel.addEVWireInfo(typ);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_KABEL} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_KABEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -2112,7 +2247,13 @@ class ConverterIntegral7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const acLineSegment = new __1.ACLineSegment(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.stkabname, i7Schluessel);
+                    const 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 acLineSegment = new __1.ACLineSegment(__1.getUUID(i7Data.guid), name, i7Data.stkabname, i7Schluessel);
                     this.cimModel.addACLineSegment(acLineSegment);
                     this.integralID2UUID.set(i7Data.id, acLineSegment.mrid);
                     const line = utils_2.getLine(this.cimModel, i7Data.bezeichner, i7Data.kurzname);
@@ -2120,30 +2261,34 @@ class ConverterIntegral7 {
                         acLineSegment.equipmentContainerUUID = line.mrid;
                     }
                     else {
-                        console.log(`Leitung  ${i7Data.id} besitzt keinen Stromkreis.`);
+                        this.logger.info(`Leitung  ${i7Data.id} besitzt keinen Stromkreis.`);
                     }
-                    const start = this.memoryObjects.get(i7Data.aknoten);
+                    const start = this.inmemoryObjects.get(i7Data.aknoten);
                     if (start) {
                         const terminal = __1.createConnection(this.cimModel, acLineSegment, start, __1.PhaseCode.ABC, 1);
-                        const baseVoltage = this.knotenSpannung.get(terminal.connectivityNodeUUID);
-                        acLineSegment.baseVoltage = baseVoltage;
+                        if (!acLineSegment.baseVoltage) {
+                            const baseVoltage = this.knotenSpannung.get(terminal.connectivityNodeUUID);
+                            acLineSegment.baseVoltage = baseVoltage;
+                        }
                     }
                     else {
-                        console.log(`Leitung ${i7Data.id} ${acLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
+                        this.logger.info(`Leitung ${i7Data.id} ${acLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
-                    const target = this.memoryObjects.get(i7Data.eknoten);
+                    const target = this.inmemoryObjects.get(i7Data.eknoten);
                     if (target) {
                         const terminal = __1.createConnection(this.cimModel, acLineSegment, target, __1.PhaseCode.ABC, 2);
-                        const baseVoltage = this.knotenSpannung.get(terminal.connectivityNodeUUID);
-                        acLineSegment.baseVoltage = baseVoltage;
+                        if (!acLineSegment.baseVoltage) {
+                            const baseVoltage = this.knotenSpannung.get(terminal.connectivityNodeUUID);
+                            acLineSegment.baseVoltage = baseVoltage;
+                        }
                     }
                     else {
-                        console.log(`Leitung ${i7Data.id} ${acLineSegment.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.info(`Leitung ${i7Data.id} ${acLineSegment.mrid} besitzt keinen Zielknoten.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.LEITUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LEITUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -2157,12 +2302,12 @@ class ConverterIntegral7 {
                         this.setACLineSegmentProperties(acLineSegment, i7Data, 'Freileitung', defaultValuesConfig);
                     }
                     else {
-                        console.log(`Freileitung ${i7Data.id} besitzt kein Leitungsobjekt.`);
+                        this.logger.info(`Freileitung ${i7Data.id} besitzt kein Leitungsobjekt.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.KABEL, 0, 0, leitungsIDs));
@@ -2172,12 +2317,12 @@ class ConverterIntegral7 {
                         this.setACLineSegmentProperties(acLineSegment, i7Data, 'Kabel', defaultValuesConfig);
                     }
                     else {
-                        console.log(`Kabel ${i7Data.id} besitzt kein Leitungsobjekt.`);
+                        this.logger.info(`Kabel ${i7Data.id} besitzt kein Leitungsobjekt.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -2186,31 +2331,33 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO2W)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TYP_TRAFO2W, 0, 0, []));
                 for (const i7Data of result) {
-                    const typTrafo = new __1.PowerTransformer2WInfo(__1.generateUUID(), i7Data.name);
-                    typTrafo.ukr = i7Data.ukr;
-                    typTrafo.pkr = i7Data.pkr;
+                    const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(__1.generateUUID(), i7Data.name);
+                    typTrafo.ukr12 = i7Data.ukr;
+                    typTrafo.pkr12 = i7Data.pkr;
                     typTrafo.pLeer = i7Data.p_leer;
                     typTrafo.iLeer = i7Data.i_leer;
-                    const typWicklung1 = new __1.TransformerEndInfo(__1.generateUUID());
+                    const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(__1.generateUUID());
                     typWicklung1.ratedS = new __1.ApparentPower(i7Data.sr, __1.UnitMultiplier.m, __1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
                     typWicklung1.powerTransformerInfo = typTrafo;
-                    typTrafo.transformerEndInfo.push(typWicklung1);
-                    const typWicklung2 = new __1.TransformerEndInfo(__1.generateUUID());
+                    typTrafo.addTransformerEndInfo(typWicklung1);
+                    const typWicklung2 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(__1.generateUUID());
                     typWicklung2.ratedS = new __1.ApparentPower(i7Data.sr, __1.UnitMultiplier.m, __1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung2, i7Data, 2);
                     typWicklung2.powerTransformerInfo = typTrafo;
-                    typTrafo.transformerEndInfo.push(typWicklung2);
-                    this.cimModel.addPowerTransformer2WInfo(typTrafo);
+                    typTrafo.addTransformerEndInfo(typWicklung2);
+                    this.cimModel.addEvPowerTransformerInfo(typTrafo);
+                    this.cimModel.addEvPowerTransformerEndInfo(typWicklung1);
+                    this.cimModel.addEvPowerTransformerEndInfo(typWicklung2);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO2W} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO2W} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO3W)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TYP_TRAFO3W, 0, 0, []));
                 for (const i7Data of result) {
-                    const typTrafo = new __1.PowerTransformer3WInfo(__1.generateUUID(), i7Data.name);
+                    const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(__1.generateUUID(), i7Data.name);
                     typTrafo.pLeer = i7Data.p_leer;
                     typTrafo.iLeer = i7Data.i_leer;
                     typTrafo.ukr12 = i7Data.ukr12;
@@ -2219,26 +2366,29 @@ class ConverterIntegral7 {
                     typTrafo.pkr12 = i7Data.pkr12;
                     typTrafo.pkr13 = i7Data.pkr13;
                     typTrafo.pkr23 = i7Data.pkr23;
-                    const typWicklung1 = new __1.TransformerEndInfo(__1.generateUUID());
+                    const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(__1.generateUUID());
                     typWicklung1.ratedS = new __1.ApparentPower(i7Data.sr1, __1.UnitMultiplier.m, __1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
                     typWicklung1.powerTransformerInfo = typTrafo;
-                    typTrafo.transformerEndInfo.push(typWicklung1);
-                    const typWicklung2 = new __1.TransformerEndInfo(__1.generateUUID());
+                    typTrafo.addTransformerEndInfo(typWicklung1);
+                    const typWicklung2 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(__1.generateUUID());
                     typWicklung2.ratedS = new __1.ApparentPower(i7Data.sr2, __1.UnitMultiplier.m, __1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung2, i7Data, 2);
                     typWicklung2.powerTransformerInfo = typTrafo;
-                    typTrafo.transformerEndInfo.push(typWicklung2);
-                    const typWicklung3 = new __1.TransformerEndInfo(__1.generateUUID());
+                    typTrafo.addTransformerEndInfo(typWicklung2);
+                    const typWicklung3 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(__1.generateUUID());
                     typWicklung3.ratedS = new __1.ApparentPower(i7Data.sr3, __1.UnitMultiplier.m, __1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung3, i7Data, 3);
                     typWicklung3.powerTransformerInfo = typTrafo;
-                    typTrafo.transformerEndInfo.push(typWicklung3);
-                    this.cimModel.addPowerTransformer3WInfo(typTrafo);
+                    typTrafo.addTransformerEndInfo(typWicklung3);
+                    this.cimModel.addEvPowerTransformerInfo(typTrafo);
+                    this.cimModel.addEvPowerTransformerEndInfo(typWicklung1);
+                    this.cimModel.addEvPowerTransformerEndInfo(typWicklung2);
+                    this.cimModel.addEvPowerTransformerEndInfo(typWicklung3);
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO3W} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO3W} ist nicht vorhanden.`);
             }
         });
     }
@@ -2259,23 +2409,24 @@ class ConverterIntegral7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new __1.PowerTransformer(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
-                    const powerTransformerInfo = this.cimModel.getPowerTransformer2WInfoByName(i7Data.nametyp);
-                    const start = this.memoryObjects.get(i7Data.aknoten);
+                    const substationName = this.substationNames.get(this.integralID2UUID.get(i7Data.standort));
+                    const powerTransformer = new __1.PowerTransformer(__1.getUUID(i7Data.guid), substationName + "/" + utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
+                    const powerTransformerInfo = this.cimModel.getPowerTransformerInfoByName(i7Data.nametyp);
+                    const start = this.inmemoryObjects.get(i7Data.aknoten);
                     let startTerminal;
                     if (start) {
                         startTerminal = __1.createConnection(this.cimModel, powerTransformer, start, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
+                        this.logger.info(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                     }
-                    const target = this.memoryObjects.get(i7Data.eknoten);
+                    const target = this.inmemoryObjects.get(i7Data.eknoten);
                     let targetTerminal;
                     if (target) {
                         targetTerminal = __1.createConnection(this.cimModel, powerTransformer, target, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        console.log(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.info(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Zielknoten.`);
                     }
                     const schaltgruppe = i7Data.schaltgr;
                     const powerTransformerEnd1 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w1), `W1${powerTransformer.name}`);
@@ -2287,10 +2438,12 @@ class ConverterIntegral7 {
                     const sr = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
                     const ur = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
                     const ir1 = (sr * Math.pow(10, 6) / ur * 1000) / Math.sqrt(3);
+                    const p0 = utils_2.isNumericI7(i7Data.p_leer) ? utils_2.convertToNumberI7(i7Data.p_leer) : 0;
+                    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, 0);
-                    powerTransformerEnd1.b = utils_2.calculateB(ur, sr, 0, 0);
+                    powerTransformerEnd1.g = utils_2.calculateG(ur, p0) * 1000000;
+                    powerTransformerEnd1.b = utils_2.calculateB(ur, sr, iLeer, p0) * 1000000;
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
                     if (powerTransformerEnd1.ratedU) {
@@ -2301,7 +2454,7 @@ class ConverterIntegral7 {
                         powerTransformerEnd1.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        console.log(`Wicklung2W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.info(`Wicklung2W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Spannungsangabe.`);
                     }
                     const terminal = startTerminal;
                     if (terminal) {
@@ -2314,7 +2467,7 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`Wicklung2W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.info(`Wicklung2W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
                     }
                     powerTransformerEnd1.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd1);
@@ -2339,7 +2492,7 @@ class ConverterIntegral7 {
                         powerTransformerEnd2.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        console.log(`Wicklung ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.info(`Wicklung ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Spannungsangabe.`);
                     }
                     const terminal2 = targetTerminal;
                     if (terminal2) {
@@ -2352,22 +2505,23 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`Wicklung2W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
-                        console.log(`TargetTerminal created ` + (targetTerminal === undefined));
+                        this.logger.info(`Wicklung2W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.info(`TargetTerminal created ` + (targetTerminal === undefined));
                     }
                     powerTransformerEnd2.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd2);
                     this.cimModel.addPowerTransformerEnd(powerTransformerEnd2);
+                    powerTransformer.sortTransformerEnd('ratedU', 'desc');
+                    for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
+                        powerTransformer.powerTransformerEnds[i].endNumber = i + 1;
+                    }
                     utils_2.createTapChanger(i7Data, powerTransformerEnd2, this.cimModel, powerTransformerEnd2.ratedU);
                     const substationUUID = this.integralID2UUID.get(i7Data.standort);
                     if (substationUUID) {
                         powerTransformer.equipmentContainerUUID = substationUUID;
-                        const i7Schluessel = +integral_prefix_1.TRAFO2WPRAEFIX_PRAEFIX +
-                            i7Data.bezeichner;
-                        powerTransformer.description = i7Schluessel;
                     }
                     else {
-                        console.log(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
+                        this.logger.info(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
                     this.cimModel.addPowerTransformer(powerTransformer);
                     this.integralID2UUID.set(i7Data.id, powerTransformer.mrid);
@@ -2375,7 +2529,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO2W} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO2W} ist nicht vorhanden.`);
             }
         });
     }
@@ -2394,7 +2548,7 @@ class ConverterIntegral7 {
                     }
                 }
                 else {
-                    console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG} ist nicht vorhanden.`);
+                    this.logger.info(`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) {
@@ -2404,8 +2558,9 @@ class ConverterIntegral7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new __1.PowerTransformer(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
-                    const powerTransformerInfo = this.cimModel.getPowerTransformer3WInfoByName(i7Data.nametyp);
+                    const substationName = this.substationNames.get(this.integralID2UUID.get(i7Data.standort));
+                    const powerTransformer = new __1.PowerTransformer(__1.getUUID(i7Data.guid), substationName + "/" + utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
+                    const powerTransformerInfo = this.cimModel.getPowerTransformerInfoByName(i7Data.nametyp);
                     const schaltgruppe = i7Data.schaltgr;
                     const pkr12 = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '12');
                     const pkr13 = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '13');
@@ -2430,16 +2585,16 @@ class ConverterIntegral7 {
                     const wicklung1 = trafoWicklungen.get(i7Data.trafowicklung3w1);
                     let terminal1, terminal2, terminal3;
                     if (wicklung1) {
-                        const start = this.memoryObjects.get(wicklung1.aknoten);
+                        const start = this.inmemoryObjects.get(wicklung1.aknoten);
                         if (start) {
                             terminal1 = __1.createConnection(this.cimModel, powerTransformer, start, __1.PhaseCode.ABC, 1);
                         }
                         else {
-                            console.log(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
+                            this.logger.info(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                         }
                     }
                     else {
-                        console.log(`Trafo ${i7Data.id} Wicklung 1 ${i7Data.trafowicklung3w1} ist nicht vorhanden.`);
+                        this.logger.info(`Trafo ${i7Data.id} Wicklung 1 ${i7Data.trafowicklung3w1} ist nicht vorhanden.`);
                     }
                     const powerTransformerEnd1 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w1), `W1 ${powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
@@ -2447,8 +2602,8 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
                     powerTransformerEnd1.r = impedanzW1.r;
                     powerTransformerEnd1.x = impedanzW1.x;
-                    powerTransformerEnd1.g = impedanzW1.g;
-                    powerTransformerEnd1.b = impedanzW1.b;
+                    powerTransformerEnd1.g = impedanzW1.g * 1000000;
+                    powerTransformerEnd1.b = impedanzW1.b * 1000000;
                     powerTransformerEnd1.ratedU = ur1;
                     powerTransformerEnd1.ratedS = sr1;
                     if (powerTransformerEnd1.ratedU) {
@@ -2459,7 +2614,7 @@ class ConverterIntegral7 {
                         powerTransformerEnd1.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        console.log(`Wicklung ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.info(`Wicklung ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Spannungsangabe.`);
                     }
                     powerTransformerEnd1.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd1);
@@ -2472,20 +2627,20 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`Wicklung3W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.info(`Wicklung3W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
                     }
                     const wicklung2 = trafoWicklungen.get(i7Data.trafowicklung3w2);
                     if (wicklung2) {
-                        const start = this.memoryObjects.get(wicklung2.aknoten);
+                        const start = this.inmemoryObjects.get(wicklung2.aknoten);
                         if (start) {
                             terminal2 = __1.createConnection(this.cimModel, powerTransformer, start, __1.PhaseCode.ABC, 2);
                         }
                         else {
-                            console.log(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
+                            this.logger.info(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                         }
                     }
                     else {
-                        console.log(`Trafo ${i7Data.id} Wicklung 2 ${i7Data.trafowicklung3w2} ist nicht vorhanden.`);
+                        this.logger.info(`Trafo ${i7Data.id} Wicklung 2 ${i7Data.trafowicklung3w2} ist nicht vorhanden.`);
                     }
                     const powerTransformerEnd2 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
@@ -2493,8 +2648,8 @@ class ConverterIntegral7 {
                     powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     powerTransformerEnd2.r = impedanzW2.r;
                     powerTransformerEnd2.x = impedanzW2.x;
-                    powerTransformerEnd2.g = impedanzW2.g;
-                    powerTransformerEnd2.b = impedanzW2.b;
+                    powerTransformerEnd2.g = impedanzW2.g * 1000000;
+                    powerTransformerEnd2.b = impedanzW2.b * 1000000;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     if (powerTransformerEnd2.ratedU) {
@@ -2505,7 +2660,7 @@ class ConverterIntegral7 {
                         powerTransformerEnd2.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        console.log(`Wicklung ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.info(`Wicklung ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Spannungsangabe.`);
                     }
                     powerTransformerEnd2.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd2);
@@ -2518,20 +2673,20 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`Wicklung3W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.info(`Wicklung3W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
                     }
                     const wicklung3 = trafoWicklungen.get(i7Data.trafowicklung3w3);
                     if (wicklung3) {
-                        const start = this.memoryObjects.get(wicklung3.aknoten);
+                        const start = this.inmemoryObjects.get(wicklung3.aknoten);
                         if (start) {
                             terminal3 = __1.createConnection(this.cimModel, powerTransformer, start, __1.PhaseCode.ABC, 3);
                         }
                         else {
-                            console.log(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
+                            this.logger.info(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                         }
                     }
                     else {
-                        console.log(`Trafo ${i7Data.id} Wicklung 3 ${i7Data.trafowicklung3w2} ist nicht vorhanden.`);
+                        this.logger.info(`Trafo ${i7Data.id} Wicklung 3 ${i7Data.trafowicklung3w2} ist nicht vorhanden.`);
                     }
                     const powerTransformerEnd3 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer.name}`);
                     powerTransformerEnd3.endNumber = 3;
@@ -2539,8 +2694,10 @@ class ConverterIntegral7 {
                     powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd3.endNumber);
                     powerTransformerEnd3.r = impedanzW3.r;
                     powerTransformerEnd3.x = impedanzW3.x;
-                    powerTransformerEnd2.g = impedanzW3.g;
-                    powerTransformerEnd2.b = impedanzW3.b;
+                    powerTransformerEnd2.g = impedanzW3.g * 1000000;
+                    ;
+                    powerTransformerEnd2.b = impedanzW3.b * 1000000;
+                    ;
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
                     if (powerTransformerEnd3.ratedU) {
@@ -2551,7 +2708,7 @@ class ConverterIntegral7 {
                         powerTransformerEnd3.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        console.log(`Wicklung3W ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.info(`Wicklung3W ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Spannungsangabe.`);
                     }
                     powerTransformerEnd3.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd3);
@@ -2564,7 +2721,11 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        console.log(`Wicklung ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.info(`Wicklung ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Terminalinstanz.`);
+                    }
+                    powerTransformer.sortTransformerEnd('ratedU', 'desc');
+                    for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
+                        powerTransformer.powerTransformerEnds[i].endNumber = i + 1;
                     }
                     const substationUUID = this.integralID2UUID.get(i7Data.standort);
                     if (substationUUID) {
@@ -2574,7 +2735,7 @@ class ConverterIntegral7 {
                         powerTransformer.description = i7Schluessel;
                     }
                     else {
-                        console.log(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
+                        this.logger.info(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
                     this.cimModel.addPowerTransformer(powerTransformer);
                     this.integralID2UUID.set(i7Data.id, powerTransformer.mrid);
@@ -2582,7 +2743,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3W} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3W} ist nicht vorhanden.`);
             }
         });
     }
@@ -2600,25 +2761,27 @@ class ConverterIntegral7 {
                 terminal.phases = __1.PhaseCode.N;
                 this.cimModel.addTerminal(terminal);
                 const junction = this.stpImpModel.junctions.get(junctionUUID);
+                if (junction)
+                    junction.name = (junction === null || junction === void 0 ? void 0 : junction.name) + '/Trafo';
                 const pSpuleGroundImpedance = this.stpImpModel.junctionUUIDstpImp.get(junctionUUID);
                 const subVlData = this.substationVoltagelevels.get(standortID);
-                const vlUUID = getVoltageLevelByVoltage(subVlData, powerTransformerEnd.ratedU);
-                if (!vlUUID) {
-                    console.log(`TrafoObjektID ${trafoObjektID} hat kein EquipmentContainer`);
+                const vlObject = getVoltageLevelByVoltage(subVlData, powerTransformerEnd.ratedU);
+                if (!vlObject) {
+                    this.logger.info(`TrafoObjektID ${trafoObjektID} hat kein EquipmentContainer`);
                 }
                 if (junction) {
-                    junction.baseVoltageUUID = powerTransformerEnd.baseVoltageUUID;
-                    junction.equipmentContainerUUID = vlUUID;
+                    junction.baseVoltageUUID = (vlObject === null || vlObject === void 0 ? void 0 : vlObject.baseVoltageUUID) ? vlObject === null || vlObject === void 0 ? void 0 : vlObject.baseVoltageUUID : powerTransformerEnd.baseVoltageUUID;
+                    junction.equipmentContainerUUID = vlObject === null || vlObject === void 0 ? void 0 : vlObject.vlUUID;
                 }
                 else {
-                    console.log(`TrafoObjektID ${trafoObjektID} hat keine Junction ${junctionUUID}`);
+                    this.logger.info(`TrafoObjektID ${trafoObjektID} hat keine Junction ${junctionUUID}`);
                 }
                 if (pSpuleGroundImpedance) {
-                    pSpuleGroundImpedance.baseVoltageUUID = powerTransformerEnd.baseVoltageUUID;
-                    pSpuleGroundImpedance.equipmentContainerUUID = vlUUID;
+                    pSpuleGroundImpedance.baseVoltageUUID = (vlObject === null || vlObject === void 0 ? void 0 : vlObject.baseVoltageUUID) ? vlObject === null || vlObject === void 0 ? void 0 : vlObject.baseVoltageUUID : powerTransformerEnd.baseVoltageUUID;
+                    pSpuleGroundImpedance.equipmentContainerUUID = vlObject === null || vlObject === void 0 ? void 0 : vlObject.vlUUID;
                 }
                 else {
-                    console.log(`TrafoObjektID ${trafoObjektID} hat keine pSpuleGroundImpedance`);
+                    this.logger.info(`TrafoObjektID ${trafoObjektID} hat keine pSpuleGroundImpedance`);
                 }
             }
         }
@@ -2632,7 +2795,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_KDROSSEL} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_KDROSSEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -2642,26 +2805,25 @@ class ConverterIntegral7 {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.LAENGSDROSSEL, limit, offset, []));
                 for (const i7Data of result) {
                     const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
-                    const start = this.memoryObjects.get(i7Data.aknoten);
+                    const start = this.inmemoryObjects.get(i7Data.aknoten);
                     let startTerminal;
                     if (start) {
                         startTerminal = __1.createConnection(this.cimModel, seriesCompensator, start, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
+                        this.logger.info(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
                     }
-                    const target = this.memoryObjects.get(i7Data.eknoten);
+                    const target = this.inmemoryObjects.get(i7Data.eknoten);
                     let targetTerminal;
                     if (target) {
                         targetTerminal = __1.createConnection(this.cimModel, seriesCompensator, target, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        console.log(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.info(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
                     }
                     const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, ur);
-                    seriesCompensator.baseVoltage = baseVoltage;
-                    const i = utils_2.isNumericI7(i7Data.ir) ? utils_2.convertToNumberI7(i7Data.ir) : defaultValuesConfig.SeriesCompensator.x;
+                    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;
@@ -2674,15 +2836,16 @@ class ConverterIntegral7 {
                         this.setConductingEquipmentCurrentLimit('Rating ' + seriesCompensator.name, terminal.mrid, i);
                     }
                     else {
-                        console.log(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.info(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
                     }
                     const subVlData = this.substationVoltagelevels.get(i7Data.standort);
-                    const vlUUID = getVoltageLevelByVoltage(subVlData, ur);
-                    if (vlUUID) {
-                        seriesCompensator.equipmentContainerUUID = vlUUID;
+                    const vlObject = getVoltageLevelByVoltage(subVlData, ur);
+                    if (vlObject) {
+                        seriesCompensator.equipmentContainerUUID = vlObject.vlUUID;
+                        seriesCompensator.baseVoltageUUID = vlObject.baseVoltageUUID;
                     }
                     else {
-                        console.log(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
+                        this.logger.info(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
                     const psrType = utils_1.createIfNotExitsPSRType(this.cimModel, 'Längsdrossel');
                     seriesCompensator.psrTypeUUID = psrType.mrid;
@@ -2691,7 +2854,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSDROSSEL} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSDROSSEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -2701,25 +2864,24 @@ class ConverterIntegral7 {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.LAENGSKONDENSATOR, limit, offset, []));
                 for (const i7Data of result) {
                     const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
-                    const start = this.memoryObjects.get(i7Data.aknoten);
+                    const start = this.inmemoryObjects.get(i7Data.aknoten);
                     let startTerminal;
                     if (start) {
                         startTerminal = __1.createConnection(this.cimModel, seriesCompensator, start, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
+                        this.logger.info(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
                     }
-                    const target = this.memoryObjects.get(i7Data.eknoten);
+                    const target = this.inmemoryObjects.get(i7Data.eknoten);
                     let targetTerminal;
                     if (target) {
                         targetTerminal = __1.createConnection(this.cimModel, seriesCompensator, target, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        console.log(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.info(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
                     }
                     const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, ur);
-                    seriesCompensator.baseVoltage = baseVoltage;
                     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) {
@@ -2733,16 +2895,17 @@ class ConverterIntegral7 {
                         this.setConductingEquipmentCurrentLimit('Rating ' + seriesCompensator.name, terminal.mrid, i);
                     }
                     else {
-                        console.log(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.info(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
                     }
                     const substationUUID = this.integralID2UUID.get(i7Data.standort);
                     const subVlData = this.substationVoltagelevels.get(i7Data.standort);
-                    const vlUUID = getVoltageLevelByVoltage(subVlData, ur);
-                    if (vlUUID) {
-                        seriesCompensator.equipmentContainerUUID = vlUUID;
+                    const vlObject = getVoltageLevelByVoltage(subVlData, ur);
+                    if (vlObject) {
+                        seriesCompensator.equipmentContainerUUID = vlObject.vlUUID;
+                        seriesCompensator.baseVoltageUUID = vlObject.baseVoltageUUID;
                     }
                     else {
-                        console.log(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
+                        this.logger.info(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
                     const psrType = utils_1.createIfNotExitsPSRType(this.cimModel, 'Längskondensator');
                     seriesCompensator.psrTypeUUID = psrType.mrid;
@@ -2751,7 +2914,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR} ist nicht vorhanden.`);
             }
         });
     }
@@ -2762,8 +2925,8 @@ class ConverterIntegral7 {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TRENNER_3P, 0, 0, containerIDs));
                 for (const i7Data of result) {
                     const disconnector = new __1.Disconnector(__1.getUUID(i7Data.guid), i7Data.bezeichner);
-                    disconnector.normalOpen = utils_2.convertToBooleanI7(!i7Data.schaltzustand);
-                    disconnector.open = utils_2.convertToBooleanI7(!i7Data.schaltzustand);
+                    disconnector.normalOpen = !utils_2.convertToBooleanI7(i7Data.schaltzustand);
+                    disconnector.open = !utils_2.convertToBooleanI7(i7Data.schaltzustand);
                     const equipmentContainer = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.seliste));
                     const cnStart = this.cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
                     const cnZiel = this.cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
@@ -2771,19 +2934,19 @@ class ConverterIntegral7 {
                         disconnector.equipmentContainerUUID = equipmentContainer.mrid;
                     }
                     else {
-                        console.log(`Disconnector ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        this.logger.info(`Disconnector ${i7Data.id} besitzt keinen EquipmentContainer.`);
                     }
                     if (cnStart) {
                         __1.createConnection(this.cimModel, disconnector, cnStart, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`Disconnector ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                        this.logger.info(`Disconnector ${i7Data.id} besitzt keinen Anfangsknoten.`);
                     }
                     if (cnZiel) {
                         __1.createConnection(this.cimModel, disconnector, cnZiel, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        console.log(`Disconnector ${i7Data.id} besitzt keinen Zielknoten.`);
+                        this.logger.info(`Disconnector ${i7Data.id} besitzt keinen Zielknoten.`);
                     }
                     const vl = this.cimModel.objects.get((_a = equipmentContainer) === null || _a === void 0 ? void 0 : _a.voltageLevelUUID);
                     const baseVoltage = this.cimModel.getBaseVoltageByUUID(vl === null || vl === void 0 ? void 0 : vl.baseVoltageUUID);
@@ -2795,7 +2958,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TRENNER_3P} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRENNER_3P} ist nicht vorhanden.`);
             }
         });
     }
@@ -2806,8 +2969,8 @@ class ConverterIntegral7 {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TRENNERFI_3P, 0, 0, containerIDs));
                 for (const i7Data of result) {
                     const disconnector = new __1.Disconnector(__1.generateUUID(), i7Data.bezeichner);
-                    disconnector.normalOpen = utils_2.convertToBooleanI7(i7Data.schaltzustand);
-                    disconnector.open = utils_2.convertToBooleanI7(i7Data.schaltzustand);
+                    disconnector.normalOpen = !utils_2.convertToBooleanI7(i7Data.schaltzustand);
+                    disconnector.open = !utils_2.convertToBooleanI7(i7Data.schaltzustand);
                     const equipmentContainer = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.seliste));
                     const cnStart = this.cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
                     const cnZiel = this.cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
@@ -2815,19 +2978,19 @@ class ConverterIntegral7 {
                         disconnector.equipmentContainerUUID = equipmentContainer.mrid;
                     }
                     else {
-                        console.log(`Disconnector Fi3 ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        this.logger.info(`Disconnector Fi3 ${i7Data.id} besitzt keinen EquipmentContainer.`);
                     }
                     if (cnStart) {
                         __1.createConnection(this.cimModel, disconnector, cnStart, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`Disconnector Fi3 ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                        this.logger.info(`Disconnector Fi3 ${i7Data.id} besitzt keinen Anfangsknoten.`);
                     }
                     if (cnZiel) {
                         __1.createConnection(this.cimModel, disconnector, cnZiel, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        console.log(`Disconnector Fi3 ${i7Data.id} besitzt keinen Zielknoten.`);
+                        this.logger.info(`Disconnector Fi3 ${i7Data.id} besitzt keinen Zielknoten.`);
                     }
                     const vl = this.cimModel.objects.get((_a = equipmentContainer) === null || _a === void 0 ? void 0 : _a.voltageLevelUUID);
                     const baseVoltage = this.cimModel.getBaseVoltageByUUID(vl === null || vl === void 0 ? void 0 : vl.baseVoltageUUID);
@@ -2839,7 +3002,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.TRENNERFI_3P} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRENNERFI_3P} ist nicht vorhanden.`);
             }
         });
     }
@@ -2850,8 +3013,8 @@ class ConverterIntegral7 {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, 0, 0, containerIDs));
                 for (const i7Data of result) {
                     const breaker = new __1.Breaker(__1.generateUUID(), i7Data.bezeichner);
-                    breaker.normalOpen = utils_2.convertToBooleanI7(i7Data.schaltzustand);
-                    breaker.open = utils_2.convertToBooleanI7(i7Data.schaltzustand);
+                    breaker.normalOpen = !utils_2.convertToBooleanI7(i7Data.schaltzustand);
+                    breaker.open = !utils_2.convertToBooleanI7(i7Data.schaltzustand);
                     const equipmentContainer = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.seliste));
                     const cnStart = this.cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
                     const cnZiel = this.cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
@@ -2859,19 +3022,19 @@ class ConverterIntegral7 {
                         breaker.equipmentContainerUUID = equipmentContainer.mrid;
                     }
                     else {
-                        console.log(`LS ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        this.logger.info(`LS ${i7Data.id} besitzt keinen EquipmentContainer.`);
                     }
                     if (cnStart) {
                         __1.createConnection(this.cimModel, breaker, cnStart, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`LS ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                        this.logger.info(`LS ${i7Data.id} besitzt keinen Anfangsknoten.`);
                     }
                     if (cnZiel) {
                         __1.createConnection(this.cimModel, breaker, cnZiel, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        console.log(`LS ${i7Data.id} besitzt keinen Zielknoten.`);
+                        this.logger.info(`LS ${i7Data.id} besitzt keinen Zielknoten.`);
                     }
                     const vl = this.cimModel.objects.get((_a = equipmentContainer) === null || _a === void 0 ? void 0 : _a.voltageLevelUUID);
                     const baseVoltage = this.cimModel.getBaseVoltageByUUID(vl === null || vl === void 0 ? void 0 : vl.baseVoltageUUID);
@@ -2883,7 +3046,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER} ist nicht vorhanden.`);
             }
         });
     }
@@ -2901,11 +3064,11 @@ class ConverterIntegral7 {
                             dcConverterUnit.setSubstation(equipmentContainer);
                         }
                         else {
-                            console.log(`DCConverterUnit ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`DCConverterUnit ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     const csConverter = new CsConverter_1.CsConverter(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     csConverter.equipmentContainer = dcConverterUnit;
@@ -2934,7 +3097,7 @@ class ConverterIntegral7 {
                         __1.createConnection(this.cimModel, csConverter, acConnectivityNode, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
+                        this.logger.info(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
                     const dcNode = new DCNode_1.DCNode(__1.generateUUID(), 'DCNode');
                     dcNode.dcEquipmentContainerUUID = dcConverterUnit.mrid;
@@ -2966,11 +3129,11 @@ class ConverterIntegral7 {
                             dcConverterUnit.setSubstation(equipmentContainer);
                         }
                         else {
-                            console.log(`DCConverterUnit ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`DCConverterUnit ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     const vsConverter = new VsConverter_1.VsConverter(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     vsConverter.equipmentContainer = dcConverterUnit;
@@ -3002,7 +3165,7 @@ class ConverterIntegral7 {
                         __1.createConnection(this.cimModel, vsConverter, acConnectivityNode, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        console.log(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
+                        this.logger.info(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
                     const dcNode = new DCNode_1.DCNode(__1.generateUUID(), 'DCNode');
                     dcNode.dcEquipmentContainerUUID = dcConverterUnit.mrid;
@@ -3051,7 +3214,7 @@ class ConverterIntegral7 {
                             converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
                         }
                     }
-                    const startDCNode = this.memoryObjects.get(i7Data.anetzobjekt);
+                    const startDCNode = this.inmemoryObjects.get(i7Data.anetzobjekt);
                     if (startDCNode) {
                         const dcTerminal = new DCTerminal_1.DCTerminal(__1.generateUUID(), 'DCTerminal_HGÜ_Leitung');
                         dcTerminal.sequenceNumber = 2;
@@ -3060,9 +3223,9 @@ class ConverterIntegral7 {
                         this.cimModel.addDCTerminal(dcTerminal);
                     }
                     else {
-                        console.log(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
+                        this.logger.info(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
                     }
-                    const tartgetDCNode = this.memoryObjects.get(i7Data.enetzobjekt);
+                    const tartgetDCNode = this.inmemoryObjects.get(i7Data.enetzobjekt);
                     if (tartgetDCNode) {
                         const dcTerminal = new DCTerminal_1.DCTerminal(__1.generateUUID(), 'DCTerminal_HGÜ_Leitung');
                         dcTerminal.sequenceNumber = 2;
@@ -3071,7 +3234,7 @@ class ConverterIntegral7 {
                         this.cimModel.addDCTerminal(dcTerminal);
                     }
                     else {
-                        console.log(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
+                        this.logger.info(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
                     }
                     this.cimModel.addDCLine(dcLine);
                     this.cimModel.addDCLineSegment(dcLineSegment);
@@ -3079,7 +3242,66 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.HGUE_LEITUNG} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.HGUE_LEITUNG} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertBoundaryInjections(knotenIDs) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION)) {
+                const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.BOUNDARYINJECTION, 0, 0, knotenIDs));
+                for (const i7Data of result) {
+                    const externalNetworkInjection = new __1.ExternalNetworkInjection(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    __1.createSvStatus(this.cimModel, inBetrieb, externalNetworkInjection);
+                    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);
+                    externalNetworkInjection.governorSCD = utils_2.convertToNumberI7(i7Data.kr);
+                    externalNetworkInjection.referencePriority = einspeisePrio;
+                    externalNetworkInjection.maxZ0ToZ1Ratio = utils_2.convertToNumberI7(i7Data.z0_z1);
+                    const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_BI_${i7Data.id}`);
+                    regulatingControl.mode = __1.RegulatingControlModeKind.voltage;
+                    regulatingControl.discrete = true;
+                    regulatingControl.enabled = inBetrieb;
+                    regulatingControl.targetValueUnitMultiplier = __1.UnitMultiplier.k;
+                    externalNetworkInjection.regulatingControl = regulatingControl;
+                    const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                    if (connectivityNode) {
+                        const terminal = __1.createConnection(this.cimModel, externalNetworkInjection, connectivityNode, __1.PhaseCode.ABC);
+                        regulatingControl.terminal = terminal;
+                        terminal.addRegulatingControl(regulatingControl);
+                        const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
+                        if (equipmentContainer) {
+                            externalNetworkInjection.equipmentContainerUUID = equipmentContainer.mrid;
+                            const sollSpanungen = this.eqSpannungsBander.get(equipmentContainer.mrid);
+                            if (sollSpanungen === null || sollSpanungen === void 0 ? void 0 : sollSpanungen.length) {
+                                for (const spannung of sollSpanungen) {
+                                    if (utils_2.isNumericI7(spannung.usoll)) {
+                                        regulatingControl.targetValue = spannung.usoll;
+                                        if (utils_2.isNumericI7(spannung.umin) && utils_2.isNumericI7(spannung.umax)) {
+                                            const targetDealBand = utils_2.convertToNumberI7(spannung.umax) - utils_2.convertToNumberI7(spannung.usoll);
+                                            regulatingControl.targetDeadband = targetDealBand;
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        else {
+                            this.logger.info(`BoundaryInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        }
+                    }
+                    else {
+                        this.logger.info(`BoundaryInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                    }
+                    this.cimModel.addExternalNetworkInjection(externalNetworkInjection);
+                    this.cimModel.addRegulatingControl(regulatingControl);
+                    this.integralID2UUID.set(i7Data.id, externalNetworkInjection.mrid);
+                }
+            }
+            else {
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -3111,16 +3333,16 @@ class ConverterIntegral7 {
                             this.integralID2UUID.set(i7Data.id, asynchronousMachine.mrid);
                         }
                         else {
-                            console.log(`AsynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`AsynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`AsynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`AsynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR} ist nicht vorhanden.`);
             }
         });
     }
@@ -3136,7 +3358,7 @@ class ConverterIntegral7 {
                     const spannungsregelungLokal = utils_2.isBooleanI7(i7Data.flag_lf) ? utils_2.convertToBooleanI7(i7Data.flag_lf) : false;
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RegulatingControl_${shunt.name}`);
+                        const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_Kompdrossel ${i7Data.id}`);
                         regulatingControl.mode = __1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
                         regulatingControl.targetDeadband = i7Data.uband;
@@ -3159,16 +3381,16 @@ class ConverterIntegral7 {
                             this.integralID2UUID.set(i7Data.id, shunt.mrid);
                         }
                         else {
-                            console.log(`LinearShuntCompensator ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`LinearShuntCompensator ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`LinearShuntCompensator ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`LinearShuntCompensator ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -3184,7 +3406,7 @@ class ConverterIntegral7 {
                     const spannungsregelungLokal = utils_2.isBooleanI7(i7Data.flag_lf) ? utils_2.convertToBooleanI7(i7Data.flag_lf) : false;
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RegulatingControl_${shunt.name}`);
+                        const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_Kompkons ${i7Data.id}`);
                         regulatingControl.mode = __1.RegulatingControlModeKind.voltage;
                         shunt.regulatingControl = regulatingControl;
                         this.cimModel.addRegulatingControl(shunt.regulatingControl);
@@ -3204,16 +3426,16 @@ class ConverterIntegral7 {
                             this.integralID2UUID.set(i7Data.id, shunt.mrid);
                         }
                         else {
-                            console.log(`LinearShuntCompensator ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.info(`LinearShuntCompensator ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        console.log(`LinearShuntCompensator ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.info(`LinearShuntCompensator ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -3232,17 +3454,20 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                console.log(`Tabelle ${integral_sql_1.Integral7TableNames.NETZVARIANTEN} ist nicht vorhanden.`);
+                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NETZVARIANTEN} ist nicht vorhanden.`);
             }
         });
     }
-    setWireInfoProperties(object, data) {
+    setWireInfoProperties(object, data, type) {
+        object.name = data.name;
+        object.type = type;
+        object.voltage = data.un;
         object.r1 = +data.r1;
         object.x1 = +data.x1;
-        object.c1 = new __1.CapacitancePerLength(data.c1, __1.UnitMultiplier.micro, __1.UnitSymbol.F);
-        object.r0 = new __1.ResistancePerLength(data.r1, __1.UnitMultiplier.none, __1.UnitSymbol.ohm);
-        object.x0 = new __1.ReactancePerLength(data.x1, __1.UnitMultiplier.none, __1.UnitSymbol.ohm);
-        object.c0 = new __1.CapacitancePerLength(data.c1, __1.UnitMultiplier.micro, __1.UnitSymbol.F);
+        object.c1 = +data.c1;
+        object.r0 = +data.r0;
+        object.x0 = +data.x0;
+        object.c0 = +data.c0;
         object.ratedCurrent = +data.ir;
     }
     setACLineSegmentProperties(acLineSegment, data, psrTypeName, defaultValuesConfig) {
@@ -3262,7 +3487,7 @@ class ConverterIntegral7 {
         }
         else {
             if (assetType) {
-                acLineSegment.r0 = assetType.r0.value * acLineSegment.length;
+                acLineSegment.r0 = assetType.r0 * acLineSegment.length;
             }
         }
         if (data.x0 && data.x0 !== 0) {
@@ -3270,7 +3495,7 @@ class ConverterIntegral7 {
         }
         else {
             if (assetType) {
-                acLineSegment.x0 = assetType.x0.value * acLineSegment.length;
+                acLineSegment.x0 = assetType.x0 * acLineSegment.length;
             }
         }
         if (data.r1 && data.r1 !== 0) {
@@ -3333,7 +3558,7 @@ class ConverterIntegral7 {
         const ur = `ur${endNumber}`;
         wicklung.endNumber = endNumber;
         wicklung.ratedU = new __1.Voltage(data[ur], __1.UnitMultiplier.k, __1.UnitSymbol.V);
-        wicklung.tapActiv = utils_2.convertToBooleanI7(data[gestufte_seite]);
+        wicklung.tapActive = utils_2.convertToBooleanI7(data[gestufte_seite]);
         const tapChangerInfo = new TapChangerInfo_1.TapChangerInfo(__1.generateUUID(), `TapChangerInfo_${data['id']}`);
         tapChangerInfo.highStep = data[maxstufe];
         tapChangerInfo.lowStep = data[minstufe];
@@ -3383,6 +3608,7 @@ class ConverterIntegral7 {
             utils_1.writeElementAttribute(xmlWriter, `xmlns:${__1.RDF_XML.AMPRION_NS_PREFIX}`, __1.RDF_XML.AMPRION_NS);
             utils_1.writeElementAttribute(xmlWriter, `xmlns:${__1.RDF_XML.IPS_NS_PREFIX}`, __1.RDF_XML.IPS_NS);
             utils_1.writeElementAttribute(xmlWriter, `xmlns:${__1.RDF_XML.CAPE_NS_PREFIX}`, __1.RDF_XML.CAPE_NS);
+            utils_1.writeElementAttribute(xmlWriter, `xmlns:${__1.RDF_XML.EV_NS_PREFIX}`, __1.RDF_XML.ENERVANCE_NS);
         }
     }
     writeHeaderEnd(xmlWriter) {
@@ -3402,7 +3628,7 @@ class ConverterIntegral7 {
     }
     checkMemoryObject(i7ID, cimObject) {
         if (this.leitungAnschlussKnotenIDs.has(i7ID)) {
-            this.memoryObjects.set(i7ID, cimObject);
+            this.inmemoryObjects.set(i7ID, cimObject);
             return true;
         }
         return false;
@@ -3450,22 +3676,85 @@ class ConverterIntegral7 {
         const conformLoadGroup = new ConformLoadGroup_1.ConformLoadGroup(__1.generateUUID(), defaultValuesConfig.ConformLoadGroup.name);
         conformLoadGroup.subLoadArea = subLoadArea;
         this.cimModel.addConformLoadGroup(conformLoadGroup);
+        const crsUrn = 'urn:ogc:def:crs:EPSG::4326';
+        const coordinateSystem = new __1.CoordinateSystem(__1.generateUUID(), this.coordinateSystemName);
+        coordinateSystem.crsUrn = crsUrn;
+        this.cimModel.addCoordinateSystem(coordinateSystem);
     }
 }
 exports.ConverterIntegral7 = ConverterIntegral7;
 function getVoltageLevelByVoltage(subVlData, ur) {
-    let vlUUID;
+    let vlObject;
     let abstand = 1000;
     if (subVlData && subVlData.length) {
         for (const vlData of subVlData) {
             const abstandAkt = Math.abs(vlData.un - ur);
             if (abstandAkt < abstand) {
                 abstand = abstandAkt;
-                vlUUID = vlData.vlUUID;
+                vlObject = vlData;
             }
         }
     }
-    return vlUUID;
+    return vlObject;
 }
 exports.getVoltageLevelByVoltage = getVoltageLevelByVoltage;
+function validateRegulatingControls(regulatingControls, logger, type) {
+    for (const rg of regulatingControls.values()) {
+        if (!rg.name)
+            logger.info(`RegulatingControl ohne Namen | ${type}`);
+        const terminalUUID = rg.terminal ? rg.terminal.mrid : rg.terminalUUID;
+        if (!terminalUUID)
+            logger.info(`RegulatingControl ohne Terminal ${rg.name} | ${type}`);
+    }
+}
+function getGeoCoordinates(i7Data) {
+    if (i7Data.geokoor_pl_breite_h && i7Data.geokoor_pl_breite_m && i7Data.geokoor_pl_breite_s) {
+        const lon = (((i7Data.geokoor_pl_laenge_s / 60) + i7Data.geokoor_pl_laenge_m) / 60) + i7Data.geokoor_pl_laenge_h;
+        const lat = (((i7Data.geokoor_pl_breite_s / 60) + i7Data.geokoor_pl_breite_m) / 60) + i7Data.geokoor_pl_breite_h;
+        return [String(lon), String(lat)];
+    }
+    if (i7Data.geokoor_pl_breite_h && i7Data.geokoor_pl_laenge_s) {
+        return [String(i7Data.geokoor_pl_laenge_s), String(i7Data.geokoor_pl_breite_s)];
+    }
+    return undefined;
+}
+exports.getGeoCoordinates = getGeoCoordinates;
+function getValidTerminals(objects, inMemoryObjects) {
+    const exportTerminals = new Map();
+    for (const value of objects.values()) {
+        if (value instanceof __1.Terminal) {
+            const terminal = value;
+            if ((terminal.conductingEquipment || terminal.conductingEquipmentUUID) &&
+                (terminal.connectivityNode || terminal.connectivityNodeUUID)) {
+                exportTerminals.set(value.mrid, value);
+            }
+            else {
+                inMemoryObjects.set(value.mrid, value);
+            }
+        }
+    }
+    return exportTerminals;
+}
+exports.getValidTerminals = getValidTerminals;
+function validateInMemoryObjects(objects) {
+    const exportTerminals = new Map();
+    for (const entry of objects.entries()) {
+        const value = entry[1];
+        if (value instanceof __1.Terminal) {
+            const terminal = value;
+            if ((terminal.conductingEquipment || terminal.conductingEquipmentUUID) &&
+                (terminal.connectivityNode || terminal.connectivityNodeUUID)) {
+                exportTerminals.set(value.mrid, value);
+            }
+            if (terminal.conductingEquipment && terminal.conductingEquipmentUUID) {
+                this.logger.info(`Terminal ohne conductingEquipment UUID ${terminal.mrid} shortName ${terminal.shortName} ID | ${entry[0]}`);
+            }
+            if (terminal.connectivityNode && terminal.connectivityNodeUUID) {
+                this.logger.info(`Terminal ohne connectivityNode UUID ${terminal.mrid} shortName ${terminal.shortName} ID | ${entry[0]}`);
+            }
+        }
+    }
+    return exportTerminals;
+}
+exports.validateInMemoryObjects = validateInMemoryObjects;
 //# sourceMappingURL=ConverterIntegral7.js.map