Skip to content

Commit 675b197

Browse files
committed
server now returns geoparquet files
1 parent bb7f929 commit 675b197

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

sliderule/icesat2.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,8 @@ def __gdf2poly(gdf):
495495
#
496496
def __procoutputfile(parm, lon_key, lat_key):
497497
if "open_on_complete" in parm["output"] and parm["output"]["open_on_complete"]:
498-
# Read Parquet File as DataFrame
499-
df = geopandas.pd.read_parquet(parm["output"]["path"])
500-
# Build GeoDataFrame
501-
gdf = __todataframe(df, lon_key=lon_key, lat_key=lat_key)
502-
# Return Results
503-
return gdf
498+
# Return GeoParquet File as GeoDataFrame
499+
return geopandas.read_parquet(parm["output"]["path"])
504500
else:
505501
# Return Parquet Filename
506502
return parm["output"]["path"]

tests/test_parquet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_atl06(self, domain, asset, organization):
2525
"output": { "path": "testfile.parquet", "format": "parquet", "open_on_complete": True } }
2626
gdf = icesat2.atl06p(parms, asset=asset, resources=[resource])
2727
assert len(gdf) == 964
28-
assert len(gdf.keys()) == 17
28+
assert len(gdf.keys()) == 19
2929
assert gdf["rgt"][0] == 1160
3030
assert gdf["cycle"][0] == 2
3131
assert gdf['segment_id'].describe()["min"] == 405240
@@ -47,7 +47,7 @@ def test_atl03(self, domain, asset, organization):
4747
"output": { "path": "testfile.parquet", "format": "parquet", "open_on_complete": True } }
4848
gdf = icesat2.atl03sp(parms, asset=asset, resources=[resource])
4949
assert len(gdf) == 194696
50-
assert len(gdf.keys()) == 15
50+
assert len(gdf.keys()) == 17
5151
assert gdf["rgt"][0] == 1160
5252
assert gdf["cycle"][0] == 2
5353
assert gdf['segment_id'].describe()["min"] == 405240

0 commit comments

Comments
 (0)