Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into kw/9325-better-mark-i…
Browse files Browse the repository at this point in the history
…nvalid

# Conflicts:
#	build/vega-lite-schema.json
#	src/scale.ts
  • Loading branch information
kanitw committed May 17, 2024
2 parents 42b2175 + 7db657a commit df46191
Show file tree
Hide file tree
Showing 122 changed files with 122 additions and 116 deletions.
10 changes: 5 additions & 5 deletions build/vega-lite-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -22122,7 +22122,7 @@
"type": "number"
},
"maxFontSize": {
"description": "The default max value for mapping quantitative fields to text's size/fontSize.\n\n__Default value:__ `40`",
"description": "The default max value for mapping quantitative fields to text's size/fontSize scale.\n\n__Default value:__ `40`",
"minimum": 0,
"type": "number"
},
Expand All @@ -22143,12 +22143,12 @@
"type": "number"
},
"minBandSize": {
"description": "The default min value for mapping quantitative fields to bar and tick's size/bandSize scale with zero=false.\n\n__Default value:__ `2`",
"description": "The default min value for mapping quantitative fields to bar and tick's size/bandSize scale.\n\n__Default value:__ `2`",
"minimum": 0,
"type": "number"
},
"minFontSize": {
"description": "The default min value for mapping quantitative fields to text's size/fontSize scale with zero=false\n\n__Default value:__ `8`",
"description": "The default min value for mapping quantitative fields to text's size/fontSize scale.\n\n__Default value:__ `8`",
"minimum": 0,
"type": "number"
},
Expand All @@ -22159,12 +22159,12 @@
"type": "number"
},
"minSize": {
"description": "Default minimum value for point size scale with zero=false.\n\n__Default value:__ `9`",
"description": "Default minimum value for point size scale.\n\n__Default value:__ `9`",
"minimum": 0,
"type": "number"
},
"minStrokeWidth": {
"description": "Default minimum strokeWidth for the scale of strokeWidth for rule and line marks and of size for trail marks with zero=false.\n\n__Default value:__ `1`",
"description": "Default minimum strokeWidth for the scale of strokeWidth for rule and line marks and of size for trail marks.\n\n__Default value:__ `1`",
"minimum": 0,
"type": "number"
},
Expand Down
Binary file modified examples/compiled/airport_connections.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/airport_connections.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/airport_connections.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"name": "size",
"type": "linear",
"domain": {"data": "data_1", "field": "routes"},
"range": [0, 1000],
"range": [4, 1000],
"zero": true
}
]
Expand Down
Binary file modified examples/compiled/circle_binned.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_binned.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_binned.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"type": "linear",
"domain": {"data": "source_0", "field": "__count"},
"range": [
0,
4,
{
"signal": "pow(0.95 * min(width / ((bin_maxbins_10_IMDB_Rating_bins.stop - bin_maxbins_10_IMDB_Rating_bins.start) / bin_maxbins_10_IMDB_Rating_bins.step), height / ((bin_maxbins_10_Rotten_Tomatoes_Rating_bins.stop - bin_maxbins_10_Rotten_Tomatoes_Rating_bins.start) / bin_maxbins_10_Rotten_Tomatoes_Rating_bins.step)), 2)"
}
Expand Down
Binary file modified examples/compiled/circle_binned_maxbins_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_binned_maxbins_2.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_binned_maxbins_2.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"type": "linear",
"domain": {"data": "source_0", "field": "__count"},
"range": [
0,
4,
{
"signal": "pow(0.95 * min(width / ((bin_maxbins_2_IMDB_Rating_bins.stop - bin_maxbins_2_IMDB_Rating_bins.start) / bin_maxbins_2_IMDB_Rating_bins.step), height / ((bin_maxbins_2_Rotten_Tomatoes_Rating_bins.stop - bin_maxbins_2_Rotten_Tomatoes_Rating_bins.start) / bin_maxbins_2_Rotten_Tomatoes_Rating_bins.step)), 2)"
}
Expand Down
Binary file modified examples/compiled/circle_binned_maxbins_20.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_binned_maxbins_20.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_binned_maxbins_20.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"type": "linear",
"domain": {"data": "source_0", "field": "__count"},
"range": [
0,
4,
{
"signal": "pow(0.95 * min(width / ((bin_maxbins_20_IMDB_Rating_bins.stop - bin_maxbins_20_IMDB_Rating_bins.start) / bin_maxbins_20_IMDB_Rating_bins.step), height / ((bin_maxbins_20_Rotten_Tomatoes_Rating_bins.stop - bin_maxbins_20_Rotten_Tomatoes_Rating_bins.start) / bin_maxbins_20_Rotten_Tomatoes_Rating_bins.step)), 2)"
}
Expand Down
Binary file modified examples/compiled/circle_binned_maxbins_5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_binned_maxbins_5.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_binned_maxbins_5.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"type": "linear",
"domain": {"data": "source_0", "field": "__count"},
"range": [
0,
4,
{
"signal": "pow(0.95 * min(width / ((bin_maxbins_5_IMDB_Rating_bins.stop - bin_maxbins_5_IMDB_Rating_bins.start) / bin_maxbins_5_IMDB_Rating_bins.step), height / ((bin_maxbins_5_Rotten_Tomatoes_Rating_bins.stop - bin_maxbins_5_Rotten_Tomatoes_Rating_bins.start) / bin_maxbins_5_Rotten_Tomatoes_Rating_bins.step)), 2)"
}
Expand Down
Binary file modified examples/compiled/circle_bubble_health_income.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_bubble_health_income.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_bubble_health_income.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
"name": "size",
"type": "linear",
"domain": {"data": "source_0", "field": "population"},
"range": [0, 361],
"range": [4, 361],
"zero": true
}
],
Expand Down
Binary file modified examples/compiled/circle_github_punchcard.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_github_punchcard.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_github_punchcard.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"name": "size",
"type": "linear",
"domain": {"data": "data_0", "field": "sum_count"},
"range": [0, 361],
"range": [4, 361],
"zero": true
}
],
Expand Down
Binary file modified examples/compiled/circle_labelangle_orient_signal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_labelangle_orient_signal.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_labelangle_orient_signal.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"name": "size",
"type": "linear",
"domain": {"data": "data_0", "field": "sum_count"},
"range": [0, 361],
"range": [4, 361],
"zero": true
}
],
Expand Down
Binary file modified examples/compiled/circle_natural_disasters.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_natural_disasters.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_natural_disasters.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"name": "size",
"type": "linear",
"domain": {"data": "source_0", "field": "Deaths"},
"range": [0, 5000],
"range": [4, 5000],
"zero": true
}
],
Expand Down
Binary file modified examples/compiled/circle_scale_quantile.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_scale_quantile.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/circle_scale_quantile.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"type": "quantile",
"domain": {"data": "data_0", "field": "b"},
"range": {
"signal": "sequence(9, 361 + (361 - 9) / (4 - 1), (361 - 9) / (4 - 1))"
"signal": "sequence(4, 361 + (361 - 4) / (4 - 1), (361 - 4) / (4 - 1))"
}
}
],
Expand Down
Binary file modified examples/compiled/circle_scale_quantize.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit df46191

Please sign in to comment.