Got tile generation working. Added package for rounding dates

Also disabled connect debug logging
QutEcoacoustics · Jan 30, 2015 · 8e45b21 · 8e45b21
1 parent 0a19e26
commit 8e45b21
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 41 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -536,7 +536,7 @@ module.exports = function (grunt) {
                     hostname: '*',
                     port: 8080,
                     base: './<%= build_dir %>',
-                    debug: true,
+                    //debug: true,
                     livereload: true,
                     middleware: function (connect, options) {
 

diff --git a/bower.json b/bower.json
@@ -23,6 +23,7 @@
     "modernizr": "~2.8.x",
     "momentjs": "~2.8.x",
     "objectdiff": "https://github.com/NV/objectDiff.js.git",
+    "round-date": "~1.0.1",
     "sass-bootstrap": "3.0.2"
   },
   "dependencies": {},

diff --git a/buildConfig/build.config.js b/buildConfig/build.config.js
@@ -73,8 +73,9 @@ module.exports = {
             'vendor/momentjs/moment.js',
             'vendor/lodash/dist/lodash.js',
             'vendor/bowser/bowser.js',
-            'vendor/humanize-duration/humanize-duration.js'
-        ],
+            'vendor/humanize-duration/humanize-duration.js',
+            'vendor/round-date/roundDate.js'
+],
         js: [
             'vendor/jquery/dist/jquery.js',
             'vendor/angular/angular.js',
@@ -121,7 +122,8 @@ module.exports = {
             'vendor/bowser/bowser.js',
             'vendor/angular-growl-v2/build/angular-growl.js',
             'vendor/angular-local-storage/dist/angular-local-storage.js',
-            'vendor/humanize-duration/humanize-duration.js'
+            'vendor/humanize-duration/humanize-duration.js',
+            'vendor/round-date/roundDate.js'
         ],
         css: [
             // NOTE: bootstrap css imported in application.tpl.scss

diff --git a/src/app/d3Bindings/eventDistribution/distributionVisualisation.js b/src/app/d3Bindings/eventDistribution/distributionVisualisation.js
@@ -11,7 +11,8 @@ angular
     "DistributionVisualisation",
     [
         "d3",
-        function (d3) {
+        "roundDate",
+        function (d3, roundDate) {
             return function DistributionVisualisation(target, data, dataFunctions) {
                 // variables
                 var that = this,
@@ -192,49 +193,21 @@ angular
                         high = new Date(dataFunctions.getHigh(current));
 
                     // round down to the lower unit of time, determined by `tileSizeSeconds`
-                    var niceLow = d3.time.second.floor(low);
-                    var niceHigh = d3.time.second.ceil(floor);
-
-                    var m = roundDate(tileSizePixels, low);
+                    var niceLow = roundDate.floor(tileSizeSeconds, low),
+                        niceHigh = roundDate.ceil(tileSizeSeconds, high),
+                        offset = niceLow;
 
                     // use d3's in built range functionality to generate steps
-                    var steps = d3.time.seconds(niceLow, niceHigh, tileSizeSeconds);
-
-                    while (false /*tileOffset < high*/) {
-
-                        previous.push()
+                    var steps = [];
+                    while (offset <= niceHigh) {
+                        steps.push(offset);
+                        offset = d3.time.second.offset(offset, tileSizeSeconds);
                     }
 
-                    tileSizeSeconds
+                    return steps;
                 }
 
-                function roundDate(roundToSeconds, roundStyle, date) {
-                    if (arguments.length === 2) {
-                        date = roundStyle;
-                        roundStyle = "round";
-                    }
-                    else if (arguments.length !== 3) {
-                        throw new Error("Expected either 2 or 3 arguments");
-                    }
-
-                    var roundToMilliseconds = roundToSeconds * 1000,
-                        unix = date.getTime(),
-                        remainder = unix % roundToMilliseconds,
-                        result;
 
-                    if (roundStyle === "round") {
-                        roundStyle = unix / remainder >= 0.5 ? "ceil" : "floor";
-                    }
-
-                    if (roundStyle === "floor") {
-                        result = new Date(unix - remainder)
-                    }
-                    else if (roundStyle === "ceil") {
-                        result = new Date(unix + (roundToMilliseconds - remainder));
-                    }
-
-                    return result;
-                }
             }
         }
     ]