fixed little errors

Author: unai-perez

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rsat
 Type: Package
 Title: Dealing with Multiplatform Satellite Images
-Version: 0.1.19
+Version: 0.1.21
 Authors@R: 
   c(person(given = "Unai",
            family = "Pérez - Goya",

NEWS.md

@@ -1,3 +1,18 @@
+rsat 0.1.20 (2024-01-30)
+=========================
+### NEW FEATURES
+  * The package accept parallel downloads from 3 different sources
+  * API change for Sentinel images from scihub to dataspace
+  * API change for Modis images from nasa inventory to lpdaac
+  
+### IMPROVEMENTS
+  * Updated API connection code
+  
+### MINOR IMPROVEMENTS
+  * Fixed minor bugs in the code
+  * Code revision and cleaned
+  * Fixed subset incompatibility with terra package
+  
 rsat 0.1.17 (2021-12-13)
 =========================
 ### NEW FEATURES

R/rsat.R

@@ -23,9 +23,9 @@
 #' of NASA's earth observation data-sets. More information about
 #' EarthData can be found
 #' \href{https://www.earthdata.nasa.gov/learn}{here}.
-#' \item \href{https://scihub.copernicus.eu/dhus/#/self-registration}{SciHub},
+#' \item \href{https://dataspace.copernicus.eu/}{dataspace},
 #' a web service giving access to Copernicus' scientific data hub.
-#' Please go \href{https://scihub.copernicus.eu}{here} to find more
+#' Please go \href{https://dataspace.copernicus.eu/}{here} to find more
 #' details about the data hub.
 #' }
 #' For convenience, try to use the same username and password for all of them.

R/rsat_derive.R

@@ -11,10 +11,10 @@
 #' return a single element. For instance, the Normalized Difference Snow
 #' Index would be;
 #'
-#' NDSI = function(green, swir1){
-#' ndsi <- (green - swir1)/(green + swir1)
-#' return(ndsi)
-#' }
+#' NDSI = function(green, swir1)\{
+#'   ndsi <- (green - swir1)/(green + swir1)
+#'   return(ndsi)
+#' \}
 #'
 #' @param x an \code{rtoi} as the source of images.
 #' @param product the name of the product from which the index is computed.
@@ -54,8 +54,8 @@
 #'
 #' # ad-hoc variable
 #' NDSI = function(green, swir1){
-#' ndsi <- (green - swir1)/(green + swir1)
-#' return(ndsi)
+#'   ndsi <- (green - swir1)/(green + swir1)
+#'   return(ndsi)
 #' }
 #' rsat_derive(pamplona, "NDSI", product = "mod09ga",fun=NDSI)
 #' # now NDVI is processed

R/rsat_download.R

@@ -43,14 +43,15 @@ setGeneric("rsat_download", function(x, ...) {
 setMethod(
   f = "rsat_download",
   signature = c("rtoi"),
-  function(x, db_path, verbose = FALSE, ...) {
+  function(x, db_path, verbose = FALSE, parallel=FALSE, ...) {
     if (missing(db_path)){
       db_path <- get_database(x)
     }
 
     rsat_download(x = records(x),
                   db_path = db_path,
                   verbose = verbose,
+                  parallel = parallel,
                   ...)
   }
 )
@@ -61,7 +62,7 @@ setMethod(
 setMethod(
   f = "rsat_download",
   signature = c("records"),
-  function(x, db_path, verbose = FALSE,parallel=FALSE, ...) {
+  function(x, db_path, verbose = FALSE, parallel=FALSE, ...) {
     args <- list(...)
 
     if (missing(db_path)){
@@ -87,21 +88,21 @@ setMethod(
         list(func = connection$getApi("usgs")$espa_order_and_download,
              args = list(usgs=usgs,db_path=db_path,verbose=verbose,...))
       )
-      mclapply(functions_list, function(entry) {
+      null.list <-mclapply(functions_list, function(entry) {
         do.call(entry$func, entry$args)
       }, mc.cores = 3)
     }else{
       functions_list <- list(
         list(func = connection$getApi("usgs")$order_usgs_records,
-             args = list(lpdaac_records=usgs,db_path=db_path,verbose=verbose,...)),
+             args = list(espa_orders=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,...))
+             args = list(espa.orders=usgs,db_path=db_path,verbose=verbose,...))
       )
-      lapply(functions_list, function(entry) {
+      null.list <- lapply(functions_list, function(entry) {
         do.call(entry$func, entry$args)
       })
       # if(length(usgs)>0){

R/rsat_search.R

@@ -6,7 +6,7 @@
 #' function returns nothing and the records are added to the \code{rtoi}.
 #'
 #' MODIS images are found through the
-#' \href{https://lpdaacsvc.cr.usgs.gov/services/inventory}{NASA Common
+#' \href{https://lpdaac.usgs.gov/}{NASA Common
 #'  Metadata Repository}
 #' (CMR). The inventory of MODIS products can be found
 #' \href{https://modis.gsfc.nasa.gov/data/dataprod/}{here}.

README.Rmd

@@ -72,7 +72,7 @@ In Linux, you need to install additional libraries before starting with `rsat`.
 The registration in the following online portals is required to get a full access to satellite images with `rsat`;
 -   [USGS](https://ers.cr.usgs.gov/register/) USGS is the sole science agency for the Department of the Interior of United States. Provide access to Modis Images. More information about USGS can be found [Here](https://www.usgs.gov/).
 -   [EarthData](https://urs.earthdata.nasa.gov): A repository of NASA's earth observation data-sets. More information about EarthData can be found [here](https://www.earthdata.nasa.gov/learn).
--   [SciHub](https://scihub.copernicus.eu/dhus/#/self-registration), a web service giving access to Copernicus' scientific data hub. Please go [here](https://scihub.copernicus.eu/) to find more details about the data hub.
+-   [Dataspace](https://dataspace.copernicus.eu/), a web service giving access to Copernicus' scientific data hub. Please go [here](https://dataspace.copernicus.eu/) to find more details about the data hub.
 
 For convenience, try to use the same username and password for all of them. To satisfy the criteria of all web services make sure that the username is $4$ characters long and includes a period, number or underscore. The password must be $12$ character long and should include characters with at least one capital letter, and numbers.
 
@@ -162,7 +162,7 @@ help you in organizing the image products.
 
 -   [rLandsat](https://github.com/atlanhq/rLandsat)
 
--   [getLandsat](https://github.com/ropensci/getlandsat)
+-   [getLandsat](https://github.com/ropensci-archive/getlandsat)
 
 -   [sen2r](https://github.com/ranghetti/sen2r)
 

README.md

@@ -62,7 +62,7 @@ In Linux, you need to install additional libraries before starting with `rsat`.
 The registration in the following online portals is required to get a full access to satellite images with `rsat`;
 -   [USGS](https://ers.cr.usgs.gov/register/) USGS is the sole science agency for the Department of the Interior of United States. Provide access to Modis Images. More information about USGS can be found [Here](https://www.usgs.gov/).
 -   [EarthData](https://urs.earthdata.nasa.gov): A repository of NASA's earth observation data-sets. More information about EarthData can be found [here](https://www.earthdata.nasa.gov/learn).
--   [DataSpace](https://identity.dataspace.copernicus.eu/), a web service giving access to Copernicus' scientific data hub. Please go [here](https://identity.dataspace.copernicus.eu/) to find more details about the data hub.
+-   [DataSpace](https://dataspace.copernicus.eu/), a web service giving access to Copernicus' scientific data hub. Please go [here](https://dataspace.copernicus.eu/) to find more details about the data hub.
 
 For convenience, try to use the same username and password for all of them. To satisfy the criteria of all web services make sure that the username is $4$ characters long and includes a period, number or underscore. The password must be $12$ character long and should include characters with at least one capital letter, and numbers.
 
@@ -131,7 +131,7 @@ The last package dedicated to image downloading is `luna`.Searching and download
 
 -   [rLandsat](https://github.com/atlanhq/rLandsat)
 
--   [getLandsat](https://github.com/ropensci/getlandsat)
+-   [getLandsat](https://github.com/ropensci-archive/getlandsat)
 
 -   [sen2r](https://github.com/ranghetti/sen2r)
 

inst/CITATION

@@ -4,12 +4,12 @@ bibentry(bibtype = "Manual",
                    person("M Montesino-SanMartin"),
                    person("A F Militino"),
                    person("M D Ugarte")),
-  year         = "2022",
-  note = "R package version 0.1.19",
+  year         = "2024",
+  note = "R package version 0.1.21",
   url = "https://CRAN.R-project.org/package=rsat",
   textVersion  =
-  paste("U Pérez-Goya, M Montesino-SanMartin, A F Militino, M D Ugarte (2022).",
-        "rsat: Dealing with Multiplatform Satellite Images from Landsat, MODIS, and Sentinel. R package version 0.1.18.",
+  paste("U Pérez-Goya, M Montesino-SanMartin, A F Militino, M D Ugarte (2024).",
+        "rsat: Dealing with Multiplatform Satellite Images from Landsat, MODIS, and Sentinel. R package version 0.1.21.",
         "https://CRAN.R-project.org/package=rsat."),
   header = "To cite the package:"
 )

man/rsat.Rd

@@ -98,6 +98,8 @@ test_that("records test", {
   # rsat_preview(navarre,dates(navarre)[2])
   # }, error = function(e) {
   #   print(e)
+  },error = function(e) {
+    print("Offline services...")
   })
   #unlink(file.path(rtoi.path,"Navarre_rtoi"),recursive = T)
 })

man/rsat_derive.Rd

@@ -30,7 +30,7 @@ In `rsat`, **searching** means locating the satellite images of a desired data p
 
 -   [USGS](https://ers.cr.usgs.gov/register/) USGS is the sole science agency for the Department of the Interior of United States. Provide access to Modis Images. More information about USGS can be found [Here](https://www.usgs.gov/).
 -   [EarthData](https://urs.earthdata.nasa.gov): A repository of NASA's earth observation data-sets. More information about EarthData can be found [here](https://www.earthdata.nasa.gov/learn).
--   [SciHub](https://scihub.copernicus.eu/dhus/#/self-registration), a web service giving access to Copernicus' scientific data hub. Please go [here](https://scihub.copernicus.eu/) to find more details about the data hub.
+-   [Dataspace](https://dataspace.copernicus.eu/), a web service giving access to Copernicus' scientific data hub. Please go [here](https://dataspace.copernicus.eu/) to find more details about the data hub.
 
 For convenience, try to use the same *username* and *password* for all of them. To satisfy the criteria in both web services make sure that the [*username* is $4$ characters long and includes a period, number or underscore]{.ul}. The [*password* must be $12$ character long and should include characters with at least one capital letter, and numbers]{.ul}.
 
@@ -198,7 +198,7 @@ Sometimes, regions are located at the intersection of images or they are too lar
 4.  `rtoi_path`: the path to a dataset, i.e. a folder for customized/processed.
 5.  `records`: a vector of satellite records relevant for the study.
 
-As a showcase, we'll assess the effects of the [Storm Filomena](https://en.wikipedia.org/wiki/2020%E2%80%9321_European_windstorm_season#Storm_Filomena) over the Iberian peninsula in terms of snow coverage. The storm was an extreme meteorological event (largest since 1971, according to [*AEMET*](http://www.aemet.es/en/portada)). The storm swept the peninsula from January $6^{th}$ and $11^{th}$, $2021$. The code below generates a bounding box around the peninsula (`ip`) and limits the study period (`toi`) to the immediate dates after the storm:
+As a showcase, we'll assess the effects of the [Storm Filomena](https://en.wikipedia.org/wiki/2020%E2%80%9321_European_windstorm_season#Storm_Filomena) over the Iberian peninsula in terms of snow coverage. The storm was an extreme meteorological event (largest since 1971, according to [*AEMET*](https://www.aemet.es/en/portada)). The storm swept the peninsula from January $6^{th}$ and $11^{th}$, $2021$. The code below generates a bounding box around the peninsula (`ip`) and limits the study period (`toi`) to the immediate dates after the storm:
 
 ```{r roi_toi}
 ip <- st_sf(st_as_sfc(st_bbox(c(