From b4964189fc81aca198c14bc31370a96b76fe6090 Mon Sep 17 00:00:00 2001 From: Sebastian Haas Date: Wed, 1 Nov 2017 23:11:23 +0100 Subject: [PATCH] Scatterplot: use dot radius for 3rd data type Map the 3rd data type from z=0 to radius=0 and max(z) to dotRadius Signed-off-by: Sebastian Haas --- modules/scatterplot-chart/hybrid/index.js | 10 +++------- modules/scatterplot-chart/static/index.js | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/modules/scatterplot-chart/hybrid/index.js b/modules/scatterplot-chart/hybrid/index.js index 76abf3f..d474917 100644 --- a/modules/scatterplot-chart/hybrid/index.js +++ b/modules/scatterplot-chart/hybrid/index.js @@ -141,13 +141,9 @@ export default class ScatterplotChart extends PureComponent { getRadius(data, dataItem, dotRadius) { if (typeof data[0].z !== 'undefined') { - const rangeRadius = extent(data, (d) => d.z); - const mn = rangeRadius[0]; - const mx = rangeRadius[1]; - const p = ((dataItem.z - mn) / (mx - mn)); - const minRad = 5; - const maxRad = 20; - const rad = minRad + ((maxRad - minRad) * p); + const mx = max(data, (d) => d.z); + const p = mx ? dataItem.z / mx : 0; + const rad = dotRadius * p; return rad; } return dotRadius; diff --git a/modules/scatterplot-chart/static/index.js b/modules/scatterplot-chart/static/index.js index de31abc..590baa5 100644 --- a/modules/scatterplot-chart/static/index.js +++ b/modules/scatterplot-chart/static/index.js @@ -139,13 +139,9 @@ export default class ScatterplotChart extends PureComponent { getRadius(data, dataItem, dotRadius) { if (typeof data[0].z !== 'undefined') { - const rangeRadius = extent(data, (d) => d.z); - const mn = rangeRadius[0]; - const mx = rangeRadius[1]; - const p = ((dataItem.z - mn) / (mx - mn)); - const minRad = 5; - const maxRad = 20; - const rad = minRad + ((maxRad - minRad) * p); + const mx = max(data, (d) => d.z); + const p = mx ? dataItem.z / mx : 0; + const rad = dotRadius * p; return rad; } return dotRadius;