freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[TASK] Adjust marker style - focus on online nodes

Browse source
This commit is contained in:
Xaver Maierhofer 2016-05-25 22:52:29 +02:00 committed by Milan Paessler
parent f1e9aacdf7
commit 41c6a03e6b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/map.js
View file

@ -179,7 +179,7 @@ define(["map/clientlayer", "map/labelslayer",
var iconLost = { var iconLost = {
color: "#D43E2A", color: "#D43E2A",
fillColor: "#D43E2A", fillColor: "#D43E2A",
radius: 6, radius: 4,
fillOpacity: 0.8, fillOpacity: 0.8,
opacity: 0.8, opacity: 0.8,
weight: 1, weight: 1,
@ -188,11 +188,11 @@ define(["map/clientlayer", "map/labelslayer",
var iconAlert = { var iconAlert = {
color: "#D43E2A", color: "#D43E2A",
fillColor: "#D43E2A", fillColor: "#D43E2A",
radius: 6, radius: 5,
fillOpacity: 0.8, fillOpacity: 0.8,
opacity: 0.8, opacity: 0.8,
weight: 2, weight: 2,
className: "stroke-first node-alert" className: "stroke-first"
}; };
var iconNew = {color: "#1566A9", fillColor: "#93E929", radius: 6, fillOpacity: 1.0, opacity: 0.5, weight: 2}; var iconNew = {color: "#1566A9", fillColor: "#93E929", radius: 6, fillOpacity: 1.0, opacity: 0.5, weight: 2};
@ -443,7 +443,7 @@ define(["map/clientlayer", "map/labelslayer",
m = linkDict[highlight.o.id]; m = linkDict[highlight.o.id];
if (m) { if (m) {
m.setStyle({weight: 7, opacity: 1, dashArray: "10, 10"}); m.setStyle({weight: 4, opacity: 1, dashArray: "5, 10"});
} }
} }
} }
@ -560,12 +560,14 @@ define(["map/clientlayer", "map/labelslayer",
return iconAlert; return iconAlert;
} }
return iconLost; if (d.lastseen.isAfter(moment(data.now).subtract(14, "days"))) {
return iconLost;
}
}, router)); }, router));
groupOffline = L.featureGroup(markersOffline).addTo(map); groupOffline = L.featureGroup(markersOffline).addTo(map);
groupOnline = L.featureGroup(markersOnline).addTo(map);
groupLost = L.featureGroup(markersLost).addTo(map); groupLost = L.featureGroup(markersLost).addTo(map);
groupOnline = L.featureGroup(markersOnline).addTo(map);
groupNew = L.featureGroup(markersNew).addTo(map); groupNew = L.featureGroup(markersNew).addTo(map);
var rtreeOnlineAll = rbush(9); var rtreeOnlineAll = rbush(9);