From 9d95cad7cf754fff1dfda87ddf96b4e18bf65fb5 Mon Sep 17 00:00:00 2001 From: Nick Eubank Date: Fri, 29 Apr 2016 13:47:28 -0700 Subject: [PATCH] allows strings for aggfunc --- geopandas/geodataframe.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/geopandas/geodataframe.py b/geopandas/geodataframe.py index e5fdd0d..08c8a3d 100644 --- a/geopandas/geodataframe.py +++ b/geopandas/geodataframe.py @@ -441,7 +441,7 @@ class GeoDataFrame(GeoPandasBase, DataFrame): plot.__doc__ = plot_dataframe.__doc__ - def dissolve(self, by=None, aggfunc=None): + def dissolve(self, by=None, aggfunc='first'): """ Dissolve geometries within `groupby` into single observation. @@ -458,9 +458,6 @@ class GeoDataFrame(GeoPandasBase, DataFrame): GeoDataFrame """ - if aggfunc is None: - aggfunc = lambda x: x.iloc[0,:] - # Separate data and geometry data = self.drop(labels=self.geometry.name, axis=1).copy() @@ -470,8 +467,8 @@ class GeoDataFrame(GeoPandasBase, DataFrame): geometry = self[groupby_plus_geometry].copy() # Process data - aggregated_data = data.groupby(by=by).apply(aggfunc).drop(by, axis=1) - + aggregated_data = data.groupby(by=by).agg(aggfunc) + # Process geometry def merge_geometries(block):