fit r using trace.aspectratio when having non scalegroup

Author: archmoj

src/traces/funnelarea/plot.js

@@ -247,13 +247,6 @@ function setCoords(cd) {
     var scaleX = r / lastX;
     var scaleY = r / rY * aspectratio;
 
-    if(!trace.scalegroup) {
-        if(aspectratio > cd0.figMaxH / cd0.figMaxW) {
-            scaleX /= aspectratio;
-            scaleY /= aspectratio;
-        }
-    }
-
     // set funnelarea r
     cd0.r = scaleY * rY;
 

src/traces/pie/plot.js

@@ -816,9 +816,13 @@ function layoutAreas(cdModule, plotSize) {
             height -= getTitleSpace(cd0, plotSize);
         }
 
-        cd0.figMaxH = height;
-        cd0.figMaxW = width;
-        cd0.r = Math.min(width / 2, height / 2) / (1 + getMaxPull(trace));
+        var rx = width / 2;
+        var ry = height / 2;
+        if(trace.type === 'funnelarea' && !trace.scalegroup) {
+            ry /= trace.aspectratio;
+        }
+
+        cd0.r = Math.min(rx, ry) / (1 + getMaxPull(trace));
 
         cd0.cx = plotSize.l + plotSize.w * (trace.domain.x[1] + trace.domain.x[0]) / 2;
         cd0.cy = plotSize.t + plotSize.h * (1 - trace.domain.y[0]) - height / 2;
@@ -852,13 +856,15 @@ function groupScale(cdModule, scaleGroups) {
                     area = cd0.r * cd0.r;
                 } else if(trace.type === 'funnelarea') {
                     var rx, ry;
+
                     if(trace.aspectratio > 1) {
                         rx = cd0.r;
                         ry = rx / trace.aspectratio;
                     } else {
                         ry = cd0.r;
                         rx = ry * trace.aspectratio;
                     }
+
                     rx *= (1 + trace.baseratio) / 2;
 
                     area = rx * ry;