fix images on date axes, and standardize axis object names

Author: alexcjohnson

src/components/images/draw.js

@@ -101,12 +101,12 @@ module.exports = function draw(gd) {
         var thisImage = d3.select(this);
 
         // Axes if specified
-        var xref = Axes.getFromId(gd, d.xref),
-            yref = Axes.getFromId(gd, d.yref);
+        var xa = Axes.getFromId(gd, d.xref),
+            ya = Axes.getFromId(gd, d.yref);
 
         var size = fullLayout._size,
-            width = xref ? Math.abs(xref.l2p(d.sizex) - xref.l2p(0)) : d.sizex * size.w,
-            height = yref ? Math.abs(yref.l2p(d.sizey) - yref.l2p(0)) : d.sizey * size.h;
+            width = xa ? Math.abs(xa.l2p(d.sizex) - xa.l2p(0)) : d.sizex * size.w,
+            height = ya ? Math.abs(ya.l2p(d.sizey) - ya.l2p(0)) : d.sizey * size.h;
 
         // Offsets for anchor positioning
         var xOffset = width * anchors.x[d.xanchor].offset,
@@ -115,8 +115,8 @@ module.exports = function draw(gd) {
         var sizing = anchors.x[d.xanchor].sizing + anchors.y[d.yanchor].sizing;
 
         // Final positions
-        var xPos = (xref ? xref.l2p(d.x) + xref._offset : d.x * size.w + size.l) + xOffset,
-            yPos = (yref ? yref.l2p(d.y) + yref._offset : size.h - d.y * size.h + size.t) + yOffset;
+        var xPos = (xa ? xa.l2p(xa.r2l(d.x)) + xa._offset : d.x * size.w + size.l) + xOffset,
+            yPos = (ya ? ya.l2p(ya.r2l(d.y)) + ya._offset : size.h - d.y * size.h + size.t) + yOffset;
 
 
         // Construct the proper aspectRatio attribute
@@ -141,8 +141,8 @@ module.exports = function draw(gd) {
 
 
         // Set proper clipping on images
-        var xId = xref ? xref._id : '',
-            yId = yref ? yref._id : '',
+        var xId = xa ? xa._id : '',
+            yId = ya ? ya._id : '',
             clipAxes = xId + yId;
 
         if(clipAxes) {

test/image/baselines/layout_image.png

@@ -4,17 +4,22 @@
       "x": [1,2,3],
       "y": [1,2,3]
     }, {
-      "x": [1,2,3],
-      "y": [1,2,3],
+      "x": ["2001-01-01","2002-01-01","2003-01-01"],
+      "y": [10,100,1000],
+      "xaxis": "x2",
       "yaxis": "y2"
     }
   ],
   "layout": {
+    "xaxis2": {
+        "anchor": "y2"
+    },
     "yaxis": {
-        "domain": [0, 0.5]
+        "domain": [0, 0.45]
     },
     "yaxis2": {
-        "domain": [0.5, 1]
+        "domain": [0.55, 1],
+        "type": "log"
     },
     "images": [
       {
@@ -41,11 +46,11 @@
       },
       {
         "source": "https://images.plot.ly/language-icons/api-home/r-logo.png",
-        "xref": "x",
+        "xref": "x2",
         "yref": "y2",
-        "x": 1,
+        "x": "2001-01-01",
         "y": 3,
-        "sizex": 2,
+        "sizex": 63072000000,
         "sizey": 2,
         "sizing": "stretch",
         "opacity": 0.4,