fix gl3d with world calendars

Author: alexcjohnson

src/traces/mesh3d/defaults.js

@@ -20,10 +20,12 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     }
 
     // read in face/vertex properties
-    function readComponents(array) {
+    function readComponents(array, doCalendar) {
         var ret = array.map(function(attr) {
             var result = coerce(attr);
 
+            if(doCalendar) coerce(attr + 'calendar', layout.calendar);
+
             if(result && Array.isArray(result)) return result;
             return null;
         });
@@ -33,7 +35,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         }) && ret;
     }
 
-    var coords = readComponents(['x', 'y', 'z']);
+    var coords = readComponents(['x', 'y', 'z'], true);
     var indices = readComponents(['i', 'j', 'k']);
 
     if(!coords) {

src/traces/scatter3d/defaults.js

@@ -26,7 +26,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
 
-    var len = handleXYZDefaults(traceIn, traceOut, coerce);
+    var len = handleXYZDefaults(traceIn, traceOut, coerce, layout);
     if(!len) {
         traceOut.visible = false;
         return;
@@ -66,12 +66,16 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'z'});
 };
 
-function handleXYZDefaults(traceIn, traceOut, coerce) {
+function handleXYZDefaults(traceIn, traceOut, coerce, layout) {
     var len = 0,
         x = coerce('x'),
         y = coerce('y'),
         z = coerce('z');
 
+    coerce('xcalendar', layout.calendar);
+    coerce('ycalendar', layout.calendar);
+    coerce('zcalendar', layout.calendar);
+
     if(x && y && z) {
         len = Math.min(x.length, y.length, z.length);
         if(len < x.length) traceOut.x = x.slice(0, len);

src/traces/surface/defaults.js

@@ -34,6 +34,10 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('x');
     coerce('y');
 
+    coerce('xcalendar', layout.calendar);
+    coerce('ycalendar', layout.calendar);
+    coerce('zcalendar', layout.calendar);
+
     if(!Array.isArray(traceOut.x)) {
         // build a linearly scaled x
         traceOut.x = [];

test/image/baselines/gl3d_scatter-date.png

@@ -0,0 +1,129 @@
+{
+    "data": [
+        {
+            "i": [
+                0,
+                0,
+                0,
+                1
+            ],
+            "j": [
+                1,
+                2,
+                3,
+                2
+            ],
+            "k": [
+                2,
+                3,
+                1,
+                3
+            ],
+            "facecolor": [
+                "rgb(0, 0, 0)",
+                "rgb(255,0,0)",
+                "rgb(0,255,0)",
+                "rgb(0,0,255)"
+            ],
+            "type": "mesh3d",
+            "x": [
+                "2000-01-01",
+                "2000-02-01",
+                "2000-03-01",
+                "2000-01-01"
+            ],
+            "xcalendar": "ethiopian",
+            "y": [
+                "0100-01-01",
+                "0100-01-01",
+                "0100-02-01",
+                "0100-03-01"
+            ],
+            "ycalendar": "taiwan",
+            "z": [
+                "2550-01-01",
+                "2550-03-01",
+                "2550-01-01",
+                "2550-02-01"
+            ],
+            "zcalendar": "thai"
+        },
+        {
+            "x": [
+                "2000-01-01",
+                "2000-01-01",
+                "2000-03-01",
+                "2000-03-01"
+            ],
+            "xcalendar": "ethiopian",
+            "y": [
+                "0100-01-01",
+                "0100-03-01",
+                "0100-01-01",
+                "0100-03-01"
+            ],
+            "ycalendar": "taiwan",
+            "z": [
+                "2550-01-01",
+                "2550-03-01",
+                "2550-03-01",
+                "2550-01-01"
+            ],
+            "zcalendar": "thai",
+            "type": "scatter3d"
+        },
+        {
+            "x": [
+                "2000-01-01",
+                "2000-03-01"
+            ],
+            "xcalendar": "ethiopian",
+            "y": [
+                "0100-01-01",
+                "0100-03-01"
+            ],
+            "ycalendar": "taiwan",
+            "z": [
+                [
+                    "2550-01-25",
+                    "2550-02-10"
+                ],
+                [
+                    "2550-02-10",
+                    "2550-01-25"
+                ]
+            ],
+            "zcalendar": "thai",
+            "type": "surface",
+            "showscale": false,
+            "surfacecolor": [[0, 1],[2, 3]]
+        }
+    ],
+    "layout": {
+        "scene": {
+            "xaxis": {
+                "title": "taiwan",
+                "calendar": "taiwan",
+                "type": "date"
+            },
+            "yaxis": {
+                "title": "gregorian",
+                "type": "date"
+            },
+            "zaxis": {
+                "title": "ethiopian",
+                "calendar": "ethiopian",
+                "type": "date"
+            },
+            "camera": {
+                "eye": {
+                    "x": -1.8,
+                    "y": 1.38,
+                    "z": 0.75
+                }
+            }
+        },
+        "width": 800,
+        "height": 700
+    }
+}