change to not double count pre-summed trees #60

timelyportfolio · Feb 15, 2018 · b8a18d1 · b8a18d1
1 parent 46f5d61
commit b8a18d1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: sunburstR
 Type: Package
 Title: 'Htmlwidget' for 'Kerry Rodden' 'd3.js' Sequence Sunburst
-Version: 1.0.3
-Date: 2018-01-29
+Version: 2.0.0
+Date: 2018-02-15
 Authors@R: c(
       person(
         "Mike", "Bostock"

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# sunburstR 1.1.0
+
+* fix to correctly handle pre-summed trees, like `treemap::treemap` to not double count the aggregate (see (issue)[https://github.com/timelyportfolio/sunburstR/issues/60#issuecomment-365751989])
+
 # sunburstR 1.0.3
 
 * change text color in legend and breadcrumb to white or black for legibility using d3plus

diff --git a/inst/htmlwidgets/sunburst.js b/inst/htmlwidgets/sunburst.js
@@ -150,7 +150,10 @@ function draw (el, instance, dispatch_) {
 
     // Turn the data into a d3 hierarchy and calculate the sums.
     var root = d3Hierarchy.hierarchy(json)
-        .sum(function(d) { return d[x.options.valueField || "size"]; });
+        .sum(function(d) {
+          // only sum if no children (or is leaf) 
+          if(!(d.children && d.children.length > 0)) return d[x.options.valueField || "size"];
+        });
 
     // check for sort function
     if(x.options.sortFunction){

diff --git a/javascript/src/sunburst-chart.js b/javascript/src/sunburst-chart.js
@@ -147,7 +147,10 @@ export default function (el, instance, dispatch_) {
 
     // Turn the data into a d3 hierarchy and calculate the sums.
     var root = hierarchy(json)
-        .sum(function(d) { return d[x.options.valueField || "size"]; });
+        .sum(function(d) {
+          // only sum if no children (or is leaf) 
+          if(!(d.children && d.children.length > 0)) return d[x.options.valueField || "size"];
+        });
 
     // check for sort function
     if(x.options.sortFunction){