add ticks add the start of the breaks and revise remove overlaps

Author: archmoj

src/plots/cartesian/axes.js

@@ -611,31 +611,43 @@ axes.calcTicks = function calcTicks(ax) {
     generateTicks();
 
     if(ax.rangebreaks) {
-        var nTicksBefore = tickVals.length;
-
         // remove ticks falling inside rangebreaks
         tickVals = tickVals.filter(function(d) {
             return ax.maskBreaks(d.value) !== BADNUM;
         });
 
-        // if 'numerous' ticks get placed into rangebreaks,
-        // increase dtick to generate more ticks,
-        // so that some hopefully fall between rangebreaks
-        if(ax.tickmode === 'auto' && tickVals.length < nTicksBefore / 6) {
-            axes.autoTicks(ax, ax._roughDTick / 3);
-            autoTickRound(ax);
-            ax._tmin = axes.tickFirst(ax);
-            generateTicks();
-            tickVals = tickVals.filter(function(d) {
-                return ax.maskBreaks(d.value) !== BADNUM;
-            });
+        // add tick at the start of every rangebreak
+        if(ax.tickmode === 'auto') {
+            for(var k = 0; k < ax._rangebreaks.length; k++) {
+                Lib.pushUnique(tickVals, {
+                    minor: false,
+                    value: ax._rangebreaks[k].min
+                });
+            }
         }
 
-        // remove "overlapping" ticks (e.g. on either side of a break)
-        var tf2 = ax.tickfont ? 1.5 * ax.tickfont.size : 0;
-        tickVals = tickVals.filter(function(d, i, self) {
-            return !(i && Math.abs(ax.c2p(d.value) - ax.c2p(self[i - 1].value)) < tf2);
+        // sort
+        tickVals = tickVals.sort(function(a, b) {
+            return a.value - b.value;
         });
+
+        // remove "overlapping" ticks (e.g. on either side of a break)
+        var len = tickVals.length;
+        if(len > 2) {
+            var tf2 = 2 * (ax.tickfont ? ax.tickfont.size : 12);
+
+            var newTickVals = [];
+            var prevPos;
+            for(var q = 0; q < len; q++) {
+                var pos = ax.c2p(tickVals[q].value);
+
+                if(prevPos === undefined || Math.abs(pos - prevPos) > tf2) {
+                    prevPos = pos;
+                    newTickVals.push(tickVals[q]);
+                }
+            }
+            tickVals = newTickVals;
+        }
     }
 
     // If same angle over a full circle, the last tick vals is a duplicate.

test/image/baselines/axes_breaks-finance.png

@@ -5008,48 +5008,6 @@ describe('Test axes', function() {
                 .catch(failTest)
                 .then(done);
             });
-
-            it('should increase dtick when too many (auto) ticks fall into rangebreaks', function(done) {
-                var fig = Lib.extendDeep({}, require('@mocks/axes_breaks-finance.json'));
-                // break over weekend
-                fig.layout.xaxis.rangebreaks[0].enabled = false;
-                // break on a single holiday
-                fig.layout.xaxis.rangebreaks[1].enabled = false;
-
-                Plotly.plot(gd, fig)
-                .then(function() {
-                    _assert('base', {
-                        tickVals: [1483833600000, 1485043200000, 1486252800000]
-                    });
-                })
-                .then(function() {
-                    gd.layout.xaxis.rangebreaks[0].enabled = true;
-                    gd.layout.xaxis.rangebreaks[1].enabled = true;
-                    return Plotly.react(gd, gd.data, gd.layout);
-                })
-                .then(function() {
-                    _assert('with rangebreaks enabled on x-axis', {
-                        tickVals: [
-                            1483574400000, 1484092800000, 1484611200000, 1484870400000,
-                            1485388800000, 1485907200000, 1486425600000, 1486684800000
-                        ]
-                    });
-                })
-                .then(function() {
-                    // a Saturday
-                    gd.layout.xaxis.tick0 = '2017-01-02';
-                    // one week
-                    gd.layout.xaxis.dtick = 7 + 24 * 60 * 60 * 1000;
-                    return Plotly.react(gd, gd.data, gd.layout);
-                })
-                .then(function() {
-                    _assert('honor set tick0/dtick even though they result in few visible ticks', {
-                        tickVals: [1483488000014]
-                    });
-                })
-                .catch(failTest)
-                .then(done);
-            });
         });
 
         it('should set visible:false in scattergl traces on axis with rangebreaks', function(done) {

test/image/baselines/axes_breaks-gridlines.png

@@ -2135,7 +2135,7 @@ describe('axis zoom/pan and main plot zoom', function() {
                     '1970-01-01 00:00:00.2019'
                 ]);
             })
-            .then(doDrag('xy', 'nsew', 0, 50))
+            .then(doDrag('xy', 'nsew', 0, -50))
             // y range would be ~ [62, 100] w/o rangebreaks
             .then(function() {
                 _assert('after y-only zoombox', [
@@ -2151,7 +2151,7 @@ describe('axis zoom/pan and main plot zoom', function() {
                 ]);
             })
             .then(function() { return Plotly.relayout(gd, 'dragmode', 'pan'); })
-            .then(doDrag('xy', 'nsew', 0, 50))
+            .then(doDrag('xy', 'nsew', 0, -50))
             // y range would be ~ [35, 239] w/o rangebreaks
             .then(function() {
                 _assert('after y-only pan', [