Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/freifunk: simplify colors in map, add a legend

Browse source
This commit is contained in:
Manuel Munz 2012-11-30 23:55:35 +00:00
parent 89b3e2ad7f
commit cad7245af2
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/freifunk/luasrc/view/freifunk-map/frame.htm
View file

@ -12,10 +12,18 @@
<% if has_latlon then %>
<iframe style="width:100%; height:640px; border:none" src="<%=luci.dispatcher.build_url("freifunk/map/content")%>"></iframe>
<h3><%:Legend%>:</h3>
<ul>
<li><strong><span style="color:#00cc00"><%:Green%></span></strong>:<%:Very good (ETX < 2)%></li>
<li><strong><span style="color:#ffcb05"><%:Yellow%></span></strong>:<%:Good (2 < ETX < 4)%></li>
<li><strong><span style="color:#ff6600"><%:Orange%></span></strong>:<%:Still usable (4 < ETX < 10)%></li>
<li><strong><span style="color:#bb3333"><%:Red%></span></strong>:<%:Bad (ETX > 10)%></li>
</ul>
<% else %>
<h2><%:Map Error%></h2>
<p><%_The OLSRd service is not configured to capture position data from the network.<br />
Please make sure that the nameservice plugin is properly configured and that the <em>latlon_file</em> option is enabled.%></p>
<% end %>
<%+footer%>

19
modules/freifunk/luasrc/view/freifunk-map/map.htm
View file

@ -43,11 +43,22 @@
if (null != alias[fromip]) fromip = alias[fromip];
if (null != points[fromip] && null != points[toip])
{
var w = 1;
if (etx < 4) w++;
if (etx < 2) w++;
var color;
var red = 240;
var green = 0;
var blue = 0;
var w = 1
if (etx < 100) {red=252;green=102;blue=0;w=2};
if (etx < 10) {red=255;green=203;blue=5;w=3};
if (etx < 4) {red=240;green=255;blue=0;w=4};
if (etx < 2) {red=0;green=204;blue=0;w=5};
if (etx < 1) {red=80;green=0;blue=0;w=1};
map.AddPolyline(new VEPolyline('id'+lineid, [points[fromip], points[toip]],
new VEColor(102,Math.floor(lq*255.0),Math.floor(nlq*255.0),1.0), w));
new VEColor(red, green, blue, 0.5), w));
}
else
{