Skip to content

Update boolean scheme9 scales #706

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 3 commits into from
Jan 25, 2022
Merged

Update boolean scheme9 scales #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5307760
Update boolean scheme9 scales
mkfreeman Jan 25, 2022
5a3354e
Update src/scales/schemes.js
mkfreeman Jan 25, 2022
852f4b2
Update tests for boolean colors
mkfreeman Jan 25, 2022
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
2 changes: 1 addition & 1 deletion src/scales/schemes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const ordinalSchemes = new Map([
function scheme9(scheme, interpolate) {
return ({length: n}) => {
if (n === 1) return [scheme[3][1]]; // favor midpoint
if (n === 2) return [scheme[3][0], scheme[3][2]]; // favor extrema
if (n === 2) return [scheme[3][1], scheme[3][2]]; // favor darker
n = Math.max(3, Math.floor(n));
return n > 9 ? quantize(interpolate, n) : scheme[n];
};
Expand Down
36 changes: 18 additions & 18 deletions test/output/colorSchemesOrdinal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3635,7 +3635,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-107-swatch" style="--color: #deebf7;">blues</span><span class="plot-107-swatch" style="--color: #3182bd;">1</span>
</style><span class="plot-107-swatch" style="--color: #9ecae1;">blues</span><span class="plot-107-swatch" style="--color: #3182bd;">1</span>
</div>
<div class="plot-108" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -3805,7 +3805,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-112-swatch" style="--color: #e5f5e0;">greens</span><span class="plot-112-swatch" style="--color: #31a354;">1</span>
</style><span class="plot-112-swatch" style="--color: #a1d99b;">greens</span><span class="plot-112-swatch" style="--color: #31a354;">1</span>
</div>
<div class="plot-113" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -3975,7 +3975,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-117-swatch" style="--color: #f0f0f0;">greys</span><span class="plot-117-swatch" style="--color: #636363;">1</span>
</style><span class="plot-117-swatch" style="--color: #bdbdbd;">greys</span><span class="plot-117-swatch" style="--color: #636363;">1</span>
</div>
<div class="plot-118" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -4145,7 +4145,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-122-swatch" style="--color: #fee6ce;">oranges</span><span class="plot-122-swatch" style="--color: #e6550d;">1</span>
</style><span class="plot-122-swatch" style="--color: #fdae6b;">oranges</span><span class="plot-122-swatch" style="--color: #e6550d;">1</span>
</div>
<div class="plot-123" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -4315,7 +4315,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-127-swatch" style="--color: #efedf5;">purples</span><span class="plot-127-swatch" style="--color: #756bb1;">1</span>
</style><span class="plot-127-swatch" style="--color: #bcbddc;">purples</span><span class="plot-127-swatch" style="--color: #756bb1;">1</span>
</div>
<div class="plot-128" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -4485,7 +4485,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-132-swatch" style="--color: #fee0d2;">reds</span><span class="plot-132-swatch" style="--color: #de2d26;">1</span>
</style><span class="plot-132-swatch" style="--color: #fc9272;">reds</span><span class="plot-132-swatch" style="--color: #de2d26;">1</span>
</div>
<div class="plot-133" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -6185,7 +6185,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-182-swatch" style="--color: #e5f5f9;">bugn</span><span class="plot-182-swatch" style="--color: #2ca25f;">1</span>
</style><span class="plot-182-swatch" style="--color: #99d8c9;">bugn</span><span class="plot-182-swatch" style="--color: #2ca25f;">1</span>
</div>
<div class="plot-183" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -6355,7 +6355,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-187-swatch" style="--color: #e0ecf4;">bupu</span><span class="plot-187-swatch" style="--color: #8856a7;">1</span>
</style><span class="plot-187-swatch" style="--color: #9ebcda;">bupu</span><span class="plot-187-swatch" style="--color: #8856a7;">1</span>
</div>
<div class="plot-188" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -6525,7 +6525,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-192-swatch" style="--color: #e0f3db;">gnbu</span><span class="plot-192-swatch" style="--color: #43a2ca;">1</span>
</style><span class="plot-192-swatch" style="--color: #a8ddb5;">gnbu</span><span class="plot-192-swatch" style="--color: #43a2ca;">1</span>
</div>
<div class="plot-193" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -6695,7 +6695,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-197-swatch" style="--color: #fee8c8;">orrd</span><span class="plot-197-swatch" style="--color: #e34a33;">1</span>
</style><span class="plot-197-swatch" style="--color: #fdbb84;">orrd</span><span class="plot-197-swatch" style="--color: #e34a33;">1</span>
</div>
<div class="plot-198" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -6865,7 +6865,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-202-swatch" style="--color: #ece7f2;">pubu</span><span class="plot-202-swatch" style="--color: #2b8cbe;">1</span>
</style><span class="plot-202-swatch" style="--color: #a6bddb;">pubu</span><span class="plot-202-swatch" style="--color: #2b8cbe;">1</span>
</div>
<div class="plot-203" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -7035,7 +7035,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-207-swatch" style="--color: #ece2f0;">pubugn</span><span class="plot-207-swatch" style="--color: #1c9099;">1</span>
</style><span class="plot-207-swatch" style="--color: #a6bddb;">pubugn</span><span class="plot-207-swatch" style="--color: #1c9099;">1</span>
</div>
<div class="plot-208" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -7205,7 +7205,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-212-swatch" style="--color: #e7e1ef;">purd</span><span class="plot-212-swatch" style="--color: #dd1c77;">1</span>
</style><span class="plot-212-swatch" style="--color: #c994c7;">purd</span><span class="plot-212-swatch" style="--color: #dd1c77;">1</span>
</div>
<div class="plot-213" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -7375,7 +7375,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-217-swatch" style="--color: #fde0dd;">rdpu</span><span class="plot-217-swatch" style="--color: #c51b8a;">1</span>
</style><span class="plot-217-swatch" style="--color: #fa9fb5;">rdpu</span><span class="plot-217-swatch" style="--color: #c51b8a;">1</span>
</div>
<div class="plot-218" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -7545,7 +7545,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-222-swatch" style="--color: #f7fcb9;">ylgn</span><span class="plot-222-swatch" style="--color: #31a354;">1</span>
</style><span class="plot-222-swatch" style="--color: #addd8e;">ylgn</span><span class="plot-222-swatch" style="--color: #31a354;">1</span>
</div>
<div class="plot-223" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -7715,7 +7715,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-227-swatch" style="--color: #edf8b1;">ylgnbu</span><span class="plot-227-swatch" style="--color: #2c7fb8;">1</span>
</style><span class="plot-227-swatch" style="--color: #7fcdbb;">ylgnbu</span><span class="plot-227-swatch" style="--color: #2c7fb8;">1</span>
</div>
<div class="plot-228" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -7885,7 +7885,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-232-swatch" style="--color: #fff7bc;">ylorbr</span><span class="plot-232-swatch" style="--color: #d95f0e;">1</span>
</style><span class="plot-232-swatch" style="--color: #fec44f;">ylorbr</span><span class="plot-232-swatch" style="--color: #d95f0e;">1</span>
</div>
<div class="plot-233" style="
--swatchWidth: 15px;
Expand Down Expand Up @@ -8055,7 +8055,7 @@
align-items: center;
margin-right: 1em;
}
</style><span class="plot-237-swatch" style="--color: #ffeda0;">ylorrd</span><span class="plot-237-swatch" style="--color: #f03b20;">1</span>
</style><span class="plot-237-swatch" style="--color: #feb24c;">ylorrd</span><span class="plot-237-swatch" style="--color: #f03b20;">1</span>
</div>
<div class="plot-238" style="
--swatchWidth: 15px;
Expand Down
2 changes: 1 addition & 1 deletion test/scales/scales-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ it("plot(…).scale('color') can return a threshold scale with an explicit schem
scaleEqual(plot.scale("color"), {
type: "threshold",
domain: [0],
range: [d3.schemeBlues[3][0], d3.schemeBlues[3][2]],
range: [d3.schemeBlues[3][1], d3.schemeBlues[3][2]],
label: "body_mass_g"
});
});
Expand Down