From df75eb1b980c0597cfde776df94382b4e2b1a5f6 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Fri, 8 Apr 2016 11:55:09 +0200 Subject: [PATCH] New maps in progress... (Arrows order implemented) --- .../javascript/map/NetworkmapController.js | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/javascript/map/NetworkmapController.js b/pandora_console/include/javascript/map/NetworkmapController.js index 39f4d3bb28..3aca798e04 100644 --- a/pandora_console/include/javascript/map/NetworkmapController.js +++ b/pandora_console/include/javascript/map/NetworkmapController.js @@ -72,13 +72,37 @@ NetworkmapController.prototype.init_map = function() { } }); - var new_clean_arrows = []; clean_arrows.forEach(function(arrow, index) { - console.log(arrow); for (var i = index + 1; i < clean_arrows.length; i++) { - + if (((arrow['to']['graph_id'] == clean_arrows[i]['to']['graph_id']) && + (arrow['from']['graph_id'] == clean_arrows[i]['from']['graph_id'])) || + ((arrow['to']['graph_id'] == clean_arrows[i]['from']['graph_id']) && + (arrow['from']['graph_id'] == clean_arrows[i]['to']['graph_id']))) { + if (arrow['type'] == 'AMMA') { + delete clean_arrows[i]; + } + else if (clean_arrows[i]['type'] == 'AMMA') { + delete clean_arrows[index]; + } + else if (arrow['type'] == 'AMA') { + delete clean_arrows[i]; + } + else if (clean_arrows[i]['type'] == 'AMA') { + delete clean_arrows[index]; + } + else { + delete clean_arrows[i]; + } + } } }); + var new_clean_arrows = []; + var j = 0; + clean_arrows.forEach(function(arrow, index) { + new_clean_arrows[j] = arrow; + j++; + }); + clean_arrows = new_clean_arrows; MapController.prototype.update_edges_from_clean_arrows(clean_arrows);