Update plotting calls to work agnostically using registered modules

Author: mdtusz

src/plots/geo/geo.js

@@ -14,14 +14,13 @@
 var Plotly = require('../../plotly');
 var d3 = require('d3');
 
+var Plots = require('../../plots/plots');
+
 var addProjectionsToD3 = require('./projections');
 var createGeoScale = require('./set_scale');
 var createGeoZoom = require('./zoom');
 var createGeoZoomReset = require('./zoom_reset');
 
-var plotScatterGeo = require('../../traces/scattergeo/plot');
-var plotChoropleth = require('../../traces/choropleth/plot');
-
 var constants = require('../../constants/geo_constants');
 var topojsonUtils = require('../../lib/topojson_utils');
 var topojsonFeature = require('topojson').feature;
@@ -136,21 +135,20 @@ proto.plot = function(geoData, fullLayout, promises) {
 };
 
 proto.onceTopojsonIsLoaded = function(geoData, geoLayout) {
-    var scattergeoData = [],
-        choroplethData = [];
+    var traceData = {};
 
     this.drawLayout(geoLayout);
 
     for(var i = 0; i < geoData.length; i++) {
         var trace = geoData[i];
-        var traceType = trace.type;
 
-        if(traceType === 'scattergeo') scattergeoData.push(trace);
-        else if(traceType === 'choropleth') choroplethData.push(trace);
+        traceData[trace.type] = traceData[trace.type] || [];
+        traceData[trace.type].push(trace);
     }
 
-    if(scattergeoData.length>0) plotScatterGeo.plot(this, scattergeoData);
-    if(choroplethData.length>0) plotChoropleth.plot(this, choroplethData, geoLayout);
+    for(var traceType in traceData){
+        Plots.getModule(traceType).plot(this, traceData[traceType], geoLayout);
+    }
 
     this.render();
 };

src/plots/geo/zoom_reset.js

@@ -9,8 +9,7 @@
 
 'use strict';
 
-var loneUnhover = require('../../plotly').Fx.loneUnhover;
-
+var Fx = require('../cartesian/graph_interact');
 
 function createGeoZoomReset(geo, geoLayout) {
     var projection = geo.projection,
@@ -23,7 +22,7 @@ function createGeoZoomReset(geo, geoLayout) {
         zoom.scale(projection.scale());
         zoom.translate(projection.translate());
 
-        loneUnhover(geo.hoverContainer);
+        Fx.loneUnhover(geo.hoverContainer);
 
         geo.render();
     };

src/plots/gl2d/scene2d.js

@@ -9,16 +9,17 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
+var Axes = require('../../plots/cartesian/axes');
+var Fx = require('../../plots/cartesian/graph_interact');
+
 var createPlot2D = require('gl-plot2d');
 var createSpikes = require('gl-spikes2d');
 var createSelectBox = require('gl-select-box');
 
 var createOptions = require('./convert');
 var createCamera = require('./camera');
 
-var createLineWithMarkers = require('../../traces/scattergl/convert');
-
 var htmlToUnicode = require('../../lib/html2unicode');
 var showNoWebGlMsg = require('../../lib/show_no_webgl_msg');
 
@@ -223,8 +224,8 @@ proto.computeTickMarks = function() {
         this.glplot.viewBox[3] - this.glplot.viewBox[1];
 
     var nextTicks = [
-        Plotly.Axes.calcTicks(this.xaxis),
-        Plotly.Axes.calcTicks(this.yaxis)
+        Axes.calcTicks(this.xaxis),
+        Axes.calcTicks(this.yaxis)
     ];
 
     for(var j = 0; j < 2; ++j) {
@@ -254,7 +255,7 @@ function compareTicks(a, b) {
 }
 
 proto.updateAxes = function(options) {
-    var spmatch = Plotly.Axes.subplotMatch,
+    var spmatch = Axes.subplotMatch,
         xaxisName = 'xaxis' + this.id.match(spmatch)[1],
         yaxisName = 'yaxis' + this.id.match(spmatch)[2];
 
@@ -325,11 +326,8 @@ proto.plot = function(fullData, fullLayout) {
 
         if(trace) trace.update(traceData);
         else {
-            switch(traceData.type) {
-                case 'scattergl':
-                    trace = createLineWithMarkers(this, traceData);
-                    break;
-            }
+            var traceModule = Plots.getModule(traceData.type);
+            trace = traceModule.plot(this, traceData);
         }
         this.traces[traceData.uid] = trace;
     }
@@ -392,7 +390,7 @@ proto.plot = function(fullData, fullLayout) {
         ax = this[AXES[i]];
         ax._length = options.viewBox[i+2] - options.viewBox[i];
 
-        Plotly.Axes.doAutoRange(ax);
+        Axes.doAutoRange(ax);
     }
 
     options.ticks = this.computeTickMarks();
@@ -475,7 +473,7 @@ proto.draw = function() {
                     if(parts.indexOf('name') === -1) selection.name = undefined;
                 }
 
-                Plotly.Fx.loneHover({
+                Fx.loneHover({
                     x: selection.screenCoord[0],
                     y: selection.screenCoord[1],
                     xLabel: this.hoverFormatter('xaxis', selection.traceCoord[0]),
@@ -493,7 +491,7 @@ proto.draw = function() {
         else if(!result && this.lastPickResult) {
             this.spikes.update({});
             this.lastPickResult = null;
-            Plotly.Fx.loneUnhover(this.svgContainer);
+            Fx.loneUnhover(this.svgContainer);
         }
     }
 
@@ -504,5 +502,5 @@ proto.hoverFormatter = function(axisName, val) {
     if(val === undefined) return undefined;
 
     var axis = this[axisName];
-    return Plotly.Axes.tickText(axis, axis.c2l(val), 'hover').text;
+    return Axes.tickText(axis, axis.c2l(val), 'hover').text;
 };

src/plots/gl3d/index.js

@@ -9,11 +9,9 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
-
 var Scene = require('./scene');
+var Plots = require('../plots');
 
-var plots = Plotly.Plots;
 var axesNames = ['xaxis', 'yaxis', 'zaxis'];
 
 
@@ -32,7 +30,7 @@ exports.supplyLayoutDefaults = require('./layout/defaults');
 exports.plot = function plotGl3d(gd) {
     var fullLayout = gd._fullLayout,
         fullData = gd._fullData,
-        sceneIds = plots.getSubplotIds(fullLayout, 'gl3d');
+        sceneIds = Plots.getSubplotIds(fullLayout, 'gl3d');
 
     fullLayout._paperdiv.style({
         width: fullLayout.width + 'px',
@@ -43,7 +41,7 @@ exports.plot = function plotGl3d(gd) {
 
     for(var i = 0; i < sceneIds.length; i++) {
         var sceneId = sceneIds[i],
-            fullSceneData = plots.getSubplotData(fullData, 'gl3d', sceneId),
+            fullSceneData = Plots.getSubplotData(fullData, 'gl3d', sceneId),
             scene = fullLayout[sceneId]._scene;  // ref. to corresp. Scene instance
 
         // If Scene is not instantiated, create one!
@@ -83,7 +81,7 @@ exports.initAxes = function(gd) {
     delete fullLayout.xaxis;
     delete fullLayout.yaxis;
 
-    var sceneIds = Plotly.Plots.getSubplotIds(fullLayout, 'gl3d');
+    var sceneIds = Plots.getSubplotIds(fullLayout, 'gl3d');
 
     for(var i = 0; i < sceneIds.length; ++i) {
         var sceneId = sceneIds[i];

src/plots/gl3d/scene.js

@@ -12,12 +12,14 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
 var createPlot = require('gl-plot3d');
 
-var createScatterTrace = require('../../traces/scatter3d/convert');
-var createSurfaceTrace = require('../../traces/surface/convert');
-var createMeshTrace = require('../../traces/mesh3d/convert');
+var Lib = require('../../lib');
+
+var Plots = require('../../plots/plots');
+var Axes = require('../../plots/cartesian/axes');
+var Fx = require('../../plots/cartesian/graph_interact');
+
 var str2RGBAarray = require('../../lib/str2rgbarray');
 var showNoWebGlMsg = require('../../lib/show_no_webgl_msg');
 
@@ -30,7 +32,6 @@ var computeTickMarks = require('./layout/tick_marks');
 
 var STATIC_CANVAS, STATIC_CONTEXT;
 
-
 function render(scene) {
 
     //Update size of svg container
@@ -62,7 +63,7 @@ function render(scene) {
         if(typeof val === 'string') return val;
 
         var axis = scene.fullSceneLayout[axisName];
-        return Plotly.Axes.tickText(axis, axis.c2l(val), 'hover').text;
+        return Axes.tickText(axis, axis.c2l(val), 'hover').text;
     }
 
     if(lastPicked !== null) {
@@ -78,7 +79,7 @@ function render(scene) {
             if(hoverinfoParts.indexOf('name') === -1) lastPicked.name = undefined;
         }
 
-        Plotly.Fx.loneHover({
+        Fx.loneHover({
             x: (0.5 + 0.5 * pdata[0]/pdata[3]) * width,
             y: (0.5 - 0.5 * pdata[1]/pdata[3]) * height,
             xLabel: formatter('xaxis', selection.traceCoordinate[0]),
@@ -91,7 +92,7 @@ function render(scene) {
             container: svgContainer
         });
     }
-    else Plotly.Fx.loneUnhover(svgContainer);
+    else Fx.loneUnhover(svgContainer);
 }
 
 function initializeGLPlot(scene, fullLayout, canvas, gl) {
@@ -351,21 +352,8 @@ proto.plot = function(sceneData, fullLayout, layout) {
         if(trace) {
             trace.update(data);
         } else {
-            switch(data.type) {
-                case 'scatter3d':
-                    trace = createScatterTrace(this, data);
-                    break;
-
-                case 'surface':
-                    trace = createSurfaceTrace(this, data);
-                    break;
-
-                case 'mesh3d':
-                    trace = createMeshTrace(this, data);
-                    break;
-
-                default:
-            }
+            var traceModule = Plots.getModule(data.type);
+            trace = traceModule.plot(this, data);
             this.traces[data.uid] = trace;
         }
         trace.name = data.name;
@@ -569,7 +557,7 @@ proto.setCamera = function setCamera(cameraData) {
 // save camera to user layout (i.e. gd.layout)
 proto.saveCamera = function saveCamera(layout) {
     var cameraData = this.getCamera(),
-        cameraNestedProp = Plotly.Lib.nestedProperty(layout, this.id + '.camera'),
+        cameraNestedProp = Lib.nestedProperty(layout, this.id + '.camera'),
         cameraDataLastSave = cameraNestedProp.get(),
         hasChanged = false;