@enervance/insight-cim-model 0.0.46 → 0.0.47

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

@@ -96,7 +96,6 @@ const ReactiveCapabilityCurve_1 = require("../../model/wires/ReactiveCapabilityC
 const RegulatingControl_1 = require("../../model/wires/RegulatingControl");
 const RegulatingControlModeKind_1 = require("../../model/wires/RegulatingControlModeKind");
 const StaticVarCompensator_1 = require("../../model/wires/StaticVarCompensator");
-const SynchronousMachine_1 = require("../../model/wires/SynchronousMachine");
 const SynchronousMachineKind_1 = require("../../model/wires/SynchronousMachineKind");
 const SynchronousMachineOperatingMode_1 = require("../../model/wires/SynchronousMachineOperatingMode");
 const TapChangerControl_1 = require("../../model/wires/TapChangerControl");
@@ -133,6 +132,8 @@ 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");
+const AsynchronousMachineKind_1 = require("../../model/wires/AsynchronousMachineKind");
+const INTEGRALEquivalentInjection_1 = require("../../model/extensions/integral/equivalents/INTEGRALEquivalentInjection");
 class ConverterI7 {
     constructor() {
         this.exportFrames = new Map();
@@ -192,7 +193,6 @@ class ConverterI7 {
                         console.log(`Convert MAS profile: ${frame.mas}`);
                         yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
                         frame.validateCIMModel();
-                        frame.purgeData();
                         const startTime = perf_hooks_1.performance.now();
                         frame.openXMLModel();
                         console.log(`Serialize MAS profile: ${frame.mas}`);
@@ -433,9 +433,6 @@ class ConverterI7 {
             startTime = perf_hooks_1.performance.now();
             yield this.assignTerminalSequenceNumber(cimModel);
             logExecutionTime(this.logger, startTime, `assignment of sequence number`);
-            startTime = perf_hooks_1.performance.now();
-            yield this.convertNetzvarianten(cimModel, integral7Modell);
-            logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
         });
     }
     assignTerminalSequenceNumber(cimModel) {
@@ -929,7 +926,7 @@ class ConverterI7 {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const object = cimModel.getObject(this.integralID2UUID.get(i7Data.standort));
                     if (!object) {
-                        this.logger.warn(`Schaltanlage ${i7Data.id}/${i7Data.guid} ist keinem Standort (${i7Data.standort}) zugeornet.`);
+                        this.logger.warn(`Schaltanlage ${i7Data.id}/${i7Data.guid} ist keinem Standort (${i7Data.standort}) zugeordnet.`);
                         continue;
                     }
                     else if (!(object instanceof Substation_1.Substation)) {
@@ -995,7 +992,8 @@ class ConverterI7 {
                     const i7Schluessel = voltageLevel.description +
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"], 32, true), i7Data.kurzname, i7Schluessel);
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B'], 32, true), i7Data.kurzname, i7Schluessel);
                     bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     bay.voltageLevel = voltageLevel;
@@ -1023,7 +1021,8 @@ class ConverterI7 {
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.un.toString(), "_VL"]), i7Data.kurzname);
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), i7Data.kurzname, i7Data.kommentar);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_CN']), i7Data.kurzname, i7Data.kommentar);
                     connectivityNode.setConnectivityNodeContainer(vl);
                     vl.addConnectivityNode(connectivityNode);
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
@@ -1073,8 +1072,8 @@ class ConverterI7 {
                     const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), "_BBS"]), i7Schaltanlagenabschnitt.kurzname);
                     busbarSection.ipMax = i7Data.limit_ip;
                     busbarSection.aggregate = false;
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.pos.toString(), "_CN"]), i7Data.kurzname);
-                    const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_' + i7Data.pos.toString(), '_' + rdfid.substring(0, 8), '_CN'], 32, true), i7Data.kurzname);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (voltageLevel) {
@@ -1094,6 +1093,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug('Sammelschiene ' + i7Data.id + ' besitzt keine Schaltanlage.');
                     }
+                    this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
                     this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.SAMMELSCHIENE);
                     cimModel.addConnectivityNode(connectivityNode);
                     cimModel.addBusbarSection(busbarSection);
@@ -1113,7 +1113,7 @@ class ConverterI7 {
                 const result = yield this.queryDataInChuncks(integral_sql_1.I7Objects.KNOTEN_SF, schaltfeldIDs);
                 for (const i7Data of result) {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.schaltfeld));
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid_cn), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
@@ -1195,7 +1195,6 @@ class ConverterI7 {
                     if (connectivityNode) {
                         connectivityNode.addTerminal(terminal);
                         terminal.setConnectivityNode(connectivityNode);
-                        terminal.name = util_create_1.createNotation([connectivityNode.name, "_Schlaufe_T"]);
                     }
                     else {
                         this.logger.debug(`Schlaufe ${i7Data.id} besitzt keinen anschluss.`);
@@ -1217,11 +1216,13 @@ class ConverterI7 {
                     const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf && targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
                         cimModel.addMultiplierFactor(mf);
-                        load.multiplierFactor = mf;
+                        load.multiplierFactorUUID = mf.getUUID();
                     }
                     const powerData = utils_2.getActiveReactivePower(i7Data, mf);
                     load.p = powerData[0];
                     load.q = powerData[1];
+                    load.p_mf = powerData[2] ? powerData[2] : undefined;
+                    load.q_mf = powerData[3] ? powerData[3] : undefined;
                     if (targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
                         const conformLoadGroup = cimModel.getObjectByName(defaultValuesConfig.ConformLoadGroup.name, cim_class_names_1.CIM_CLASS_NAMES.ConformLoadGroup);
                         load.loadGroup = conformLoadGroup;
@@ -1287,16 +1288,66 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.GENERATOR, knotenSfIDs));
                 for (const i7Data of result) {
                     const genType = this.generatorTypen.get(i7Data.nametyp);
-                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM"]), i7Data.kurzname, i7Data.nameprimaertyp);
-                    const isRotatingPhaseShifter = utils_2.isBooleanI7(i7Data.flag_phasenschieber) ? utils_2.convertToBooleanI7(i7Data.flag_phasenschieber) : false;
+                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM"], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    if (isRotatingPhaseShifter) {
-                        synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.condenser;
+                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
+                    const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : 0;
+                    const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const p = powerData[0];
+                    const q = powerData[1];
+                    const flagCondenserOperationMode = utils_2.isBooleanI7(i7Data.flag_phasenschieber) ? utils_2.convertToBooleanI7(i7Data.flag_phasenschieber) : true;
+                    const isRotatingPhaseShifter = mf !== undefined && flagCondenserOperationMode && maxP === 0 && minP === 0;
+                    const isGenerator = (maxP >= 0 || maxP === undefined) && (minP >= 0 || minP === undefined);
+                    const isMotor = (maxP <= 0 || maxP === undefined) && (minP <= 0 || minP === undefined);
+                    synchronousMachine.nameprimaertyp = i7Data.nameprimaertyp;
+                    if (isRotatingPhaseShifter && isGenerator && isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor;
+                    }
+                    else if (isRotatingPhaseShifter && isGenerator && !isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenser;
+                    }
+                    else if (isRotatingPhaseShifter && !isGenerator && !isMotor) {
                         synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.condenser;
                     }
+                    else if (isRotatingPhaseShifter && !isGenerator && isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.motorOrCondenser;
+                    }
+                    else if (!isRotatingPhaseShifter && isGenerator && !isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
+                    }
+                    else if (!isRotatingPhaseShifter && !isGenerator && isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.motor;
+                    }
+                    else if (!isRotatingPhaseShifter && isGenerator && isMotor) {
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generatorOrMotor;
+                    }
                     else {
+                        synchronousMachine.type = undefined;
+                    }
+                    const condenserOperationMode = p !== undefined && p === 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.condenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motorOrCondenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
+                    const generatorOperationMode = p !== undefined && p >= 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generator
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrMotor
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
+                    const motorOperationMode = p !== undefined && p <= 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motor
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrMotor
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motorOrCondenser
+                        || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
+                    if (condenserOperationMode && !generatorOperationMode && !motorOperationMode) {
+                        synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.condenser;
+                    }
+                    else if (!condenserOperationMode && generatorOperationMode && !motorOperationMode) {
                         synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
-                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
+                    }
+                    else if (!condenserOperationMode && !generatorOperationMode && motorOperationMode) {
+                        synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.motor;
+                    }
+                    else {
+                        synchronousMachine.operatingMode = undefined;
                     }
                     if (utils_2.convertToNumberI7(i7Data.blocktrafo_1)) {
                         this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_1));
@@ -1315,8 +1366,6 @@ class ConverterI7 {
                     }
                     const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
                     synchronousMachine.referencePriority = prio;
-                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
-                    const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : 0;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
                     const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
                     const maxQvonPmax = utils_2.isNumericI7(i7Data.qmax_von_pmax) ? utils_2.convertToNumberI7(i7Data.qmax_von_pmax) : undefined;
@@ -1325,11 +1374,10 @@ class ConverterI7 {
                     synchronousMachine.minQ = minQ ? minQ : minQvonPmin;
                     const pType = (genType === null || genType === void 0 ? void 0 : genType.sr) * (genType === null || genType === void 0 ? void 0 : genType.cosphir);
                     const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
-                    const p = powerData[0];
-                    const q = powerData[1];
                     synchronousMachine.setActivePower(p * -1);
                     synchronousMachine.setReactivePower(q * -1);
+                    synchronousMachine.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    synchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     const sr = utils_2.isNumericI7(i7Data.sr) ? utils_2.convertToNumberI7(i7Data.sr) : genType === null || genType === void 0 ? void 0 : genType.sr;
                     if (sr && sr >= 0) {
                         synchronousMachine.ratedS = sr;
@@ -1337,14 +1385,14 @@ class ConverterI7 {
                     else {
                         synchronousMachine.ratedS = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));
                     }
-                    const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : genType.ur;
-                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
+                    const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : utils_2.isNumericI7(genType === null || genType === void 0 ? void 0 : genType.ur) ? genType.ur : undefined;
+                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : ur;
                     const cosphir = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : genType.cosphir;
-                    synchronousMachine.ratedU = usoll ? usoll : ur;
+                    synchronousMachine.ratedU = ur ? ur : usoll;
                     synchronousMachine.aggregate = true;
                     synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
                     synchronousMachine.r = utils_2.isNumericI7(i7Data.rg) ? utils_2.convertToNumberI7(i7Data.rg) : genType === null || genType === void 0 ? void 0 : genType.rg;
-                    if (!isRotatingPhaseShifter) {
+                    if (minP && maxP && minQvonPmin && maxQvonPmax) {
                         const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), util_create_1.createNotation(['CurveData', synchronousMachine.mrid, "_RCC"]));
                         reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                         reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
@@ -1352,15 +1400,15 @@ class ConverterI7 {
                         reactiveCapabilityCurve.y2Unit = UnitSymbol_1.UnitSymbol.VAr;
                         const curveData1 = new CurveData_1.CurveData(utils_1.generateUUID());
                         curveData1.curve = reactiveCapabilityCurve;
-                        curveData1.xvalue = i7Data.p_min;
-                        curveData1.y1value = i7Data.qmin_von_pmin;
-                        curveData1.y2value = i7Data.qmax_von_pmin;
+                        curveData1.xvalue = minP;
+                        curveData1.y1value = minQvonPmin;
+                        curveData1.y2value = maxQvonPmax;
                         cimModel.addCurveData(curveData1);
                         const curveData2 = new CurveData_1.CurveData(utils_1.generateUUID());
                         curveData2.curve = reactiveCapabilityCurve;
-                        curveData2.xvalue = i7Data.p_max;
-                        curveData2.y1value = i7Data.qmin_von_pmax;
-                        curveData2.y2value = i7Data.qmax_von_pmax;
+                        curveData2.xvalue = minP;
+                        curveData2.y1value = minQvonPmin;
+                        curveData2.y2value = maxQvonPmax;
                         cimModel.addCurveData(curveData2);
                         cimModel.addReactiveCapabilityCurve(reactiveCapabilityCurve);
                         synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
@@ -1368,7 +1416,7 @@ class ConverterI7 {
                     let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Gen_${synchronousMachine.getUUID().substring(0, 8)}`);
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), util_create_1.createNotation(['GEN'], 32, true));
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -1384,7 +1432,7 @@ class ConverterI7 {
                         }
                     }
                     let generatingUnit;
-                    if (!isRotatingPhaseShifter) {
+                    if (synchronousMachine.type !== SynchronousMachineKind_1.SynchronousMachineKind.condenser) {
                         const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
                         if (generatingUnitConfig) {
                             switch (generatingUnitConfig.class) {
@@ -1436,8 +1484,8 @@ class ConverterI7 {
                             generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_GU"]), i7Data.kurzname);
                         }
                         generatingUnit.initialP = utils_2.isNumericI7(i7Data.p0) ? utils_2.convertToNumberI7(i7Data.p0) : undefined;
-                        generatingUnit.maxOperatingP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
-                        generatingUnit.minOperatingP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
+                        generatingUnit.maxOperatingP = maxP;
+                        generatingUnit.minOperatingP = minP;
                         generatingUnit.nominalP = utils_2.isNumericI7(cosphir) && utils_2.isNumericI7(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
                         const kr = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
                         const fn = 50;
@@ -1460,6 +1508,10 @@ class ConverterI7 {
                     smtcr.xQuadSubtrans = utils_2.isNumericI7(i7Data.xqu2s) ? utils_2.convertToNumberI7(i7Data.xqu2s) : undefined;
                     smtcr.synchronousMachine = synchronousMachine;
                     synchronousMachine.synchronousMachineDynamics = smtcr;
+                    if (mf) {
+                        cimModel.addMultiplierFactor(mf);
+                        synchronousMachine.multiplierFactorUUID = mf.getUUID();
+                    }
                     cimModel.addGeneratingUnit(generatingUnit);
                     cimModel.addSynchronousMachine(synchronousMachine);
                     cimModel.addSynchronousMachineTimeConstantReactance(smtcr);
@@ -1480,6 +1532,7 @@ class ConverterI7 {
                         cimModel.addMultiplierFactor(mf);
                         asynchronousMachine.multiplierFactorUUID = mf.getUUID();
                     }
+                    asynchronousMachine.asynchronousMachineType = AsynchronousMachineKind_1.AsynchronousMachineKind.motor;
                     asynchronousMachine.efficiency = i7Data.wirkungsgrad * 100;
                     asynchronousMachine.iaIrRatio = utils_2.isNumericI7(i7Data.ilr_ir) ? i7Data.ilr_ir : assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir;
                     asynchronousMachine.polePairNumber = utils_2.isNumericI7(i7Data.polpaarz) ? i7Data.polpaarz : assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz;
@@ -1487,12 +1540,13 @@ class ConverterI7 {
                     asynchronousMachine.ratedPowerFactor = utils_2.isNumericI7(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
                     asynchronousMachine.ratedS = utils_2.isNumericI7(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
                     asynchronousMachine.ratedU = utils_2.isNumericI7(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
-                    const s0 = i7Data.s0;
-                    const cosPhi = i7Data.cos_phi;
-                    const cosPhiR = utils_2.isNumericI7(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
-                    asynchronousMachine.setActivePower(i7Data.p0 * -1);
-                    const fag_ind = utils_2.isNumericI7(i7Data.flag_ind) ? i7Data.flag_ind : assetType === null || assetType === void 0 ? void 0 : assetType.flag_ind;
-                    asynchronousMachine.setReactivePower((fag_ind === 1 ? i7Data.q0_ind : i7Data.q0_kap) * -1);
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const p = powerData[0];
+                    const q = powerData[1];
+                    asynchronousMachine.setActivePower(p * -1);
+                    asynchronousMachine.setReactivePower(q * -1);
+                    asynchronousMachine.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    asynchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     asynchronousMachine.controlEnabled = false;
                     const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : true;
                     asynchronousMachine.normallyInService = inBetrieb;
@@ -1644,18 +1698,20 @@ class ConverterI7 {
                 const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
                 const r_ext = utils_2.isNumericI7(i7Data.r_ext) ? utils_2.convertToNumberI7(i7Data.r_ext) : undefined;
                 const x_ext = utils_2.isNumericI7(i7Data.x_ext) ? utils_2.convertToNumberI7(i7Data.x_ext) : undefined;
-                const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_EI"]), i7Data.kurzname);
+                const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_EI"]), i7Data.kurzname);
                 equivalentInjection.normallyInService = inBetrieb;
                 if (flag_lfl && usoll && (r_ext || x_ext)) {
                     equivalentInjection.regulationCapability = true;
                     equivalentInjection.regulationStatus = true;
                     equivalentInjection.regulationTarget = usoll;
-                    equivalentInjection.r = r_ext;
-                    equivalentInjection.r0 = 0;
-                    equivalentInjection.r2 = 0;
-                    equivalentInjection.x = x_ext;
-                    equivalentInjection.x0 = 0;
-                    equivalentInjection.x2 = 0;
+                    equivalentInjection.rExt = r_ext;
+                    equivalentInjection.r = 1e9;
+                    equivalentInjection.r0 = 1e9;
+                    equivalentInjection.r2 = 1e9;
+                    equivalentInjection.xExt = x_ext;
+                    equivalentInjection.x = 1e9;
+                    equivalentInjection.x0 = 1e9;
+                    equivalentInjection.x2 = 1e9;
                 }
                 equivalentInjection.aggregate = true;
                 this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
@@ -1726,8 +1782,7 @@ class ConverterI7 {
     convertErsatzLaengszweige(frame, integral7, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) && integral7.ersatzZweigAnschlussKnotenIDs.length) {
-                integral_sql_1.I7Objects.ERSATZLAENGSZWEIGDIFF;
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) && integral7.ersatzZweigAnschlussKnotenIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, integral7.ersatzZweigAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
@@ -1738,7 +1793,8 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([i7Data.bezeichner, '_EB', `_${cimModel.equivalentBranches.size}`]), i7Data.kurzname, i7Schluessel);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(rdfid, util_create_1.createNotation([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
                     const ur1 = utils_2.getU(i7Data.ur1, defaultValuesConfig.DefaultVoltage);
                     const ur2 = utils_2.getU(i7Data.ur2, defaultValuesConfig.DefaultVoltage);
                     const baseVoltageUr1 = util_create_1.createBaseVoltageIfNotExists(cimModel, ur1, this.exportFramesBoundary);
@@ -1752,6 +1808,7 @@ class ConverterI7 {
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     cimModel.addEquivalentBranch(equivalentBranch);
+                    this.checkErsatzZweigID(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, equivalentBranch.mrid, integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG);
                 }
             }
@@ -1773,9 +1830,9 @@ class ConverterI7 {
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     const spannungsregelungLokal = utils_2.isBooleanI7(i7Data.flag_lf) ? utils_2.convertToBooleanI7(i7Data.flag_lf) : false;
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
-                    let regulatingControl;
+                    let regulatingControl = undefined;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Kompdrossel_${i7Data.id}`);
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), util_create_1.createNotation(['LSC']));
                         regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                         regulatingControl.discrete = true;
                         regulatingControl.targetDeadband = i7Data.uband;
@@ -1975,6 +2032,7 @@ class ConverterI7 {
         });
     }
     convertVsConverterDC(cimModel, integral7, knotenSfIDs) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, knotenSfIDs));
@@ -2017,6 +2075,13 @@ class ConverterI7 {
                         vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
                         vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
                     }
+                    vsConverter.droop = 0;
+                    vsConverter.droopCompensation = 0;
+                    vsConverter.qShare = 0;
+                    vsConverter.targetQpcc = 0;
+                    vsConverter.targetUpcc = (_a = acConnectivityNode === null || acConnectivityNode === void 0 ? void 0 : acConnectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getBaseVoltageAsNumber();
+                    vsConverter.targetPpcc = vsConverter.baseS;
+                    vsConverter.targetUdc = vsConverter.ratedUdc;
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     vsConverter.normallyInService = inBetrieb;
                     if (acConnectivityNode) {
@@ -2047,7 +2112,8 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const energySource = new EnergySource_1.EnergySource(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ES"]), i7Data.kurzname);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const energySource = new EnergySource_1.EnergySource(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
                     this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
                     energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
                     const prio = i7Data.einspprio;
@@ -2069,7 +2135,8 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EI', `_${cimModel.equivalentInjections.size}`]), i7Data.kurzname);
+                    const rdfid = utils_1.getUUID(i7Data.guid);
+                    const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
                     const prio = i7Data.einspprio;
                     const usoll = i7Data.usoll;
                     const powerData = utils_2.getActiveReactivePower(i7Data);
@@ -2089,31 +2156,49 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI"]), i7Data.kurzname);
+                    const cn = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), "_" + cimrdfid, "_ENI"], 32, true), i7Data.kurzname);
+                    const un = cn.getVoltageLevel().getBaseVoltageAsNumber();
+                    externalNetworkInjection.nameprimaertyp = i7Data.nameprimaertyp;
                     let mf = undefined;
                     mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
                         externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
                     }
-                    const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
-                    externalNetworkInjection.governorSCD = governorscd;
                     const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
                     externalNetworkInjection.maxP = maxP;
+                    const governorscd = utils_2.isNumericI7(i7Data.kr) && maxP ? utils_2.calculateSigma(50, externalNetworkInjection.maxP, utils_2.convertToNumberI7(i7Data.kr)) : undefined;
+                    externalNetworkInjection.governorSCD = governorscd;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
                     externalNetworkInjection.maxQ = maxQ;
                     const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
                     externalNetworkInjection.minP = minP;
                     const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
                     externalNetworkInjection.minQ = minQ;
-                    const maxR0X0Ratio = undefined;
+                    const r0X0 = utils_2.isNumericI7(i7Data.x0_r0) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0) : undefined;
+                    const r1X1 = utils_2.isNumericI7(i7Data.x1_r1) ? 1 / utils_2.convertToNumberI7(i7Data.x1_r1) : undefined;
+                    const z0Z1 = utils_2.isNumericI7(i7Data.z0_z1) ? utils_2.convertToNumberI7(i7Data.z0_z1) : undefined;
+                    const maxR0X0Ratio = utils_2.isNumericI7(i7Data.x0_r0_max) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0_max) : r0X0;
                     externalNetworkInjection.maxR0ToX0Ratio = maxR0X0Ratio;
-                    const maxR1X1Ratio = undefined;
+                    const maxR1X1Ratio = utils_2.isNumericI7(i7Data.x1_r1_max) ? 1 / utils_2.convertToNumberI7(i7Data.x1_r1_max) : r1X1;
                     externalNetworkInjection.maxR1ToX1Ratio = maxR1X1Ratio;
-                    const maxZ0Z1Ratio = undefined;
+                    const maxZ0Z1Ratio = utils_2.isNumericI7(i7Data.z0_z1_max) ? utils_2.convertToNumberI7(i7Data.z0_z1_max) : z0Z1;
                     externalNetworkInjection.maxZ0ToZ1Ratio = maxZ0Z1Ratio;
-                    const minIkSecond = undefined;
+                    const minR0X0Ratio = utils_2.isNumericI7(i7Data.x0_r0_min) ? 1 / utils_2.convertToNumberI7(i7Data.x0_r0_min) : r0X0;
+                    externalNetworkInjection.minR0ToX0Ratio = minR0X0Ratio;
+                    const minR1X1Ratio = utils_2.isNumericI7(i7Data.x1_r1_min) ? utils_2.convertToNumberI7(i7Data.x1_r1_min) : r1X1;
+                    externalNetworkInjection.minR1ToX1Ratio = minR1X1Ratio;
+                    const minZ0Z1Ratio = utils_2.isNumericI7(i7Data.z0_z1_min) ? utils_2.convertToNumberI7(i7Data.z0_z1_min) : z0Z1;
+                    externalNetworkInjection.minZ0ToZ1Ratio = minZ0Z1Ratio;
+                    const skAkt = utils_2.isNumericI7(i7Data.sk_akt) ? utils_2.convertToNumberI7(i7Data.sk_akt) : undefined;
+                    const skMin = utils_2.isNumericI7(i7Data.sk_min) ? utils_2.convertToNumberI7(i7Data.sk_min) : skAkt;
+                    const skMax = utils_2.isNumericI7(i7Data.sk_max) ? utils_2.convertToNumberI7(i7Data.sk_max) : skAkt;
+                    const minIkSecond = utils_2.isNumericI7(i7Data.sk_min) ? utils_2.convertToNumberI7(skMin) / Math.sqrt(3) * skMin : undefined;
                     externalNetworkInjection.minInitialSymShCCurrent = minIkSecond;
+                    const maxIkSecond = utils_2.isNumericI7(i7Data.sk_max) ? utils_2.convertToNumberI7(skMax) / Math.sqrt(3) * skMax : undefined;
+                    externalNetworkInjection.maxInitialSymShCCurrent = maxIkSecond;
                     const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
                     const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : false;
                     let regulatingControl = undefined;
@@ -2136,14 +2221,22 @@ class ConverterI7 {
                         }
                     }
                     this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
-                    const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
-                    externalNetworkInjection.referencePriority = prio;
+                    let prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
                     if ((regulatingControl === null || regulatingControl === void 0 ? void 0 : regulatingControl.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
-                        externalNetworkInjection.referencePriority = prio;
+                        if (prio && prio > 0) {
+                            externalNetworkInjection.referencePriority = prio + 1;
+                        }
+                        else {
+                            prio = undefined;
+                        }
                     }
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
-                    externalNetworkInjection.p = powerData[0];
-                    externalNetworkInjection.q = powerData[1];
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
+                    const p = powerData[0];
+                    const q = powerData[1];
+                    externalNetworkInjection.setActivePower(p * -1);
+                    externalNetworkInjection.setReactivePower(q * -1);
+                    externalNetworkInjection.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    externalNetworkInjection.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
                 }
@@ -2154,14 +2247,16 @@ class ConverterI7 {
         });
     }
     setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, regulatingControl, generatingUnit) {
-        var _a, _b;
+        var _a, _b, _c;
         const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
         condEquip.normallyInService = inBetrieb;
         const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
         if (connectivityNode) {
             const terminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
-            if (regulatingControl)
+            if (regulatingControl) {
+                regulatingControl.name = util_create_1.createNotation([regulatingControl.name, '_', (_a = connectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
                 regulatingControl.terminal = terminal;
+            }
             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, connectivityNode.connectivityNodeContainer);
             if (equipmentContainer) {
                 condEquip.equipmentContainer = equipmentContainer;
@@ -2190,11 +2285,11 @@ class ConverterI7 {
                 }
             }
             else {
-                this.logger.error(`${(_a = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _a === void 0 ? void 0 : _a.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                this.logger.error(`${(_b = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _b === void 0 ? void 0 : _b.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
             }
         }
         else {
-            this.logger.error(`${(_b = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _b === void 0 ? void 0 : _b.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
+            this.logger.error(`${(_c = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _c === void 0 ? void 0 : _c.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
         }
     }
     convertQuerkupplungen(cimModel, integral7, schaltanlagenAbschnittIDs) {
@@ -2202,7 +2297,8 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.QUERKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), 'Querkupplung');
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), 'Querkupplung');
                     bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
@@ -2232,7 +2328,8 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), i7Data.kurzname, 'Laengskupplung');
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
@@ -2440,9 +2537,10 @@ class ConverterI7 {
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
-                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_CN"]), `StpSchiene_${i7DataSchiene.id}`);
-                            const junction = new Junction_1.Junction(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_J"]), `StpSchiene/${i7DataSchiene.id}`);
+                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_CN"]));
+                            const junction = new Junction_1.Junction(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_J"]));
                             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
+                            connectivityNode.setConnectivityNodeContainer(equipmentContainer);
                             if (equipmentContainer) {
                                 equipmentContainer.addEquipment(junction);
                                 junction.equipmentContainer = equipmentContainer;
@@ -2559,7 +2657,8 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), i7Data.kurzname, 'Laengskupplung');
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
@@ -2646,8 +2745,11 @@ class ConverterI7 {
                 const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, leitungIDs));
                 for (const i7Data of result) {
                     const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
-                    if (!(stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length))
+                    if (!((stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length) > 0))
                         continue;
+                    stromkreisabschnitte.sort(function (stka, stkb) {
+                        return stka['pos'] - stkb['pos'];
+                    });
                     const leitung = new Leitung_1.LeitungImpl(i7Data);
                     integral7.integralLeitungen.set(i7Data.id, leitung);
                     let i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
@@ -2663,7 +2765,7 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         '-' +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const line = new AMPRIONLine_1.AMPRIONLine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([name, "_L"]), i7Data.stkabname, i7Schluessel);
+                    const line = new AMPRIONLine_1.AMPRIONLine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([name, i7Data.guid.substring(0, 8), "_L"], 32, true), i7Data.stkabname, i7Schluessel);
                     line.ukz = i7Data.ukz;
                     let acLineSegments = [];
                     for (const stk of stromkreisabschnitte) {
@@ -2673,7 +2775,7 @@ class ConverterI7 {
                             utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                             '-' +
                             utils_2.ueberpruefeZeichenkette(stk.bezeichner);
-                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137), util_create_1.createNotation([name, stk.pos.toString(), "_ACLS"]), i7Data.stkabname, i7Schluessel);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137), util_create_1.createNotation([name, "_" + stk.pos.toString(), stk.custom_guid_0120.substring(0, 8), "_ACLS"], 32, true), i7Data.stkabname, i7Schluessel);
                         let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(stk.multfaktor));
                         if (mf) {
                             cimModel.addMultiplierFactor(mf);
@@ -2686,12 +2788,11 @@ class ConverterI7 {
                     }
                     const acLineSegmentStart = acLineSegments[0];
                     const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
-                    let equivalentInjection = undefined;
                     if (startTerminal) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(startTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
-                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                         if (!acLineSegmentStart.baseVoltage) {
                             if (startTerminal.getConnectedNode())
@@ -2704,19 +2805,20 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
+                    this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentStart, stromkreisabschnitte[0], defaultValuesConfig);
                     cimModel.addACLineSegment(acLineSegmentStart);
-                    this.setACLineSegmentProperties(this.cimModelDefault, acLineSegments[0], stromkreisabschnitte[0], defaultValuesConfig);
                     const anzahl = acLineSegments.length;
                     let tmp_terminal = undefined;
                     for (let i = 0; i < anzahl - 1; i++) {
-                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([name, "_CN"]));
                         const acLineSegment1 = acLineSegments[i];
+                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
+                        cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
                         tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
                             tmp_terminal = undefined;
                         }
-                        this.setACLineSegmentProperties(this.cimModelDefault, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
+                        this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
                         const acLineSegment2 = acLineSegments[i + 1];
                         tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true);
                         cimModel.addACLineSegment(acLineSegment1);
@@ -2732,7 +2834,7 @@ class ConverterI7 {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(targetTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && 'boundaryPoint' in tmp_cn && tmp_cn.boundaryPoint) {
-                            equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
+                            this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                         if (!acLineSegmentZiel.baseVoltage) {
                             acLineSegmentZiel.baseVoltage = (_b = targetTerminal.getConnectivityNode()) === null || _b === void 0 ? void 0 : _b.getBaseVoltage();
@@ -2744,6 +2846,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentZiel.mrid} besitzt keinen Zielknoten.`);
                     }
+                    this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentZiel, stromkreisabschnitte[stromkreisabschnitte.length - 1], defaultValuesConfig);
                     cimModel.addACLineSegment(acLineSegmentZiel);
                     const stkBaseVoltage = acLineSegments.find(elem => elem.baseVoltage !== undefined);
                     if (!stkBaseVoltage) {
@@ -2791,7 +2894,7 @@ class ConverterI7 {
     convertLaengskondensatoren(cimModel, integral7, defaultValuesConfig) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs) {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKONDENSATOR, integral7.lKondensatorAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC"]), i7Data.kurzname);
@@ -2854,21 +2957,25 @@ class ConverterI7 {
     convertDCLines(cimModel, integral7, defaultValuesConfig) {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length) {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length > 0) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
+                    console.log(utils_1.getUUID(i7Data.guid_dcline));
+                    if (utils_1.getUUID(i7Data.guid_dcline) === '6a5b7e1e-f8be-4165-9752-2e2359d9b4f8') {
+                        let stop = true;
+                    }
                     const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data.guid_dcline), util_create_1.createNotation([utils_2.getName(i7Data), "_DCL"]));
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                     const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.getUUID(i7Data.guidp), util_create_1.createNotation([utils_2.getName(i7Data), "_DCLS"]), i7Data.kurzname, i7Schluessel);
-                    dcLineSegment.resistance = i7Data.rdc;
+                    dcLineSegment.resistance = i7Data.rdc / 2;
                     dcLineSegment.equipmentContainer = dcLine;
                     const bipol = utils_2.convertToBooleanI7(i7Data.bipol);
                     const acDCConverterStart = cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt));
                     const acDCConverterTarget = cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt));
-                    const converterUnitStart = (_a = acDCConverterStart) === null || _a === void 0 ? void 0 : _a.equipmentContainer;
-                    const converterUnitTarget = (_b = acDCConverterTarget) === null || _b === void 0 ? void 0 : _b.equipmentContainer;
-                    if (converterUnitStart && converterUnitTarget) {
+                    if (acDCConverterStart && acDCConverterTarget) {
+                        const converterUnitStart = (_a = acDCConverterStart) === null || _a === void 0 ? void 0 : _a.equipmentContainer;
+                        const converterUnitTarget = (_b = acDCConverterTarget) === null || _b === void 0 ? void 0 : _b.equipmentContainer;
                         switch (bipol) {
                             case (true): {
                                 converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
@@ -2880,37 +2987,37 @@ class ConverterI7 {
                                 converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
                             }
                         }
+                        const startDCNode = getDCNodeFromConverter(acDCConverterStart);
+                        if (startDCNode) {
+                            const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT"]));
+                            dcTerminal.connected = true;
+                            dcTerminal.dCConductingEquipment = dcLineSegment;
+                            dcTerminal.dcNode = startDCNode;
+                            startDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
+                            cimModel.addDCTerminal(dcTerminal);
+                        }
+                        else {
+                            this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
+                        }
+                        const targetDCNode = getDCNodeFromConverter(acDCConverterTarget);
+                        if (targetDCNode) {
+                            const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT"]));
+                            dcTerminal.connected = true;
+                            dcTerminal.dCConductingEquipment = dcLineSegment;
+                            dcTerminal.dcNode = targetDCNode;
+                            targetDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
+                            cimModel.addDCTerminal(dcTerminal);
+                        }
+                        else {
+                            this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
+                        }
+                        cimModel.addDCLine(dcLine);
+                        cimModel.addDCLineSegment(dcLineSegment);
+                        this.addIdMapping(i7Data.id, dcLineSegment.mrid, integral_sql_1.Integral7TableNames.HGUE_LEITUNG);
                     }
                     else {
-                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r Konverter konnte nicht ermittelt werden.`);
-                    }
-                    const startDCNode = acDCConverterStart ? getDCNodeFromConverter(acDCConverterStart) : undefined;
-                    if (startDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT"]));
-                        dcTerminal.connected = true;
-                        dcTerminal.dCConductingEquipment = dcLineSegment;
-                        dcTerminal.dcNode = startDCNode;
-                        startDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
-                        cimModel.addDCTerminal(dcTerminal);
-                    }
-                    else {
-                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
-                    }
-                    const targetDCNode = acDCConverterTarget ? getDCNodeFromConverter(acDCConverterTarget) : undefined;
-                    if (targetDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT"]));
-                        dcTerminal.connected = true;
-                        dcTerminal.dCConductingEquipment = dcLineSegment;
-                        dcTerminal.dcNode = targetDCNode;
-                        targetDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
-                        cimModel.addDCTerminal(dcTerminal);
-                    }
-                    else {
-                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
+                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: Es konnten nicht alle zugehörende/r Konverter ermittelt werden. Gefundene Konverter: ${acDCConverterStart === null || acDCConverterStart === void 0 ? void 0 : acDCConverterStart.mrid}, ${acDCConverterTarget === null || acDCConverterTarget === void 0 ? void 0 : acDCConverterTarget.mrid}`);
                     }
-                    cimModel.addDCLine(dcLine);
-                    cimModel.addDCLineSegment(dcLineSegment);
-                    this.addIdMapping(i7Data.id, dcLineSegment.mrid, integral_sql_1.Integral7TableNames.HGUE_LEITUNG);
                 }
             }
             else {
@@ -3018,11 +3125,11 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, []));
                 for (const i7Data of result) {
                     const multFaktor = new INTEGRALMultiplierFactor_1.INTEGRALMultiplierFactor(utils_1.getUUID(undefined), utils_2.getName(i7Data), i7Data.kurzname, i7Data.kommentar);
-                    multFaktor.p = utils_2.isNumericI7(i7Data.p) ? utils_2.convertToNumberI7(i7Data.p) : 1;
-                    multFaktor.qInd = utils_2.isNumericI7(i7Data.q_ind) ? utils_2.convertToNumberI7(i7Data.q_ind) : 1;
-                    multFaktor.qKap = utils_2.isNumericI7(i7Data.q_kap) ? utils_2.convertToNumberI7(i7Data.q_kap) : 1;
-                    multFaktor.cosPhiInd = utils_2.isNumericI7(i7Data.cos_phi_ind) ? utils_2.convertToNumberI7(i7Data.cos_phi_ind) : 1;
-                    multFaktor.cosPhiKap = utils_2.isNumericI7(i7Data.cos_phi_kap) ? utils_2.convertToNumberI7(i7Data.cos_phi_kap) : 1;
+                    multFaktor.p = utils_2.isNumericI7(i7Data.p) ? utils_2.convertToNumberI7(i7Data.p) : undefined;
+                    multFaktor.qInd = utils_2.isNumericI7(i7Data.q_ind) ? utils_2.convertToNumberI7(i7Data.q_ind) : undefined;
+                    multFaktor.qKap = utils_2.isNumericI7(i7Data.q_kap) ? utils_2.convertToNumberI7(i7Data.q_kap) : undefined;
+                    multFaktor.cosPhiInd = utils_2.isNumericI7(i7Data.cos_phi_ind) ? utils_2.convertToNumberI7(i7Data.cos_phi_ind) : undefined;
+                    multFaktor.cosPhiKap = utils_2.isNumericI7(i7Data.cos_phi_kap) ? utils_2.convertToNumberI7(i7Data.cos_phi_kap) : undefined;
                     this.cimModelDefault.addMultiplierFactor(multFaktor);
                     this.addIdMapping(i7Data.id, multFaktor.mrid, integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR);
                 }
@@ -3050,7 +3157,8 @@ class ConverterI7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT"]), i7Data.kurzname, i7Data.kommentar);
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -3093,7 +3201,7 @@ class ConverterI7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2${powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     const sr2 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
                     const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
@@ -3118,18 +3226,12 @@ class ConverterI7 {
                     powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
                     powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
-                    const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2];
+                    const powerTransformerEnds = [powerTransformer.powerTransformerEnds[0], powerTransformer.powerTransformerEnds[1]];
                     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);
-                    try {
-                        this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
-                    }
-                    catch (err) {
-                        console.log('convertTapChangers');
-                        console.log(err);
-                    }
+                    this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
                     cimModel.addPowerTransformer(powerTransformer);
@@ -3171,7 +3273,8 @@ class ConverterI7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT"]), i7Data.kurzname, i7Data.kommentar);
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -3207,7 +3310,7 @@ class ConverterI7 {
                     const impedanzW1 = utils_trafo3w_1.calculateImpedanzenTrafo3W(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
                     const impedanzW2 = utils_trafo3w_1.calculateImpedanzenTrafo3W(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
                     const impedanzW3 = utils_trafo3w_1.calculateImpedanzenTrafo3W(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1 ${powerTransformer.name}`);
+                    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 wicklung1 = trafoWicklungen.get(i7Data.trafowicklung3w1);
                     const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, PhaseCode_1.PhaseCode.ABC);
@@ -3234,7 +3337,7 @@ class ConverterI7 {
                     const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal2)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     powerTransformerEnd2.r = impedanzW2.r;
                     powerTransformerEnd2.x = impedanzW2.x;
@@ -3258,7 +3361,7 @@ class ConverterI7 {
                     const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal3)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer.name}`);
+                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd3.endNumber = 3;
                     powerTransformerEnd3.r = impedanzW3.r;
                     powerTransformerEnd3.x = impedanzW3.x;
@@ -3284,13 +3387,7 @@ class ConverterI7 {
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
                     const connectivityNode = cimModel.getObject(cnUUID);
-                    try {
-                        this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
-                    }
-                    catch (err) {
-                        console.log('convertTapChangers');
-                        console.log(err);
-                    }
+                    this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
                     cimModel.addPowerTransformer(powerTransformer);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
@@ -3383,7 +3480,7 @@ class ConverterI7 {
                     line.addConnectivityNode(connectivityNode);
                     const junction = new Junction_1.Junction(utils_1.generateUUID(), `${line.name}_BD-J`, `Junction`, 'Junction for Geo');
                     junction.equipmentContainer = line;
-                    let terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([line.name, '_BD-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
+                    let terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([line.getUUID().substring(0, 8), '_BD-JCT-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
                     junction.terminals.set(terminal.getUUID(), terminal);
                     terminal.conductingEquipment = junction;
                     line.addEquipment(junction);
@@ -3435,19 +3532,17 @@ class ConverterI7 {
         const winding1_guid = winding_guids[0];
         const winding2 = powerTransformer.powerTransformerEnds[0];
         if (!(winding1_guid === winding2.getUUID())) {
-            const winding1 = powerTransformer.powerTransformerEnds.find(e => e.mrid === winding1_guid[0]);
-            if (winding1) {
-                let val = winding2.phaseAngleClock;
-                winding2.phaseAngleClock = 0;
-                winding1.phaseAngleClock = 12 - val;
-            }
-            else {
-                const isNull = true;
-            }
+            powerTransformer.powerTransformerEnds[0].endNumber = 1;
+            powerTransformer.powerTransformerEnds[1].endNumber = 2;
+            powerTransformer.powerTransformerEnds[1].phaseAngleClock = 12 - powerTransformer.powerTransformerEnds[0].phaseAngleClock;
+            powerTransformer.powerTransformerEnds[0].phaseAngleClock = 0;
         }
     }
-    setACLineSegmentProperties(defaultModel, acLineSegment, data, defaultValuesConfig) {
-        if (utils_2.isNumericI7(data.laenge) && data.laenge <= 0) {
+    setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, defaultValuesConfig) {
+        if (acLineSegment.getUUID() === 'e2505f0f-c764-44da-b88b-d40e048193c9') {
+            let stop = true;
+        }
+        if ((utils_2.isNumericI7(data.laenge) && data.laenge <= 0) || (utils_2.isBooleanI7(data.flag_impedanzlos) && utils_2.convertToBooleanI7(data.flag_impedanzlos))) {
             data.flag_impedanzlos = 1;
         }
         if (utils_2.isNumericI7(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
@@ -3522,12 +3617,12 @@ class ConverterI7 {
         }
         for (const terminal of acLineSegment.terminals.values()) {
             if (utils_2.isNumericI7(data.ir) && data.ir > 0) {
-                this.setConductingEquipmentCurrentLimit(defaultModel, acLineSegment.name, terminal, data.ir);
+                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, data.ir);
             }
             else if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
-                this.setConductingEquipmentCurrentLimit(defaultModel, acLineSegment.name, terminal, assetType.ratedCurrent);
+                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
             }
-            const psrType = utils_1.createIfNotExitsPSRType(defaultModel, data.typ);
+            const psrType = utils_1.createIfNotExitsPSRType(cimModel, data.typ);
             acLineSegment.psrTypeUUID = psrType.mrid;
         }
     }
@@ -3574,10 +3669,12 @@ class ConverterI7 {
         return operationalLimitType;
     }
     createConnection(cimModel, conductingEquipment, object, phase, connected) {
+        let isNameSet = false;
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
             const cn = object;
-            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([cn.name, '_T']));
+            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_T']));
+            isNameSet = true;
             terminal.setConnectivityNode(cn);
             cn.addTerminal(terminal);
             cimModel.addTerminal(terminal);
@@ -3590,7 +3687,9 @@ class ConverterI7 {
             terminal.conductingEquipment = conductingEquipment;
             conductingEquipment.addTerminal(terminal);
             terminal.connected = connected;
-            terminal.name = util_create_1.createNotation([conductingEquipment.name, terminal.name], 32, true);
+            if (!isNameSet) {
+                terminal.name = util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
+            }
         }
         return terminal;
     }
@@ -3610,7 +3709,7 @@ class ConverterI7 {
                 const object = cimModelBD.getObject(anschlussUUID);
                 if (object instanceof ConnectivityNode_1.ConnectivityNode) {
                     cn = object;
-                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([cn.name, '_T']));
+                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
                     terminal.connectivityNodeUUID = cn.mrid;
                     terminal.phases = phase;
                     terminal.connected = true;
@@ -3627,6 +3726,7 @@ class ConverterI7 {
                         terminal.setConnectivityNodeUUID(cn.getUUID());
                         terminal.setConnectivityNode(undefined);
                     }
+                    terminal.name = util_create_1.createNotation([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
                     cimModelBD.terminals.delete(terminal.mrid);
                     cimModel.addTerminal(terminal);
                 }
@@ -3679,7 +3779,7 @@ class ConverterI7 {
                 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);
+                tmp_terminal.name = util_create_1.createNotation([frame.tsoName, '_BD-EI-T'], 32, true);
                 cn.addTerminal(tmp_terminal);
                 frame.cimModel.addEquivalentInjection(equivalentInjection);
                 if (tmp_terminal.getConductingEquipmentUUID() !== undefined) {
@@ -4004,7 +4104,7 @@ class ConverterI7 {
         const cimModel = frame.cimModel;
         if (terminal) {
             powerTransformerEnd.terminal = terminal;
-            this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + powerTransformer.name, terminal, ir);
+            this.setConductingEquipmentCurrentLimit(cimModel, 'W1 ' + (powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name), terminal, ir);
             if (sternpunktKnotenMap.has(i7Data.id) && i7Data) {
                 if (sternpunktKnotenMap.get(i7Data.id).has(i7Data.aknknoten1p)) {
                     this.convertTrafoGrounding(frame, powerTransformer, powerTransformerEnd, integral7, sternpunktKnotenMap.get(i7Data.id).get(i7Data.aknknoten1p), defaultValuesConfig);
@@ -4042,7 +4142,7 @@ class ConverterI7 {
         powerTransformer.addPowerTransformerEnd(powerTransformerEnd);
     }
     convertTapChangers(i7Data, transformerEnds, cimModel, transformerinfo, connectivityNode, spannungsband) {
-        var _a, _b;
+        var _a, _b, _c;
         for (let tapChangerNumber = 1; tapChangerNumber <= 2; tapChangerNumber++) {
             const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
             const transformerEnd = transformerEnds.find(elem => elem.endNumber === tapChangerNumber);
@@ -4055,10 +4155,14 @@ class ConverterI7 {
                 this.logger.error(`Trafo ${i7Data.id}: Zum Stufenschalter ${gestufteSeite} keine Wicklung gefunden.`);
                 continue;
             }
+            else if (!gestufteSeite) {
+                this.logger.error(`Trafo ${i7Data.id}: Kein Stufenschalter ${gestufteSeite} zur Wicklung ${transformerEnd.getUUID()} an Transformator ${(_b = transformerEnd.powerTransformer) === null || _b === void 0 ? void 0 : _b.getUUID()} gefunden.`);
+                continue;
+            }
             const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
             const angle = utils_2.isNumericI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
                 ? utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`])
-                : (_b = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _b === void 0 ? void 0 : _b.value;
+                : (_c = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _c === void 0 ? void 0 : _c.value;
             const neutralU = transformerEnd.ratedU;
             let tapChanger;
             if (isFinite(angle) && angle !== 0) {
@@ -4423,6 +4527,7 @@ class ConverterI7 {
     addIdMapping(i7ID, uuid, type) {
         if (this.integralID2UUID.has(i7ID)) {
             console.log(`ID ${i7ID} existiert bereits. Typ ${this.integralID2Type.get(i7ID)} neuer Typ ${type}`);
+            this.logger.debug(`ID ${i7ID} existiert bereits. Typ ${this.integralID2Type.get(i7ID)} neuer Typ ${type}`);
         }
         else {
             this.integralID2UUID.set(i7ID, uuid);
@@ -4487,7 +4592,8 @@ class ConverterI7 {
 }
 exports.ConverterI7 = ConverterI7;
 function getDCNodeFromConverter(acDcConverter) {
-    for (const terminal of acDcConverter.dCTerminals.values()) {
+    var _a;
+    for (const terminal of (_a = acDcConverter === null || acDcConverter === void 0 ? void 0 : acDcConverter.dCTerminals) === null || _a === void 0 ? void 0 : _a.values()) {
         if (terminal.dcNode)
             return terminal.dcNode;
     }