@enervance/insight-cim-model 0.0.37 → 0.0.38

package/dist/converter/integral7/converter-i7.d.ts

@@ -59,11 +59,11 @@ export declare class ConverterI7 {
     convertSchlaufen(cimModel: Model, integral7: Integral7Model, knotenSoIDs: number[]): Promise<void>;
     convertBelastungen(cimModel: INTEGRALModel, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig, targetClass: string): Promise<any>;
     convertEinspeisungen(cimModel: INTEGRALModel, knotenSfIDs: number[], targetClass: string): Promise<void>;
-    convertErsatzQuerZweige(cimModel: Model, knotenSfIDs: number[], targetClass: string): Promise<void>;
+    convertErsatzQuerZweige(cimModel: INTEGRALModel, knotenSfIDs: number[], targetClass: string): Promise<void>;
     convertGeneratoren(cimModel: Model, knotenSfIDs: number[], energyTypesConfig: any): Promise<void>;
     convertAsynchronmotor(cimModel: INTEGRALModel, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig): Promise<void>;
     convertKraftwerksbloecke(cimModel: INTEGRALModel, knotenSfIDs: number[], energyTypesConfig: any): Promise<void>;
-    convertErsatzQuerZweige2ExternalNetworkInjection(cimModel: Model, result: Ersatzquerzweig[]): Promise<void>;
+    convertErsatzQuerZweige2ExternalNetworkInjection(cimModel: INTEGRALModel, result: Ersatzquerzweig[]): Promise<void>;
     convertErsatzQuerZweige2EquivalentInjection(cimModel: Model, result: Ersatzquerzweig[]): Promise<void>;
     convertBoundaryInjections(cimModel: INTEGRALModel, knotenSfIDs: number[], targetClass: string): Promise<void>;
     private convertBoundaryInjections2EquivalentInjection;

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

@@ -132,6 +132,7 @@ const constants_1 = require("./model/dl-utils/constants");
 const SsabNsg_1 = require("./model/dl-utils/SsabNsg");
 const Laengskupplung_1 = require("./model/integral/Laengskupplung");
 const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel/INTEGRALConformLoad");
+const AngleDegrees_1 = require("../../model/domain/AngleDegrees");
 class ConverterI7 {
     constructor() {
         this.exportFrames = new Map();
@@ -536,8 +537,8 @@ class ConverterI7 {
                     this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGION, 0, 0, []))
                         .then((result) => {
                         for (const i7Data of result) {
-                            const i7Schluesel = integral_prefix_1.GEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_GR"]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                            const i7Schluessel = integral_prefix_1.GEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
+                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_GR"]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
                         }
@@ -734,26 +735,26 @@ class ConverterI7 {
             if (schaltanlagenabschnittIDs.length <= 0)
                 return;
             const isEingeblendet = 1;
-            const innerSQLisEingeblendet = `IFNULL(
-                                      (SELECT max(slotnummer) + 1
-                                      FROM nsg_nsgschaltfeld AS nsg_nsgsf
-                                      WHERE nsg_nsgsf.nsgsaa = nsg_nsgsaab.id
-                                      AND nsg_nsgsf.eingeblendet = ${isEingeblendet}),
+            const innerSQLisEingeblendet = `IFNULL(
+                                      (SELECT max(slotnummer) + 1
+                                      FROM nsg_nsgschaltfeld AS nsg_nsgsf
+                                      WHERE nsg_nsgsf.nsgsaa = nsg_nsgsaab.id
+                                      AND nsg_nsgsf.eingeblendet = ${isEingeblendet}),
                                     1)`;
             const outerSQLisEingeblendet = `AND nsg_nsgsaab.eingeblendet = ${isEingeblendet}`;
-            const sqlStatement = `SELECT nsg_nsgsaab.variantennr,
-              nsg_nsgsaab.id,
-              ${onlyEingeblendet ? innerSQLisEingeblendet : 'nsg_nsgsaab.laenge'} as laenge,
-              nsg_nsgsaab.nslots,
-              nsg_nsgsaab.saabschnitt,
-              nsg_nsgsaab.nsgsa,
-              nsg_nsgsaab.eingeblendet,
-              nsg_nsgsaab.nsglkp,
-              netz_ssab.pos AS posSSAB,
-              netz_ssab.id  AS idSSAB
-       FROM nsg_nsgsaabschnitt AS nsg_nsgsaab
-                LEFT JOIN netz_ssab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
-       WHERE (${integral_sql_1.getWhereIDs('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')})
+            const sqlStatement = `SELECT nsg_nsgsaab.variantennr,
+              nsg_nsgsaab.id,
+              ${onlyEingeblendet ? innerSQLisEingeblendet : 'nsg_nsgsaab.laenge'} as laenge,
+              nsg_nsgsaab.nslots,
+              nsg_nsgsaab.saabschnitt,
+              nsg_nsgsaab.nsgsa,
+              nsg_nsgsaab.eingeblendet,
+              nsg_nsgsaab.nsglkp,
+              netz_ssab.pos AS posSSAB,
+              netz_ssab.id  AS idSSAB
+       FROM nsg_nsgsaabschnitt AS nsg_nsgsaab
+                LEFT JOIN netz_ssab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
+       WHERE (${integral_sql_1.getWhereIDs('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')})
            ${onlyEingeblendet ? outerSQLisEingeblendet : ''};`;
             const queryResults = yield this.mysqlController.execQuery(sqlStatement);
             const filteredResults = queryResults.filter(elem => elem.variantennr === variantenNr);
@@ -1371,7 +1372,7 @@ class ConverterI7 {
                     synchronousMachine.ratedU = usoll ? usoll : ur;
                     synchronousMachine.aggregate = true;
                     synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
-                    synchronousMachine.r = utils_2.isNumericI7(i7Data.rg) ? utils_2.convertToNumberI7(i7Data.rg) : undefined;
+                    synchronousMachine.r = utils_2.isNumericI7(i7Data.rg) ? utils_2.convertToNumberI7(i7Data.rg) : genType === null || genType === void 0 ? void 0 : genType.rg;
                     if (!isRotatingPhaseShifter) {
                         const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), util_create_1.createNotation(['CurveData', synchronousMachine.mrid, "_RCC"]));
                         reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
@@ -1717,7 +1718,7 @@ class ConverterI7 {
     }
     convertBoundaryInjections2EquivalentInjection(cimModel, result) {
         for (const i7Data of result) {
-            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), 'BD_EI', `_${cimModel.equivalentInjections.size}`]), i7Data.kurzname);
+            const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), 'BD_EI']), i7Data.kurzname);
             const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
             const einspeisePrio = utils_2.convertToNumberI7(i7Data.einspprio);
             equivalentInjection.p = utils_2.convertToNumberI7(i7Data.p_ersatznetz) + utils_2.convertToNumberI7(i7Data.p_restnetz);
@@ -2134,6 +2135,14 @@ class ConverterI7 {
                     externalNetworkInjection.minP = minP;
                     const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
                     externalNetworkInjection.minQ = minQ;
+                    const maxR0X0Ratio = undefined;
+                    externalNetworkInjection.maxR0ToX0Ratio = maxR0X0Ratio;
+                    const maxR1X1Ratio = undefined;
+                    externalNetworkInjection.maxR1ToX1Ratio = maxR1X1Ratio;
+                    const maxZ0Z1Ratio = undefined;
+                    externalNetworkInjection.maxZ0ToZ1Ratio = maxZ0Z1Ratio;
+                    const minIkSecond = undefined;
+                    externalNetworkInjection.minInitialSymShCCurrent = minIkSecond;
                     const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
                     const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : false;
                     let regulatingControl = undefined;
@@ -2157,6 +2166,7 @@ class ConverterI7 {
                     }
                     this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
                     const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                    externalNetworkInjection.referencePriority = prio;
                     if ((regulatingControl === null || regulatingControl === void 0 ? void 0 : regulatingControl.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
                         externalNetworkInjection.referencePriority = prio;
                     }
@@ -2947,6 +2957,8 @@ class ConverterI7 {
                     typTrafo.pkr12 = i7Data.pkr;
                     typTrafo.pLeer = i7Data.p_leer;
                     typTrafo.iLeer = i7Data.i_leer;
+                    typTrafo.schaltgruppe = i7Data.schaltgr;
+                    typTrafo.spezialRegelung = i7Data.trafo_spezial;
                     const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(utils_1.generateUUID());
                     typWicklung1.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
@@ -3050,7 +3062,7 @@ class ConverterI7 {
         });
     }
     convertTrafo2W(frame, integral7, defaultValuesConfig, standortIDs) {
-        var _a;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W)) {
                 const cimModel = frame.cimModel;
@@ -3082,8 +3094,8 @@ class ConverterI7 {
                     else {
                         powerTransformer.isPartOfGeneratorUnit = false;
                     }
-                    const schaltgruppe = i7Data.schaltgr;
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1${powerTransformer.name}`);
+                    const schaltgruppe = ((_b = i7Data.schaltgr) === null || _b === void 0 ? void 0 : _b.length) ? i7Data.schaltgr : powerTransformerInfo === null || powerTransformerInfo === void 0 ? void 0 : powerTransformerInfo.schaltgruppe;
+                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     const pkr = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '');
                     const ukr = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '') / 100;
@@ -3140,7 +3152,7 @@ class ConverterI7 {
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
                     const connectivityNode = cimModel.getObject(cnUUID);
-                    this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, connectivityNode, spannungsband);
+                    this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
                     cimModel.addPowerTransformer(powerTransformer);
@@ -3290,13 +3302,12 @@ class ConverterI7 {
                     powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
                     powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd3.endNumber);
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
-                    const terminals = [terminal1, terminal2, terminal3];
                     const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2, powerTransformerEnd3];
                     const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
                     const connectivityNode = cimModel.getObject(cnUUID);
-                    this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, connectivityNode, spannungsband);
+                    this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
                     cimModel.addPowerTransformer(powerTransformer);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
@@ -3315,17 +3326,19 @@ class ConverterI7 {
         const maxstufe = `maxstufe_s${endNumber}`;
         const umax = `umax_s${endNumber}`;
         const umin = `umin_s${endNumber}`;
-        const gestufte_seite = `gestufte_seite_s${endNumber}`;
+        const gestufteSeite = `gestufte_seite_s${endNumber}`;
+        const winkel = `uzus_winkel_s${endNumber}`;
         const ur = `ur${endNumber}`;
         powerTransformerEndInfo.endNumber = endNumber;
         powerTransformerEndInfo.ratedU = new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
-        powerTransformerEndInfo.tapActive = utils_2.convertToBooleanI7(data[gestufte_seite]);
+        powerTransformerEndInfo.gestufteSeite = utils_2.convertToNumberI7(data[gestufteSeite]);
         const tapChangerInfo = new EVTapChangerInfo_1.EVTapChangerInfo(utils_1.generateUUID(), `TapChangerInfo_${data['id']}`);
         tapChangerInfo.highStep = utils_2.convertToNumberI7(data[maxstufe]);
         tapChangerInfo.lowStep = utils_2.convertToNumberI7(data[minstufe]);
         tapChangerInfo.neutralStep = utils_2.convertToNumberI7(data[neutralstufe]);
-        powerTransformerEndInfo.uMax = data[umax];
-        powerTransformerEndInfo.uMin = data[umin];
+        tapChangerInfo.stepPhaseIncrement = utils_2.isNumericI7(data[winkel]) ? new AngleDegrees_1.AngleDegrees(data[winkel], UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.deg) : undefined;
+        tapChangerInfo.uMax = data[umax];
+        tapChangerInfo.uMin = data[umin];
         tapChangerInfo.setPowerTransfomerEndInfo(powerTransformerEndInfo);
         powerTransformerEndInfo.setTapChangerInfo(tapChangerInfo);
     }
@@ -3660,32 +3673,35 @@ class ConverterI7 {
         return undefined;
     }
     createBoundaryEquivalentInjection(frame, cn) {
-        let equivinj_exists = false;
         let equivalentInjection = undefined;
-        frame.cimModel.equivalentInjections.forEach((equivinj, uuid) => {
-            var _a;
-            if (equivinj.name.match(frame.tsoName) && equivinj.name.match(frame.tsoName).length > 0 && ((_a = equivinj.terminals.values()) === null || _a === void 0 ? void 0 : _a.next().value.getConnectivityNodeUUID()) === cn.getUUID()) {
-                equivinj_exists = true;
-            }
-        });
-        if (!equivinj_exists) {
-            let tmp_terminal = new Terminal_1.Terminal(utils_1.generateUUID());
-            tmp_terminal.setConnectivityNodeUUID(cn.mrid);
-            tmp_terminal.phases = PhaseCode_1.PhaseCode.ABC;
-            tmp_terminal.connected = true;
-            tmp_terminal.sequenceNumber = 1;
-            equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.generateUUID(), util_create_1.createNotation([frame.tsoName, '_BD-EI', cn.mrid], 32, true));
-            equivalentInjection.p = 0;
-            equivalentInjection.q = 0;
-            equivalentInjection.regulationStatus = false;
-            equivalentInjection.addTerminal(tmp_terminal);
-            equivalentInjection.baseVoltage = cn.getBaseVoltage();
-            tmp_terminal.setConductingEquipment(equivalentInjection);
-            tmp_terminal.name = util_create_1.createNotation([cn.name, '_', equivalentInjection.name, '_BD-T'], 32, true);
-            cn.addTerminal(tmp_terminal);
-            frame.cimModel.addEquivalentInjection(equivalentInjection);
-            if (tmp_terminal.getConductingEquipmentUUID() !== undefined) {
-                frame.cimModel.addTerminal(tmp_terminal);
+        if (!frame.boundary) {
+            let equivinj_exists = false;
+            frame.cimModel.equivalentInjections.forEach((equivinj, uuid) => {
+                var _a;
+                if (equivinj.name.match(frame.tsoName) && equivinj.name.match(frame.tsoName).length > 0 && ((_a = equivinj.terminals.values()) === null || _a === void 0 ? void 0 : _a.next().value.getConnectivityNodeUUID()) === cn.getUUID()) {
+                    equivinj_exists = true;
+                }
+            });
+            if (!equivinj_exists) {
+                let tmp_terminal = new Terminal_1.Terminal(utils_1.generateUUID());
+                tmp_terminal.setConnectivityNodeUUID(cn.mrid);
+                tmp_terminal.phases = PhaseCode_1.PhaseCode.ABC;
+                tmp_terminal.connected = true;
+                tmp_terminal.sequenceNumber = 1;
+                equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.generateUUID(), util_create_1.createNotation([frame.tsoName, '_BD-EI', '_' + cn.mrid.substring(0, 8)], 32, true));
+                equivalentInjection.p = 0;
+                equivalentInjection.q = 0;
+                equivalentInjection.regulationStatus = false;
+                equivalentInjection.addTerminal(tmp_terminal);
+                equivalentInjection.baseVoltage = cn.getBaseVoltage();
+                equivalentInjection.normallyInService = false;
+                tmp_terminal.setConductingEquipment(equivalentInjection);
+                tmp_terminal.name = util_create_1.createNotation([cn.name.substring(0, 8), '_', equivalentInjection.name, '_BD-T'], 32, true);
+                cn.addTerminal(tmp_terminal);
+                frame.cimModel.addEquivalentInjection(equivalentInjection);
+                if (tmp_terminal.getConductingEquipmentUUID() !== undefined) {
+                    frame.cimModel.addTerminal(tmp_terminal);
+                }
             }
         }
         return equivalentInjection;
@@ -3747,10 +3763,10 @@ class ConverterI7 {
                         const tabName_NetzSSAB = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SAMMELSCHIENE];
                         const tabName_NetzSchaltfeld = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SCHALTFELD];
                         const tabName_NetzKnotenSf = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SF];
-                        const sqlStatement = `SELECT ${tabName_NetzSSAB}.id, ${tabName_NetzSSAB}.umin, ${tabName_NetzSSAB}.umax, ${tabName_NetzSSAB}.usoll
-                                          FROM  ${tabName_NetzSSAB}
-                                          LEFT JOIN ${tabName_NetzSchaltfeld} ON ${tabName_NetzSSAB}.saabschnitt = ${tabName_NetzSchaltfeld}.saabschnitt
-                                          LEFT JOIN ${tabName_NetzKnotenSf} ON  ${tabName_NetzKnotenSf}.schaltfeld = ${tabName_NetzSchaltfeld}.id
+                        const sqlStatement = `SELECT ${tabName_NetzSSAB}.id, ${tabName_NetzSSAB}.umin, ${tabName_NetzSSAB}.umax, ${tabName_NetzSSAB}.usoll
+                                          FROM  ${tabName_NetzSSAB}
+                                          LEFT JOIN ${tabName_NetzSchaltfeld} ON ${tabName_NetzSSAB}.saabschnitt = ${tabName_NetzSchaltfeld}.saabschnitt
+                                          LEFT JOIN ${tabName_NetzKnotenSf} ON  ${tabName_NetzKnotenSf}.schaltfeld = ${tabName_NetzSchaltfeld}.id
                                           WHERE ${tabName_NetzKnotenSf}.id = ${tempKnotenId}`;
                         minMaxSollResult = yield this.mysqlController.execQuery(sqlStatement);
                     }
@@ -3760,12 +3776,12 @@ class ConverterI7 {
                             const tabName_NetzSo = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO];
                             const tabName_NetzSchlaufe = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SCHLAUFE];
                             const tabName_NetzKnotenZw = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_ZW];
-                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT ${tabName_NetzSo}.id, ${tabName_NetzSo}.umin, ${tabName_NetzSo}.umax, ${tabName_NetzSo}.usoll 
-                                       FROM ${tabName_NetzKnotenZw} 
-                                       LEFT JOIN ${tabName_NetzSchlaufe} ON 
-                                             ${tabName_NetzSchlaufe}.id = ${tabName_NetzKnotenZw}.schlaufe
-                                       LEFT JOIN ${tabName_NetzSo} ON 
-                                             ${tabName_NetzSchlaufe}.eknoten = ${tabName_NetzSo}.id 
+                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT ${tabName_NetzSo}.id, ${tabName_NetzSo}.umin, ${tabName_NetzSo}.umax, ${tabName_NetzSo}.usoll 
+                                       FROM ${tabName_NetzKnotenZw} 
+                                       LEFT JOIN ${tabName_NetzSchlaufe} ON 
+                                             ${tabName_NetzSchlaufe}.id = ${tabName_NetzKnotenZw}.schlaufe
+                                       LEFT JOIN ${tabName_NetzSo} ON 
+                                             ${tabName_NetzSchlaufe}.eknoten = ${tabName_NetzSo}.id 
                                        WHERE ${tabName_NetzKnotenZw}.id = ${tempKnotenId};`);
                         }
                         else {
@@ -3776,10 +3792,10 @@ class ConverterI7 {
                 else if (spgKnotenId !== undefined) {
                     const tabName_NetzSo = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO];
                     const tabName_NetzSSAB = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SAMMELSCHIENE];
-                    const query = ` SELECT Voltage.id, Voltage.umin,  Voltage.umax,  Voltage.usoll
-                                FROM (
-                                SELECT id, umin, umax, usoll FROM ${tabName_NetzSo} WHERE ${tabName_NetzSo}.id = ${spgKnotenId}
-                                UNION
+                    const query = ` SELECT Voltage.id, Voltage.umin,  Voltage.umax,  Voltage.usoll
+                                FROM (
+                                SELECT id, umin, umax, usoll FROM ${tabName_NetzSo} WHERE ${tabName_NetzSo}.id = ${spgKnotenId}
+                                UNION
                                 SELECT id, umin, umax, usoll FROM ${tabName_NetzSSAB} WHERE ${tabName_NetzSSAB}.id = ${spgKnotenId}) as Voltage`;
                     minMaxSollResult = yield this.mysqlController.execQuery(query);
                 }
@@ -4042,40 +4058,59 @@ class ConverterI7 {
         powerTransformerEnd.powerTransformer = powerTransformer;
         powerTransformer.addPowerTransformerEnd(powerTransformerEnd);
     }
-    convertTapChangers(i7Data, transformerEnds, cimModel, connectivityNode, spannungsband) {
+    convertTapChangers(i7Data, transformerEnds, cimModel, transformerinfo, connectivityNode, spannungsband) {
+        var _a, _b;
         for (let tapChangerNumber = 1; tapChangerNumber <= 2; tapChangerNumber++) {
-            const gestufteSeite = i7Data[`gestufte_seite_s${tapChangerNumber}`] === 0 ? 1 : i7Data[`gestufte_seite_s${tapChangerNumber}`];
-            const transformerEnd = transformerEnds.find(elem => elem.endNumber === gestufteSeite);
+            const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
+            const transformerEnd = transformerEnds.find(elem => elem.endNumber === tapChangerNumber);
+            let gestufteSeite = utils_2.isNumericI7(i7Data[`gestufte_seite_s${tapChangerNumber}`])
+                ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
+                : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
+            if (utils_2.isNumericI7(gestufteSeite))
+                gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
             if (!transformerEnd) {
                 this.logger.error(`Trafo ${i7Data.id}: Zum Stufenschalter ${gestufteSeite} keine Wicklung gefunden.`);
                 continue;
             }
-            const angle = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`]);
+            const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
+            const angle = utils_2.isNumericI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+                ? utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+                : (_b = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _b === void 0 ? void 0 : _b.value;
             const neutralU = transformerEnd.ratedU;
             let tapChanger;
             if (isFinite(angle) && angle !== 0) {
-                tapChanger = this.createPhaseTapChanger(i7Data, transformerEnds, cimModel, tapChangerNumber);
+                tapChanger = this.createPhaseTapChanger(i7Data, transformerEnds, cimModel, tapChangerNumber, transformerinfo);
             }
             else {
-                tapChanger = this.createRatioTapChanger(i7Data, transformerEnd, cimModel, connectivityNode, tapChangerNumber, spannungsband);
+                tapChanger = this.createRatioTapChanger(i7Data, transformerEnd, cimModel, connectivityNode, tapChangerNumber, spannungsband, transformerinfo);
             }
-            this.setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber);
+            this.setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, tapChangerInfo);
             tapChanger.transformerEnd = transformerEnd;
             tapChanger.neutralU = neutralU;
         }
     }
-    setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber) {
-        let lowStep = i7Data[`minstufe_s${tapChangerNumber}`];
-        let highStep = i7Data[`maxstufe_s${tapChangerNumber}`];
-        let neutralStep = i7Data[`mittelstufe_s${tapChangerNumber}`];
+    setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, tapChangerInfo) {
+        let lowStep = utils_2.isNumericI7(i7Data[`minstufe_s${tapChangerNumber}`])
+            ? i7Data[`minstufe_s${tapChangerNumber}`]
+            : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.lowStep;
+        let highStep = utils_2.isNumericI7(i7Data[`maxstufe_s${tapChangerNumber}`])
+            ? i7Data[`maxstufe_s${tapChangerNumber}`]
+            : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.highStep;
+        let neutralStep = utils_2.isNumericI7(i7Data[`mittelstufe_s${tapChangerNumber}`])
+            ? i7Data[`mittelstufe_s${tapChangerNumber}`]
+            : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.neutralStep;
         let currentStep = i7Data[`aktstufe_s${tapChangerNumber}`];
         const i7TapArray = utils_2.getTapChangerStepArray(lowStep, highStep);
-        const tapStepCount = i7TapArray.length;
-        const neutralStepIndex = i7TapArray.indexOf(neutralStep);
         const lowerVoltageStepCount = utils_2.getTapChangerStepCount(lowStep, neutralStep);
         const increaseVoltageStepCount = utils_2.getTapChangerStepCount(neutralStep, highStep);
-        const lowerVoltageStepIncrement = Math.abs(i7Data[`umin_s${tapChangerNumber}`]) / lowerVoltageStepCount * -1;
-        let increaseVoltageStepIncrement = Math.abs(i7Data[`umax_s${tapChangerNumber}`]) / increaseVoltageStepCount;
+        const uMin = utils_2.isNumericI7(i7Data[`umin_s${tapChangerNumber}`])
+            ? i7Data[`umin_s${tapChangerNumber}`]
+            : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMin;
+        const uMax = utils_2.isNumericI7(i7Data[`umax_s${tapChangerNumber}`])
+            ? i7Data[`umax_s${tapChangerNumber}`]
+            : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMax;
+        const lowerVoltageStepIncrement = Math.abs(uMin) / lowerVoltageStepCount * -1;
+        let increaseVoltageStepIncrement = Math.abs(uMax) / increaseVoltageStepCount;
         increaseVoltageStepIncrement = isNaN(increaseVoltageStepIncrement) ? 1 : increaseVoltageStepIncrement;
         if (tapChanger instanceof RatioTapChanger_1.RatioTapChanger) {
             const ratioTapChanger = tapChanger;
@@ -4111,9 +4146,14 @@ class ConverterI7 {
             this.logger.error(`Trafo ${i7Data.id}: Zusatzspannung Min/Max sind nicht symmetrisch  MIN ${lowerVoltageStepIncrement} MAX ${increaseVoltageStepIncrement}. Das Attribut voltageStepIncrement i.H.v ${increaseVoltageStepIncrement} könnte inkorrekt sein.`);
         }
     }
-    createRatioTapChanger(i7Data, transformerEnd, cimModel, regulatingConnectivityNode, tapChangerNumber, spannungsband) {
-        var _a, _b;
-        const gestufteSeite = i7Data[`gestufte_seite_s${tapChangerNumber}`] === 0 ? 1 : i7Data[`gestufte_seite_s${tapChangerNumber}`];
+    createRatioTapChanger(i7Data, transformerEnd, cimModel, regulatingConnectivityNode, tapChangerNumber, spannungsband, transformerinfo) {
+        var _a, _b, _c;
+        const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
+        const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
+        let gestufteSeite = utils_2.isNumericI7(i7Data[`gestufte_seite_s${tapChangerNumber}`])
+            ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
+            : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
+        gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
         const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
         ratioTapChanger.ltcFlag = false;
         ratioTapChanger.transformerEnd = transformerEnd;
@@ -4121,7 +4161,7 @@ class ConverterI7 {
         ratioTapChanger.neutralU = transformerEnd.ratedU;
         ratioTapChanger.tculControlMode = TransformerControlMode_1.TransformerControlMode.volt;
         const regelung = +i7Data[`regelung_s${gestufteSeite}`];
-        const regulatingTerminal = ((_a = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _a === void 0 ? void 0 : _a.size) ? [...(_b = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _b === void 0 ? void 0 : _b.values()].find(elem => elem.connected) : undefined;
+        const regulatingTerminal = ((_b = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _b === void 0 ? void 0 : _b.size) ? [...(_c = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _c === void 0 ? void 0 : _c.values()].find(elem => elem.connected) : undefined;
         if (isFinite(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.usoll) && regulatingTerminal) {
             const tapChangerControl = new TapChangerControl_1.TapChangerControl(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
             tapChangerControl.discrete = true;
@@ -4143,12 +4183,22 @@ class ConverterI7 {
         cimModel.addRatioTapChanger(ratioTapChanger);
         return ratioTapChanger;
     }
-    createPhaseTapChanger(i7Data, transformerEnds, cimModel, tapChangerNumber) {
-        const gestufteSeite = i7Data[`gestufte_seite_s${tapChangerNumber}`] === 0 ? 1 : i7Data[`gestufte_seite_s${tapChangerNumber}`];
+    createPhaseTapChanger(i7Data, transformerEnds, cimModel, tapChangerNumber, transformerinfo) {
+        var _a;
+        const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
+        const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
+        let gestufteSeite = utils_2.isNumericI7(i7Data[`gestufte_seite_s${tapChangerNumber}`])
+            ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
+            : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
+        gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
         const transformerEnd = transformerEnds.find(elem => elem.endNumber === gestufteSeite);
         const is3WTransformer = transformerEnds.length > 2 ? true : false;
         let phaseTapChanger;
-        const spezialregelung = i7Data.trafo_spezial ? i7Data.trafo_spezial : (is3WTransformer ? 2 : undefined);
+        let spezialregelung = utils_2.isNumericI7(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
+        spezialregelung = spezialregelung ? spezialregelung : (is3WTransformer ? 2 : undefined);
+        const winkel = utils_2.isNumericI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+            ? i7Data[`uzus_winkel_s${tapChangerNumber}`]
+            : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement;
         switch (spezialregelung) {
             case (1): {
                 const phaseTapChangerSync = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
@@ -4158,14 +4208,14 @@ class ConverterI7 {
             }
             case (2): {
                 const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                phaseTapChangerAsync.windingConnectionAngle = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`]);
+                phaseTapChangerAsync.windingConnectionAngle = winkel;
                 phaseTapChanger = phaseTapChangerAsync;
                 cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
                 break;
             }
             default: {
                 const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                phaseTapChangerAsync.windingConnectionAngle = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`]);
+                phaseTapChangerAsync.windingConnectionAngle = winkel;
                 phaseTapChanger = phaseTapChangerAsync;
                 cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
                 break;
@@ -4270,13 +4320,13 @@ class ConverterI7 {
     }
     queryTrafosAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
                                                                                                             FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}`) : [];
             for (const result of results) {
                 this.trafo2wAnschlussKnotenIDs.add(result[`aknoten`]);
                 this.trafo2wAnschlussKnotenIDs.add(result[`eknoten`]);
             }
-            results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+            results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
                                                                                                                     FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}`) : [];
             for (const result of results) {
                 this.trafo3wAnschlussKnotenIDs.add(result[`aknoten`]);
@@ -4416,15 +4466,15 @@ class ConverterI7 {
             connectivityNode.toEndNameTso = tsoName;
         }
         else {
-            this.logger.error(`Grenzknoten ${connectivityNode.name} mit der UUID ${connectivityNode.mrid} ist bereits belegt:
-                         fromEndName ${connectivityNode.fromEndName} 
-                         fromEndIsoCode ${connectivityNode.fromEndIsoCode} 
-                         fromEndNameTso ${connectivityNode.fromEndNameTso} 
-                         toEndName ${connectivityNode.toEndName} 
-                         toEndIsoCode ${connectivityNode.toEndIsoCode} 
-                         toEndNameTso ${connectivityNode.toEndNameTso} 
-                         name ${name} 
-                         isoCode ${isoCode} 
+            this.logger.error(`Grenzknoten ${connectivityNode.name} mit der UUID ${connectivityNode.mrid} ist bereits belegt:
+                         fromEndName ${connectivityNode.fromEndName} 
+                         fromEndIsoCode ${connectivityNode.fromEndIsoCode} 
+                         fromEndNameTso ${connectivityNode.fromEndNameTso} 
+                         toEndName ${connectivityNode.toEndName} 
+                         toEndIsoCode ${connectivityNode.toEndIsoCode} 
+                         toEndNameTso ${connectivityNode.toEndNameTso} 
+                         name ${name} 
+                         isoCode ${isoCode} 
                          tsoName ${tsoName}`);
         }
     }