@enervance/insight-cim-model 0.0.165 → 0.0.167

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

@@ -16,9 +16,11 @@ export declare class DataManager {
     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): Promise<void>;
 }

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

@@ -7,6 +7,7 @@ const executor_1 = require("./executor.js");
 class DataManager {
     constructor(logger) {
         this.logger = logger;
+        this.trafowicklungIntegralId2Uuid = new Map();
     }
     setDbObjectGraph(graph) {
         this.dbObjectGraph = graph;
@@ -14,6 +15,9 @@ class DataManager {
     setCimModelGraph(graph) {
         this.cimModelGraph = graph;
     }
+    addTrafowicklungIntegralId2UuidMapping(i7Id, uuid) {
+        this.trafowicklungIntegralId2Uuid.set(i7Id, uuid);
+    }
     setDbObjectKeyCimModelUuidGraph(graph) {
         this.dbObjectKeyCimModelUuidGraph = graph;
     }

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":";;;;AACA,uEAOwC;AAKxC,yCAAsC;AAWtC,MAAa,WAAW;IAOtB,YAAY,MAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,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;IAED,+BAA+B,CAAC,KAAmE;QACjG,IAAI,CAAC,4BAA4B,GAAG,KAAK,CAAC;IAC5C,CAAC;IAEK,aAAa,CAAC,eAAgC,EAAE,OAA6B;;;YACjF,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,0BAA0B,GAAG,EAAE,CAAC;oBACpC,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;wBAC3C,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAG,EAAC,oDAAoD;4BAC3F,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,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;yBAC/C;6BAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAG,EAAC,oDAAoD;4BAClG,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BAClE,0BAA0B,CAAC,IAAI,CAAC,IAAI,UAAU,QAAQ,YAAY,GAAG,CAAC,CAAC;yBACxE;qBACF;oBACD,IAAI,WAAW,GAAG;kCACQ,SAAS,EAAE,CAAC;oBACtC,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzC,WAAW,IAAI,UAAU,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;qBACrE;oBACD,WAAW,IAAI,GAAG,CAAA;oBAClB,sBAAsB;oBAEtB,IAAI;wBACF,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBAElE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,mCAAI,EAAE,CAAC;wBAEpE,IAAI,CAAC,aAAa,CAAC,UAAU,CAC3B,SAAkC,EAAE,8CAAyB,CAAC,SAAS,CAAC,EAAE,YAAY,CACvF,CAAC;qBACH;oBAAC,OAAO,CAAC,EAAE;wBACV,4BAA4B;wBAC5B,mGAAmG;wBACnG,qDAAqD;wBACrD,0FAA0F;wBAC1F,kCAAkC;wBAClC,IAAG,CAAC,mBAAQ,CAAC,eAAe,EAAC;4BAC3B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;yBAChB;qBACF;iBACF;aACF;;KACF;CACF;AAtED,kCAsEC"}
+{"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;IAStB,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;IAED,sCAAsC,CAAC,IAAY,EAAE,IAAY;QAC/D,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,+BAA+B,CAAC,KAAmE;QACjG,IAAI,CAAC,4BAA4B,GAAG,KAAK,CAAC;IAC5C,CAAC;IAEK,aAAa,CAAC,eAAgC,EAAE,OAA6B;;;YACjF,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,0BAA0B,GAAG,EAAE,CAAC;oBACpC,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,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;yBAC/C;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,0BAA0B,CAAC,IAAI,CAAC,IAAI,UAAU,QAAQ,YAAY,GAAG,CAAC,CAAC;yBACxE;qBACF;oBACD,IAAI,WAAW,GAAG;kCACQ,SAAS,EAAE,CAAC;oBACtC,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzC,WAAW,IAAI,UAAU,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;qBACrE;oBACD,WAAW,IAAI,GAAG,CAAA;oBAClB,sBAAsB;oBAEtB,IAAI;wBACF,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBAElE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,mCAAI,EAAE,CAAC;wBAEpE,IAAI,CAAC,aAAa,CAAC,UAAU,CAC3B,SAAkC,EAAE,8CAAyB,CAAC,SAAS,CAAC,EAAE,YAAY,CACvF,CAAC;qBACH;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;;KACF;CACF;AA9ED,kCA8EC"}

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

@@ -19,7 +19,7 @@ export declare class DLConverterI7 {
     private dbObjectKeyCimModelUuidGraph;
     private cimModelGraph;
     private exportedTerminalUUIDs;
-    private exportedBusbarSectionConnectivityNodeUuidToDiagramObject;
+    private trafowicklungIntegralId2Uuid;
     exportedDiagramObjectsGraph: {
         [variantenNr: number | string]: {
             [netzId: number | string]: DiagramObject;
@@ -27,9 +27,11 @@ export declare class DLConverterI7 {
     };
     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;
+    setTrafowicklungIntegralId2Uuid(trafowicklungIntegralId2Uuid: Map<number, string>): void;
     addCimObject<K extends typeof i7SchemaKeyDefinitions, KN extends keyof typeof i7SchemaKeyDefinitions & string>(uuid: string, object: any, typeOfKey?: KN, dbKey?: K[KN]): void;
     /**
      * convertNsgVariante
@@ -155,6 +157,8 @@ export declare class DLConverterI7 {
      * result is either [Terminal-UUID, ConnectivityNode-UUID, Terminal-UUID] or []
      */
     private findConnectionAsUuidsBetweenTwoConductingEquipments;
+    private adjustTransformerTerminalPositions;
     private createTerminalDiagramObjectFromPoints;
+    private alreadyExported;
 }
 export {};

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

@@ -29,7 +29,7 @@ class DLConverterI7 {
         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();
+        // this.exportedBusbarSectionConnectivityNodeUuidToDiagramObject = new Map();
         util_functions_1.DLUtilFunctions.setUuidNamespaces(this.configUuid);
     }
     addExportedDiagramObjectToGraph(variantennr, netzId, diagramObject) {
@@ -37,6 +37,12 @@ class DLConverterI7 {
         this.exportedDiagramObjectsGraph[variantennr] = (_a = this.exportedDiagramObjectsGraph[variantennr]) !== null && _a !== void 0 ? _a : {};
         this.exportedDiagramObjectsGraph[variantennr][netzId] = diagramObject;
     }
+    getExportedDiagramObjectBy(variantennr, netzId) {
+        if (variantennr in this.exportedDiagramObjectsGraph) {
+            return this.exportedDiagramObjectsGraph[variantennr][netzId];
+        }
+        return undefined;
+    }
     setDbObjectGraph(graph) {
         this.dbObjectGraph = graph;
     }
@@ -46,6 +52,9 @@ class DLConverterI7 {
     setDbObjectKeyCimModelUuidGraph(graph) {
         this.dbObjectKeyCimModelUuidGraph = graph;
     }
+    setTrafowicklungIntegralId2Uuid(trafowicklungIntegralId2Uuid) {
+        this.trafowicklungIntegralId2Uuid = trafowicklungIntegralId2Uuid;
+    }
     addCimObject(uuid, object, typeOfKey, dbKey) {
         if (typeOfKey !== undefined && dbKey !== undefined)
             this.dbObjectKeyCimModelUuidGraph.addRelation(typeOfKey, dbKey, uuid);
@@ -395,14 +404,20 @@ class DLConverterI7 {
                 }
                 nodePointMap.set(prevNode.eknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(position[0], position[1], null));
                 // END: Last ConnectivityNode
+                // if (!this.alreadyExported(nsgSchaltfeld.variantennr, nsgSchaltfeld.id)) {
+                //   resultingDiagramObjects.push(value);
+                //   this.addExportedDiagramObjectToGraph(nsgSchaltfeld.variantennr, nsgSchaltfeld.id, value);
+                // }
             }
             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;
                 value.identifiedObjectUUID = cimObjectUUID;
-                resultingDiagramObjects.push(value);
-                this.addExportedDiagramObjectToGraph(nsgSchaltfeld.variantennr, key, value);
+                if (!this.alreadyExported(nsgSchaltfeld.variantennr, key)) {
+                    resultingDiagramObjects.push(value);
+                    this.addExportedDiagramObjectToGraph(nsgSchaltfeld.variantennr, key, value);
+                }
             }
             /* ---------- ---------- ---------- */
             // BEGIN: Terminal-Export
@@ -513,7 +528,7 @@ class DLConverterI7 {
             const createdDiagramObjects = [];
             createdDiagramObjects.push(powerTransformerDiagramObject);
             let terminal1DiagramObject;
-            let powerTransformerEnd1TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo2W.guid_w1);
+            let powerTransformerEnd1TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo2W.guid_w1, 1);
             if (powerTransformerEnd1TerminalUuid) {
                 terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                     xPosition: positionAnschlussanf[0],
@@ -525,7 +540,7 @@ class DLConverterI7 {
                 createdDiagramObjects.push(terminal1DiagramObject);
             }
             let terminal2DiagramObject;
-            let powerTransformerEnd2TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo2W.guid_w2);
+            let powerTransformerEnd2TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo2W.guid_w2, 2);
             if (powerTransformerEnd2TerminalUuid) {
                 terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                     xPosition: positionAnschlussend[0],
@@ -544,15 +559,17 @@ class DLConverterI7 {
                     diagramObjectPoint.yPosition += nsgStandort.yrel;
                 }
             }
-            const doAKnotenConnectivityNode = this.exportedDiagramObjectsGraph[nsgTrafo2w.variantennr][netzTrafo2W.aknoten];
+            const doAKnotenConnectivityNode = this.getExportedDiagramObjectBy(nsgTrafo2w.variantennr, netzTrafo2W.aknoten);
             if (terminal1DiagramObject && doAKnotenConnectivityNode) {
                 const dopAKnotenConnectivityNode = doAKnotenConnectivityNode.diagramObjectPoints[0];
                 util_functions_1.DLUtilFunctions.copyAndPushDiagramObjectPoint(terminal1DiagramObject, dopAKnotenConnectivityNode, false);
+                this.adjustTransformerTerminalPositions(terminal1DiagramObject, powerTransformerDiagramObject);
             }
-            const doEKnotenConnectivityNode = this.exportedDiagramObjectsGraph[nsgTrafo2w.variantennr][netzTrafo2W.eknoten];
+            const doEKnotenConnectivityNode = this.getExportedDiagramObjectBy(nsgTrafo2w.variantennr, netzTrafo2W.eknoten);
             if (terminal2DiagramObject && doEKnotenConnectivityNode) {
                 const dopEKnotenConnectivityNode = doEKnotenConnectivityNode.diagramObjectPoints[0];
                 util_functions_1.DLUtilFunctions.copyAndPushDiagramObjectPoint(terminal2DiagramObject, dopEKnotenConnectivityNode, false);
+                this.adjustTransformerTerminalPositions(terminal2DiagramObject, powerTransformerDiagramObject);
             }
             return createdDiagramObjects;
         });
@@ -602,7 +619,7 @@ class DLConverterI7 {
             const createdDiagramObjects = [];
             createdDiagramObjects.push(powerTransformerDiagramObject);
             let terminal1DiagramObject;
-            let powerTransformerEnd1TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo3w.guid_w1);
+            let powerTransformerEnd1TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo3w.guid_w1, 1);
             if (powerTransformerEnd1TerminalUuid) {
                 terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                     xPosition: rotationenGroup[exchangeGroup[1]][0],
@@ -613,7 +630,7 @@ class DLConverterI7 {
                 createdDiagramObjects.push(terminal1DiagramObject);
             }
             let terminal2DiagramObject;
-            let powerTransformerEnd2TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo3w.guid_w2);
+            let powerTransformerEnd2TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo3w.guid_w2, 2);
             if (powerTransformerEnd2TerminalUuid) {
                 terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                     xPosition: rotationenGroup[exchangeGroup[xMirroring ? 3 : 2]][0],
@@ -624,9 +641,9 @@ class DLConverterI7 {
                 createdDiagramObjects.push(terminal2DiagramObject);
             }
             let terminal3DiagramObject;
-            let powerTransformerEnd3TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo3w.guid_w3);
+            let powerTransformerEnd3TerminalUuid = this.lookupTransformerEndTerminalUUIDBy(powerTransformerUUID, netzTrafo3w.guid_w3, 3);
             if (powerTransformerEnd3TerminalUuid) {
-                const terminal3DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
+                terminal3DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
                     xPosition: rotationenGroup[exchangeGroup[xMirroring ? 2 : 3]][0],
                     yPosition: rotationenGroup[exchangeGroup[xMirroring ? 2 : 3]][1],
                     diagramObjectName: 'Terminal 3',
@@ -652,6 +669,10 @@ class DLConverterI7 {
             if (terminal1DiagramObject && w1TypedResult) {
                 const w1ConnectivityNodePosition = yield this.getConnectivityNodePositionFor(w1TypedResult.type, w1TypedResult.object);
                 util_functions_1.DLUtilFunctions.copyAndPushXYCoordinates(terminal1DiagramObject, w1ConnectivityNodePosition, false);
+                this.adjustTransformerTerminalPositions(terminal1DiagramObject, powerTransformerDiagramObject);
+                // } else {
+                //   const powerTransformer: PowerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
+                //   console.log(powerTransformer)
             }
             const w2TypedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
                 variantennr: nsgTrafo3w.variantennr, id: nsgTrafo3w.anschluss_w2
@@ -659,6 +680,10 @@ class DLConverterI7 {
             if (terminal2DiagramObject && w2TypedResult) {
                 const w2ConnectivityNodePosition = yield this.getConnectivityNodePositionFor(w2TypedResult.type, w2TypedResult.object);
                 util_functions_1.DLUtilFunctions.copyAndPushXYCoordinates(terminal2DiagramObject, w2ConnectivityNodePosition, false);
+                this.adjustTransformerTerminalPositions(terminal2DiagramObject, powerTransformerDiagramObject);
+                // } else {
+                //   const powerTransformer: PowerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
+                //   console.log(powerTransformer)
             }
             const w3TypedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
                 variantennr: nsgTrafo3w.variantennr, id: nsgTrafo3w.anschluss_w3
@@ -666,23 +691,35 @@ class DLConverterI7 {
             if (terminal3DiagramObject && w3TypedResult) {
                 const w3ConnectivityNodePosition = yield this.getConnectivityNodePositionFor(w3TypedResult.type, w3TypedResult.object);
                 util_functions_1.DLUtilFunctions.copyAndPushXYCoordinates(terminal3DiagramObject, w3ConnectivityNodePosition, false);
+                this.adjustTransformerTerminalPositions(terminal3DiagramObject, powerTransformerDiagramObject);
+                // } else {
+                //   const powerTransformer: PowerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
+                //   console.log(powerTransformer)
             }
             return createdDiagramObjects;
         });
     }
-    lookupTransformerEndTerminalUUIDBy(powerTransformerUuid, powerTransformerEndUuid) {
-        if (!powerTransformerEndUuid)
-            return;
-        if (powerTransformerEndUuid.startsWith('_'))
-            powerTransformerEndUuid = powerTransformerEndUuid.substring(1);
-        let powerTransformerEnd = this.cimModelGraph.findObjectByUUID(powerTransformerEndUuid);
-        if (powerTransformerEnd)
-            return powerTransformerEnd.getTerminalUUID();
-        const powerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUuid);
-        if (powerTransformer) {
-            powerTransformerEnd = powerTransformer.powerTransformerEnd.find(pte => pte.getUUID() === powerTransformerEndUuid);
+    lookupTransformerEndTerminalUUIDBy(powerTransformerUuid, powerTransformerEndUuid, endNumber) {
+        if (powerTransformerEndUuid) {
+            if (powerTransformerEndUuid.startsWith('_'))
+                powerTransformerEndUuid = powerTransformerEndUuid.substring(1);
+            let powerTransformerEnd = this.cimModelGraph.findObjectByUUID(powerTransformerEndUuid);
             if (powerTransformerEnd)
                 return powerTransformerEnd.getTerminalUUID();
+            const powerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUuid);
+            if (powerTransformer) {
+                powerTransformerEnd = powerTransformer.powerTransformerEnd.find(pte => pte.getUUID() === powerTransformerEndUuid);
+                if (powerTransformerEnd)
+                    return powerTransformerEnd.getTerminalUUID();
+            }
+        }
+        else {
+            const powerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUuid);
+            if (powerTransformer) {
+                let powerTransformerEnd = powerTransformer.powerTransformerEnd.find(pte => pte.getEndNumber() === endNumber);
+                if (powerTransformerEnd)
+                    return powerTransformerEnd.getTerminalUUID();
+            }
         }
         return undefined;
     }
@@ -1049,8 +1086,10 @@ class DLConverterI7 {
                 diagramObjectName: `DiagramObject ${nsgQuerzweig.querzweig}`,
                 identifiedObjectUUID: cimObjectUUID
             });
-            this.addExportedDiagramObjectToGraph(nsgQuerzweig.variantennr, nsgQuerzweig.querzweig, querzweigDiagramObject);
-            resultingDiagramObjects.push(querzweigDiagramObject);
+            if (!this.alreadyExported(nsgQuerzweig.variantennr, nsgQuerzweig.querzweig)) {
+                this.addExportedDiagramObjectToGraph(nsgQuerzweig.variantennr, nsgQuerzweig.querzweig, querzweigDiagramObject);
+                resultingDiagramObjects.push(querzweigDiagramObject);
+            }
             /* ---------- ---------- ---------- */
             // BEGIN: Terminal-Export
             const doBackwardConnectivityNode = this.exportedDiagramObjectsGraph[nsgQuerzweig.variantennr][netzQuerzweig.anschluss];
@@ -1776,7 +1815,10 @@ class DLConverterI7 {
                 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;
                 value.identifiedObjectUUID = cimObjectUUID;
-                resultingDiagramObjects.push(value);
+                if (!this.alreadyExported(nsgLKupplungRss.variantennr, key)) {
+                    resultingDiagramObjects.push(value);
+                    // this.addExportedDiagramObjectToGraph(nsgLKupplungRss.variantennr, key, value) // todo check if this causes problems
+                }
             }
             return resultingDiagramObjects;
         });
@@ -2180,7 +2222,10 @@ class DLConverterI7 {
                 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;
                 value.identifiedObjectUUID = cimObjectUUID;
-                resultingDiagramObjects.push(value);
+                if (!this.alreadyExported(nsgKpfeld.variantennr, key)) {
+                    resultingDiagramObjects.push(value);
+                    // this.addExportedDiagramObjectToGraph(nsgKpfeld.variantennr, key, value) // todo check if this causes problems
+                }
             }
             return resultingDiagramObjects;
         });
@@ -2597,7 +2642,10 @@ class DLConverterI7 {
                 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;
                 value.identifiedObjectUUID = cimObjectUUID;
-                resultingDiagramObjects.push(value);
+                if (!this.alreadyExported(nsgLKupplung.variantennr, key)) {
+                    resultingDiagramObjects.push(value);
+                    // this.addExportedDiagramObjectToGraph(nsgLKupplung.variantennr, key, value) // todo check if this causes problems
+                }
             }
             return resultingDiagramObjects;
         });
@@ -2658,8 +2706,10 @@ class DLConverterI7 {
                 diagramObjectName: `DiagramObject ${nsgLKondensator.lkondensator}`,
                 identifiedObjectUUID: cimObjectUUID
             });
-            this.addExportedDiagramObjectToGraph(nsgLKondensator.variantennr, nsgLKondensator.id, doLKondensator);
-            resultingDiagramObjects.push(doLKondensator);
+            if (!this.alreadyExported(nsgLKondensator.variantennr, nsgLKondensator.id)) {
+                this.addExportedDiagramObjectToGraph(nsgLKondensator.variantennr, nsgLKondensator.id, doLKondensator);
+                resultingDiagramObjects.push(doLKondensator);
+            }
             /* ---------- ---------- ---------- */
             // BEGIN: Terminal-Export
             const anschlussanfTypedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
@@ -3539,6 +3589,22 @@ class DLConverterI7 {
         }
         return [];
     }
+    adjustTransformerTerminalPositions(terminalDiagramObject, transformerDiagramObject) {
+        if (terminalDiagramObject.diagramObjectPoints.length === 2 && transformerDiagramObject.diagramObjectPoints.length === 1) {
+            const firstDiagramObjectPoint = terminalDiagramObject.diagramObjectPoints[0];
+            const secondDiagramObjectPoint = terminalDiagramObject.diagramObjectPoints[1];
+            if (firstDiagramObjectPoint.xPosition === secondDiagramObjectPoint.xPosition
+                && firstDiagramObjectPoint.yPosition === secondDiagramObjectPoint.yPosition) {
+                const v1 = [firstDiagramObjectPoint.xPosition, firstDiagramObjectPoint.yPosition];
+                const v2 = [transformerDiagramObject.diagramObjectPoints[0].xPosition, transformerDiagramObject.diagramObjectPoints[0].yPosition];
+                const v = [v2[0] - v1[0], v2[1] - v1[1]];
+                const lengthOfV = util_functions_1.DLUtilFunctions.euclideanMetric(v2, v1);
+                util_functions_1.DLUtilFunctions.inplaceNormalize(v);
+                firstDiagramObjectPoint.xPosition += v[0] * (lengthOfV * 0.3);
+                firstDiagramObjectPoint.yPosition += v[1] * (lengthOfV * 0.3);
+            }
+        }
+    }
     createTerminalDiagramObjectFromPoints(args) {
         if (args.points) {
             const terminalDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoints([...args.points], null);
@@ -3555,6 +3621,14 @@ class DLConverterI7 {
             return terminalDiagramObject;
         }
     }
+    alreadyExported(variantenNr, netzId) {
+        if (variantenNr in this.exportedDiagramObjectsGraph) {
+            if (netzId in this.exportedDiagramObjectsGraph[variantenNr]) {
+                return this.exportedDiagramObjectsGraph[variantenNr][netzId] !== undefined;
+            }
+        }
+        return false;
+    }
 }
 exports.DLConverterI7 = DLConverterI7;
 DLConverterI7.testmode = false;