commit 35d5feebcd7afe705efa6cb7724fc3f493dcd2a5
author Paul Greyson <someone.named.paul@gmail.com> Wed Apr 10 09:58:02 2013 -0700
committer Paul Greyson <someone.named.paul@gmail.com> Wed Apr 10 09:58:02 2013 -0700
tree 191f7733e21075681f176720e8e5ed8bddef8c67
parent 5f20cae095e6d8c8cfe5c17b7f9c5ea7de8250a0
parent 4fe9899ccb28a877e50fb9fe45eb822bc1b4bdd6

Merge remote-tracking branch 'upstream/master'

web/ons-demo/data/configuration.json

diff --git a/web/ons-demo/data/configuration.json b/web/ons-demo/data/configuration.json
index 4d38d5f..91490e4 100644
--- a/web/ons-demo/data/configuration.json
+++ b/web/ons-demo/data/configuration.json
@@ -61,7 +61,7 @@
 			"lat": 41.225925,
 			"lng": -74.00528,
 			"label": "NYC",
-			"fanOutAngle": 135
+			"fanOutAngle": 150
 		},
 		"00:00:00:00:ba:5e:ba:13": {
 			"lat": 37.901187,

web/ons-demo/js/map.js

diff --git a/web/ons-demo/js/map.js b/web/ons-demo/js/map.js
index 62df872..7662aaf 100644
--- a/web/ons-demo/js/map.js
+++ b/web/ons-demo/js/map.js
@@ -2,7 +2,7 @@
 
 var projection = d3.geo.mercator()
     .center([82, 46])
-    .scale(8000)
+    .scale(10000)
     .rotate([-180,0]);
 
 var switchXML;
@@ -164,8 +164,13 @@
 }
 
 var fanOutAngles = {
-	aggregation: 90,
-	edge: 7
+	aggregation: 100,
+	edge: 5
+}
+
+var fanOutDistances = {
+	aggregation: 60,
+	edge: 140
 }
 
 function makeSwitchesModel(switches, className) {
@@ -187,8 +192,8 @@
 				fanOutAngle -= (upstreamGeo.count - 1) * fanOutAngles[className]/2;
 
 				var angle = toRadians(fanOutAngle);
-				var xOff = Math.sin(angle) * widths[className] * 20;
-				var yOff = Math.cos(angle) * widths[className] * 20;
+				var xOff = Math.sin(angle) * fanOutDistances[className];
+				var yOff = Math.cos(angle) * fanOutDistances[className];
 
 				pos = [pos[0] + xOff, pos[1] + yOff];