MM review

grass-gis-addons/m.analyse.trees/analyse_trees_lib/analyse_trees_lib.py

@@ -450,37 +450,24 @@ def compute_ndvi_neighbors(ndvi, nprocs, memory, rm_rasters):
     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"]:
+def calculate_index(band1, band2, output):
+    """Calculate NDWI or NDGB if does not exists
+    Args:
+        band1(string): Name of green raster map
+        band2(string): Name of nir (for NDWI) or blue (for NDGB) raster map
+        output(string): Name for output NDWI or NDGB raster map
+    """
+    if not grass.find_file(name=output, element="cell")["file"]:
         grass.mapcalc(
-            f"{ndgb} = round(127.5 * (1.0 + float({green} - {blue}) / float({green} + {blue})))"
+            f"{output} = round(127.5 * (1.0 + float({band1} - {band2}) / float({band1} + {band2})))"
         )
     else:
         grass.warning(
             _(
-                f"Map <{ndgb}> already exists."
+                f"Map <{output}> already exists."
                 "If you want to recalculate all existing data use --o "
-                f"and if you only want to recalculate {ndgb}, "
+                f"and if you only want to recalculate {output}, "
                 "please delete the map first with:\n"
-                f"<g.remove -rf type=raster name={ndgb}>"
+                f"<g.remove -rf type=raster name={output}>"
             )
         )

grass-gis-addons/m.analyse.trees/r.trees.mltrain/r.trees.mltrain.py

@@ -216,8 +216,7 @@ def main():
     sys.path.append(path)
     try:
         from analyse_trees_lib import (
-            calculate_ndgb,
-            calculate_ndwi,
+            calculate_index,
             create_nearest_pixel_ndvi,
             set_nprocs,
             test_memory,
@@ -260,11 +259,11 @@ def main():
 
     if not ndwi:
         ndwi = "ndwi"
-        calculate_ndwi(green, nir, ndwi)
+        calculate_index(green, nir, ndwi)
 
     if not ndgb:
         ndgb = "ndgb"
-        calculate_ndgb(green, blue, ndgb)
+        calculate_index(green, blue, ndgb)
 
     if options["trees_raw_v"]:
         trees_raw_v_rast = f"trees_raw_v_rast_{os.getpid()}"

grass-gis-addons/m.analyse.trees/r.trees.traindata/r.trees.traindata.py

@@ -212,8 +212,7 @@ def main():
     sys.path.append(path)
     try:
         from analyse_trees_lib import (
-            calculate_ndgb,
-            calculate_ndwi,
+            calculate_index,
             create_nearest_pixel_ndvi,
             set_nprocs,
             test_memory,
@@ -257,11 +256,11 @@ def main():
 
     if not ndwi:
         ndwi = "ndwi"
-        calculate_ndwi(green, nir, ndwi)
+        calculate_index(green, nir, ndwi)
 
     if not ndgb:
         ndgb = "ndgb"
-        calculate_ndgb(green, blue, ndgb)
+        calculate_index(green, blue, ndgb)
 
     # estimate trees from nearest peak IDs and various bands
 

grass-gis-addons/m.analyse.trees/v.trees.species/v.trees.species.py

@@ -208,7 +208,7 @@ def main():
     sys.path.append(path)
     try:
         from analyse_trees_lib import (
-            calculate_ndwi,
+            calculate_index,
             reset_region,
             set_nprocs,
             test_memory,
@@ -285,7 +285,7 @@ def main():
         grass.message(_("Computing NDWI ..."))
         ndwi = f"ndwi_{tmp_name}"
         rm_rasters.append(ndwi)
-        calculate_ndwi(green, nir, ndwi)
+        calculate_index(green, nir, ndwi)
 
     grass.message(_("Classifying deciduous and coniferous trees ..."))
     classification_group = f"classification_group_{tmp_name}"