apply UTC time only to bar length for now

archmoj · archmoj · commit 61559659ea0b · 2020-06-04T12:17:50.000-04:00
diff --git a/src/plots/cartesian/set_convert.js b/src/plots/cartesian/set_convert.js
@@ -90,7 +90,7 @@ module.exports = function setConvert(ax, fullLayout) {
      * - inserts a dummy arg so calendar is the 3rd arg (see notes below).
      * - defaults to ax.calendar
      */
-    function dt2ms(v, _, calendar) {
+    function dt2ms(v, _, calendar, msUTC) {
         // NOTE: Changed this behavior: previously we took any numeric value
         // to be a ms, even if it was a string that could be a bare year.
         // Now we convert it as a date if at all possible, and only try
@@ -106,7 +106,12 @@ module.exports = function setConvert(ax, fullLayout) {
 
                 var d = new Date(msRounded);
                 ms = dateTime2ms(d) + msecTenths / 10;
-                ms += d.getTimezoneOffset() * ONEMIN;
+                if(msUTC) {
+                    // For now it is only used
+                    // to fix bar length in milliseconds.
+                    // It could be applied in other places in v2
+                    ms += d.getTimezoneOffset() * ONEMIN;
+                }
             } else return BADNUM;
         }
         return ms;
@@ -794,7 +799,7 @@ module.exports = function setConvert(ax, fullLayout) {
     //          the first letter of ax._id?)
     // in case the expected data isn't there, make a list of
     // integers based on the opposite data
-    ax.makeCalcdata = function(trace, axLetter) {
+    ax.makeCalcdata = function(trace, axLetter, msUTC) {
         var arrayIn, arrayOut, i, len;
 
         var axType = ax.type;
@@ -818,10 +823,10 @@ module.exports = function setConvert(ax, fullLayout) {
 
             arrayOut = new Array(len);
             for(i = 0; i < len; i++) {
-                arrayOut[i] = ax.d2c(arrayIn[i], 0, cal);
+                arrayOut[i] = ax.d2c(arrayIn[i], 0, cal, msUTC);
             }
         } else {
-            var v0 = ((axLetter + '0') in trace) ? ax.d2c(trace[axLetter + '0'], 0, cal) : 0;
+            var v0 = ((axLetter + '0') in trace) ? ax.d2c(trace[axLetter + '0'], 0, cal, false) : 0;
             var dv = (trace['d' + axLetter]) ? Number(trace['d' + axLetter]) : 1;
 
             // the opposing data, for size if we have x and dx etc
diff --git a/src/traces/bar/calc.js b/src/traces/bar/calc.js
@@ -19,12 +19,14 @@ module.exports = function calc(gd, trace) {
     var ya = Axes.getFromId(gd, trace.yaxis || 'y');
     var size, pos;
 
+    var msUTC = !!(trace.base || trace.base === 0);
+
     if(trace.orientation === 'h') {
-        size = xa.makeCalcdata(trace, 'x');
-        pos = ya.makeCalcdata(trace, 'y');
+        size = xa.makeCalcdata(trace, 'x', msUTC);
+        pos = ya.makeCalcdata(trace, 'y', msUTC);
     } else {
-        size = ya.makeCalcdata(trace, 'y');
-        pos = xa.makeCalcdata(trace, 'x');
+        size = ya.makeCalcdata(trace, 'y', msUTC);
+        pos = xa.makeCalcdata(trace, 'x', msUTC);
     }
 
     // create the "calculated data" to plot
