texttemplate: DRY code for gl(2|3)d traces, pass meta to scatter3d

Author: antoinerg

src/traces/scatter3d/convert.js

@@ -242,24 +242,18 @@ function convertPlotlyOptions(scene, data) {
     }
 
     // check texttemplate
-    if(data.texttemplate) {
+    var texttemplate = data.texttemplate;
+    if(texttemplate) {
+        var isArray = Array.isArray(texttemplate);
+        var N = isArray ? Math.min(texttemplate.length, len) : len;
+        var txt = isArray ? function(i) {return texttemplate[i];} : function() { return texttemplate;};
         var d3locale = scene.fullLayout._d3locale;
-        if(Array.isArray(data.texttemplate)) {
-            text = new Array(data.texttemplate.length);
-            for(i = 0; i < Math.min(len, data.texttemplate.length); i++) {
-                var pt = {};
-                pt.text = text[i];
-                appendArrayPointValue(pt, data, i);
-                text[i] = Lib.texttemplateString(data.texttemplate[i], pt, d3locale, pt);
-            }
-        } else {
-            text = new Array(len);
-            for(i = 0; i < len; i++) {
-                var pt1 = {};
-                pt1.text = text[i];
-                appendArrayPointValue(pt1, data, i);
-                text[i] = Lib.texttemplateString(data.texttemplate, pt1, d3locale, pt1);
-            }
+        text = new Array(N);
+        for(i = 0; i < N; i++) {
+            var pt = {};
+            pt.text = text[i];
+            appendArrayPointValue(pt, data, i);
+            text[i] = Lib.texttemplateString(txt(i), pt, d3locale, pt, data._meta || {});
         }
     }
 

src/traces/scattergl/convert.js

@@ -115,21 +115,15 @@ function convertTextStyle(trace, gd) {
 
     var texttemplate = trace.texttemplate;
     if(texttemplate) {
-        var d3locale = gd._fullLayout._d3locale;
         optsOut.text = [];
-        var pt;
-        if(Array.isArray(texttemplate)) {
-            for(i = 0; i < Math.min(texttemplate.length, count); i++) {
-                pt = {};
-                appendArrayPointValue(pt, trace, i);
-                optsOut.text.push(Lib.texttemplateString(texttemplate[i], pt, d3locale, pt, trace._meta || {}));
-            }
-        } else {
-            for(i = 0; i < count; i++) {
-                pt = {};
-                appendArrayPointValue(pt, trace, i);
-                optsOut.text.push(Lib.texttemplateString(texttemplate, pt, d3locale, pt, trace._meta || {}));
-            }
+        var isArray = Array.isArray(texttemplate);
+        var N = isArray ? Math.min(texttemplate.length, count) : count;
+        var txt = isArray ? function(i) {return texttemplate[i];} : function() { return texttemplate;};
+        var d3locale = gd._fullLayout._d3locale;
+        for(i = 0; i < N; i++) {
+            var pt = {};
+            appendArrayPointValue(pt, trace, i);
+            optsOut.text.push(Lib.texttemplateString(txt(i), pt, d3locale, pt, trace._meta || {}));
         }
     } else {
         if(Array.isArray(trace.text) && trace.text.length < count) {

test/image/baselines/gl3d_scatter3d-texttemplate.png

@@ -12,7 +12,8 @@
         "x": [2, 1, 0],
         "y": [0, 4, 1],
         "z": [-5, -2, 4],
-        "texttemplate": ["1", "2"],
+        "texttemplate": ["1", "2 with %{meta.text}"],
+        "meta": {"text": "meta"},
         "mode": "markers+text"
       }],
   "layout": {