Merge branch 'master' of github.com:tech-server/tgmanage

1 files changed, 123 insertions, 55 deletions

diff --git a/web/nms.gathering.org/js/nms-map.js b/web/nms.gathering.org/js/nms-map.js
index 9bba1bf..c64a387 100644
--- a/web/nms.gathering.org/js/nms-map.js
+++ b/web/nms.gathering.org/js/nms-map.js
@@ -10,7 +10,8 @@
  * nmsMap.setSwitchColor(switch,color)
  * nmsMap.setSwitchInfo(switch,info)
  * nmsMap.setSwitchHighlight(switch,true/false)
- * nmsMap.removeAllSwitchHighlights()
+ * nmsMap.enableHighlights()
+ * nmsMap.disableHighlights()
  */
 
 
@@ -46,21 +47,24 @@ var nmsMap = nmsMap || {
 	},
 
 	_color: { },
+	_linknets: {} ,
 	_highlight: { },
+	_highlightActive: false,
 	_c: {}
-}
+};
 
 nmsMap._loadEvent = function(e) {
 	nmsMap._init = false;
 	nmsMap._drawAllSwitches();
-}
+};
+
 nmsMap.init = function() {
 	this._initContexts();
 	this._init = true;
 	nmsData.addHandler("switches","nmsMap",function(){nmsMap._resizeEvent();});
 	window.addEventListener('resize',nmsMap._resizeEvent,true);
-	document.addEventListener('load',nmsMap._loadEvent,true);
-}
+	window.addEventListener('load',nmsMap._loadEvent,true);
+};
 
 nmsMap.setSwitchColor = function(sw, color) {
 	if (this._color[sw] != color) {
@@ -70,22 +74,30 @@ nmsMap.setSwitchColor = function(sw, color) {
 	} else {
 		this.stats.colorSame++;
 	}
-}
+};
+
 
 nmsMap.setSwitchHighlight = function(sw, highlight) {
-	if(highlight)
-		highlight == true;
-	if (this._highlight[sw] != highlight) {
-		this._highlight[sw] = highlight;
-		this._drawSwitch(sw);
-		this.stats.highlightChange++;
-	}
-}
+    if( highlight )
+        highlight = true;
+    if ( this._highlight[sw] != highlight ) {
+        this.stats.highlightChange++;
+        this._highlight[sw] = highlight;
+    }
+    this._drawSwitch(sw);
+};
+
+
+nmsMap.enableHighlights = function() {
+    this._highlightActive = true;
+};
+
+
+nmsMap.disableHighlights = function() {
+    this._highlightActive = false;
+    this._drawAllSwitches();
+};
 
-nmsMap.removeAllSwitchHighlights = function() {
-	for(var sw in this._highlight)
-		this.setSwitchHighlight(sw,false);
-}
 
 nmsMap.reset = function() {
 	for (var sw in this._color) {
@@ -94,7 +106,7 @@ nmsMap.reset = function() {
 	for (var sw in this._info) {
 		nmsMap.setSwitchInfo(sw, undefined);
 	}
-}
+};
 
 nmsMap.setSwitchInfo = function(sw,info) {
 	if (this._info[sw] != info) {
@@ -104,19 +116,19 @@ nmsMap.setSwitchInfo = function(sw,info) {
 	} else {
 		this.stats.switchInfoSame++;
 	}
-}
+};
 
 nmsMap._initContext = function(name) {
 	this._c[name] = {};
 	this._c[name].c = document.getElementById(name + "Canvas");
 	this._c[name].ctx = this._c[name].c.getContext('2d');
-}
+};
 
 nmsMap._initContexts = function() {
 	for (var context in this.contexts) {
 		this._initContext(this.contexts[context]);
 	}
-}
+};
 
 nmsMap._resizeEvent = function() {
 	var width = window.innerWidth - nmsMap._c.bg.c.offsetLeft;
@@ -138,16 +150,19 @@ nmsMap._resizeEvent = function() {
 			continue;
 		nmsMap._c[a].c.height = nmsMap._canvas.height;
 		nmsMap._c[a].c.width = nmsMap._canvas.width;
+    if(a == 'bg') {
+      nmsMap._drawBG();
+    }
 	}
 	if (nmsMap._init != true) {
-		console.log("Drawing shit");
 		nmsMap._blurDrawn = false;
 		nmsMap._drawBG();
 		nmsMap._drawAllSwitches();
+		nmsMap._drawAllLinknets();
 		nmsMap.drawNow();
 		nmsMap.stats.resizeEvents++;
 	}
-}
+};
 
 /*
  * Draw current time-window
@@ -157,10 +172,16 @@ nmsMap._resizeEvent = function() {
  *
  * FIXME: 2: Should really just use _drawText() instead somehow. Font size
  * being an issue.
+ *
+ * FIXME 3: Currently assuming that time from api is UTC and converting to
+ * local time zone with js. Should find a more robust solution.
+ *
  */
 nmsMap.drawNow = function ()
 {
 	var now = nmsData.now;
+	now = new Date(nmsData.now); //Date assumes UTC
+	now = now.toString().split(' ').splice(1,4).join(' '); //Date returns local time
 	if (nmsMap._lastNow == now) {
 		nmsMap.stats.nowDups++;
 		return;
@@ -175,10 +196,10 @@ nmsMap.drawNow = function ()
 	ctx.fillStyle = "white";
 	ctx.strokeStyle = "black";
 	ctx.lineWidth = nms.fontLineFactor;
-	ctx.strokeText(now, 0 + this._settings.textMargin, 25);
-	ctx.fillText(now, 0 + this._settings.textMargin, 25);
+	ctx.strokeText(now, this._settings.textMargin, 25);
+	ctx.fillText(now, this._settings.textMargin, 25);
 	ctx.restore();
-}
+};
 
 nmsMap.setNightMode = function(toggle) {
 	if (this._nightmode == toggle)
@@ -194,14 +215,14 @@ nmsMap.setNightMode = function(toggle) {
 		this._c.blur.c.style.display = "";
 	}
 	nmsMap._drawBG();
-}
+};
 
 nmsMap._drawBG = function() {
 	var imageObj = document.getElementById('source');
 	this._c.bg.ctx.drawImage(imageObj, 0, 0, nmsMap._canvas.width, nmsMap._canvas.height);
 	if(this._nightmode)
 		nmsMap._invertBG();
-}
+};
 
 nmsMap._invertBG = function() {
 	var imageData = this._c.bg.ctx.getImageData(0, 0, nmsMap._canvas.width, nmsMap._canvas.height);
@@ -213,7 +234,7 @@ nmsMap._invertBG = function() {
 		data[i + 2] = 255 - data[i + 2];
 	}
 	this._c.bg.ctx.putImageData(imageData, 0, 0);
-}
+};
 
 nmsMap._getBox = function(sw) {
 	var box = nmsData.switches.switches[sw]['placement'];
@@ -222,7 +243,7 @@ nmsMap._getBox = function(sw) {
 	box.width = parseInt(box.width);
 	box.height = parseInt(box.height);
 	return box;
-}
+};
 
 nmsMap._drawSwitchBlur = function(sw)
 {
@@ -233,10 +254,11 @@ nmsMap._drawSwitchBlur = function(sw)
 	this._c.blur.ctx.fillStyle = "red";
 	this._c.blur.ctx.shadowBlur = 30;
 	this._c.blur.ctx.shadowColor = "white";
-	this._c.blur.ctx.scale(this.scale, this.scale); // FIXME
+	this._c.blur.ctx.scale(this.scale, this.scale); // FIXME <- fix what?!
 	this._c.blur.ctx.fillRect(box['x'],box['y'],box['width'],box['height']);
 	this._c.blur.ctx.restore();
-}
+};
+
 nmsMap._drawSwitch = function(sw)
 {
 	// XXX: If a handler sets a color before switches are loaded... The
@@ -245,8 +267,12 @@ nmsMap._drawSwitch = function(sw)
 		return;
 	var box = this._getBox(sw);
 	var color = nmsMap._color[sw];
-	if(nmsMap._highlight[sw]) {
-		color = red;
+	if(this._highlightActive) {
+		if(nmsMap._highlight[sw]) {
+			color = green;
+		} else {
+			color = white;
+		}
 	}
 	if (color == undefined) {
 		color = blue;
@@ -255,7 +281,10 @@ nmsMap._drawSwitch = function(sw)
 	this._drawBox(this._c.switch.ctx, box['x'],box['y'],box['width'],box['height']);
 	this._c.switch.ctx.shadowBlur = 0;
 	this._drawText(this._c.text.ctx, sw,box);
-}
+
+	if(this._info[sw])
+		this._drawSwitchInfo(sw);
+};
 
 nmsMap._drawSwitchInfo = function(sw) {
 	var box = this._getBox(sw);
@@ -264,14 +293,14 @@ nmsMap._drawSwitchInfo = function(sw) {
 	} else {
 		this._drawText(this._c.textInfo.ctx, this._info[sw], box, "right");
 	}
-}
+};
 
 nmsMap._clearBox = function(ctx,box) {
 	ctx.save();
 	ctx.scale(this.scale,this.scale);
 	ctx.clearRect(box['x'], box['y'], box['width'], box['height']);
 	ctx.restore();
-}
+};
 
 nmsMap._drawText = function(ctx, text, box, align) {
 	var rotate = false;
@@ -307,8 +336,42 @@ nmsMap._drawText = function(ctx, text, box, align) {
 	ctx.strokeText(text, 0, 0);
 	ctx.fillText(text, 0, 0);
 	ctx.restore();
-}
+};
 
+nmsMap._setLinknetColor = function(l, color1, color2)
+{
+	var oldcolor1;
+	var oldcolor2;
+	try {
+		oldcolor1 = nmsMap._linknets[l].sysname1;
+		oldcolor2 = nmsMap._linknets[l].sysname2;
+		if (oldcolor1 == color1 && oldcolor2 == color2) {
+			return ;
+		}
+	} catch (e) {}
+	nmsMap._linknets[l] = {};
+	nmsMap._linknets[l].sysname1 = color1;
+	nmsMap._linknets[l].sysname2 = color2;
+	nmsMap._drawLinknet(l)
+}
+
+nmsMap._drawLinknet = function(l) {
+	try {
+		var color1 = blue;
+		var color2 = blue;
+		try {
+			color1 = nmsMap._linknets[l].sysname1;
+			color2 = nmsMap._linknets[l].sysname2;
+		} catch(e) { }
+		nmsMap._connectSwitches(nmsData.switches.linknets[l].sysname1, nmsData.switches.linknets[l].sysname2, color1, color2);
+	} catch(e) { }
+}
+
+nmsMap._drawAllLinknets = function() {
+	for (var l in nmsData.switches.linknets) {
+		nmsMap._drawLinknet(l);
+	}
+}
 nmsMap._drawAllSwitches = function() {
 	if (nmsData.switches == undefined) {
 		this.stats.earlyDrawAll++;
@@ -319,7 +382,7 @@ nmsMap._drawAllSwitches = function() {
 	}
 	if (this._nightmode)
 		this._drawAllBlur();
-}
+};
 
 nmsMap._drawAllBlur = function() {
 	if (nmsMap._blurDrawn == true)
@@ -328,22 +391,22 @@ nmsMap._drawAllBlur = function() {
 	for (var sw in nmsData.switches.switches) {
 		nmsMap._drawSwitchBlur(sw);
 	}
-}
+};
 
 nmsMap._drawBox = function(ctx, x, y, boxw, boxh) {
 	ctx.save();
-	ctx.scale(this.scale, this.scale); // FIXME
+	ctx.scale(this.scale, this.scale); // FIXME <- what?!
 	ctx.fillRect(x,y, boxw, boxh);
 	ctx.lineWidth = 1;
 	ctx.strokeStyle = "#000000";
 	ctx.strokeRect(x,y, boxw, boxh);
 	ctx.restore();
-}
+};
 
 nmsMap._connectSwitches = function(sw1, sw2, color1, color2) {
 	nmsMap._connectBoxes(this._getBox(sw1), this._getBox(sw2),
 			     color1, color2);
-}
+};
 
 /*
  * Draw a line between two boxes, with a gradient going from color1 to
@@ -365,18 +428,20 @@ nmsMap._connectBoxes = function(box1, box2,color1, color2) {
 	gradient.addColorStop(0, color1);
 	gradient.addColorStop(1, color2);
 	ctx.strokeStyle = gradient;
+	ctx.beginPath();
 	ctx.moveTo(x0,y0);
 	ctx.lineTo(x1,y1); 
 	ctx.lineWidth = 5;
 	ctx.stroke();
+	ctx.closePath();
 	ctx.restore();
-}
+};
 
 nmsMap.moveSet = function(toggle) {
 	nmsMap._moveInProgress = toggle;
 	if (!toggle)
 		nmsMap._moveStopListen();
-}
+};
 
 /*
  * onclick handler for the canvas.
@@ -392,8 +457,10 @@ nmsMap.canvasClick = function(e)
 		} else {
 			nmsInfoBox.click(sw);
 		}
+	} else {
+		nmsInfoBox.hide();
 	}
-}
+};
 
 nmsMap._clearOld = function(box) {
 	if (box) {
@@ -403,7 +470,7 @@ nmsMap._clearOld = function(box) {
 		nmsMap._c.top.ctx.clearRect(box['x'] - 5, box['y'] - 5, box['width'] + 10, box['height'] + 10);
 		nmsMap._c.top.ctx.restore();
 	}
-}
+};
 
 nmsMap._moveMove = function(e) {
 	nmsMap._moveX = (e.pageX - e.target.offsetLeft) / nmsMap.scale;
@@ -421,28 +488,29 @@ nmsMap._moveMove = function(e) {
 	nmsMap._c.top.ctx.fillStyle = "red";
 	nmsMap._drawBox(nmsMap._c.top.ctx, box['x'], box['y'], box['width'], box['height']);
 	nmsMap._c.top.ctx.restore();
-}
+};
 
 nmsMap._moveSubmit = function() {
 	var data = {
 		sysname: nmsMap._moving,
 		placement: nmsMap._moveOldBox
-	}
+	};
 	var myData = JSON.stringify([data]);
 	$.ajax({
 		type: "POST",
-		url: "/api/private/switch-add",
+		url: "/api/write/switch-update",
 		dataType: "text",
 		data:myData,
 		success: function (data, textStatus, jqXHR) {
 			nmsData.invalidate("switches");
 		}
 	});
-}
+};
+
 nmsMap._moveStopListen = function() {
 	nmsMap._c.input.c.removeEventListener('mousemove',nmsMap._moveMove, true);
 	nmsMap._c.input.c.removeEventListener('mouseup',nmsMap._moveDone, true);
-}
+};
 
 nmsMap._moveDone = function(e) {
 	nmsMap._moveStopListen();
@@ -451,7 +519,7 @@ nmsMap._moveDone = function(e) {
 	}
 	nmsMap._moveSubmit();
 	nmsMap._clearOld(nmsMap._moveOldBox);
-}
+};
 
 nmsMap._moveStart = function(sw, e)
 {
@@ -462,7 +530,7 @@ nmsMap._moveStart = function(sw, e)
 	nmsMap._moveBox = nmsData.switches.switches[sw].placement;
 	nmsMap._c.input.c.addEventListener('mousemove',nmsMap._moveMove,true);
 	nmsMap._c.input.c.addEventListener('mouseup',nmsMap._moveDone,true);
-}
+};
 
 
 /*