-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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 lakes and rivers geometry on scoped geo subplots #4048
Merged
+278
−14
Merged
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 7075d13
baseline geo_lakes-and-rivers using pre-#3856 topojson files
etpinard f06d25c
use topojson files from [email protected]
etpinard 5385673
baseline geo_lakes-and-rivers using [email protected]
etpinard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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:
There was a problem hiding this comment.
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