From 1ee5178449036ece2d2cf8e4264df0a52bcdeec6 Mon Sep 17 00:00:00 2001
From: Mike Mahoney <mike.mahoney.218@gmail.com>
Date: Thu, 2 Nov 2023 11:23:55 -0400
Subject: [PATCH] Fix no-merge downloads

---
 R/get_stac_data.R | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/R/get_stac_data.R b/R/get_stac_data.R
index c31961d..5dc6615 100644
--- a/R/get_stac_data.R
+++ b/R/get_stac_data.R
@@ -284,7 +284,7 @@ get_stac_data <- function(aoi,
     p <- function(...) NULL
   }
 
-  if (is.null(mask_function) && !rescale_bands && composite_function == "merge") {
+  if (is.null(mask_function) && !rescale_bands && !is.null(composite_function) && composite_function == "merge") {
     download_results <- simple_download(
       items,
       sign_function,
@@ -315,7 +315,6 @@ get_stac_data <- function(aoi,
     on.exit(file.remove(unlist(download_results[["final_bands"]])), add = TRUE)
   }
 
-
   mapply(
     function(in_bands, vrt) {
       stack_rasters(
@@ -330,6 +329,20 @@ get_stac_data <- function(aoi,
 
   on.exit(file.remove(download_results[["out_vrt"]]), add = TRUE)
 
+  if (is.null(composite_function)) {
+    app <- tryCatch(rstac::items_datetime(items), error = function(e) NA)
+    if (any(is.na(app))) app <- NULL
+    app <- app %||% seq_along(download_results[["final_bands"]])
+
+    output_filename <- paste0(
+      tools::file_path_sans_ext(output_filename),
+      "_",
+      app,
+      ".",
+      tools::file_ext(output_filename)
+    )
+  }
+
   out <- mapply(
     function(vrt, out) {
       sf::gdal_utils(
@@ -402,7 +415,7 @@ simple_download <- function(items,
     future.seed = TRUE
   )
   list(
-    final_bands = out,
+    final_bands = list(out),
     out_vrt = tempfile(fileext = ".vrt")
   )
 }
@@ -456,25 +469,12 @@ complex_download <- function(items,
     }
   )
   download_locations <- stats::na.omit(download_locations)
-  on.exit(file.remove(unlist(download_locations)))
   names(download_locations) <- names(items_urls)
 
   if (!is.null(mask_band)) apply_masks(mask_band, mask_function, download_locations, p)
 
   if (is.null(composite_function)) {
     out_vrt <- replicate(nrow(download_locations), tempfile(fileext = ".tif"))
-
-    app <- tryCatch(rstac::items_datetime(items), error = function(e) NA)
-    if (any(is.na(app))) app <- NULL
-    app <- app %||% seq_along(out_vrt)
-
-    output_filename <- paste0(
-      tools::file_path_sans_ext(output_filename),
-      "_",
-      app,
-      ".",
-      tools::file_ext(output_filename)
-    )
     final_bands <- apply(download_locations, 1, identity, simplify = FALSE)
   } else {
     out_vrt <- tempfile(fileext = ".vrt")