Skip to content

inferRadialRange #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2021
Merged

inferRadialRange #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c79e59
switch from inferRadialDomain to inferRadialRange
Fil Mar 11, 2021
7eeadcc
inferRadialDomain [0, max] (#237)
mbostock Mar 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/scales/quantitative.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export function ScaleQ(key, scale, channels, {
clamp,
domain = (registry.get(key) === radius ? inferRadialDomain : inferDomain)(channels),
round,
range = registry.get(key) === radius ? [0, 3] : undefined, // see inferRadialDomain
range = registry.get(key) === radius ? inferRadialRange(channels, domain) : undefined,
scheme,
type,
interpolate = registry.get(key) === color ? (range !== undefined ? interpolateRgb : scheme !== undefined ? Scheme(scheme) : type === "cyclical" ? interpolateRainbow : interpolateTurbo) : round ? interpolateRound : undefined,
Expand Down Expand Up @@ -219,11 +219,13 @@ function inferDomain(channels) {
];
}

function inferRadialDomain(channels) {
return [0, max(channels, ({value}) => value === undefined ? value : max(value))];
}

// We don’t want the upper bound of the radial domain to be zero, as this would
// be degenerate, so we ignore nonpositive values.
function inferRadialDomain(channels) {
return [
0,
quantile(channels, 0.5, ({value}) => value === undefined ? NaN : quantile(value, 0.25, positive))
];
function inferRadialRange(channels, domain) {
const h25 = quantile(channels, 0.5, ({value}) => value === undefined ? NaN : quantile(value, 0.25, positive));
return domain.map(d => 3 * Math.sqrt(d / h25));
}
Loading