Merge branch 'master' of ssh://bulbe.nos-oignons.net/website

[website.git] / assets / bw_graphs.js

diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js
index 900e1266539c58bcc3836b856984a874bacbae28..3efacbbb8559edad9e5352fe9abe3b5cc2e66f43 100644 (file)
--- a/assets/bw_graphs.js
+++ b/assets/bw_graphs.js
@@ -16,8 +16,6 @@ BwDrawer.x = d3.time.scale()
 BwDrawer.y = d3.scale.linear()
     .range([BwDrawer.height, 0]);
 
 BwDrawer.y = d3.scale.linear()
     .range([BwDrawer.height, 0]);
 

-BwDrawer.color = d3.scale.category20();
-

 BwDrawer.xAxis = d3.svg.axis()
     .scale(BwDrawer.x)
     .orient("bottom");
 BwDrawer.xAxis = d3.svg.axis()
     .scale(BwDrawer.x)
     .orient("bottom");


@@ -40,11 +38,9 @@ BwDrawer.write_stack = d3.layout.stack()
 BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net";
 
 BwDrawer.periods = [
 BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net";
 
 BwDrawer.periods = [

-    { id: "3_days", label: L10n.t_3_days },
-    { id: "1_week", label: L10n.t_1_week },
-    { 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: "1_year", label: L10n.t_1_year },

+    { id: "5_years", label: L10n.t_5_years },

   ];
 
 BwDrawer.extract_values = function(history, interval, minTime, maxTime) {
   ];
 
 BwDrawer.extract_values = function(history, interval, minTime, maxTime) {


@@ -60,7 +56,18 @@ BwDrawer.extract_values = function(history, interval, minTime, maxTime) {
   return values;
 }
 
   return values;
 }
 

+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.draw_bandwidth_graph = function(raw_data, selector, period) {
 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);
+    }
+  });
+

   var update_period;
 
   var svg = d3.select(selector).append("svg")
   var update_period;
 
   var svg = d3.select(selector).append("svg")


@@ -70,29 +77,23 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
       .attr("transform", "translate(" + BwDrawer.margin.left + "," + BwDrawer.margin.top + ")");
 
   var form = d3.select(selector).append("form")
       .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("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")
       .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);
     }
   });
 
       .text(p.label);
     if (p.id == BwDrawer.periods[0].id) {
       radio.attr("checked", true);
     }
   });
 

-  var valid_fingerprints = [];
-  nos_oignons_relays.forEach(function(r) {
-    var relay_data = raw_data["relays"].filter(function(d) { return d.fingerprint == r.fingerprint; })[0];
-    valid_fingerprints.push(r.fingerprint);
-  });
-  BwDrawer.color.domain(valid_fingerprints);
-

   var bw_data = {};
   BwDrawer.periods.map(function(p) { return p.id; }).forEach(function(period) {
     var interval = d3.max(raw_data.relays, function(d) {
   var bw_data = {};
   BwDrawer.periods.map(function(p) { return p.id; }).forEach(function(period) {
     var interval = d3.max(raw_data.relays, function(d) {


@@ -108,7 +109,7 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
       return d['read_history'][period] && BwDrawer.parseTime(d['read_history'][period].first) &&
              d['write_history'][period] && BwDrawer.parseTime(d['write_history'][period].first);
     });
       return d['read_history'][period] && BwDrawer.parseTime(d['read_history'][period].first) &&
              d['write_history'][period] && BwDrawer.parseTime(d['write_history'][period].first);
     });

-    var maxTime = d3.max(raw_data.relays, function(d) {
+    var maxTime = d3.min(raw_data.relays, function(d) {

       return d['read_history'][period] && BwDrawer.parseTime(d['read_history'][period].last) &&
              d['write_history'][period] && BwDrawer.parseTime(d['write_history'][period].last);
     });
       return d['read_history'][period] && BwDrawer.parseTime(d['read_history'][period].last) &&
              d['write_history'][period] && BwDrawer.parseTime(d['write_history'][period].last);
     });