Skip to content

Commit b7fde0d

Browse files
committed
added sorting at concatenation of dataframes; moved initial sort to after geometry was added so that it aligned correctly
1 parent ef4dc85 commit b7fde0d

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

sliderule/icesat2.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,16 +302,18 @@ def __todataframe(columns, delta_time_key="delta_time", lon_key="lon", lat_key="
302302

303303
# Create Pandas DataFrame object
304304
df = geopandas.pd.DataFrame(columns)
305-
305+
306+
# Build GeoDataFrame (default geometry is crs="EPSG:4326")
307+
gdf = geopandas.GeoDataFrame(df, geometry=geometry)
308+
306309
# Set index (default is Timestamp), can add `verify_integrity=True` to check for duplicates
307310
# Can do this during DataFrame creation, but this allows input argument for desired column
308-
df.set_index(index_key, inplace=True)
311+
gdf.set_index(index_key, inplace=True)
309312

310313
# Sort values for reproducible output despite async processing
311-
df.sort_index(inplace=True)
314+
gdf.sort_index(inplace=True)
312315

313-
# Build and Return GeoDataFrame (default geometry is crs="EPSG:4326")
314-
gdf = geopandas.GeoDataFrame(df, geometry=geometry)
316+
# Return GeoDataFrame
315317
return gdf
316318

317319

@@ -461,7 +463,7 @@ def __parallelize(max_workers, block, function, parm, resources, *args):
461463

462464
# Return Results
463465
if len(results) > 0:
464-
return geopandas.pd.concat(results)
466+
return geopandas.pd.concat(results, sort=True)
465467
else:
466468
return __emptyframe()
467469

0 commit comments

Comments
 (0)