Fixed a few errors after rewriting the logic on aquatic vegetation

opendatacube · Nov 15, 2024 · bd278c7 · bd278c7
1 parent 02de18c
commit bd278c7
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 441 deletions.
diff --git a/odc/stats/plugins/l34_utils/l4_natural_aquatic.py b/odc/stats/plugins/l34_utils/l4_natural_aquatic.py
@@ -28,14 +28,14 @@ def natural_auquatic_veg(l4, veg_cover, water_seasonality):
         dtype="uint8",
     )
 
-    res = expr_eval(
-        "where((a!=124)|(a!=125), 255, a)",
-        {
-            "a": res,
-        },
-        name="mark_nodata",
-        dtype="uint8",
-    )
+    # res = expr_eval(
+    #     "where((a!=124)|(a!=125), 255, a)",
+    #     {
+    #         "a": res,
+    #     },
+    #     name="mark_nodata",
+    #     dtype="uint8",
+    # )
 
     # mark water season
     # use some value not used in final class
@@ -120,7 +120,6 @@ def natural_auquatic_veg(l4, veg_cover, water_seasonality):
         name="mark_final",
         dtype="uint8",
     )
-
     #########################################
     res = expr_eval(
         "where((a==254)&(b==12), 67, a)",

diff --git a/tests/test_lc_l4_natural_surface.py b/tests/test_lc_l4_natural_surface.py
@@ -188,7 +188,7 @@ def test_ns():
         xx, stats_l4.water_seasonality_threshold
     )
     l4_ctv_ntv_nav = l4_natural_aquatic.natural_auquatic_veg(
-        l4_ctv_ntv, lifeform, veg_cover, water_seasonality
+        l4_ctv_ntv, veg_cover, water_seasonality
     )
 
     # Bare gradation