Bugfix multipolygon treatment and adapt to latest Shapely #14
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
added 4 commits
January 9, 2023 14:41
Signed-off-by: Adam.Dybbroe <a000680@c21856.ad.smhi.se>
Signed-off-by: Adam.Dybbroe <a000680@c21856.ad.smhi.se>
…ions Signed-off-by: Adam.Dybbroe <a000680@c21856.ad.smhi.se>
…onstituent parts of a multi-part geometry. From 2.0 and onwards the previous code would result in a TypeError ShapelyDeprecationWarning: Iteration over multi-part geometries is deprecated and will be removed in Shapely 2.0. Use the `geoms` property to access the constituent parts of a multi-part geometry.
Signed-off-by: Adam.Dybbroe <a000680@c21856.ad.smhi.se>
mraspaud
reviewed
Jan 11, 2023
activefires_pp/post_processing.py
Outdated
Comment on lines
329
to
337
| shape = geometry.geoms[0] | ||
| pth = Path(shape.exterior.coords) | ||
| mask = pth.contains_points(points) | ||
| for shape in geometry.geoms[start_geom_index:]: | ||
|
|
||
| constituent_part = geometry.geoms[start_geom_index:] | ||
| for shape in constituent_part.geoms: | ||
| pth = Path(shape.exterior.coords) | ||
| mask = np.logical_or(mask, pth.contains_points(points)) | ||
|
|
There was a problem hiding this comment.
this looks very similar to get_maks_from_mulitpolygon, can it be factorized?
There was a problem hiding this comment.
Yes, true. I think this should be done okay now, and at least one test is covering this
Signed-off-by: Adam.Dybbroe <a000680@c21856.ad.smhi.se>
Codecov Report
@@ Coverage Diff @@
## main #14 +/- ##
==========================================
+ Coverage 75.73% 77.45% +1.71%
==========================================
Files 20 20
Lines 1966 2000 +34
Branches 193 192 -1
==========================================
+ Hits 1489 1549 +60
+ Misses 451 422 -29
- Partials 26 29 +3
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
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.
This PR mainly fixes a problem in the treatment of multi polygons for newer shapely versions.
For a while this deprecation warning has been seen.
Now with shapely 2.0 it results in a
TypeErrorand a failure.pytestflake8