Merge pull request #37 from MeteoSwiss/add-features

Add new features for tpi
MeteoSwiss · Nov 8, 2024 · c0ad911 · c0ad911
2 parents 26337bd + 821873e
commit c0ad911
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 4 deletions.
diff --git a/mlpp_features/terrain.py b/mlpp_features/terrain.py
@@ -365,33 +365,79 @@ def std_500m(data: Dict[str, xr.Dataset], stations, *args, **kwargs) -> xr.Datas
     """
     Terrain STD at a 500m scale
     """
-    return data["terrain"].mlpp.get("STD_500M").mlpp.interp(stations).astype("float32")
+    return (
+        data["terrain"]
+        .mlpp.get("STD_500M")
+        .mlpp.interp(stations)
+        .astype("float32")
+    )
 
 
 @out_format()
 def std_2000m(data: Dict[str, xr.Dataset], stations, *args, **kwargs) -> xr.Dataset:
     """
     Terrain STD at a 2000m scale
     """
-    return data["terrain"].mlpp.get("STD_2000M").mlpp.interp(stations).astype("float32")
+    return (
+        data["terrain"]
+        .mlpp.get("STD_2000M")
+        .mlpp.interp(stations)
+        .astype("float32")
+    )
 
 
 @out_format()
 def tpi_500m(data: Dict[str, xr.Dataset], stations, *args, **kwargs) -> xr.Dataset:
     """
     Terrain TPI at a 500m scale
     """
-    return data["terrain"].mlpp.get("TPI_500M").mlpp.interp(stations).astype("float32")
+    return (
+        data["terrain"]
+        .mlpp.get("TPI_500M")
+        .mlpp.interp(stations)
+        .astype("float32")
+    )
 
 
 @out_format()
 def tpi_2000m(data: Dict[str, xr.Dataset], stations, *args, **kwargs) -> xr.Dataset:
     """
     Terrain TPI at a 2000m scale
     """
-    return data["terrain"].mlpp.get("TPI_2000M").mlpp.interp(stations).astype("float32")
+    return (
+        data["terrain"]
+        .mlpp.get("TPI_2000M")
+        .mlpp.interp(stations)
+        .astype("float32")
+    )
 
 
+@out_format()
+def smooth_tpi_60000m(data: Dict[str, xr.Dataset], stations, *args, **kwargs) -> xr.Dataset:
+    """
+    Terrain TPI at a 60000m scale with smooth factor 1
+    """
+    return (
+        data["terrain"]
+        .mlpp.get("TPI_60000M_SMTHFACT1")
+        .mlpp.interp(stations)
+        .astype("float32")
+    )
+
+
+@out_format()
+def smooth_tpi_100000m(data: Dict[str, xr.Dataset], stations, *args, **kwargs) -> xr.Dataset:
+    """
+    Terrain TPI at a 100000m scale with smooth factor 1
+    """
+    return (
+        data["terrain"]
+        .mlpp.get("TPI_100000M_SMTHFACT1")
+        .mlpp.interp(stations)
+        .astype("float32")
+    )
+
+
 @out_format()
 def valley_norm_2000m(
     data: Dict[str, xr.Dataset], stations, *args, **kwargs

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -181,6 +181,8 @@ def _data(grid_res_meters, var_names=None):
                 "STD_2000M",
                 "TPI_500M",
                 "TPI_2000M",
+                "TPI_60000M_SMTHFACT1",
+                "TPI_100000M_SMTHFACT1",
                 "VALLEY_NORM_1000M_SMTHFACT0.5",
                 "VALLEY_NORM_2000M_SMTHFACT0.5",
                 "VALLEY_NORM_10000M_SMTHFACT0.5",