better definition of custom ranges

mhkeller · Mar 20, 2019 · 7bd8bb4 · 7bd8bb4
1 parent ac6931f
commit 7bd8bb4
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/layercake.js b/src/layercake.js
@@ -192,10 +192,11 @@ export default class LayerCakeStore extends Store {
 					if (domains === null) {
 						return null;
 					}
+					// TODO, DRYer and more explicit version of what ranges are defined as, including fallbacks
 					const defaultRanges = {
-						x: settings.reverseX ? [width, 0] : [0, width],
-						y: settings.reverseY ? [height, 0] : [0, height],
-						r: [1, 25]
+						x: settings.reverseX ? [width, 0] : typeof settings.xRange === 'function' ? settings.xRange({ width, height }) : [0, width],
+						y: settings.reverseY ? [height, 0] : typeof settings.yRange === 'function' ? settings.yRange({ width, height }) : [0, height],
+						r: !settings.rRange ? [1, 25] : typeof settings.rRange === 'function' ? settings.rRange({ width, height }) : settings.rRange
 					};
 					const scale = settings[thisScale] ? settings[thisScale].copy() : defaultScales[s]();
 					scale
@@ -214,10 +215,6 @@ export default class LayerCakeStore extends Store {
 						}
 					}
 
-					if (settings.rRange) {
-						scale.range(settings.rRange);
-					}
-
 					return scale;
 				});