-
Notifications
You must be signed in to change notification settings - Fork 94
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
Add a function to join/enclose areas. #306
Merged
Merged
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4f6524b
Add a function to join/enclose areas.
gerritholl 63de559
Adapt to satisfy deepcode.
gerritholl 25542c5
Merge branch 'master' into area-join-utility
gerritholl 8cc3721
Merge branch 'master' into area-join-utility
gerritholl 6699f9d
Merge branch 'master' into area-join-utility
gerritholl 3bcc187
Merge branch 'master' into area-join-utility
gerritholl 50bafda
Merge branch 'master' into area-join-utility
gerritholl f1e048f
Replace proj_dict by crs
gerritholl 599fc22
Rename area_enclosure to enclose_areas
gerritholl bdb6ccb
Remove duplicate import
gerritholl 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
Next
Next commit
Add a function to join/enclose areas.
Add a function to calculate an area enclosing one or more other areas.
- Loading branch information
commit 4f6524b41b07362fb6f6362c61df3d7d7e24ebab
There are no files selected for viewing
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
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
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.
After #332, this should be changed to
.crs
. Actually, it could be done now and should still work. Passing PROJ dicts in is fine, using them after is not. Ah you also use proj_dict below to get the units. This shouldn't be necessary ascreate_area_def
should determine the units from the CRS information.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.
If I change
first.proj_dict
tofirst.crs
the test fails withTypeError: Wrong type for projection: <class 'pyproj.crs.crs.CRS'>. Expected dict or string.
in_get_proj_data
, which verifies that the projection is either a dict or a string.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.
🤔 I think in #332 that should work. Once some of my more recent PRs are merged maybe we can test this idea again.
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.
Should I wait for merger of #332 and then adapt the code here?
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.
Merged just now. If you have the time to merge master into this PR and test some things that'd be great. Thanks.
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.
Replaced
proj_dict
bycrs
.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.
Changed name to
enclose_areas
.