X-Git-Url: https://www.nos-oignons.net/gitweb/website.git/blobdiff_plain/33a8590296933501348374a8797c81c0e9679664..1cda2f60238b75c6d48e587b9d7e3284eeb9e4d3:/assets/bw_graphs.js?ds=sidebyside

diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js
index 6c0f05f..8091271 100644
--- a/assets/bw_graphs.js
+++ b/assets/bw_graphs.js
@@ -35,11 +35,10 @@ BwDrawer.read_stack = d3.layout.stack()
 BwDrawer.write_stack = d3.layout.stack()
     .values(function(d) { return d.write_values; });
 
-BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net";
+BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=%20%20%20%200x9F29C15D42A8B6F3";
 
 BwDrawer.periods = [
-    { id: "1_month", label: L10n.t_1_month },
-    { id: "3_months", label: L10n.t_3_months },
+    { id: "6_months", label: L10n.t_6_months },
     { id: "1_year", label: L10n.t_1_year },
     { id: "5_years", label: L10n.t_5_years },
   ];
@@ -58,42 +57,48 @@ BwDrawer.extract_values = function(history, interval, minTime, maxTime) {
 }
 
 BwDrawer.color = d3.scale.ordinal();
-BwDrawer.color.domain(nos_oignons_relays.map(function(r) {return r.fingerprint}));
-BwDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color}));
+BwDrawer.color.domain(nos_oignons_groups.map(function(g) {return g.name}));
+BwDrawer.color.range(nos_oignons_groups.map(function(g) {return g.color}));
 
 BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
   // Purge non running relays
-  raw_data.relays.forEach(function(r, i) {
-    if (typeof r.read_history === 'undefined' || typeof r.write_history === 'undefined') {
-      raw_data.relays.splice(i, 1);
-    }
+  raw_data.relays = raw_data.relays.filter(function(r) {
+    return typeof r.read_history !== 'undefined' && typeof r.write_history !== 'undefined';
   });
 
+
   var update_period;
 
-  var svg = d3.select(selector).append("svg")
+  var wrapper = d3.select(selector).append("div")
+      .style("display", "flex")
+      .style("align-items", "flex-start");
+
+  var svg = wrapper.append("svg")
       .attr("width", BwDrawer.width + BwDrawer.margin.left + BwDrawer.margin.right)
       .attr("height", BwDrawer.height + BwDrawer.margin.top + BwDrawer.margin.bottom)
     .append("g")
       .attr("transform", "translate(" + BwDrawer.margin.left + "," + BwDrawer.margin.top + ")");
 
   var form = d3.select(selector).append("form")
+      .attr("class", "graph-period")
       .attr("action", "#");
   BwDrawer.periods.forEach(function(p) {
     var div = form.append("div");
     var radio = div.append("input")
       .attr("type", "radio")
       .attr("name", "period")
-      .attr("id", "period_" + p.id)
+      .attr("id", "bw_period_" + p.id)
       .on("click", function() { update_period(p.id); });
     div.append("label")
-      .attr("for", "period_" + p.id)
+      .attr("for", "bw_period_" + p.id)
       .text(p.label);
     if (p.id == BwDrawer.periods[0].id) {
       radio.attr("checked", true);
     }
   });
 
+  var relayIndex = buildRelayIndex(raw_data.relays);
+
   var bw_data = {};
   BwDrawer.periods.map(function(p) { return p.id; }).forEach(function(period) {
     var interval = d3.max(raw_data.relays, function(d) {
@@ -117,20 +122,19 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
     var maxReadBandwidth = 0;
     var maxWriteBandwidth = 0;
 
-    var values = BwDrawer.color.domain().map(function(fingerprint) {
-      var relay_data = raw_data["relays"].filter(function(d) { return d.fingerprint == fingerprint; })[0];
-      var read_history = relay_data['read_history'][period];
-      var write_history = relay_data['write_history'][period];
-      var read_values = BwDrawer.extract_values(read_history, interval, minTime, maxTime);
-      var write_values = BwDrawer.extract_values(write_history, interval, minTime, maxTime);
-
-      maxReadBandwidth = maxReadBandwidth + d3.max(read_values, function(d) { return d.y; });
-      maxWriteBandwidth = maxWriteBandwidth + d3.max(write_values, function(d) { return d.y; });
-
+    var values = nos_oignons_groups.map(function(group) {
+      var group_read = sumGroupRelayValues(group, relayIndex, function(r) {
+        return BwDrawer.extract_values(r['read_history'][period], interval, minTime, maxTime);
+      });
+      var group_write = sumGroupRelayValues(group, relayIndex, function(r) {
+        return BwDrawer.extract_values(r['write_history'][period], interval, minTime, maxTime);
+      });
+      maxReadBandwidth += (d3.max(group_read, function(d) { return d.y; }) || 0);
+      maxWriteBandwidth += (d3.max(group_write, function(d) { return d.y; }) || 0);
       return {
-        fingerprint: fingerprint,
-        read_values: read_values,
-        write_values: write_values.map(function(d) { d.y = -d.y; return d })
+        group: group.name,
+        read_values: group_read,
+        write_values: group_write.map(function(d) { d.y = -d.y; return d })
       };
     });
     bw_data[period] = { minTime: minTime,
@@ -152,14 +156,14 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
     .enter().append("path")
       .attr("class", "read_graph area")
       .attr("d", function(d) { return BwDrawer.area(d.read_values); })
-      .style("fill", function(d) { return BwDrawer.color(d.fingerprint); });
+      .style("fill", function(d) { return BwDrawer.color(d.group); });
 
   var write_graph = svg.selectAll(".write_graph")
       .data(BwDrawer.write_stack(bw_data[initial_period].values))
     .enter().append("path")
       .attr("class", "write_graph area")
       .attr("d", function(d) { return BwDrawer.area(d.write_values); })
-      .style("fill", function(d) { return BwDrawer.color(d.fingerprint); });
+      .style("fill", function(d) { return BwDrawer.color(d.group); });
 
   update_period = function(period) {
     BwDrawer.x.domain([bw_data[period].minTime, bw_data[period].maxTime]);
@@ -194,26 +198,31 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
       .attr("class", "y axis")
       .call(BwDrawer.yAxis);
 
-  var legend = svg.selectAll(".legend")
-      .data(BwDrawer.color.domain().slice().reverse())
-    .enter().append("g")
-      .attr("class", "legend")
-      .attr("transform", function(d, i) { return "translate(0," + ((i * 20) - BwDrawer.margin.top) + ")"; });
-
-  legend.append("rect")
-      .attr("x", BwDrawer.width - 18)
-      .attr("width", 18)
-      .attr("height", 18)
-      .style("fill", BwDrawer.color);
-
-  legend.append("text")
-      .attr("x", BwDrawer.width - 24)
-      .attr("y", 9)
-      .attr("dy", ".35em")
-      .style("text-anchor", "end")
-      .text(function(d) {
-        return nos_oignons_relays.filter(function(r) { return r.fingerprint == d; })[0].name;
-      });
+  var legendDiv = wrapper.append("div")
+      .style("overflow-y", "auto")
+      .style("max-height", (BwDrawer.height + BwDrawer.margin.top + BwDrawer.margin.bottom) + "px")
+      .style("min-width", "90px")
+      .style("padding-left", "10px")
+      .style("padding-top", BwDrawer.margin.top + "px")
+      .style("box-sizing", "border-box");
+
+  BwDrawer.color.domain().slice().reverse().forEach(function(name) {
+    var item = legendDiv.append("div")
+        .style("display", "flex")
+        .style("align-items", "center")
+        .style("margin-bottom", "3px")
+        .style("white-space", "nowrap");
+    item.append("span")
+        .style("display", "inline-block")
+        .style("width", "14px")
+        .style("min-width", "14px")
+        .style("height", "14px")
+        .style("background-color", BwDrawer.color(name))
+        .style("margin-right", "5px");
+    item.append("span")
+        .style("font-size", "11px")
+        .text(name);
+  });
 };
 
 BwDrawer.prototype.draw = function() {