Skip to content

Commit 24a0f91

Browse files
authored
Merge pull request #2912 from plotly/date-precision-bug
fix #2892 - don't allow auto date ticks < our 100 microseconds limit
2 parents 5bd5783 + 92864b8 commit 24a0f91

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

src/plots/cartesian/axes.js

+9
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,10 @@ axes.prepTicks = function(ax) {
503503
ax.tick0 = (ax.type === 'date') ? '2000-01-01' : 0;
504504
}
505505

506+
// ensure we don't try to make ticks below our minimum precision
507+
// see https://github.com/plotly/plotly.js/issues/2892
508+
if(ax.type === 'date' && ax.dtick < 0.1) ax.dtick = 0.1;
509+
506510
// now figure out rounding of tick values
507511
autoTickRound(ax);
508512
};
@@ -785,6 +789,11 @@ function autoTickRound(ax) {
785789
// of all possible ticks - so take the max. length of tick0 and the next one
786790
var tick1len = ax.l2r(tick0ms + dtick).replace(/^-/, '').length;
787791
ax._tickround = Math.max(tick0len, tick1len) - 20;
792+
793+
// We shouldn't get here... but in case there's a situation I'm
794+
// not thinking of where tick0str and tick1str are identical or
795+
// something, fall back on maximum precision
796+
if(ax._tickround < 0) ax._tickround = 4;
788797
}
789798
}
790799
else if(isNumeric(dtick) || dtick.charAt(0) === 'L') {

test/jasmine/tests/axes_test.js

+27
Original file line numberDiff line numberDiff line change
@@ -2057,6 +2057,33 @@ describe('Test axes', function() {
20572057
expect(textOut).toEqual(expectedText);
20582058
});
20592059

2060+
it('never gives date dtick < 100 microseconds (autotick case)', function() {
2061+
var ax = {
2062+
type: 'date',
2063+
tickmode: 'auto',
2064+
nticks: '100',
2065+
range: ['2017-02-08 05:21:18.145', '2017-02-08 05:21:18.1451']
2066+
};
2067+
2068+
var textOut = mockCalc(ax);
2069+
var expectedText = ['05:21:18.145<br>Feb 8, 2017', '05:21:18.1451'];
2070+
expect(textOut).toEqual(expectedText);
2071+
});
2072+
2073+
it('never gives date dtick < 100 microseconds (explicit tick case)', function() {
2074+
var ax = {
2075+
type: 'date',
2076+
tickmode: 'linear',
2077+
tick0: '2000-01-01',
2078+
dtick: 0.01,
2079+
range: ['2017-02-08 05:21:18.145', '2017-02-08 05:21:18.1451']
2080+
};
2081+
2082+
var textOut = mockCalc(ax);
2083+
var expectedText = ['05:21:18.145<br>Feb 8, 2017', '05:21:18.1451'];
2084+
expect(textOut).toEqual(expectedText);
2085+
});
2086+
20602087
it('should handle edge cases with dates and tickvals', function() {
20612088
var ax = {
20622089
type: 'date',

0 commit comments

Comments
 (0)