fill rLabel and thetaLabel during scatterpolar and barpolar hover

Author: etpinard

Diff for: src/traces/scatterpolar/hover.js

@@ -42,26 +42,26 @@ function makeHoverPointText(cdi, trace, subplot, pointData) {
     radialAxis._hovertitle = 'r';
     angularAxis._hovertitle = 'θ';
 
+    var rVal = radialAxis.c2l(cdi.r);
+    pointData.rLabel = Axes.tickText(radialAxis, rVal, 'hover').text;
+
+    // N.B here the ° sign is part of the formatted value for thetaunit:'degrees'
+    var thetaVal = angularAxis.thetaunit === 'degrees' ? Lib.rad2deg(cdi.theta) : cdi.theta;
+    pointData.thetaLabel = Axes.tickText(angularAxis, thetaVal, 'hover').text;
+
     var hoverinfo = cdi.hi || trace.hoverinfo;
     var text = [];
     function textPart(ax, val) {
-        text.push(ax._hovertitle + ': ' + Axes.tickText(ax, val, 'hover').text);
+        text.push(ax._hovertitle + ': ' + val);
     }
 
     if(!trace.hovertemplate) {
         var parts = hoverinfo.split('+');
 
         if(parts.indexOf('all') !== -1) parts = ['r', 'theta', 'text'];
-        if(parts.indexOf('r') !== -1) {
-            textPart(radialAxis, radialAxis.c2l(cdi.r));
-        }
-        if(parts.indexOf('theta') !== -1) {
-            var theta = cdi.theta;
-            textPart(
-                angularAxis,
-                angularAxis.thetaunit === 'degrees' ? Lib.rad2deg(theta) : theta
-            );
-        }
+        if(parts.indexOf('r') !== -1) textPart(radialAxis, pointData.rLabel);
+        if(parts.indexOf('theta') !== -1) textPart(angularAxis, pointData.thetaLabel);
+
         if(parts.indexOf('text') !== -1 && pointData.text) {
             text.push(pointData.text);
             delete pointData.text;

Diff for: test/jasmine/tests/barpolar_test.js

@@ -128,6 +128,8 @@ describe('Test barpolar hover:', function() {
             index: 0,
             x: 263.33,
             y: 200,
+            rLabel: '1',
+            thetaLabel: '0°',
             hovertemplate: 'tpl',
             color: '#1f77b4'
         }

Diff for: test/jasmine/tests/scatterpolar_test.js

@@ -115,7 +115,7 @@ describe('Test scatterpolar hover:', function() {
             fig.data[2].hovertemplate = 'template %{r} %{theta}';
             return fig;
         },
-        nums: 'template 4.02289202968 128.342009045',
+        nums: 'template 4.022892 128.342°',
         name: 'Trial 3'
     }, {
         desc: 'with hovertemplate and empty trace name',
@@ -124,7 +124,7 @@ describe('Test scatterpolar hover:', function() {
             fig.data[2].name = '';
             return fig;
         },
-        nums: 'template 4.02289202968 128.342009045',
+        nums: 'template 4.022892 128.342°',
         name: ''
     }, {
         desc: '(no labels - out of sector)',

Diff for: test/jasmine/tests/scatterpolargl_test.js

@@ -50,7 +50,7 @@ describe('Test scatterpolargl hover:', function() {
             fig.data[2].hovertemplate = 'template %{r} %{theta}';
             return fig;
         },
-        nums: 'template 3.88601339194 125.282157112',
+        nums: 'template 3.886013 125.2822°',
         name: 'Trial 3'
     }, {
         desc: '(no labels - out of sector)',