Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Always use kwargs when calling _series_unary_op() #194

Merged
merged 2 commits into from Apr 30, 2015
Merged

Always use kwargs when calling _series_unary_op() #194

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d77b129
CLN: Make the null_value argument explicit by name when calling _seri…
Apr 30, 2015
bc3dc90
CLN: Add kwarg for calls to _series_unary_op() even when using defaul…
Apr 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions geopandas/base.py
View file
Open in desktop
Expand Up @@ -95,12 +95,12 @@ def _invalidate_sindex(self):
@property
def area(self):
"""Return the area of each geometry in the GeoSeries"""
return _series_unary_op(self, 'area', np.nan)
return _series_unary_op(self, 'area', null_value=np.nan)

@property
def geom_type(self):
"""Return the geometry type of each geometry in the GeoSeries"""
return _series_unary_op(self, 'geom_type', None)
return _series_unary_op(self, 'geom_type', null_value=None)

@property
def type(self):
Expand All @@ -110,22 +110,22 @@ def type(self):
@property
def length(self):
"""Return the length of each geometry in the GeoSeries"""
return _series_unary_op(self, 'length', np.nan)
return _series_unary_op(self, 'length', null_value=np.nan)

@property
def is_valid(self):
"""Return True for each valid geometry, else False"""
return _series_unary_op(self, 'is_valid')
return _series_unary_op(self, 'is_valid', null_value=False)

@property
def is_empty(self):
"""Return True for each empty geometry, False for non-empty"""
return _series_unary_op(self, 'is_empty')
return _series_unary_op(self, 'is_empty', null_value=False)

@property
def is_simple(self):
"""Return True for each simple geometry, else False"""
return _series_unary_op(self, 'is_simple', False)
return _series_unary_op(self, 'is_simple', null_value=False)

@property
def is_ring(self):
Expand Down Expand Up @@ -168,7 +168,7 @@ def exterior(self):
def interiors(self):
"""Return the interior rings of each polygon"""
# TODO: return empty list or None for non-polygons
return _series_unary_op(self, 'interiors')
return _series_unary_op(self, 'interiors', null_value=False)

def representative_point(self):
"""Return a GeoSeries of points guaranteed to be in each geometry"""
Expand Down