remove hm and contour groups on update

  and colorbar group when necessary.

Author: etpinard

src/plot_api/plot_api.js

@@ -251,7 +251,7 @@ Plotly.plot = function(gd, data, layout, config) {
             subplots = Plots.getSubplotIds(fullLayout, 'cartesian'),
             modules = gd._modules;
 
-        var i, j, cd, trace, uid, subplot, subplotInfo,
+        var i, j, trace, subplot, subplotInfo,
             cdSubplot, cdError, cdModule, _module;
 
         function getCdSubplot(calcdata, subplot) {
@@ -293,17 +293,20 @@ Plotly.plot = function(gd, data, layout, config) {
         // in case of traces that were heatmaps or contour maps
         // previously, remove them and their colorbars explicitly
         for (i = 0; i < calcdata.length; i++) {
-            cd = calcdata[i];
-            trace = cd[0].trace;
-            if (trace.visible !== true || !trace._module.colorbar) {
+            trace = calcdata[i][0].trace;
+
+            var isVisible = (trace.visible === true),
                 uid = trace.uid;
 
+            if(!isVisible || !Plots.traceIs(trace, '2dMap')) {
                 fullLayout._paper.selectAll(
                     '.hm' + uid +
                     ',.contour' + uid +
                     ',#clip' + uid
                 ).remove();
+            }
 
+            if(!isVisible || !trace._module.colorbar) {
                 fullLayout._infolayer.selectAll('.cb' + uid).remove();
             }
         }