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

Merge pull request #12 from flokli/startAngle

Browse source 
use node_id hash to calculate startAngle for client layer
This commit is contained in:
Nils Schneider 2015-06-21 15:59:28 +02:00
parent 3a413463ec 008a1d0b0b
commit 7f74fff992
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app.js
View file

@ -13,7 +13,8 @@ require.config({
"numeral-intl": "../bower_components/numeraljs/min/languages.min", "numeral-intl": "../bower_components/numeraljs/min/languages.min",
"virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom", "virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom",
"rbush": "../bower_components/rbush/rbush", "rbush": "../bower_components/rbush/rbush",
"helper": "../helper" "helper": "../helper",
"jshashes": "../bower_components/jshashes/hashes"
}, },
shim: { shim: {
"leaflet.label": ["leaflet"], "leaflet.label": ["leaflet"],

3
bower.json
View file

@ -24,7 +24,8 @@
"roboto-fontface": "~0.3.0", "roboto-fontface": "~0.3.0",
"virtual-dom": "~2.0.1", "virtual-dom": "~2.0.1",
"leaflet-providers": "~1.0.27", "leaflet-providers": "~1.0.27",
"rbush": "https://github.com/mourner/rbush.git#~1.3.5" "rbush": "https://github.com/mourner/rbush.git#~1.3.5",
"jshashes": "~1.0.5"
}, },
"authors": [ "authors": [
"Nils Schneider <nils@nilsschneider.net>" "Nils Schneider <nils@nilsschneider.net>"

14
lib/map/clientlayer.js
View file

@ -1,8 +1,16 @@
define(["leaflet"], define(["leaflet", "jshashes"],
function (L) { function (L, jsHashes) {
var MD5 = new jsHashes.MD5()
return L.TileLayer.Canvas.extend({ return L.TileLayer.Canvas.extend({
setData: function (d) { setData: function (d) {
this.data = d this.data = d
//pre-calculate start angles
this.data.all().forEach(function (d) {
var hash = MD5.hex(d.node.nodeinfo.node_id)
d.startAngle = (parseInt(hash.substr(0, 2), 16) / 255) * 2 * Math.PI
})
this.redraw() this.redraw()
}, },
drawTile: function (canvas, tilePoint) { drawTile: function (canvas, tilePoint) {
@ -33,7 +41,6 @@ define(["leaflet"],
var radius = 3 var radius = 3
var a = 1.2 var a = 1.2
var startDistance = 12 var startDistance = 12
var startAngle = Math.PI
ctx.beginPath() ctx.beginPath()
nodes.forEach(function (d) { nodes.forEach(function (d) {
@ -47,6 +54,7 @@ define(["leaflet"],
p.y -= s.y p.y -= s.y
var distance = startDistance var distance = startDistance
var startAngle = d.startAngle
var angle = startAngle var angle = startAngle
for (var i = 0; i < clients; i++) { for (var i = 0; i < clients; i++) {