Merge pull request #4660 from plotly/remove-rangebreaks-operation

Revise operation in rangebreaks

Author: archmoj

src/plots/cartesian/axis_defaults.js

@@ -187,7 +187,5 @@ function rangebreaksDefaults(itemIn, itemOut, containerOut) {
                 return;
             }
         }
-
-        coerce('operation');
     }
 }

src/plots/cartesian/layout_attributes.js

@@ -273,7 +273,6 @@ module.exports = {
             editType: 'calc',
             description: [
                 'Sets the lower and upper bounds of this axis rangebreak.',
-                'Can be used with `operation` to determine the behavior at the bounds.',
                 'Can be used with `pattern`.'
             ].join(' ')
         },
@@ -292,7 +291,7 @@ module.exports = {
                 'Examples:',
                 '- { pattern: \'' + DAY_OF_WEEK + '\', bounds: [6, 0] }',
                 '  breaks from Saturday to Monday (i.e. skips the weekends).',
-                '- { pattern: \'' + HOUR + '\', bounds: [17, 8], operation: \'()\' }', // TODO: simplify after revise defaults
+                '- { pattern: \'' + HOUR + '\', bounds: [17, 8] }',
                 '  breaks from 5pm to 8am (i.e. skips non-work hours).'
             ].join(' ')
         },
@@ -325,23 +324,6 @@ module.exports = {
             ].join(' ')
         },
 
-        operation: {
-            valType: 'enumerated',
-            values: ['[]', '()', '[)', '(]'],
-            dflt: '[]',
-            role: 'info',
-            editType: 'calc',
-            description: [
-                'Determines if we include or not the bound values within the rangebreak.',
-                'Closed interval bounds (i.e. starting with *[* or ending with *]*)',
-                'include the bound value within the rangebreak and thus make coordinates',
-                'equal to the bound disappear.',
-                'Open interval bounds (i.e. starting with *(* or ending with *)*)',
-                'does not include the bound value within the rangebreak and thus keep coordinates',
-                'equal to the bound on the axis.'
-            ].join(' ')
-        },
-
         /*
         gap: {
             valType: 'number',

src/plots/cartesian/set_convert.js

@@ -620,10 +620,6 @@ module.exports = function setConvert(ax, fullLayout) {
             var brk = rangebreaksIn[i];
 
             if(brk.enabled) {
-                var op = brk.operation;
-                var op0 = op.charAt(0);
-                var op1 = op.charAt(1);
-
                 if(brk.bounds) {
                     var pattern = brk.pattern;
                     bnds = Lib.simpleMap(brk.bounds, pattern ?
@@ -671,24 +667,13 @@ module.exports = function setConvert(ax, fullLayout) {
                             break;
                     }
 
-                    if(
-                        (op0 === '(' ? vb > b0 : vb >= b0) &&
-                        (op1 === ')' ? vb < b1 : vb <= b1)
-                    ) return BADNUM;
+                    if(vb >= b0 && vb < b1) return BADNUM;
                 } else {
                     var vals = Lib.simpleMap(brk.values, ax.d2c).sort(Lib.sorterAsc);
-                    var onOpenBound = false;
-
                     for(var j = 0; j < vals.length; j++) {
                         b0 = vals[j];
                         b1 = b0 + brk.dvalue;
-                        if(
-                            (op0 === '(' ? v > b0 : v >= b0) &&
-                            (op1 === ')' ? v < b1 : v <= b1)
-                        ) return BADNUM;
-
-                        if(onOpenBound && op0 === '(' && v === b0) return BADNUM;
-                        onOpenBound = op1 === ')' && v === b1;
+                        if(v >= b0 && v < b1) return BADNUM;
                     }
                 }
             }
@@ -737,14 +722,9 @@ module.exports = function setConvert(ax, fullLayout) {
             var brk = rangebreaksIn[i];
 
             if(brk.enabled) {
-                var op = brk.operation;
-                var op0 = op.charAt(0);
-                var op1 = op.charAt(1);
-
                 if(brk.bounds) {
                     if(brk.pattern) {
                         bnds = Lib.simpleMap(brk.bounds, cleanNumber);
-                        if(bnds[0] === bnds[1] && op === '()') continue;
 
                         // r0 value as date
                         var r0Date = new Date(r0);
@@ -761,12 +741,11 @@ module.exports = function setConvert(ax, fullLayout) {
 
                         switch(brk.pattern) {
                             case WEEKDAY_PATTERN:
-                                b0 = bnds[0] + (op0 === '(' ? 1 : 0);
+                                b0 = bnds[0];
                                 b1 = bnds[1];
                                 r0Pattern = r0Date.getUTCDay();
                                 r0PatternDelta = b0 - r0Pattern;
                                 bndDelta = (b1 >= b0 ? b1 - b0 : (b1 + 7) - b0) * ONEDAY;
-                                if(op1 === ']') bndDelta += ONEDAY;
                                 step = 7 * ONEDAY;
 
                                 t = r0 + r0PatternDelta * ONEDAY -

test/image/baselines/axes_breaks-bars.png

@@ -364,11 +364,10 @@
       "rangebreaks": [
         {
           "pattern": "day of week",
-          "bounds": [ 6, 0 ]
+          "bounds": [ 6, 1 ]
         },
         {
-          "values": ["2017-01-16"],
-          "operation": "()"
+          "values": ["2017-01-16"]
         }
       ]
     },
@@ -377,11 +376,10 @@
       "rangebreaks": [
         {
           "pattern": "day of week",
-          "bounds": [ 6, 0 ]
+          "bounds": [ 6, 1 ]
         },
         {
-          "values": ["2017-01-16"],
-          "operation": "()"
+          "values": ["2017-01-16"]
         }
       ]
     },

test/image/baselines/axes_breaks-rangeslider.png

@@ -196,8 +196,7 @@
                     "bounds": [
                         18,
                         6
-                    ],
-                    "operation": "[)"
+                    ]
                 }
             ],
             "domain": [
@@ -212,8 +211,7 @@
                     "bounds": [
                         18,
                         6
-                    ],
-                    "operation": "[)"
+                    ]
                 }
             ],
             "autorange": "reversed",
@@ -257,8 +255,7 @@
                     "bounds": [
                         18,
                         6
-                    ],
-                    "operation": "[)"
+                    ]
                 }
             ],
             "anchor": "x3",
@@ -274,8 +271,7 @@
                     "bounds": [
                         18,
                         6
-                    ],
-                    "operation": "[)"
+                    ]
                 }
             ],
             "autorange": "reversed",