Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a41c823

Browse files
tsutterleytsutterley
committed
use geoparquet as default file type
1 parent ae82257 commit a41c823

File tree

3 files changed

+25
-33
lines changed

3 files changed

+25
-33
lines changed

‎demo/voila_demo.ipynb‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -371,17 +371,21 @@
371371
"# Download ATL06-SR data as geojson\n",
372372
"display.display(download_output)\n",
373373
"#SRwidgets.file_format.value = 'geoparquet'\n",
374-
"def download_file(gdf, filename, media_type='text/json'):\n",
375-
" if (media_type == 'text/json'):\n",
374+
"def download_file(gdf, filename, mime_type='text/json'):\n",
375+
" if (mime_type == 'text/json'):\n",
376376
" content = base64.b64encode(gdf.to_json().encode()).decode()\n",
377-
" elif (media_type == 'text/csv'):\n",
377+
" elif (mime_type == 'text/csv'):\n",
378378
" content = base64.b64encode(gdf.to_csv().encode()).decode()\n",
379-
" elif (media_type == 'application/vnd.apache.parquet'):\n",
379+
" elif (mime_type == 'application/vnd.apache.parquet'):\n",
380380
" fid = BytesIO()\n",
381-
" gdf.to_parquet(fid)\n",
381+
" parms = copy.copy(atl06_parms)\n",
382+
" version = sliderule.get_version()\n",
383+
" parms['version'] = version['icesat2']['version']\n",
384+
" parms['commit'] = version['icesat2']['commit']\n",
385+
" io.to_parquet(gdf, fid, parameters=parms, regions=m.regions)\n",
382386
" content = base64.b64encode(fid.getbuffer()).decode()\n",
383387
" # create download link\n",
384-
" url = f'data:{media_type};charset=utf-8;base64,{content}'\n",
388+
" url = f'data:{mime_type};charset=utf-8;base64,{content}'\n",
385389
" js = f\"\"\"\n",
386390
" var a = document.createElement('a');\n",
387391
" a.setAttribute('download', '{filename}');\n",
@@ -394,7 +398,7 @@
394398
"\n",
395399
"def on_download_clicked(e=None):\n",
396400
" download_file(atl06_rsps, SRwidgets.atl06_filename,\n",
397-
" media_type=SRwidgets.media_type)\n",
401+
" mime_type=SRwidgets.mime_type)\n",
398402
"\n",
399403
"# link buttons\n",
400404
"run_button.on_click(on_run_clicked)\n",

‎examples/api_widgets_demo.ipynb‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"warnings.filterwarnings('ignore') # turn off warnings for demo\n",
3131
"\n",
3232
"from sliderule import icesat2, ipysliderule, io, sliderule\n",
33-
"import ipywidgets as widgets\n",
3433
"import geopandas\n",
3534
"import logging\n",
3635
"\n",
@@ -85,7 +84,7 @@
8584
"source": [
8685
"# display widgets for setting SlideRule parameters\n",
8786
"SRwidgets = ipysliderule.widgets()\n",
88-
"widgets.VBox(SRwidgets.atl06())"
87+
"SRwidgets.VBox(SRwidgets.atl06())"
8988
]
9089
},
9190
{
@@ -146,7 +145,7 @@
146145
},
147146
"outputs": [],
148147
"source": [
149-
"widgets.VBox([\n",
148+
"SRwidgets.VBox([\n",
150149
" SRwidgets.projection,\n",
151150
" SRwidgets.layers,\n",
152151
" SRwidgets.raster_functions\n",
@@ -219,6 +218,7 @@
219218
"elevations = [sliderule.emptyframe()]\n",
220219
"\n",
221220
"# for each region of interest\n",
221+
"sliderule.logger.warning('No valid regions to run') if not m.regions else None\n",
222222
"for poly in m.regions:\n",
223223
" # add polygon from map to sliderule parameters\n",
224224
" parms[\"poly\"] = poly\n",
@@ -269,7 +269,7 @@
269269
},
270270
"outputs": [],
271271
"source": [
272-
"widgets.VBox([\n",
272+
"SRwidgets.VBox([\n",
273273
" SRwidgets.variable,\n",
274274
" SRwidgets.cmap,\n",
275275
" SRwidgets.reverse,\n",
@@ -315,7 +315,7 @@
315315
},
316316
"outputs": [],
317317
"source": [
318-
"widgets.VBox([\n",
318+
"SRwidgets.VBox([\n",
319319
" SRwidgets.plot_kind,\n",
320320
" SRwidgets.rgt,\n",
321321
" SRwidgets.ground_track,\n",
@@ -343,9 +343,7 @@
343343
"tags": []
344344
},
345345
"source": [
346-
"### Save GeoDataFrame to output file\n",
347-
"- [pytables HDF5](https://www.pytables.org/): easily read back as a Geopandas GeoDataFrame\n",
348-
"- [netCDF](https://www.unidata.ucar.edu/software/netcdf): interoperable with other programs"
346+
"### Save GeoDataFrame to output file"
349347
]
350348
},
351349
{
@@ -374,7 +372,6 @@
374372
"# save to file in format (HDF5 or netCDF)\n",
375373
"io.to_file(gdf, SRwidgets.file,\n",
376374
" format=SRwidgets.format,\n",
377-
" driver='pytables',\n",
378375
" parameters=parms,\n",
379376
" regions=m.regions,\n",
380377
" verbose=True)"
@@ -384,9 +381,7 @@
384381
"cell_type": "markdown",
385382
"metadata": {},
386383
"source": [
387-
"### Read GeoDataFrame from input file\n",
388-
"- [pytables HDF5](https://www.pytables.org/)\n",
389-
"- [netCDF](https://www.unidata.ucar.edu/software/netcdf)"
384+
"### Read GeoDataFrame from input file"
390385
]
391386
},
392387
{
@@ -411,7 +406,6 @@
411406
"# read from file in format (HDF5 or netCDF)\n",
412407
"gdf,parms,regions = io.from_file(SRwidgets.file,\n",
413408
" format=SRwidgets.format,\n",
414-
" driver='pytables',\n",
415409
" return_parameters=True,\n",
416410
" return_regions=True)"
417411
]

‎examples/atl03_widgets_demo.ipynb‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"warnings.filterwarnings('ignore')# autoreload\n",
4141
"\n",
4242
"from sliderule import icesat2, ipysliderule, sliderule, io, earthdata\n",
43-
"import ipywidgets as widgets\n",
4443
"import geopandas\n",
4544
"import logging\n",
4645
"\n",
@@ -93,7 +92,7 @@
9392
"# display widgets for setting SlideRule parameters\n",
9493
"SRwidgets = ipysliderule.widgets()\n",
9594
"SRwidgets.set_atl03_defaults()\n",
96-
"widgets.VBox(SRwidgets.atl03())"
95+
"SRwidgets.VBox(SRwidgets.atl03())"
9796
]
9897
},
9998
{
@@ -154,7 +153,7 @@
154153
},
155154
"outputs": [],
156155
"source": [
157-
"widgets.VBox([\n",
156+
"SRwidgets.VBox([\n",
158157
" SRwidgets.projection,\n",
159158
" SRwidgets.layers,\n",
160159
" SRwidgets.raster_functions\n",
@@ -221,6 +220,7 @@
221220
"# find granule for each region of interest\n",
222221
"granules_list = []\n",
223222
"# for each region of interest\n",
223+
"sliderule.logger.warning('No valid regions to run') if not m.regions else None\n",
224224
"for poly in m.regions:\n",
225225
" granules = earthdata.cmr(short_name=\"ATL03\",\n",
226226
" polygon=poly,\n",
@@ -309,7 +309,7 @@
309309
},
310310
"outputs": [],
311311
"source": [
312-
"widgets.VBox([\n",
312+
"SRwidgets.VBox([\n",
313313
" SRwidgets.variable,\n",
314314
" SRwidgets.cmap,\n",
315315
" SRwidgets.reverse,\n",
@@ -351,7 +351,7 @@
351351
},
352352
"outputs": [],
353353
"source": [
354-
"widgets.VBox([\n",
354+
"SRwidgets.VBox([\n",
355355
" SRwidgets.plot_classification,\n",
356356
" SRwidgets.rgt,\n",
357357
" SRwidgets.ground_track,\n",
@@ -378,9 +378,7 @@
378378
"cell_type": "markdown",
379379
"metadata": {},
380380
"source": [
381-
"### Save GeoDataFrame to output file\n",
382-
"- [pytables HDF5](https://www.pytables.org/): easily read back as a Geopandas GeoDataFrame\n",
383-
"- [netCDF](https://www.unidata.ucar.edu/software/netcdf): interoperable with other programs"
381+
"### Save GeoDataFrame to output file"
384382
]
385383
},
386384
{
@@ -409,7 +407,6 @@
409407
"# save to file in format (HDF5 or netCDF)\n",
410408
"io.to_file(gdf, SRwidgets.file,\n",
411409
" format=SRwidgets.format,\n",
412-
" driver='pytables',\n",
413410
" parameters=parms,\n",
414411
" regions=m.regions,\n",
415412
" verbose=True)"
@@ -419,9 +416,7 @@
419416
"cell_type": "markdown",
420417
"metadata": {},
421418
"source": [
422-
"### Read GeoDataFrame from input file\n",
423-
"- [pytables HDF5](https://www.pytables.org/)\n",
424-
"- [netCDF](https://www.unidata.ucar.edu/software/netcdf)"
419+
"### Read GeoDataFrame from input file"
425420
]
426421
},
427422
{
@@ -446,7 +441,6 @@
446441
"# read from file in format (HDF5 or netCDF)\n",
447442
"gdf,parms,regions = io.from_file(SRwidgets.file,\n",
448443
" format=SRwidgets.format,\n",
449-
" driver='pytables',\n",
450444
" return_parameters=True,\n",
451445
" return_regions=True)"
452446
]

0 commit comments

Comments
 (0)