NMS: Tweak uplink traffic map

2 files changed, 11 insertions, 7 deletions

diff --git a/web/nms.gathering.org/js/nms-map-handlers.js b/web/nms.gathering.org/js/nms-map-handlers.js
index 33e6eb4..868d26d 100644
--- a/web/nms.gathering.org/js/nms-map-handlers.js
+++ b/web/nms.gathering.org/js/nms-map-handlers.js
@@ -152,9 +152,9 @@ function trafficInit()
 	var m = 1024 * 1024 / 8;
 	drawGradient([lightgreen,green,orange,red]);
 	setLegend(1,colorFromSpeed(0),"0 (N/A)");	
-	setLegend(5,colorFromSpeed(2000 * m) , "2000Mb/s");	
-	setLegend(4,colorFromSpeed(1500 * m),"1500Mb/s");	
-	setLegend(3,colorFromSpeed(500 * m),"500Mb/s");	
+	setLegend(5,colorFromSpeed(1100 * m) , "1100Mb/s");	
+	setLegend(4,colorFromSpeed(600 * m),"600Mb/s");	
+	setLegend(3,colorFromSpeed(300 * m),"300Mb/s");	
 	setLegend(2,colorFromSpeed(10 * m),"10Mb/s");	
 }
 
@@ -173,8 +173,10 @@ function trafficUpdater()
 		var tdiff = nt - tt;
 		var diff = n - t;
 		speed = diff / tdiff;
-                if(!isNaN(speed))
+                if(!isNaN(speed)) {
                         nmsMap.setSwitchColor(sw,colorFromSpeed(speed));
+			nmsMap.setSwitchInfo(sw,byteCount(speed*8,0));
+		}
 	}
 }
 
@@ -215,7 +217,7 @@ function colorFromSpeed(speed,factor)
 {
 	var m = 1024 * 1024 / 8;
 	if (factor == undefined)
-		factor = 2;
+		factor = 1.1;
 	if (speed == 0)
 		return blue;
 	speed = speed < 0 ? 0 : speed;
diff --git a/web/nms.gathering.org/js/nms.js b/web/nms.gathering.org/js/nms.js
index 1c750b8..ea440fc 100644
--- a/web/nms.gathering.org/js/nms.js
+++ b/web/nms.gathering.org/js/nms.js
@@ -100,14 +100,16 @@ function nmsTimer(handler, interval, name, description) {
  * Convenience function that doesn't support huge numbers, and it's easier
  * to comment than to fix. But not really, but I'm not fixing it anyway.
  */
-function byteCount(bytes) {
+function byteCount(bytes,precision) {
+	if (precision ==undefined)
+		precision = 1;
 	var units = ['', 'K', 'M', 'G', 'T', 'P'];
 	var i = 0;
 	while (bytes > 1024) {
 		bytes = bytes / 1024;
 		i++;
 	}
-	return bytes.toFixed(1) + units[i];
+	return bytes.toFixed(precision) + units[i];
 }
 
 /*