fixing infinite digest issue in time series chart; simplification of dimension functions

matthiasn · matthiasn · commit c711a6f7d9db · 2013-10-12T15:29:09.000+02:00
diff --git a/app/assets/javascripts/directives.js b/app/assets/javascripts/directives.js
@@ -81,7 +81,7 @@ angular.module('birdwatch.directives', ['charts.barchart', 'charts.wordcloud'])
 
                 $scope.$watch("tsdata", function() {
                     if ($scope.tsdata.length > 0) {
-                        graph.series[0].data = $scope.tsdata;
+                        graph.series[0].data = $scope.tsdata.map(function(el) { return { x: el.key, y: el.value } });
                         graph.update();
                     }
                 });
diff --git a/app/assets/javascripts/services/crossfilter.js b/app/assets/javascripts/services/crossfilter.js
@@ -18,26 +18,22 @@ angular.module('birdwatch.services').factory('cf', function (utils) {
         else return 0;
     });
 
-    var rsMapper = function(el) { return { x: el.key, y: el.value }};
+    // Higher-order function, returns a function that rounds time down. Interval s is specified in seconds.
+    // Example: returned function makes Jan 1, 2012, 16:45:00 out of Jan 1, 2012, 16:45:55 when interval is 60s
+    function dateRound(s) { return function(t) { return s * Math.floor(Date.parse(t.created_at) / (s * 1000)) }; }
 
-    var parseDateRoundedByMin    = function(t) { return      60 * Math.floor(Date.parse(t.created_at) / 60000) };
-    var parseDateRoundedBy15Min  = function(t) { return     900 * Math.floor(Date.parse(t.created_at) / 900000) };
-    var parseDateRoundedByHour   = function(t) { return    3600 * Math.floor(Date.parse(t.created_at) / 3600000) };
-    var parseDateRoundedBy6Hour  = function(t) { return  6*3600 * Math.floor(Date.parse(t.created_at) / 3600000 / 6) };
-    var parseDateRoundedByDay    = function(t) { return 24*3600 * Math.floor(Date.parse(t.created_at) / 3600000 / 24) };
-
-    var byMinGrp   = cf.dimension(parseDateRoundedByMin).group();
-    var by15MinGrp = cf.dimension(parseDateRoundedBy15Min).group();
-    var byHourGrp  = cf.dimension(parseDateRoundedByHour).group();
-    var by6HourGrp = cf.dimension(parseDateRoundedBy6Hour).group();
-    var byDayGrp   = cf.dimension(parseDateRoundedByDay).group();
+    var byMinGrp   = cf.dimension(dateRound(      60)).group();
+    var by15MinGrp = cf.dimension(dateRound(   15*60)).group();
+    var byHourGrp  = cf.dimension(dateRound(   60*60)).group();
+    var by6HourGrp = cf.dimension(dateRound( 6*60*60)).group();
+    var byDayGrp   = cf.dimension(dateRound(24*60*60)).group();
 
     exports.timeseries = function() {
-      if (byMinGrp.size() < 60)        { return byMinGrp.all().map(rsMapper); }
-      else if (by15MinGrp.size() < 48) { return by15MinGrp.all().map(rsMapper); }
-      else if (byHourGrp.size() < 96)  { return byHourGrp.all().map(rsMapper); }
-      else if (by6HourGrp.size() < 40) { return by6HourGrp.all().map(rsMapper); }
-      else                             { return byDayGrp.all().map(rsMapper); }
+             if (byMinGrp.size() < 60)   { return byMinGrp.all(); }
+        else if (by15MinGrp.size() < 48) { return by15MinGrp.all(); }
+        else if (byHourGrp.size() < 96)  { return byHourGrp.all(); }
+        else if (by6HourGrp.size() < 40) { return by6HourGrp.all(); }
+        else                             { return byDayGrp.all(); }
     };
 
     // freeze imposes filter on crossfilter that only shows anything older than and including the latest

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ angular.module('birdwatch.directives', ['charts.barchart', 'charts.wordcloud'])`
`81`	`81`
`82`	`82`	`$scope.$watch("tsdata", function() {`
`83`	`83`	`if ($scope.tsdata.length > 0) {`
`84`		`- graph.series[0].data = $scope.tsdata;`
	`84`	`+ graph.series[0].data = $scope.tsdata.map(function(el) { return { x: el.key, y: el.value } });`
`85`	`85`	`graph.update();`
`86`	`86`	`}`
`87`	`87`	`});`