Skip to content

fix raster crash when colors are set by hand (identity scale) #1237

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
Jan 23, 2023
Merged

fix raster crash when colors are set by hand (identity scale) #1237

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
e14766a
fix raster crash when colors are set by hand (identity scale)
Fil Jan 23, 2023
01d2bc9
formatHex (hex is deprecated)
Fil Jan 23, 2023
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/marks/raster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export class Raster extends AbstractRaster {
return super.scale(channels, scales, context);
}
render(index, scales, channels, dimensions, context) {
const {color} = scales;
const color = scales.color ?? ((x) => x);
const {x: X, y: Y} = channels;
const {document} = context;
const [x1, y1, x2, y2] = renderBounds(channels, dimensions, context);
Expand Down
19 changes: 19 additions & 0 deletions test/output/rasterCa55Color.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions test/plots/raster-ca55.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,24 @@ export async function rasterCa55Nearest() {
return rasterCa55({interpolate: "nearest"});
}

export async function rasterCa55Color() {
const ca55 = await d3.csv("data/ca55-south.csv", d3.autoType);
const domain = {type: "MultiPoint", coordinates: ca55.map((d) => [d.GRID_EAST, d.GRID_NORTH])};
return Plot.plot({
width: 640,
height: 484,
projection: {type: "reflect-y", inset: 3, domain},
marks: [
Plot.raster(ca55, {
x: "GRID_EAST",
y: "GRID_NORTH",
interpolate: "random-walk",
fill: (d) => d3.hcl(d.MAG_IGRF90, 120, 80).formatHex()
})
]
});
}

export async function contourCa55() {
return plotCa55((ca55) =>
Plot.contour(ca55, {
Expand Down