tree analyses remove duplicated calculation of NDWI and NDGB

mundialis · Dec 4, 2024 · fec134c · fec134c
1 parent aa70c10
commit fec134c
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 26 deletions.
diff --git a/grass-gis-addons/m.analyse.trees/analyse_trees_lib/analyse_trees_lib.py b/grass-gis-addons/m.analyse.trees/analyse_trees_lib/analyse_trees_lib.py
@@ -448,3 +448,39 @@ def compute_ndvi_neighbors(ndvi, nprocs, memory, rm_rasters):
     rm_rasters.append(f"{ndvi_split}_max1")
     rm_rasters.append(f"{ndvi_split}_max2")
     return f"{ndvi_split}_max2"
+
+
+def calculate_ndwi(green, nir, ndwi):
+    """Calculate NDWI if does not exists"""
+    if not grass.find_file(name=ndwi, element="cell")["file"]:
+        grass.mapcalc(
+            f"{ndwi} = round(127.5 * (1.0 + float({green} - {nir}) / float({green} + {nir})))"
+        )
+    else:
+        grass.warning(
+            _(
+                f"Map <{ndwi}> already exists."
+                "If you want to recalculate all existing data use --o "
+                f"and if you only want to recalculate {ndwi}, "
+                "please delete the map first with:\n"
+                f"<g.remove -rf type=raster name={ndwi}>"
+            )
+        )
+
+
+def calculate_ndgb(green, blue, ndgb):
+    """Calculate NDGB if does not exists"""
+    if not grass.find_file(name=ndgb, element="cell")["file"]:
+        grass.mapcalc(
+            f"{ndgb} = round(127.5 * (1.0 + float({green} - {blue}) / float({green} + {blue})))"
+        )
+    else:
+        grass.warning(
+            _(
+                f"Map <{ndgb}> already exists."
+                "If you want to recalculate all existing data use --o "
+                f"and if you only want to recalculate {ndgb}, "
+                "please delete the map first with:\n"
+                f"<g.remove -rf type=raster name={ndgb}>"
+            )
+        )
diff --git a/grass-gis-addons/m.analyse.trees/r.trees.mltrain/r.trees.mltrain.py b/grass-gis-addons/m.analyse.trees/r.trees.mltrain/r.trees.mltrain.py
@@ -216,6 +216,8 @@ def main():
     sys.path.append(path)
     try:
         from analyse_trees_lib import (
+            calculate_ndgb,
+            calculate_ndwi,
             create_nearest_pixel_ndvi,
             set_nprocs,
             test_memory,
@@ -258,15 +260,11 @@ def main():
 
     if not ndwi:
         ndwi = "ndwi"
-        grass.mapcalc(
-            f"{ndwi} = round(127.5 * (1.0 + float({green} - {nir}) / float({green} + {nir})))"
-        )
+        calculate_ndwi(green, nir, ndwi)
 
     if not ndgb:
         ndgb = "ndgb"
-        grass.mapcalc(
-            f"{ndgb} = round(127.5 * (1.0 + float({green} - {blue}) / float({green} + {blue})))"
-        )
+        calculate_ndgb(green, blue, ndgb)
 
     if options["trees_raw_v"]:
         trees_raw_v_rast = f"trees_raw_v_rast_{os.getpid()}"

diff --git a/grass-gis-addons/m.analyse.trees/r.trees.postprocess/r.trees.postprocess.py b/grass-gis-addons/m.analyse.trees/r.trees.postprocess/r.trees.postprocess.py
@@ -212,7 +212,12 @@ def main():
         grass.fatal("Unable to find the analyse trees library directory.")
     sys.path.append(path)
     try:
-        from analyse_trees_lib import set_nprocs, test_memory
+        from analyse_trees_lib import (
+            calculate_ndgb,
+            calculate_ndwi,
+            set_nprocs,
+            test_memory,
+        )
     except Exception:
         grass.fatal("analyse_trees_lib missing.")
 
@@ -256,17 +261,11 @@ def main():
 
     if not ndwi:
         ndwi = "ndwi"
-        grass.mapcalc(
-            f"{ndwi} = round(127.5 * (1.0 + float({green} - {nir}) / float({green} + {nir})))",
-            overwrite=True,
-        )
+        calculate_ndwi(green, nir, ndwi)
 
     if not ndgb:
         ndgb = "ndgb"
-        grass.mapcalc(
-            f"{ndgb} = round(127.5 * (1.0 + float({green} - {blue}) / float({green} + {blue})))",
-            overwrite=True,
-        )
+        calculate_ndgb(green, blue, ndgb)
 
     # estimate trees from nearest peak IDs and various bands
 

diff --git a/grass-gis-addons/m.analyse.trees/r.trees.traindata/r.trees.traindata.py b/grass-gis-addons/m.analyse.trees/r.trees.traindata/r.trees.traindata.py
@@ -212,6 +212,8 @@ def main():
     sys.path.append(path)
     try:
         from analyse_trees_lib import (
+            calculate_ndgb,
+            calculate_ndwi,
             create_nearest_pixel_ndvi,
             set_nprocs,
             test_memory,
@@ -255,15 +257,11 @@ def main():
 
     if not ndwi:
         ndwi = "ndwi"
-        grass.mapcalc(
-            f"{ndwi} = round(127.5 * (1.0 + float({green} - {nir}) / float({green} + {nir})))"
-        )
+        calculate_ndwi(green, nir, ndwi)
 
     if not ndgb:
         ndgb = "ndgb"
-        grass.mapcalc(
-            f"{ndgb} = round(127.5 * (1.0 + float({green} - {blue}) / float({green} + {blue})))"
-        )
+        calculate_ndgb(green, blue, ndgb)
 
     # estimate trees from nearest peak IDs and various bands
 

diff --git a/grass-gis-addons/m.analyse.trees/v.trees.species/v.trees.species.py b/grass-gis-addons/m.analyse.trees/v.trees.species/v.trees.species.py
@@ -207,7 +207,12 @@ def main():
         grass.fatal("Unable to find the analyse trees library directory")
     sys.path.append(path)
     try:
-        from analyse_trees_lib import reset_region, set_nprocs, test_memory
+        from analyse_trees_lib import (
+            calculate_ndwi,
+            reset_region,
+            set_nprocs,
+            test_memory,
+        )
     except Exception:
         grass.fatal("analyse_trees_lib missing.")
 
@@ -280,10 +285,7 @@ def main():
         grass.message(_("Computing NDWI ..."))
         ndwi = f"ndwi_{tmp_name}"
         rm_rasters.append(ndwi)
-        grass.mapcalc(
-            f"{ndwi} = round(255 * (1.0 + ( float({green} - {nir})/"
-            f"({green} + {nir}) ))/2)"
-        )
+        calculate_ndwi(green, nir, ndwi)
 
     grass.message(_("Classifying deciduous and coniferous trees ..."))
     classification_group = f"classification_group_{tmp_name}"