Skip to content

Commit

Permalink
Merge pull request #4048 from plotly/fixup-geo-scope-lake-polygons
Browse files Browse the repository at this point in the history 
Fix lakes and rivers geometry on scoped geo subplots
  • Loading branch information
@etpinard
etpinard authored Jul 16, 2019
2 parents 674f0b0 + 5385673 commit 218a919
Show file tree
Hide file tree
Showing 14 changed files with 278 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dist/topojson/africa_110m.json
View file

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

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
Original file line number Diff line number Diff 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 added test/image/baselines/geo_lakes-and-rivers.png
View file
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
{
"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
}
}
}

0 comments on commit 218a919

Please sign in to comment.