drop unused attributes from smith

 - avoid coercing twice of attributes e.g. tickangle and tickfont
 - refactor polar defaults
 - add options to handleTickLabelDefaults

Author: archmoj

src/plots/cartesian/tick_label_defaults.js

@@ -27,7 +27,8 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
             size: font.size,
             color: dfltFontColor
         });
-        coerce('tickangle');
+
+        if(!options.noAng) coerce('tickangle');
 
         if(axType !== 'category') {
             var tickFormat = coerce('tickformat');
@@ -41,7 +42,7 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
                 delete containerOut.tickformatstops;
             }
 
-            if(!tickFormat && axType !== 'date') {
+            if(!options.noExp && !tickFormat && axType !== 'date') {
                 coerce('showexponent', showAttrDflt);
                 coerce('exponentformat');
                 coerce('minexponent');

src/plots/polar/layout_defaults.js

@@ -62,14 +62,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
 
         coerceAxis('uirevision', contOut.uirevision);
 
-        var dfltColor;
-        var dfltFontColor;
-
-        if(visible) {
-            dfltColor = coerceAxis('color');
-            dfltFontColor = (dfltColor === axIn.color) ? dfltColor : opts.font.color;
-        }
-
         // We don't want to make downstream code call ax.setScale,
         // as both radial and angular axes don't have a set domain.
         // Furthermore, angular axes don't have a set range.
@@ -91,18 +83,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
 
                 coerceAxis('range');
                 axOut.cleanRange('range', {dfltRange: [0, 1]});
-
-                if(visible) {
-                    coerceAxis('side');
-                    coerceAxis('angle', sector[0]);
-
-                    coerceAxis('title.text');
-                    Lib.coerceFont(coerceAxis, 'title.font', {
-                        family: opts.font.family,
-                        size: Lib.bigFont(opts.font.size),
-                        color: dfltFontColor
-                    });
-                }
                 break;
 
             case 'angularaxis':
@@ -142,20 +122,27 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         });
 
         if(visible) {
+            var dfltColor;
+            var dfltFontColor;
+            var dfltFontSize;
+            var dfltFontFamily;
+            var font = opts.font || {};
+
+            dfltColor = coerceAxis('color');
+            dfltFontColor = (dfltColor === axIn.color) ? dfltColor : font.color;
+            dfltFontSize = font.size;
+            dfltFontFamily = font.family;
+
             handleTickValueDefaults(axIn, axOut, coerceAxis, axOut.type);
-            handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type);
-            handleTickMarkDefaults(axIn, axOut, coerceAxis, {outerTicks: true});
+            handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type, {
+                font: {
+                    color: dfltFontColor,
+                    size: dfltFontSize,
+                    family: dfltFontFamily
+                }
+            });
 
-            var showTickLabels = coerceAxis('showticklabels');
-            if(showTickLabels) {
-                Lib.coerceFont(coerceAxis, 'tickfont', {
-                    family: opts.font.family,
-                    size: opts.font.size,
-                    color: dfltFontColor
-                });
-                coerceAxis('tickangle');
-                coerceAxis('tickformat');
-            }
+            handleTickMarkDefaults(axIn, axOut, coerceAxis, {outerTicks: true});
 
             handleLineGridDefaults(axIn, axOut, coerceAxis, {
                 dfltColor: dfltColor,
@@ -170,6 +157,18 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             });
 
             coerceAxis('layer');
+
+            if(axName === 'radialaxis') {
+                coerceAxis('side');
+                coerceAxis('angle', sector[0]);
+
+                coerceAxis('title.text');
+                Lib.coerceFont(coerceAxis, 'title.font', {
+                    color: dfltFontColor,
+                    size: Lib.bigFont(dfltFontSize),
+                    family: dfltFontFamily
+                });
+            }
         }
 
         if(axType !== 'category') coerceAxis('hoverformat');

src/plots/smith/layout_attributes.js

@@ -26,9 +26,6 @@ var axisTickAttrs = overrideAll({
     showticksuffix: axesAttrs.showticksuffix,
     ticksuffix: axesAttrs.ticksuffix,
     showexponent: axesAttrs.showexponent,
-    exponentformat: axesAttrs.exponentformat,
-    minexponent: axesAttrs.minexponent,
-    separatethousands: axesAttrs.separatethousands,
     tickfont: axesAttrs.tickfont,
     tickformat: axesAttrs.tickformat,
     hoverformat: axesAttrs.hoverformat,
@@ -97,8 +94,6 @@ var imaginaryAxisAttrs = {
         description: 'Sets the values at which ticks on this axis appear.'
     },
 
-    tickangle: axesAttrs.tickangle,
-
     ticks: axesAttrs.ticks,
 
     editType: 'calc'

src/plots/smith/layout_defaults.js

@@ -47,14 +47,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         axOut.type = 'linear';
         setConvert(axOut, contOut, layoutOut);
 
-        var dfltColor;
-        var dfltFontColor;
-
-        if(visible) {
-            dfltColor = coerceAxis('color');
-            dfltFontColor = (dfltColor === axIn.color) ? dfltColor : opts.font.color;
-        }
-
         // We don't want to make downstream code call ax.setScale,
         // as both real and imaginary axes don't have a set domain.
         // Furthermore, imaginary axes don't have a set range.
@@ -70,13 +62,33 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         handlePrefixSuffixDefaults(axIn, axOut, coerceAxis, axOut.type);
 
         if(visible) {
-            if(axName === 'realaxis') {
-                coerceAxis('side');
-            }
+            var isRealAxis = axName === 'realaxis';
+            if(isRealAxis) coerceAxis('side');
 
             coerceAxis('tickvals');
 
-            handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type);
+            var dfltColor;
+            var dfltFontColor;
+            var dfltFontSize;
+            var dfltFontFamily;
+            var font = opts.font || {};
+
+            if(visible) {
+                dfltColor = coerceAxis('color');
+                dfltFontColor = (dfltColor === axIn.color) ? dfltColor : font.color;
+                dfltFontSize = font.size;
+                dfltFontFamily = font.family;
+            }
+
+            handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type, {
+                noAng: !isRealAxis,
+                noExp: true,
+                font: {
+                    color: dfltFontColor,
+                    size: dfltFontSize,
+                    family: dfltFontFamily
+                }
+            });
 
             Lib.coerce2(contIn, contOut, layoutAttributes, axName + '.ticklen');
             Lib.coerce2(contIn, contOut, layoutAttributes, axName + '.tickwidth');
@@ -88,17 +100,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
                 delete contOut[axName].tickcolor;
             }
 
-            var showTickLabels = coerceAxis('showticklabels');
-            if(showTickLabels) {
-                Lib.coerceFont(coerceAxis, 'tickfont', {
-                    family: opts.font.family,
-                    size: opts.font.size,
-                    color: dfltFontColor
-                });
-                coerceAxis('tickangle');
-                coerceAxis('tickformat');
-            }
-
             handleLineGridDefaults(axIn, axOut, coerceAxis, {
                 dfltColor: dfltColor,
                 bgColor: opts.bgColor,

test/plot-schema.json

@@ -7362,20 +7362,6 @@
       "valType": "color"
      },
      "editType": "plot",
-     "exponentformat": {
-      "description": "Determines a formatting rule for the tick exponents. For example, consider the number 1,000,000,000. If *none*, it appears as 1,000,000,000. If *e*, 1e+9. If *E*, 1E+9. If *power*, 1x10^9 (with 9 in a super script). If *SI*, 1G. If *B*, 1B.",
-      "dflt": "B",
-      "editType": "plot",
-      "valType": "enumerated",
-      "values": [
-       "none",
-       "e",
-       "E",
-       "power",
-       "SI",
-       "B"
-      ]
-     },
      "gridcolor": {
       "description": "Sets the color of the grid lines.",
       "dflt": "#eee",
@@ -7418,20 +7404,7 @@
       "min": 0,
       "valType": "number"
      },
-     "minexponent": {
-      "description": "Hide SI prefix for 10^n if |n| is below this number. This only has an effect when `tickformat` is *SI* or *B*.",
-      "dflt": 3,
-      "editType": "plot",
-      "min": 0,
-      "valType": "number"
-     },
      "role": "object",
-     "separatethousands": {
-      "description": "If \"true\", even 4-digit integers are separated",
-      "dflt": false,
-      "editType": "plot",
-      "valType": "boolean"
-     },
      "showexponent": {
       "description": "If *all*, all exponents are shown besides their significands. If *first*, only the exponent of the first tick is shown. If *last*, only the exponent of the last tick is shown. If *none*, no exponents appear.",
       "dflt": "all",
@@ -7486,12 +7459,6 @@
        "none"
       ]
      },
-     "tickangle": {
-      "description": "Sets the angle of the tick labels with respect to the horizontal. For example, a `tickangle` of -90 draws the tick labels vertically.",
-      "dflt": "auto",
-      "editType": "ticks",
-      "valType": "angle"
-     },
      "tickcolor": {
       "description": "Sets the tick color.",
       "dflt": "#444",
@@ -7613,20 +7580,6 @@
       "valType": "color"
      },
      "editType": "plot",
-     "exponentformat": {
-      "description": "Determines a formatting rule for the tick exponents. For example, consider the number 1,000,000,000. If *none*, it appears as 1,000,000,000. If *e*, 1e+9. If *E*, 1E+9. If *power*, 1x10^9 (with 9 in a super script). If *SI*, 1G. If *B*, 1B.",
-      "dflt": "B",
-      "editType": "plot",
-      "valType": "enumerated",
-      "values": [
-       "none",
-       "e",
-       "E",
-       "power",
-       "SI",
-       "B"
-      ]
-     },
      "gridcolor": {
       "description": "Sets the color of the grid lines.",
       "dflt": "#eee",
@@ -7669,20 +7622,7 @@
       "min": 0,
       "valType": "number"
      },
-     "minexponent": {
-      "description": "Hide SI prefix for 10^n if |n| is below this number. This only has an effect when `tickformat` is *SI* or *B*.",
-      "dflt": 3,
-      "editType": "plot",
-      "min": 0,
-      "valType": "number"
-     },
      "role": "object",
-     "separatethousands": {
-      "description": "If \"true\", even 4-digit integers are separated",
-      "dflt": false,
-      "editType": "plot",
-      "valType": "boolean"
-     },
      "showexponent": {
       "description": "If *all*, all exponents are shown besides their significands. If *first*, only the exponent of the first tick is shown. If *last*, only the exponent of the last tick is shown. If *none*, no exponents appear.",
       "dflt": "all",