Merge pull request #5398 from plotly/gl2d-cleanup

Drop contourgl and pointcloud traces from the code and API

Author: archmoj

lib/contourgl.js

@@ -13,9 +13,7 @@ var Plotly = require('./core');
 Plotly.register([
     require('./scattergl'),
     require('./splom'),
-    require('./pointcloud'),
     require('./heatmapgl'),
-    require('./contourgl'),
     require('./parcoords')
 ]);
 

lib/index-gl2d.js

@@ -44,7 +44,6 @@ Plotly.register([
     require('./scattergl'),
     require('./splom'),
 
-    require('./pointcloud'),
     require('./heatmapgl'),
 
     require('./parcoords'),

lib/index.js

@@ -79,15 +79,13 @@
     "delaunay-triangulate": "^1.1.6",
     "fast-isnumeric": "^1.1.4",
     "gl-cone3d": "^1.5.2",
-    "gl-contour2d": "^1.1.7",
     "gl-error3d": "^1.0.16",
     "gl-heatmap2d": "^1.1.0",
     "gl-line3d": "1.2.1",
     "gl-mat4": "^1.2.0",
     "gl-mesh3d": "^2.3.1",
     "gl-plot2d": "^1.4.5",
     "gl-plot3d": "^2.4.7",
-    "gl-pointcloud2d": "^1.0.3",
     "gl-scatter3d": "^1.2.3",
     "gl-select-box": "^1.0.4",
     "gl-spikes2d": "^1.0.2",

lib/pointcloud.js

@@ -236,8 +236,8 @@ module.exports = function draw(gd) {
         subplot = allSubplots[i];
         var subplotObj = fullLayout._plots[subplot];
 
-        // filter out overlaid plots (which havd their images on the main plot)
-        // and gl2d plots (which don't support below images, at least not yet)
+        // filter out overlaid plots (which have their images on the main plot)
+        // and heatmapgl plots (which don't support below images, at least not yet)
         if(!subplotObj.imagelayer) continue;
 
         var imagesOnSubplot = subplotObj.imagelayer.selectAll('image')

package-lock.json

@@ -89,7 +89,7 @@ function getButtonGroups(gd) {
     var hasGeo = fullLayout._has('geo');
     var hasPie = fullLayout._has('pie');
     var hasFunnelarea = fullLayout._has('funnelarea');
-    var hasGL2D = fullLayout._has('gl2d');
+    var hasHeatmapgl = fullLayout._has('gl2d');
     var hasTernary = fullLayout._has('ternary');
     var hasMapbox = fullLayout._has('mapbox');
     var hasPolar = fullLayout._has('polar');
@@ -124,7 +124,7 @@ function getButtonGroups(gd) {
     var resetGroup = [];
     var dragModeGroup = [];
 
-    if((hasCartesian || hasGL2D || hasPie || hasFunnelarea || hasTernary) + hasGeo + hasGL3D + hasMapbox + hasPolar > 1) {
+    if((hasCartesian || hasHeatmapgl || hasPie || hasFunnelarea || hasTernary) + hasGeo + hasGL3D + hasMapbox + hasPolar > 1) {
         // graphs with more than one plot types get 'union buttons'
         // which reset the view or toggle hover labels across all subplots.
         hoverGroup = ['toggleHover'];
@@ -140,7 +140,7 @@ function getButtonGroups(gd) {
         zoomGroup = ['zoomInMapbox', 'zoomOutMapbox'];
         hoverGroup = ['toggleHover'];
         resetGroup = ['resetViewMapbox'];
-    } else if(hasGL2D) {
+    } else if(hasHeatmapgl) {
         hoverGroup = ['hoverClosestGl2d'];
     } else if(hasPie) {
         hoverGroup = ['hoverClosestPie'];
@@ -161,14 +161,14 @@ function getButtonGroups(gd) {
         hoverGroup = [];
     }
 
-    if((hasCartesian || hasGL2D) && !allAxesFixed) {
+    if((hasCartesian || hasHeatmapgl) && !allAxesFixed) {
         zoomGroup = ['zoomIn2d', 'zoomOut2d', 'autoScale2d'];
         if(resetGroup[0] !== 'resetViews') resetGroup = ['resetScale2d'];
     }
 
     if(hasGL3D) {
         dragModeGroup = ['zoom3d', 'pan3d', 'orbitRotation', 'tableRotation'];
-    } else if(((hasCartesian || hasGL2D) && !allAxesFixed) || hasTernary) {
+    } else if(((hasCartesian || hasHeatmapgl) && !allAxesFixed) || hasTernary) {
         dragModeGroup = ['zoom2d', 'pan2d'];
     } else if(hasMapbox || hasGeo) {
         dragModeGroup = ['pan2d'];

package.json

@@ -332,15 +332,15 @@ function layoutHeadAttr(fullLayout, head) {
             _module = basePlotModules[i];
             if(_module.attrRegex && _module.attrRegex.test(head)) {
                 // if a module defines overrides, these take precedence
-                // initially this is to allow gl2d different editTypes from svg cartesian
+                // initially this was to allow heatmapgl different editTypes from svg cartesian
                 if(_module.layoutAttrOverrides) return _module.layoutAttrOverrides;
 
                 // otherwise take the first attributes we find
                 if(!out && _module.layoutAttributes) out = _module.layoutAttributes;
             }
 
             // a module can also override the behavior of base (and component) module layout attrs
-            // again see gl2d for initial use case
+            // again see heatmapgl for initial use case
             var baseOverrides = _module.baseLayoutAttrOverrides;
             if(baseOverrides && head in baseOverrides) return baseOverrides[head];
         }

src/components/images/draw.js

@@ -68,7 +68,7 @@ function lsInner(gd) {
     exports.drawMainTitle(gd);
     ModeBar.manage(gd);
 
-    // _has('cartesian') means SVG specifically, not GL2D - but GL2D
+    // _has('cartesian') means SVG specifically, not heatmapgl - but heatmapgl
     // can still get here because it makes some of the SVG structure
     // for shared features like selections.
     if(!fullLayout._has('cartesian')) {

src/components/modebar/manage.js

@@ -102,7 +102,7 @@ axes.coerceRef = function(containerIn, containerOut, gd, attr, dflt, extraOption
     if(!extraOption) extraOption = dflt;
     axlist = axlist.concat(axlist.map(function(x) { return x + ' domain'; }));
 
-    // data-ref annotations are not supported in gl2d yet
+    // data-ref annotations are not supported in heatmapgl yet
 
     attrDef[refAttr] = {
         valType: 'enumerated',

src/plot_api/plot_schema.js

@@ -35,7 +35,7 @@ module.exports = function makeIncludeComponents(containerArrayName) {
         var xaList = subplots.xaxis;
         var yaList = subplots.yaxis;
         var cartesianList = subplots.cartesian;
-        var hasCartesianOrGL2D = layoutOut._has('cartesian') || layoutOut._has('gl2d');
+        var hasCartesianOrHeatmapgl = layoutOut._has('cartesian') || layoutOut._has('gl2d');
 
         for(var i = 0; i < array.length; i++) {
             var itemi = array[i];
@@ -49,7 +49,7 @@ module.exports = function makeIncludeComponents(containerArrayName) {
             var hasXref = idRegex.x.test(xref);
             var hasYref = idRegex.y.test(yref);
             if(hasXref || hasYref) {
-                if(!hasCartesianOrGL2D) Lib.pushUnique(layoutOut._basePlotModules, Cartesian);
+                if(!hasCartesianOrHeatmapgl) Lib.pushUnique(layoutOut._basePlotModules, Cartesian);
 
                 var newAxis = false;
                 if(hasXref && xaList.indexOf(xref) === -1) {

src/plot_api/subroutines.js

@@ -476,12 +476,12 @@ plots.supplyDefaults = function(gd, opts) {
     // clean subplots and other artifacts from previous plot calls
     plots.cleanPlot(newFullData, newFullLayout, oldFullData, oldFullLayout);
 
-    var hadGL2D = !!(oldFullLayout._has && oldFullLayout._has('gl2d'));
-    var hasGL2D = !!(newFullLayout._has && newFullLayout._has('gl2d'));
+    var hadHeatmapgl = !!(oldFullLayout._has && oldFullLayout._has('gl2d'));
+    var hasHeatmapgl = !!(newFullLayout._has && newFullLayout._has('gl2d'));
     var hadCartesian = !!(oldFullLayout._has && oldFullLayout._has('cartesian'));
     var hasCartesian = !!(newFullLayout._has && newFullLayout._has('cartesian'));
-    var hadBgLayer = hadCartesian || hadGL2D;
-    var hasBgLayer = hasCartesian || hasGL2D;
+    var hadBgLayer = hadCartesian || hadHeatmapgl;
+    var hasBgLayer = hasCartesian || hasHeatmapgl;
     if(hadBgLayer && !hasBgLayer) {
         // remove bgLayer
         oldFullLayout._bgLayer.remove();