test update

Author: unai-perez

DESCRIPTION

@@ -33,7 +33,7 @@ Authors@R:
     )
 Maintainer: Unai Pérez - Goya <[email protected]>
 Description: Downloading, customizing, and processing time series of satellite images for a region of interest. 'rsat' functions allow a unified access to multispectral images from Landsat, MODIS and Sentinel repositories. 'rsat' also offers capabilities for customizing satellite images, such as tile mosaicking, image cropping and new variables computation. Finally, 'rsat' covers the processing, including cloud masking, compositing and gap-filling/smoothing time series of images (Militino et al., 2018 <doi:10.3390/rs10030398> and Militino et al., 2019 <doi:10.1109/TGRS.2019.2904193>).
-Depends: R (>= 4.0.0)
+Depends: R (>= 4.3.2)
 Imports: XML, curl, httr, leafem, leaflet, rjson, rvest, tmap, xml2, zip, methods, Rdpack, fields, calendR, sf, stars, terra, sp, raster
 URL: https://github.com/ropensci/rsat
 BugReports: https://github.com/ropensci/rsat/issues

R/data.R

@@ -67,5 +67,23 @@ NULL
 #' @keywords data
 NULL
 
+#' Result of IMA test 1
+#'
+#' Filled image to test the package
+#'
+#' @name tiles.mod.ndvi.filled.1.res
+#' @docType data
+#' @keywords data
+NULL
+
+#' Result of IMA test 2
+#'
+#' Filled image to test the package
+#'
+#' @name tiles.mod.ndvi.filled.2.res
+#' @docType data
+#' @keywords data
+NULL
+
 #' @docType package
 #' @bibliography system.file("REFERENCES.bib", package = "rsat")

R/rsat_download.R

@@ -91,27 +91,40 @@ setMethod(
         do.call(entry$func, entry$args)
       }, mc.cores = 3)
     }else{
-      if(length(usgs)>0){
-        espa.orders <- connection$getApi("usgs")$order_usgs_records(usgs,
-                                                                    db_path,
-                                                                    verbose,
-                                                                    ...)
-      }
-      if(length(lpdaac)>0){
-        connection$getApi("lpdaac")$download_lpdaac_records(lpdaac,
-                                                            db_path,
-                                                            verbose,...)
-      }
-      if(length(dataspace)>0){
-        connection$getApi("dataspace")$dataspace_download_records(dataspace,
-                                                                  db_path,
-                                                                  verbose,...)
-      }
-      if(length(usgs)>0){
-        connection$getApi("usgs")$download_espa_orders(espa.orders,
-                                                       db_path,
-                                                       verbose,...)
-      }
+      functions_list <- list(
+        list(func = connection$getApi("usgs")$order_usgs_records,
+             args = list(lpdaac_records=usgs,db_path=db_path,verbose=verbose,...)),
+        list(func = connection$getApi("lpdaac")$download_lpdaac_records,
+             args = list(lpdaac_records=lpdaac,db_path=db_path,verbose=verbose,...)),
+        list(func = connection$getApi("dataspace")$dataspace_download_records,
+             args = list(records=dataspace,db_path=db_path,verbose=verbose,...)),
+        list(func = connection$getApi("usgs")$download_espa_orders,
+             args = list(usgs=usgs,db_path=db_path,verbose=verbose,...))
+      )
+      lapply(functions_list, function(entry) {
+        do.call(entry$func, entry$args)
+      })
+      # if(length(usgs)>0){
+      #   espa.orders <- connection$getApi("usgs")$order_usgs_records(usgs,
+      #                                                               db_path,
+      #                                                               verbose,
+      #                                                               ...)
+      # }
+      # if(length(lpdaac)>0){
+      #   connection$getApi("lpdaac")$download_lpdaac_records(lpdaac,
+      #                                                       db_path,
+      #                                                       verbose,...)
+      # }
+      # if(length(dataspace)>0){
+      #   connection$getApi("dataspace")$dataspace_download_records(dataspace,
+      #                                                             db_path,
+      #                                                             verbose,...)
+      # }
+      # if(length(usgs)>0){
+      #   connection$getApi("usgs")$download_espa_orders(espa.orders,
+      #                                                  db_path,
+      #                                                  verbose,...)
+      # }
     }
   }
 )

R/rtoi.R

@@ -464,6 +464,8 @@ setMethod(
   "get_database",
   signature = c(x = "missing"),
   function() {
+    if(getRSATOpt("RSAT_DATABASE")=="")
+      warning("Database not defined, use the set_database function to define it.")
     return(getRSATOpt("RSAT_DATABASE"))
   }
 )