diff --git a/DESCRIPTION b/DESCRIPTION index 170bdcd7..485c2aef 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: sen2r Type: Package Title: Find, Download and Process Sentinel-2 Data -Version: 1.4.1 +Version: 1.4.2 Authors@R: c(person("Luigi", "Ranghetti", email = "luigi@ranghetti.info", role = c("aut", "cre"), diff --git a/NEWS.md b/NEWS.md index 96402e0a..e0bfbfd4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# Version 1.4.2 + +## Bug fixes +- Fix CRAN error (invalid example). + + # Version 1.4.1 ## Minor changes diff --git a/R/s2_order.R b/R/s2_order.R index a93007e9..d76f11d3 100644 --- a/R/s2_order.R +++ b/R/s2_order.R @@ -53,11 +53,11 @@ #' \donttest{ #' # Generate the lists of products #' pos <- sf::st_sfc(sf::st_point(c(-57.8815,-51.6954)), crs = 4326) -#' time_window <- as.Date(c("2018-02-21", "2018-03-20")) +#' time_window <- as.Date(c("2019-10-21", "2019-11-20")) #' list_safe <- s2_list(spatial_extent = pos, time_interval = time_window) #' print(list_safe) -#' # (at the time the documentation was written, this list was containing 5 -#' # archives already available online and 2 stored in the Long Term Archive) +#' # (at the time the documentation was updated, this list was containing 6 +#' # archives already available online and 3 stored in the Long Term Archive) #' #' # Order the products #' ordered_prods <- s2_order(list_safe) diff --git a/R/scihub_login.R b/R/scihub_login.R index c94624bc..68ff6fbe 100644 --- a/R/scihub_login.R +++ b/R/scihub_login.R @@ -24,10 +24,14 @@ #' @note License: GPL 3.0 #' #' @examples -#' check_scihub_login("user", "user") -#' write_scihub_login("user", "user") -#' read_scihub_login() -#' check_scihub_connection() +#' \donttest{ +#' check_scihub_connection() +#' } +#' \dontrun{ +#' check_scihub_login("username", "password") +#' write_scihub_login("username", "password") +#' read_scihub_login() +#' } #' @name read_scihub_login #' @rdname scihub_login diff --git a/cran-comments.md b/cran-comments.md index 55d6307c..5b68362c 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,4 @@ -# sen2r v. 1.4.1 +# sen2r v. 1.4.2 ## Test environments * [local installation] Ubuntu 18.04, 64 bit, R 4.0.4 @@ -7,21 +7,19 @@ * [win-builder] R unstable, 4.0.4 and 3.6.3 (devel, release and oldrelease) ## R CMD check results -There were no ERRORs, WARNINGs or NOTEs. +There were no ERRORs nor WARNINGs. +There was 1 NOTE: +Days since last update: 2 + +This submission is finalised to fix an error found by CRAN checks +on the last release submitted 2 days ago (see below). ## CRAN review > Dear maintainer, Please see the problems shown on . -Please correct before 2021-03-11 to safely retain your package on CRAN. - -All the errors were fixed (they were due to #390) -(see commit 82754724fd3259b12ea1aee57a5242cfcec8438d). - -> 'Writing R Extensions' asked you not to use progress bars in -non-interactive sessions and doing so makes your erroneous output -necessarily hard to read. +Please correct before 2021-03-18 to safely retain your package on CRAN. -All progress bars were put within `if (interactive())` checks -(see commit c4f36378859d584d9c617ccdd3938d4086a05816). +The error were fixed +(see commit 6010b3f327f3c71392e47c2adc12071f50c29ee7). diff --git a/docs/404.html b/docs/404.html index b2ce4b28..710b6063 100644 --- a/docs/404.html +++ b/docs/404.html @@ -71,7 +71,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/CODE-OF-CONDUCT.html b/docs/CODE-OF-CONDUCT.html index b7c22bc1..bbde6719 100644 --- a/docs/CODE-OF-CONDUCT.html +++ b/docs/CODE-OF-CONDUCT.html @@ -71,7 +71,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/ISSUE_TEMPLATE.html b/docs/ISSUE_TEMPLATE.html index ee387fb9..28b80a70 100644 --- a/docs/ISSUE_TEMPLATE.html +++ b/docs/ISSUE_TEMPLATE.html @@ -71,7 +71,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/LICENSE.html b/docs/LICENSE.html index 61e1444b..22cf531f 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -71,7 +71,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/articles/docker.html b/docs/articles/docker.html index e1a8947f..0be4bd5b 100644 --- a/docs/articles/docker.html +++ b/docs/articles/docker.html @@ -31,7 +31,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/articles/index.html b/docs/articles/index.html index 77f0a006..a88f71bb 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -71,7 +71,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/articles/installation.html b/docs/articles/installation.html index de5b094b..be6529a3 100644 --- a/docs/articles/installation.html +++ b/docs/articles/installation.html @@ -31,7 +31,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/articles/outstructure.html b/docs/articles/outstructure.html index 619341f6..3bc3adb6 100644 --- a/docs/articles/outstructure.html +++ b/docs/articles/outstructure.html @@ -31,7 +31,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/articles/sen2r_cmd.html b/docs/articles/sen2r_cmd.html index 344b5320..c034de7e 100644 --- a/docs/articles/sen2r_cmd.html +++ b/docs/articles/sen2r_cmd.html @@ -31,7 +31,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/articles/sen2r_gui.html b/docs/articles/sen2r_gui.html index 5859cbd8..bcfbf645 100644 --- a/docs/articles/sen2r_gui.html +++ b/docs/articles/sen2r_gui.html @@ -31,7 +31,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/authors.html b/docs/authors.html index a6987726..2e78cfcf 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -71,7 +71,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/index.html b/docs/index.html index 4ad6fe5a..a993b37e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -38,7 +38,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/news/index.html b/docs/news/index.html index 6242b9a9..f0ddf56e 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -71,7 +71,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -155,9 +155,21 @@

Changelog

Source: NEWS.md +
+

+Version 1.4.2 Unreleased +

+
+

+Bug fixes

+
    +
  • Fix CRAN error (invalid example).
  • +
+
+

-Version 1.4.1 Unreleased +Version 1.4.1 2021-03-02

@@ -169,9 +181,9 @@

  • Manage error 429 for dhus (resend APIs more times in case of too many requests).
  • -
    +

    -Bug fixes

    +Bug fixes
    • Partially fix #368 (determine the output projection before processing).
    • Fix #371.
    • @@ -227,9 +239,9 @@

      Version 1.3.9 2020-10-14

      -
      +

      -Bug fixes

      +Bug fixes
      • Fix check errors due to rgdal changes in version 1.6-17.
      @@ -257,9 +269,9 @@

      build_example_param_file() now generates more recent images, 2020-08-01 instead than 2019-07-23 (this because the previous ones required two SAFE which are now on LTA); the same was done for some tests.

    -
    +

    -Bug fixes

    +Bug fixes @@ -294,9 +306,9 @@

  • The documentation site links to the personal page https://luigi.ranghetti.info/.
  • -
    +

    -Bug fixes

    +Bug fixes @@ -306,9 +318,9 @@

    Version 1.3.6 2020-06-04

    -
    +

    -Bug fixes

    +Bug fixes
    • Fix GDAL usage over Windows (a new version was specifically released for this bug because it caused sen2r stopping for many Windows users).
    @@ -342,9 +354,9 @@

  • Update documentation according to GDAL changes.
  • -
    +

    -Bug fixes

    +Bug fixes
    • Fix Travis-lwgeom incompatibilities (#319)
    • Fix #310 and #311
    • @@ -387,9 +399,9 @@

    • The new section of the vignette “Output file documentation” regarding products is linked in the GUI.
    -
    +

    -Bug fixes

    +Bug fixes
    • Re-fix #292.
    • Fix #308.
    • @@ -427,9 +439,9 @@

    • Improve the installation page.
    -
    +

    -Bug fixes

    +Bug fixes
    • Support for sf >= 0.9 (#260)
    • Patch for stars issue, made to resolve the temporary incompatibility with sf >= 0.9 (see issue #295)
    • @@ -489,9 +501,9 @@

    • Documentation was improved with three new vignettes about GUI usage, command line usage and output structure.
    -
    +

    -Bug fixes

    +Bug fixes
    • Restore checking environmental variable in init_python() (this urgent bug fixing was the reason of the urgent release of the current version).
    • Fix building offline footprint.
    • diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 57197734..cb0a1060 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -7,5 +7,5 @@ articles: outstructure: outstructure.html sen2r_cmd: sen2r_cmd.html sen2r_gui: sen2r_gui.html -last_built: 2021-03-02T07:32Z +last_built: 2021-03-04T08:18Z diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png index 77007b6a..17a35806 100644 Binary files a/docs/reference/Rplot001.png and b/docs/reference/Rplot001.png differ diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png index 4b41309e..13339d7e 100644 Binary files a/docs/reference/Rplot002.png and b/docs/reference/Rplot002.png differ diff --git a/docs/reference/abs2rel.html b/docs/reference/abs2rel.html index 49fa128b..f95f8709 100644 --- a/docs/reference/abs2rel.html +++ b/docs/reference/abs2rel.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/add_rgb_image.html b/docs/reference/add_rgb_image.html index a8ca6f1f..62e36654 100644 --- a/docs/reference/add_rgb_image.html +++ b/docs/reference/add_rgb_image.html @@ -72,7 +72,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/add_tile_suffix.html b/docs/reference/add_tile_suffix.html index 69242706..b439b79c 100644 --- a/docs/reference/add_tile_suffix.html +++ b/docs/reference/add_tile_suffix.html @@ -76,7 +76,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/build_example_param_file.html b/docs/reference/build_example_param_file.html index 94d60ad6..25f1da89 100644 --- a/docs/reference/build_example_param_file.html +++ b/docs/reference/build_example_param_file.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2
    @@ -204,7 +204,7 @@

    AuthorExamples

    build_example_param_file() -
    #> [1] "/tmp/Rtmpb6Zc1m/file32e15c576e3224_sen2r_params.json"
    +
    #> [1] "/tmp/RtmpV9ekAl/file5b0a192fb1c9_sen2r_params.json"
    diff --git a/docs/reference/check_gdal.html b/docs/reference/check_gdal.html index c4d8a9fe..d348c972 100644 --- a/docs/reference/check_gdal.html +++ b/docs/reference/check_gdal.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/check_gui_deps.html b/docs/reference/check_gui_deps.html index 916632c1..02045b21 100644 --- a/docs/reference/check_gui_deps.html +++ b/docs/reference/check_gui_deps.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/check_param_list.html b/docs/reference/check_param_list.html index 14f05b40..fbe2a528 100644 --- a/docs/reference/check_param_list.html +++ b/docs/reference/check_param_list.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/check_sen2r_deps.html b/docs/reference/check_sen2r_deps.html index 7e6c30d9..85a0d011 100644 --- a/docs/reference/check_sen2r_deps.html +++ b/docs/reference/check_sen2r_deps.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/compute_s2_paths.html b/docs/reference/compute_s2_paths.html index 2b6a070a..fecd2940 100644 --- a/docs/reference/compute_s2_paths.html +++ b/docs/reference/compute_s2_paths.html @@ -81,7 +81,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/comsub.html b/docs/reference/comsub.html index 4929ee32..8790c02f 100644 --- a/docs/reference/comsub.html +++ b/docs/reference/comsub.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/create_indices_db.html b/docs/reference/create_indices_db.html index e954687c..e8033138 100644 --- a/docs/reference/create_indices_db.html +++ b/docs/reference/create_indices_db.html @@ -78,7 +78,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/create_s2_dop.html b/docs/reference/create_s2_dop.html index 1ce10e1b..8a82ef7c 100644 --- a/docs/reference/create_s2_dop.html +++ b/docs/reference/create_s2_dop.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/dontuse.html b/docs/reference/dontuse.html index 2a707358..68038e0c 100644 --- a/docs/reference/dontuse.html +++ b/docs/reference/dontuse.html @@ -72,7 +72,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/expand_path.html b/docs/reference/expand_path.html index c0b6bbb1..1cfe553b 100644 --- a/docs/reference/expand_path.html +++ b/docs/reference/expand_path.html @@ -77,7 +77,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/expect_equal_crs.html b/docs/reference/expect_equal_crs.html index a48669de..578688d5 100644 --- a/docs/reference/expect_equal_crs.html +++ b/docs/reference/expect_equal_crs.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/fix_envi_format.html b/docs/reference/fix_envi_format.html index d32bdb90..639b22fb 100644 --- a/docs/reference/fix_envi_format.html +++ b/docs/reference/fix_envi_format.html @@ -81,7 +81,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/gdalUtil.html b/docs/reference/gdalUtil.html index abc8b4b7..abfb4351 100644 --- a/docs/reference/gdalUtil.html +++ b/docs/reference/gdalUtil.html @@ -76,7 +76,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/gdal_abs2rel_rel2abs.html b/docs/reference/gdal_abs2rel_rel2abs.html index b10f9d62..651b2383 100644 --- a/docs/reference/gdal_abs2rel_rel2abs.html +++ b/docs/reference/gdal_abs2rel_rel2abs.html @@ -81,7 +81,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/gdal_warp.html b/docs/reference/gdal_warp.html index aa7a79c8..46f97d1b 100644 --- a/docs/reference/gdal_warp.html +++ b/docs/reference/gdal_warp.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/gdalwarp_grid.html b/docs/reference/gdalwarp_grid.html index d481302e..0c65e08f 100644 --- a/docs/reference/gdalwarp_grid.html +++ b/docs/reference/gdalwarp_grid.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/gipp.html b/docs/reference/gipp.html index fa548f62..46b4b479 100644 --- a/docs/reference/gipp.html +++ b/docs/reference/gipp.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -232,26 +232,35 @@

    Examp
    # \donttest{ # Read default values read_gipp(c("dem_directory", "dem_reference")) -
    #> Error: -#> Sen2Cor was not yet installed; install it using function -#> install_sen2cor() (command line) or check_sen2r_deps() (GUI).
    # Set the use of a topographic correction +
    #> $dem_directory +#> [1] "NONE" +#> +#> $dem_reference +#> [1] "http://data_public:GDdci@data.cgiar-csi.org/srtm/tiles/GeoTIFF/" +#>
    # Set the use of a topographic correction set_gipp(use_dem = TRUE, gipp_path = gipp_temp <- tempfile()) -
    #> Error: -#> Sen2Cor was not yet installed; install it using function -#> install_sen2cor() (command line) or check_sen2r_deps() (GUI).
    # Read the parameters in the created temporary files +# Read the parameters in the created temporary files read_gipp(c("DEM_Directory", "DEM_Reference"), gipp_path = gipp_temp) -
    #> Error in normalizePath(path, ...): path[1]="/tmp/Rtmpb6Zc1m/file32e15ca2f8e69": File o directory non esistente
    # Set not to use a topographic correction +
    #> $DEM_Directory +#> [1] "/home/lranghetti/.sen2r/srtm90" +#> +#> $DEM_Reference +#> [1] "http://data_public:GDdci@data.cgiar-csi.org/srtm/tiles/GeoTIFF/" +#>
    # Set not to use a topographic correction set_gipp(use_dem = FALSE, gipp_path = gipp_temp <- tempfile()) -
    #> Error: -#> Sen2Cor was not yet installed; install it using function -#> install_sen2cor() (command line) or check_sen2r_deps() (GUI).
    # This is equivalent to: +# This is equivalent to: # set_gipp( # list(DEM_Directory = NA, DEM_Reference = NA), # gipp_path = gipp_temp <- tempfile() # ) # Read again the parameters in the created temporary files read_gipp(c("DEM_Directory", "DEM_Reference"), gipp_path = gipp_temp) -
    #> Error in normalizePath(path, ...): path[1]="/tmp/Rtmpb6Zc1m/file32e15c7f0bdd09": File o directory non esistente
    # } +
    #> $DEM_Directory +#> [1] "NONE" +#> +#> $DEM_Reference +#> [1] "http://data_public:GDdci@data.cgiar-csi.org/srtm/tiles/GeoTIFF/" +#>
    # }
    diff --git a/docs/reference/give_write_permission.html b/docs/reference/give_write_permission.html index b22a2c96..61ca2e1b 100644 --- a/docs/reference/give_write_permission.html +++ b/docs/reference/give_write_permission.html @@ -76,7 +76,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/ignorelist.html b/docs/reference/ignorelist.html index 50f36795..63c3db7f 100644 --- a/docs/reference/ignorelist.html +++ b/docs/reference/ignorelist.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/index.html b/docs/reference/index.html index a466bc50..6e7dbd6d 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -71,7 +71,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/init_python.html b/docs/reference/init_python.html index bb508aed..ea2d55ee 100644 --- a/docs/reference/init_python.html +++ b/docs/reference/init_python.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/install_aria2.html b/docs/reference/install_aria2.html index df201c84..c633a676 100644 --- a/docs/reference/install_aria2.html +++ b/docs/reference/install_aria2.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/install_sen2cor.html b/docs/reference/install_sen2cor.html index 68fc6944..b7d8f965 100644 --- a/docs/reference/install_sen2cor.html +++ b/docs/reference/install_sen2cor.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/list_indices.html b/docs/reference/list_indices.html index 031de4f2..0590c2fc 100644 --- a/docs/reference/list_indices.html +++ b/docs/reference/list_indices.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/load_binpaths.html b/docs/reference/load_binpaths.html index c015e630..a5e56dd3 100644 --- a/docs/reference/load_binpaths.html +++ b/docs/reference/load_binpaths.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -211,6 +211,9 @@

    Examp #> $aria2c #> [1] "/usr/bin/aria2c" #> +#> $sen2cor +#> [1] "/home/lranghetti/.sen2r/sen2cor/bin/L2A_Process" +#> #> attr(,"path") #> [1] "/home/lranghetti/.sen2r/paths.json"
    # } diff --git a/docs/reference/load_extent.html b/docs/reference/load_extent.html index 763dba3f..7b6e1b75 100644 --- a/docs/reference/load_extent.html +++ b/docs/reference/load_extent.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/mountpoint.html b/docs/reference/mountpoint.html index e95e7eb7..879272e4 100644 --- a/docs/reference/mountpoint.html +++ b/docs/reference/mountpoint.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/nn.html b/docs/reference/nn.html index b669c75a..af95abe1 100644 --- a/docs/reference/nn.html +++ b/docs/reference/nn.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/normalize_path.html b/docs/reference/normalize_path.html index 93c0a1d3..539acebd 100644 --- a/docs/reference/normalize_path.html +++ b/docs/reference/normalize_path.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/path_check.html b/docs/reference/path_check.html index 9ee79792..4ca79fe6 100644 --- a/docs/reference/path_check.html +++ b/docs/reference/path_check.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/print_message.html b/docs/reference/print_message.html index 1626e031..3923c8eb 100644 --- a/docs/reference/print_message.html +++ b/docs/reference/print_message.html @@ -72,7 +72,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/projpar.html b/docs/reference/projpar.html index 2d22e2b2..a4a947f8 100644 --- a/docs/reference/projpar.html +++ b/docs/reference/projpar.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/raster2rgb.html b/docs/reference/raster2rgb.html index fa85485a..d7f11fc7 100644 --- a/docs/reference/raster2rgb.html +++ b/docs/reference/raster2rgb.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/raster_metadata.html b/docs/reference/raster_metadata.html index 77d8ac6a..8e126925 100644 --- a/docs/reference/raster_metadata.html +++ b/docs/reference/raster_metadata.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/s2_calcindices.html b/docs/reference/s2_calcindices.html index c2080057..eee7db80 100644 --- a/docs/reference/s2_calcindices.html +++ b/docs/reference/s2_calcindices.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -349,8 +349,8 @@

    Examp outdir = tempdir(), dataType = "Float32" ) -
    #> Carico il pacchetto richiesto: sp
    #> Carico il pacchetto richiesto: abind
    #> Carico il pacchetto richiesto: sf
    #> Linking to GEOS 3.8.1, GDAL 3.0.4, PROJ 6.3.2
    #> [2021-03-02 08:33:00] Computing index EVI on date 2019-07-23...
    ex_out -
    #> [1] "/tmp/Rtmpb6Zc1m/S2A2A_20190723_022_Barbellino_EVI_10.tif"
    +
    #> Carico il pacchetto richiesto: sp
    #> Carico il pacchetto richiesto: abind
    #> Carico il pacchetto richiesto: sf
    #> Linking to GEOS 3.8.1, GDAL 3.0.4, PROJ 6.3.2
    #> [2021-03-04 09:19:22] Computing index EVI on date 2019-07-23...
    ex_out +
    #> [1] "/tmp/RtmpV9ekAl/S2A2A_20190723_022_Barbellino_EVI_10.tif"
    # Show output oldpar <- par(mfrow = c(1,2), mar = rep(0,4)) image(stars::read_stars(ex_in), rgb = 4:2, maxColorValue = 3500, useRaster = TRUE) diff --git a/docs/reference/s2_defNA.html b/docs/reference/s2_defNA.html index 6151ceba..3acc0d00 100644 --- a/docs/reference/s2_defNA.html +++ b/docs/reference/s2_defNA.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/s2_dop.html b/docs/reference/s2_dop.html index 3c2de0d5..2e589574 100644 --- a/docs/reference/s2_dop.html +++ b/docs/reference/s2_dop.html @@ -81,7 +81,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -232,17 +232,17 @@

    Examp
    # All the passages in a cycle of 10 days over all the orbits s2_dop()
    #> date mission orbit -#> 1: 2021-03-02 2A 001 -#> 2: 2021-03-02 2A 131 -#> 3: 2021-03-02 2A 132 -#> 4: 2021-03-02 2A 133 -#> 5: 2021-03-02 2A 134 +#> 1: 2021-03-04 2A 016 +#> 2: 2021-03-04 2A 017 +#> 3: 2021-03-04 2A 018 +#> 4: 2021-03-04 2A 019 +#> 5: 2021-03-04 2A 020 #> --- -#> 282: 2021-03-11 2B 054 -#> 283: 2021-03-11 2B 055 -#> 284: 2021-03-11 2B 056 -#> 285: 2021-03-11 2B 057 -#> 286: 2021-03-11 2B 058
    +#> 282: 2021-03-13 2B 083 +#> 283: 2021-03-13 2B 084 +#> 284: 2021-03-13 2B 085 +#> 285: 2021-03-13 2B 086 +#> 286: 2021-03-13 2B 087
    # The passages in the current month over two orbits s2_dop(c("022", "065"), "this month")
    #> date mission orbit @@ -263,11 +263,11 @@

    Examp

    #> [1] "2021-03-04" "2021-03-14" "2021-03-24" "2021-04-03"
    # The date in which Sentinel-2A would be passed in the last 10 days over one orbit s2_dop("022", "-10 days", mission = "2A")$date -
    #> [1] "2021-02-22"
    +
    #> [1] "2021-03-04"
    # All the orbits covered today s2_dop(timewindow = Sys.Date(), mission = "2B")$orbit -
    #> [1] "059" "060" "061" "062" "063" "064" "065" "066" "067" "068" "069" "070" -#> [13] "071" "072"
    +
    #> [1] "088" "089" "090" "091" "092" "093" "094" "095" "096" "097" "098" "099" +#> [13] "100" "101"
    # The passages in a fixed time window for one orbit s2_dop(65, as.Date(c("2018-08-01", "2018-08-31")))
    #> date mission orbit diff --git a/docs/reference/s2_download.html b/docs/reference/s2_download.html index a4cc4b31..06b17dae 100644 --- a/docs/reference/s2_download.html +++ b/docs/reference/s2_download.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/s2_gui.html b/docs/reference/s2_gui.html index 58a509bf..17f04f93 100644 --- a/docs/reference/s2_gui.html +++ b/docs/reference/s2_gui.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/s2_list.html b/docs/reference/s2_list.html index 300f09c3..1b04964b 100644 --- a/docs/reference/s2_list.html +++ b/docs/reference/s2_list.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/s2_mask.html b/docs/reference/s2_mask.html index 6499c97d..6be76281 100644 --- a/docs/reference/s2_mask.html +++ b/docs/reference/s2_mask.html @@ -77,7 +77,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -409,9 +409,9 @@

    Examp mask_type = "land", outdir = tempdir() ) -
    #> [2021-03-02 08:33:16] Masking file +
    #> [2021-03-04 09:19:34] Masking file #> S2A2A_20190723_022_Barbellino_RGB432B_10.tif...
    ex_out -
    #> [1] "/tmp/Rtmpb6Zc1m/S2A2A_20190723_022_Barbellino_RGB432B_10.tif" +
    #> [1] "/tmp/RtmpV9ekAl/S2A2A_20190723_022_Barbellino_RGB432B_10.tif" #> attr(,"toomasked") #> character(0)
    # Show output diff --git a/docs/reference/s2_merge.html b/docs/reference/s2_merge.html index 3f0acafe..0779b8cf 100644 --- a/docs/reference/s2_merge.html +++ b/docs/reference/s2_merge.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/s2_order.html b/docs/reference/s2_order.html index 255789ce..f7739e1d 100644 --- a/docs/reference/s2_order.html +++ b/docs/reference/s2_order.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -253,48 +253,52 @@

    Examp
    # \donttest{ # Generate the lists of products pos <- sf::st_sfc(sf::st_point(c(-57.8815,-51.6954)), crs = 4326) -time_window <- as.Date(c("2018-02-21", "2018-03-20")) +time_window <- as.Date(c("2019-10-21", "2019-11-20")) list_safe <- s2_list(spatial_extent = pos, time_interval = time_window)
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    print(list_safe) -
    #> A named vector with 7 SAFE archives. -#> S2B_MSIL1C_20180224T133629_N0206_R038_T21FVC_20180224T194845.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('c88086ac-8087-4adb-866e-baeffec5eb68')/$value" -#> S2B_MSIL1C_20180227T134629_N0206_R081_T21FVC_20180227T200327.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('fa8cba66-7b8b-45aa-9038-9521d7658bad')/$value" -#> S2A_MSIL1C_20180301T133641_N0206_R038_T21FVC_20180301T145524.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('d9a50ba4-8213-421e-92da-e5a487766dc2')/$value" -#> S2B_MSIL1C_20180306T133629_N0206_R038_T21FVC_20180306T183210.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('5ae358f2-8589-493b-bb6d-09df04ec0ff9')/$value" -#> S2A_MSIL1C_20180311T133641_N0206_R038_T21FVC_20180311T163528.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('266e369c-9ab5-486e-83b3-7180b6956616')/$value" -#> ...with 2 more elements. -#> The following attributes are included: mission, level, id_tile, id_orbit, sensing_datetime, ingestion_datetime, clouds, footprint, uuid, online.
    # (at the time the documentation was written, this list was containing 5 -# archives already available online and 2 stored in the Long Term Archive) +
    #> A named vector with 9 SAFE archives. +#> S2A_MSIL2A_20191022T133641_N0213_R038_T21FVC_20191023T155120.SAFE +#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('d76c8a00-3b7f-45a2-b359-fc363c388a94')/$value" +#> S2B_MSIL2A_20191027T133639_N0213_R038_T21FVC_20191027T150854.SAFE +#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('03cb6cbc-e858-4e40-ae37-d1872c957762')/$value" +#> S2B_MSIL2A_20191030T134639_N0213_R081_T21FVC_20191030T152504.SAFE +#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('ed6aeeb1-f721-4aed-9a85-b37708f7149d')/$value" +#> S2A_MSIL2A_20191101T133641_N0213_R038_T21FVC_20191101T150755.SAFE +#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('a52c1f7b-aa21-4055-9541-95aa2ec28bdb')/$value" +#> S2B_MSIL2A_20191106T133639_N0213_R038_T21FVC_20191106T150814.SAFE +#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('091bc063-4978-4b28-8664-c5189d71e64b')/$value" +#> ...with 4 more elements. +#> The following attributes are included: mission, level, id_tile, id_orbit, sensing_datetime, ingestion_datetime, clouds, footprint, uuid, online.
    # (at the time the documentation was updated, this list was containing 6 +# archives already available online and 3 stored in the Long Term Archive) # Order the products ordered_prods <- s2_order(list_safe) -
    #> [2021-03-02 08:33:39] Check if products are already available for -#> download...
    #> [2021-03-02 08:33:40] Ordering 7 Sentinel-2 images stored in the Long -#> Term Archive...
    #> [2021-03-02 08:33:46] 7 of 7 Sentinel-2 images were correctly ordered. +
    #> [2021-03-04 09:32:47] Check if products are already available for +#> download...
    #> [2021-03-04 09:32:48] 6 Sentinel-2 images are already online.
    #> [2021-03-04 09:32:48] Ordering 3 Sentinel-2 images stored in the Long +#> Term Archive...
    #> [2021-03-04 09:32:52] 3 of 3 Sentinel-2 images were correctly ordered. #> You can check at a later time if the ordered products are #> available online using the command: -#>   safe_is_online("/home/lranghetti/.sen2r/lta_orders/lta_20210302_083346.json")
    +#>   safe_is_online("/home/lranghetti/.sen2r/lta_orders/lta_20210304_093252.json")
    # Check in a second time if the product was made available (order_path <- attr(ordered_prods, "path")) -
    #> [1] "/home/lranghetti/.sen2r/lta_orders/lta_20210302_083346.json"
    safe_is_online(order_path) -
    #> 0 out of 7 products are online.
    #> S2B_MSIL1C_20180224T133629_N0206_R038_T21FVC_20180224T194845.SAFE +
    #> [1] "/home/lranghetti/.sen2r/lta_orders/lta_20210304_093252.json"
    safe_is_online(order_path) +
    #> 6 out of 9 products are online.
    #> S2A_MSIL2A_20191101T133641_N0213_R038_T21FVC_20191101T150755.SAFE +#> TRUE +#> S2B_MSIL2A_20191106T133639_N0213_R038_T21FVC_20191106T150814.SAFE +#> TRUE +#> S2B_MSIL2A_20191109T134639_N0213_R081_T21FVC_20191109T152703.SAFE +#> TRUE +#> S2A_MSIL2A_20191111T133641_N0213_R038_T21FVC_20191111T150452.SAFE +#> TRUE +#> S2B_MSIL2A_20191116T133639_N0213_R038_T21FVC_20191116T145355.SAFE +#> TRUE +#> S2B_MSIL2A_20191119T134639_N0213_R081_T21FVC_20191119T152133.SAFE +#> TRUE +#> S2A_MSIL2A_20191022T133641_N0213_R038_T21FVC_20191023T155120.SAFE #> FALSE -#> S2B_MSIL1C_20180227T134629_N0206_R081_T21FVC_20180227T200327.SAFE +#> S2B_MSIL2A_20191027T133639_N0213_R038_T21FVC_20191027T150854.SAFE #> FALSE -#> S2A_MSIL1C_20180301T133641_N0206_R038_T21FVC_20180301T145524.SAFE -#> FALSE -#> S2B_MSIL1C_20180306T133629_N0206_R038_T21FVC_20180306T183210.SAFE -#> FALSE -#> S2A_MSIL1C_20180311T133641_N0206_R038_T21FVC_20180311T163528.SAFE -#> FALSE -#> S2A_MSIL1C_20180314T134631_N0206_R081_T21FVC_20180314T150724.SAFE -#> FALSE -#> S2B_MSIL1C_20180316T133639_N0206_R038_T21FVC_20180316T145348.SAFE +#> S2B_MSIL2A_20191030T134639_N0213_R081_T21FVC_20191030T152504.SAFE #> FALSE
    # }
    diff --git a/docs/reference/s2_rgb.html b/docs/reference/s2_rgb.html index 22fddedb..2d4e51f2 100644 --- a/docs/reference/s2_rgb.html +++ b/docs/reference/s2_rgb.html @@ -72,7 +72,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -326,11 +326,11 @@

    Examp outdir = tempdir(), compress = 50 ) -
    #> [2021-03-02 08:33:48] Generating image -#> S2A2A_20190723_022_Barbellino_RGBb84B_10.tif...
    #> [2021-03-02 08:33:54] Generating image +
    #> [2021-03-04 09:20:09] Generating image +#> S2A2A_20190723_022_Barbellino_RGBb84B_10.tif...
    #> [2021-03-04 09:20:14] Generating image #> S2A2A_20190723_022_Barbellino_RGB954B_10.tif...
    #> 2 output RGB files were correctly created.
    ex_out -
    #> [1] "/tmp/Rtmpb6Zc1m/RGBb84B/S2A2A_20190723_022_Barbellino_RGBb84B_10.tif" -#> [2] "/tmp/Rtmpb6Zc1m/RGB954B/S2A2A_20190723_022_Barbellino_RGB954B_10.tif"
    +
    #> [1] "/tmp/RtmpV9ekAl/RGBb84B/S2A2A_20190723_022_Barbellino_RGBb84B_10.tif" +#> [2] "/tmp/RtmpV9ekAl/RGB954B/S2A2A_20190723_022_Barbellino_RGB954B_10.tif"
    # Show output oldpar <- par(mfrow = c(1,3), mar = rep(0,4)) image(stars::read_stars(ex_in), rgb = 4:2, maxColorValue = 3500, useRaster = TRUE) diff --git a/docs/reference/s2_thumbnails.html b/docs/reference/s2_thumbnails.html index 2204823b..7df81492 100644 --- a/docs/reference/s2_thumbnails.html +++ b/docs/reference/s2_thumbnails.html @@ -77,7 +77,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/s2_tiles.html b/docs/reference/s2_tiles.html index 9a21f4ab..3f403d76 100644 --- a/docs/reference/s2_tiles.html +++ b/docs/reference/s2_tiles.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -195,11 +195,11 @@

    Examp httr::write_disk(ch_path <- tempfile()) )
    #> Response [https://raw.githubusercontent.com/ranghetti/sen2r/master/utils/vector/ch_bound.rds] -#> Date: 2021-03-02 07:38 +#> Date: 2021-03-04 08:25 #> Status: 200 #> Content-Type: application/octet-stream #> Size: 43.8 kB -#> <ON DISK> /tmp/Rtmpb6Zc1m/file32e15c4254a364
    ch <- readRDS(ch_path) +#> <ON DISK> /tmp/RtmpV9ekAl/file5b0a6011fd9c
    ch <- readRDS(ch_path) s2tiles_ch <- s2tiles[suppressMessages(sf::st_intersects(ch, s2tiles))[[1]],] s2_coords <- sf::st_coordinates(suppressWarnings(sf::st_centroid(s2tiles_ch))) diff --git a/docs/reference/s2_translate.html b/docs/reference/s2_translate.html index 9daac048..6ae19e41 100644 --- a/docs/reference/s2_translate.html +++ b/docs/reference/s2_translate.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/safe_getMetadata.html b/docs/reference/safe_getMetadata.html index 8771ced4..119fdf2a 100644 --- a/docs/reference/safe_getMetadata.html +++ b/docs/reference/safe_getMetadata.html @@ -77,7 +77,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/safe_is_online.html b/docs/reference/safe_is_online.html index 87a61a34..ce5e57cd 100644 --- a/docs/reference/safe_is_online.html +++ b/docs/reference/safe_is_online.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/safe_shortname.html b/docs/reference/safe_shortname.html index 50693d39..a18e1004 100644 --- a/docs/reference/safe_shortname.html +++ b/docs/reference/safe_shortname.html @@ -77,7 +77,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/safelist-class.html b/docs/reference/safelist-class.html index 6b5133d9..97bdc388 100644 --- a/docs/reference/safelist-class.html +++ b/docs/reference/safelist-class.html @@ -88,7 +88,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/scihub_login.html b/docs/reference/scihub_login.html index febf46ea..6cb71b49 100644 --- a/docs/reference/scihub_login.html +++ b/docs/reference/scihub_login.html @@ -77,7 +77,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -247,12 +247,15 @@

    AuthorLorenzo Busetto, phD (2019)

    Examples

    -
    check_scihub_login("user", "user") -
    #> [1] TRUE
    write_scihub_login("user", "user") - read_scihub_login() -
    #> [,1] [,2] -#> [1,] "user" "user"
    check_scihub_connection() -
    #> [1] TRUE
    +
    # \donttest{ +check_scihub_connection() +
    #> [1] TRUE
    # } +if (FALSE) { +check_scihub_login("username", "password") +write_scihub_login("username", "password") +read_scihub_login() +} +
    diff --git a/docs/reference/sen2r.html b/docs/reference/sen2r.html index 9df8d50a..33c6451f 100644 --- a/docs/reference/sen2r.html +++ b/docs/reference/sen2r.html @@ -76,7 +76,7 @@ sen2r - 1.4.1 + 1.4.2 @@ -758,27 +758,28 @@

    Examp if (interactive()) { sen2r() } -
    #> [2021-03-02 08:38:32] #### Starting sen2r execution. ####
    #> [2021-03-02 08:38:32] Launching GUI...
    #> Loading required package: shiny
    #> -#> Listening on http://127.0.0.1:5413
    #> [2021-03-02 08:38:39] Program interrupted by the user (GUI closed).
    + # Launch a processing from a saved JSON file (here we use an internal function # to create a testing json file - this is not intended to be used by final users) json_path <- build_example_param_file() out_paths_2 <- sen2r(json_path) -
    #> [2021-03-02 08:38:39] #### Starting sen2r execution. ####
    #> [2021-03-02 08:38:40] Searching for available SAFE products on -#> SciHub...
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> [2021-03-02 08:38:42] Computing output names...
    #> [2021-03-02 08:38:43] Starting to download the required level-2A SAFE +
    #> [2021-03-04 09:20:49] #### Starting sen2r execution. ####
    #> Loading required namespace: stringi
    #> Registered S3 method overwritten by 'geojsonlint': +#> method from +#> print.location dplyr
    #> [2021-03-04 09:20:50] Searching for available SAFE products on +#> SciHub...
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> [2021-03-04 09:20:52] Computing output names...
    #> [2021-03-04 09:20:53] Starting to download the required level-2A SAFE #> products.
    #> Images #> S2B_MSIL2A_20200801T100559_N0214_R022_T32TNS_20200801T135302.SAFE are #> already on your system and will be skipped. Set "overwrite_safe" to -#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-03-02 08:38:43] Download of level-2A SAFE products terminated.
    #> [2021-03-02 08:38:43] Starting to download the required level-1C SAFE -#> products.
    #> No L1C images are needed.
    #> [2021-03-02 08:38:43] Download of level-1C SAFE products terminated.
    #> [2021-03-02 08:38:43] Updating output names...
    #> [2021-03-02 08:38:43] Starting to translate SAFE products in custom -#> format.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> [2021-03-02 08:38:44] Starting to merge tiles by orbit.
    #> Using projection "EPSG:32632".
    #> [2021-03-02 08:38:44] Starting to edit geometry (clip, reproject, -#> rescale).
    #> [2021-03-02 08:38:45] Producing required RGB images.
    #> [2021-03-02 08:38:45] Generating image -#> S2B2A_20200801_022_sen2r_RGB432B_10.tif...
    #> [2021-03-02 08:38:54] Generating image -#> S2B2A_20200801_022_sen2r_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-03-02 08:39:23] Computing required spectral indices.
    #> [2021-03-02 08:39:23] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-03-02 08:39:33] Computing index NDVI on date 2020-08-01...
    #> [2021-03-02 08:39:42] Generating thumbnails.
    #> 6 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════ +#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-03-04 09:20:53] Download of level-2A SAFE products terminated.
    #> [2021-03-04 09:20:53] Starting to download the required level-1C SAFE +#> products.
    #> No L1C images are needed.
    #> [2021-03-04 09:20:53] Download of level-1C SAFE products terminated.
    #> [2021-03-04 09:20:53] Updating output names...
    #> [2021-03-04 09:20:54] Starting to translate SAFE products in custom +#> format.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> [2021-03-04 09:20:54] Starting to merge tiles by orbit.
    #> Using projection "EPSG:32632".
    #> [2021-03-04 09:20:54] Starting to edit geometry (clip, reproject, +#> rescale).
    #> [2021-03-04 09:20:55] Producing required RGB images.
    #> [2021-03-04 09:20:55] Generating image +#> S2B2A_20200801_022_sen2r_RGB432B_10.tif...
    #> [2021-03-04 09:21:01] Generating image +#> S2B2A_20200801_022_sen2r_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-03-04 09:21:18] Computing required spectral indices.
    #> [2021-03-04 09:21:18] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-03-04 09:21:23] Computing index NDVI on date 2020-08-01...
    #> [2021-03-04 09:21:29] Generating thumbnails.
    #> 6 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════ #> ║ sen2r Processing Report -#> ╟──────────────────────────────────────────────────────────────────────
    #> ║ Dates to be processed based on processing parameters: 1
    #> ║ Processing completed for: all expected dates.
    #> ╚══════════════════════════════════════════════════════════════════════
    #> [2021-03-02 08:39:53] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command: -#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210302_083840.json")
    # Notice that passing the path of a JSON file results in launching +#> ╟──────────────────────────────────────────────────────────────────────
    #> ║ Dates to be processed based on processing parameters: 1
    #> ║ Processing completed for: all expected dates.
    #> ╚══════════════════════════════════════════════════════════════════════
    #> [2021-03-04 09:21:35] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command: +#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210304_092049.json")
    # Notice that passing the path of a JSON file results in launching # a session without opening the gui, unless gui = TRUE is passed. # Launch a processing using function arguments @@ -799,26 +800,26 @@

    Examp path_l2a = safe_dir, path_out = out_dir_3 ) -

    #> [2021-03-02 08:39:53] #### Starting sen2r execution. ####
    #> [2021-03-02 08:39:54] Searching for available SAFE products on -#> SciHub...
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> [2021-03-02 08:39:56] Computing output names...
    #> [2021-03-02 08:39:57] Starting to download the required level-2A SAFE +
    #> [2021-03-04 09:21:36] #### Starting sen2r execution. ####
    #> [2021-03-04 09:21:36] Searching for available SAFE products on +#> SciHub...
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> [2021-03-04 09:21:40] Computing output names...
    #> [2021-03-04 09:21:41] Starting to download the required level-2A SAFE #> products.
    #> Images #> S2B_MSIL2A_20200801T100559_N0214_R022_T32TNS_20200801T135302.SAFE are #> already on your system and will be skipped. Set "overwrite_safe" to -#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-03-02 08:39:57] Download of level-2A SAFE products terminated.
    #> [2021-03-02 08:39:57] Starting to download the required level-1C SAFE +#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-03-04 09:21:41] Download of level-2A SAFE products terminated.
    #> [2021-03-04 09:21:41] Starting to download the required level-1C SAFE #> products.
    #> Images #> S2B_MSIL1C_20200801T100559_N0209_R022_T32TNS_20200801T130136.SAFE are #> already on your system and will be skipped. Set "overwrite_safe" to -#> TRUE to re-download them.
    #> No L1C images are needed.
    #> [2021-03-02 08:39:57] Download of level-1C SAFE products terminated.
    #> [2021-03-02 08:39:57] Updating output names...
    #> [2021-03-02 08:39:57] Starting to translate SAFE products in custom -#> format.
    #> Using UTM zone 32N.
    #> 1 output files were correctly created.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> [2021-03-02 08:39:58] Starting to merge tiles by orbit.
    #> Using projection "EPSG:32632".
    #> [2021-03-02 08:39:59] Starting to edit geometry (clip, reproject, -#> rescale).
    #> [2021-03-02 08:39:59] Starting to apply cloud masks.
    #> [2021-03-02 08:39:59] Masking file -#> S2B1C_20200801_022_Barbellino_TOA_10.tif...
    #> [2021-03-02 08:40:08] Masking file -#> S2B2A_20200801_022_Barbellino_BOA_10.tif...
    #> [2021-03-02 08:40:17] Producing required RGB images.
    #> [2021-03-02 08:40:17] Generating image -#> S2B1C_20200801_022_Barbellino_RGB432T_10.tif...
    #> 1 output RGB files were correctly created.
    #> [2021-03-02 08:40:27] Generating image -#> S2B2A_20200801_022_Barbellino_RGB432B_10.tif...
    #> [2021-03-02 08:40:37] Generating image -#> S2B2A_20200801_022_Barbellino_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-03-02 08:41:07] Computing required spectral indices.
    #> [2021-03-02 08:41:07] Computing index NDVI on date 2020-08-01...
    #> [2021-03-02 08:41:08] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-03-02 08:41:09] Generating thumbnails.
    #> 8 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════ +#> TRUE to re-download them.
    #> No L1C images are needed.
    #> [2021-03-04 09:21:41] Download of level-1C SAFE products terminated.
    #> [2021-03-04 09:21:41] Updating output names...
    #> [2021-03-04 09:21:41] Starting to translate SAFE products in custom +#> format.
    #> Using UTM zone 32N.
    #> 1 output files were correctly created.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> [2021-03-04 09:21:42] Starting to merge tiles by orbit.
    #> Using projection "EPSG:32632".
    #> [2021-03-04 09:21:42] Starting to edit geometry (clip, reproject, +#> rescale).
    #> [2021-03-04 09:21:43] Starting to apply cloud masks.
    #> [2021-03-04 09:21:43] Masking file +#> S2B1C_20200801_022_Barbellino_TOA_10.tif...
    #> [2021-03-04 09:21:49] Masking file +#> S2B2A_20200801_022_Barbellino_BOA_10.tif...
    #> [2021-03-04 09:21:55] Producing required RGB images.
    #> [2021-03-04 09:21:55] Generating image +#> S2B1C_20200801_022_Barbellino_RGB432T_10.tif...
    #> 1 output RGB files were correctly created.
    #> [2021-03-04 09:22:01] Generating image +#> S2B2A_20200801_022_Barbellino_RGB432B_10.tif...
    #> [2021-03-04 09:22:07] Generating image +#> S2B2A_20200801_022_Barbellino_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-03-04 09:22:23] Computing required spectral indices.
    #> [2021-03-04 09:22:24] Computing index NDVI on date 2020-08-01...
    #> [2021-03-04 09:22:24] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-03-04 09:22:25] Generating thumbnails.
    #> 8 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════ #> ║ sen2r Processing Report -#> ╟──────────────────────────────────────────────────────────────────────
    #> ║ Dates to be processed based on processing parameters: 1
    #> ║ Processing completed for: all expected dates.
    #> ╚══════════════════════════════════════════════════════════════════════
    #> [2021-03-02 08:41:29] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command: -#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210302_083953.json")
    +#> ╟──────────────────────────────────────────────────────────────────────
    #> ║ Dates to be processed based on processing parameters: 1
    #> ║ Processing completed for: all expected dates.
    #> ╚══════════════════════════════════════════════════════════════════════
    #> [2021-03-04 09:22:36] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command: +#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210304_092136.json")
    # Launch a processing based on a JSON file, but changing some parameters # (e.g., the same processing on a different extent) out_dir_4 <- tempfile(pattern = "Scalve_") @@ -828,21 +829,21 @@

    Examp extent_name = "Scalve", path_out = out_dir_4 ) -

    #> [2021-03-02 08:41:29] #### Starting sen2r execution. ####
    #> [2021-03-02 08:41:30] Searching for available SAFE products on -#> SciHub...
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> [2021-03-02 08:41:33] Computing output names...
    #> [2021-03-02 08:41:33] Starting to download the required level-2A SAFE +
    #> [2021-03-04 09:22:37] #### Starting sen2r execution. ####
    #> [2021-03-04 09:22:37] Searching for available SAFE products on +#> SciHub...
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> [2021-03-04 09:22:40] Computing output names...
    #> [2021-03-04 09:22:41] Starting to download the required level-2A SAFE #> products.
    #> Images #> S2B_MSIL2A_20200801T100559_N0214_R022_T32TNR_20200801T135302.SAFE, #> S2B_MSIL2A_20200801T100559_N0214_R022_T32TNS_20200801T135302.SAFE are #> already on your system and will be skipped. Set "overwrite_safe" to -#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-03-02 08:41:33] Download of level-2A SAFE products terminated.
    #> [2021-03-02 08:41:33] Starting to download the required level-1C SAFE -#> products.
    #> No L1C images are needed.
    #> [2021-03-02 08:41:33] Download of level-1C SAFE products terminated.
    #> [2021-03-02 08:41:33] Updating output names...
    #> [2021-03-02 08:41:34] Starting to translate SAFE products in custom -#> format.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> [2021-03-02 08:41:34] Starting to merge tiles by orbit.
    #> Using projection "EPSG:32632".
    #> [2021-03-02 08:41:35] Starting to edit geometry (clip, reproject, -#> rescale).
    #> [2021-03-02 08:41:41] Producing required RGB images.
    #> [2021-03-02 08:41:41] Generating image -#> S2B2A_20200801_022_Scalve_RGB432B_10.tif...
    #> [2021-03-02 08:41:45] Generating image -#> S2B2A_20200801_022_Scalve_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-03-02 08:41:49] Computing required spectral indices.
    #> [2021-03-02 08:41:49] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-03-02 08:41:52] Computing index NDVI on date 2020-08-01...
    #> [2021-03-02 08:41:54] Generating thumbnails.
    #> 6 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════ +#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-03-04 09:22:41] Download of level-2A SAFE products terminated.
    #> [2021-03-04 09:22:41] Starting to download the required level-1C SAFE +#> products.
    #> No L1C images are needed.
    #> [2021-03-04 09:22:41] Download of level-1C SAFE products terminated.
    #> [2021-03-04 09:22:41] Updating output names...
    #> [2021-03-04 09:22:41] Starting to translate SAFE products in custom +#> format.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> [2021-03-04 09:22:42] Starting to merge tiles by orbit.
    #> Using projection "EPSG:32632".
    #> [2021-03-04 09:22:42] Starting to edit geometry (clip, reproject, +#> rescale).
    #> [2021-03-04 09:22:49] Producing required RGB images.
    #> [2021-03-04 09:22:49] Generating image +#> S2B2A_20200801_022_Scalve_RGB432B_10.tif...
    #> [2021-03-04 09:22:52] Generating image +#> S2B2A_20200801_022_Scalve_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-03-04 09:22:56] Computing required spectral indices.
    #> [2021-03-04 09:22:56] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-03-04 09:22:58] Computing index NDVI on date 2020-08-01...
    #> [2021-03-04 09:23:00] Generating thumbnails.
    #> 6 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════ #> ║ sen2r Processing Report -#> ╟──────────────────────────────────────────────────────────────────────
    #> ║ Dates to be processed based on processing parameters: 2
    #> ║ Processing completed for: all expected dates.
    #> ╚══════════════════════════════════════════════════════════════════════
    #> [2021-03-02 08:41:58] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command: -#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210302_084129.json")
    +#> ╟──────────────────────────────────────────────────────────────────────
    #> ║ Dates to be processed based on processing parameters: 2
    #> ║ Processing completed for: all expected dates.
    #> ╚══════════════════════════════════════════════════════════════════════
    #> [2021-03-04 09:23:02] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command: +#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210304_092237.json")
    # Show outputs (loading thumbnails) diff --git a/docs/reference/sen2r_getElements.html b/docs/reference/sen2r_getElements.html index 483e2ac4..4d94271f 100644 --- a/docs/reference/sen2r_getElements.html +++ b/docs/reference/sen2r_getElements.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2
    diff --git a/docs/reference/sen2r_process_report.html b/docs/reference/sen2r_process_report.html index aea1e962..541bf2e2 100644 --- a/docs/reference/sen2r_process_report.html +++ b/docs/reference/sen2r_process_report.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/smooth_mask.html b/docs/reference/smooth_mask.html index 8d82f7b7..2b35e6cc 100644 --- a/docs/reference/smooth_mask.html +++ b/docs/reference/smooth_mask.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/st_as_text_2.html b/docs/reference/st_as_text_2.html index 0d32a4c8..d80a217f 100644 --- a/docs/reference/st_as_text_2.html +++ b/docs/reference/st_as_text_2.html @@ -78,7 +78,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/st_crs2.html b/docs/reference/st_crs2.html index 36714ad9..a76de5cb 100644 --- a/docs/reference/st_crs2.html +++ b/docs/reference/st_crs2.html @@ -75,7 +75,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/stack2rgb.html b/docs/reference/stack2rgb.html index efe269e6..90034121 100644 --- a/docs/reference/stack2rgb.html +++ b/docs/reference/stack2rgb.html @@ -74,7 +74,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/str_pad2.html b/docs/reference/str_pad2.html index 74566108..e92d7608 100644 --- a/docs/reference/str_pad2.html +++ b/docs/reference/str_pad2.html @@ -76,7 +76,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/suppress_warnings.html b/docs/reference/suppress_warnings.html index 0d595393..08902ee2 100644 --- a/docs/reference/suppress_warnings.html +++ b/docs/reference/suppress_warnings.html @@ -72,7 +72,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/tile_utmzone.html b/docs/reference/tile_utmzone.html index f8a0d641..c0a523d7 100644 --- a/docs/reference/tile_utmzone.html +++ b/docs/reference/tile_utmzone.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/tiles_intersects.html b/docs/reference/tiles_intersects.html index fa515c08..a73602f4 100644 --- a/docs/reference/tiles_intersects.html +++ b/docs/reference/tiles_intersects.html @@ -73,7 +73,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/docs/reference/trace_function.html b/docs/reference/trace_function.html index da1f8a69..51c736d0 100644 --- a/docs/reference/trace_function.html +++ b/docs/reference/trace_function.html @@ -91,7 +91,7 @@ sen2r - 1.4.1 + 1.4.2 diff --git a/man/s2_order.Rd b/man/s2_order.Rd index 8f35078f..9583e8c1 100644 --- a/man/s2_order.Rd +++ b/man/s2_order.Rd @@ -70,11 +70,11 @@ License: GPL 3.0 \donttest{ # Generate the lists of products pos <- sf::st_sfc(sf::st_point(c(-57.8815,-51.6954)), crs = 4326) -time_window <- as.Date(c("2018-02-21", "2018-03-20")) +time_window <- as.Date(c("2019-10-21", "2019-11-20")) list_safe <- s2_list(spatial_extent = pos, time_interval = time_window) print(list_safe) -# (at the time the documentation was written, this list was containing 5 -# archives already available online and 2 stored in the Long Term Archive) +# (at the time the documentation was updated, this list was containing 6 +# archives already available online and 3 stored in the Long Term Archive) # Order the products ordered_prods <- s2_order(list_safe) diff --git a/man/scihub_login.Rd b/man/scihub_login.Rd index 3822b85d..9d4c4ba0 100644 --- a/man/scihub_login.Rd +++ b/man/scihub_login.Rd @@ -69,10 +69,14 @@ and password edits on old credentials are not immediately recognised. License: GPL 3.0 } \examples{ - check_scihub_login("user", "user") - write_scihub_login("user", "user") - read_scihub_login() - check_scihub_connection() +\donttest{ +check_scihub_connection() +} +\dontrun{ +check_scihub_login("username", "password") +write_scihub_login("username", "password") +read_scihub_login() +} } \references{ L. Ranghetti, M. Boschetti, F. Nutini, L. Busetto (2020). diff --git a/tests/testthat/setup-scihub_creds.R b/tests/testthat/setup-scihub_creds.R index e59f43cb..448a5a0e 100644 --- a/tests/testthat/setup-scihub_creds.R +++ b/tests/testthat/setup-scihub_creds.R @@ -4,19 +4,20 @@ tests_apihub <- if (Sys.getenv("TRAVIS") == "true") {c( Sys.getenv("TRAVIS_PASSWORD") )} else { saved_creds <- try(sen2r::read_scihub_login(), silent = TRUE) - if (inherits(saved_creds, "try-error")) { - c("user", "user") - } else { - saved_creds[1,] - } } -# Use a temporary apihub file -write_scihub_login( - tests_apihub[1], tests_apihub[2], - tests_apihub_path <- tempfile(), - check = FALSE -) - -# Return message -message("Tests are run with SciHub user \"",tests_apihub[1],"\".") +if (!inherits(saved_creds, "try-error")) { + + # Use a temporary apihub file + write_scihub_login( + tests_apihub[1], tests_apihub[2], + tests_apihub_path <- tempfile(), + check = FALSE + ) + + # Return message + message("Tests are run with SciHub user \"",tests_apihub[1],"\".") + +} else { + message("Problems with SciHub credentials; check secrets.") +}