fix texttemplate formatting for scattermapbox

... using a new formatLabels method. Notice that now the minus
    sign render correctly.

Author: etpinard

Diff for: src/traces/scattermapbox/convert.js

@@ -19,6 +19,7 @@ var Drawing = require('../../components/drawing');
 var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
 var subTypes = require('../scatter/subtypes');
 var convertTextOpts = require('../../plots/mapbox/convert_text_opts');
+var appendArrayPointValue = require('../../components/fx/helpers').appendArrayPointValue;
 
 var NEWLINES = require('../../lib/svg_text_utils').NEWLINES;
 var BR_TAG_ALL = require('../../lib/svg_text_utils').BR_TAG_ALL;
@@ -233,6 +234,7 @@ function makeCircleOpts(calcTrace) {
 }
 
 function makeSymbolGeoJSON(calcTrace, gd) {
+    var fullLayout = gd._fullLayout;
     var trace = calcTrace[0].trace;
 
     var marker = trace.marker || {};
@@ -253,18 +255,23 @@ function makeSymbolGeoJSON(calcTrace, gd) {
 
         if(isBADNUM(calcPt.lonlat)) continue;
 
-        var txt = trace.texttemplate;
-        if(txt) {
-            var txti = Array.isArray(txt) ? (txt[i] || '') : txt;
-            calcPt.text = calcPt.tx;
-            calcPt.lon = calcPt.lonlat[0];
-            calcPt.lat = calcPt.lonlat[1];
-            calcPt.customdata = calcPt.data;
-            calcPt.txt = Lib.texttemplateString(txti, {}, gd._fullLayout._d3locale, calcPt, trace._meta || {});
+        var texttemplate = trace.texttemplate;
+        var text;
+
+        if(texttemplate) {
+            var tt = Array.isArray(texttemplate) ? (texttemplate[i] || '') : texttemplate;
+            var labels = trace._module.formatLabels(calcPt, trace, fullLayout);
+            var pointValues = {};
+            appendArrayPointValue(pointValues, trace, calcPt.i);
+            var meta = trace._meta || {};
+            text = Lib.texttemplateString(tt, labels, fullLayout._d3locale, pointValues, calcPt, meta);
+        } else {
+            text = fillText(calcPt.tx);
         }
 
-        var text = txt ? calcPt.txt : fillText(calcPt.tx);
-        if(text) text = text.replace(NEWLINES, '').replace(BR_TAG_ALL, '\n');
+        if(text) {
+            text = text.replace(NEWLINES, '').replace(BR_TAG_ALL, '\n');
+        }
 
         features.push({
             type: 'Feature',

Diff for: src/traces/scattermapbox/format_labels.js

@@ -0,0 +1,24 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+var Axes = require('../../plots/cartesian/axes');
+
+module.exports = function formatLabels(cdi, trace, fullLayout) {
+    var labels = {};
+
+    var subplot = fullLayout[trace.subplot]._subplot;
+    var ax = subplot.mockAxis;
+
+    var lonlat = cdi.lonlat;
+    labels.lonLabel = Axes.tickText(ax, ax.c2l(lonlat[0]), true).text;
+    labels.latLabel = Axes.tickText(ax, ax.c2l(lonlat[1]), true).text;
+
+    return labels;
+};

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

@@ -64,6 +64,12 @@ module.exports = function hoverPoints(pointData, xval, yval) {
     pointData.y0 = yc - rad;
     pointData.y1 = yc + rad;
 
+    var fullLayout = {};
+    fullLayout[trace.subplot] = {_subplot: subplot};
+    var labels = trace._module.formatLabels(di, trace, fullLayout);
+    pointData.lonLabel = labels.lonLabel;
+    pointData.latLabel = labels.latLabel;
+
     pointData.color = getTraceColor(trace, di);
     pointData.extraText = getExtraText(trace, di, cd[0].t.labels);
     pointData.hovertemplate = trace.hovertemplate;
@@ -72,9 +78,7 @@ module.exports = function hoverPoints(pointData, xval, yval) {
 };
 
 function getExtraText(trace, di, labels) {
-    if(trace.hovertemplate) {
-        return;
-    }
+    if(trace.hovertemplate) return;
 
     var hoverinfo = di.hi || trace.hoverinfo;
     var parts = hoverinfo.split('+');

Diff for: src/traces/scattermapbox/index.js

@@ -12,6 +12,7 @@ module.exports = {
     attributes: require('./attributes'),
     supplyDefaults: require('./defaults'),
     colorbar: require('../scatter/marker_colorbar'),
+    formatLabels: require('./format_labels'),
     calc: require('../scattergeo/calc'),
     plot: require('./plot'),
     hoverPoints: require('./hover'),

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

@@ -1,6 +1,7 @@
 var Plotly = require('@lib');
 var Plots = require('@src/plots/plots');
 var Lib = require('@src/lib');
+var Axes = require('@src/plots/cartesian/axes');
 
 var ScatterMapbox = require('@src/traces/scattermapbox');
 var convert = require('@src/traces/scattermapbox/convert');
@@ -139,7 +140,15 @@ describe('scattermapbox convert', function() {
         Plots.doCalcdata(gd, fullTrace);
 
         var calcTrace = gd.calcdata[0];
-        return convert({_fullLayout: {_d3locale: false}}, calcTrace);
+
+        var mockAxis = {type: 'linear'};
+        Axes.setConvert(mockAxis, gd._fullLayout);
+
+        gd._fullLayout.mapbox._subplot = {
+            mockAxis: mockAxis
+        };
+
+        return convert(gd, calcTrace);
     }
 
     function assertVisibility(opts, expectations) {
@@ -536,9 +545,9 @@ describe('scattermapbox convert', function() {
         });
 
         expect(actualText).toEqual([
-            'Montreal (-73.57, 45.5): 1.8M',
-            'Toronto (-79.24, 43.4): 2.9M',
-            'Vancouver (-123.06, 49.13): 680k'
+            'Montreal (−73.57, 45.5): 1.8M',
+            'Toronto (−79.24, 43.4): 2.9M',
+            'Vancouver (−123.06, 49.13): 680k'
         ]);
     });