@enervance/insight-cim-model 0.0.213 → 0.0.214-next

package/dist/converter/integral7/dl-convert/data-manager.d.ts

@@ -2,7 +2,7 @@ import { ILogger } from '../../../interfaces/ILogger.js';
 import { i7SchemaKeyDefinitions, I7TableSchemas } from './dl-graphs/convert-graph-keys.js';
 import { DbObjectGraph } from './dl-graphs/db-object-graph.js';
 import { MysqlController } from '../../../util/database/mysql-controller.js';
-import { CimModelGraph, DbObjectKey2CimModelUUIDGraph } from './dl-graphs/cim-model-graph.js';
+import { CimModelGraph } from './dl-graphs/cim-model-graph.js';
 export type LoadFromMySQLOptions = {
     [tableName in keyof I7TableSchemas]?: {
         [tableColumnName in keyof I7TableSchemas[tableName]]?: {
@@ -14,13 +14,10 @@ export type LoadFromMySQLOptions = {
 export declare class DataManager {
     private logger;
     dbObjectGraph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>;
-    dbObjectKeyCimModelUuidGraph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>;
     cimModelGraph: CimModelGraph;
     trafowicklungIntegralId2Uuid: Map<number, string>;
     constructor(logger?: ILogger);
     setDbObjectGraph(graph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>): void;
     setCimModelGraph(graph: CimModelGraph): void;
-    addTrafowicklungIntegralId2UuidMapping(i7Id: number, uuid: string): void;
-    setDbObjectKeyCimModelUuidGraph(graph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>): void;
     loadFromMySQL(mysqlController: MysqlController, options: LoadFromMySQLOptions, currentFrameBoundary?: IterableIterator<number>): Promise<void>;
 }

package/dist/converter/integral7/dl-convert/data-manager.js

@@ -15,12 +15,6 @@ class DataManager {
     setCimModelGraph(graph) {
         this.cimModelGraph = graph;
     }
-    addTrafowicklungIntegralId2UuidMapping(i7Id, uuid) {
-        this.trafowicklungIntegralId2Uuid.set(i7Id, uuid);
-    }
-    setDbObjectKeyCimModelUuidGraph(graph) {
-        this.dbObjectKeyCimModelUuidGraph = graph;
-    }
     loadFromMySQL(mysqlController, options, currentFrameBoundary) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const tableMetaData = yield mysqlController.getTableMetaData();
@@ -50,7 +44,9 @@ class DataManager {
                     try {
                         let queryResultsAllSites = undefined;
                         if (tableName === 'nsg_nsgstandort') {
-                            const selectQuery = `SELECT * FROM nsg_nsgstandort WHERE ${where_conditions_concats_and[0]}` + ';';
+                            const selectQuery = `SELECT *
+                                 FROM nsg_nsgstandort
+                                 WHERE ${where_conditions_concats_and[0]}` + ';';
                             queryResultsAllSites = yield mysqlController.execQuery(selectQuery);
                         }
                         const queryResults = yield mysqlController.execQuery(selectQuery);

package/dist/converter/integral7/dl-convert/data-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":";;;;AACA,uEAKwC;AAIxC,yCAAsC;AAWtC,MAAa,WAAW;IAQtB,YAAY,MAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,4BAA4B,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChE,CAAC;IAED,gBAAgB,CAAC,KAAmE;QAClF,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,KAAoB;QACnC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAEK,aAAa,CAAC,eAAgC,EAAE,OAA6B,EAAE,oBAA+C;;YAClI,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,gBAAgB,EAAE,CAAC;YAE/D,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;gBAC/B,IAAI,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;oBAChC,wBAAwB;oBACxB,IAAI,4BAA4B,GAAG,EAAE,CAAC;oBACtC,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;wBAC3C,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAC,oDAAoD;4BAC1F,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gCAC/D,OAAO,GAAG,UAAU,MAAM,GAAG,EAAE,CAAA;4BACjC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BAChB,4BAA4B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;yBACjD;6BAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAC,oDAAoD;4BACjG,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BAClE,4BAA4B,CAAC,IAAI,CAAC,IAAI,UAAU,QAAQ,YAAY,GAAG,CAAC,CAAC;yBAC1E;qBACF;oBACD,IAAI,WAAW,GAAG;kCACQ,SAAS,EAAE,CAAC;oBACtC,IAAI,4BAA4B,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC3C,WAAW,IAAI,UAAU,4BAA4B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;qBACvE;oBACD,WAAW,IAAI,GAAG,CAAA;oBAClB,sBAAsB;oBAEtB,IAAI;wBACF,IAAI,oBAAoB,GAAG,SAAS,CAAC;wBACrC,IAAI,SAAS,KAAK,iBAAiB,EAAE;4BACnC,MAAM,WAAW,GAAG;;yCAES,4BAA4B,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC;4BACrE,oBAAoB,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;yBACrE;wBACD,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBAClE,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC3B,uCAAuC;4BACvC,IAAI,CAAC,aAAa,CAAC,UAAU,CAC3B,SAAkC,EAAE,8CAAyB,CAAC,SAAS,CAAC,EAAE,YAAY,CACvF,CAAC;4BACF,yKAAyK;4BACzK,4BAA4B;4BAC5B,uEAAuE;4BACvE,8CAA8C;4BAC9C,+DAA+D;4BAC/D,sCAAsC;4BACtC,yEAAyE;4BACzE,+BAA+B;4BAC/B,0CAA0C;4BAC1C,6CAA6C;4BAC7C,sEAAsE;4BACtE,+BAA+B;4BAC/B,gCAAgC;4BAChC,UAAU;4BACV,yBAAyB;4BACzB,QAAQ;4BACR,MAAM;4BACN,iDAAiD;4BACjD,qCAAqC;4BACrC,+FAA+F;4BAC/F,SAAS;4BACT,WAAW;4BACX,uBAAuB;4BACvB,MAAM;4BACN,SAAS;4BACT,qBAAqB;4BACrB,IAAI;yBACL;6BAAM,EAAC,mEAAmE;4BACzE,IAAI,IAAI,GAAG,IAAI,CAAC;yBACjB;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACV,4BAA4B;wBAC5B,mGAAmG;wBACnG,qDAAqD;wBACrD,0FAA0F;wBAC1F,kCAAkC;wBAClC,IAAI,CAAC,mBAAQ,CAAC,eAAe,EAAE;4BAC7B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;yBAChB;qBACF;iBACF;aACF;QACH,CAAC;KAAA;CACF;AAzGD,kCAyGC"}

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

@@ -3,20 +3,21 @@ import { NetzKnoten, NetzLKupplung, NetzStreckenlast, Netzvariante, NsgKnotenHgu
 import { DiagramObject } from '../../../model/diagram/DiagramObject.js';
 import { i7SchemaKeyDefinitions, I7TableSchemas } from './dl-graphs/convert-graph-keys.js';
 import { Diagram } from '../../../model/diagram/Diagram.js';
-import { CimModelGraph, DbObjectKey2CimModelUUIDGraph } from './dl-graphs/cim-model-graph.js';
+import { CimModelGraph } from './dl-graphs/cim-model-graph.js';
 import { DbObjectGraph } from './dl-graphs/db-object-graph.js';
 import { VariantenNrIdKey } from './db/data-types.js';
 import { IUuidConfig } from '../interface-i7/uuid-config.interface.js';
 type DLConverterI7Config = {
     busbarSectionAsConnectivityNode: boolean;
+    generateUUID4?: boolean;
 };
 export declare class DLConverterI7 {
     private logger;
     private configUuid;
+    private integralID2UUID;
     static testmode: boolean;
     private config;
     private dbObjectGraph;
-    private dbObjectKeyCimModelUuidGraph;
     private cimModelGraph;
     exportedTerminalUUIDs: Set<string>;
     exportedDiagramObjectsGraph: {
@@ -24,12 +25,14 @@ export declare class DLConverterI7 {
             [netzId: number | string]: DiagramObject;
         };
     };
-    constructor(configUuid: Array<IUuidConfig>, logger?: ILogger, config?: DLConverterI7Config);
+    diagramStyles: {
+        "node-breaker": any;
+    };
+    constructor(configUuid?: Array<IUuidConfig>, logger?: ILogger, config?: DLConverterI7Config);
     addExportedDiagramObjectToGraph(variantennr: number, netzId: number, diagramObject: DiagramObject): void;
     getExportedDiagramObjectBy(variantennr: number, netzId: number): DiagramObject | undefined;
     setDbObjectGraph(graph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>): void;
     setCimModelGraph(graph: CimModelGraph): void;
-    setDbObjectKeyCimModelUuidGraph(graph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>): void;
     addCimObject<K extends typeof i7SchemaKeyDefinitions, KN extends keyof typeof i7SchemaKeyDefinitions & string>(uuid: string, object: any, typeOfKey?: KN, dbKey?: K[KN]): void;
     /**
      * convertNsgVariante
@@ -154,5 +157,7 @@ export declare class DLConverterI7 {
     private adjustTransformerTerminalPositions;
     private createTerminalDiagramObjectFromPoints;
     private alreadyExported;
+    linkIntegralId2UUIDMap(integralID2UUID: Map<number, string>): void;
+    private getCimObjectIdFromDbKey;
 }
 export {};

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

@@ -22,17 +22,20 @@ const cim_class_names_1 = require("../../../constants/cim-class-names.js");
 const util_create_1 = require("../../../util/util-create.js");
 class DLConverterI7 {
     constructor(configUuid, logger, config) {
-        // private exportedBusbarSectionConnectivityNodeUuidToDiagramObject: Map<string, DiagramObject>;
+        var _a;
         this.exportedDiagramObjectsGraph = {};
+        this.diagramStyles = {
+            [cim_constants_1.DiagramLayoutTypes.NODE_BREAKER]: undefined
+        };
         this.configUuid = configUuid;
         this.logger = logger;
         this.config = config;
         this.dbObjectGraph = new db_object_graph_1.DbObjectGraph(convert_graph_keys_1.i7SchemaKeyDefinitions);
-        this.dbObjectKeyCimModelUuidGraph = new cim_model_graph_1.DbObjectKey2CimModelUUIDGraph(convert_graph_keys_1.i7SchemaKeyDefinitions);
         this.cimModelGraph = new cim_model_graph_1.CimModelGraph();
         this.exportedTerminalUUIDs = new Set();
-        // this.exportedBusbarSectionConnectivityNodeUuidToDiagramObject = new Map();
         util_functions_1.DLUtilFunctions.setUuidNamespaces(this.configUuid);
+        const uuid = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.generateUUID4) ? common_utils_1.CommonUtils.generateUUID() : common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramStyle, this.configUuid, cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);
+        this.diagramStyles[cim_constants_1.DiagramLayoutTypes.NODE_BREAKER] = new DiagramStyle_1.DiagramStyle(uuid, cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);
     }
     addExportedDiagramObjectToGraph(variantennr, netzId, diagramObject) {
         var _a;
@@ -51,12 +54,9 @@ class DLConverterI7 {
     setCimModelGraph(graph) {
         this.cimModelGraph = graph;
     }
-    setDbObjectKeyCimModelUuidGraph(graph) {
-        this.dbObjectKeyCimModelUuidGraph = graph;
-    }
     addCimObject(uuid, object, typeOfKey, dbKey) {
         // todo remove call from test
-        // if (typeOfKey !== undefined && dbKey !== undefined) this.dbObjectKeyCimModelUuidGraph.addRelation(typeOfKey, dbKey, uuid);
+        // if (typeOfKey !== undefined && dbKey !== undefined) this.addRelation(typeOfKey, dbKey, uuid);
         // this.cimModelGraph.addUnspecifiedObject(uuid, object);
     }
     /**
@@ -66,8 +66,7 @@ class DLConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const diagram = new Diagram_1.Diagram((0, parser_utils_1.getUUID)(arg.guid), (0, util_create_1.createNotation)([arg.name, '_', tsoName], 32, true), String(arg.id));
             diagram.orientation = OrientationKind_1.OrientationKind.negative;
-            const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramStyle, this.configUuid, cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);
-            diagram.diagramStyle = new DiagramStyle_1.DiagramStyle(uuid, cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);
+            diagram.diagramStyle = this.diagramStyles[cim_constants_1.DiagramLayoutTypes.NODE_BREAKER];
             return diagram;
         });
     }
@@ -82,12 +81,12 @@ class DLConverterI7 {
      * convertSchemaKnotenStandort
      */
     convertSchemaKnotenStandort(nsgKnotenSo) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgStandort = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgstandort, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgKnotenSo.variantennr, id: nsgKnotenSo.nsgso });
             if (nsgStandort === undefined)
                 return null;
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgKnotenSo.knotenso })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgKnotenSo.knotenso })) !== null && _a !== void 0 ? _a : undefined;
             const diagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                 xPosition: nsgStandort.xrel + nsgKnotenSo.xrel + 16,
                 yPosition: nsgStandort.yrel + nsgKnotenSo.yrel + 16,
@@ -111,12 +110,12 @@ class DLConverterI7 {
      * convertSchemaKnotenStandort
      */
     convertSchemaKnotenHgue(nsgKnotenHgue) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgStandort = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgstandort, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgKnotenHgue.variantennr, id: nsgKnotenHgue.nsgso });
             if (nsgStandort === undefined)
                 return null;
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgKnotenHgue.knotenso })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgKnotenHgue.knotenso })) !== null && _a !== void 0 ? _a : undefined;
             const diagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                 xPosition: nsgStandort.xrel + nsgKnotenHgue.xrel + 16,
                 yPosition: nsgStandort.yrel + nsgKnotenHgue.yrel + 16,
@@ -177,7 +176,7 @@ class DLConverterI7 {
      * convertSchemaSammelschienenAbschnitt
      */
     convertSchemaSammelschienenAbschnitt(nsgSaabschnitt, netzSsab) {
-        var _a, _b, _c;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgSchaltanlage = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgschaltanlage, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgSaabschnitt.variantennr, id: nsgSaabschnitt.nsgsa });
             if (!nsgSchaltanlage)
@@ -200,7 +199,7 @@ class DLConverterI7 {
             topLeft.sequenceNumber = 1;
             bottomRight.sequenceNumber = 2;
             points.push(topLeft, bottomRight);
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzSsab.id })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzSsab.id })) !== null && _a !== void 0 ? _a : undefined;
             const connectivityNode = this.cimModelGraph.findObjectByUUID(cimObjectUUID);
             let busbarSection = null;
             let busbarSectionTerminal = null;
@@ -213,7 +212,7 @@ class DLConverterI7 {
                     }
                 }
             }
-            if (busbarSection && busbarSectionTerminal && !((_c = this.config) === null || _c === void 0 ? void 0 : _c.busbarSectionAsConnectivityNode)) {
+            if (busbarSection && busbarSectionTerminal && !((_b = this.config) === null || _b === void 0 ? void 0 : _b.busbarSectionAsConnectivityNode)) {
                 // compute the position for the ConnectivityNode (the center of the BusbarSection)
                 const centerPosition = [
                     (topLeft.xPosition + bottomRight.xPosition) / 2,
@@ -248,7 +247,7 @@ class DLConverterI7 {
      * convertSchemaSchaltfeldElemente
      */
     convertSchemaSchaltfeldElemente(nsgSchaltfeld) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             // Es kann vorkommen, dass der Standort einer Sammelschiene bzw. einer Schaltanlage nicht eingeblendet ist.
@@ -411,7 +410,7 @@ class DLConverterI7 {
             for (const nodePointEntry of nodePointMap.entries()) {
                 const key = nodePointEntry[0];
                 const value = nodePointEntry[1];
-                const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _b !== void 0 ? _b : undefined;
+                const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _a !== void 0 ? _a : undefined;
                 value.identifiedObjectUUID = cimObjectUUID;
                 if (!this.alreadyExported(nsgSchaltfeld.variantennr, key)) {
                     resultingDiagramObjects.push(value);
@@ -470,7 +469,7 @@ class DLConverterI7 {
      * convertSchemaTransformer2W
      */
     convertSchemaTransformer2W(nsgTrafo2w) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgStandort = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgstandort, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgTrafo2w.variantennr, id: nsgTrafo2w.nsgso }, false);
             if (!nsgStandort)
@@ -478,7 +477,7 @@ class DLConverterI7 {
             const netzTrafo2W = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.netz_trafo2w, convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo2w.trafo2w });
             if (!netzTrafo2W)
                 return;
-            const powerTransformerUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo2w.trafo2w })) !== null && _b !== void 0 ? _b : undefined;
+            const powerTransformerUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo2w.trafo2w })) !== null && _a !== void 0 ? _a : undefined;
             let centerTransformer = [null, null];
             let positionAnschlussanf = [null, null];
             let positionAnschlussend = [null, null];
@@ -577,7 +576,7 @@ class DLConverterI7 {
      * convertSchemaTransformer3W
      */
     convertSchemaTransformer3W(nsgTrafo3w) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgStandort = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgstandort, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgTrafo3w.variantennr, id: nsgTrafo3w.nsgso }, false);
             if (!nsgStandort)
@@ -585,7 +584,7 @@ class DLConverterI7 {
             const netzTrafo3w = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.netz_trafo3w, convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo3w.trafo3w });
             if (!netzTrafo3w)
                 return null;
-            const powerTransformerUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo3w.trafo3w })) !== null && _b !== void 0 ? _b : undefined;
+            const powerTransformerUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo3w.trafo3w })) !== null && _a !== void 0 ? _a : undefined;
             // Der relative Punkt des Transformators ist die linke obere Ecke bezogen auf die Bounding-Box
             const trafoDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO3W_WIDTH / 2, constants_1.NsgConstants.TRAFO3W_HEIGHT / 2);
             const powerTransformerDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
@@ -761,7 +760,7 @@ class DLConverterI7 {
      * convertSchemaLeitung
      */
     convertSchemaLeitung(nsgLeitung, splitLine = true) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let netzLeitung;
             netzLeitung = yield this.dbObjectGraph.findObjectByKey([
@@ -791,7 +790,7 @@ class DLConverterI7 {
             const nsgLtgpunkte = yield this.dbObjectGraph.findAllByAttributes(convert_graph_keys_1.i7TableNames.nsg_nsgltgpunkt, { nsgleitung: nsgLeitung.id });
             // Manche Leitung beinhalten keine Zwischenpunkte, sondern verlaufen lediglich zwischen dem Start- und Endpunkt
             // if (nsgLtgpunkte.length === 0) return;
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLeitung.leitung })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLeitung.leitung })) !== null && _a !== void 0 ? _a : undefined;
             nsgLtgpunkte.sort((a, b) => a.pos - b.pos);
             const diagramObject = new DiagramObject_1.DiagramObject();
             diagramObject.name = `Leitung ${generalNetzLeitung.id}`;
@@ -887,7 +886,7 @@ class DLConverterI7 {
                 }
                 const segments = util_functions_1.DLUtilFunctions.splitLineIntoLineSegments(segmentPercentages, diagramObject.diagramObjectPoints.map(arg => [arg.xPosition, arg.yPosition]));
                 for (let a = 0; a < segments.length; ++a) {
-                    const thisSegmentUUID = (_d = (_c = this.dbObjectKeyCimModelUuidGraph) === null || _c === void 0 ? void 0 : _c.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzLeitungsabschnitte[a].id })) !== null && _d !== void 0 ? _d : undefined;
+                    const thisSegmentUUID = (_b = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzLeitungsabschnitte[a].id })) !== null && _b !== void 0 ? _b : undefined;
                     const thisSegmentCimObject = this.cimModelGraph.findObjectByUUID(thisSegmentUUID);
                     const diagramObject = new DiagramObject_1.DiagramObject();
                     diagramObject.name = `Leitung ${generalNetzLeitung.id}`;
@@ -913,7 +912,7 @@ class DLConverterI7 {
                         if (thisSegmentCimObject) {
                             // need to get the ConnectivityNode and the Terminal, which connects the current (this) with the prev segment
                             const prevSegment = netzLeitungsabschnitte[a - 1];
-                            const prevSegmentUUID = this.dbObjectKeyCimModelUuidGraph.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: prevSegment.id });
+                            const prevSegmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: prevSegment.id });
                             const prevSegmentCimObject = this.cimModelGraph.findObjectByUUID(prevSegmentUUID);
                             let connectivityNodeUUIDThisToPrev;
                             let terminalUUIDThisToPrevConnectivityNode;
@@ -957,7 +956,7 @@ class DLConverterI7 {
                         if (thisSegmentCimObject) {
                             // need to get the ConnectivityNode and the Terminal, which connects the current (this) with the next segment
                             const nextSegment = netzLeitungsabschnitte[a + 1];
-                            const nextSegmentUUID = this.dbObjectKeyCimModelUuidGraph.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nextSegment.id });
+                            const nextSegmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nextSegment.id });
                             const nextSegmentCimObject = this.cimModelGraph.findObjectByUUID(nextSegmentUUID);
                             let connectivityNodeUUIDThisToNext;
                             let terminalUUIDThisToNextConnectivityNode;
@@ -1042,7 +1041,7 @@ class DLConverterI7 {
      * convertSchemaQuerzweig
      */
     convertSchemaQuerzweig(nsgQuerzweig) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             const typedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
@@ -1077,7 +1076,7 @@ class DLConverterI7 {
             else {
                 return null;
             }
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgQuerzweig.querzweig })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgQuerzweig.querzweig })) !== null && _a !== void 0 ? _a : undefined;
             const querzweigDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                 xPosition: xPosition,
                 yPosition: yPosition,
@@ -1112,12 +1111,12 @@ class DLConverterI7 {
      * convertNsgLeitungStreckenlast
      */
     convertNsgLeitungStreckenlast(nsgLeitung, netzStreckenlast, splitLine = true) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgLtgpunkte = yield this.dbObjectGraph.findAllByAttributes(convert_graph_keys_1.i7TableNames.nsg_nsgltgpunkt, { nsgleitung: nsgLeitung.id });
             // Manche Leitung beinhalten keine Zwischenpunkte, sondern verlaufen lediglich zwischen dem Start- und Endpunkt
             // if (nsgLtgpunkte.length === 0) return;
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLeitung.leitung })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLeitung.leitung })) !== null && _a !== void 0 ? _a : undefined;
             nsgLtgpunkte.sort((a, b) => a.pos - b.pos);
             const diagramObject = new DiagramObject_1.DiagramObject();
             diagramObject.name = `Streckenlast ${netzStreckenlast.id}`;
@@ -1213,7 +1212,7 @@ class DLConverterI7 {
                 }
                 const segments = util_functions_1.DLUtilFunctions.splitLineIntoLineSegments(segmentPercentages, diagramObject.diagramObjectPoints.map(arg => [arg.xPosition, arg.yPosition]));
                 for (let a = 0; a < segments.length; ++a) {
-                    const thisSegmentUUID = (_d = (_c = this.dbObjectKeyCimModelUuidGraph) === null || _c === void 0 ? void 0 : _c.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzLeitungsabschnitte[a].id })) !== null && _d !== void 0 ? _d : undefined;
+                    const thisSegmentUUID = (_b = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzLeitungsabschnitte[a].id })) !== null && _b !== void 0 ? _b : undefined;
                     const thisSegmentCimObject = this.cimModelGraph.findObjectByUUID(thisSegmentUUID);
                     const diagramObject = new DiagramObject_1.DiagramObject();
                     diagramObject.name = `Leitung ${netzStreckenlast.id}`;
@@ -1239,7 +1238,7 @@ class DLConverterI7 {
                         if (thisSegmentCimObject) {
                             // need to get the ConnectivityNode and the Terminal, which connects the current (this) with the prev segment
                             const prevSegment = netzLeitungsabschnitte[a - 1];
-                            const prevSegmentUUID = this.dbObjectKeyCimModelUuidGraph.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: prevSegment.id });
+                            const prevSegmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: prevSegment.id });
                             const prevSegmentCimObject = this.cimModelGraph.findObjectByUUID(prevSegmentUUID);
                             let connectivityNodeUUIDThisToPrev;
                             let terminalUUIDThisToPrevConnectivityNode;
@@ -1283,7 +1282,7 @@ class DLConverterI7 {
                         if (thisSegmentCimObject) {
                             // need to get the ConnectivityNode and the Terminal, which connects the current (this) with the next segment
                             const nextSegment = netzLeitungsabschnitte[a + 1];
-                            const nextSegmentUUID = this.dbObjectKeyCimModelUuidGraph.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nextSegment.id });
+                            const nextSegmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nextSegment.id });
                             const nextSegmentCimObject = this.cimModelGraph.findObjectByUUID(nextSegmentUUID);
                             let connectivityNodeUUIDThisToNext;
                             let terminalUUIDThisToNextConnectivityNode;
@@ -1381,7 +1380,7 @@ class DLConverterI7 {
      * convertSchemaQuerzweigqcont
      */
     convertSchemaQuerzweigqzcont(nsgQuerzweigqzcont) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             const typedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
@@ -1418,7 +1417,7 @@ class DLConverterI7 {
                     id: nsgQuerzweigqzContelem.querzweig
                 });
                 const netzQuerzweig = querzweigWrapperObject.object;
-                const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgQuerzweigqzContelem.querzweig })) !== null && _b !== void 0 ? _b : undefined;
+                const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgQuerzweigqzContelem.querzweig })) !== null && _a !== void 0 ? _a : undefined;
                 const querzweigDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                     xPosition: xPosition,
                     yPosition: yPosition,
@@ -1452,7 +1451,7 @@ class DLConverterI7 {
      * convertSchemaNsgLKupplungRss
      */
     convertSchemaNsgLKupplungRss(nsgLKupplungRss) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             const netzLKupplung = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.netz_lkupplung, convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLKupplungRss.lkupplung });
@@ -1812,7 +1811,7 @@ class DLConverterI7 {
             for (const nodePointEntry of nodePointMap.entries()) {
                 const key = nodePointEntry[0];
                 const value = nodePointEntry[1];
-                const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _b !== void 0 ? _b : undefined;
+                const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _a !== void 0 ? _a : undefined;
                 value.identifiedObjectUUID = cimObjectUUID;
                 if (!this.alreadyExported(nsgLKupplungRss.variantennr, key)) {
                     resultingDiagramObjects.push(value);
@@ -1893,7 +1892,7 @@ class DLConverterI7 {
      * convertSchemaKpfeld
      */
     convertSchemaKpfeld(nsgKpfeld) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             const nsgSaabschnitt = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgsaabschnitt, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgKpfeld.variantennr, id: nsgKpfeld.nsgsaa }, false);
@@ -2219,7 +2218,7 @@ class DLConverterI7 {
             for (const nodePointEntry of nodePointMap.entries()) {
                 const key = nodePointEntry[0];
                 const value = nodePointEntry[1];
-                const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _b !== void 0 ? _b : undefined;
+                const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _a !== void 0 ? _a : undefined;
                 value.identifiedObjectUUID = cimObjectUUID;
                 if (!this.alreadyExported(nsgKpfeld.variantennr, key)) {
                     resultingDiagramObjects.push(value);
@@ -2233,7 +2232,7 @@ class DLConverterI7 {
      * convertSchemaLKupplung
      */
     convertSchemaLKupplung(nsgLKupplung, netzLKupplung) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             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);
@@ -2639,7 +2638,7 @@ class DLConverterI7 {
             for (const nodePointEntry of nodePointMap.entries()) {
                 const key = nodePointEntry[0];
                 const value = nodePointEntry[1];
-                const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _b !== void 0 ? _b : undefined;
+                const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _a !== void 0 ? _a : undefined;
                 value.identifiedObjectUUID = cimObjectUUID;
                 if (!this.alreadyExported(nsgLKupplung.variantennr, key)) {
                     resultingDiagramObjects.push(value);
@@ -2653,7 +2652,7 @@ class DLConverterI7 {
      * convertSchemaStpschiene
      */
     convertSchemaLKondensator(nsgLKondensator) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             const leftUpperCornerOfNsgLKondensator = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsglkondensator, nsgLKondensator);
@@ -2697,7 +2696,7 @@ class DLConverterI7 {
                     endPos[1] += 48;
                     break;
             }
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLKondensator.lkondensator })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLKondensator.lkondensator })) !== null && _a !== void 0 ? _a : undefined;
             const doLKondensator = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                 xPosition: pos[0],
                 yPosition: pos[1],
@@ -2762,7 +2761,7 @@ class DLConverterI7 {
      * convertSchemaStpschiene
      */
     convertSchemaStpschiene(nsgStpschiene) {
-        var _a, _b, _c;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const leftUpperCornerOfNsgStpschiene = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsgstpschiene, nsgStpschiene);
             const length = nsgStpschiene.laenge;
@@ -2786,7 +2785,7 @@ class DLConverterI7 {
             topLeft.sequenceNumber = 1;
             bottomRight.sequenceNumber = 2;
             points.push(topLeft, bottomRight);
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpschiene.stpschiene })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpschiene.stpschiene })) !== null && _a !== void 0 ? _a : undefined;
             const connectivityNode = this.cimModelGraph.findObjectByUUID(cimObjectUUID);
             let junction = null;
             let junctionTerminal = null;
@@ -2799,7 +2798,7 @@ class DLConverterI7 {
                     }
                 }
             }
-            if (junction && junctionTerminal && !((_c = this.config) === null || _c === void 0 ? void 0 : _c.busbarSectionAsConnectivityNode)) {
+            if (junction && junctionTerminal && !((_b = this.config) === null || _b === void 0 ? void 0 : _b.busbarSectionAsConnectivityNode)) {
                 // compute the position for the ConnectivityNode (the center of the BusbarSection)
                 const centerPosition = [
                     (topLeft.xPosition + bottomRight.xPosition) / 2,
@@ -2832,7 +2831,7 @@ class DLConverterI7 {
      * convertSchemaStpknoten
      */
     convertSchemaStpknoten(nsgStpknoten) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             let leftUpperCornerOfNsgStpknoten = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsgstpknoten, nsgStpknoten);
@@ -2849,7 +2848,7 @@ class DLConverterI7 {
                     coords[1] += 8;
                     break;
             }
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpknoten.knoten })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpknoten.knoten })) !== null && _a !== void 0 ? _a : undefined;
             const doStpknoten = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                 xPosition: coords[0],
                 yPosition: coords[1],
@@ -2874,7 +2873,7 @@ class DLConverterI7 {
      * convertSchemaStpimpedanz
      */
     convertSchemaStpimpedanz(nsgStpimpedanz) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             let leftUpperCornerOfNsgStpimpedanz = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsgstpimpedanz, nsgStpimpedanz);
@@ -2894,7 +2893,7 @@ class DLConverterI7 {
                     coords[1] += (width / 2);
                     break;
             }
-            const cimObjectUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpimpedanz.kdrossel })) !== null && _b !== void 0 ? _b : undefined;
+            const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpimpedanz.kdrossel })) !== null && _a !== void 0 ? _a : undefined;
             const doStpknoten = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                 xPosition: coords[0],
                 yPosition: coords[1],
@@ -2910,7 +2909,7 @@ class DLConverterI7 {
      * convertSchemaStpschaltfeld
      */
     convertSchemaStpschaltfeldElemente(nsgStpschaltfeld) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const resultingDiagramObjects = [];
             const leftUpperCornerOfNsgStpSchaltfeld = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsgstpschaltfeld, nsgStpschaltfeld);
@@ -2968,7 +2967,7 @@ class DLConverterI7 {
                         coordsConnectivityNodeBusbarSection[1] += 8;
                         break;
                 }
-                const equipmentUUID = (_b = (_a = this.dbObjectKeyCimModelUuidGraph) === null || _a === void 0 ? void 0 : _a.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: schaltelement1pelem.id })) !== null && _b !== void 0 ? _b : undefined;
+                const equipmentUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: schaltelement1pelem.id })) !== null && _a !== void 0 ? _a : undefined;
                 const doEquipment = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                     xPosition: coordsEquipment[0],
                     yPosition: coordsEquipment[1],
@@ -2976,7 +2975,7 @@ class DLConverterI7 {
                     diagramObjectName: `NsgStpschaltfeld-Node ${schaltelement1pelem.id}`,
                     identifiedObjectUUID: equipmentUUID
                 });
-                const connectivityNodeBayEndUUID = (_d = (_c = this.dbObjectKeyCimModelUuidGraph) === null || _c === void 0 ? void 0 : _c.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: schaltelement1pelem.eknoten })) !== null && _d !== void 0 ? _d : undefined;
+                const connectivityNodeBayEndUUID = (_b = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: schaltelement1pelem.eknoten })) !== null && _b !== void 0 ? _b : undefined;
                 const doConnectivityNodeBayEnd = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                     xPosition: coordsConnectivityNodeBayEnd[0],
                     yPosition: coordsConnectivityNodeBayEnd[1],
@@ -3006,7 +3005,7 @@ class DLConverterI7 {
     // async convertSchemaStpTerminals(nsgStpknoten: NsgStpknoten): Promise<DiagramObject[]> {
     //   const resultingDiagramObjects: DiagramObject[] = [];
     //
-    //   const cimObjectUUID = this.dbObjectKeyCimModelUuidGraph?.getCimObjectIdFromDbKey(
+    //   const cimObjectUUID = this.getCimObjectIdFromDbKey(
     //     i7SchemaKeyNames.IdOnlyKey, { id: nsgStpknoten.knoten }
     //   ) ?? undefined;
     //
@@ -3019,7 +3018,7 @@ class DLConverterI7 {
     //
     //       const ceUUID = terminal.getConductingEquipmentUUID();
     //
-    //       const ceDbKeys = this.dbObjectKeyCimModelUuidGraph.getDbKeyDbFromCimObjectId(ceUUID);
+    //       const ceDbKeys = this.getDbKeyDbFromCimObjectId(ceUUID);
     //
     //       if (ceDbKeys.VariantenNrIdKey) {
     //         const ceDbKey = ceDbKeys.VariantenNrIdKey;
@@ -3546,8 +3545,8 @@ class DLConverterI7 {
         if (DLConverterI7.testmode) {
             return common_utils_1.CommonUtils.generateUUID();
         }
-        const connectivityNodeUUID = this.dbObjectKeyCimModelUuidGraph.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: connectivityNodeI7ID });
-        const conductingEquipmentUUID = this.dbObjectKeyCimModelUuidGraph.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: conductingEquipmentI7ID });
+        const connectivityNodeUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: connectivityNodeI7ID });
+        const conductingEquipmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: conductingEquipmentI7ID });
         if (!connectivityNodeUUID || !conductingEquipmentUUID) {
             return null;
         }
@@ -3636,6 +3635,17 @@ class DLConverterI7 {
         }
         return false;
     }
+    linkIntegralId2UUIDMap(integralID2UUID) {
+        this.integralID2UUID = integralID2UUID;
+    }
+    getCimObjectIdFromDbKey(typeOfKey, dbKey) {
+        if (typeOfKey === convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey) {
+            return this.integralID2UUID.get(dbKey.id);
+        }
+        else {
+            throw Error('Optimierung ging nach hinten los!');
+        }
+    }
 }
 exports.DLConverterI7 = DLConverterI7;
 DLConverterI7.testmode = false;