ENH: use query_bulk in fuzzy_contiguity #335
Merged
Conversation
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
Codecov Report
@@ Coverage Diff @@
## master #335 +/- ##
==========================================
- Coverage 81.22% 81.08% -0.14%
==========================================
Files 115 115
Lines 11678 11693 +15
==========================================
- Hits 9485 9481 -4
- Misses 2193 2212 +19
Continue to review full report at Codecov.
|
jGaboardi
reviewed
Aug 13, 2020
jGaboardi
approved these changes
Aug 14, 2020
Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Reimplements core part of
fuzzy_contiguityusing newsindex.query_bulkintroduced in GeoPandas 0.8.0. It brings cleaner code (once compatibility layer is removed), performance enhancements (438 msvs2.58 sformap_RS_BR.shp) and allows specification ofpredicate, which means that we can generate weights not only based onintersectsbut also'within', 'contains', 'overlaps', 'crosses', 'touches'(plus more once pygeos/shapely 2.0 will support them).At the same time resolves #334.
Note that it now uses the actual index of the GeoDataFrame, not an integer (as per @sjsrey's suggestion).