From 6ee0d02b7bd7c8cb511991d99a2c7f557b2cff8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 18 Feb 2016 19:42:46 +0000 Subject: [PATCH] cleanup and fix things --- lib/forcegraph.js | 4 ++-- lib/map.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/forcegraph.js b/lib/forcegraph.js index cc8d222..2cf49f3 100644 --- a/lib/forcegraph.js +++ b/lib/forcegraph.js @@ -213,7 +213,7 @@ define(["d3"], function (d3) { function drawLabel(d) { var neighbours = d.neighbours.filter(function (d) { - return !d.link.o.type === "VPN" + return d.link.o.type !== "VPN" }) var sum = neighbours.reduce(function (a, b) { @@ -516,7 +516,7 @@ define(["d3"], function (d3) { } var links = intLinks.filter(function (d) { - return !d.o.type === "VPN" + return d.o.type !== "VPN" }).filter(function (d) { return distanceLink(e, d.source, d.target) < LINE_RADIUS }) diff --git a/lib/map.js b/lib/map.js index 0218db4..e8e9743 100644 --- a/lib/map.js +++ b/lib/map.js @@ -129,7 +129,7 @@ define(["map/clientlayer", "map/labelslayer", function addLinksToMap(dict, linkScale, graph, router) { graph = graph.filter( function (d) { - return "distance" in d && !d.type === "VPN" + return "distance" in d && d.type !== "Kabel" && d.type !== "VPN" }) var lines = graph.map( function (d) {