rename getBubbleSizFn -> makeBubbleSizeFn + put it separate file

Author: etpinard

src/components/drawing/index.js

@@ -13,6 +13,8 @@ var Plotly = require('../../plotly');
 var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
+var makeBubbleSizeFn = require('../../traces/scatter/make_bubble_size_func');
+
 var drawing = module.exports = {};
 
 // -----------------------------------------------------
@@ -175,7 +177,7 @@ drawing.pointStyle = function(s, trace) {
     // only scatter & box plots get marker path and opacity
     // bars, histograms don't
     if(Plotly.Plots.traceIs(trace, 'symbols')) {
-        var sizeFn = Plotly.Scatter.getBubbleSizeFn(trace);
+        var sizeFn = makeBubbleSizeFn(trace);
 
         s.attr('d', function(d) {
             var r;

src/traces/scatter/index.js

@@ -79,32 +79,6 @@ scatter.cleanData = function(fullData) {
 
 scatter.colorbar = require('./colorbar');
 
-// used in the drawing step for 'scatter' and 'scattegeo' and
-// in the convert step for 'scatter3d'
-scatter.getBubbleSizeFn = function(trace) {
-    var marker = trace.marker,
-        sizeRef = marker.sizeref || 1,
-        sizeMin = marker.sizemin || 0;
-
-    // for bubble charts, allow scaling the provided value linearly
-    // and by area or diameter.
-    // Note this only applies to the array-value sizes
-
-    var baseFn = marker.sizemode==='area' ?
-            function(v) { return Math.sqrt(v / sizeRef); } :
-            function(v) { return v / sizeRef; };
-
-    // TODO add support for position/negative bubbles?
-    // TODO add 'sizeoffset' attribute?
-    return function(v) {
-        var baseSize = baseFn(v / 2);
-
-        // don't show non-numeric and negative sizes
-        return (isNumeric(baseSize) && baseSize>0) ?
-            Math.max(baseSize, sizeMin) : 0;
-    };
-};
-
 scatter.calc = function(gd, trace) {
     var xa = Axes.getFromId(gd,trace.xaxis||'x'),
         ya = Axes.getFromId(gd,trace.yaxis||'y');

src/traces/scatter/make_bubble_size_func.js

@@ -0,0 +1,39 @@
+/**
+* Copyright 2012-2016, 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 isNumeric = require('fast-isnumeric');
+
+
+// used in the drawing step for 'scatter' and 'scattegeo' and
+// in the convert step for 'scatter3d'
+module.exports = function makeBubbleSizeFn(trace) {
+    var marker = trace.marker,
+        sizeRef = marker.sizeref || 1,
+        sizeMin = marker.sizemin || 0;
+
+    // for bubble charts, allow scaling the provided value linearly
+    // and by area or diameter.
+    // Note this only applies to the array-value sizes
+
+    var baseFn = marker.sizemode==='area' ?
+            function(v) { return Math.sqrt(v / sizeRef); } :
+            function(v) { return v / sizeRef; };
+
+    // TODO add support for position/negative bubbles?
+    // TODO add 'sizeoffset' attribute?
+    return function(v) {
+        var baseSize = baseFn(v / 2);
+
+        // don't show non-numeric and negative sizes
+        return (isNumeric(baseSize) && baseSize>0) ?
+            Math.max(baseSize, sizeMin) : 0;
+    };
+};

src/traces/scatter3d/convert.js

@@ -18,8 +18,7 @@ var triangulate = require('delaunay-triangulate');
 var Lib = require('../../lib');
 var str2RgbaArray = require('../../lib/str2rgbarray');
 var formatColor = require('../../lib/gl_format_color');
-
-var Scatter = require('../scatter');
+var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
 
 var DASH_PATTERNS = require('../../constants/gl3d_dashes.json');
 var MARKER_SYMBOLS = require('../../constants/gl_markers.json');
@@ -210,7 +209,7 @@ function convertPlotlyOptions(scene, data) {
     }
 
     if ('marker' in data) {
-        var sizeFn = Scatter.getBubbleSizeFn(data);
+        var sizeFn = makeBubbleSizeFn(data);
 
         params.scatterColor = formatColor(marker, 1, len);
         params.scatterSize = formatParam(marker.size, len, calculateSize, 20, sizeFn);

src/traces/scattergl/convert.js

@@ -24,6 +24,7 @@ var formatColor = require('../../lib/gl_format_color');
 var Scatter = require('../scatter');
 
 var ErrorBars = require('../../components/errorbars');
+var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
 
 var MARKER_SYMBOLS = require('../../constants/gl_markers.json');
 var DASHES = require('../../constants/gl2d_dashes.json');
@@ -418,7 +419,7 @@ proto.updateFancy = function(options) {
         this.scatterOptions.colors = new Array(pId * 4);
         this.scatterOptions.borderColors = new Array(pId * 4);
 
-        var markerSizeFunc = Scatter.getBubbleSizeFn(options),
+        var markerSizeFunc = makeBubbleSizeFn(options),
             markerOpts = options.marker,
             markerOpacity = markerOpts.opacity,
             traceOpacity = options.opacity,