Skip to content

Fix lakes and rivers geometry on scoped geo subplots#4048

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
etpinard merged 4 commits into from
Jul 16, 2019
Merged

Fix lakes and rivers geometry on scoped geo subplots #4048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02614d2
add geo mock of lakes & rivers at 110m and 50m resolutions
etpinard Jul 15, 2019
7075d13
baseline geo_lakes-and-rivers using pre-#3856 topojson files
etpinard Jul 15, 2019
f06d25c
use topojson files from sane-topojson@4.0.0
etpinard Jul 15, 2019
5385673
baseline geo_lakes-and-rivers using sane-topojson@4.0.0
etpinard Jul 15, 2019
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 dist/topojson/africa_110m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/africa_50m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/asia_110m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/asia_50m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/europe_110m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/europe_50m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/north-america_110m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/north-america_50m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/south-america_110m.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/topojson/south-america_50m.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@
"regl-splom": "^1.0.7",
"right-now": "^1.0.0",
"robust-orientation": "^1.1.3",
"sane-topojson": "^3.0.1",
"sane-topojson": "^4.0.0",
"strongly-connected-components": "^1.0.1",
"superscript-text": "^1.0.0",
"svg-path-sdf": "^1.1.3",
Expand Down
Binary file addedtest/image/baselines/geo_lakes-and-rivers.png
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.
264 changes: 264 additions & 0 deletions test/image/mocks/geo_lakes-and-rivers.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
{

@etpinardetpinardJul 15, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This mock currently looks like:

newplot (42)

@etpinardetpinardJul 15, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using topojson files from before #3856 fixes the lake polygons, but the scoped rivers were still off, see 7075d13 or diff in 5385673

"data": [
{
"type": "scattergeo",
"geo": "geo"
},
{
"type": "scattergeo",
"geo": "geo2"
},
{
"type": "scattergeo",
"geo": "geo3"
},
{
"type": "scattergeo",
"geo": "geo4"
},
{
"type": "scattergeo",
"geo": "geo5"
},
{
"type": "scattergeo",
"geo": "geo6"
},
{
"type": "scattergeo",
"geo": "geo7"
},
{
"type": "scattergeo",
"geo": "geo8"
},
{
"type": "scattergeo",
"geo": "geo9"
},
{
"type": "scattergeo",
"geo": "geo10"
},
{
"type": "scattergeo",
"geo": "geo11"
},
{
"type": "scattergeo",
"geo": "geo12"
},
{
"type": "scattergeo",
"geo": "geo13"
},
{
"type": "scattergeo",
"geo": "geo14"
}
],
"layout": {
"grid": {
"rows": 7,
"columns": 2
},
"width": 600,
"height": 1500,
"geo": {
"scope": "world",
"resolution": 110,
"domain": {
"column": 0,
"row": 0
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo2": {
"scope": "usa",
"resolution": 110,
"domain": {
"column": 0,
"row": 1
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo3": {
"scope": "europe",
"resolution": 110,
"domain": {
"column": 0,
"row": 2
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo4": {
"scope": "asia",
"resolution": 110,
"domain": {
"column": 0,
"row": 3
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo5": {
"scope": "africa",
"resolution": 110,
"domain": {
"column": 0,
"row": 4
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo6": {
"scope": "north america",
"resolution": 110,
"domain": {
"column": 0,
"row": 5
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo7": {
"scope": "south america",
"resolution": 110,
"domain": {
"column": 0,
"row": 6
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo8": {
"scope": "world",
"resolution": 50,
"domain": {
"column": 1,
"row": 0
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo9": {
"scope": "usa",
"resolution": 50,
"domain": {
"column": 1,
"row": 1
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo10": {
"scope": "europe",
"resolution": 50,
"domain": {
"column": 1,
"row": 2
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo11": {
"scope": "asia",
"resolution": 50,
"domain": {
"column": 1,
"row": 3
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo12": {
"scope": "africa",
"resolution": 50,
"domain": {
"column": 1,
"row": 4
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo13": {
"scope": "north america",
"resolution": 50,
"domain": {
"column": 1,
"row": 5
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
},
"geo14": {
"scope": "south america",
"resolution": 50,
"domain": {
"column": 1,
"row": 6
},
"landcolor": "brown",
"showland": true,
"lakecolor": "blue",
"showlakes": true,
"rivercolor": "blue",
"showrivers": true
}
}
}