From a2e72be00d34f2e38a22f296715cb8b669af7c73 Mon Sep 17 00:00:00 2001 From: Luigi Ranghetti <6874239+ranghetti@users.noreply.github.com> Date: Fri, 5 Mar 2021 17:19:58 +0100 Subject: [PATCH] RC v. 1.4.2 (#392) --- DESCRIPTION | 2 +- NEWS.md | 6 ++ R/s2_order.R | 6 +- R/scihub_login.R | 12 ++- cran-comments.md | 22 +++--- docs/404.html | 2 +- docs/CODE-OF-CONDUCT.html | 2 +- docs/ISSUE_TEMPLATE.html | 2 +- docs/LICENSE.html | 2 +- docs/articles/docker.html | 2 +- docs/articles/index.html | 2 +- docs/articles/installation.html | 2 +- docs/articles/outstructure.html | 2 +- docs/articles/sen2r_cmd.html | 2 +- docs/articles/sen2r_gui.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 52 ++++++++----- docs/pkgdown.yml | 2 +- docs/reference/Rplot001.png | Bin 7140 -> 1011 bytes docs/reference/Rplot002.png | Bin 12556 -> 3649 bytes docs/reference/abs2rel.html | 2 +- docs/reference/add_rgb_image.html | 2 +- docs/reference/add_tile_suffix.html | 2 +- docs/reference/build_example_param_file.html | 4 +- docs/reference/calcindex.html | 2 +- docs/reference/check_gdal.html | 2 +- docs/reference/check_gui_deps.html | 2 +- docs/reference/check_param_list.html | 2 +- docs/reference/check_sen2r_deps.html | 2 +- docs/reference/compute_s2_paths.html | 2 +- docs/reference/comsub.html | 2 +- docs/reference/create_indices_db.html | 2 +- docs/reference/create_s2_dop.html | 2 +- docs/reference/dontuse.html | 2 +- docs/reference/expand_path.html | 2 +- docs/reference/expect_equal_crs.html | 2 +- docs/reference/fix_envi_format.html | 2 +- docs/reference/gdalUtil.html | 2 +- docs/reference/gdal_abs2rel_rel2abs.html | 2 +- docs/reference/gdal_warp.html | 2 +- docs/reference/gdalwarp_grid.html | 2 +- docs/reference/gipp.html | 33 ++++++--- docs/reference/gipp_init.html | 2 +- docs/reference/give_write_permission.html | 2 +- docs/reference/ignorelist.html | 2 +- docs/reference/index.html | 2 +- docs/reference/init_python.html | 2 +- docs/reference/install_aria2.html | 2 +- docs/reference/install_sen2cor.html | 2 +- docs/reference/list_indices.html | 2 +- docs/reference/load_binpaths.html | 5 +- docs/reference/load_extent.html | 2 +- docs/reference/mountpoint.html | 2 +- docs/reference/nn.html | 2 +- docs/reference/normalize_path.html | 2 +- docs/reference/path_check.html | 2 +- docs/reference/print_message.html | 2 +- docs/reference/projpar.html | 2 +- docs/reference/raster2rgb.html | 2 +- docs/reference/raster_metadata.html | 2 +- docs/reference/s2_calcindices.html | 6 +- docs/reference/s2_defNA.html | 2 +- docs/reference/s2_dop.html | 28 +++---- docs/reference/s2_download.html | 2 +- docs/reference/s2_gui.html | 2 +- docs/reference/s2_list.html | 2 +- docs/reference/s2_mask.html | 6 +- docs/reference/s2_merge.html | 2 +- docs/reference/s2_order.html | 68 +++++++++-------- docs/reference/s2_rgb.html | 10 +-- docs/reference/s2_thumbnails.html | 2 +- docs/reference/s2_tiles.html | 6 +- docs/reference/s2_translate.html | 2 +- docs/reference/safe_getMetadata.html | 2 +- docs/reference/safe_is_online.html | 2 +- docs/reference/safe_shortname.html | 2 +- docs/reference/safelist-class.html | 2 +- docs/reference/scihub_login.html | 17 +++-- docs/reference/sen2cor.html | 2 +- docs/reference/sen2r.html | 73 ++++++++++--------- docs/reference/sen2r_getElements.html | 2 +- docs/reference/sen2r_process_report.html | 2 +- docs/reference/smooth_mask.html | 2 +- docs/reference/st_as_text_2.html | 2 +- docs/reference/st_crs2.html | 2 +- docs/reference/stack2rgb.html | 2 +- docs/reference/str_pad2.html | 2 +- docs/reference/suppress_warnings.html | 2 +- docs/reference/tile_utmzone.html | 2 +- docs/reference/tiles_intersects.html | 2 +- docs/reference/trace_function.html | 2 +- man/s2_order.Rd | 6 +- man/scihub_login.Rd | 12 ++- tests/testthat/setup-scihub_creds.R | 29 ++++---- 95 files changed, 297 insertions(+), 252 deletions(-) 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 77007b6a91428effbf3d5447e6316be890ec2071..17a358060aed2a86950757bbd25c6f92c08c458f 100644 GIT binary patch delta 95 zcmaE2{+WG(mpJoePZ!6KiaBo&GBPqSFf=LrU!UjUz&P=u-^2&@L?A1%4;ez67#O)u S87u(mXYh3Ob6Mw<&;$VC4Jj@F literal 7140 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 literal 12556 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 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.") +}