Skip to content
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.

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

fix(#9343): binned stacked area now correctly filter null values #9344

Merged
merged 4 commits into from
May 9, 2024
Merged
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
Binary file added examples/compiled/stacked_area_binned.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions examples/compiled/stacked_area_binned.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
173 changes: 173 additions & 0 deletions examples/compiled/stacked_area_binned.vg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
{
"$schema": "https://vega.github.io/schema/vega/v5.json",
"background": "white",
"padding": 5,
"width": 200,
"height": 200,
"style": "cell",
"data": [
{
"name": "source_0",
"url": "data/movies.json",
"format": {"type": "json", "parse": {"IMDB Rating": "number"}},
"transform": [
{
"type": "extent",
"field": "IMDB Rating",
"signal": "bin_maxbins_10_IMDB_Rating_extent"
},
{
"type": "bin",
"field": "IMDB Rating",
"as": [
"bin_maxbins_10_IMDB Rating",
"bin_maxbins_10_IMDB Rating_end"
],
"signal": "bin_maxbins_10_IMDB_Rating_bins",
"extent": {"signal": "bin_maxbins_10_IMDB_Rating_extent"},
"maxbins": 10
},
{
"type": "aggregate",
"groupby": [
"bin_maxbins_10_IMDB Rating",
"bin_maxbins_10_IMDB Rating_end",
"Major Genre"
],
"ops": ["count"],
"fields": [null],
"as": ["__count"]
},
{
"type": "formula",
"expr": "isValid(datum[\"bin_maxbins_10_IMDB Rating\"]) && isFinite(+datum[\"bin_maxbins_10_IMDB Rating\"]) ? 0.5*datum[\"bin_maxbins_10_IMDB Rating\"]+0.5*datum[\"bin_maxbins_10_IMDB Rating_end\"] : datum[\"bin_maxbins_10_IMDB Rating\"]",
"as": "bin_maxbins_10_IMDB Rating_mid"
},
{
"type": "impute",
"field": "__count",
"groupby": ["Major Genre"],
"key": "bin_maxbins_10_IMDB Rating_mid",
"method": "value",
"value": 0
},
{
"type": "stack",
"groupby": ["bin_maxbins_10_IMDB Rating_mid"],
"field": "__count",
"sort": {"field": ["Major Genre"], "order": ["descending"]},
"as": ["__count_start", "__count_end"],
"offset": "zero"
}
]
}
],
"marks": [
{
"name": "pathgroup",
"type": "group",
"from": {
"facet": {
"name": "faceted_path_main",
"data": "source_0",
"groupby": ["Major Genre"]
}
},
"encode": {
"update": {
"width": {"field": {"group": "width"}},
"height": {"field": {"group": "height"}}
}
},
"marks": [
{
"name": "marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"bin_maxbins_10_IMDB Rating_mid\"]"},
"from": {"data": "faceted_path_main"},
"encode": {
"update": {
"orient": {"value": "vertical"},
"fill": {"scale": "color", "field": "Major Genre"},
"description": {
"signal": "\"IMDB Rating (binned): \" + (!isValid(datum[\"bin_maxbins_10_IMDB Rating\"]) || !isFinite(+datum[\"bin_maxbins_10_IMDB Rating\"]) ? \"null\" : format(datum[\"bin_maxbins_10_IMDB Rating\"], \"\") + \" – \" + format(datum[\"bin_maxbins_10_IMDB Rating_end\"], \"\")) + \"; Count of Records: \" + (format(datum[\"__count\"], \"\")) + \"; Major Genre: \" + (isValid(datum[\"Major Genre\"]) ? datum[\"Major Genre\"] : \"\"+datum[\"Major Genre\"])"
},
"x": {"scale": "x", "field": "bin_maxbins_10_IMDB Rating_mid"},
"y": {"scale": "y", "field": "__count_end"},
"y2": {"scale": "y", "field": "__count_start"},
"defined": {
"signal": "isValid(datum[\"bin_maxbins_10_IMDB Rating_mid\"]) && isFinite(+datum[\"bin_maxbins_10_IMDB Rating_mid\"]) && isValid(datum[\"__count\"]) && isFinite(+datum[\"__count\"])"
}
}
}
}
]
}
],
"scales": [
{
"name": "x",
"type": "linear",
"domain": {
"signal": "[bin_maxbins_10_IMDB_Rating_bins.start, bin_maxbins_10_IMDB_Rating_bins.stop]"
},
"range": [0, {"signal": "width"}],
"bins": {"signal": "bin_maxbins_10_IMDB_Rating_bins"},
"zero": false
},
{
"name": "y",
"type": "linear",
"domain": {
"data": "source_0",
"fields": ["__count_start", "__count_end"]
},
"range": [{"signal": "height"}, 0],
"nice": true,
"zero": true
},
{
"name": "color",
"type": "ordinal",
"domain": {"data": "source_0", "field": "Major Genre", "sort": true},
"range": "category"
}
],
"axes": [
{
"scale": "y",
"orient": "left",
"gridScale": "x",
"grid": true,
"tickCount": {"signal": "ceil(height/40)"},
"domain": false,
"labels": false,
"aria": false,
"maxExtent": 0,
"minExtent": 0,
"ticks": false,
"zindex": 0
},
{
"scale": "x",
"orient": "bottom",
"grid": false,
"title": "IMDB Rating (binned)",
"labelFlush": true,
"labelOverlap": true,
"tickCount": {"signal": "ceil(width/10)"},
"zindex": 0
},
{
"scale": "y",
"orient": "left",
"grid": false,
"title": "Count of Records",
"labelOverlap": true,
"tickCount": {"signal": "ceil(height/40)"},
"zindex": 0
}
],
"legends": [{"fill": "color", "symbolType": "circle", "title": "Major Genre"}]
}
13 changes: 13 additions & 0 deletions examples/specs/stacked_area_binned.vl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"$schema": "https://vega.github.io/schema/vega-lite/v5.json",
"data": {"url": "data/movies.json"},
"mark": "area",
"encoding": {
"x": {
"bin": true,
"field": "IMDB Rating"
},
"y": {"aggregate": "count"},
"color": {"field": "Major Genre"}
}
}
9 changes: 6 additions & 3 deletions src/compile/data/filterinvalid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,9 @@ export class FilterInvalidNode extends DataFlowNode {

if (fieldDef !== null) {
if (fieldDef.type === 'temporal') {
vegaFilters.push(`(isDate(${ref}) || (isValid(${ref}) && isFinite(+${ref})))`);
vegaFilters.push(`(isDate(${ref}) || (${isValidFiniteNumberExpr(ref)}))`);
} else if (fieldDef.type === 'quantitative') {
vegaFilters.push(`isValid(${ref})`);
vegaFilters.push(`isFinite(+${ref})`);
vegaFilters.push(isValidFiniteNumberExpr(ref));
} else {
// should never get here
}
Expand All @@ -94,3 +93,7 @@ export class FilterInvalidNode extends DataFlowNode {
: null;
}
}

export function isValidFiniteNumberExpr(ref: string) {
return `isValid(${ref}) && isFinite(+${ref})`;
}
3 changes: 2 additions & 1 deletion src/compile/data/stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {duplicate, getFirstDefined, hash} from '../../util';
import {sortParams} from '../common';
import {UnitModel} from '../unit';
import {DataFlowNode} from './dataflow';
import {isValidFiniteNumberExpr} from './filterinvalid';

function getStackByFields(model: UnitModel): string[] {
return model.stack.stackBy.reduce((fields, by) => {
Expand Down Expand Up @@ -240,7 +241,7 @@ export class StackNode extends DataFlowNode {
const binEnd = vgField(dimensionFieldDef, {expr: 'datum', binSuffix: 'end'});
transform.push({
type: 'formula',
expr: `${bandPosition}*${binStart}+${1 - bandPosition}*${binEnd}`,
expr: `${isValidFiniteNumberExpr(binStart)} ? ${bandPosition}*${binStart}+${1 - bandPosition}*${binEnd} : ${binStart}`,
as: vgField(dimensionFieldDef, {binSuffix: 'mid', forAs: true})
});
}
Expand Down
2 changes: 1 addition & 1 deletion test/compile/data/stack.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ describe('compile/data/stack', () => {
expect(assemble(model)).toEqual([
{
type: 'formula',
expr: '0.5*datum["bin_maxbins_10_b"]+0.5*datum["bin_maxbins_10_b_end"]',
expr: 'isValid(datum["bin_maxbins_10_b"]) && isFinite(+datum["bin_maxbins_10_b"]) ? 0.5*datum["bin_maxbins_10_b"]+0.5*datum["bin_maxbins_10_b_end"] : datum["bin_maxbins_10_b"]',
as: 'bin_maxbins_10_b_mid'
},
{
Expand Down