Freifunk-Troisdorf/meshviewer
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TASK] CGL - Optimize returns and unnecessary math

Browse Source
This commit is contained in:
Xaver Maierhofer 2016-05-22 23:32:05 +02:00
parent f716966eaa
commit aa9416ed9b
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/forcegraph.js
View File

@ -271,8 +271,7 @@ define(["d3"], function (d3) {
function drawNode(color, radius, scale, r) { function drawNode(color, radius, scale, r) {
var node = document.createElement("canvas"); var node = document.createElement("canvas");
node.width = scale * radius * 8 * r; node.height = node.width = scale * radius * 8 * r;
node.height = node.width;
var nctx = node.getContext("2d"); var nctx = node.getContext("2d");
nctx.scale(scale * r, scale * r); nctx.scale(scale * r, scale * r);
@ -286,12 +285,12 @@ define(["d3"], function (d3) {
nctx.arc(0, 0, radius, 0, 2 * Math.PI); nctx.arc(0, 0, radius, 0, 2 * Math.PI);
nctx.strokeStyle = "rgba(255, 0, 0, 1)"; 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.shadowOffsetY = node.height * 1.5 + 3;
nctx.shadowBlur = 12; nctx.shadowBlur = 12;
nctx.shadowColor = "rgba(0, 0, 0, 0.16)"; nctx.shadowColor = "rgba(0, 0, 0, 0.16)";
nctx.stroke(); nctx.stroke();
nctx.shadowOffsetX = node.width * 1.5 + 0; nctx.shadowOffsetX = node.width * 1.5;
nctx.shadowOffsetY = node.height * 1.5 + 3; nctx.shadowOffsetY = node.height * 1.5 + 3;
nctx.shadowBlur = 12; nctx.shadowBlur = 12;
nctx.shadowColor = "rgba(0, 0, 0, 0.23)"; nctx.shadowColor = "rgba(0, 0, 0, 0.23)";
@ -554,7 +553,6 @@ define(["d3"], function (d3) {
if (links.length > 0) { if (links.length > 0) {
router.link(links[0].o)(); router.link(links[0].o)();
return;
} }
} }

4
lib/map.js
View File

@ -135,7 +135,7 @@ define(["map/clientlayer", "map/labelslayer",
return "distance" in d && d.type !== "VPN"; return "distance" in d && d.type !== "VPN";
}); });
var lines = graph.map(function (d) { return graph.map(function (d) {
var opts = { var opts = {
color: d.type === "Kabel" ? "#50B0F0" : linkScale(d.tq).hex(), color: d.type === "Kabel" ? "#50B0F0" : linkScale(d.tq).hex(),
weight: 4, weight: 4,
@ -156,8 +156,6 @@ define(["map/clientlayer", "map/labelslayer",
return line; return line;
}); });
return lines;
} }
var iconOnline = {color: "#1566A9", fillColor: "#1566A9", radius: 6, fillOpacity: 0.5, opacity: 0.5, weight: 2, className: "stroke-first"}; var iconOnline = {color: "#1566A9", fillColor: "#1566A9", radius: 6, fillOpacity: 0.5, opacity: 0.5, weight: 2, className: "stroke-first"};

4
lib/map/labelslayer.js
View File

@ -73,7 +73,7 @@ define(["leaflet", "rbush"],
return [x, y, x + width, y + height]; return [x, y, x + width, y + height];
} }
var c = L.TileLayer.Canvas.extend({ return L.TileLayer.Canvas.extend({
onAdd: function (map) { onAdd: function (map) {
L.TileLayer.Canvas.prototype.onAdd.call(this, map); L.TileLayer.Canvas.prototype.onAdd.call(this, map);
if (this.data) { if (this.data) {
@ -235,6 +235,4 @@ define(["leaflet", "rbush"],
}).forEach(drawLabel); }).forEach(drawLabel);
} }
}); });
return c;
}); });