Meteostat 1.5.10 (#67)

meteostat · Aug 27, 2021 · d8ce478 · d8ce478
1 parent 6b2baf7
commit d8ce478
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/meteostat/__init__.py b/meteostat/__init__.py
@@ -12,7 +12,7 @@
 """
 
 __appname__ = 'meteostat'
-__version__ = '1.5.9'
+__version__ = '1.5.10'
 
 from .interface.base import Base
 from .interface.timeseries import Timeseries

diff --git a/meteostat/interface/normals.py b/meteostat/interface/normals.py
@@ -158,9 +158,37 @@ def _resolve_point(
         if self._stations.size == 0 or self._data.size == 0:
             return None
 
+        def adjust_temp(data: pd.DataFrame):
+            """
+            Adjust temperature-like data based on altitude
+            """
+
+            data.loc[data['tmin'] != np.NaN, 'tmin'] = data['tmin'] + \
+                ((2 / 3) * ((data['elevation'] - alt) / 100))
+            data.loc[data['tmax'] != np.NaN, 'tmax'] = data['tmax'] + \
+                ((2 / 3) * ((data['elevation'] - alt) / 100))
+
+            return data
+
         if method == 'nearest':
 
-            self._data = self._data.groupby(level=[
+            if adapt_temp:
+
+                # Join elevation of involved weather stations
+                data = self._data.join(
+                    stations['elevation'], on='station')
+
+                # Adapt temperature-like data based on altitude
+                data = adjust_temp(data)
+
+                # Drop elevation & round
+                data = data.drop('elevation', axis=1).round(1)
+
+            else:
+
+                data = self._data
+
+            self._data = data.groupby(level=[
                 'start',
                 'end',
                 'month'
@@ -173,10 +201,7 @@ def _resolve_point(
 
             # Adapt temperature-like data based on altitude
             if adapt_temp:
-                data.loc[data['tmin'] != np.NaN, 'tmin'] = data['tmin'] + \
-                    ((2 / 3) * ((data['elevation'] - alt) / 100))
-                data.loc[data['tmax'] != np.NaN, 'tmax'] = data['tmax'] + \
-                    ((2 / 3) * ((data['elevation'] - alt) / 100))
+                data = adjust_temp(data)
 
             # Aggregate mean data
             data = data.groupby(level=[

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 # Setup
 setup(
     name='meteostat',
-    version='1.5.9',
+    version='1.5.10',
     author='Meteostat',
     author_email='[email protected]',
     description='Access and analyze historical weather and climate data with Python.',