fill lonLabel and latLabel for scattergeo traces

Author: etpinard

src/traces/scattergeo/hover.js

@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var Fx = require('../../components/fx');
@@ -64,17 +63,19 @@ module.exports = function hoverPoints(pointData, xval, yval) {
     pointData.lon = lonlat[0];
     pointData.lat = lonlat[1];
 
+    var ax = geo.mockAxis;
+    pointData.lonLabel = Axes.tickText(ax, ax.c2l(pointData.lon), 'hover').text;
+    pointData.latLabel = Axes.tickText(ax, ax.c2l(pointData.lat), 'hover').text;
+
     pointData.color = getTraceColor(trace, di);
-    pointData.extraText = getExtraText(trace, di, geo.mockAxis, cd[0].t.labels);
+    pointData.extraText = getExtraText(trace, di, pointData, cd[0].t.labels);
     pointData.hovertemplate = trace.hovertemplate;
 
     return [pointData];
 };
 
-function getExtraText(trace, pt, axis, labels) {
-    if(trace.hovertemplate) {
-        return;
-    }
+function getExtraText(trace, pt, pointData, labels) {
+    if(trace.hovertemplate) return;
 
     var hoverinfo = pt.hi || trace.hoverinfo;
 
@@ -88,18 +89,16 @@ function getExtraText(trace, pt, axis, labels) {
     var hasText = (parts.indexOf('text') !== -1);
     var text = [];
 
-    function format(val) {
-        return Axes.tickText(axis, axis.c2l(val), 'hover').text + '\u00B0';
-    }
+    function format(val) { return val + '\u00B0'; }
 
     if(hasLocation) {
         text.push(pt.loc);
     } else if(hasLon && hasLat) {
-        text.push('(' + format(pt.lonlat[0]) + ', ' + format(pt.lonlat[1]) + ')');
+        text.push('(' + format(pointData.lonLabel) + ', ' + format(pointData.latLabel) + ')');
     } else if(hasLon) {
-        text.push(labels.lon + format(pt.lonlat[0]));
+        text.push(labels.lon + format(pointData.lonLabel));
     } else if(hasLat) {
-        text.push(labels.lat + format(pt.lonlat[1]));
+        text.push(labels.lat + format(pointData.latLabel));
     }
 
     if(hasText) {

test/jasmine/tests/scattergeo_test.js

@@ -358,6 +358,32 @@ describe('Test scattergeo hover', function() {
         .catch(failTest)
         .then(done);
     });
+
+    describe('should preserve lon/lat formatting hovetemplate equivalence', function() {
+        var pos = [381, 221];
+        var exp = ['(10.00012°, 10.00088°)\nA'];
+
+        it('- base case (truncate z decimals)', function(done) {
+            Plotly.restyle(gd, {
+                lon: [[10.0001221321]],
+                lat: [[10.00087683]]
+            })
+            .then(function() { check(pos, exp); })
+            .catch(failTest)
+            .then(done);
+        });
+
+        it('- hovertemplate case (same lon/lat truncation)', function(done) {
+            Plotly.restyle(gd, {
+                lon: [[10.0001221321]],
+                lat: [[10.00087683]],
+                hovertemplate: '(%{lon}°, %{lat}°)<br>%{text}<extra></extra>'
+            })
+            .then(function() { check(pos, exp); })
+            .catch(failTest)
+            .then(done);
+        });
+    });
 });
 
 describe('scattergeo drawing', function() {