Fixed facets with UTC time (#323)

TargetProcess · Jan 13, 2017 · b0f0b41 · b0f0b41
1 parent dd9f930
commit b0f0b41
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/src/algebra.js b/src/algebra.js
@@ -36,8 +36,9 @@ var FramesAlgebra = {
             []);
     },
 
-    cross_period(dataFn, dimX, dimY, xPeriod, yPeriod) {
+    cross_period(dataFn, dimX, dimY, xPeriod, yPeriod, guide) {
         var data = dataFn();
+        var utc = (guide ? guide.utcTime : false);
 
         var domainX = utils.unique(data.map(x => x[dimX]), unify);
         var domainY = utils.unique(data.map(x => x[dimY]), unify);
@@ -46,11 +47,11 @@ var FramesAlgebra = {
         var domY = domainY.length === 0 ? [null] : domainY;
 
         if (xPeriod) {
-            domX = UnitDomainPeriodGenerator.generate(Math.min(...domainX), Math.max(...domainX), xPeriod);
+            domX = UnitDomainPeriodGenerator.generate(Math.min(...domainX), Math.max(...domainX), xPeriod, {utc});
         }
 
         if (yPeriod) {
-            domY = UnitDomainPeriodGenerator.generate(Math.min(...domainY), Math.max(...domainY), yPeriod);
+            domY = UnitDomainPeriodGenerator.generate(Math.min(...domainY), Math.max(...domainY), yPeriod, {utc});
         }
 
         return domY.reduce(

diff --git a/src/charts/tau.gpl.js b/src/charts/tau.gpl.js
@@ -202,7 +202,7 @@ export class GPL extends Emitter {
 
         } else {
 
-            var expr = this._parseExpression(root.expression, parentPipe);
+            var expr = this._parseExpression(root.expression, parentPipe, root.guide);
 
             root.transformation = root.transformation || [];
 
@@ -253,7 +253,7 @@ export class GPL extends Emitter {
         return new DataFrame(frame, this.sources[frame.source].data, this.transformations);
     }
 
-    _parseExpression(expr, parentPipe) {
+    _parseExpression(expr, parentPipe, guide) {
 
         var funcName = expr.operator || 'none';
         var srcAlias = expr.source;
@@ -278,7 +278,7 @@ export class GPL extends Emitter {
             inherit: bInherit,
             func: func,
             args: funcArgs,
-            exec: () => func(dataFn, ...(funcArgs || []))
+            exec: () => func(dataFn, ...(funcArgs || []), guide)
         };
     }
 }
diff --git a/src/spec-converter.js b/src/spec-converter.js
@@ -61,7 +61,8 @@ export class SpecConverter {
             childUnit.guide = utils.defaults(
                 (childUnit.guide || {}),
                 {
-                    animationSpeed: settings.animationSpeed || 0
+                    animationSpeed: settings.animationSpeed || 0,
+                    utcTime: settings.utcTime || false
                 }
             );
 

diff --git a/test/spec-converter.test.js b/test/spec-converter.test.js
@@ -135,6 +135,7 @@ define(function (require) {
                                     "namespace": "chart",
                                     "guide": {
                                         "animationSpeed": 0,
+                                        "utcTime": false,
                                         "x": {},
                                         "y": {}
                                     },
@@ -144,13 +145,15 @@ define(function (require) {
                             ],
                             "namespace": "chart",
                             "guide": {
-                                "animationSpeed": 0
+                                "animationSpeed": 0,
+                                "utcTime": false
                             }
                         }
                     ],
                     "namespace": "chart",
                     "guide": {
-                        "animationSpeed": 0
+                        "animationSpeed": 0,
+                        "utcTime": false
                     }
                 }
             };
@@ -288,7 +291,8 @@ define(function (require) {
                     "guide": {
                         "x": {"tickPeriod": "week"},
                         "y": {"tickLabel": "name"},
-                        "animationSpeed": 0
+                        "animationSpeed": 0,
+                        "utcTime": false
                     },
                     "expression": {
                         "inherit": false,
@@ -319,6 +323,7 @@ define(function (require) {
                                     "namespace": "chart",
                                     "guide": {
                                         "animationSpeed": 0,
+                                        "utcTime": false,
                                         "x": {},
                                         "y": {}
                                     },
@@ -328,7 +333,8 @@ define(function (require) {
                             ],
                             "namespace": "chart",
                             "guide": {
-                                "animationSpeed": 0
+                                "animationSpeed": 0,
+                                "utcTime": false
                             }
                         }
                     ],