smart dflt for cluster.enabled

plotly · Oct 14, 2022 · 477d2a0 · 477d2a0
1 parent 54aaa17
commit 477d2a0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/src/traces/scattermapbox/attributes.js b/src/traces/scattermapbox/attributes.js
@@ -22,7 +22,6 @@ module.exports = overrideAll({
     cluster: {
         enabled: {
             valType: 'boolean',
-            dflt: false,
             description: 'Determines whether clustering is enabled or disabled.'
         },
         maxzoom: extendFlat({}, mapboxLayoutAtributes.layers.maxzoom, {

diff --git a/src/traces/scattermapbox/defaults.js b/src/traces/scattermapbox/defaults.js
@@ -14,6 +14,10 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
 
+    function coerce2(attr, dflt) {
+        return Lib.coerce2(traceIn, traceOut, attributes, attr, dflt);
+    }
+
     var len = handleLonLatDefaults(traceIn, traceOut, coerce);
     if(!len) {
         traceOut.visible = false;
@@ -46,14 +50,20 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         }
     }
 
-    var hasCluster = coerce('cluster.enabled');
-    if(hasCluster) {
-        coerce('cluster.maxzoom');
-        coerce('cluster.step');
-        coerce('cluster.color', traceOut.marker.color || defaultColor);
-        coerce('cluster.size');
-        coerce('cluster.opacity');
-    }
+    var clusterMaxzoom = coerce2('cluster.maxzoom');
+    var clusterStep = coerce2('cluster.step');
+    var clusterColor = coerce2('cluster.color', (traceOut.marker && traceOut.marker.color) || defaultColor);
+    var clusterSize = coerce2('cluster.size');
+    var clusterOpacity = coerce2('cluster.opacity');
+
+    var clusterEnabledDflt =
+        clusterMaxzoom !== false ||
+        clusterStep !== false ||
+        clusterColor !== false ||
+        clusterSize !== false ||
+        clusterOpacity !== false;
+
+    coerce('cluster.enabled', clusterEnabledDflt);
 
     if(subTypes.hasText(traceOut)) {
         handleTextDefaults(traceIn, traceOut, layout, coerce, {noSelect: true});

diff --git a/test/image/mocks/mapbox_scattercluster.json b/test/image/mocks/mapbox_scattercluster.json
@@ -11,7 +11,6 @@
         "opacity": 0.5
       },
       "cluster": {
-        "enabled": true,
         "size": 20,
         "color": "yellow"
       },
@@ -61,7 +60,6 @@
         "size": 20
       },
       "cluster": {
-        "enabled": true,
         "size": 10
       },
       "lon": [
@@ -110,7 +108,6 @@
         "size": 10
       },
       "cluster": {
-        "enabled": true,
         "size": 20
       },
       "lon": [
@@ -159,7 +156,6 @@
         "size": 10
       },
       "cluster": {
-        "enabled": true,
         "size": 10
       },
       "lon": [

diff --git a/test/plot-schema.json b/test/plot-schema.json
@@ -53461,7 +53461,6 @@
      "editType": "calc",
      "enabled": {
       "description": "Determines whether clustering is enabled or disabled.",
-      "dflt": false,
       "editType": "calc",
       "valType": "boolean"
      },