This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch tmp-stv in repository https://gitbox.apache.org/repos/asf/sdap-nexus.git
commit a9f938ae22e2a51ec8bd54b51545de5f5476ce6c Merge: ddb21a9 72d7bef Author: rileykk <[email protected]> AuthorDate: Wed Jul 10 15:50:52 2024 -0700 Merge branch 'SDAP-495-stv-lidar' into tmp-stv # Conflicts: # analysis/webservice/algorithms/__init__.py # analysis/webservice/nexus_tornado/request/renderers/NexusGIFRenderer.py # analysis/webservice/nexus_tornado/request/renderers/__init__.py # poetry.lock CHANGELOG.md | 1 + analysis/webservice/algorithms/Lidar.py | 1502 ++++++++++++++++++++ analysis/webservice/algorithms/__init__.py | 1 + .../request/renderers/NexusGIFRenderer.py | 2 +- .../request/renderers/NexusRendererFactory.py | 6 + data-access/nexustiles/model/nexusmodel.py | 3 +- data-access/nexustiles/nexustiles.py | 5 +- poetry.lock | 112 +- pyproject.toml | 1 + 9 files changed, 1552 insertions(+), 81 deletions(-) diff --cc analysis/webservice/algorithms/__init__.py index f2396fd,c4bd25d..cfb3b5a --- a/analysis/webservice/algorithms/__init__.py +++ b/analysis/webservice/algorithms/__init__.py @@@ -30,5 -30,4 +30,6 @@@ from . import TileSearc from . import TimeAvgMap from . import TimeSeries from . import TimeSeriesSolr +from . import Tomogram +from . import Tomogram3D + from . import Lidar diff --cc pyproject.toml index 4bb7dba,542a371..4651496 --- a/pyproject.toml +++ b/pyproject.toml @@@ -67,9 -67,8 +67,10 @@@ xarray = "^2022.3.0 dask = "*" zarr = "2.11.3" pandas = "<2.1.0rc0" +matplotlib = "^3.7" +basemap = "^1.2" psutil = "*" + geopy = "*" [tool.poetry.dev-dependencies]
