texttemplate for scattermapbox: fix editType, improve style and mock

Author: antoinerg

src/traces/scattermapbox/attributes.js

@@ -50,7 +50,7 @@ module.exports = overrideAll({
             'these elements will be seen in the hover labels.'
         ].join(' ')
     }),
-    texttemplate: texttemplateAttrs({editType: 'calc'}, {
+    texttemplate: texttemplateAttrs({editType: 'plot'}, {
         keys: ['lat', 'lon', 'text']
     }),
     hovertext: extendFlat({}, scatterAttrs.hovertext, {

src/traces/scattermapbox/convert.js

@@ -20,7 +20,7 @@ var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
 var subTypes = require('../scatter/subtypes');
 var convertTextOpts = require('../../plots/mapbox/convert_text_opts');
 
-module.exports = function convert(calcTrace, gd) {
+module.exports = function convert(gd, calcTrace) {
     var trace = calcTrace[0].trace;
 
     var isVisible = (trace.visible === true && trace._length !== 0);

src/traces/scattermapbox/plot.js

@@ -67,7 +67,7 @@ proto.addLayer = function(k, opts, below) {
 proto.update = function update(calcTrace) {
     var subplot = this.subplot;
     var map = subplot.map;
-    var optsAll = convert(calcTrace, subplot.gd);
+    var optsAll = convert(subplot.gd, calcTrace);
     var below = subplot.belowLookup['trace-' + this.uid];
     var i, k, opts;
 
@@ -113,7 +113,7 @@ proto.dispose = function dispose() {
 module.exports = function createScatterMapbox(subplot, calcTrace) {
     var trace = calcTrace[0].trace;
     var scatterMapbox = new ScatterMapbox(subplot, trace.uid);
-    var optsAll = convert(calcTrace, subplot.gd);
+    var optsAll = convert(subplot.gd, calcTrace);
     var below = scatterMapbox.below = subplot.belowLookup['trace-' + trace.uid];
 
     for(var i = 0; i < ORDER.length; i++) {

test/image/mocks/mapbox_texttemplate.json

@@ -17,7 +17,7 @@
       "Toronto",
       "Vancouver"
     ],
-    "texttemplate": "%{text} (%{lonlat[0]}, %{lonlat[1]}): %{customdata:.2s}",
+    "texttemplate": "%{text} (%{lon}, %{lat}): %{customdata:.2s}",
     "textposition": "top center",
     "customdata": [1780000, 2930000, 675218]
   }],

test/jasmine/tests/scattermapbox_test.js

@@ -139,7 +139,7 @@ describe('scattermapbox convert', function() {
         Plots.doCalcdata(gd, fullTrace);
 
         var calcTrace = gd.calcdata[0];
-        return convert(calcTrace, {_fullLayout: {_d3locale: false}});
+        return convert({_fullLayout: {_d3locale: false}}, calcTrace);
     }
 
     function assertVisibility(opts, expectations) {
@@ -500,7 +500,7 @@ describe('scattermapbox convert', function() {
             'lon': [-73.57, -79.24, -123.06],
             'lat': [45.5, 43.4, 49.13],
             'text': ['Montreal', 'Toronto', 'Vancouver'],
-            'texttemplate': '%{text} (%{lonlat[0]}, %{lonlat[1]}): %{customdata:.2s}',
+            'texttemplate': '%{text} (%{lon}, %{lat}): %{customdata:.2s}',
             'textposition': 'top center',
             'customdata': [1780000, 2930000, 675218]
         };