Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 11 additions & 9 deletions src/transforms/bin.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,24 @@ export function bin(outputs = {fill: "count"}, options = {}) {
return binn(x, y, null, null, outputs, maybeInsetX(maybeInsetY(options)));
}

function maybeDenseInterval(bin, k, options = {}) {
if (options?.interval == null) return options;
function maybeDenseInterval(x, options) {
options = withTip(options, x);
if (options.interval == null) return options;
const {reduce = reduceFirst} = options;
const outputs = {filter: null};
if (options[k] != null) outputs[k] = reduce;
if (options[`${k}1`] != null) outputs[`${k}1`] = reduce;
if (options[`${k}2`] != null) outputs[`${k}2`] = reduce;
return bin(outputs, options);
const outputs = {filter: null, [x]: `${x}1`};
const y = x === "x" ? "y" : "x";
if (options[y] != null) outputs[y] = reduce;
if (options[`${y}1`] != null) outputs[`${y}1`] = reduce;
if (options[`${y}2`] != null) outputs[`${y}2`] = reduce;
return (x === "x" ? binX : binY)(outputs, options);
}

export function maybeDenseIntervalX(options = {}) {
return maybeDenseInterval(binX, "y", withTip(options, "x"));
return maybeDenseInterval("x", options);
}

export function maybeDenseIntervalY(options = {}) {
return maybeDenseInterval(binY, "x", withTip(options, "y"));
return maybeDenseInterval("y", options);
}

function binn(
Expand Down
52 changes: 26 additions & 26 deletions test/output/aaplInterval.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 14 additions & 14 deletions test/output/availability.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 20 additions & 20 deletions test/output/downloads.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 22 additions & 20 deletions test/output/integerIntervalArea.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,28 +70,30 @@
<text y="0.71em" transform="translate(40,20)">↑ y</text>
</g>
<g aria-label="x-axis tick" aria-hidden="true" fill="none" stroke="currentColor" transform="translate(0.5,0)">
<path transform="translate(69,370)" d="M0,0L0,6"></path>
<path transform="translate(127,370)" d="M0,0L0,6"></path>
<path transform="translate(185,370)" d="M0,0L0,6"></path>
<path transform="translate(243,370)" d="M0,0L0,6"></path>
<path transform="translate(301,370)" d="M0,0L0,6"></path>
<path transform="translate(359,370)" d="M0,0L0,6"></path>
<path transform="translate(417,370)" d="M0,0L0,6"></path>
<path transform="translate(475,370)" d="M0,0L0,6"></path>
<path transform="translate(533,370)" d="M0,0L0,6"></path>
<path transform="translate(591,370)" d="M0,0L0,6"></path>
<path transform="translate(40,370)" d="M0,0L0,6"></path>
<path transform="translate(98,370)" d="M0,0L0,6"></path>
<path transform="translate(156,370)" d="M0,0L0,6"></path>
<path transform="translate(214,370)" d="M0,0L0,6"></path>
<path transform="translate(272,370)" d="M0,0L0,6"></path>
<path transform="translate(330,370)" d="M0,0L0,6"></path>
<path transform="translate(388,370)" d="M0,0L0,6"></path>
<path transform="translate(446,370)" d="M0,0L0,6"></path>
<path transform="translate(504,370)" d="M0,0L0,6"></path>
<path transform="translate(562,370)" d="M0,0L0,6"></path>
<path transform="translate(620,370)" d="M0,0L0,6"></path>
</g>
<g aria-label="x-axis tick label" font-variant="tabular-nums" transform="translate(0.5,9.5)">
<text y="0.71em" transform="translate(69,370)">3</text>
<text y="0.71em" transform="translate(127,370)">4</text>
<text y="0.71em" transform="translate(185,370)">5</text>
<text y="0.71em" transform="translate(243,370)">6</text>
<text y="0.71em" transform="translate(301,370)">7</text>
<text y="0.71em" transform="translate(359,370)">8</text>
<text y="0.71em" transform="translate(417,370)">9</text>
<text y="0.71em" transform="translate(475,370)">10</text>
<text y="0.71em" transform="translate(533,370)">11</text>
<text y="0.71em" transform="translate(591,370)">12</text>
<text y="0.71em" transform="translate(40,370)">0</text>
<text y="0.71em" transform="translate(98,370)">1</text>
<text y="0.71em" transform="translate(156,370)">2</text>
<text y="0.71em" transform="translate(214,370)">3</text>
<text y="0.71em" transform="translate(272,370)">4</text>
<text y="0.71em" transform="translate(330,370)">5</text>
<text y="0.71em" transform="translate(388,370)">6</text>
<text y="0.71em" transform="translate(446,370)">7</text>
<text y="0.71em" transform="translate(504,370)">8</text>
<text y="0.71em" transform="translate(562,370)">9</text>
<text y="0.71em" transform="translate(620,370)">10</text>
</g>
<g aria-label="x-axis label" text-anchor="end" transform="translate(17.5,27.5)">
<text transform="translate(620,370)">x →</text>
Expand Down
Loading
Loading