@enervance/insight-cim-model 0.0.140 → 0.0.141

package/dist/converter/integral7/dl-convert/executor.js

@@ -0,0 +1,263 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Executor = void 0;
+const tslib_1 = require("tslib");
+const perf_hooks_1 = require("perf_hooks");
+const convert_graph_keys_1 = require("./dl-graphs/convert-graph-keys.js");
+const cim_model_graph_1 = require("./dl-graphs/cim-model-graph.js");
+const db_object_graph_1 = require("./dl-graphs/db-object-graph.js");
+const data_manager_1 = require("./data-manager.js");
+const dl_converter_i7_2_1 = require("./dl-converter-i7-2.js");
+class Executor {
+    constructor(mySQLController, logger) {
+        this.logger = logger;
+        this.mySQLController = mySQLController;
+        this.dbObjectGraph = new db_object_graph_1.DbObjectGraph(convert_graph_keys_1.i7SchemaKeyDefinitions);
+        this.dbObjectGraph.mySQLController = this.mySQLController;
+        this.dbObjectKeyCimModelUuidGraph = new cim_model_graph_1.DbObjectKey2CimModelUUIDGraph(convert_graph_keys_1.i7SchemaKeyDefinitions);
+        this.cimModelGraph = new cim_model_graph_1.CimModelGraph();
+        this.dlConverter = new dl_converter_i7_2_1.DLConverterI7(logger);
+        this.dlConverter.setDbObjectGraph(this.dbObjectGraph);
+        this.dlConverter.setDbObjectKeyCimModelUuidGraph(this.dbObjectKeyCimModelUuidGraph);
+        this.dlConverter.setCimModelGraph(this.cimModelGraph);
+        this.dataManager = new data_manager_1.DataManager(logger);
+        this.dataManager.setDbObjectGraph(this.dbObjectGraph);
+        this.dataManager.setDbObjectKeyCimModelUuidGraph(this.dbObjectKeyCimModelUuidGraph);
+        this.dataManager.setCimModelGraph(this.cimModelGraph);
+    }
+    mergeDataFromFrame(frame) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            for (const objectEntry of frame.cimModel.objects.entries()) {
+                this.cimModelGraph.addUnspecifiedObject(objectEntry[0], objectEntry[1]);
+            }
+        });
+    }
+    mergeDataFromIntegralID2UUID(integralID2UUID) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            for (const entry of integralID2UUID.entries()) {
+                this.dbObjectKeyCimModelUuidGraph.addRelation(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: entry[0] }, entry[1]);
+            }
+        });
+    }
+    loadAllSchemaVariants() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.dataManager.loadFromMySQL(this.mySQLController, {
+                allg_netzvarianten: { art: { eq: [2] } }
+            });
+        });
+    }
+    loadElementsForSchemaVariant(idOfVariant, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.dataManager.loadFromMySQL(this.mySQLController, {
+                nsg_nsgstandort: {
+                    variantennr: { eq: [idOfVariant] }, standort: {
+                        in: options.only.netz_standortIds ? options.only.netz_knotensoIds.map(arg => arg.id) : undefined
+                    }
+                },
+                nsg_nsgschaltanlage: {
+                    variantennr: { eq: [idOfVariant] }, schaltanlage: {
+                        in: options.only.netz_schaltanlagenIds ? options.only.netz_schaltanlagenIds.map(arg => arg.id) : undefined
+                    }
+                },
+                nsg_nsgsaabschnitt: {
+                    variantennr: { eq: [idOfVariant] }, saabschnitt: {
+                        in: options.only.netz_saabschnittIds ? options.only.netz_saabschnittIds.map(arg => arg.id) : undefined
+                    }
+                },
+                nsg_nsgknotenso: {
+                    variantennr: { eq: [idOfVariant] }, knotenso: {
+                        in: options.only.netz_knotensoIds ? options.only.netz_knotensoIds.map(arg => arg.id) : undefined
+                    }
+                },
+                nsg_nsgschaltfeld: {
+                    variantennr: { eq: [idOfVariant] }, schaltfeld: {
+                        in: options.only.netz_schaltfeldIds ? options.only.netz_schaltfeldIds.map(arg => arg.id) : undefined
+                    }
+                },
+                nsg_nsgkpfeld: { variantennr: { eq: [idOfVariant] } },
+                nsg_nsglkupplung: { variantennr: { eq: [idOfVariant] } },
+                nsg_nsgtrafo2w: { variantennr: { eq: [idOfVariant] } },
+                nsg_nsgtrafo3w: { variantennr: { eq: [idOfVariant] } },
+                nsg_nsgleitung: {
+                    variantennr: { eq: [idOfVariant] }, leitung: {
+                        in: options.only.netz_leitungIds ? options.only.netz_leitungIds.map(arg => arg.id) : undefined
+                    }
+                },
+                nsg_nsgltgpunkt: { variantennr: { eq: [idOfVariant] } },
+                nsg_nsgquerzweig: { variantennr: { eq: [idOfVariant] } }
+            });
+            const relevantSchaltanlageIds = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgschaltanlage))
+                .map(arg => arg.schaltanlage);
+            yield this.dataManager.loadFromMySQL(this.mySQLController, {
+                netz_lkupplung: { schaltanlage: { in: relevantSchaltanlageIds } }
+            });
+            const relevantQuerzweigIds = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgquerzweig))
+                .map(arg => arg.querzweig);
+            yield this.dataManager.loadFromMySQL(this.mySQLController, {
+                netz_belastung: { id: { in: relevantQuerzweigIds } },
+                netz_generator: { id: { in: relevantQuerzweigIds } },
+                netz_netzeinspeisung: { id: { in: relevantQuerzweigIds } }
+            });
+            const relevantNsgSaabschnitt = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgsaabschnitt))
+                .map(arg => arg.saabschnitt);
+            const relevantSelisteIds = [];
+            relevantSelisteIds.push(...(yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgschaltfeld)).map(arg => arg.schaltfeld));
+            relevantSelisteIds.push(...(yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgkpfeld)).map(arg => arg.kpfeld));
+            relevantSelisteIds.push(...(yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.netz_lkupplung)).map(arg => arg.id));
+            yield this.dataManager.loadFromMySQL(this.mySQLController, {
+                netz_ssab: { saabschnitt: { in: relevantNsgSaabschnitt } },
+                netz_leistungsschalter: { seliste: { in: relevantSelisteIds } },
+                netz_trenner3p: { seliste: { in: relevantSelisteIds } },
+                netz_trennerfi3p: { seliste: { in: relevantSelisteIds } },
+                netz_sestarr3p: { seliste: { in: relevantSelisteIds } }
+            });
+            // read all those netz_schlaufe entries, which are accessible via the knotenso's
+            const relevantNetzKnotenSoIds = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgknotenso))
+                .map(arg => arg.knotenso);
+            yield this.dataManager.loadFromMySQL(this.mySQLController, {
+                netz_schlaufe: { eknoten: { in: relevantNetzKnotenSoIds } }
+            });
+            const relevantNetzKnotenzwIds = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.netz_schlaufe))
+                .map(arg => arg.knotenzw);
+            yield this.dataManager.loadFromMySQL(this.mySQLController, {
+                netz_knotenzw: { id: { in: relevantNetzKnotenzwIds } }
+            });
+            // read all relevant netz_{kabel|freileitungs}abschnitte
+            const relevantNetzLeitungIds = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgleitung))
+                .map(arg => arg.leitung);
+            yield this.dataManager.loadFromMySQL(this.mySQLController, {
+                netz_freileitungabschnitt: { leitung: { in: relevantNetzLeitungIds } },
+                netz_kabelabschnitt: { leitung: { in: relevantNetzLeitungIds } }
+            });
+        });
+    }
+    convert(options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const nsgVarianten = yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.allg_netzvarianten);
+                const resultingObjects = [];
+                for (const nsgVariante of nsgVarianten) {
+                    yield this.loadElementsForSchemaVariant(nsgVariante.id, options);
+                    this.log(`Schema ${nsgVariante.id} hat ${this.dbObjectGraph.size} Elemente!`);
+                    const resultingDiagramObjects = [];
+                    const diagram = yield this.runAndLogPerformance(this.dlConverter.convertNsgVariante, nsgVariante);
+                    // const relevantNsgKnotenSo = await this.dbObjectGraph.findByAttributes(i7TableNames.nsg_nsgknotenso, {
+                    //   knotenso: { in: [...frame.integral7Modell.integralKnotenSo.keys()] }
+                    // });
+                    const relevantNsgKnotenSo = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgknotenso));
+                    // .filter(arg => frame.integral7Modell.integralKnotenSo.has(arg.knotenso));
+                    for (const nsgKnotenSo of relevantNsgKnotenSo) {
+                        const result = yield this.runAndLogPerformance(this.dlConverter.convertSchemaKnotenStandort, nsgKnotenSo);
+                        if (result)
+                            resultingDiagramObjects.push(result);
+                    }
+                    const relevantNsgSaabschnitt = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgsaabschnitt));
+                    // .filter(arg => frame.integral7Modell.integralSchaltanlagenAbschnitte.has(arg.saabschnitt));
+                    for (const nsgSaabschnitt of relevantNsgSaabschnitt) {
+                        const results = yield this.runAndLogPerformance(this.dlConverter.convertSchemaSammelschienenAbschnitte, nsgSaabschnitt);
+                        if (results)
+                            resultingDiagramObjects.push(...results);
+                    }
+                    const relevantNsgSchaltfeld = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgschaltfeld));
+                    // .filter(arg => frame.integral7Modell.integralSchaltfelder.has(arg.schaltfeld));
+                    for (const nsgSchaltfeld of relevantNsgSchaltfeld) {
+                        const results = yield this.runAndLogPerformance(this.dlConverter.convertSchemaSchaltfeldElemente, nsgSchaltfeld);
+                        if (results)
+                            resultingDiagramObjects.push(...results);
+                    }
+                    const relevantNsgLeitung = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgleitung));
+                    // .filter(arg => frame.integral7Modell.integralSchaltanlagenAbschnitte.has(arg.saabschnitt));
+                    for (const nsgLeitung of relevantNsgLeitung) {
+                        const results = yield this.runAndLogPerformance(this.dlConverter.convertSchemaLeitung, nsgLeitung);
+                        if (results)
+                            resultingDiagramObjects.push(...results);
+                    }
+                    const relevantNsgTrafo2W = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgtrafo2w));
+                    // .filter(arg => frame.integral7Modell.integralSchaltanlagenAbschnitte.has(arg.saabschnitt));
+                    for (const nsgTrafo2W of relevantNsgTrafo2W) {
+                        const results = yield this.runAndLogPerformance(this.dlConverter.convertSchemaTransformer2W, nsgTrafo2W);
+                        if (results)
+                            resultingDiagramObjects.push(...results);
+                    }
+                    const relevantNsgTrafo3W = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgtrafo3w));
+                    // .filter(arg => frame.integral7Modell.integralSchaltanlagenAbschnitte.has(arg.saabschnitt));
+                    for (const nsgTrafo3W of relevantNsgTrafo3W) {
+                        const results = yield this.runAndLogPerformance(this.dlConverter.convertSchemaTransformer3W, nsgTrafo3W);
+                        if (results)
+                            resultingDiagramObjects.push(...results);
+                    }
+                    const relevantNsgQuerzweig = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgquerzweig));
+                    // .filter(arg => frame.integral7Modell.integralSchaltanlagenAbschnitte.has(arg.saabschnitt));
+                    for (const nsgQuerzweig of relevantNsgQuerzweig) {
+                        const results = yield this.runAndLogPerformance(this.dlConverter.convertSchemaQuerzweig, nsgQuerzweig);
+                        if (results)
+                            resultingDiagramObjects.push(...results);
+                    }
+                    const relevantNsgKpfeld = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsgkpfeld));
+                    // .filter(arg => frame.integral7Modell.integralSchaltanlagenAbschnitte.has(arg.saabschnitt));
+                    for (const nsgKpfeld of relevantNsgKpfeld) {
+                        const results = yield this.runAndLogPerformance(this.dlConverter.convertSchemaKpfeld, nsgKpfeld);
+                        if (results)
+                            resultingDiagramObjects.push(...results);
+                    }
+                    const relevantNsgLKupplung = (yield this.dbObjectGraph.getAllObjectsOfTable(convert_graph_keys_1.i7TableNames.nsg_nsglkupplung));
+                    for (const nsgLKupplung of relevantNsgLKupplung) {
+                        const nsgSaabschnitt = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgsaabschnitt, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgLKupplung.variantennr, id: nsgLKupplung.nsgsaa }, false);
+                        if (nsgSaabschnitt) {
+                            const relevantNetzLKupplung = (yield this.dbObjectGraph.findByAttributes(convert_graph_keys_1.i7TableNames.netz_lkupplung, {
+                                saa_end: { in: [nsgSaabschnitt.saabschnitt] }
+                            }));
+                            for (const netzLKupplung of relevantNetzLKupplung) {
+                                const results = yield this.runAndLogPerformance(this.dlConverter.convertSchemaLKupplung, nsgLKupplung, netzLKupplung);
+                                if (results)
+                                    resultingDiagramObjects.push(...results);
+                            }
+                        }
+                    }
+                    // await this.runAndLogPerformance(this.dlConverter.convertSchemaTerminals);
+                    for (const resultingDiagramObject of resultingDiagramObjects) {
+                        resultingDiagramObject.diagram = diagram;
+                        diagram.diagramObjects.push(resultingDiagramObject);
+                    }
+                    resultingObjects.push(diagram, ...resultingDiagramObjects);
+                    this.dbObjectGraph.forgetByTableNames([
+                        convert_graph_keys_1.i7TableNames.nsg_nsgstandort,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgschaltanlage,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgsaabschnitt,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgknotenso,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgschaltfeld,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgkpfeld,
+                        convert_graph_keys_1.i7TableNames.nsg_nsglkupplung,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgtrafo2w,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgtrafo3w,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgleitung,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgltgpunkt,
+                        convert_graph_keys_1.i7TableNames.nsg_nsgquerzweig
+                    ]);
+                }
+                return resultingObjects;
+            }
+            catch (e) {
+                console.log(e);
+                return [];
+            }
+        });
+    }
+    log(msg) {
+        var _a;
+        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(msg);
+        console.log(msg);
+    }
+    runAndLogPerformance(func, ...args) {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const startTime = perf_hooks_1.performance.now();
+            const returnValueFunc = yield func.apply(this.dlConverter, args);
+            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`${func.name} ${(perf_hooks_1.performance.now() - startTime) / 1000} seconds`);
+            console.log(`${func.name} ${(perf_hooks_1.performance.now() - startTime) / 1000} seconds`);
+            return returnValueFunc;
+        });
+    }
+}
+exports.Executor = Executor;
+//# sourceMappingURL=executor.js.map

package/dist/converter/integral7/dl-convert/executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/executor.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,uEAAwH;AAExH,iEAA2F;AAC3F,iEAA4D;AAC5D,iDAA6C;AAC7C,2DAAoD;AAyCpD,MAAa,QAAQ;IAcnB,YAAY,eAAgC,EAAE,MAAgB;QAC5D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAEvC,IAAI,CAAC,aAAa,GAAG,IAAI,+BAAa,CAAC,2CAAsB,CAAC,CAAC;QAC/D,IAAI,CAAC,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC1D,IAAI,CAAC,4BAA4B,GAAG,IAAI,+CAA6B,CAAC,2CAAsB,CAAC,CAAC;QAC9F,IAAI,CAAC,aAAa,GAAG,IAAI,+BAAa,EAAE,CAAC;QAEzC,IAAI,CAAC,WAAW,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,+BAA+B,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACpF,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEtD,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,+BAA+B,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACpF,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC;IAEK,kBAAkB,CAAC,KAAoB;;YAC3C,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;gBAC1D,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;aACzE;QACH,CAAC;KAAA;IAEK,4BAA4B,CAAC,eAAoC;;YACrE,KAAK,MAAM,KAAK,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE;gBAC7C,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAC3C,qCAAgB,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,EAC5C,KAAK,CAAC,CAAC,CAAC,CACT,CAAC;aACH;QACH,CAAC;KAAA;IAEK,qBAAqB;;YACzB,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzD,kBAAkB,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;aACzC,CAAC,CAAC;QACL,CAAC;KAAA;IAEa,4BAA4B,CAAC,WAAmB,EAAE,OAAkC;;YAChG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzD,eAAe,EAAE;oBACf,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE;wBAC5C,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;qBACjG;iBACF;gBACD,mBAAmB,EAAE;oBACnB,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE;wBAChD,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;qBAC3G;iBACF;gBACD,kBAAkB,EAAE;oBAClB,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,EAAE;wBAC/C,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;qBACvG;iBACF;gBACD,eAAe,EAAE;oBACf,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE;wBAC5C,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;qBACjG;iBACF;gBACD,iBAAiB,EAAE;oBACjB,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,UAAU,EAAE;wBAC9C,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;qBACrG;iBACF;gBACD,aAAa,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE;gBACrD,gBAAgB,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE;gBACxD,cAAc,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE;gBACtD,cAAc,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE;gBACtD,cAAc,EAAE;oBACd,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE;wBAC3C,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;qBAC/F;iBACF;gBACD,eAAe,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE;gBACvD,gBAAgB,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE;aACzD,CAAC,CAAC;YAEH,MAAM,uBAAuB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,mBAAmB,CAAC,CAAC;iBAC9G,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAEhC,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzD,cAAc,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,uBAAuB,EAAE,EAAE;aAClE,CAAC,CAAC;YAEH,MAAM,oBAAoB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,gBAAgB,CAAC,CAAC;iBACxG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAE7B,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzD,cAAc,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,oBAAoB,EAAE,EAAE;gBACpD,cAAc,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,oBAAoB,EAAE,EAAE;gBACpD,oBAAoB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,oBAAoB,EAAE,EAAE;aAC3D,CAAC,CAAC;YAEH,MAAM,sBAAsB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,kBAAkB,CAAC,CAAC;iBAC5G,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAE/B,MAAM,kBAAkB,GAAG,EAAE,CAAC;YAC9B,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YACvI,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/H,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAE5H,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzD,SAAS,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE;gBAC1D,sBAAsB,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE;gBAC/D,cAAc,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE;gBACvD,gBAAgB,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE;gBACzD,cAAc,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE;aACxD,CAAC,CAAC;YAEH,gFAAgF;YAChF,MAAM,uBAAuB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,eAAe,CAAC,CAAC;iBAC1G,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE5B,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzD,aAAa,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,uBAAuB,EAAE,EAAE;aAC5D,CAAC,CAAC;YAEH,MAAM,uBAAuB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,aAAa,CAAC,CAAC;iBACxG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE5B,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzD,aAAa,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,uBAAuB,EAAE,EAAE;aACvD,CAAC,CAAC;YAEH,wDAAwD;YACxD,MAAM,sBAAsB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,cAAc,CAAC,CAAC;iBACxG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAE3B,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzD,yBAAyB,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE;gBACtE,mBAAmB,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE;aACjE,CAAC,CAAC;QACL,CAAC;KAAA;IAEK,OAAO,CAAC,OAAkC;;YAC9C,IAAI;gBACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,kBAAkB,CAAC,CAAC;gBAEpG,MAAM,gBAAgB,GAAqC,EAAE,CAAC;gBAE9D,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;oBACtC,MAAM,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;oBAEjE,IAAI,CAAC,GAAG,CAAC,UAAU,WAAW,CAAC,EAAE,QAAQ,IAAI,CAAC,aAAa,CAAC,IAAI,YAAY,CAAC,CAAA;oBAE7E,MAAM,uBAAuB,GAAoB,EAAE,CAAC;oBAEpD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;oBAElG,wGAAwG;oBACxG,yEAAyE;oBACzE,MAAM;oBACN,MAAM,mBAAmB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,eAAe,CAAC,CAAC,CAAA;oBACzG,4EAA4E;oBAC5E,KAAK,MAAM,WAAW,IAAI,mBAAmB,EAAE;wBAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,2BAA2B,EAAE,WAAW,CAAC,CAAC;wBAC1G,IAAI,MAAM;4BAAE,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;qBAClD;oBAED,MAAM,sBAAsB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,kBAAkB,CAAC,CAAC,CAAA;oBAC/G,8FAA8F;oBAC9F,KAAK,MAAM,cAAc,IAAI,sBAAsB,EAAE;wBACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,qCAAqC,EAAE,cAAc,CAAC,CAAC;wBACxH,IAAI,OAAO;4BAAE,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;qBACvD;oBAED,MAAM,qBAAqB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,iBAAiB,CAAC,CAAC,CAAA;oBAC7G,kFAAkF;oBAClF,KAAK,MAAM,aAAa,IAAI,qBAAqB,EAAE;wBACjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,+BAA+B,EAAE,aAAa,CAAC,CAAC;wBACjH,IAAI,OAAO;4BAAE,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;qBACvD;oBAED,MAAM,kBAAkB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,cAAc,CAAC,CAAC,CAAA;oBACvG,8FAA8F;oBAC9F,KAAK,MAAM,UAAU,IAAI,kBAAkB,EAAE;wBAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;wBACnG,IAAI,OAAO;4BAAE,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;qBACvD;oBAED,MAAM,kBAAkB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,cAAc,CAAC,CAAC,CAAA;oBACvG,8FAA8F;oBAC9F,KAAK,MAAM,UAAU,IAAI,kBAAkB,EAAE;wBAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,UAAU,CAAC,CAAC;wBACzG,IAAI,OAAO;4BAAE,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;qBACvD;oBAED,MAAM,kBAAkB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,cAAc,CAAC,CAAC,CAAA;oBACvG,8FAA8F;oBAC9F,KAAK,MAAM,UAAU,IAAI,kBAAkB,EAAE;wBAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,UAAU,CAAC,CAAC;wBACzG,IAAI,OAAO;4BAAE,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;qBACvD;oBAED,MAAM,oBAAoB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,gBAAgB,CAAC,CAAC,CAAA;oBAC3G,8FAA8F;oBAC9F,KAAK,MAAM,YAAY,IAAI,oBAAoB,EAAE;wBAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE,YAAY,CAAC,CAAC;wBACvG,IAAI,OAAO;4BAAE,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;qBACvD;oBAED,MAAM,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,aAAa,CAAC,CAAC,CAAA;oBACrG,8FAA8F;oBAC9F,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE;wBACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;wBACjG,IAAI,OAAO;4BAAE,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;qBACvD;oBAED,MAAM,oBAAoB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,iCAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC;oBAE5G,KAAK,MAAM,YAAY,IAAI,oBAAoB,EAAE;wBAC/C,MAAM,cAAc,GAAmB,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAC7E,iCAAY,CAAC,kBAAkB,EAC/B,qCAAgB,CAAC,gBAAgB,EAAE,EAAE,WAAW,EAAE,YAAY,CAAC,WAAW,EAAE,EAAE,EAAE,YAAY,CAAC,MAAM,EAAE,EACrG,KAAK,CACN,CAAC;wBAEF,IAAI,cAAc,EAAE;4BAClB,MAAM,qBAAqB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CACtE,iCAAY,CAAC,cAAc,EAAE;gCAC3B,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;6BAC9C,CACF,CAAC,CAAC;4BAEH,KAAK,MAAM,aAAa,IAAI,qBAAqB,EAAE;gCACjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;gCACtH,IAAI,OAAO;oCAAE,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;6BACvD;yBACF;qBACF;oBAED,4EAA4E;oBAE5E,KAAK,MAAM,sBAAsB,IAAI,uBAAuB,EAAE;wBAC5D,sBAAsB,CAAC,OAAO,GAAG,OAAO,CAAC;wBACzC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;qBACrD;oBAED,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,uBAAuB,CAAC,CAAC;oBAE3D,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC;wBACpC,iCAAY,CAAC,eAAe;wBAC5B,iCAAY,CAAC,mBAAmB;wBAChC,iCAAY,CAAC,kBAAkB;wBAC/B,iCAAY,CAAC,eAAe;wBAC5B,iCAAY,CAAC,iBAAiB;wBAC9B,iCAAY,CAAC,aAAa;wBAC1B,iCAAY,CAAC,gBAAgB;wBAC7B,iCAAY,CAAC,cAAc;wBAC3B,iCAAY,CAAC,cAAc;wBAC3B,iCAAY,CAAC,cAAc;wBAC3B,iCAAY,CAAC,eAAe;wBAC5B,iCAAY,CAAC,gBAAgB;qBAC9B,CAAC,CAAC;iBACJ;gBACD,OAAO,gBAAgB,CAAC;aAEzB;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,OAAO,EAAE,CAAC;aACX;QAEH,CAAC;KAAA;IAEO,GAAG,CAAC,GAAW;;QACrB,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAEa,oBAAoB,CAAoC,IAAO,EAAE,GAAG,IAAmB;;;YACnG,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;YACpC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACjE,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,wBAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC;YACrF,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,wBAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC;YAE9E,OAAO,eAAe,CAAC;;KACxB;CACF;AAvSD,4BAuSC"}

package/dist/converter/integral7/model/dl-utils/constants.js

@@ -12,7 +12,7 @@ NsgConstants.onlyEingeblendet = true;
  * Mögliche Werte für DEFAULT_ROTATION sind 0, 90, 180, 270 (clockwise)
  */
 NsgConstants.DEFAULT_ROTATION = 0;
-NsgConstants.KNOTENSO_WIDTH = 16;
+NsgConstants.KNOTENSO_WIDTH = 32;
 NsgConstants.KNOTENSO_HEIGHT = 32;
 NsgConstants.HGUE_KNOTENSO_WIDTH = 32;
 NsgConstants.HGUE_KNOTENSO_HEIGHT = 32;

package/dist/converter/integral7/model/dl-utils/util-functions.d.ts

@@ -5,7 +5,7 @@ import { DiagramObjectPoint } from '../../../../model/diagram/DiagramObjectPoint
 import { NsgKnotenSo, NsgLeitungsPunkt } from '../interfaces.js';
 import { I7ExportFrame } from '../../interface-i7/export-frame-i7.js';
 import { ISchemaDatabaseKey } from './ISchemaDatabaseKey.js';
-import { NsgObject, NsgSAAB, NsgSchaltanlage, NsgSSAB, NsgStandort } from '../../dl-convert/db/database.interface.types.js';
+import { NsgObject, NsgSaabschnitt, NsgSchaltanlage, NsgSSAB, NsgStandort } from '../../dl-convert/db/database.interface.types.js';
 import { DiagramObjectWithPointParams } from '../../dl-convert/dl-converter-i7-function.types.js';
 import { IIdentifiedObject } from '../../../../interfaces/model/core/IIdentifiedObject.js';
 import { IUUIDObject } from '../../../../interfaces/IUUIDObject.js';
@@ -18,7 +18,7 @@ export declare class DLUtilFunctions {
     static dot(v1: number[], v2: number[]): number;
     static mutliplyScalar(v: number[], scalar: number): number[];
     static divideScalar(v: number[], scalar: number): number[];
-    static add(v1: number[], v2: number[]): number[];
+    static add(v: number[], ...v_args: number[][]): number[];
     static subtract(v1: number[], v2: number[]): number[];
     static vec2(lStart: number[], lEnd: number[], v: number[]): number[];
     static isNegativeOrZero(v: number): boolean;
@@ -28,6 +28,7 @@ export declare class DLUtilFunctions {
      * Der Winkel wird dabei in Grad angegeben und es wird am Ende auf eine bestimmte Anzahl an Nachkommastellen gerundet
      */
     static rotateDiagramObjectPoint(point: DiagramObjectPoint, angle: number): void;
+    static rotatePoint(point: number[], angle: number): void;
     static shiftAddBasedOnNsgSo(cimModel: ModelContainer, integral7: Integral7Model, variantenNr: number, nsgSoID: number, uuidPointsMap: Map<string, DiagramObject>): void;
     /**
      * Basierend auf der Ausrichtung der Schaltanlage wird die Rotation in Grad berechnet.
@@ -39,20 +40,23 @@ export declare class DLUtilFunctions {
     static getRotationBasedOnTrafo2W(orientationTrafo2w: number): number;
     static getRotationBasedOnQuerzweig(orientationQuerzweig: number): number;
     static getRotationBasedOnNsgSaNsgSf(orientationNsgSa: number, orientationNsgSf: number): number;
-    static rotateAndShiftBasedOnNsgSAA(nsgSo: NsgStandort, nsgSa: NsgSchaltanlage, nsgSaab: NsgSAAB, diagramObjects: DiagramObject[], useLeftOffset?: boolean): void;
+    static rotateAndShiftBasedOnNsgSAA(nsgSo: NsgStandort, nsgSa: NsgSchaltanlage, nsgSaab: NsgSaabschnitt, diagramObjects: DiagramObject[], useLeftOffset?: boolean): void;
     static rotateShiftAddBasedOnNsgSAA(cimModel: ModelContainer, integral7: Integral7Model, variantenNr: number, nsgSaaID: number, uuidPointsMap: Map<string, DiagramObject>, useLeftOffset?: boolean): void;
     static cloneDiagramObject(other: DiagramObject): DiagramObject;
     static addi7ObjectToCIMModel(uuidPointsMap: Map<string, DiagramObject>, cimModel: ModelContainer, integral7: Integral7Model, variantenNr: number): void;
     static placeKupplung(i7KnotenBeziehungen: I7KnotenBeziehung[], relevantSSabIDs: Set<number>, nsgSSABs: Map<number, NsgSSAB>, integralID2UUID: Map<number, string>, placedCIMObjectUUIDs: Set<string>, kpFeldDeltaausrichtung: number, kpFeldLeftOffset: number, isLKupplung: boolean, objects: ReadonlyMap<string, IUUIDObject>): Map<number, DiagramObject>;
     static exportTerminals(nodeRelation: I7KnotenBeziehung, nodePointMap: Map<number, DiagramObject>, integralID2UUID: Map<number, string>, objects: ReadonlyMap<string, IIdentifiedObject>, aKnotenPos?: DiagramObjectPoint, eKnotenPos?: DiagramObjectPoint): void;
     static adjustTerminalCEPosition(ceDiagramObject: DiagramObject, cnPoint: DiagramObjectPoint, terminalDiagramObjectPoint: any): void;
-    static copyAndPushDiagramObjectPoint(diagramObject: DiagramObject, diagramObjectPoint2Copy: DiagramObjectPoint): void;
+    static copyAndPushDiagramObjectPoint(diagramObject: DiagramObject, diagramObjectPoint2Copy: DiagramObjectPoint, unshift?: boolean): void;
+    static copyAndPushXYCoordinates(diagramObject: DiagramObject, xy: number[], unshift?: boolean): void;
     static createDiagramObjectWithPoint2(args: DiagramObjectWithPointParams): DiagramObject;
     static createDiagramObjectWithPoint(x: number, y: number, rotation?: number, sequenceNumber?: number): DiagramObject;
+    static createDiagramObjectWithPoints(xy_s: number[][], rotation?: number): DiagramObject;
     static createDiagramObjectWithPointArrayBased(xy: number[], rotation?: number): DiagramObject;
     static filterByVariantenNrOnlyEingeblendet<T extends NsgObject>(result: T[], variantenNr: number, onlyEingeblendet: boolean): T[];
     static getXYOffsetFromRelCM(type: string, nsgObject: NsgObject, anschlussID: number, nsgLeitungspkt: NsgLeitungsPunkt): number[];
     static convertNsgKnoten(cimModel: ModelContainer, integral7: Integral7Model, data: NsgKnotenSo, refCimObjectUUID: string, width: number, height: number, xParentRel: number, yParentRel: number): void;
+    static splitLineIntoLineSegments(segmentPercentages: number[], linePoints: number[][]): number[][][];
     static convertACLineSegment(completeLength: number, segmentPercentages: number[], eqUUIDs: string[], i7LineBasePoints: {
         xPosition: number;
         yPosition: number;

package/dist/converter/integral7/model/dl-utils/util-functions.js

@@ -53,8 +53,14 @@ class DLUtilFunctions {
         }
         return resV;
     }
-    static add(v1, v2) {
-        return [v1[0] + v2[0], v1[1] + v2[1]];
+    static add(v, ...v_args) {
+        const v_return = [...v];
+        for (let a = 0; a < v_args.length; ++a) {
+            for (let b = 0; b < v_args[a].length; ++b) {
+                v_return[b] += v_args[a][b];
+            }
+        }
+        return v_return;
     }
     static subtract(v1, v2) {
         return [v1[0] - v2[0], v1[1] - v2[1]];
@@ -107,6 +113,24 @@ class DLUtilFunctions {
         point.xPosition = Math.round(resultCoords[0] * amountOfDecimals) / amountOfDecimals;
         point.yPosition = Math.round(resultCoords[1] * amountOfDecimals) / amountOfDecimals;
     }
+    static rotatePoint(point, angle) {
+        // negate the angle to rotate clockwise
+        const radiansAngle = -angle * (Math.PI / 180);
+        const coords = [point[0], point[1]];
+        const rotMat = [
+            [Math.cos(radiansAngle), -Math.sin(radiansAngle)],
+            [Math.sin(radiansAngle), Math.cos(radiansAngle)]
+        ];
+        const resultCoords = [0, 0];
+        for (let a = 0; a < rotMat.length; a++) {
+            for (let b = 0; b < rotMat[a].length; b++) {
+                resultCoords[a] += rotMat[a][b] * coords[b];
+            }
+        }
+        const amountOfDecimals = 100; // Die Anzahl der Nullen entspricht der Anzahl an Nachkommastellen
+        point[0] = Math.round(resultCoords[0] * amountOfDecimals) / amountOfDecimals;
+        point[1] = Math.round(resultCoords[1] * amountOfDecimals) / amountOfDecimals;
+    }
     static shiftAddBasedOnNsgSo(cimModel, integral7, variantenNr, nsgSoID, uuidPointsMap) {
         const nsgSo = integral7.integralNSGStandorte.get(nsgSoID);
         uuidPointsMap.forEach((entryDiagramObject, key) => {
@@ -148,7 +172,7 @@ class DLUtilFunctions {
     // }
     static rotateAndShiftBasedOnNsgSAA(nsgSo, nsgSa, nsgSaab, diagramObjects, useLeftOffset = false) {
         let saabShiftOffset = 0;
-        for (const tempNsgSaab of nsgSa.nsgSaabs) {
+        for (const tempNsgSaab of nsgSa.nsgSaabschnitt) {
             saabShiftOffset = saabShiftOffset < (tempNsgSaab.nslots + tempNsgSaab.laenge) ? (tempNsgSaab.nslots + tempNsgSaab.laenge) : saabShiftOffset;
         }
         for (const diagramObject of diagramObjects) {
@@ -540,18 +564,37 @@ class DLUtilFunctions {
             terminalDiagramObjectPoint.xPosition += (isLeft ? -1 : 1) * constants_1.NsgConstants.TERMINAL_CE_OFFSET;
         }
     }
-    static copyAndPushDiagramObjectPoint(diagramObject, diagramObjectPoint2Copy) {
+    static copyAndPushDiagramObjectPoint(diagramObject, diagramObjectPoint2Copy, unshift) {
         const sequenceNumber = diagramObject.diagramObjectPoints.length + 1;
         const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(diagramObjectPoint2Copy.xPosition, diagramObjectPoint2Copy.yPosition, sequenceNumber);
         diagramObjectPoint.mrid = common_utils_1.CommonUtils.generateUUID();
         diagramObjectPoint.diagramObject = diagramObject;
-        diagramObject.diagramObjectPoints.push(diagramObjectPoint);
+        if (unshift) {
+            diagramObject.diagramObjectPoints.unshift(diagramObjectPoint);
+        }
+        else {
+            diagramObject.diagramObjectPoints.push(diagramObjectPoint);
+        }
+    }
+    static copyAndPushXYCoordinates(diagramObject, xy, unshift) {
+        const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(xy[0], xy[1]);
+        diagramObjectPoint.mrid = common_utils_1.CommonUtils.generateUUID();
+        diagramObjectPoint.diagramObject = diagramObject;
+        if (unshift) {
+            diagramObject.diagramObjectPoints.unshift(diagramObjectPoint);
+        }
+        else {
+            diagramObject.diagramObjectPoints.push(diagramObjectPoint);
+        }
+        for (let a = 0; a < diagramObject.diagramObjectPoints.length; ++a) {
+            diagramObject.diagramObjectPoints[a].sequenceNumber = (a + 1);
+        }
     }
     static createDiagramObjectWithPoint2(args) {
         const diagramObject = new DiagramObject_1.DiagramObject(common_utils_1.CommonUtils.generateUUID(), args.diagramObjectName);
         diagramObject.diagramUUID = args.diagramUUID;
         diagramObject.identifiedObjectUUID = args.identifiedObjectUUID;
-        diagramObject.rotation = args.rotation;
+        diagramObject.rotation = args.rotation !== undefined ? args.rotation : null;
         const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(args.xPosition, args.yPosition);
         diagramObjectPoint.mrid = common_utils_1.CommonUtils.generateUUID();
         diagramObjectPoint.sequenceNumber = args.sequenceNumber !== undefined ? args.sequenceNumber : 1;
@@ -569,6 +612,18 @@ class DLUtilFunctions {
         diagramObject.diagramObjectPoints.push(diagramObjectPoint);
         return diagramObject;
     }
+    static createDiagramObjectWithPoints(xy_s, rotation) {
+        const diagramObject = new DiagramObject_1.DiagramObject(common_utils_1.CommonUtils.generateUUID(), 'DiagramObject');
+        diagramObject.rotation = rotation;
+        for (let a = 0; a < xy_s.length; ++a) {
+            const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(xy_s[a][0], xy_s[a][1]);
+            diagramObjectPoint.mrid = common_utils_1.CommonUtils.generateUUID();
+            diagramObjectPoint.sequenceNumber = (a + 1);
+            diagramObjectPoint.diagramObject = diagramObject;
+            diagramObject.diagramObjectPoints.push(diagramObjectPoint);
+        }
+        return diagramObject;
+    }
     static createDiagramObjectWithPointArrayBased(xy, rotation) {
         const diagramObject = new DiagramObject_1.DiagramObject();
         diagramObject.rotation = rotation;
@@ -685,6 +740,79 @@ class DLUtilFunctions {
             integral7.placedCIMObjectsForDLProfil.set(diagramObject.getUUID(), diagramObject);
         }
     }
+    static splitLineIntoLineSegments(segmentPercentages, linePoints) {
+        // const resultDiagramObjects: DiagramObject[] = [];
+        const resultSegments = [];
+        // Bestimme komplette 'Pixellänge' der Leitung
+        let completePixelLength = 0;
+        for (let a = 1; a < linePoints.length; ++a) {
+            const tempX = linePoints[a][0] - linePoints[a - 1][0];
+            const tempY = linePoints[a][1] - linePoints[a - 1][1];
+            completePixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
+        }
+        // Der Leitungsabschnitt zwischen 'lastB' und 'b' wird mit der Leitung 'eqIdx' verknüpft
+        let lastB = 0;
+        let b = 1;
+        for (let segmentIndex = 0; segmentIndex < segmentPercentages.length; ++segmentIndex) {
+            let crtPixelPercentageSize = 0;
+            let lastPixelPercentageSize;
+            const epsilon = 0.00001;
+            let crtPixelLength = 0;
+            for (let idx = 1; idx < b; ++idx) {
+                const tempX = linePoints[idx][0] - linePoints[idx - 1][0];
+                const tempY = linePoints[idx][1] - linePoints[idx - 1][1];
+                crtPixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
+            }
+            do {
+                // Nehme weitere DiagramObjectPoint zum aktuellen LineSegment hinzu
+                const tempX = linePoints[b][0] - linePoints[b - 1][0];
+                const tempY = linePoints[b][1] - linePoints[b - 1][1];
+                crtPixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
+                lastPixelPercentageSize = crtPixelPercentageSize;
+                crtPixelPercentageSize = (crtPixelLength / completePixelLength);
+                b++;
+            } while (crtPixelPercentageSize < segmentPercentages[segmentIndex] && b < linePoints.length);
+            const crtPixelPercentage = (crtPixelLength / completePixelLength);
+            if (crtPixelPercentage <= segmentPercentages[segmentIndex] + epsilon) {
+                // Ende erreicht
+            }
+            else if (crtPixelPercentage > segmentPercentages[segmentIndex]) {
+                let decreased = false;
+                //if (b === i7LineBasePoints.length) {
+                b--;
+                decreased = true;
+                //}
+                // Neuer DiagramObjectPoint notwendig
+                // Interpoliere dafür zwischen den letzten beiden Punkten und erzeuge neuen Punkt
+                let tempX = linePoints[b][0] - linePoints[b - 1][0];
+                let tempY = linePoints[b][1] - linePoints[b - 1][1];
+                const percentageOfSegment = crtPixelPercentageSize - lastPixelPercentageSize;
+                const tempRestX = tempX * (1 - percentageOfSegment);
+                const tempRestY = tempY * (1 - percentageOfSegment);
+                tempX = tempX * percentageOfSegment;
+                tempY = tempY * percentageOfSegment;
+                const newDiagramObjectPoint = [
+                    linePoints[b - 1][0] + tempX,
+                    linePoints[b - 1][1] + tempY
+                ];
+                crtPixelLength -= Math.sqrt((tempRestX * tempRestX) + (tempRestY * tempRestY));
+                linePoints.splice(b, 0, newDiagramObjectPoint);
+                if (decreased)
+                    b++;
+            }
+            const diagramObject = new DiagramObject_1.DiagramObject(common_utils_1.CommonUtils.generateUUID(), 'DiagramObject');
+            // diagramObject.setIdentifiedObjectUUID(eqUUIDs[segmentIndex]);
+            const segment = [];
+            resultSegments.push(segment);
+            // let i = 1;
+            for (let idx = lastB; idx < b; ++idx) {
+                segment.push([linePoints[idx][0], linePoints[idx][1]]);
+                // ++i;
+            }
+            lastB = b - 1;
+        }
+        return resultSegments;
+    }
     static convertACLineSegment(completeLength, segmentPercentages, eqUUIDs, i7LineBasePoints) {
         const returnedDiagramObjects = [];
         // Bestimme komplette 'Pixellänge' der Leitung