adds domain override to .color( ) scale (closes #523)

d3plus · Aug 12, 2016 · 3133e81 · 3133e81
1 parent e5a1480
commit 3133e81
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/core/data/color.js b/src/core/data/color.js
@@ -8,11 +8,16 @@ module.exports = function(vars) {
 
   if ( vars.dev.value ) print.time("getting color data range")
 
-  var data_range = []
-  vars.data.pool.forEach(function(d){
-    var val = parseFloat(fetchValue(vars,d,vars.color.value))
-    if (typeof val == "number" && !isNaN(val) && data_range.indexOf(val) < 0) data_range.push(val)
-  })
+  if (vars.color.domain.value) {
+    var data_range = vars.color.domain.value;
+  }
+  else {
+    var data_range = []
+    vars.data.pool.forEach(function(d){
+      var val = parseFloat(fetchValue(vars,d,vars.color.value))
+      if (typeof val == "number" && !isNaN(val) && data_range.indexOf(val) < 0) data_range.push(val)
+    })
+  }
 
   if ( vars.dev.value ) print.timeEnd("getting color data range")
 
@@ -22,7 +27,7 @@ module.exports = function(vars) {
 
     if ( vars.dev.value ) print.time("calculating color scale")
 
-    data_range = d3.extent(data_range)
+    data_range = d3.extent(data_range);
 
     if (data_range[0] < 0 && data_range[1] > 0) {
       var color_range = vars.color.range

diff --git a/src/viz/methods/color.coffee b/src/viz/methods/color.coffee
@@ -4,6 +4,9 @@ scale  = require("../../color/scale.coffee")
 module.exports =
   accepted:   [false, Array, Function, Object, String]
   deprecates: "color_var"
+  domain:
+    accepted: [false, Array]
+    value: false
   focus:      "#444444"
   heatmap:    ["#282F6B", "#419391", "#AFD5E8", "#EACE3F", "#B35C1E", "#B22200"]
   missing:    "#eeeeee"