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 continuous colour chart #78

Merged
merged 24 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dc1c1f9
🐛 : add continuous color chart
edwardchalstrey1 Dec 2, 2021
66d3308
♻️ : aremove duplicated code
edwardchalstrey1 Dec 2, 2021
d6521f3
🐛 : remove added legend
edwardchalstrey1 Dec 2, 2021
a192c88
✨ : flakee8
edwardchalstrey1 Dec 2, 2021
b08e7fd
❗ : move title
edwardchalstrey1 Dec 6, 2021
6c64c7c
❗ : remove x axis title when continuous
edwardchalstrey1 Dec 6, 2021
5b2b86f
❗ : add y axis title
edwardchalstrey1 Dec 6, 2021
016f27f
❗ : remove x axis title
edwardchalstrey1 Dec 6, 2021
3218eb6
❗ : use mark_bar for continuous chart
edwardchalstrey1 Dec 6, 2021
728192d
❗ : use count() properly
edwardchalstrey1 Dec 6, 2021
53f3b90
❗ : drop duplicates for colours used chart
edwardchalstrey1 Dec 6, 2021
3bc1d1c
🐛 : remove commented code
edwardchalstrey1 Dec 6, 2021
5f47f71
❗ : adding a y scale to the cont col chart with nice=False almost works
edwardchalstrey1 Dec 6, 2021
99893e5
❗ : setting nice=False for cont hist works for choroplent example
edwardchalstrey1 Dec 6, 2021
48e3e27
❗ : reemove y scale args note needed
edwardchalstrey1 Dec 7, 2021
78d1f13
❗ : remove comments and y scale args not needed
edwardchalstrey1 Dec 7, 2021
1d567cf
✨ : flake8
edwardchalstrey1 Dec 7, 2021
82098f5
❗ : add y_scale option for binning where extent not set
edwardchalstrey1 Dec 7, 2021
585193e
❗ : add y_scale option for binning where extent not set density plot
edwardchalstrey1 Dec 7, 2021
4059bbd
Merge branch 'develop' into continuous-color-chart
edwardchalstrey1 Dec 7, 2021
4cdd816
❗ : restore change
edwardchalstrey1 Dec 7, 2021
7dd0385
❗ : modify tests
edwardchalstrey1 Dec 7, 2021
90bc4d0
♻️ : reduce number of ifs
edwardchalstrey1 Dec 7, 2021
598060e
❗ : modify tests
edwardchalstrey1 Dec 7, 2021
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
11 changes: 5 additions & 6 deletions tests/expected_meta_hist_choropleth.json
Original file line number Diff line number Diff line change
Expand Up @@ -363744,10 +363744,9 @@
},
"field": "pct_estimate",
"scale": {
"nice": true,
"zero": false
"nice": true
},
"title": "",
"title": "pct_estimate",
"type": "quantitative"
}
},
Expand All @@ -363756,6 +363755,7 @@
"color": "gray",
"type": "bar"
},
"title": "Colours used",
"transform": [
{
"joinaggregate": [
Expand Down Expand Up @@ -363795,7 +363795,7 @@
},
"field": "x",
"sort": "descending",
"title": "colours used",
"title": "",
"type": "quantitative"
},
"y": {
Expand All @@ -363805,8 +363805,7 @@
},
"field": "y",
"scale": {
"nice": true,
"zero": false
"nice": true
},
"title": "",
"type": "quantitative"
Expand Down
2 changes: 1 addition & 1 deletion tests/expected_meta_hist_choropleth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions tests/expected_meta_hist_choropleth_extent.json
Original file line number Diff line number Diff line change
Expand Up @@ -363754,7 +363754,7 @@
],
"nice": true
},
"title": "",
"title": "pct_estimate",
"type": "quantitative"
}
},
Expand All @@ -363763,6 +363763,7 @@
"color": "gray",
"type": "bar"
},
"title": "Colours used",
"transform": [
{
"joinaggregate": [
Expand Down Expand Up @@ -363806,7 +363807,7 @@
},
"field": "x",
"sort": "descending",
"title": "colours used",
"title": "",
"type": "quantitative"
},
"y": {
Expand Down
2 changes: 1 addition & 1 deletion tests/expected_meta_hist_choropleth_extent.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 7 additions & 2 deletions tests/expected_meta_hist_scatterplot.json
Original file line number Diff line number Diff line change
Expand Up @@ -57663,7 +57663,11 @@
"maxbins": 100
},
"field": "Production_Budget",
"title": "",
"scale": {
"nice": true,
"zero": false
},
"title": "Production_Budget",
"type": "quantitative"
}
},
Expand All @@ -57672,6 +57676,7 @@
"color": "gray",
"type": "bar"
},
"title": "Colours used",
"transform": [
{
"joinaggregate": [
Expand Down Expand Up @@ -57711,7 +57716,7 @@
},
"field": "x",
"sort": "descending",
"title": "colours used",
"title": "",
"type": "quantitative"
},
"y": {
Expand Down
2 changes: 1 addition & 1 deletion tests/expected_meta_hist_scatterplot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading