Bugfix: Edges no longer overlap if two nodes have mutual edges.

Updating package.json and changelog.

Resolves #112

Author: CoderAllan

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## Version 1.3.3
+
+- Bugfix: When edges have the same source and target the edges no longer overlap.
+
 ## Version 1.3.2
 
 - When the mouse pointer is hovering over a node or an edge a popup is shown with various information about the node or edge.

package-lock.json

@@ -4,7 +4,7 @@
   "displayName": "DGMLViewer",
   "description": "DGMLViewer is viewer for dgml (Directed Graph Markup Language) files",
   "icon": "icon.png",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "repository": "https://github.com/CoderAllan/vscode-dgmlviewer",
   "engines": {
     "vscode": "^1.55.0"

package.json

@@ -169,6 +169,11 @@ export class DgmlParser {
           if (newLink.category === undefined) {
             newLink.category = this.createCategoryRef(xmlNode);
           }
+          const mutualLinks = links.filter(l => l.target === newLink.source && l.source === newLink.target);
+          if (mutualLinks.length > 0) {
+            newLink.mutualLinkCount += 1;
+            mutualLinks.forEach(l => l.mutualLinkCount += 1 );
+          }
           links.push(newLink);
         }
       });

src/dgmlParser.ts

@@ -4,6 +4,7 @@ import { BaseElement } from './BaseElement';
 export class Link extends BaseElement {
   public source: string | undefined;
   public target: string | undefined;
+  public mutualLinkCount: number = 1;
   public category: string | undefined;
   // CommonAttributes
   public label: string | undefined;
@@ -42,6 +43,11 @@ export class Link extends BaseElement {
       jsStringProperties.push(`to: "${this.target}"`);
       titleElements.push(`Target: ${this.target}`);
     }
+    if (this.mutualLinkCount > 1) {
+      jsStringProperties.push(`smooth: {type: 'curvedCW', roundness: 0.2}`);
+    } else {
+      jsStringProperties.push(`smooth: false`);
+    }
     if (this.strokeThickness !== undefined) { jsStringProperties.push(`width: ${this.strokeThickness}`); }
     if (this.visibility !== undefined) { jsStringProperties.push(`hidden: ${this.visibility}`); }
     const jsStringColorProperties: string[] = [];

src/model/Link.ts

@@ -24,9 +24,6 @@
     interaction: {
       hover: true
     },
-    edges: {
-      smooth: false // Make edges straight lines.
-    },
     nodes: {
       shape: 'box' // The shape of the nodes.
     },