Merge pull request #7213 from plotly/drop-gl2d

Drop deprecated `pointcloud` and `heatmapgl` traces and `gl2d` subplots

Author: archmoj

draftlogs/7213_remove.md

@@ -0,0 +1 @@
+ - Drop deprecated pointcloud and heatmapgl traces and gl2d subplots [[#7213](https://github.com/plotly/plotly.js/pull/7213)]

lib/heatmapgl.js

@@ -6,8 +6,6 @@ Plotly.register([
     // traces
     require('./scattergl'),
     require('./splom'),
-    require('./pointcloud'),
-    require('./heatmapgl'),
     require('./parcoords'),
 
     // transforms

lib/index-gl2d.js

@@ -32,8 +32,6 @@ Plotly.register([
     require('./choropleth'),
     require('../src/traces/scattergl/strict'),
     require('../src/traces/splom/strict'),
-    require('./pointcloud'),
-    require('./heatmapgl'),
     require('../src/traces/parcoords/strict'),
     require('./parcats'),
     require('./scattermapbox'),

lib/index-strict.js

@@ -32,8 +32,6 @@ Plotly.register([
     require('./choropleth'),
     require('./scattergl'),
     require('./splom'),
-    require('./pointcloud'),
-    require('./heatmapgl'),
     require('./parcoords'),
     require('./parcats'),
     require('./scattermapbox'),

lib/index.js

@@ -160,7 +160,7 @@ exports.loneHover = function loneHover(hoverItems, opts) {
                 x1 += dx;
                 y0 += dy;
                 y1 += dy;
-            } // TODO: handle heatmapgl
+            }
 
             eventData.bbox = {
                 x0: x0 + gLeft,

lib/pointcloud.js

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

src/components/fx/hover.js

@@ -559,18 +559,6 @@ function handleGeo(gd, ev) {
     }
 }
 
-modeBarButtons.hoverClosestGl2d = {
-    name: 'hoverClosestGl2d',
-    _cat: 'hoverclosest',
-    title: function(gd) { return _(gd, 'Toggle show closest data on hover'); },
-    attr: 'hovermode',
-    val: null,
-    toggle: true,
-    icon: Icons.tooltip_basic,
-    gravity: 'ne',
-    click: toggleHover
-};
-
 modeBarButtons.hoverClosestPie = {
     name: 'hoverClosestPie',
     _cat: 'hoverclosest',

src/components/images/draw.js

@@ -107,7 +107,6 @@ function getButtonGroups(gd) {
     var hasGeo = fullLayout._has('geo');
     var hasPie = fullLayout._has('pie');
     var hasFunnelarea = fullLayout._has('funnelarea');
-    var hasGL2D = fullLayout._has('gl2d');
     var hasTernary = fullLayout._has('ternary');
     var hasMapbox = fullLayout._has('mapbox');
     var hasMap = fullLayout._has('map');
@@ -155,7 +154,7 @@ function getButtonGroups(gd) {
     var resetGroup = [];
     var dragModeGroup = [];
 
-    if((hasCartesian || hasGL2D || hasPie || hasFunnelarea || hasTernary) + hasGeo + hasGL3D + hasMapbox + hasMap + hasPolar + hasSmith > 1) {
+    if((hasCartesian || hasPie || hasFunnelarea || hasTernary) + hasGeo + hasGL3D + hasMapbox + hasMap + hasPolar + hasSmith > 1) {
         // graphs with more than one plot types get 'union buttons'
         // which reset the view or toggle hover labels across all subplots.
         hoverGroup = ['toggleHover'];
@@ -175,8 +174,6 @@ function getButtonGroups(gd) {
         zoomGroup = ['zoomInMap', 'zoomOutMap'];
         hoverGroup = ['toggleHover'];
         resetGroup = ['resetViewMap'];
-    } else if(hasGL2D) {
-        hoverGroup = ['hoverClosestGl2d'];
     } else if(hasPie) {
         hoverGroup = ['hoverClosestPie'];
     } else if(hasSankey) {
@@ -196,14 +193,14 @@ function getButtonGroups(gd) {
         hoverGroup = [];
     }
 
-    if((hasCartesian || hasGL2D) && !allAxesFixed) {
+    if(hasCartesian && !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 && !allAxesFixed) || hasTernary) {
         dragModeGroup = ['zoom2d', 'pan2d'];
     } else if(hasMapbox || hasMap || hasGeo) {
         dragModeGroup = ['pan2d'];
@@ -248,14 +245,12 @@ function getButtonGroups(gd) {
                     enableHover('hoverClosestCartesian');
                     enableHover('hoverClosestGeo');
                     enableHover('hoverClosest3d');
-                    enableHover('hoverClosestGl2d');
                     enableHover('hoverClosestPie');
                 } else if(b === 'v1hovermode') {
                     enableHover('hoverClosestCartesian');
                     enableHover('hoverCompareCartesian');
                     enableHover('hoverClosestGeo');
                     enableHover('hoverClosest3d');
-                    enableHover('hoverClosestGl2d');
                     enableHover('hoverClosestPie');
                 }
             } else newList.push(b);