From 166cad518a95698d1425d261325b4cd52609a93b Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sun, 29 Apr 2018 15:33:31 +0200
Subject: [PATCH] map/router.html: Indicate ethernet mesh connections by color

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 ffmap/mapnik/routers.xml    |  4 ++++
 ffmap/mapnik/routers_v2.xml |  4 ++++
 ffmap/maptools.py           |  9 +++++++++
 ffmap/misc.py               | 18 +++++++++---------
 ffmap/web/api.py            |  2 +-
 ffmap/web/application.py    |  2 +-
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/ffmap/mapnik/routers.xml b/ffmap/mapnik/routers.xml
index 4c4dfe3..e44c4d4 100644
--- a/ffmap/mapnik/routers.xml
+++ b/ffmap/mapnik/routers.xml
@@ -23,6 +23,10 @@
 	</Rule>
   </Style>
   <Style name="color" filter-mode="first">
+	<Rule>
+	  <Filter>([quality] &lt; 1)</Filter>
+	  <LineSymbolizer stroke-width="3" stroke="#008c00" stroke-linecap="butt" clip="false" />
+	</Rule>
 	<Rule>
 	  <Filter>([quality] &lt; 105)</Filter>
 	  <LineSymbolizer stroke-width="3" stroke="#ff1e1e" stroke-linecap="butt" clip="false" />
diff --git a/ffmap/mapnik/routers_v2.xml b/ffmap/mapnik/routers_v2.xml
index 571c401..506505a 100644
--- a/ffmap/mapnik/routers_v2.xml
+++ b/ffmap/mapnik/routers_v2.xml
@@ -23,6 +23,10 @@
 	</Rule>
   </Style>
   <Style name="color" filter-mode="first">
+	<Rule>
+	  <Filter>([quality] &lt; 1)</Filter>
+	  <LineSymbolizer stroke-width="3" stroke="#008c00" stroke-linecap="butt" clip="false" />
+	</Rule>
 	<Rule>
 	  <Filter>([quality] &lt; 105)</Filter>
 	  <LineSymbolizer stroke-width="3" stroke="#ff1e1e" stroke-linecap="butt" clip="false" />
diff --git a/ffmap/maptools.py b/ffmap/maptools.py
index 8b9a633..eb9a8a1 100644
--- a/ffmap/maptools.py
+++ b/ffmap/maptools.py
@@ -137,14 +137,23 @@ def update_mapnik_csv(mysql):
 		else:
 			# Check for duplicate
 			if row["nid"] in dictl2.keys() and row["rid"] in dictl2[row["nid"]].keys():
+				# Check for ethernet (ethernet always wins)
+				if dictl2[row["nid"]][row["rid"]]["data"][4] == 0:
+					continue
 				row["quality"] = int(0.5 * (dictl2[row["nid"]][row["rid"]]["data"][4] + row["quality"]))
 				del dictl2[row["nid"]][row["rid"]] # Delete old entry, as we create a new one with averaged quality
 			if row["rid"] in dictl2.keys() and row["nid"] in dictl2[row["rid"]].keys():
+				# Check for ethernet (ethernet always wins)
+				if dictl2[row["rid"]][row["nid"]]["data"][4] == 0:
+					continue
 				row["quality"] = int(0.5 * (dictl2[row["rid"]][row["nid"]]["data"][4] + row["quality"]))
 				# No need to delete, since we overwrite later
 			# Write current set to dict
 			if not row["rid"] in dictl2.keys():
 				dictl2[row["rid"]] = {}
+			# Check for ethernet
+			if row["netif"].startswith("eth"):
+				row["quality"] = 0
 			
 			tmp = (
 				row["rlng"],
diff --git a/ffmap/misc.py b/ffmap/misc.py
index a999e7d..a395d3f 100644
--- a/ffmap/misc.py
+++ b/ffmap/misc.py
@@ -16,12 +16,10 @@ def writefulllog(content):
 	with open(CONFIG["debug_dir"] + "/fulllog.log", "a") as csv:
 		csv.write(time.strftime('{%Y-%m-%d %H:%M:%S}') + " - " + content + "\n")
 
-def neighbor_color(quality,rt_protocol):
+def neighbor_color(quality,netif,rt_protocol):
+	color = "#04ff0a"
 	if rt_protocol=="BATMAN_V":
-		color = "#04ff0a"
-		if quality < 0:
-			color = "#06a4f4"
-		elif quality < 10:
+		if quality < 10:
 			color = "#ff1e1e"
 		elif quality < 20:
 			color = "#ff4949"
@@ -32,10 +30,7 @@ def neighbor_color(quality,rt_protocol):
 		elif quality < 1000:
 			color = "#ffeb79"
 	else:
-		color = "#04ff0a"
-		if quality < 0:
-			color = "#06a4f4"
-		elif quality < 105:
+		if quality < 105:
 			color = "#ff1e1e"
 		elif quality < 130:
 			color = "#ff4949"
@@ -47,6 +42,11 @@ def neighbor_color(quality,rt_protocol):
 			color = "#ffeb79"
 		elif quality < 230:
 			color = "#79ff7c"
+	if netif.startswith("eth"):
+		#color = "#999999"
+		color = "#008c00"
+	if quality < 0:
+		color = "#06a4f4"
 	return color
 
 def defrag_table(mysql,table,sleep):
diff --git a/ffmap/web/api.py b/ffmap/web/api.py
index 4b1508f..3cacd72 100755
--- a/ffmap/web/api.py
+++ b/ffmap/web/api.py
@@ -105,7 +105,7 @@ def get_nearest_router():
 		WHERE nb.router = %s""",(router["id"],))
 	mysql.close()
 	for n in router["neighbours"]:
-		n["color"] = neighbor_color(n["quality"],router["routing_protocol"])
+		n["color"] = neighbor_color(n["quality"],n["netif"],router["routing_protocol"])
 	
 	r = make_response(bson2json(router))
 	r.mimetype = 'application/json'
diff --git a/ffmap/web/application.py b/ffmap/web/application.py
index 92b1438..d59672c 100755
--- a/ffmap/web/application.py
+++ b/ffmap/web/application.py
@@ -226,7 +226,7 @@ def router_info(dbid):
 
 			## Set color for neighbors AFTER json if clause
 			for n in router["neighbours"]:
-				n["color"] = neighbor_color(n["quality"],router["routing_protocol"])
+				n["color"] = neighbor_color(n["quality"],n["netif"],router["routing_protocol"])
 
 			router["stats"] = mysql.fetchall("""SELECT * FROM router_stats WHERE router = %s""",(dbid,))
 			for s in router["stats"]: