display original position in hover for scatter and bar traces

Author: archmoj

src/plots/cartesian/align_period.js

@@ -44,6 +44,7 @@ module.exports = function alignPeriod(trace, ax, axLetter, vals) {
         var period0 = trace[axLetter + 'period0'];
         var base = (dateTime2ms(period0, calendar) || 0) - offset;
 
+        var newVals = [];
         var len = vals.length;
         for(var i = 0; i < len; i++) {
             var v = vals[i] - base;
@@ -98,10 +99,9 @@ module.exports = function alignPeriod(trace, ax, axLetter, vals) {
                 );
             }
 
-            if(newD) {
-                vals[i] = newD.getTime() + base;
-            }
+            newVals[i] = newD ? newD.getTime() + base : vals[i];
         }
+        return newVals;
     }
     return vals;
 };

src/traces/bar/calc.js

@@ -18,20 +18,23 @@ var calcSelection = require('../scatter/calc_selection');
 module.exports = function calc(gd, trace) {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x');
     var ya = Axes.getFromId(gd, trace.yaxis || 'y');
-    var size, pos;
+    var size, pos, oPos;
 
     var sizeOpts = {
         msUTC: !!(trace.base || trace.base === 0)
     };
 
+    var hasPeriod;
     if(trace.orientation === 'h') {
         size = xa.makeCalcdata(trace, 'x', sizeOpts);
-        pos = ya.makeCalcdata(trace, 'y');
-        pos = alignPeriod(trace, ya, 'y', pos);
+        oPos = ya.makeCalcdata(trace, 'y');
+        pos = alignPeriod(trace, ya, 'y', oPos);
+        hasPeriod = !!trace.yperiodalignment;
     } else {
         size = ya.makeCalcdata(trace, 'y', sizeOpts);
-        pos = xa.makeCalcdata(trace, 'x');
-        pos = alignPeriod(trace, xa, 'x', pos);
+        oPos = xa.makeCalcdata(trace, 'x');
+        pos = alignPeriod(trace, xa, 'x', oPos);
+        hasPeriod = !!trace.xperiodalignment;
     }
 
     // create the "calculated data" to plot
@@ -42,6 +45,10 @@ module.exports = function calc(gd, trace) {
     for(var i = 0; i < serieslen; i++) {
         cd[i] = { p: pos[i], s: size[i] };
 
+        if(hasPeriod) {
+            cd[i].orig_p = oPos[i]; // used by hover
+        }
+
         if(trace.ids) {
             cd[i].id = String(trace.ids[i]);
         }

src/traces/bar/hover.js

@@ -158,7 +158,9 @@ function hoverOnBars(pointData, xval, yval, hovermode) {
     var extent = t.extents[t.extents.round(di.p)];
     pointData[posLetter + '0'] = pa.c2p(isClosest ? minPos(di) : extent[0], true);
     pointData[posLetter + '1'] = pa.c2p(isClosest ? maxPos(di) : extent[1], true);
-    pointData[posLetter + 'LabelVal'] = di.p;
+
+    var hasPeriod = di.orig_p !== undefined;
+    pointData[posLetter + 'LabelVal'] = hasPeriod ? di.orig_p : di.p;
 
     pointData.labelLabel = hoverLabelText(pa, pointData[posLetter + 'LabelVal']);
     pointData.valueLabel = hoverLabelText(sa, pointData[sizeLetter + 'LabelVal']);

src/traces/scatter/calc.js

@@ -24,10 +24,10 @@ function calc(gd, trace) {
     var fullLayout = gd._fullLayout;
     var xa = Axes.getFromId(gd, trace.xaxis || 'x');
     var ya = Axes.getFromId(gd, trace.yaxis || 'y');
-    var x = xa.makeCalcdata(trace, 'x');
-    var y = ya.makeCalcdata(trace, 'y');
-    x = alignPeriod(trace, xa, 'x', x);
-    y = alignPeriod(trace, ya, 'y', y);
+    var oX = xa.makeCalcdata(trace, 'x');
+    var oY = ya.makeCalcdata(trace, 'y');
+    var x = alignPeriod(trace, xa, 'x', oX);
+    var y = alignPeriod(trace, ya, 'y', oY);
 
     var serieslen = trace._length;
     var cd = new Array(serieslen);
@@ -59,13 +59,23 @@ function calc(gd, trace) {
         calcAxisExpansion(gd, trace, xa, ya, x, y, ppad);
     }
 
+    var hasPeriodX = !!trace.xperiodalignment;
+    var hasPeriodY = !!trace.yperiodalignment;
+
     for(i = 0; i < serieslen; i++) {
         var cdi = cd[i] = {};
         var xValid = isNumeric(x[i]);
         var yValid = isNumeric(y[i]);
         if(xValid && yValid) {
             cdi[xAttr] = x[i];
             cdi[yAttr] = y[i];
+
+            if(hasPeriodX) {
+                cdi.orig_x = oX[i];
+            }
+            if(hasPeriodY) {
+                cdi.orig_y = oY[i];
+            }
         } else if(stackGroupOpts && (isV ? xValid : yValid)) {
             // if we're stacking we need to hold on to all valid positions
             // even with invalid sizes

src/traces/scatter/hover.js

@@ -78,8 +78,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
             // the normalized individual sizes, so that's what I'm doing here
             // for now.
             var sizeVal = orientation && (di.sNorm || di.s);
-            var xLabelVal = (orientation === 'h') ? sizeVal : di.x;
-            var yLabelVal = (orientation === 'v') ? sizeVal : di.y;
+            var xLabelVal = (orientation === 'h') ? sizeVal : di.orig_x !== undefined ? di.orig_x : di.x;
+            var yLabelVal = (orientation === 'v') ? sizeVal : di.orig_y !== undefined ? di.orig_y : di.y;
 
             Lib.extendFlat(pointData, {
                 color: getTraceColor(trace, di),