Merge pull request #162 from nzzdev/release-3.1.5

Release 3.1.5
nzzdev · Nov 4, 2019 · 4a5f102 · 4a5f102
2 parents fe2eae4 + 42389d7
commit 4a5f102
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Q-chart [![Build Status](https://travis-ci.com/nzzdev/Q-chart.svg?branch=dev)](https://travis-ci.com/nzzdev/Q-chart) [![Greenkeeper badge](https://badges.greenkeeper.io/nzzdev/Q-chart.svg)](https://greenkeeper.io/)
 
-**maintainer**: [benib](https://github.com/benib)
+**maintainer**: [romankaravia](https://github.com/romankaravia)
 
 Q chart is a charting tool based on [Vega](https://github.com/vega/vega) for [Q](https://q.tools)
 

diff --git a/chartTypes/commonMappings.js b/chartTypes/commonMappings.js
@@ -173,8 +173,7 @@ function getColumnAreaPrognosisMappings() {
           transform: [
             {
               type: "filter",
-              expr:
-                "timeFormat(datum.xValue, '%Q') >= timeFormat(prognosisStartDate, '%Q')"
+              expr: "datum.xValue >= prognosisStartDate"
             }
           ]
         });
@@ -226,8 +225,7 @@ function getBarPrognosisMappings() {
           transform: [
             {
               type: "filter",
-              expr:
-                "timeFormat(datum.xValue, '%Q') >= timeFormat(prognosisStartDate, '%Q')"
+              expr: "datum.xValue >= prognosisStartDate"
             }
           ]
         });

diff --git a/chartTypes/line/mapping.js b/chartTypes/line/mapping.js
@@ -240,13 +240,11 @@ module.exports = function getMappings() {
         // split the marks at the prognosisStart index
         const lineMark = clone(spec.marks[0].marks[0]);
         lineMark.encode.enter.defined = {
-          signal:
-            "datum.yValue !== null && timeFormat(datum.xValue, '%Q') <= timeFormat(prognosisStartDate, '%Q')"
+          signal: "datum.yValue !== null && datum.xValue <= prognosisStartDate"
         };
         const lineMarkPrognosis = clone(spec.marks[0].marks[0]);
         lineMarkPrognosis.encode.enter.defined = {
-          signal:
-            "datum.yValue !== null && timeFormat(datum.xValue, '%Q') >= timeFormat(prognosisStartDate, '%Q')"
+          signal: "datum.yValue !== null && datum.xValue >= prognosisStartDate"
         };
         lineMarkPrognosis.style = "prognosisLine";
         spec.marks[0].marks = [lineMark, lineMarkPrognosis];

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "q-chart",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "",
   "main": "index.js",
   "scripts": {