improve quarters and year period label positioning

Author: archmoj

src/constants/numerical.js

@@ -31,13 +31,17 @@ module.exports = {
      * to remind us that not all years and months
      * have the same length
      */
+    ONEMAXYEAR: 31622400000, // 366 * ONEDAY
     ONEAVGYEAR: 31557600000, // 365.25 days
+    ONEMINYEAR: 31536000000, // 365 * ONEDAY
+    ONEMAXQUARTER: 7948800000, // 92 * ONEDAY
     ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
+    ONEMINQUARTER: 7776000000, // 90 * ONEDAY
     ONEMAXMONTH: 2678400000, // 31 * ONEDAY
     ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
     ONEMINMONTH: 2419200000, // 28 * ONEDAY
     ONEWEEK: 604800000, // 7 * ONEDAY
-    ONEDAY: 86400000,
+    ONEDAY: 86400000, // 24 * ONEHOUR
     ONEHOUR: 3600000,
     ONEMIN: 60000,
     ONESEC: 1000,

src/plots/cartesian/axes.js

@@ -23,8 +23,12 @@ var axAttrs = require('./layout_attributes');
 var cleanTicks = require('./clean_ticks');
 
 var constants = require('../../constants/numerical');
+var ONEMAXYEAR = constants.ONEMAXYEAR;
 var ONEAVGYEAR = constants.ONEAVGYEAR;
+var ONEMINYEAR = constants.ONEMINYEAR;
+var ONEMAXQUARTER = constants.ONEMAXQUARTER;
 var ONEAVGQUARTER = constants.ONEAVGQUARTER;
+var ONEMINQUARTER = constants.ONEMINQUARTER;
 var ONEMAXMONTH = constants.ONEMAXMONTH;
 var ONEAVGMONTH = constants.ONEAVGMONTH;
 var ONEMINMONTH = constants.ONEMINMONTH;
@@ -779,11 +783,19 @@ axes.calcTicks = function calcTicks(ax, opts) {
 
             var actualDelta = Math.abs(B - A);
             var delta = definedDelta || actualDelta;
-            if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
-                v += ONEAVGYEAR / 2;
-            } else if(delta >= ONEAVGQUARTER) {
-                v += ONEAVGQUARTER / 2;
-            } else if(delta >= ONEMINMONTH) { // Months could have days less than ONEAVGMONTH period
+            if(delta >= ONEMINYEAR) {
+                if(actualDelta >= ONEMINYEAR && actualDelta <= ONEMAXYEAR) {
+                    v += actualDelta / 2;
+                } else {
+                    v += ONEAVGYEAR / 2;
+                }
+            } else if(delta >= ONEMINQUARTER) {
+                if(actualDelta >= ONEMINQUARTER && actualDelta <= ONEMAXQUARTER) {
+                    v += actualDelta / 2;
+                } else {
+                    v += ONEAVGQUARTER / 2;
+                }
+            } else if(delta >= ONEMINMONTH) {
                 if(actualDelta >= ONEMINMONTH && actualDelta <= ONEMAXMONTH) {
                     v += actualDelta / 2;
                 } else {

test/image/baselines/date_axes_period2.png

@@ -5232,14 +5232,14 @@ describe('Test axes', function() {
                 })
                 .then(function() {
                     _assert('', [
-                        '2019-07-02 15:00',
-                        '2020-07-01 15:00',
-                        '2021-07-02 15:00',
-                        '2022-07-02 15:00',
-                        '2023-07-02 15:00',
-                        '2024-07-01 15:00',
-                        '2025-07-02 15:00',
-                        '2026-07-02 15:00'
+                        '2019-07-02 12:00',
+                        '2020-07-02',
+                        '2021-07-02 12:00',
+                        '2022-07-02 12:00',
+                        '2023-07-02 12:00',
+                        '2024-07-02',
+                        '2025-07-02 12:00',
+                        '2026-07-02 12:00'
                     ], [
                         ['', '2020', '2021', '2022', '2023', '2024', '2025', ''],
                         ['', '20', '21', '22', '23', '24', '25', '']
@@ -5265,16 +5265,16 @@ describe('Test axes', function() {
             })
             .then(function() {
                 _assert('', [
-                    '2019-11-15 15:45',
-                    '2020-02-15 15:45',
-                    '2020-05-16 15:45',
-                    '2020-08-15 15:45',
-                    '2020-11-15 15:45',
-                    '2021-02-15 15:45',
-                    '2021-05-16 15:45',
-                    '2021-08-15 15:45',
-                    '2021-11-15 15:45',
-                    '2022-02-15 15:45'
+                    '2019-11-16',
+                    '2020-02-15 12:00',
+                    '2020-05-16 12:00',
+                    '2020-08-16',
+                    '2020-11-16',
+                    '2021-02-15',
+                    '2021-05-16 12:00',
+                    '2021-08-16',
+                    '2021-11-16',
+                    '2022-02-16'
                 ], ['', '2020-1', '2020-2', '2020-3', '2020-4', '2021-1', '2021-2', '2021-3', '2021-4', '']);
             })
             .catch(failTest)