change tickformatstops definition and code review fixes

Author: yauhen-kavaliou

src/plots/cartesian/axes.js

@@ -1297,7 +1297,8 @@ function formatDate(ax, out, hover, extraPrecision) {
 
 function formatLog(ax, out, hover, extraPrecision, hideexp) {
     var dtick = ax.dtick,
-        x = out.x;
+        x = out.x,
+        tickformat = ax.tickformat;
 
     if(hideexp === 'never') {
         // If this is a hover label, then we must *never* hide the exponent
@@ -1311,7 +1312,7 @@ function formatLog(ax, out, hover, extraPrecision, hideexp) {
 
     if(extraPrecision && ((typeof dtick !== 'string') || dtick.charAt(0) !== 'L')) dtick = 'L3';
 
-    if(ax.tickformat || (typeof dtick === 'string' && dtick.charAt(0) === 'L')) {
+    if(tickformat || (typeof dtick === 'string' && dtick.charAt(0) === 'L')) {
         out.text = numFormat(Math.pow(10, x), ax, hideexp, extraPrecision);
     }
     else if(isNumeric(dtick) || ((dtick.charAt(0) === 'D') && (Lib.mod(x + 0.01, 1) < 0.1))) {
@@ -1515,15 +1516,33 @@ axes.getTickFormat = function(ax) {
         var convertFn = convert || function(x) { return x;};
         var leftDtick = range[0];
         var rightDtick = range[1];
-        return (!leftDtick || convertFn(leftDtick) <= convertFn(dtick)) &&
-               (!rightDtick || convertFn(rightDtick) >= convertFn(dtick));
+        return (leftDtick === null || convertFn(leftDtick) <= convertFn(dtick)) &&
+               (rightDtick === null || convertFn(rightDtick) >= convertFn(dtick));
     }
     function getRangeWidth(range, convert) {
         var convertFn = convert || function(x) { return x;};
         var left = range[0] || 0;
         var right = range[1] || 0;
         return Math.abs(convertFn(right) - convertFn(left));
     }
+    function compareLogTicks(left, right) {
+        var priority = ['L', 'D'];
+        if(typeof left === typeof right) {
+            if(typeof left === 'number') {
+                return left - right;
+            } else {
+                var leftPriority = priority.indexOf(left.charAt(0));
+                var rightPriority = priority.indexOf(right.charAt(0));
+                if(leftPriority === rightPriority) {
+                    return Number(left.replace(/(L|D)/g, '')) - Number(right.replace(/(L|D)/g, ''));
+                } else {
+                    return leftPriority - rightPriority;
+                }
+            }
+        } else {
+            return typeof left === 'number' ? 1 : -1;
+        }
+    }
 
     var tickstop;
     if(ax.tickformatstops && ax.tickformatstops.length > 0) {
@@ -1554,6 +1573,17 @@ axes.getTickFormat = function(ax) {
                 }, null);
                 break;
             }
+            case 'log': {
+                tickstop = ax.tickformatstops.filter(function(stop) {
+                    var left = stop.dtickrange[0], right = stop.dtickrange[1];
+                    var isLeftDtickNull = left === null;
+                    var isRightDtickNull = right === null;
+                    var isDtickInRangeLeft = compareLogTicks(ax.dtick, left) >= 0;
+                    var isDtickInRangeRight = compareLogTicks(ax.dtick, right) <= 0;
+                    return (isLeftDtickNull || isDtickInRangeLeft) && (isRightDtickNull || isDtickInRangeRight);
+                })[0];
+                break;
+            }
             default:
         }
     }

src/plots/cartesian/layout_attributes.js

@@ -449,16 +449,24 @@ module.exports = {
         ].join(' ')
     },
     tickformatstops: {
-        valType: 'any',
-        arrayOk: true,
-        role: 'style',
-        description: [
-            'Set rules for customizing tickformat on different zoom levels for *date* and',
-            '*linear axis types. You can specify these rules in following way',
-            '[{dtickrange: [*min*, *max*], value: *format*}]. Where *min*, *max* - dtick values',
-            'which describe some zoom level, it is possible to omit *min* or *max* value by passing',
-            '*null*. *format* - string, exactly as *tickformat*'
-        ].join(' ')
+        _isLinkedToArray: 'tickformatstop',
+
+        dtickrange: {
+            valType: 'data_array',
+            description: [
+                'range [*min*, *max*], where *min*, *max* - dtick values',
+                'which describe some zoom level, it is possible to omit *min*',
+                'or *max* value by passing *null*'
+            ].join(' ')
+        },
+        value: {
+            valType: 'string',
+            dflt: '',
+            role: 'style',
+            description: [
+                'string - dtickformat for described zoom level, the same as *tickformat*'
+            ].join(' ')
+        }
     },
     hoverformat: {
         valType: 'string',

src/plots/cartesian/tick_label_defaults.js

@@ -10,7 +10,7 @@
 'use strict';
 
 var Lib = require('../../lib');
-
+var layoutAttributes = require('./layout_attributes');
 
 /**
  * options: inherits font, outerTicks, noHover from axes.handleAxisDefaults
@@ -40,7 +40,7 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
 
         if(axType !== 'category') {
             var tickFormat = coerce('tickformat');
-            coerce('tickformatstops');
+            tickformatstopsDefaults(containerIn, containerOut);
             if(!tickFormat && axType !== 'date') {
                 coerce('showexponent', showAttrDflt);
                 coerce('exponentformat');
@@ -81,3 +81,26 @@ function getShowAttrDflt(containerIn) {
         return containerIn[showAttrs[0]];
     }
 }
+
+function tickformatstopsDefaults(tickformatIn, tickformatOut) {
+    var valuesIn = tickformatIn.tickformatstops || [],
+        valuesOut = tickformatOut.tickformatstops = [];
+
+    var valueIn, valueOut;
+
+    function coerce(attr, dflt) {
+        return Lib.coerce(valueIn, valueOut, layoutAttributes.tickformatstops, attr, dflt);
+    }
+
+    for(var i = 0; i < valuesIn.length; i++) {
+        valueIn = valuesIn[i];
+        valueOut = {};
+
+        coerce('dtickrange');
+        coerce('value');
+
+        valuesOut.push(valueOut);
+    }
+
+    return valuesOut;
+}

src/traces/carpet/axis_attributes.js

@@ -266,16 +266,24 @@ module.exports = {
         ].join(' ')
     },
     tickformatstops: {
-        valType: 'any',
-        arrayOk: true,
-        role: 'style',
-        description: [
-            'Set rules for customizing tickformat on different zoom levels for *date* and',
-            '*linear axis types. You can specify these rules in following way',
-            '[{dtickrange: [*min*, *max*], value: *format*}]. Where *min*, *max* - dtick values',
-            'which describe some zoom level, it is possible to omit *min* or *max* value by passing',
-            '*null*. *format* - string, exactly as *tickformat*'
-        ].join(' ')
+        _isLinkedToArray: 'tickformatstop',
+
+        dtickrange: {
+            valType: 'data_array',
+            description: [
+                'range [*min*, *max*], where *min*, *max* - dtick values',
+                'which describe some zoom level, it is possible to omit *min*',
+                'or *max* value by passing *null*'
+            ].join(' ')
+        },
+        value: {
+            valType: 'string',
+            dflt: '',
+            role: 'style',
+            description: [
+                'string - dtickformat for described zoom level, the same as *tickformat*'
+            ].join(' ')
+        }
     },
     categoryorder: {
         valType: 'enumerated',

tasks/util/strict_d3.js

@@ -6,7 +6,7 @@ var pathToStrictD3Module = path.join(
     constants.pathToImageTest,
     'strict-d3.js'
 );
-
+var normalizedpathToStrictD3Module = pathToStrictD3Module.replace(/\\/g, '/'); // fix npm-sripts for windows users
 /**
  * Transform `require('d3')` expressions to `require(/path/to/strict-d3.js)`
  */
@@ -18,7 +18,7 @@ module.exports = transformTools.makeRequireTransform('requireTransform',
         var pathOut;
 
         if(pathIn === 'd3' && opts.file !== pathToStrictD3Module) {
-            pathOut = 'require(\'' + pathToStrictD3Module.replace(/\\/g, '/') + '\')';
+            pathOut = 'require(\'' + normalizedpathToStrictD3Module + '\')';
         }
 
         if(pathOut) return cb(null, pathOut);