From aa9416ed9b3b8e1eb26ced8d1aa67b195ca19890 Mon Sep 17 00:00:00 2001
From: Xaver Maierhofer <xaver.maierhofer@xwissen.info>
Date: Sun, 22 May 2016 23:32:05 +0200
Subject: [PATCH] [TASK] CGL - Optimize returns and unnecessary math

---
 lib/forcegraph.js      | 8 +++-----
 lib/map.js             | 4 +---
 lib/map/labelslayer.js | 4 +---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/forcegraph.js b/lib/forcegraph.js
index 3958be8..41c8e69 100644
--- a/lib/forcegraph.js
+++ b/lib/forcegraph.js
@@ -271,8 +271,7 @@ define(["d3"], function (d3) {
 
     function drawNode(color, radius, scale, r) {
       var node = document.createElement("canvas");
-      node.width = scale * radius * 8 * r;
-      node.height = node.width;
+      node.height = node.width = scale * radius * 8 * r;
 
       var nctx = node.getContext("2d");
       nctx.scale(scale * r, scale * r);
@@ -286,12 +285,12 @@ define(["d3"], function (d3) {
       nctx.arc(0, 0, radius, 0, 2 * Math.PI);
 
       nctx.strokeStyle = "rgba(255, 0, 0, 1)";
-      nctx.shadowOffsetX = node.width * 1.5 + 0;
+      nctx.shadowOffsetX = node.width * 1.5;
       nctx.shadowOffsetY = node.height * 1.5 + 3;
       nctx.shadowBlur = 12;
       nctx.shadowColor = "rgba(0, 0, 0, 0.16)";
       nctx.stroke();
-      nctx.shadowOffsetX = node.width * 1.5 + 0;
+      nctx.shadowOffsetX = node.width * 1.5;
       nctx.shadowOffsetY = node.height * 1.5 + 3;
       nctx.shadowBlur = 12;
       nctx.shadowColor = "rgba(0, 0, 0, 0.23)";
@@ -554,7 +553,6 @@ define(["d3"], function (d3) {
 
       if (links.length > 0) {
         router.link(links[0].o)();
-        return;
       }
     }
 
diff --git a/lib/map.js b/lib/map.js
index 6515fd0..8230817 100644
--- a/lib/map.js
+++ b/lib/map.js
@@ -135,7 +135,7 @@ define(["map/clientlayer", "map/labelslayer",
         return "distance" in d && d.type !== "VPN";
       });
 
-      var lines = graph.map(function (d) {
+      return graph.map(function (d) {
         var opts = {
           color: d.type === "Kabel" ? "#50B0F0" : linkScale(d.tq).hex(),
           weight: 4,
@@ -156,8 +156,6 @@ define(["map/clientlayer", "map/labelslayer",
 
         return line;
       });
-
-      return lines;
     }
 
     var iconOnline = {color: "#1566A9", fillColor: "#1566A9", radius: 6, fillOpacity: 0.5, opacity: 0.5, weight: 2, className: "stroke-first"};
diff --git a/lib/map/labelslayer.js b/lib/map/labelslayer.js
index e616877..a6af979 100644
--- a/lib/map/labelslayer.js
+++ b/lib/map/labelslayer.js
@@ -73,7 +73,7 @@ define(["leaflet", "rbush"],
       return [x, y, x + width, y + height];
     }
 
-    var c = L.TileLayer.Canvas.extend({
+    return L.TileLayer.Canvas.extend({
       onAdd: function (map) {
         L.TileLayer.Canvas.prototype.onAdd.call(this, map);
         if (this.data) {
@@ -235,6 +235,4 @@ define(["leaflet", "rbush"],
         }).forEach(drawLabel);
       }
     });
-
-    return c;
   });