Merge pull request #9 from morand-g/main

geoenrich 0.6.4

Author: morand-g

.zenodo.json

@@ -18,7 +18,7 @@
 
     "license": "GPL-3.0",
 
-    "title": "GeoEnrich v0.6.3: a new tool for scientists to painlessly enrich species occurrence data with environmental variables",
+    "title": "GeoEnrich v0.6.4: a new tool for scientists to painlessly enrich species occurrence data with environmental variables",
 
     "related_identifiers": [
         {

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.6.4
+
+#### Bug fixes:
+ - Fixed bug that occurred when requesting data for surface points in 'nearest_lower' mode.
+ 
 ## v0.6.3
 
 #### New functions

README.md

@@ -1,4 +1,4 @@
-# **geoenrich 0.6.3**
+# **geoenrich 0.6.4**
 
 [![Read the Docs](https://img.shields.io/readthedocs/geoenrich)](https://geoenrich.readthedocs.io/en/latest/)
 [![License](https://img.shields.io/github/license/morand-g/geoenrich?color=green)](https://github.com/morand-g/geoenrich/blob/main/LICENSE)

docs/source/conf.py

@@ -25,7 +25,7 @@
 author = 'Gaétan Morand (UMR Marbec)'
 
 # The full version, including alpha/beta/rc tags
-release = '0.6.3'
+release = '0.6.4'
 
 
 # -- General configuration ---------------------------------------------------

docs/source/index.rst

@@ -1,4 +1,4 @@
-geoenrich 0.6.3 documentation
+geoenrich 0.6.4 documentation
 ==============================
 
 |Read the Docs| |License| |PyPI| |Python versions| |Last commit| |DOI|

geoenrich/enrichment.py

@@ -730,8 +730,15 @@ def calculate_indices(row, dimdict, var, depth_request, downsample):
         if depth_request == 'nearest_lower' and pd.notna(row['bestz']):
             diffs = (row['bestz'] - dimdict['depth']['vals']).astype('float')
             diffs[diffs < 0] = np.nan
-            d1 = np.nanargmin(diffs)
-            ind['depth'] = {'min': d1, 'max': d1, 'best': d1, 'step': 1}
+
+            if np.isnan(diffs).all():
+                # Requested depth is inferior to all available depths -> Return surface data
+                d1 = np.argmin( np.abs( dimdict['depth']['vals'] ) )
+                ind['depth'] = {'min': d1, 'max': d1, 'best': d1, 'step': 1}
+                
+            else:
+                d1 = np.nanargmin(diffs)
+                ind['depth'] = {'min': d1, 'max': d1, 'best': d1, 'step': 1}
 
         elif depth_request == 'nearest' and pd.notna(row['bestz']):
             d1 = np.argmin( np.abs(row['bestz'] - dimdict['depth']['vals'] ) )

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = geoenrich
-version = 0.6.3
+version = 0.6.4
 author = Gaétan Morand (UMR Marbec)
 author_email = gaetan.morand@ird.fr
 description = A package to enrich your geo-referenced data (e.g. species occurrences) with environmental data.