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

use circleMarkers again

Browse source
This commit is contained in:
Nils Schneider 2015-03-25 01:27:05 +01:00
commit 090b6c1d79
4 changed files with 5 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/map.js
View file

@ -4,11 +4,7 @@ define(function () {
}
function mkMarker(dict, iconFunc, gotoAnything) {
return function (d) {
var opt = { icon: iconFunc(d),
title: d.nodeinfo.hostname
}
var m = L.marker([d.nodeinfo.location.latitude, d.nodeinfo.location.longitude], opt)
var m = L.circleMarker([d.nodeinfo.location.latitude, d.nodeinfo.location.longitude], iconFunc(d))
m.on('click', gotoAnything.node(d, false))
m.bindPopup(d.nodeinfo.hostname)
@ -42,28 +38,9 @@ define(function () {
return lines
}
var iconBase = { iconUrl: 'img/circlemarker.png',
iconRetinaUrl: 'img/circlemarker@2x.png',
iconSize: [17, 17],
iconAnchor: [8, 8],
popupAnchor: [0, -3]
}
var iconOnline = Object.assign({}, iconBase)
iconOnline.className = "node-online"
iconOnline = L.icon(iconOnline)
var iconOffline = Object.assign({}, iconBase)
iconOffline.className = "node-offline"
iconOffline = L.icon(iconOffline)
var iconNew = Object.assign({}, iconBase)
iconNew.className = "node-new"
iconNew = L.icon(iconNew)
var iconOfflineAlert = Object.assign({}, iconBase)
iconOfflineAlert.className = "node-offline node-alert"
iconOfflineAlert = L.icon(iconOfflineAlert)
var iconOnline = { color: "#1566A9", radius: 6, fillOpacity: 0.5 }
var iconOffline = { color: "#D43E2A", radius: 6, fillOpacity: 0.5 }
var iconNew = { color: "#558020", radius: 6, fillOpacity: 0.5 }
return function (sidebar) {
var self = this
@ -98,10 +75,7 @@ define(function () {
if (d.flags.online)
return iconNew
if (d.lastseen.isAfter(moment(now).subtract(1, 'days')))
return iconOfflineAlert
else
return iconOffline
return iconOffline
}, gotoAnything))
var onlinemarkers = subtract(onlinenodes.filter(has_location), newnodes)