@enervance/insight-cim-model 0.0.50 → 0.0.51

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

@@ -161,87 +161,77 @@ class ConverterI7 {
     convert(objectMappingConfig, defaultValuesConfig, energyTypesConfig, exportConfig, tempDirPath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                try {
-                    yield this.createColumnIndex();
-                    yield this.configExportFrames(exportConfig, defaultValuesConfig, tempDirPath);
-                    yield this.convertBetriebsmitteltypenKdrossel();
-                    yield this.convertBetriebsmitteltypenLeitung();
-                    yield this.convertBetriebsmitteltypenTrafo();
-                    yield this.convertBetriebsmitteltypenGenerator();
-                    yield this.convertBetriebsmitteltypenAsynchronmotor();
-                    yield this.convertMultiplikationsfaktoren();
-                    yield this.queryLeitungsAnschlussIDs();
-                    yield this.queryTrafosAnschlussIDs();
-                    yield this.queryHgueAnschlussIDs();
-                    yield this.queryLDroselAnschlussIDs();
-                    yield this.queryErsatzLaengsAnschlussIDs();
-                    yield this.queryLkondensatorAnschlussIDs();
-                    console.log('Convert BD Profiles');
-                    for (const entry of this.exportFramesBoundary.entries()) {
-                        const geoRegionUUID = entry[0];
-                        const frame = entry[1];
-                        const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
-                        if (!geoRegion)
-                            continue;
-                        yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
-                    }
-                    console.log('Convert MAS Profiles');
-                    for (const entry of this.exportFrames.entries()) {
-                        const geoRegionUUID = entry[0];
-                        const frame = entry[1];
-                        const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
-                        if (!geoRegion)
-                            continue;
-                        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}`);
-                        frame.serializeModel(defaultValuesConfig);
-                        yield frame.closeXMLModel();
-                        let endTime = perf_hooks_1.performance.now();
-                        frame.cimModel.purgeData();
-                        console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
-                    }
-                    console.log('Serialize BD Profiles');
-                    for (const entry of this.exportFramesBoundary.entries()) {
-                        const geoRegionUUID = entry[0];
-                        const frame = entry[1];
-                        const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
-                        if (!geoRegion)
-                            continue;
-                        console.log('Transform MAS Profiles');
-                        yield this.transformBoundaryModel(frame, [...this.exportFrames.values()]);
-                        frame.validateCIMModel();
-                        const startTime = perf_hooks_1.performance.now();
-                        frame.openXMLModel();
-                        console.log(`Serialize BD profile: ${frame.mas}`);
-                        frame.serializeModel(defaultValuesConfig);
-                        yield frame.closeXMLModel();
-                        let endTime = perf_hooks_1.performance.now();
-                        console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
-                    }
-                    const zip = new jszip_1.default();
-                    const gridFrames = [...this.exportFrames.values(), ...this.exportFramesBoundary.values()]
-                        .filter((value, index, self) => self.indexOf(value) === index);
-                    for (const frame of gridFrames) {
-                        for (const xmlSerializer of frame.profileXmlSerializers.values()) {
-                            const readStreamEq = fs_1.default.createReadStream(xmlSerializer.filePath);
-                            zip.file(`${xmlSerializer.fileName}`, readStreamEq);
-                        }
-                    }
-                    resolve(yield utils_2.generateNodeStream(zip));
-                }
-                catch (e) {
-                    this.logger.error(e);
-                    console.error('ERROR:' + e);
-                    reject({ status: 'error', message: e.toString() });
-                }
-                finally {
-                    yield this.dropColumnIndex();
-                }
+                yield this.createColumnIndex();
+                yield this.configExportFrames(exportConfig, defaultValuesConfig, tempDirPath);
+                yield this.convertBetriebsmitteltypenKdrossel();
+                yield this.convertBetriebsmitteltypenLeitung();
+                yield this.convertBetriebsmitteltypenTrafo();
+                yield this.convertBetriebsmitteltypenGenerator();
+                yield this.convertBetriebsmitteltypenAsynchronmotor();
+                yield this.convertMultiplikationsfaktoren();
+                yield this.queryLeitungsAnschlussIDs();
+                yield this.queryTrafosAnschlussIDs();
+                yield this.queryHgueAnschlussIDs();
+                yield this.queryLDroselAnschlussIDs();
+                yield this.queryErsatzLaengsAnschlussIDs();
+                yield this.queryLkondensatorAnschlussIDs();
+                console.log('Convert BD Profiles');
+                for (const entry of this.exportFramesBoundary.entries()) {
+                    const geoRegionUUID = entry[0];
+                    const frame = entry[1];
+                    const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
+                    if (!geoRegion)
+                        continue;
+                    yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
+                }
+                console.log('Convert MAS Profiles');
+                for (const entry of this.exportFrames.entries()) {
+                    const geoRegionUUID = entry[0];
+                    const frame = entry[1];
+                    const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
+                    if (!geoRegion)
+                        continue;
+                    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}`);
+                    frame.serializeModel(defaultValuesConfig);
+                    yield frame.closeXMLModel();
+                    let endTime = perf_hooks_1.performance.now();
+                    frame.cimModel.purgeData();
+                    console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
+                }
+                console.log('Serialize BD Profiles');
+                for (const entry of this.exportFramesBoundary.entries()) {
+                    const geoRegionUUID = entry[0];
+                    const frame = entry[1];
+                    const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
+                    if (!geoRegion)
+                        continue;
+                    console.log('Transform MAS Profiles');
+                    yield this.transformBoundaryModel(frame, [...this.exportFrames.values()]);
+                    frame.validateCIMModel();
+                    const startTime = perf_hooks_1.performance.now();
+                    frame.openXMLModel();
+                    console.log(`Serialize BD profile: ${frame.mas}`);
+                    frame.serializeModel(defaultValuesConfig);
+                    yield frame.closeXMLModel();
+                    let endTime = perf_hooks_1.performance.now();
+                    console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
+                }
+                const zip = new jszip_1.default();
+                const gridFrames = [...this.exportFrames.values(), ...this.exportFramesBoundary.values()]
+                    .filter((value, index, self) => self.indexOf(value) === index);
+                for (const frame of gridFrames) {
+                    for (const xmlSerializer of frame.profileXmlSerializers.values()) {
+                        const readStreamEq = fs_1.default.createReadStream(xmlSerializer.filePath);
+                        zip.file(`${xmlSerializer.fileName}`, readStreamEq);
+                    }
+                }
+                resolve(yield utils_2.generateNodeStream(zip));
             }));
         });
     }
@@ -439,6 +429,64 @@ class ConverterI7 {
             startTime = perf_hooks_1.performance.now();
             yield this.convertNetzvarianten(cimModel, integral7Modell);
             logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
+            for (const key of integral7Modell.i7SchemaID2UUID.keys()) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaStandorte(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaStandorte`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaKnotenSo(cimModel, integral7Modell, knotenSoIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaKnotenSo`);
+                startTime = perf_hooks_1.performance.now();
+                logExecutionTime(this.logger, startTime, `convertSchemaHgueKnotenSo`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaSchaltanlage(cimModel, integral7Modell, schaltanlagenIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlage`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlagenAbschnitte`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaSammelschienenAbschnitte`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaSchaltfeldElemente(cimModel, integral7Modell, schaltfeldIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaSchaltfeldElemente`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaQuerkupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaQuerkupplungen`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaLaengskupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaLaengskupplungen`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaTransformatoren2W(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren2W`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaTransformatoren3W(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren3W`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaQuerzweige(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaQuerzweige`);
+                startTime = perf_hooks_1.performance.now();
+                logExecutionTime(this.logger, startTime, `convertSchemaSternpunktSchiene`);
+                startTime = perf_hooks_1.performance.now();
+                logExecutionTime(this.logger, startTime, `convertSchemaSternpunktKnoten`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaLeitungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                logExecutionTime(this.logger, startTime, `convertSchemaLeitungen`);
+                integral7Modell.integralLaengskupplungen.clear();
+                integral7Modell.integralHgueLeitungen.clear();
+                integral7Modell.i7ID2UUID.clear();
+                integral7Modell.i7SchemaID2Type.clear();
+                integral7Modell.integralNSGStandorte.clear();
+                integral7Modell.integralNSGSchaltanlage.clear();
+                integral7Modell.integralNSGSchaltfeld.clear();
+                integral7Modell.integralNSGSAAbschnitt.clear();
+                integral7Modell.integralNSGSsab.clear();
+                integral7Modell.integralNSGStpSchiene.clear();
+                integral7Modell.integralNSGStpKnoten.clear();
+                integral7Modell.integralNSGTrafos.clear();
+                integral7Modell.integralNSGQuerzweig.clear();
+                integral7Modell.placedCIMObjectsForDLProfil.clear();
+            }
         });
     }
     assignTerminalSequenceNumber(cimModel) {
@@ -698,8 +746,8 @@ class ConverterI7 {
             if (schaltanlagenabschnittIDs.length <= 0)
                 return;
             const isEingeblendet = 1;
-            let sqlSelectGroupedMaxSlotSf = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
-                                     FROM nsg_nsgschaltfeld
+            let sqlSelectGroupedMaxSlotSf = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
+                                     FROM nsg_nsgschaltfeld
                                      WHERE ((${integral_sql_1.getWhereIDs('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
             if (onlyEingeblendet) {
                 sqlSelectGroupedMaxSlotSf += ` AND (eingeblendet = ${isEingeblendet} OR (eingeblendet IS NULL AND angezeigt = ${isEingeblendet}))`;
@@ -707,8 +755,8 @@ class ConverterI7 {
             sqlSelectGroupedMaxSlotSf += ` GROUP BY nsgsaa`;
             const resultsMaxSlotsSf = yield this.mysqlController.execQuery(sqlSelectGroupedMaxSlotSf);
             const mappedResultsMaxSlotsSf = new Map(resultsMaxSlotsSf.map(value => [value.nsgsaa, value.laenge]));
-            let sqlSelectGroupedMaxSlotKpF = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
-                                      FROM nsg_nsgkpfeld
+            let sqlSelectGroupedMaxSlotKpF = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
+                                      FROM nsg_nsgkpfeld
                                       WHERE ((${integral_sql_1.getWhereIDs('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
             if (onlyEingeblendet) {
                 sqlSelectGroupedMaxSlotKpF += ` AND (eingeblendet = ${isEingeblendet} OR (eingeblendet IS NULL AND angezeigt = ${isEingeblendet}))`;
@@ -716,19 +764,19 @@ class ConverterI7 {
             sqlSelectGroupedMaxSlotKpF += ` GROUP BY nsgsaa`;
             const resultsMaxSlotsKpF = yield this.mysqlController.execQuery(sqlSelectGroupedMaxSlotKpF);
             const mappedResultsMaxSlotsKpF = new Map(resultsMaxSlotsKpF.map(value => [value.nsgsaa, value.laenge]));
-            const sqlStatement = `SELECT nsg_nsgsaab.variantennr,
-              nsg_nsgsaab.id,
-              nsg_nsgsaab.laenge AS laenge,
-              nsg_nsgsaab.nslots,
-              nsg_nsgsaab.saabschnitt,
-              nsg_nsgsaab.nsgsa,
-              nsg_nsgsaab.angezeigt,
-              nsg_nsgsaab.eingeblendet,
-              nsg_nsgsaab.nsglkp,
-              netz_ssab.pos      AS posSSAB,
-              netz_ssab.id       AS idSSAB
-       FROM netz_ssab
-                LEFT JOIN nsg_nsgsaabschnitt AS nsg_nsgsaab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
+            const sqlStatement = `SELECT nsg_nsgsaab.variantennr,
+              nsg_nsgsaab.id,
+              nsg_nsgsaab.laenge AS laenge,
+              nsg_nsgsaab.nslots,
+              nsg_nsgsaab.saabschnitt,
+              nsg_nsgsaab.nsgsa,
+              nsg_nsgsaab.angezeigt,
+              nsg_nsgsaab.eingeblendet,
+              nsg_nsgsaab.nsglkp,
+              netz_ssab.pos      AS posSSAB,
+              netz_ssab.id       AS idSSAB
+       FROM netz_ssab
+                LEFT JOIN nsg_nsgsaabschnitt AS nsg_nsgsaab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
        WHERE (${integral_sql_1.getWhereIDs('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')});`;
             const queryResults = yield this.mysqlController.execQuery(sqlStatement);
             queryResults.forEach(value => {
@@ -738,6 +786,9 @@ class ConverterI7 {
             for (const queryResult of filteredResults) {
                 const nsgSa = integral7.integralNSGSchaltanlage.get(queryResult.nsgsa);
                 const nsgSo = integral7.integralNSGStandorte.get(nsgSa.nsgsoid);
+                if (nsgSo === undefined) {
+                    continue;
+                }
                 const leftOffset = queryResult.nslots * constants_1.NsgConstants.HORIZONTAL_OFFSET;
                 const topOffset = queryResult.posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
                 const ssabLength = queryResult.laenge * constants_1.NsgConstants.HORIZONTAL_OFFSET;
@@ -788,6 +839,15 @@ class ConverterI7 {
                 const resultsNsgSchaltfeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTFELD, schaltfeldIDs));
                 const filteredResultsNsgSchaltfeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgSchaltfeld, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgSchaltfeld) {
+                    const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
+                    const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
+                    if (nsgSa === undefined) {
+                        continue;
+                    }
+                    const nsgSo = integral7.integralNSGStandorte.get(nsgSa.nsgsoid);
+                    if (nsgSo === undefined) {
+                        continue;
+                    }
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_SCHALTFELD);
                     const nsgSchaltfeldObj = new SchaltfeldNsg_1.SchaltfeldNsgImpl(i7Data);
                     integral7.integralNSGSchaltfeld.set(i7Data.id, nsgSchaltfeldObj);
@@ -862,15 +922,13 @@ class ConverterI7 {
                     [...nodePointMap.entries()].forEach(entry => {
                         uuidPointsMap.set(this.integralID2UUID.get(entry[0]), entry[1]);
                     });
-                    const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
-                    const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
                     nsgSchaltfeldObj.orientation = nsgSa.ausrichtung;
                     if (i7Data.deltaausrichtung === 1) {
                         nsgSchaltfeldObj.orientation = (nsgSchaltfeldObj.orientation + 2) % 4;
                     }
                     uuidPointsMap.forEach((entryDiagramObject, key) => {
                         if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
-                            entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                            entryDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSaNsgSf(nsgSa.ausrichtung, schaltfeldDeltaausrichtung);
                         }
                     });
                     util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap, true);
@@ -905,7 +963,8 @@ class ConverterI7 {
                     const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
                     uuidPointsMap.forEach((entryDiagramObject, key) => {
                         if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
-                            entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                            entryDiagramObject.rotation += (util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung) - 90 + 720);
+                            entryDiagramObject.rotation = entryDiagramObject.rotation % 360;
                         }
                     });
                     util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap, true);
@@ -915,7 +974,8 @@ class ConverterI7 {
     }
     convertSchemaLaengskupplungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG) && integral7.laengskupplungIDs.length > 0) {
+            const ssabIDs = [...integral7.integralNSGSAAbschnitt.keys()];
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG) && integral7.laengskupplungIDs.length > 0 && ssabIDs.length > 0) {
                 const i7relevantTables = [
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
@@ -924,7 +984,7 @@ class ConverterI7 {
                 ];
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
                 const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, integral7.laengskupplungIDs));
-                const resultsNsgLKupplung = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, [...integral7.integralNSGSAAbschnitt.keys()]));
+                const resultsNsgLKupplung = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, ssabIDs));
                 const filteredResultsNsgLKupplung = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgLKupplung, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgLKupplung) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG);
@@ -941,7 +1001,12 @@ class ConverterI7 {
                     const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
                     uuidPointsMap.forEach((entryDiagramObject, key) => {
                         if (!(entryDiagramObject.identifiedObject instanceof Terminal_1.Terminal || entryDiagramObject.identifiedObject instanceof ConnectivityNode_1.ConnectivityNode)) {
-                            entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                            if (entryDiagramObject.rotation === undefined) {
+                                entryDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                            }
+                            else {
+                                entryDiagramObject.rotation += util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                            }
                         }
                     });
                     util_functions_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, variantenNr, i7Data.nsgsaa, uuidPointsMap);
@@ -951,69 +1016,74 @@ class ConverterI7 {
     }
     convertSchemaTransformatoren2W(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO2W) && nsgStandortIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO2W, nsgStandortIDs));
-                let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
-                for (const i7Data of filteredResults) {
-                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_TRAFO2W);
-                    const uuidPointsMap = new Map();
-                    const trafo2wNsg = new Trafo2wNsg_1.Trafo2wNsgImpl(i7Data);
-                    integral7.integralNSGTrafos.set(i7Data.trafo2w, trafo2wNsg);
-                    const trafoDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO2W_WIDTH / 2, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
-                    trafoDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnTrafo2W(trafo2wNsg.ausrichtung);
-                    const tempPoints = [];
-                    tempPoints.push(trafoDiagramObject.diagramObjectPoints[0]);
-                    const trafoUUID = this.integralID2UUID.get(trafo2wNsg.trafo2wid);
-                    const transformer = cimModel.getPowerTransformer(trafoUUID);
-                    const terminal1 = transformer.powerTransformerEnds[0].terminal;
-                    const terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(0, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
-                    tempPoints.push(terminal1DiagramObject.diagramObjectPoints[0]);
-                    const terminal2 = transformer.powerTransformerEnds[1].terminal;
-                    const terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO2W_WIDTH, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
-                    tempPoints.push(terminal2DiagramObject.diagramObjectPoints[0]);
-                    for (const p of tempPoints) {
-                        util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, 360 - (90 * trafo2wNsg.ausrichtung) % 360);
-                        p.xPosition += trafo2wNsg.xrel;
-                        p.yPosition += trafo2wNsg.yrel;
-                        p.xPosition += (trafo2wNsg.ausrichtung === 1 ? constants_1.NsgConstants.TRAFO2W_HEIGHT : 0);
-                        p.xPosition += (trafo2wNsg.ausrichtung === 2 ? constants_1.NsgConstants.TRAFO2W_WIDTH : 0);
-                        p.yPosition += (trafo2wNsg.ausrichtung === 2 ? constants_1.NsgConstants.TRAFO2W_HEIGHT : 0);
-                        p.yPosition += (trafo2wNsg.ausrichtung === 3 ? constants_1.NsgConstants.TRAFO2W_WIDTH : 0);
-                    }
-                    uuidPointsMap.set(this.integralID2UUID.get(trafo2wNsg.trafo2wid), trafoDiagramObject);
-                    if (terminal1 !== undefined) {
-                        uuidPointsMap.set(terminal1.getUUID(), terminal1DiagramObject);
-                    }
-                    if (terminal2 !== undefined) {
-                        uuidPointsMap.set(terminal2.getUUID(), terminal2DiagramObject);
-                    }
-                    util_functions_1.DLUtilFunctions.shiftAddBasedOnNsgSo(cimModel, integral7, variantenNr, trafo2wNsg.nsgsoid, uuidPointsMap);
-                    let t1CNdiagramObject, t1DiagramObject, t2CNdiagramObject, t2DiagramObject;
-                    if (terminal1 !== undefined) {
-                        t1CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.connectivityNode.getUUID());
-                        t1DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getUUID());
-                    }
-                    if (terminal2 !== undefined) {
-                        t2CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.connectivityNode.getUUID());
-                        t2DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getUUID());
-                    }
-                    if (trafo2wNsg.ausrichtung === 2 || trafo2wNsg.ausrichtung === 3) {
-                        if (terminal2 !== undefined)
-                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t1CNdiagramObject.diagramObjectPoints);
-                        if (terminal1 !== undefined)
-                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t2CNdiagramObject.diagramObjectPoints);
-                    }
-                    else {
-                        if (terminal1 !== undefined)
-                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
-                        if (terminal2 !== undefined)
-                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+            try {
+                const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
+                if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO2W) && nsgStandortIDs.length > 0) {
+                    const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO2W, nsgStandortIDs));
+                    let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
+                    for (const i7Data of filteredResults) {
+                        integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_TRAFO2W);
+                        const uuidPointsMap = new Map();
+                        const trafo2wNsg = new Trafo2wNsg_1.Trafo2wNsgImpl(i7Data);
+                        integral7.integralNSGTrafos.set(i7Data.trafo2w, trafo2wNsg);
+                        const trafoDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO2W_WIDTH / 2, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
+                        trafoDiagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnTrafo2W(trafo2wNsg.ausrichtung);
+                        const tempPoints = [];
+                        tempPoints.push(trafoDiagramObject.diagramObjectPoints[0]);
+                        const trafoUUID = this.integralID2UUID.get(trafo2wNsg.trafo2wid);
+                        const transformer = cimModel.getPowerTransformer(trafoUUID);
+                        const terminal1 = transformer.powerTransformerEnds[0].terminal;
+                        const terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(0, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
+                        tempPoints.push(terminal1DiagramObject.diagramObjectPoints[0]);
+                        const terminal2 = transformer.powerTransformerEnds[1].terminal;
+                        const terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO2W_WIDTH, constants_1.NsgConstants.TRAFO2W_HEIGHT / 2);
+                        tempPoints.push(terminal2DiagramObject.diagramObjectPoints[0]);
+                        for (const p of tempPoints) {
+                            util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, 360 - (90 * trafo2wNsg.ausrichtung) % 360);
+                            p.xPosition += trafo2wNsg.xrel;
+                            p.yPosition += trafo2wNsg.yrel;
+                            p.xPosition += (trafo2wNsg.ausrichtung === 1 ? constants_1.NsgConstants.TRAFO2W_HEIGHT : 0);
+                            p.xPosition += (trafo2wNsg.ausrichtung === 2 ? constants_1.NsgConstants.TRAFO2W_WIDTH : 0);
+                            p.yPosition += (trafo2wNsg.ausrichtung === 2 ? constants_1.NsgConstants.TRAFO2W_HEIGHT : 0);
+                            p.yPosition += (trafo2wNsg.ausrichtung === 3 ? constants_1.NsgConstants.TRAFO2W_WIDTH : 0);
+                        }
+                        uuidPointsMap.set(this.integralID2UUID.get(trafo2wNsg.trafo2wid), trafoDiagramObject);
+                        if (terminal1 !== undefined) {
+                            uuidPointsMap.set(terminal1.getUUID(), terminal1DiagramObject);
+                        }
+                        if (terminal2 !== undefined) {
+                            uuidPointsMap.set(terminal2.getUUID(), terminal2DiagramObject);
+                        }
+                        util_functions_1.DLUtilFunctions.shiftAddBasedOnNsgSo(cimModel, integral7, variantenNr, trafo2wNsg.nsgsoid, uuidPointsMap);
+                        let t1CNdiagramObject, t1DiagramObject, t2CNdiagramObject, t2DiagramObject;
+                        if (terminal1 !== undefined) {
+                            t1CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.connectivityNode.getUUID());
+                            t1DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getUUID());
+                        }
+                        if (terminal2 !== undefined) {
+                            t2CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.connectivityNode.getUUID());
+                            t2DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getUUID());
+                        }
+                        if (trafo2wNsg.ausrichtung === 2 || trafo2wNsg.ausrichtung === 3) {
+                            if (terminal2 !== undefined && t1CNdiagramObject !== undefined)
+                                utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                            if (terminal1 !== undefined && t2CNdiagramObject !== undefined)
+                                utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                        }
+                        else {
+                            if (terminal1 !== undefined && t1CNdiagramObject !== undefined)
+                                utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                            if (terminal2 !== undefined && t2CNdiagramObject !== undefined)
+                                utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                        }
                     }
                 }
+                else {
+                    this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_TRAFO2W} ist nicht vorhanden.`);
+                }
             }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_TRAFO2W} ist nicht vorhanden.`);
+            catch (err) {
+                console.log(err);
             }
         });
     }
@@ -1035,6 +1105,8 @@ class ConverterI7 {
                     const tempPoints = [];
                     tempPoints.push(trafoDiagramObject.diagramObjectPoints[0]);
                     const trafo3wNetz = netzTrafos.get(trafo3wNsg.trafo3wid);
+                    if (trafo3wNetz === undefined)
+                        continue;
                     const pteW1 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w1));
                     const pteW2 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w2));
                     const pteW3 = cimModel.getPowerTransformerEnd(this.integralID2UUID.get(trafo3wNetz.trafowicklung3w3));
@@ -1105,7 +1177,7 @@ class ConverterI7 {
         });
     }
     convertSchemaLeitungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        var _a, _b, _c;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const leitungIDs = [...integral7.integralLeitungen.keys(), ...integral7.integralHgueLeitungen.keys()];
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNG) && this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT)
@@ -1113,198 +1185,203 @@ class ConverterI7 {
                 const leitungResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNG, leitungIDs));
                 let filteredLeitungResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungResults, variantenNr, onlyEingeblendet);
                 const nsgLeitungIDs = filteredLeitungResults.map(elem => elem.id);
-                const leitungspktResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNGSPUNKT, nsgLeitungIDs));
-                let filteredLeitungspktResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungspktResults, variantenNr, onlyEingeblendet);
-                for (const i7Data of filteredLeitungResults) {
-                    integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_LEITUNG);
-                    let netzLeitung, aKnotenCimObjectUUID, eKnotenCimObjectUUID;
-                    const isACLine = integral7.integralLeitungen.get(i7Data.leitung);
-                    if (isACLine) {
-                        netzLeitung = integral7.integralLeitungen.get(i7Data.leitung);
-                        aKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.aknotenid);
-                        eKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.eknotenid);
-                    }
-                    else {
-                        netzLeitung = integral7.integralHgueLeitungen.get(i7Data.leitung);
-                        aKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.anetzobjekt);
-                        eKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.enetzobjekt);
-                    }
-                    const anfSchemaType = integral7.i7SchemaID2Type.get(i7Data.anschlussanf);
-                    const endSchemaType = integral7.i7SchemaID2Type.get(i7Data.anschlussend);
-                    let tempDiagramObjectPoints = [];
-                    let tempAnfDiagramObject = undefined;
-                    let tempEndDiagramObject = undefined;
-                    if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
-                        const anfSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.anschlussanf);
-                        tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(anfSchaltfeld.lastNodeCimUUID);
-                    }
-                    else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
-                        tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(aKnotenCimObjectUUID);
-                    }
-                    else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) {
-                        tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(integral7.i7ID2UUID.get(i7Data.anschlussanf));
-                    }
-                    else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) {
-                        tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(aKnotenCimObjectUUID);
-                    }
-                    else {
-                    }
-                    if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
-                        const anfSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.anschlussend);
-                        tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(anfSchaltfeld.lastNodeCimUUID);
-                    }
-                    else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
-                        tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(eKnotenCimObjectUUID);
-                    }
-                    else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) {
-                        tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(integral7.i7ID2UUID.get(i7Data.anschlussend));
-                    }
-                    else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) {
-                        tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(eKnotenCimObjectUUID);
-                    }
-                    else {
-                    }
-                    if (tempAnfDiagramObject === undefined || tempEndDiagramObject === undefined)
-                        continue;
-                    tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(tempAnfDiagramObject.diagramObjectPoints[0].xPosition, tempAnfDiagramObject.diagramObjectPoints[0].yPosition));
-                    const relevantLeitungspkts = filteredLeitungspktResults.filter(elem => elem.nsgleitung === i7Data.id).sort((a, b) => a.pos - b.pos);
-                    for (let a = 0; a < relevantLeitungspkts.length; a++) {
-                        const nsgLeitungspkt = relevantLeitungspkts[a];
-                        if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 1) {
-                            const tempDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempAnfDiagramObject.diagramObjectPoints[0].xPosition, tempAnfDiagramObject.diagramObjectPoints[0].yPosition);
-                            const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(anfSchemaType, integral7, i7Data.anschlussanf, nsgLeitungspkt);
-                            tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
-                            tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
-                            tempDiagramObjectPoints.push(tempDiagramObjectPoint);
+                if (nsgLeitungIDs.length > 0) {
+                    const leitungspktResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNGSPUNKT, nsgLeitungIDs));
+                    let filteredLeitungspktResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungspktResults, variantenNr, onlyEingeblendet);
+                    for (const i7Data of filteredLeitungResults) {
+                        integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_LEITUNG);
+                        let netzLeitung, aKnotenCimObjectUUID, eKnotenCimObjectUUID;
+                        const isACLine = integral7.integralLeitungen.get(i7Data.leitung);
+                        if (isACLine) {
+                            netzLeitung = integral7.integralLeitungen.get(i7Data.leitung);
+                            aKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.aknotenid);
+                            eKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.eknotenid);
+                        }
+                        else {
+                            netzLeitung = integral7.integralHgueLeitungen.get(i7Data.leitung);
+                            aKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.anetzobjekt);
+                            eKnotenCimObjectUUID = this.integralID2UUID.get(netzLeitung.enetzobjekt);
+                        }
+                        const anfSchemaType = integral7.i7SchemaID2Type.get(i7Data.anschlussanf);
+                        const endSchemaType = integral7.i7SchemaID2Type.get(i7Data.anschlussend);
+                        let tempDiagramObjectPoints = [];
+                        let tempAnfDiagramObject = undefined;
+                        let tempEndDiagramObject = undefined;
+                        if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
+                            const anfSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.anschlussanf);
+                            tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(anfSchaltfeld.lastNodeCimUUID);
+                        }
+                        else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
+                            tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(aKnotenCimObjectUUID);
                         }
-                        else if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 0) {
-                            const tempDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempEndDiagramObject.diagramObjectPoints[0].xPosition, tempEndDiagramObject.diagramObjectPoints[0].yPosition);
-                            const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(endSchemaType, integral7, i7Data.anschlussend, nsgLeitungspkt);
-                            tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
-                            tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
-                            tempDiagramObjectPoints.push(tempDiagramObjectPoint);
+                        else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) {
+                            tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(integral7.i7ID2UUID.get(i7Data.anschlussanf));
+                        }
+                        else if (anfSchemaType === integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) {
+                            tempAnfDiagramObject = integral7.placedCIMObjectsForDLProfil.get(aKnotenCimObjectUUID);
                         }
                         else {
-                            tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(nsgLeitungspkt.xrel, nsgLeitungspkt.yrel));
+                            this.logger.info(`nsg-line with a unknown/unhandled start reference-point (i7-NetzLeitungID ${netzLeitung.id}, i7-aKnotenID: ${netzLeitung.aknotenid})`);
+                            continue;
                         }
-                    }
-                    tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(tempEndDiagramObject.diagramObjectPoints[0].xPosition, tempEndDiagramObject.diagramObjectPoints[0].yPosition));
-                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
-                    const diagram = cimModel.getDiagram(diagramUUID);
-                    if (isACLine) {
-                        const netzLeitungCimObj = cimModel.getLine(this.integralID2UUID.get(netzLeitung.id));
-                        const cableAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL);
-                        const overheadAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.FREILEITUNG);
-                        let type = integral_sql_1.I7Objects.STROMKREISABSCHNITT;
-                        if (cableAvailable && overheadAvailable) {
-                            type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG;
+                        if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
+                            const anfSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.anschlussend);
+                            tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(anfSchaltfeld.lastNodeCimUUID);
                         }
-                        else if (cableAvailable) {
-                            type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL;
+                        else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
+                            tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(eKnotenCimObjectUUID);
                         }
-                        else if (overheadAvailable) {
-                            type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
+                        else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) {
+                            tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(integral7.i7ID2UUID.get(i7Data.anschlussend));
                         }
-                        const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, [netzLeitung.id]));
-                        leitungStromkreisabschnitt.sort((a, b) => a.pos - b.pos);
-                        const acSegmentPercentages = [];
-                        let completeLength = 0;
-                        for (let a = 0; a < leitungStromkreisabschnitt.length; ++a) {
-                            completeLength += leitungStromkreisabschnitt[a].laenge;
+                        else if (endSchemaType === integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) {
+                            tempEndDiagramObject = integral7.placedCIMObjectsForDLProfil.get(eKnotenCimObjectUUID);
                         }
-                        let crtLength = 0;
-                        for (let a = 0; a < leitungStromkreisabschnitt.length; ++a) {
-                            crtLength += leitungStromkreisabschnitt[a].laenge;
-                            acSegmentPercentages.push(crtLength / completeLength);
+                        else {
+                            this.logger.info(`nsg-line with a unknown/unhandled end reference-point (i7-NetzLeitungID ${netzLeitung.id}, i7-eKnotenID: ${netzLeitung.eknotenid})`);
+                            continue;
                         }
-                        let completePixelLength = 0;
-                        for (let a = 1; a < tempDiagramObjectPoints.length; ++a) {
-                            const tempX = tempDiagramObjectPoints[a].xPosition - tempDiagramObjectPoints[a - 1].xPosition;
-                            const tempY = tempDiagramObjectPoints[a].yPosition - tempDiagramObjectPoints[a - 1].yPosition;
-                            completePixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
+                        if (tempAnfDiagramObject === undefined || tempEndDiagramObject === undefined)
+                            continue;
+                        tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(tempAnfDiagramObject.diagramObjectPoints[0].xPosition, tempAnfDiagramObject.diagramObjectPoints[0].yPosition));
+                        const relevantLeitungspkts = filteredLeitungspktResults.filter(elem => elem.nsgleitung === i7Data.id).sort((a, b) => a.pos - b.pos);
+                        for (let a = 0; a < relevantLeitungspkts.length; a++) {
+                            const nsgLeitungspkt = relevantLeitungspkts[a];
+                            if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 1) {
+                                const tempDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempAnfDiagramObject.diagramObjectPoints[0].xPosition, tempAnfDiagramObject.diagramObjectPoints[0].yPosition);
+                                const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(anfSchemaType, integral7, i7Data.anschlussanf, nsgLeitungspkt);
+                                tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
+                                tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
+                                tempDiagramObjectPoints.push(tempDiagramObjectPoint);
+                            }
+                            else if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 0) {
+                                const tempDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempEndDiagramObject.diagramObjectPoints[0].xPosition, tempEndDiagramObject.diagramObjectPoints[0].yPosition);
+                                const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(endSchemaType, integral7, i7Data.anschlussend, nsgLeitungspkt);
+                                tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
+                                tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
+                                tempDiagramObjectPoints.push(tempDiagramObjectPoint);
+                            }
+                            else {
+                                tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(nsgLeitungspkt.xrel, nsgLeitungspkt.yrel));
+                            }
                         }
-                        let lastB = 0;
-                        let b = 1;
-                        let crtPixelLength = 0;
-                        for (let a = 0; a < acSegmentPercentages.length; ++a) {
-                            let crtPixelPercentageSize = 0;
-                            let lastPixelPercentageSize;
-                            do {
-                                const tempX = tempDiagramObjectPoints[b].xPosition - tempDiagramObjectPoints[b - 1].xPosition;
-                                const tempY = tempDiagramObjectPoints[b].yPosition - tempDiagramObjectPoints[b - 1].yPosition;
-                                crtPixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
-                                lastPixelPercentageSize = crtPixelPercentageSize;
-                                crtPixelPercentageSize = (crtPixelLength / completePixelLength);
-                                b++;
-                            } while (crtPixelPercentageSize < acSegmentPercentages[a] && b < tempDiagramObjectPoints.length);
-                            const epsilon = 0.00001;
-                            if ((crtPixelLength / completePixelLength) <= acSegmentPercentages[a] + epsilon) {
-                                const conductorCimObj = netzLeitungCimObj.equipments[a];
-                                const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'DiagramObj ' + ((_a = conductorCimObj.shortName) !== null && _a !== void 0 ? _a : ''));
-                                diagramObject.setIdentifiedObject(conductorCimObj);
-                                diagramObject.setDiagram(diagram);
-                                diagram.addDiagramObject(diagramObject);
-                                let i = 1;
-                                for (let idx = lastB; idx < b; ++idx) {
-                                    const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, i);
-                                    diagramObjectPoint.mrid = utils_1.generateUUID();
-                                    diagramObjectPoint.diagramObject = diagramObject;
-                                    diagramObject.addDiagramObjectPoint(diagramObjectPoint);
-                                    ++i;
-                                }
+                        tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(tempEndDiagramObject.diagramObjectPoints[0].xPosition, tempEndDiagramObject.diagramObjectPoints[0].yPosition));
+                        const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
+                        const diagram = cimModel.getDiagram(diagramUUID);
+                        if (isACLine) {
+                            const netzLeitungCimObj = cimModel.getLine(this.integralID2UUID.get(netzLeitung.id));
+                            const cableAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL);
+                            const overheadAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.FREILEITUNG);
+                            let type = integral_sql_1.I7Objects.STROMKREISABSCHNITT;
+                            if (cableAvailable && overheadAvailable) {
+                                type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG;
                             }
-                            else if ((crtPixelLength / completePixelLength) > acSegmentPercentages[a]) {
-                                let decreased = false;
-                                if (b === tempDiagramObjectPoints.length) {
-                                    b--;
-                                    decreased = true;
-                                }
-                                let tempX = tempDiagramObjectPoints[b].xPosition - tempDiagramObjectPoints[b - 1].xPosition;
-                                let tempY = tempDiagramObjectPoints[b].yPosition - tempDiagramObjectPoints[b - 1].yPosition;
-                                const percentageOfSegment = crtPixelPercentageSize - lastPixelPercentageSize;
-                                const tempRestX = tempX * (1 - percentageOfSegment);
-                                const tempRestY = tempY * (1 - percentageOfSegment);
-                                tempX = tempX * percentageOfSegment;
-                                tempY = tempY * percentageOfSegment;
-                                const newDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[b - 1].xPosition + tempX, tempDiagramObjectPoints[b - 1].yPosition + tempY);
-                                crtPixelLength -= Math.sqrt((tempRestX * tempRestX) + (tempRestY * tempRestY));
-                                tempDiagramObjectPoints.splice(b, 0, newDiagramObjectPoint);
-                                const conductorCimObj = netzLeitungCimObj.equipments[a];
-                                const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'DiagramObj ' + ((_b = conductorCimObj.shortName) !== null && _b !== void 0 ? _b : ''));
-                                diagramObject.setDiagram(diagram);
-                                diagramObject.setIdentifiedObject(conductorCimObj);
-                                diagram.addDiagramObject(diagramObject);
-                                let i = 1;
-                                if (decreased)
+                            else if (cableAvailable) {
+                                type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL;
+                            }
+                            else if (overheadAvailable) {
+                                type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
+                            }
+                            const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, [netzLeitung.id]));
+                            leitungStromkreisabschnitt.sort((a, b) => a.pos - b.pos);
+                            const acSegmentPercentages = [];
+                            let completeLength = 0;
+                            for (let a = 0; a < leitungStromkreisabschnitt.length; ++a) {
+                                completeLength += leitungStromkreisabschnitt[a].laenge;
+                            }
+                            let crtLength = 0;
+                            for (let a = 0; a < leitungStromkreisabschnitt.length; ++a) {
+                                crtLength += leitungStromkreisabschnitt[a].laenge;
+                                acSegmentPercentages.push(crtLength / completeLength);
+                            }
+                            let completePixelLength = 0;
+                            for (let a = 1; a < tempDiagramObjectPoints.length; ++a) {
+                                const tempX = tempDiagramObjectPoints[a].xPosition - tempDiagramObjectPoints[a - 1].xPosition;
+                                const tempY = tempDiagramObjectPoints[a].yPosition - tempDiagramObjectPoints[a - 1].yPosition;
+                                completePixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
+                            }
+                            let lastB = 0;
+                            let b = 1;
+                            let crtPixelLength = 0;
+                            for (let eqIdx = 0; eqIdx < acSegmentPercentages.length; ++eqIdx) {
+                                let crtPixelPercentageSize = 0;
+                                let lastPixelPercentageSize;
+                                const epsilon = 0.00001;
+                                do {
+                                    const tempX = tempDiagramObjectPoints[b].xPosition - tempDiagramObjectPoints[b - 1].xPosition;
+                                    const tempY = tempDiagramObjectPoints[b].yPosition - tempDiagramObjectPoints[b - 1].yPosition;
+                                    crtPixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
+                                    lastPixelPercentageSize = crtPixelPercentageSize;
+                                    crtPixelPercentageSize = (crtPixelLength / completePixelLength);
                                     b++;
-                                for (let idx = lastB; idx < b; ++idx) {
-                                    const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, i);
-                                    diagramObjectPoint.mrid = utils_1.generateUUID();
-                                    diagramObjectPoint.diagramObject = diagramObject;
-                                    diagramObject.addDiagramObjectPoint(diagramObjectPoint);
-                                    ++i;
+                                } while (crtPixelPercentageSize < acSegmentPercentages[eqIdx] + epsilon && b < tempDiagramObjectPoints.length);
+                                if ((crtPixelLength / completePixelLength) <= acSegmentPercentages[eqIdx] + epsilon) {
+                                    const conductorCimObj = netzLeitungCimObj.equipments[eqIdx];
+                                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'DiagramObject');
+                                    diagramObject.setIdentifiedObject(conductorCimObj);
+                                    diagramObject.setDiagram(diagram);
+                                    diagram.addDiagramObject(diagramObject);
+                                    let i = 1;
+                                    for (let idx = lastB; idx < b; ++idx) {
+                                        const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, i);
+                                        diagramObjectPoint.mrid = utils_1.generateUUID();
+                                        diagramObjectPoint.diagramObject = diagramObject;
+                                        diagramObject.addDiagramObjectPoint(diagramObjectPoint);
+                                        ++i;
+                                    }
+                                }
+                                else if ((crtPixelLength / completePixelLength) > acSegmentPercentages[eqIdx]) {
+                                    let decreased = false;
+                                    if (b === tempDiagramObjectPoints.length) {
+                                        b--;
+                                        decreased = true;
+                                    }
+                                    let tempX = tempDiagramObjectPoints[b].xPosition - tempDiagramObjectPoints[b - 1].xPosition;
+                                    let tempY = tempDiagramObjectPoints[b].yPosition - tempDiagramObjectPoints[b - 1].yPosition;
+                                    const percentageOfSegment = crtPixelPercentageSize - lastPixelPercentageSize;
+                                    const tempRestX = tempX * (1 - percentageOfSegment);
+                                    const tempRestY = tempY * (1 - percentageOfSegment);
+                                    tempX = tempX * percentageOfSegment;
+                                    tempY = tempY * percentageOfSegment;
+                                    const newDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[b - 1].xPosition + tempX, tempDiagramObjectPoints[b - 1].yPosition + tempY);
+                                    tempDiagramObjectPoints.splice(b, 0, newDiagramObjectPoint);
+                                    const conductorCimObj = netzLeitungCimObj.equipments[eqIdx];
+                                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'DiagramObj ' + ((_a = conductorCimObj.shortName) !== null && _a !== void 0 ? _a : ''));
+                                    diagramObject.setDiagram(diagram);
+                                    diagramObject.setIdentifiedObject(conductorCimObj);
+                                    diagram.addDiagramObject(diagramObject);
+                                    let i = 1;
+                                    if (decreased)
+                                        b++;
+                                    for (let idx = lastB; idx < b; ++idx) {
+                                        const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, i);
+                                        diagramObjectPoint.mrid = utils_1.generateUUID();
+                                        diagramObjectPoint.diagramObject = diagramObject;
+                                        diagramObject.addDiagramObjectPoint(diagramObjectPoint);
+                                        ++i;
+                                    }
                                 }
+                                lastB = b - 1;
                             }
-                            lastB = b - 1;
-                        }
-                    }
-                    else {
-                        const netzLeitungCimObj = cimModel.getObject(this.integralID2UUID.get(netzLeitung.id));
-                        const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID());
-                        diagramObject.setDiagram(diagram);
-                        diagram.addDiagramObject(diagramObject);
-                        diagramObject.setIdentifiedObjectUUID(this.integralID2UUID.get(netzLeitung.id));
-                        if (netzLeitungCimObj !== undefined) {
-                            diagramObject.name = 'DiagramObj ' + ((_c = netzLeitungCimObj.shortName) !== null && _c !== void 0 ? _c : '');
                         }
                         else {
-                            diagramObject.name = 'DiagramObj HGUE-Leitung';
-                        }
-                        for (let idx = 0; idx < tempDiagramObjectPoints.length; ++idx) {
-                            const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, idx + 1);
-                            diagramObjectPoint.mrid = utils_1.generateUUID();
-                            diagramObjectPoint.diagramObject = diagramObject;
-                            diagramObject.addDiagramObjectPoint(diagramObjectPoint);
+                            const netzLeitungCimObj = cimModel.getObject(this.integralID2UUID.get(netzLeitung.id));
+                            const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID());
+                            diagramObject.setDiagram(diagram);
+                            diagram.addDiagramObject(diagramObject);
+                            diagramObject.setIdentifiedObjectUUID(this.integralID2UUID.get(netzLeitung.id));
+                            if (netzLeitungCimObj !== undefined) {
+                                diagramObject.name = 'DiagramObj ' + ((_b = netzLeitungCimObj.shortName) !== null && _b !== void 0 ? _b : '');
+                            }
+                            else {
+                                diagramObject.name = 'DiagramObj HGUE-Leitung';
+                            }
+                            for (let idx = 0; idx < tempDiagramObjectPoints.length; ++idx) {
+                                const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, idx + 1);
+                                diagramObjectPoint.mrid = utils_1.generateUUID();
+                                diagramObjectPoint.diagramObject = diagramObject;
+                                diagramObject.addDiagramObjectPoint(diagramObjectPoint);
+                            }
                         }
                     }
                 }
@@ -1496,8 +1573,8 @@ class ConverterI7 {
                     return;
                 const knoten1pelemIDs = filteredResults.map(elem => elem.knoten);
                 let sqlStatement;
-                sqlStatement = `SELECT *
-                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.STERNPUNKT_KNOTEN]}
+                sqlStatement = `SELECT *
+                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.STERNPUNKT_KNOTEN]}
                       WHERE ${integral_sql_1.getWhereIDs('id', knoten1pelemIDs).join(' OR ')};`;
                 const knoten1pelemResults = yield this.mysqlController.execQuery(sqlStatement);
                 const knoten1pelemMap = new Map();
@@ -1506,12 +1583,12 @@ class ConverterI7 {
                     arr.push(elem.id);
                     knoten1pelemMap.set(elem.netzobjekt, arr);
                 }
-                sqlStatement = `SELECT id AS 'netzobjektID', trafo3w AS 'trafoID', 'netz_trafo3w' AS 'trafoType'
-                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}
-                      WHERE id IN (${knoten1pelemResults.map(elem => elem.netzobjekt).join(',')})
-                      UNION ALL
-                      SELECT id AS 'netzobjektID', id AS 'trafoID', 'netz_trafo2w' AS 'trafoType'
-                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}
+                sqlStatement = `SELECT id AS 'netzobjektID', trafo3w AS 'trafoID', 'netz_trafo3w' AS 'trafoType'
+                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}
+                      WHERE id IN (${knoten1pelemResults.map(elem => elem.netzobjekt).join(',')})
+                      UNION ALL
+                      SELECT id AS 'netzobjektID', id AS 'trafoID', 'netz_trafo2w' AS 'trafoType'
+                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}
                       WHERE id IN (${knoten1pelemResults.map(elem => elem.netzobjekt).join(',')});`;
                 const trafoIDTypeResults = yield this.mysqlController.execQuery(sqlStatement);
                 const trafoIDTypeMap = new Map();
@@ -4570,44 +4647,44 @@ class ConverterI7 {
                 let tempKnotenId = i7Data.spgreg_anschluss === 0 ? i7Data.aknoten :
                     (i7Data.spgreg_anschluss === 1 ? i7Data.eknoten : undefined);
                 if (tempKnotenId !== undefined) {
-                    let queryResult = yield this.mysqlController.execQuery(`SELECT id
-                                                                FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SF]}
+                    let queryResult = yield this.mysqlController.execQuery(`SELECT id
+                                                                FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SF]}
                                                                 WHERE id = ${tempKnotenId};`);
                     if (queryResult.length === 1) {
                         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);
                     }
                     else {
-                        queryResult = yield this.mysqlController.execQuery(`SELECT id
-                                                              FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_ZW]}
+                        queryResult = yield this.mysqlController.execQuery(`SELECT id
+                                                              FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_ZW]}
                                                               WHERE id = ${tempKnotenId};`);
                         if (queryResult.length === 1) {
                             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 {
-                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT id, umin, umax, usoll
-                                                                     FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO]}
+                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT id, umin, umax, usoll
+                                                                     FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO]}
                                                                      where id = ${tempKnotenId};`);
                         }
                     }
@@ -4615,14 +4692,14 @@ 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
-                                 SELECT id, umin, umax, usoll
-                                 FROM ${tabName_NetzSSAB}
+                    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);
                 }
@@ -5144,7 +5221,7 @@ class ConverterI7 {
     }
     queryLeitungsAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
                                                                                                              FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEITUNG]}`) : [];
             for (const result of results) {
                 this.leitungAnschlussKnotenIDs.add(result[`aknoten`]);
@@ -5154,13 +5231,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`]);
@@ -5170,7 +5247,7 @@ class ConverterI7 {
     }
     queryHgueAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT anetzobjekt, enetzobjekt
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT anetzobjekt, enetzobjekt
                                                                                                                   FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.HGUE_LEITUNG]}`) : [];
             for (const result of results) {
                 this.hgueAnschlussKnotenIDs.add(result[`anetzobjekt`]);
@@ -5180,7 +5257,7 @@ class ConverterI7 {
     }
     queryLDroselAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
                                                                                                                    FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSDROSSEL]}`) : [];
             for (const result of results) {
                 this.lDrosselAnschlussKnotenIDs.add(result[`aknoten`]);
@@ -5190,7 +5267,7 @@ class ConverterI7 {
     }
     queryErsatzLaengsAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
                                                                                                                        FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.ERSATZLAENGSZWEIG]}`) : [];
             for (const result of results) {
                 this.ersatzZweigAnschlussKnotenIDs.add(result[`aknoten`]);
@@ -5200,7 +5277,7 @@ class ConverterI7 {
     }
     queryLkondensatorAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
                                                                                                                        FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSKONDENSATOR]}`) : [];
             for (const result of results) {
                 this.lKondensatorAnschlussKnotenIDs.add(result[`aknoten`]);
@@ -5305,15 +5382,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}`);
         }
     }