Limit sliver uses #23
Conversation
… geodataframes, and works even if a geometry collection isn't returned.
|
|
||
|
|
||
| def test_clip_line_keep_slivers(single_rectangle_gdf, sliver_line): | ||
| with pytest.warns(UserWarning): |
| else: | ||
| raise TypeError("`drop_sliver` does not support {}.".format(type)) | ||
| elif (concat.geom_type == "GeometryCollection").any() and not drop_slivers: | ||
| polys = ["Polygon", "MultiPolygon"] |
There was a problem hiding this comment.
You can add a few tactful comments here.
geopandas/tools/clip.py
Outdated
| lines = ["LineString", "MultiLineString", "LinearRing"] | ||
| points = ["Point", "MultiPoint"] | ||
|
|
||
| poly_check_orig = gdf.geom_type.isin(polys).any() |
There was a problem hiding this comment.
These three variables are not needed if you just add the boolean values directly in the list below.
geopandas/tools/clip.py
Outdated
|
|
||
| orig_types_total = sum([poly_check_orig, lines_check_orig, points_check_orig]) | ||
|
|
||
| poly_check_clip = concat.geom_type.isin(polys).any() |
There was a problem hiding this comment.
Similarly - please just add these up in the list below!
|
@lwasser added in the comments and docstrings, and reformatted the type checks. Hope this is it! |
Codecov Report
@@ Coverage Diff @@
## add-clip #23 +/- ##
============================================
+ Coverage 90.14% 90.37% +0.22%
============================================
Files 22 22
Lines 2161 2171 +10
============================================
+ Hits 1948 1962 +14
+ Misses 213 209 -4
Continue to review full report at Codecov.
|
| lines = ["LineString", "MultiLineString", "LinearRing"] | ||
| points = ["Point", "MultiPoint"] | ||
|
|
||
| # Check that the gdf submitted is not a multi type GeoDataFrame |
There was a problem hiding this comment.
| # Check that the gdf submitted is not a multi type GeoDataFrame | |
| # Check that the gdf does not contain multiple feature types (points, lines and / or polygons) |
Limited
drop_sliversto only be used on single typepolygonorlinegeodataframes. Additionally, madedrop_sliverswork when a sliver is returned not as a geodataframe, which is apparently possible. This is the behavior when a line returns a point sliver. It doesn't return a geometry collection, just a regular geodataframe with a line and a point in it. So, I added the needed sections and warnings to check for those cases.