Use geoviews everywhere + use pn.State for caching

This commit is quite messy, but we are still at an early stage of the
development and the API is not set yet. Anyhow, it mostly  addresses the
remarks made by @jbednar at:

#16 (comment)

In a nutshell:

- We follow the recommendation of the [FAQ](https://holoviews.org/FAQ.html)
  and we stop mixing holoviews and geoviews objects.
- We use `pn.State` in order to cache the `xr.Dataset` objects among
  different requests.
- We fix cartopy to < 0.20 since we are affected by this issue:
  holoviz/geoviews#529

Author: pmav99

.gitignore

@@ -145,6 +145,7 @@ cython_debug/
 
 #data folder
 data/
+data.bak/
 data_/
 
 .config_jupyter/

README.md

@@ -9,19 +9,24 @@ You will need some data to visualize. If you don't have any you can download a s
 created with [pyposeidon](https://github.com/ec-jrc/pyPoseidon/):
 
 ```
-mkdir data
-wget -O data/dataset.nc    https://static.techrad.eu/thalassa/dataset.nc
+mkdir ./data
+wget -O data/dataset.nc https://static.techrad.eu/thalassa/dataset.nc
 ```
 
 ## Deploying on a server
 
-1. Install the dependencies with
+1. Install the binary dependencies:
+
+- `python 3.9`
+- `proj < 8`
+
+2. Install the python dependencies with
 
 ```
 pip install -r requirements/requirements.txt
 ```
 
-2. Run the panel server with:
+3. Run the panel server with:
 
 ```
 panel serve ./thalassa

Thalassa.ipynb

@@ -45,9 +45,10 @@ bokeh = "^2.2"
 panel = "^0.12"
 xarray = "^0.19"
 netCDF4 = "^1.5"
-geoviews = "^1.8"
 datashader = "^0.13"
 ruyaml = "^0.20.0"
+geoviews = "^1.9.2"
+Cartopy = "<0.20"  # due to https://github.com/holoviz/geoviews/issues/529
 
 [tool.poetry.group.dev.dependencies]
 black = "^21.9b0"
@@ -58,12 +59,14 @@ mypy = "^0.910"
 prospector = "^1.5"
 pre-commit = "^2.15.0"
 
+
 [tool.poetry.group.vim]
 optional = true
 
 [tool.poetry.group.vim.dependencies]
 jupyterlab-vim = "^0.14"
 
+
 [tool.black]
 line-length = 109
 target-version = ['py39']

poetry.lock

@@ -1,25 +1,24 @@
-anyio==3.3.2; python_full_version >= "3.6.2" and python_version >= "3.6"
+anyio==3.3.3; python_full_version >= "3.6.2" and python_version >= "3.6"
 appnope==0.1.2; sys_platform == "darwin" and python_version >= "3.7" or platform_system == "Darwin" and python_version >= "3.7"
 argon2-cffi==21.1.0; python_version >= "3.6"
-astroid==2.8.0; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1"
+astroid==2.8.2; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1"
 attrs==21.2.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7"
 babel==2.9.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 backcall==0.2.0; python_version >= "3.7"
 backports.entry-points-selectable==1.1.0; python_version >= "2.7" and python_full_version >= "3.6.1"
 black==21.9b0; python_full_version >= "3.6.2"
 bleach==4.1.0; python_version >= "3.6"
 bokeh==2.4.0; python_version >= "3.7"
-cartopy==0.20.0; python_version >= "3.7"
-certifi==2021.5.30; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" or python_version >= "3.7"
+cartopy==0.19.0.post1; python_version >= "3.5"
+certifi==2021.10.8; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" or python_version >= "3.7"
 cffi==1.14.6; implementation_name == "pypy" and python_version >= "3.6" or python_version >= "3.6"
 cfgv==3.3.1; python_full_version >= "3.6.1"
 cftime==1.5.1
-charset-normalizer==2.0.6; python_full_version >= "3.6.0" and python_version >= "3.6"
-click==8.0.1; python_version >= "3.6" and python_full_version >= "3.6.2" or python_version >= "3.7"
+charset-normalizer==2.0.7; python_full_version >= "3.6.0" and python_version >= "3.6"
+click==8.0.3; python_version >= "3.6" and python_full_version >= "3.6.2" or python_version >= "3.7"
 cloudpickle==2.0.0; python_version >= "3.7" or python_version >= "3.7"
 colorama==0.4.4; python_version >= "3.6" and python_full_version < "3.0.0" and platform_system == "Windows" or python_full_version >= "3.5.0" and python_version >= "3.6" and platform_system == "Windows" or python_version >= "3.6" and python_full_version >= "3.6.2" and platform_system == "Windows" or python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.5.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1" and sys_platform == "win32"
 colorcet==2.0.6; python_version >= "2.7"
-cycler==0.10.0; python_version >= "3.7"
 dask==2021.9.1; python_version >= "3.7" or python_version >= "3.7"
 datashader==0.13.0; python_version >= "2.7"
 datashape==0.5.2; python_version >= "2.7"
@@ -33,35 +32,33 @@ dodgy==0.2.1; python_full_version >= "3.6.1" and python_version < "4.0"
 entrypoints==0.3; python_full_version >= "3.6.1" and python_version >= "3.6" or python_version >= "3.6"
 filelock==3.3.0; python_version >= "3.6" and python_full_version >= "3.6.1"
 flake8-polyfill==1.0.2; python_full_version >= "3.6.1" and python_version < "4.0"
-flake8==3.9.2; python_full_version >= "3.6.1" and python_version < "4.0"
+flake8==2.3.0; python_full_version >= "3.6.1" and python_version < "4.0"
 fsspec==2021.10.0; python_version >= "3.7"
 geoviews==1.9.2; python_version >= "3.7"
 heapdict==1.0.1; python_version >= "3.7"
 holoviews==1.14.6; python_version >= "2.7"
 identify==2.3.0; python_full_version >= "3.6.1"
-idna==3.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" or python_full_version >= "3.6.2" and python_version >= "3.6"
+idna==3.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" or python_full_version >= "3.6.2" and python_version >= "3.6"
 ipykernel==6.4.1; python_version >= "3.7"
 ipython-genutils==0.2.0; python_version >= "3.6"
 ipython==7.28.0; python_version >= "3.7"
 isort==5.9.3; python_full_version >= "3.6.1" and python_version < "4.0" and python_version >= "3.6"
 jedi==0.18.0; python_version >= "3.7"
 jinja2==3.0.2; python_version >= "3.7" or python_version >= "3.6"
 json5==0.9.6; python_version >= "3.6"
-jsonschema==4.0.1; python_version >= "3.7"
+jsonschema==4.1.0; python_version >= "3.7"
 jupyter-client==7.0.6; python_full_version >= "3.6.1" and python_version >= "3.6" or python_full_version >= "3.6.1" and python_version >= "3.7"
 jupyter-core==4.8.1; python_full_version >= "3.6.1" and python_version >= "3.6" or python_version >= "3.6"
 jupyter-server==1.11.1; python_version >= "3.6"
 jupyterlab-pygments==0.1.2; python_version >= "3.7"
 jupyterlab-server==2.8.2; python_version >= "3.6"
-jupyterlab==3.1.17; python_version >= "3.6"
-kiwisolver==1.3.2; python_version >= "3.7"
+jupyterlab==3.1.18; python_version >= "3.6"
 lazy-object-proxy==1.6.0; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1"
 llvmlite==0.36.0; python_version >= "3.6" and python_version < "3.10"
 locket==0.2.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7"
 markdown==3.3.4; python_version >= "3.6"
 markupsafe==2.0.1; python_version >= "3.7"
 matplotlib-inline==0.1.3; python_version >= "3.7"
-matplotlib==3.4.3; python_version >= "3.7"
 mccabe==0.6.1; python_full_version >= "3.6.1" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1"
 mistune==0.8.4; python_version >= "3.7"
 msgpack==1.0.2; python_version >= "3.7"
@@ -87,6 +84,7 @@ parso==0.8.2; python_version >= "3.7"
 partd==1.2.0; python_version >= "3.7"
 pathspec==0.9.0; python_full_version >= "3.6.2"
 pep8-naming==0.10.0; python_full_version >= "3.6.1" and python_version < "4.0"
+pep8==1.7.1; python_full_version >= "3.6.1" and python_version < "4.0"
 pexpect==4.8.0; sys_platform != "win32" and python_version >= "3.7"
 pickleshare==0.7.5; python_version >= "3.7"
 pillow==8.3.2; python_version >= "3.6"
@@ -98,7 +96,7 @@ prospector==1.5.1; python_full_version >= "3.6.1" and python_version < "4.0"
 psutil==5.8.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.4.0"
 ptyprocess==0.7.0; sys_platform != "win32" and python_version >= "3.7" or os_name != "nt" and python_version >= "3.6"
 py==1.10.0; python_version >= "3.6" and python_full_version < "3.0.0" and implementation_name == "pypy" or implementation_name == "pypy" and python_version >= "3.6" and python_full_version >= "3.4.0"
-pycodestyle==2.7.0; python_full_version >= "3.6.1" and python_version < "4.0"
+pycodestyle==2.8.0; python_full_version >= "3.6.1" and python_version < "4.0"
 pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 pyct==0.4.8; python_version >= "2.7"
 pydocstyle==6.1.1; python_full_version >= "3.6.1" and python_version < "4.0" and python_version >= "3.6"
@@ -113,14 +111,14 @@ pyparsing==2.4.7; python_version >= "3.7" and python_full_version < "3.0.0" or p
 pyproj==3.2.1; python_version >= "3.7"
 pyrsistent==0.18.0; python_version >= "3.7"
 pyshp==2.1.3; python_version >= "3.7"
-python-dateutil==2.8.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "2.7" or python_full_version >= "3.7.1" and python_version >= "2.7" or python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7" or python_full_version >= "3.6.1" and python_version >= "3.6"
+python-dateutil==2.8.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "2.7" or python_full_version >= "3.7.1" and python_version >= "2.7" or python_full_version >= "3.6.1" and python_version >= "3.6"
 pytz==2021.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" or python_full_version >= "3.7.1" and python_version >= "2.7"
 pyviz-comms==2.1.0
-pywin32==301; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.6"
+pywin32==302; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.6"
 pywinpty==1.1.4; os_name == "nt" and python_version >= "3.6"
 pyyaml==5.4.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7" or python_full_version >= "3.6.1" and python_version < "4.0" or python_full_version >= "3.6.1"
 pyzmq==22.3.0; python_full_version >= "3.6.1" and python_version >= "3.6" or python_version >= "3.6"
-regex==2021.9.30; python_full_version >= "3.6.2"
+regex==2021.10.8; python_full_version >= "3.6.2"
 requests-unixsocket==0.2.0; python_version >= "3.6"
 requests==2.26.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 requirements-detector==0.7; python_full_version >= "3.6.1" and python_version < "4.0"
@@ -130,7 +128,7 @@ send2trash==1.8.0; python_version >= "3.6"
 setoptconf-tmp==0.3.1; python_full_version >= "3.6.1" and python_version < "4.0"
 setuptools==58.2.0; python_version >= "3.6" and python_version < "3.10" or python_version >= "3.6" or python_version >= "3.7" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1"
 shapely==1.7.1; python_version >= "3.7"
-six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" or python_full_version >= "3.7.1" and python_version >= "2.7" or python_full_version >= "3.6.1" or python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "2.7" or python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7"
+six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" or python_full_version >= "3.7.1" and python_version >= "2.7" or python_full_version >= "3.6.1" or python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "2.7"
 sniffio==1.2.0; python_full_version >= "3.6.2" and python_version >= "3.6"
 snowballstemmer==2.1.0; python_full_version >= "3.6.1" and python_version < "4.0" and python_version >= "3.6"
 sortedcontainers==2.4.0; python_version >= "3.7"

pyproject.toml

@@ -1,14 +1,13 @@
 bleach==4.1.0; python_version >= "3.6"
 bokeh==2.4.0; python_version >= "3.7"
-cartopy==0.20.0; python_version >= "3.7"
-certifi==2021.5.30; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" or python_version >= "3.7"
+cartopy==0.19.0.post1; python_version >= "3.5"
+certifi==2021.10.8; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" or python_version >= "3.7"
 cftime==1.5.1
-charset-normalizer==2.0.6; python_full_version >= "3.6.0" and python_version >= "3.6"
-click==8.0.1; python_version >= "3.7"
+charset-normalizer==2.0.7; python_full_version >= "3.6.0" and python_version >= "3.6"
+click==8.0.3; python_version >= "3.7"
 cloudpickle==2.0.0; python_version >= "3.7" or python_version >= "3.7"
 colorama==0.4.4; python_version >= "3.6" and python_full_version < "3.0.0" and platform_system == "Windows" or python_full_version >= "3.5.0" and python_version >= "3.6" and platform_system == "Windows" or python_version >= "3.7" and python_full_version < "3.0.0" and platform_system == "Windows" or python_version >= "3.7" and platform_system == "Windows" and python_full_version >= "3.5.0"
 colorcet==2.0.6; python_version >= "2.7"
-cycler==0.10.0; python_version >= "3.7"
 dask==2021.9.1; python_version >= "3.7" or python_version >= "3.7"
 datashader==0.13.0; python_version >= "2.7"
 datashape==0.5.2; python_version >= "2.7"
@@ -18,14 +17,12 @@ fsspec==2021.10.0; python_version >= "3.7"
 geoviews==1.9.2; python_version >= "3.7"
 heapdict==1.0.1; python_version >= "3.7"
 holoviews==1.14.6; python_version >= "2.7"
-idna==3.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
+idna==3.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 jinja2==3.0.2; python_version >= "3.7" or python_version >= "3.7"
-kiwisolver==1.3.2; python_version >= "3.7"
 llvmlite==0.36.0; python_version >= "3.6" and python_version < "3.10"
 locket==0.2.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7"
 markdown==3.3.4; python_version >= "3.6"
 markupsafe==2.0.1; python_version >= "3.7"
-matplotlib==3.4.3; python_version >= "3.7"
 msgpack==1.0.2; python_version >= "3.7"
 multipledispatch==0.6.0; python_version >= "2.7"
 netcdf4==1.5.7
@@ -42,7 +39,7 @@ pyct==0.4.8; python_version >= "2.7"
 pyparsing==2.4.7; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7"
 pyproj==3.2.1; python_version >= "3.7"
 pyshp==2.1.3; python_version >= "3.7"
-python-dateutil==2.8.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "2.7" or python_full_version >= "3.7.1" and python_version >= "2.7" or python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7"
+python-dateutil==2.8.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "2.7" or python_full_version >= "3.7.1" and python_version >= "2.7"
 pytz==2021.3; python_full_version >= "3.7.1" and python_version >= "2.7"
 pyviz-comms==2.1.0; python_version >= "2.7"
 pyyaml==5.4.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7"
@@ -51,7 +48,7 @@ ruyaml==0.20.0; python_version >= "3.6"
 scipy==1.7.1; python_version >= "3.7" and python_version < "3.10"
 setuptools==58.2.0; python_version >= "3.6" and python_version < "3.10" or python_version >= "3.6" or python_version >= "3.7"
 shapely==1.7.1; python_version >= "3.7"
-six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" or python_full_version >= "3.7.1" and python_version >= "2.7" or python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "2.7" or python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7"
+six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" or python_full_version >= "3.7.1" and python_version >= "2.7" or python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "2.7"
 sortedcontainers==2.4.0; python_version >= "3.7"
 tblib==1.7.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0"
 toolz==0.11.1; python_version >= "3.7" or python_version >= "3.7"

requirements/requirements-dev.txt

@@ -2,13 +2,17 @@
 
 from .utils import open_dataset
 from .utils import reload
+from .visuals import get_max_elevation
+from .visuals import get_tiles
 from .visuals import get_trimesh
-from .visuals import get_wireframe_and_max_elevation
+from .visuals import get_wireframe
 
 
 __all__: list[str] = [
     "open_dataset",
     "reload",
     "get_trimesh",
-    "get_wireframe_and_max_elevation",
+    "get_tiles",
+    "get_wireframe",
+    "get_max_elevation",
 ]

requirements/requirements.txt

@@ -12,7 +12,7 @@
 logger = logging.getLogger(__name__)
 
 
-def open_dataset(path: str | pathlib.Path) -> xr.Dataset:
+def open_dataset(path: str | pathlib.Path, load: bool = False) -> xr.Dataset:
     path = pathlib.Path(path)
     if path.suffix == ".nc":
         ds = xr.open_dataset(path, mask_and_scale=True)
@@ -21,6 +21,9 @@ def open_dataset(path: str | pathlib.Path) -> xr.Dataset:
     # TODO: extend with GeoTiff, Grib etc
     else:
         raise ValueError(f"Don't know how to handle this: {path}")
+    if load:
+        # load dataset to memory
+        ds.load()
     return ds