Replace gdal_merge with gdalwarp, clean up report

Author: sjpfenninger

workflow/envs/default.yaml

@@ -13,6 +13,7 @@ dependencies:
   - fiona=1.10.1
   - rasterio=1.4.3
   - rioxarray=0.19.0
+  - gdal=3.10.3
   - libgdal-arrow-parquet=3.10.3
   - libgdal-hdf5=3.10.3
   - matplotlib=3.10.3

workflow/rules/process.smk

@@ -94,7 +94,7 @@ rule aggregate_area_potential:
         "../envs/default.yaml"
     shell:
         """
-        gdal_merge -o "{output.aggregated_area_potential}" -a_nodata -1 {input}
+        gdalwarp --config GDAL_CACHEMAX 3000 -wm 3000 -of GTiff -co COMPRESS=LZW {input} "{output.aggregated_area_potential}"
         """
 
 

workflow/scripts/report.py

@@ -33,7 +33,9 @@ def report(shapes, area_potentials, csv_path, html_path):
             .squeeze()
             .drop_vars(["band", "spatial_ref"])
         )
-        dataframes.append(da_area_potential.groupby(regions).sum().to_pandas())
+        df_ = da_area_potential.groupby(regions).sum().to_pandas()
+        df_.name = area_potential_file
+        dataframes.append(df_)
         del da_area_potential
 
     df = pd.concat(dataframes, axis=1)