fix scattergeo handling of '' text items

etpinard · etpinard · commit 9df444da8f27 · 2017-01-04T17:31:16.000-05:00
diff --git a/src/traces/scattergeo/hover.js b/src/traces/scattergeo/hover.js
@@ -102,7 +102,10 @@ function getExtraText(trace, pt, axis) {
     else if(hasLon) text.push('lon: ' + format(pt.lonlat[0]));
     else if(hasLat) text.push('lat: ' + format(pt.lonlat[1]));
 
-    if(hasText) text.push(pt.tx || trace.text);
+    if(hasText) {
+        var tx = pt.tx || trace.text;
+        if(!Array.isArray(tx)) text.push(tx);
+    }
 
     return text.join('<br>');
 }
diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js
@@ -420,25 +420,54 @@ describe('Test geo interactions', function() {
         });
 
         describe('scattergeo hover labels', function() {
-            beforeEach(function() {
-                mouseEventScatterGeo('mousemove');
-            });
-
             it('should show one hover text group', function() {
+                mouseEventScatterGeo('mousemove');
                 expect(d3.selectAll('g.hovertext').size()).toEqual(1);
             });
 
             it('should show longitude and latitude values', function() {
-                var node = d3.selectAll('g.hovertext').selectAll('tspan')[0][0];
+                mouseEventScatterGeo('mousemove');
 
+                var node = d3.selectAll('g.hovertext').selectAll('tspan')[0][0];
                 expect(node.innerHTML).toEqual('(0°, 0°)');
             });
 
             it('should show the trace name', function() {
-                var node = d3.selectAll('g.hovertext').selectAll('text')[0][0];
+                mouseEventScatterGeo('mousemove');
 
+                var node = d3.selectAll('g.hovertext').selectAll('text')[0][0];
                 expect(node.innerHTML).toEqual('trace 0');
             });
+
+            it('should show *text* (case 1)', function(done) {
+                Plotly.restyle(gd, 'text', [['A', 'B']]).then(function() {
+                    mouseEventScatterGeo('mousemove');
+
+                    var node = d3.selectAll('g.hovertext').selectAll('tspan')[0][1];
+                    expect(node.innerHTML).toEqual('A');
+                })
+                .then(done);
+            });
+
+            it('should show *text* (case 2)', function(done) {
+                Plotly.restyle(gd, 'text', [[null, 'B']]).then(function() {
+                    mouseEventScatterGeo('mousemove');
+
+                    var node = d3.selectAll('g.hovertext').selectAll('tspan')[0][1];
+                    expect(node).toBeUndefined();
+                })
+                .then(done);
+            });
+
+            it('should show *text* (case 3)', function(done) {
+                Plotly.restyle(gd, 'text', [['', 'B']]).then(function() {
+                    mouseEventScatterGeo('mousemove');
+
+                    var node = d3.selectAll('g.hovertext').selectAll('tspan')[0][1];
+                    expect(node).toBeUndefined();
+                })
+                .then(done);
+            });
         });
 
         describe('scattergeo hover events', function() {
