prohibit bingroup for traces using different calendars

Author: etpinard

src/traces/histogram/cross_trace_defaults.js

@@ -56,33 +56,46 @@ module.exports = function crossTraceDefaults(fullData, fullLayout) {
         if(!groupName) groupName = fallbackGroupName;
 
         var axType = getAxisType(traceOut, binDir);
+        var calendar = traceOut[binDir + 'calendar'];
         var binOpts = allBinOpts[groupName];
+        var needsNewItem = true;
 
         if(binOpts) {
-            if(axType === binOpts.axType) {
+            if(axType === binOpts.axType && calendar === binOpts.calendar) {
+                needsNewItem = false;
                 binOpts.traces.push(traceOut);
                 binOpts.dirs.push(binDir);
             } else {
                 groupName = fallbackGroupName;
-                allBinOpts[groupName] = {
-                    traces: [traceOut],
-                    dirs: [binDir],
-                    axType: axType
-                };
-                Lib.warn([
-                    'Attempted to group the bins of trace', traceOut.index,
-                    'set on a', 'type:' + axType, 'axis',
-                    'with bins on', 'type:' + binOpts.axType, 'axis.'
-                ].join(' '));
+
+                if(axType !== binOpts.axType) {
+                    Lib.warn([
+                        'Attempted to group the bins of trace', traceOut.index,
+                        'set on a', 'type:' + axType, 'axis',
+                        'with bins on', 'type:' + binOpts.axType, 'axis.'
+                    ].join(' '));
+                }
+                if(calendar !== binOpts.calendar) {
+                    // prohibit bingroup for traces using different calendar,
+                    // there's probably a way to make this work, but skip for now
+                    Lib.warn([
+                        'Attempted to group the bins of trace', traceOut.index,
+                        'set with a', calendar, 'calendar',
+                        'with bins',
+                        (binOpts.calendar ? 'on a ' + binOpts.calendar + ' calendar' : 'w/o a set calendar')
+                    ].join(' '));
+                }
             }
-        } else {
-            binOpts = allBinOpts[groupName] = {
+        }
+
+        if(needsNewItem) {
+            allBinOpts[groupName] = {
                 traces: [traceOut],
                 dirs: [binDir],
-                axType: axType
+                axType: axType,
+                calendar: traceOut[binDir + 'calendar'] || ''
             };
         }
-
         traceOut['_' + binDir + 'bingroup'] = groupName;
     }
 

test/jasmine/tests/histogram_test.js

@@ -459,6 +459,25 @@ describe('Test histogram', function() {
                 ['1', [0, 1, 3, 3, 2]]
             ]);
         });
+
+        it('should not group traces across different calendars', function() {
+            gd = {
+                data: [
+                    {uid: 'a', bingroup: '1', type: 'histogram', x: ['2000-01-01']},
+                    {uid: 'b', bingroup: '1', type: 'histogram', x: ['2000-01-01'], xcalendar: 'julian'},
+                ],
+                layout: {barmode: 'overlay'}
+            };
+            supplyAllDefaults(gd);
+
+            _assert('', [
+                ['1', [0]],
+                ['b__x', [1]]
+            ],
+                'Attempted to group the bins of trace 1 set with a julian calendar ' +
+                'with bins on a gregorian calendar'
+            );
+        });
     });
 
     describe('calc', function() {