separate hasMapbox and hasMap

Author: archmoj

src/components/fx/layout_defaults.js

@@ -22,13 +22,14 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
     // if only mapbox, map or geo subplots is present on graph,
     // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
     // so that the correct modebar button is active
-    var hasMap = layoutOut._has('mapbox') || layoutOut._has('map');
+    var hasMapbox = layoutOut._has('mapbox');
+    var hasMap = layoutOut._has('map');
     var hasGeo = layoutOut._has('geo');
     var len = layoutOut._basePlotModules.length;
 
     if(layoutOut.dragmode === 'zoom' && (
-        ((hasMap || hasGeo) && len === 1) ||
-        (hasMap && hasGeo && len === 2)
+        ((hasMapbox || hasMap || hasGeo) && len === 1) ||
+        ((hasMapbox || hasMap) && hasGeo && len === 2)
     )) {
         layoutOut.dragmode = 'pan';
     }