From 090b6c1d79725ac6ddbf635c2d5c8a9456ba40fb Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Wed, 25 Mar 2015 01:27:05 +0100 Subject: [PATCH] use circleMarkers again --- history.html | 35 ----------------------------------- img/circlemarker.png | Bin 618 -> 0 bytes img/circlemarker@2x.png | Bin 1094 -> 0 bytes lib/map.js | 36 +++++------------------------------- 4 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 img/circlemarker.png delete mode 100644 img/circlemarker@2x.png diff --git a/history.html b/history.html index e2b6e13..1a7f568 100644 --- a/history.html +++ b/history.html @@ -207,41 +207,6 @@ right: 0.5em; } - .leaflet-marker-icon.node-online { - filter: hue-rotate(203deg) brightness(1.5); - -webkit-filter: hue-rotate(203deg) brightness(1.5); - opacity: 0.9; - } - - .leaflet-marker-icon.node-new { - filter: hue-rotate(88deg) brightness(1.5); - -webkit-filter: hue-rotate(88deg) brightness(1.5); - } - - .leaflet-marker-icon.node-offline { - filter: saturate(160%); - -webkit-filter: saturate(160%); - } - - .leaflet-marker-icon.node-alert { - -webkit-animation: blink 2s linear; - -webkit-animation-iteration-count: infinite; - animation: blink 2s linear; - animation-iteration-count: infinite; - } - - @-webkit-keyframes blink { - 0% { opacity: 1.0; } - 80% { opacity: 1.0; } - 90% { opacity: 0.0; } - } - - @keyframes blink { - 0% { opacity: 1.0; } - 80% { opacity: 1.0; } - 90% { opacity: 0.0; } - } - @media screen and (max-width: 80em) { .sidebar { font-size: 0.8em; diff --git a/img/circlemarker.png b/img/circlemarker.png deleted file mode 100644 index 71c368993e0aaba4b3d2dea9452c8b1f76e492c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 618 zcmV-w0+s!VP)qA`~Uy|8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10q03XK~y-6m6Oj-Q(+Lre`jvf(p*b0*jy7TBqZ)(Ezf`}SrB4k z;=j1}DR==B6B3MUh;HN^Tq-M8h9D_uTTnys*3#Q=T-YLDYv8QDOlE#LGdZ6aqU9us z$IK@E^`s6eh%u@#lnkn`F12NI?Ujn``f8ZuqpSohmFRkfe;71ESK*& zED2h2KXhoil*v6OD7iH5P&9b;sL^=SpN;yDiE??tVM)?gxo-=O1s#K~pd&a24lpxd zZa$7X8)>=)VEq;P01Kfi@FBaqg;2%)OMv?;Niuy3iKInAOCjtHJM;zEo}iVvF9Fzc zlEe-(az7mAV2~rZ9}>dsdZkjd(I~owd(NSG89-kSO{CmG2$QCEy9D6w*;OEtGJssW zJ!)PkG<(I||Hm#k>18M?6pjqo?FFfHB_~kAJu8{*+LQhLRIu3#(mx3vq%K&HZa92c zs8(ABAon$gqMJ=z24XM)jC7-D4SI=vm!{wD#&HLj^FP^X4zkn*6I5KfDQWd-z5f0b z0{Ua=lV1eh*qEB@Bjb+ diff --git a/img/circlemarker@2x.png b/img/circlemarker@2x.png deleted file mode 100644 index ea332540d42bbd8cfd327a8d20a6a2c2727eeb44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1094 zcmV-M1iAZ(P)xRQcG5izkHS4}G)5_^V&cbyG!e%2P9 z)7zcdna_JW``*mLGa@?Z0}i@TDowRptruiAhBVeuc*8?zM7iA3%<}SY0v`y-wKzT_ zn8y7LNym4m^@lFqi{Q>|t#-dJAaljyM9%DegJ~Ub1sz=Qqr2a{RIgVK4KiOWo^!KL zfqd3^a9;z~+*0X<$C@51A#bbK8`;EE^Jz=1^g4tsz7_U z2>_A71R+e~o=a~A`1+Gt?Pjn1iF$cC8OI-IAq1;(UrbhFKS}622$CEpPNV-Upn1a=QKxAPA4FHG2y7XaBkZW;# z#^J4msD=B3enF(-@Bpck=*_l0|{_G{p17{L95>&!F>a>N)kg3(_26sg!^mB z*fFd38zK|1>dBX9?r(ZB`2g@)sq_lciG+G>5UY`qc5r_TAnEvAsWjCEQLA-2W4Jaz zh>nEtC>=&g?9Qu^o=X+(zCLh}c6%co%51C)63k9?71F>#JQG97B7|*5hp17W3d+nk zLEIag8qfEBq>sVf3*8H;(FO4k8k_f3*!E4Yyg-v;*jgh%ilSJPJ%q*6a%+E8-oBy?MhE9Gi+C2O;- zW?g7Dm);v5E;yV8BxwX`$fYL-ty@jXBfW@JOt))Ex68HK!hdadY$v{m>f)lTf*V2zKzgLK(DEkPQ@gZpDbctpFskse@j zFAzm}%toz8gC)2!TdUpODb}6`+>N70%*M07B?zJJW`CCJ^~Hn!mUw35Uok|Eg)}P=UH||9 M07*qoM6N<$f)w!d82|tP diff --git a/lib/map.js b/lib/map.js index 6ae9dec..fb9fe08 100644 --- a/lib/map.js +++ b/lib/map.js @@ -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)