Wdi basteln richtig (#2)

* fix region

* updated flake8 for new worker and lib

* linting

Author: kimariak

.flake8

@@ -6,7 +6,8 @@
 # F821 undefined name '_'
 
 per-file-ignores =
-    ./r.dem.import.worker/r.dem.worker.py:E501,F821
+    ./lib_dem/r_dem_import_lib.py: E501,F821
+    ./r.dem.import.worker/r.dem.import.worker.py:E501,F821
     ./r.dsm.import.bb/r.dsm.import.bb.py:E501,F821
     ./r.dsm.import.be/r.dsm.import.be.py:E501,F821
     ./r.dsm.import.hb/r.dsm.import.hb.py:E501,F821

lib_dem/r_dem_import_lib.py

@@ -112,7 +112,6 @@
     },
 }
 
-RETRIES = 30
 WAITING_TIME = 10
 
 
@@ -158,7 +157,7 @@ def create_grid_and_tiles_list(
 
     Returns:
         rm_vectors (list): Extended list of vectors to remove in cleanup
-        nummber_tiles (str): Number of tiles overlapping with aoi
+        number_tiles (str): Number of tiles overlapping with aoi
         tiles_list (list): List of tile names overlapping with aoi
     """
     # check if aoi is smaller than tile size
@@ -213,8 +212,6 @@ def create_grid_and_tiles_list(
     grass.message(_(f"Number of tiles: {number_tiles}"))
     tiles_list = []
     for tile in tiles_num_list:
-        # TODO Möglichkeit nach DTM oder DSM zu bennenen einfügen,
-        # bis dahin mit DEM bezeichnet
         tile_area = f"{fs}_DEM_{tile}"
         grass.run_command(
             "v.extract",
@@ -237,6 +234,7 @@ def import_dem_from_wms(
     layer_name,
     native_res,
     data_format="tiff",
+    retries=30,
 ):
     """Import DEMs from WMS
     Args:
@@ -246,8 +244,10 @@ def import_dem_from_wms(
         resolution_to_import (float): Resolution to resample imported raster to
         layer_name (str): Name of WMS Layer, given as Layer_{fs}
         native_res (bool): Keep native DEM resolution
+        retries (int): Set how often function is retried
     """
-    # set region and create variable names
+
+    # set region
     grass.run_command("g.region", vector=tile_key)
     if not native_res:
         grass.run_command("g.region", res=resolution_to_import, flags="a")
@@ -277,6 +277,6 @@ def import_dem_from_wms(
                 flags="f",
             )
             grass.message(_("Retry download..."))
-            if count > (RETRIES / 2):
+            if count > (retries / 2):
                 grass.fatal(f"Download of {tile_url} not working.")
             sleep(10)

r.dem.import.worker/r.dem.import.worker.py

@@ -77,11 +77,6 @@
 # % description: Name of raster output
 # %end
 
-# %option
-# % key: raster_name_list
-# % description: List of all output rasters
-# %end
-
 # %flag
 # % key: r
 # % description: Use native DEM resolution
@@ -101,7 +96,7 @@
 # import module library
 path = get_lib_path(modname="r.dem.import")
 if path is None:
-    grass.fatal("Unable to find the dop library directory.")
+    grass.fatal("Unable to find the dem library directory.")
 sys.path.append(path)
 try:
     from r_dem_import_lib import import_dem_from_wms
@@ -114,7 +109,7 @@
 # pylint: disable=C0103
 original_nprocs = None
 
-RETRIES = 3
+RETRIES = 30
 WAITING_TIME = 10
 
 
@@ -173,9 +168,14 @@ def main():
         ),
     )
 
+    # add all generated rasters to a list, later used to create vrt
     raster_name_list = []
+
+    # iterate through all layers
     for layer_name in layer_names_list:
         output_raster = f"{raster_name}_{layer_name}"
+
+        # import DEMs from WMS
         import_dem_from_wms(
             f"{tile_key}@{old_mapset}",
             output_raster,
@@ -187,41 +187,36 @@ def main():
         )
         raster_name_info = grass.raster_info(output_raster)
 
-        # Prüfen ob richtige min/max werte -> nicht NULL
+        # test if raster is invalid
         if (
             raster_name_info["min"] is not None
             and raster_name_info["max"] is not None
         ):
             raster_name_list.append(output_raster)
         else:
-            # Ungültige Raster direkt entfernen
-            grass.run_command(
-                "g.remove",
-                type="raster",
-                name=output_raster,
-                flags="f",
-                quiet=True,
-            )
-
-    # Falls kein einziges gültig war
+            rm_rast.append(output_raster)
+
+    # no valid raster
     if not raster_name_list:
-        grass.fatal("TODO: Fehlermeldung")
+        grass.fatal("Unable to find DEM matching the given aoi")
 
-    # Falls nur eins gültig war -> direkt verwenden
+    # one valid raster
     elif len(raster_name_list) == 1:
         grass.run_command(
             "g.rename",
             raster=f"{raster_name_list[0]},{raster_name}",
         )
 
-    # Mehrere gültige Raster -> patchen
+    # multiple valid rasters
     else:
         grass.run_command(
             "r.patch",
             input=raster_name_list,
             output=raster_name,
         )
 
+    grass.message(_(f"Finishing raster import for {raster_name}..."))
+
     # switch back to original location
     switch_back_original_location(gisrc)
     grass.utils.try_remove(newgisrc)

r.dsm.import.hb/r.dsm.import.hb.py

@@ -34,6 +34,12 @@
 # % multiple: no
 # %end
 
+# %option G_OPT_R_INPUT
+# % key: alignment_raster
+# % required: no
+# % description: Name of raster map, used for raster alignment (if not given, dem extent and region resolution is used)
+# %end
+
 # %option G_OPT_R_OUTPUT
 # % description: Name for output raster map
 # %end
@@ -63,6 +69,7 @@
 
 # %rules
 # % requires_all: -k,download_dir
+# % excludes: -r,alignment_raster
 # %end
 
 import atexit
@@ -77,7 +84,7 @@
 from grass_gis_helpers.open_geodata_germany.download_data import (
     check_download_dir,
 )
-from grass_gis_helpers.raster import create_vrt
+from grass_gis_helpers.raster import adjust_raster_resolution, create_vrt
 
 # import module library
 path = get_lib_path(modname="r.dem.import")
@@ -95,6 +102,7 @@
 ID = grass.tempname(12)
 ORIG_REGION = f"original_region_{ID}"
 rm_vectors = []
+rm_rasters = []
 download_dir = None
 rm_dirs = []
 
@@ -111,6 +119,7 @@ def cleanup():
     general_cleanup(
         orig_region=ORIG_REGION,
         rm_vectors=rm_vectors,
+        rm_rasters=rm_rasters,
         rm_dirs=rm_dirs,
     )
 
@@ -120,6 +129,7 @@ def main():
     global rm_vectors
     aoi = options["aoi"]
     download_dir = check_download_dir(options["download_dir"])
+    alignment_raster = options["alignment_raster"]
     nprocs = int(options["nprocs"])
     nprocs = setup_parallel_processing(nprocs)
     output = options["output"]
@@ -158,6 +168,7 @@ def main():
 
     # set region if aoi is given
     if aoi:
+        # pylint: disable=E0601
         grass.run_command("g.region", vector=aoi, res=ns_res, flags="a")
     # if no aoi save region as aoi
     else:
@@ -198,6 +209,7 @@ def main():
     gisenv = grass.gisenv()
     gisdbase = gisenv["GISDBASE"]
     location = gisenv["LOCATION_NAME"]
+
     # set queue and variables for worker addon
     create_vrt_list = []
     try:
@@ -208,7 +220,7 @@ def main():
             key = tile
             new_mapset = f"tmp_mapset_r_dem_import_tile_{key}_{os.getpid()}"
             rm_dirs.append(os.path.join(gisdbase, location, new_mapset))
-            raster_name = f"{tile}_{ID}"
+            raster_name = tile
             create_vrt_list.append(f"{raster_name}@{new_mapset}")
             param = {
                 "tile_key": key,
@@ -220,6 +232,7 @@ def main():
                 "flags": "",
             }
             grass.message(_(f"raster name: {raster_name}"))
+
             # modify params
             if aoi:
                 param["aoi"] = aoi
@@ -231,6 +244,7 @@ def main():
                 param["resolution_to_import"] = NATIVE_DSM_RES
             else:
                 param["resolution_to_import"] = ns_res
+
             # run worker addon in parallel
             r_dem_import_worker = Module(
                 "r.dem.import.worker",
@@ -254,6 +268,29 @@ def main():
                 )
 
     create_vrt(create_vrt_list, output)
+    if not flags["r"]:
+        if alignment_raster:
+            # set extent from imported data, and align with alignment raster
+            grass.run_command(
+                "g.region", raster=output, align=alignment_raster
+            )
+            ns_res = float(
+                grass.parse_command("r.info", map=alignment_raster, flags="g")[
+                    "nsres"
+                ],
+            )
+        else:
+            # if no alignemnt raster is given,
+            # use extent of imported data and
+            # set and align with current region resolution
+            grass.run_command("g.region", raster=output)
+            grass.run_command("g.region", res=ns_res, flags="a")
+        grass.message(_("Resampling / interpolating data..."))
+        grass.run_command("g.rename", raster=f"{output},{output}_tmp")
+        adjust_raster_resolution(f"{output}_tmp", output, ns_res)
+        rm_rasters.append(f"{output}_tmp")
+
+    grass.message(_(f"Generated following raster map: {output}"))
 
 
 if __name__ == "__main__":