Should extract unique dates when scale is [period] but [period] value…

… is not specified
TargetProcess · May 18, 2016 · 2b0b81f · 2b0b81f
1 parent 7166c23
commit 2b0b81f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/scales/period.js b/src/scales/period.js
@@ -23,7 +23,8 @@ export class PeriodScale extends BaseScale {
             new Date(Math.max(max, domain[1]))
         ];
 
-        if (props.fitToFrameByDims) {
+        var periodGenerator = UnitDomainPeriodGenerator.get(props.period);
+        if (props.fitToFrameByDims || (periodGenerator === null)) {
             this.vars = _(vars).chain()
                 .uniq((x) => new Date(x).getTime())
                 .map((x) => new Date(x))

diff --git a/src/spec-converter.js b/src/spec-converter.js
@@ -126,8 +126,8 @@ export class SpecConverter {
 
         var walkStructure = (srcUnit) => {
             var gplRoot = utils.clone(_.omit(srcUnit, 'unit'));
-            gplRoot.expression = this.ruleInferExpression(srcUnit);
             this.ruleCreateScales(srcUnit, gplRoot);
+            gplRoot.expression = this.ruleInferExpression(srcUnit);
 
             if (srcUnit.unit) {
                 gplRoot.units = srcUnit.unit.map(walkStructure);
@@ -313,6 +313,11 @@ export class SpecConverter {
         return k;
     }
 
+    getScaleConfig(scaleType, dimName) {
+        var k = `${scaleType}_${dimName}`;
+        return this.dist.scales[k];
+    }
+
     ruleInferExpression(srcUnit) {
 
         var expr = {
@@ -324,6 +329,9 @@ export class SpecConverter {
         var gx = g.x || {};
         var gy = g.y || {};
 
+        var scaleX = this.getScaleConfig('x', srcUnit.x);
+        var scaleY = this.getScaleConfig('y', srcUnit.y);
+
         if (srcUnit.type.indexOf('ELEMENT.') === 0) {
 
             if (srcUnit.color) {
@@ -341,14 +349,14 @@ export class SpecConverter {
 
                 // jshint ignore:start
                 // jscs:disable requireDotNotation
-                if (gx['tickPeriod'] || gy['tickPeriod']) {
+                if (scaleX.period || scaleY.period) {
                     expr = {
                         operator: 'cross_period',
                         params: [
                             this.ruleInferDim(srcUnit.x, gx),
                             this.ruleInferDim(srcUnit.y, gy),
-                            gx['tickPeriod'],
-                            gy['tickPeriod']
+                            scaleX.period,
+                            scaleY.period
                         ]
                     };
                 } else {

diff --git a/src/unit-domain-period-generator.js b/src/unit-domain-period-generator.js
@@ -78,11 +78,14 @@ var UnitDomainPeriodGenerator = {
         return this;
     },
 
-    get: (periodAlias) => PERIODS_MAP[periodAlias.toLowerCase()],
+    get: (periodAlias) => {
+        var alias = periodAlias || '';
+        return PERIODS_MAP[alias.toLowerCase()] || null;
+    },
 
     generate: (lTick, rTick, periodAlias) => {
         var r = [];
-        var period = PERIODS_MAP[periodAlias.toLowerCase()];
+        var period = UnitDomainPeriodGenerator.get(periodAlias);
         if (period) {
             var last = period.cast(new Date(rTick));
             var curr = period.cast(new Date(lTick));