attempt improving ticks on rangebreaks

Author: archmoj

src/plots/cartesian/axes.js

@@ -638,7 +638,10 @@ axes.calcTicks = function calcTicks(ax) {
                 if(ax.maskBreaks(tickVal.value) === BADNUM) {
                     tickVal.value = moveOutsideBreak(tickVal.value, ax);
 
-                    if(ax._rl && tickVal.value === ax._rl[1]) continue;
+                    if(ax._rl && (
+                        ax._rl[0] === tickVal.value ||
+                        ax._rl[1] === tickVal.value
+                    )) continue;
                 }
 
                 var pos = ax.c2p(tickVal.value);
@@ -992,8 +995,11 @@ axes.tickFirst = function(ax) {
     var dtick = ax.dtick;
     var tick0 = r2l(ax.tick0);
 
-    if(ax.tickmode === 'auto' && ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
-        tick0 = moveOutsideBreak(tick0, ax);
+    if(ax._dayHours && ax.tickmode === 'auto') {
+        var tick0Hour = Math.floor(tick0 / ONEHOUR) % 24;
+        if(tick0Hour === 0 && tick0Hour < ax._startHour) {
+            tick0 += ONEHOUR * ax._startHour;
+        }
     }
 
     if(isNumeric(dtick)) {

src/plots/cartesian/axis_defaults.js

@@ -135,22 +135,32 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
         if(!containerOut.rangebreaks.length) {
             delete containerOut.rangebreaks;
         } else {
-            var n = 0;
             for(var k = 0; k < containerOut.rangebreaks.length; k++) {
                 var brk = containerOut.rangebreaks[k];
                 if(brk.pattern === DAY_OF_WEEK) {
                     containerOut._hasDayOfWeekBreaks = true;
-                    n++;
                 }
 
                 if(brk.pattern === HOUR) {
                     containerOut._hasHourBreaks = true;
-                    containerOut._dayHours = Math.round((brk.bounds[1] - brk.bounds[0] + 24) % 24);
-                    n++;
-                }
 
-                // break when found all types
-                if(n === 2) break;
+                    var startHour = Math.max((brk.bounds[0] % 24), (brk.bounds[1] % 24));
+                    if(containerOut._startHour === undefined) {
+                        containerOut._startHour = startHour;
+                    } else {
+                        containerOut._startHour = Math.max(containerOut._startHour, startHour);
+                    }
+
+                    var dayHours = (brk.bounds[1] - brk.bounds[0] + 24) % 24;
+                    if(containerOut._dayHours === undefined) {
+                        containerOut._dayHours = dayHours;
+                    } else {
+                        containerOut._dayHours += dayHours;
+                    }
+                }
+            }
+            if(containerOut._dayHours !== undefined) {
+                containerOut._dayHours = Math.ceil(containerOut._dayHours);
             }
 
             setConvert(containerOut, layoutOut);