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

[BUGFIX] Select correct goto link

Browse Source
This commit is contained in:
Geno 2017-11-01 11:43:20 +01:00 committed by Xaver Maierhofer
parent 1ec81fd45c
commit 9f95fa9c95
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/forcegraph.js
View File

@ -242,12 +242,9 @@ define(['d3-selection', 'd3-force', 'd3-zoom', 'd3-drag', 'd3-timer', 'd3-ease',
self.gotoNode = function gotoNode(d) { self.gotoNode = function gotoNode(d) {
moveTo(function calcToNode() { moveTo(function calcToNode() {
for (var i = 0; i < intNodes.length; i++) { draw.setHighlight({ type: 'node', id: d.node_id });
var n = intNodes[i]; var n = dictNodes[d.node_id];
if (n.o.node_id !== d.node_id) { if (n) {
continue;
}
draw.setHighlight({ type: 'node', o: n.o });
return [n.x, n.y, (ZOOM_MAX + 1) / 2]; return [n.x, n.y, (ZOOM_MAX + 1) / 2];
} }
return [0, 0, (ZOOM_MIN + 1) / 2]; return [0, 0, (ZOOM_MIN + 1) / 2];
@ -256,9 +253,11 @@ define(['d3-selection', 'd3-force', 'd3-zoom', 'd3-drag', 'd3-timer', 'd3-ease',
self.gotoLink = function gotoLink(d) { self.gotoLink = function gotoLink(d) {
moveTo(function calcToLink() { moveTo(function calcToLink() {
draw.setHighlight({ type: 'link', o: d }); draw.setHighlight({ type: 'link', id: d.id });
for (var i = 0; i < intLinks.length; i++) { var l = intLinks.find(function (link) {
var l = intLinks[i]; return link.o.id === d.id;
});
if (l) {
return [(l.source.x + l.target.x) / 2, (l.source.y + l.target.y) / 2, (ZOOM_MAX / 2) + ZOOM_MIN]; return [(l.source.x + l.target.x) / 2, (l.source.y + l.target.y) / 2, (ZOOM_MAX / 2) + ZOOM_MIN];
} }
return [0, 0, (ZOOM_MIN + 1) / 2]; return [0, 0, (ZOOM_MIN + 1) / 2];

4
lib/forcegraph/draw.js
View File

@ -32,7 +32,7 @@ define(['helper'], function (helper) {
} }
function drawHighlightNode(d) { function drawHighlightNode(d) {
if (highlight && highlight.type === 'node' && d.o.node_id === highlight.o.node_id) { if (highlight && highlight.type === 'node' && d.o.node_id === highlight.id) {
ctx.arc(d.x, d.y, NODE_RADIUS * 1.5, 0, 2 * Math.PI); ctx.arc(d.x, d.y, NODE_RADIUS * 1.5, 0, 2 * Math.PI);
ctx.fillStyle = highlightColor; ctx.fillStyle = highlightColor;
ctx.fill(); ctx.fill();
@ -41,7 +41,7 @@ define(['helper'], function (helper) {
} }
function drawHighlightLink(d, to) { function drawHighlightLink(d, to) {
if (highlight && highlight.type === 'link' && d.o.id === highlight.o.id) { if (highlight && highlight.type === 'link' && d.o.id === highlight.id) {
ctx.lineTo(to[0], to[1]); ctx.lineTo(to[0], to[1]);
ctx.strokeStyle = highlightColor; ctx.strokeStyle = highlightColor;
ctx.lineWidth = LINE_RADIUS * 2; ctx.lineWidth = LINE_RADIUS * 2;