drop role and handle cases with no cluster

Author: archmoj

src/traces/scattermapbox/attributes.js

@@ -22,7 +22,6 @@ module.exports = overrideAll({
     cluster: {
         enabled: {
             valType: 'boolean',
-            role: 'info',
             dflt: false,
             description: 'Determines whether clustering is enabled or disabled.'
         },
@@ -33,7 +32,6 @@ module.exports = overrideAll({
             ].join(' ')
         }),
         step: {
-            role: 'info',
             valType: 'number',
             arrayOk: true,
             dflt: -1,
@@ -43,7 +41,6 @@ module.exports = overrideAll({
             ].join(' ')
         },
         size: {
-            role: 'info',
             valType: 'number',
             arrayOk: true,
             dflt: 20,
@@ -55,7 +52,6 @@ module.exports = overrideAll({
         color: {
             valType: 'color',
             arrayOk: true,
-            role: 'style',
             description: [
                 'Sets the color for each cluster step.'
             ].join(' ')

src/traces/scattermapbox/convert.js

@@ -26,7 +26,7 @@ module.exports = function convert(gd, calcTrace) {
     var hasText = subTypes.hasText(trace);
     var hasCircles = (hasMarkers && trace.marker.symbol === 'circle');
     var hasSymbols = (hasMarkers && trace.marker.symbol !== 'circle');
-    var hasCluster = trace.cluster.enabled;
+    var hasCluster = trace.cluster && trace.cluster.enabled;
 
     var fill = initContainer('fill');
     var line = initContainer('line');

src/traces/scattermapbox/defaults.js

@@ -46,8 +46,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         }
     }
 
-    var clusterEnabled = coerce('cluster.enabled');
-    if(clusterEnabled) {
+    var hasCluster = coerce('cluster.enabled');
+    if(hasCluster) {
         coerce('cluster.maxzoom');
         coerce('cluster.step');
         coerce('cluster.color', traceOut.marker.color || defaultColor);

src/traces/scattermapbox/hover.js

@@ -15,8 +15,9 @@ function hoverPoints(pointData, xval, yval) {
     var subplot = pointData.subplot;
     var clusteredPointsIds = [];
     var layer = LAYER_PREFIX + trace.uid + '-circle';
+    var hasCluster = trace.cluster && trace.cluster.enabled;
 
-    if(trace.cluster.enabled) {
+    if(hasCluster) {
         var elems = subplot.map.queryRenderedFeatures(null, {layers: [layer]});
         clusteredPointsIds = elems.map(function(elem) {return elem.id;});
     }
@@ -33,7 +34,7 @@ function hoverPoints(pointData, xval, yval) {
     function distFn(d) {
         var lonlat = d.lonlat;
         if(lonlat[0] === BADNUM) return Infinity;
-        if(trace.cluster.enabled && clusteredPointsIds.indexOf(d.i + 1) === -1) return Infinity;
+        if(hasCluster && clusteredPointsIds.indexOf(d.i + 1) === -1) return Infinity;
 
         var lon = Lib.modHalf(lonlat[0], 360);
         var lat = lonlat[1];

src/traces/scattermapbox/plot.js

@@ -49,7 +49,7 @@ proto.addSource = function(k, opts, cluster) {
         data: opts.geojson,
     };
 
-    if(cluster.enabled) {
+    if(cluster && cluster.enabled) {
         Lib.extendFlat(sourceOpts, {
             cluster: true,
             clusterMaxZoom: cluster.maxzoom,
@@ -86,7 +86,7 @@ proto.update = function update(calcTrace) {
     var optsAll = convert(subplot.gd, calcTrace);
     var below = subplot.belowLookup['trace-' + this.uid];
     var i, k, opts, order;
-    var hasCluster = trace.cluster.enabled;
+    var hasCluster = trace.cluster && trace.cluster.enabled;
     var hadCluster = this.clusterEnabled;
 
     if(hasCluster === hadCluster) {
@@ -147,16 +147,18 @@ proto.dispose = function dispose() {
 
 module.exports = function createScatterMapbox(subplot, calcTrace) {
     var trace = calcTrace[0].trace;
+    var hasCluster = trace.cluster && trace.cluster.enabled;
     var scatterMapbox = new ScatterMapbox(
-    subplot,
-    trace.uid,
-    trace.cluster.enabled
-  );
+        subplot,
+        trace.uid,
+        hasCluster
+    );
+
     var optsAll = convert(subplot.gd, calcTrace);
     var below = scatterMapbox.below = subplot.belowLookup['trace-' + trace.uid];
     var i, k, opts;
 
-    if(trace.cluster.enabled) {
+    if(hasCluster) {
         scatterMapbox.addSource('circle', optsAll.circle, trace.cluster);
         for(i = 0; i < ORDER.cluster.length; i++) {
             k = ORDER.cluster[i];

test/plot-schema.json

@@ -51002,7 +51002,6 @@
       "arrayOk": true,
       "description": "Sets the color for each cluster step.",
       "editType": "calc",
-      "role": "style",
       "valType": "color"
      },
      "colorsrc": {
@@ -51015,7 +51014,6 @@
       "description": "Determines whether clustering is enabled or disabled.",
       "dflt": false,
       "editType": "calc",
-      "role": "info",
       "valType": "boolean"
      },
      "maxzoom": {
@@ -51047,7 +51045,6 @@
       "dflt": 20,
       "editType": "calc",
       "min": 0,
-      "role": "info",
       "valType": "number"
      },
      "sizesrc": {
@@ -51061,7 +51058,6 @@
       "dflt": -1,
       "editType": "calc",
       "min": -1,
-      "role": "info",
       "valType": "number"
      },
      "stepsrc": {