diff --git a/geospatial_tools/stac.py b/geospatial_tools/stac.py index a7b0a71..9816f75 100644 --- a/geospatial_tools/stac.py +++ b/geospatial_tools/stac.py @@ -200,7 +200,7 @@ def __init__(self, catalog_name, logger=LOGGER): def search( self, - datetime=None, + data_range=None, max_items: int = None, limit: int = None, collections: str = None, @@ -249,7 +249,7 @@ def search( self.logger.info(intro_log) search = self.catalog.search( - datetime=datetime, + datetime=data_range, max_items=max_items, limit=limit, collections=collections, diff --git a/geospatial_tools/vector.py b/geospatial_tools/vector.py index b1ba0d5..769e2e1 100644 --- a/geospatial_tools/vector.py +++ b/geospatial_tools/vector.py @@ -558,9 +558,9 @@ def spatial_join_within( logger.info("Grouping results") grouped_gdf = joined_gdf.groupby(temp_feature_id)[polygon_column].agg(list).reset_index() logger.info("Cleaning and merging results") - features = gpd.GeoDataFrame(vector_features.merge(grouped_gdf, on=temp_feature_id, how="left")) + features = vector_features.merge(grouped_gdf, on=temp_feature_id, how="left") features = features.rename(columns={polygon_column: vector_column_name}) features.drop(columns=[temp_feature_id], inplace=True) features[vector_column_name] = features[vector_column_name].apply(sorted) logger.info("Spatial join operation is completed") - return features + return gpd.GeoDataFrame(features)