Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use hvPlot in Plotting API, Add Polygon Projection Support #922

Merged
merged 74 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
fe0ad7f
add projection support for geodataframe conversion
philipc2 Aug 30, 2024
d558a7f
Merge branch 'main' into philipc2/polygon-proj
philipc2 Aug 30, 2024
a5db1df
update plotting methods
philipc2 Aug 30, 2024
47b2a5e
fix polygon plot
philipc2 Aug 30, 2024
613dad9
fix tests
philipc2 Aug 30, 2024
ced079b
update benchmarks
philipc2 Aug 30, 2024
db84f1a
add check to DataArray.to_geodataframe()
philipc2 Aug 30, 2024
034f0cc
add GeoDataFrameProjection benchmark
philipc2 Aug 30, 2024
dca6d6f
Merge branch 'main' into philipc2/polygon-proj
philipc2 Aug 30, 2024
bcecbf8
Merge branch 'main' into philipc2/polygon-proj
philipc2 Sep 4, 2024
3a05e03
run pre-commit
philipc2 Sep 4, 2024
1f1011b
update projection parameter in benchmarks
philipc2 Sep 4, 2024
a337c8f
work on documentation
philipc2 Sep 4, 2024
d586426
clean and restart notebooks
philipc2 Sep 4, 2024
8bb29ad
add docstrings
philipc2 Sep 4, 2024
703db73
Merge branch 'main' into philipc2/polygon-proj
philipc2 Sep 6, 2024
5ddca59
update notebook
philipc2 Sep 9, 2024
0a3a1d5
add geoviews to ci
philipc2 Sep 9, 2024
ecc3c02
add geoviews to ci
philipc2 Sep 9, 2024
3310625
update notebook
philipc2 Sep 9, 2024
276225f
update plot
philipc2 Sep 10, 2024
095dd9a
use hvplot for plotting api
philipc2 Sep 11, 2024
cefa06e
Merge branch 'main' into philipc2/polygon-proj
philipc2 Sep 11, 2024
4e6ab59
update plotting notebooks
philipc2 Sep 11, 2024
9b4adc6
work on notebooks
philipc2 Sep 12, 2024
edd0817
Merge branch 'main' into philipc2/polygon-proj
erogluorhan Sep 15, 2024
1040479
update plotting api notebook
philipc2 Sep 23, 2024
19308b8
Merge branch 'main' into philipc2/polygon-proj
philipc2 Sep 23, 2024
9bbdfea
Merge branch 'philipc2/polygon-proj' of https://github.com/UXARRAY/ux…
philipc2 Sep 23, 2024
18810fb
fix warning
philipc2 Sep 23, 2024
9e19d32
update notebooks
philipc2 Sep 23, 2024
67c654d
update notebooks and backend usage
philipc2 Sep 23, 2024
0fad8e9
use hv.Store for managing backends
philipc2 Sep 23, 2024
f33feb5
update notebooks
philipc2 Sep 23, 2024
9817b0a
update remapping and topo user guide sections
philipc2 Sep 23, 2024
6f52514
update remapping and topo user guide sections
philipc2 Sep 23, 2024
23ca0c9
update remapping notebook
philipc2 Sep 23, 2024
f18ff11
update plotting, remap, and topo notebooks
philipc2 Sep 23, 2024
8686893
update plotting notebook
philipc2 Sep 23, 2024
07a19d1
update fig size for remapping notebook
philipc2 Sep 23, 2024
58911b4
fix tests
philipc2 Sep 23, 2024
2b63ebc
add hvplot to dependencies
philipc2 Sep 23, 2024
85a9e90
remove duplicate hvplot
philipc2 Sep 23, 2024
caa6318
add docstrings to functions
philipc2 Sep 23, 2024
4b39395
update docstrings and tests
philipc2 Sep 23, 2024
e757a63
Merge branch 'main' into philipc2/polygon-proj
philipc2 Sep 23, 2024
7948f37
add support for pixel ratio point rasters until hvPlot new release
philipc2 Sep 24, 2024
6b54a45
clear and restart notebooks
philipc2 Sep 24, 2024
c7a986c
Merge branch 'philipc2/polygon-proj' of https://github.com/UXARRAY/ux…
philipc2 Sep 24, 2024
d8e8f41
add support for geopandas
philipc2 Sep 24, 2024
65b76a3
use ignore isntead of include, update code and notebooks
philipc2 Sep 26, 2024
79efd0c
use a dictionary for keeping track of cached parameters
philipc2 Sep 26, 2024
bdd3725
Merge branch 'main' into philipc2/polygon-proj
erogluorhan Sep 26, 2024
e96cd15
update docstrings with better phrasing
philipc2 Sep 26, 2024
7ee649e
Merge branch 'philipc2/polygon-proj' of https://github.com/UXARRAY/ux…
philipc2 Sep 26, 2024
82e1c84
add split parameter
philipc2 Sep 26, 2024
5cfd553
update failing tests
philipc2 Sep 26, 2024
6b6637a
Merge branch 'main' into philipc2/polygon-proj
philipc2 Sep 27, 2024
187e69d
remove handling for pixel-ratio after hvPlot 0.11 release
philipc2 Sep 27, 2024
e6db2a8
work on fixing line colleciton
philipc2 Oct 1, 2024
786935d
Merge branch 'main' into philipc2/polygon-proj
erogluorhan Oct 1, 2024
302d913
update projections, organize imports
philipc2 Oct 1, 2024
0d15e85
Merge branch 'philipc2/polygon-proj' of https://github.com/UXARRAY/ux…
philipc2 Oct 1, 2024
8f07275
add internal central longitude correction
philipc2 Oct 1, 2024
8c1900f
Update uxarray/grid/grid.py
philipc2 Oct 1, 2024
23ac9cb
delete grid_plot.py and clean up dataarray_plot.py
philipc2 Oct 1, 2024
6dc9a76
update line and poly colletion methods
philipc2 Oct 1, 2024
dc33af6
update internal API
philipc2 Oct 1, 2024
40265fa
update tests (1)
philipc2 Oct 2, 2024
1785e40
update tests (2)
philipc2 Oct 2, 2024
81716b9
update matplotlib user guide
philipc2 Oct 2, 2024
4e05b3d
clean up docs and comments
philipc2 Oct 2, 2024
63a825b
remove leftover grid central longitude code
philipc2 Oct 2, 2024
53c4fc5
add hotfix to asv benchmark
philipc2 Oct 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions benchmarks/mpas_ocean.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ class GeoDataFrame(DatasetBenchmark):
def time_to_geodataframe(self, resolution, exclude_antimeridian):
self.uxds[data_var].to_geodataframe(exclude_antimeridian=exclude_antimeridian)

def peakmem_to_geodataframe(self, resolution, exclude_antimeridian):
gdf = self.uxds[data_var].to_geodataframe(exclude_antimeridian=exclude_antimeridian)
philipc2 marked this conversation as resolved.
Show resolved Hide resolved


class ConnectivityConstruction(DatasetBenchmark):
Expand Down
2 changes: 2 additions & 0 deletions ci/asv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dependencies:
- dask
- datashader
- gmpy2
- geoviews
- holoviews
- matplotlib-base
- matplotlib-inline
Expand All @@ -27,6 +28,7 @@ dependencies:
- geopandas
- xarray
- asv
- hvplot
- pip:
- antimeridian
- git+https://github.com/philipc2/pyfma.git # fix until https://github.com/nschloe/pyfma/pull/17 is merged
Expand Down
2 changes: 2 additions & 0 deletions ci/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ dependencies:
- dask
- datashader
- gmpy2
- geoviews
- h5netcdf
- hdf5
- holoviews
- hvplot
- matplotlib-base
- matplotlib-inline
- netcdf4
Expand Down
21 changes: 12 additions & 9 deletions docs/user-guide/calculus.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,39 @@
"cells": [
{
"cell_type": "markdown",
"id": "6051044271a0d338",
"metadata": {
"collapsed": false,
"jupyter": {
"outputs_hidden": false
}
},
"source": [
"# Calculus Operators\n",
"\n",
"```{seealso}\n",
"This section is currently under development. Please refer to the API reference for current information about supported calculus operators.\n",
"```"
],
"metadata": {
"collapsed": false
},
"id": "6051044271a0d338"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 2
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.6"
"pygments_lexer": "ipython3",
"version": "3.11.9"
}
},
"nbformat": 4,
Expand Down
Loading
Loading