clean up scene computeTraceBounds

Author: etpinard

src/plots/gl3d/scene.js

@@ -306,41 +306,44 @@ proto.recoverContext = function() {
 
 var axisProperties = [ 'xaxis', 'yaxis', 'zaxis' ];
 
-function coordinateBound(axis, coord, len, d, bounds, calendar) {
-    var x;
-    if(!Lib.isArrayOrTypedArray(coord)) {
-        bounds[0][d] = Math.min(bounds[0][d], 0);
-        bounds[1][d] = Math.max(bounds[1][d], len - 1);
-        return;
-    }
+function computeTraceBounds(scene, trace, bounds) {
+    var sceneLayout = scene.fullSceneLayout;
 
-    for(var i = 0; i < (len || coord.length); ++i) {
-        if(Lib.isArrayOrTypedArray(coord[i])) {
-            for(var j = 0; j < coord[i].length; ++j) {
-                x = axis.d2l(coord[i][j], 0, calendar);
-                if(!isNaN(x) && isFinite(x)) {
-                    bounds[0][d] = Math.min(bounds[0][d], x);
-                    bounds[1][d] = Math.max(bounds[1][d], x);
+    for(var d = 0; d < 3; d++) {
+        var axisName = axisProperties[d];
+        var axLetter = axisName.charAt(0);
+        var ax = sceneLayout[axisName];
+        var coords = trace[axLetter];
+        var calendar = trace[axLetter + 'calendar'];
+        var len = trace['_' + axLetter + 'length'];
+
+        if(!Lib.isArrayOrTypedArray(coords)) {
+            bounds[0][d] = Math.min(bounds[0][d], 0);
+            bounds[1][d] = Math.max(bounds[1][d], len - 1);
+        } else {
+            var v;
+
+            for(var i = 0; i < (len || coords.length); i++) {
+                if(Lib.isArrayOrTypedArray(coords[i])) {
+                    for(var j = 0; j < coords[i].length; ++j) {
+                        v = ax.d2l(coords[i][j], 0, calendar);
+                        if(!isNaN(v) && isFinite(v)) {
+                            bounds[0][d] = Math.min(bounds[0][d], v);
+                            bounds[1][d] = Math.max(bounds[1][d], v);
+                        }
+                    }
+                } else {
+                    v = ax.d2l(coords[i], 0, calendar);
+                    if(!isNaN(v) && isFinite(v)) {
+                        bounds[0][d] = Math.min(bounds[0][d], v);
+                        bounds[1][d] = Math.max(bounds[1][d], v);
+                    }
                 }
             }
         }
-        else {
-            x = axis.d2l(coord[i], 0, calendar);
-            if(!isNaN(x) && isFinite(x)) {
-                bounds[0][d] = Math.min(bounds[0][d], x);
-                bounds[1][d] = Math.max(bounds[1][d], x);
-            }
-        }
     }
 }
 
-function computeTraceBounds(scene, trace, bounds) {
-    var sceneLayout = scene.fullSceneLayout;
-    coordinateBound(sceneLayout.xaxis, trace.x, trace._xlength, 0, bounds, trace.xcalendar);
-    coordinateBound(sceneLayout.yaxis, trace.y, trace._ylength, 1, bounds, trace.ycalendar);
-    coordinateBound(sceneLayout.zaxis, trace.z, trace._zlength, 2, bounds, trace.zcalendar);
-}
-
 proto.plot = function(sceneData, fullLayout, layout) {
 
     // Save parameters