Test treemap against D3 3.x.

d3 · Mar 15, 2016 · 6e7a4b0 · 6e7a4b0
1 parent 141f5a6
commit 6e7a4b0
Show file tree

Hide file tree

Showing 6 changed files with 4,747 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
     "rw": "1"
   },
   "devDependencies": {
+    "d3-queue": "2",
     "json2module": "0.0",
     "rollup": "0.25",
     "tape": "4",

diff --git a/src/treemap/squarify.js b/src/treemap/squarify.js
@@ -1,4 +1,4 @@
-export default (function ratio(phi) {
+export default (function custom(ratio) {
 
   function squarify(parent, x0, y0, x1, y1) {
     var nodes = parent.children,
@@ -21,7 +21,7 @@ export default (function ratio(phi) {
     while (i0 < n) {
       dx = x1 - x0, dy = y1 - y0;
       sumValue = minValue = maxValue = nodes[i0].value;
-      alpha = Math.max(dy / dx, dx / dy) / (value * phi);
+      alpha = Math.max(dy / dx, dx / dy) / (value * ratio);
       beta = sumValue * sumValue * alpha;
       minRatio = Math.max(maxValue / beta, beta / minValue);
 
@@ -58,7 +58,9 @@ export default (function ratio(phi) {
     }
   }
 
-  squarify.ratio = ratio;
+  squarify.ratio = function(x) {
+    return custom((x = +x) > 1 ? x : 1);
+  };
 
   return squarify;
 })((1 + Math.sqrt(5)) / 2);