sub startx/starty/startz -> starts.(x|y|z)

Author: etpinard

src/traces/streamtube/attributes.js

@@ -52,26 +52,28 @@ var attrs = {
         description: 'Sets the z components of the vector field.'
     },
 
-    startx: {
-        valType: 'data_array',
-        editType: 'calc',
-        description: [
-            'Sets the x components of the starting position of the streamtubes',
-        ].join(' ')
-    },
-    starty: {
-        valType: 'data_array',
-        editType: 'calc',
-        description: [
-            'Sets the y components of the starting position of the streamtubes',
-        ].join(' ')
-    },
-    startz: {
-        valType: 'data_array',
-        editType: 'calc',
-        description: [
-            'Sets the z components of the starting position of the streamtubes',
-        ].join(' ')
+    starts: {
+        x: {
+            valType: 'data_array',
+            editType: 'calc',
+            description: [
+                'Sets the x components of the starting position of the streamtubes',
+            ].join(' ')
+        },
+        y: {
+            valType: 'data_array',
+            editType: 'calc',
+            description: [
+                'Sets the y components of the starting position of the streamtubes',
+            ].join(' ')
+        },
+        z: {
+            valType: 'data_array',
+            editType: 'calc',
+            description: [
+                'Sets the z components of the starting position of the streamtubes',
+            ].join(' ')
+        }
     },
 
     maxdisplayed: {

src/traces/streamtube/calc.js

@@ -21,10 +21,14 @@ module.exports = function calc(gd, trace) {
     var z = trace.z;
     var len = Math.min(x.length, y.length, z.length, u.length, v.length, w.length);
 
-    var startx = trace.startx || [];
-    var starty = trace.starty || [];
-    var startz = trace.startz || [];
-    var slen = Math.min(startx.length, starty.length, startz.length);
+    var slen = 0;
+    var startx, starty, startz;
+    if(trace.starts) {
+        startx = trace.starts.x || [];
+        starty = trace.starts.y || [];
+        startz = trace.starts.z || [];
+        slen = Math.min(startx.length, starty.length, startz.length);
+    }
 
     var normMax = 0;
     var normMin = Infinity;

src/traces/streamtube/convert.js

@@ -107,12 +107,12 @@ function convert(scene, trace) {
 
     tubeOpts.meshgrid = [meshx, meshy, meshz];
 
-    if(trace.startx && trace.starty && trace.startz) {
+    if(trace.starts) {
         var slen = trace._slen;
         tubeOpts.startingPositions = zip3(
-            toDataCoords(trace.startx.slice(0, slen), 'xaxis'),
-            toDataCoords(trace.starty.slice(0, slen), 'yaxis'),
-            toDataCoords(trace.startz.slice(0, slen), 'zaxis')
+            toDataCoords(trace.starts.x.slice(0, slen), 'xaxis'),
+            toDataCoords(trace.starts.y.slice(0, slen), 'yaxis'),
+            toDataCoords(trace.starts.z.slice(0, slen), 'zaxis')
         );
     } else {
         // Default starting positions: cut xz plane at min-y,

src/traces/streamtube/defaults.js

@@ -34,9 +34,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return;
     }
 
-    coerce('startx');
-    coerce('starty');
-    coerce('startz');
+    coerce('starts.x');
+    coerce('starts.y');
+    coerce('starts.z');
 
     coerce('maxdisplayed');
     coerce('sizeref');
@@ -56,6 +56,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     // disable 1D transforms (for now)
     // x/y/z and u/v/w have matching lengths,
-    // but they don't have to match with start(x|y|z)
+    // but they don't have to match with starts.(x|y|z)
     traceOut._length = null;
 };

src/traces/streamtube/index.js

@@ -49,8 +49,8 @@ module.exports = {
             '',
             'By default, the tubes\' starting positions will be cut from the vector field\'s',
             'x-z plane at its minimum y value.',
-            'To specify your own starting position, use attributes `startx`, `starty`',
-            'and `startz`.'
+            'To specify your own starting position, use attributes `starts.x`, `starts.y`',
+            'and `starts.z`.'
         ].join(' ')
     }
 };

test/image/mocks/gl3d_cone-with-streamtube.json

@@ -135648,60 +135648,62 @@
         -0.25592,
         -0.61511
       ],
-      "startx": [
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80,
-        80
-      ],
-      "starty": [
-        20,
-        30,
-        40,
-        50,
-        20,
-        30,
-        40,
-        50,
-        20,
-        30,
-        40,
-        50,
-        20,
-        30,
-        40,
-        50
-      ],
-      "startz": [
-        0,
-        0,
-        0,
-        0,
-        5,
-        5,
-        5,
-        5,
-        10,
-        10,
-        10,
-        10,
-        15,
-        15,
-        15,
-        15
-      ],
+      "starts": {
+        "x": [
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80,
+          80
+        ],
+        "y": [
+          20,
+          30,
+          40,
+          50,
+          20,
+          30,
+          40,
+          50,
+          20,
+          30,
+          40,
+          50,
+          20,
+          30,
+          40,
+          50
+        ],
+        "z": [
+          0,
+          0,
+          0,
+          0,
+          5,
+          5,
+          5,
+          5,
+          10,
+          10,
+          10,
+          10,
+          15,
+          15,
+          15,
+          15
+        ]
+      },
       "sizeref": 0.6,
       "colorscale": "Portland",
       "showscale": false,