fix cluster mapbox font inherit family, weight & style

Author: archmoj

src/traces/scattermapbox/convert.js

@@ -93,7 +93,7 @@ module.exports = function convert(gd, calcTrace) {
                 paint: {},
                 layout: {
                     'text-field': '{point_count_abbreviated}',
-                    'text-font': ['Open Sans Regular', 'Arial Unicode MS Regular'],
+                    'text-font': getTextFont(trace),
                     'text-size': 12
                 }
             };
@@ -146,23 +146,16 @@ module.exports = function convert(gd, calcTrace) {
         }
 
         if(hasText) {
-            var font = trace.textfont;
-            var str = '';
-            if(font.weight === 'bold') str += ' Bold';
-            if(font.style === 'italic') str += ' Italic';
-            var textFont = font.family;
-            if(str) textFont = textFont.replace(' Regular', str);
-            textFont = textFont.split(', ');
-
             var iconSize = (trace.marker || {}).size;
             var textOpts = convertTextOpts(trace.textposition, iconSize);
 
             // all data-driven below !!
+
             Lib.extendFlat(symbol.layout, {
                 'text-size': trace.textfont.size,
                 'text-anchor': textOpts.anchor,
                 'text-offset': textOpts.offset,
-                'text-font': textFont
+                'text-font': getTextFont(trace)
             });
 
             Lib.extendFlat(symbol.paint, {
@@ -373,3 +366,14 @@ function arrayifyAttribute(values, step) {
     }
     return newAttribute;
 }
+
+function getTextFont(trace) {
+    var font = trace.textfont;
+    var str = '';
+    if(font.weight === 'bold') str += ' Bold';
+    if(font.style === 'italic') str += ' Italic';
+    var textFont = font.family;
+    if(str) textFont = textFont.replace(' Regular', str);
+    textFont = textFont.split(', ');
+    return textFont;
+}

src/traces/scattermapbox/defaults.js

@@ -101,9 +101,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         clusterSize !== false ||
         clusterOpacity !== false;
 
-    coerce('cluster.enabled', clusterEnabledDflt);
+    var clusterEnabled = coerce('cluster.enabled', clusterEnabledDflt);
 
-    if(subTypes.hasText(traceOut)) {
+    if(clusterEnabled || subTypes.hasText(traceOut)) {
         handleTextDefaults(traceIn, traceOut, layout, coerce,
             {
                 noSelect: true,

test/image/baselines/mapbox_scattercluster.png

@@ -197,6 +197,10 @@
     }
   ],
   "layout": {
+    "font": {
+      "weight": "bold",
+      "style": "italic"
+    },
     "title": {
       "text": "Clustering points over Canadian cities"
     },