diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 8369ac3d..c1075ce1 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -3,6 +3,7 @@ on: push: branches: + - master - devel pull_request: branches: diff --git a/.github/workflows/R-CMD-check_sf_develop.yaml b/.github/workflows/R-CMD-check_sf_develop.yaml index 1f0f8e90..e22eddb8 100644 --- a/.github/workflows/R-CMD-check_sf_develop.yaml +++ b/.github/workflows/R-CMD-check_sf_develop.yaml @@ -3,6 +3,7 @@ on: push: branches: + - master - devel name: R-CMD-check_sf_develop diff --git a/DESCRIPTION b/DESCRIPTION index f8ae8dc5..6b75a4cb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: sen2r Type: Package Title: Find, Download and Process Sentinel-2 Data -Version: 1.4.2.9002 +Version: 1.4.3 Authors@R: c(person("Luigi", "Ranghetti", email = "luigi@ranghetti.info", role = c("aut", "cre"), diff --git a/NEWS.md b/NEWS.md index f0ef0657..68a8b4e1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,23 @@ +# Version 1.4.3 + +## Minor changes +- Use API URLs `https://apihub.copernicus.eu/apihub` instead of + `https://scihub.copernicus.eu/apihub` as required after changes at + SciHub side (https://scihub.copernicus.eu/news/News00868). +- Manage multiple SciHub credentials when ordering SAFE archives from LTA + (experimental). + +## Documentation +- Replace `http://` with `https://` in documentation _URLs. + +## Checks +- Replace Travis with GitHub Actions (and fix tests accordingly). + +## Bug fixes +- Avoid topology errors on S2 footprints (to fix errors using `{sf}` 1.0). +- Manage situations like in #397 (too many nodes for ESA API query). + + # Version 1.4.2 ## Bug fixes diff --git a/R/abs2rel.R b/R/abs2rel.R index aa3e8ea4..6a53cc61 100644 --- a/R/abs2rel.R +++ b/R/abs2rel.R @@ -25,15 +25,15 @@ #' #' @examples #' # the reference path -#' (ref_path <- system.file(package="sen2r")) +#' (ref_path <- system.file(package="sf")) #' # a path with a common parent with ref_path -#' (in_path_1 <- system.file(package="gdalUtils")) +#' (in_path_1 <- system.file(package="rgdal")) #' # a path included in ref_path -#' (in_path_2 <- system.file("R/abs2rel.R", package="sen2r")) +#' (in_path_2 <- system.file("DESCRIPTION", package="sf")) #' # a path external to ref_path (in Linux) #' (in_path_3 <- system.file(package="base")) #' # an unexisting path -#' (in_path_4 <- gsub("sen2r","r2sen",ref_path)) +#' (in_path_4 <- gsub("sf$","unexistingpackage",ref_path)) #' #' abs2rel(in_path_1, ref_path) #' diff --git a/R/s2_list.R b/R/s2_list.R index 04e38cbd..cfdc99e3 100644 --- a/R/s2_list.R +++ b/R/s2_list.R @@ -237,7 +237,7 @@ s2_list <- function(spatial_extent = NULL, ) } - spatial_extent <- suppressWarnings(sf::st_union(spatial_extent)) + spatial_extent <- suppressMessages(sf::st_union(spatial_extent)) if (any(!st_is_valid(spatial_extent))) { spatial_extent <- st_make_valid(spatial_extent) } diff --git a/R/sen2r.R b/R/sen2r.R index e9cd0ccb..21e50e7b 100644 --- a/R/sen2r.R +++ b/R/sen2r.R @@ -1262,9 +1262,9 @@ sen2r <- function(param_list = NULL, error = function(e) {st_sfc(st_polygon(), crs = 4326)} ) }) - s2_dt_centroid <- round(st_coordinates( + s2_dt_centroid <- suppressMessages(round(st_coordinates( st_centroid(st_transform(do.call("c",s2_footprint_sf_l), 3857)) - ), -3) # rounded to 1 km + ), -3)) # rounded to 1 km s2_dt[,c("centroid_x", "centroid_y") := list(s2_dt_centroid[,"X"], s2_dt_centroid[,"Y"])] } else { s2_dt[,c("centroid_x", "centroid_y") := list(numeric(), numeric())] @@ -1281,9 +1281,9 @@ sen2r <- function(param_list = NULL, "id_tile", "creation_datetime", "footprint"), format = "data.table" ) - s2_existing_dt_centroid <- round(st_coordinates( + s2_existing_dt_centroid <- suppressMessages(round(st_coordinates( st_centroid(st_transform(st_as_sfc(s2_existing_dt$footprint, crs = 4326), 3857)) - ), -3) # rounded to 1 km + ), -3)) # rounded to 1 km s2_existing_dt[,c("centroid_x", "centroid_y") := list(s2_existing_dt_centroid[,"X"], s2_existing_dt_centroid[,"Y"])] # make a vector with only metadata to be used for the comparison s2_meta_pasted <- s2_dt[,list("V1" = paste( @@ -1374,7 +1374,7 @@ sen2r <- function(param_list = NULL, } # if extent and footprint are defined, filter SAFEs on footprints if (all(!is(pm$extent, "logical"), !anyNA(pm$extent), !is.na(s2_dt$footprint))) { - extent_dissolved <- st_union(pm$extent) + extent_dissolved <- suppressMessages(st_union(pm$extent)) if (any(!st_is_valid(extent_dissolved))) { extent_dissolved <- st_make_valid(extent_dissolved) } @@ -2089,9 +2089,9 @@ sen2r <- function(param_list = NULL, fill = TRUE ) if (nrow(s2_downloaded_dt)>0) { - s2_downloaded_dt_centroid <- round(st_coordinates( + s2_downloaded_dt_centroid <- suppressMessages(round(st_coordinates( st_centroid(st_transform(st_as_sfc(s2_downloaded_dt$footprint, crs = 4326), 3857)) - ), -3) # rounded to 1 km + ), -3)) # rounded to 1 km s2_downloaded_dt[,c("centroid_x", "centroid_y") := list( s2_downloaded_dt_centroid[,"X"], s2_downloaded_dt_centroid[,"Y"] diff --git a/README.Rmd b/README.Rmd index ace88550..375020ff 100644 --- a/README.Rmd +++ b/README.Rmd @@ -1,8 +1,7 @@ --- output: github_document: - toc: yes - toc_depth: 2 + toc: no fig_caption: no --- @@ -20,7 +19,7 @@ knitr::opts_chunk$set( [![CRAN Status](https://www.r-pkg.org/badges/version-ago/sen2r)](https://cran.r-project.org/package=sen2r) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1240384.svg)](https://doi.org/10.5281/zenodo.1240384) [![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/last-month/sen2r?color=green)](https://cran.rstudio.com/web/packages/ggplot2/index.html) -[![R-CMD-check](https://github.com/ranghetti/sen2r/workflows/R-CMD-check/badge.svg)](https://github.com/ranghetti/sen2r/actions) +[![R-CMD-check](https://github.com/ranghetti/sen2r/workflows/R-CMD-check/badge.svg)](https://github.com/ranghetti/sen2r/actions/workflows/R-CMD-check.yaml) [![Coverage Status](http://img.shields.io/codecov/c/github/ranghetti/sen2r/master.svg)](http://codecov.io/github/ranghetti/sen2r?branch=master) [![Docker Automated build](https://img.shields.io/docker/automated/ranghetti/sen2r.svg)](https://hub.docker.com/r/ranghetti/sen2r) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0) diff --git a/README.md b/README.md index 9c3a710f..978cff8f 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,4 @@ - - [sen2r: Find, Download and Process Sentinel-2 - Data](#sen2r-find-download-and-process-sentinel-2-data) - - [Installation](#installation) - - [Usage](#usage) - - [Credits](#credits) - - [Contributing](#contributing) - @@ -15,7 +8,7 @@ Status](https://www.r-pkg.org/badges/version-ago/sen2r)](https://cran.r-project. [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1240384.svg)](https://doi.org/10.5281/zenodo.1240384) [![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/last-month/sen2r?color=green)](https://cran.rstudio.com/web/packages/ggplot2/index.html) -[![R-CMD-check](https://github.com/ranghetti/sen2r/workflows/R-CMD-check/badge.svg)](https://github.com/ranghetti/sen2r/actions) +[![R-CMD-check](https://github.com/ranghetti/sen2r/workflows/R-CMD-check/badge.svg)](https://github.com/ranghetti/sen2r/actions/workflows/R-CMD-check.yaml) [![Coverage Status](http://img.shields.io/codecov/c/github/ranghetti/sen2r/master.svg)](http://codecov.io/github/ranghetti/sen2r?branch=master) [![Docker Automated diff --git a/cran-comments.md b/cran-comments.md index 5b68362c..7624b512 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,4 @@ -# sen2r v. 1.4.2 +# sen2r v. 1.4.3 ## Test environments * [local installation] Ubuntu 18.04, 64 bit, R 4.0.4 @@ -7,19 +7,4 @@ * [win-builder] R unstable, 4.0.4 and 3.6.3 (devel, release and oldrelease) ## R CMD check results -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-18 to safely retain your package on CRAN. - -The error were fixed -(see commit 6010b3f327f3c71392e47c2adc12071f50c29ee7). +There were no ERRORs, WARNINGs nor NOTEs. diff --git a/docs/404.html b/docs/404.html index 710b6063..c8780329 100644 --- a/docs/404.html +++ b/docs/404.html @@ -71,7 +71,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/CODE-OF-CONDUCT.html b/docs/CODE-OF-CONDUCT.html index bbde6719..50ae1106 100644 --- a/docs/CODE-OF-CONDUCT.html +++ b/docs/CODE-OF-CONDUCT.html @@ -71,7 +71,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/ISSUE_TEMPLATE.html b/docs/ISSUE_TEMPLATE.html index 28b80a70..ba4f4937 100644 --- a/docs/ISSUE_TEMPLATE.html +++ b/docs/ISSUE_TEMPLATE.html @@ -71,7 +71,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/LICENSE.html b/docs/LICENSE.html index 32c06af3..c66ef83f 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -71,7 +71,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/articles/docker.html b/docs/articles/docker.html index 727c74ee..50f24045 100644 --- a/docs/articles/docker.html +++ b/docs/articles/docker.html @@ -31,7 +31,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/articles/index.html b/docs/articles/index.html index a88f71bb..17500d73 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -71,7 +71,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/articles/installation.html b/docs/articles/installation.html index 3abe8f57..47b2130a 100644 --- a/docs/articles/installation.html +++ b/docs/articles/installation.html @@ -31,7 +31,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/articles/outstructure.html b/docs/articles/outstructure.html index 81351870..d6ff725c 100644 --- a/docs/articles/outstructure.html +++ b/docs/articles/outstructure.html @@ -31,7 +31,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/articles/sen2r_cmd.html b/docs/articles/sen2r_cmd.html index ee811756..d09fe64a 100644 --- a/docs/articles/sen2r_cmd.html +++ b/docs/articles/sen2r_cmd.html @@ -31,7 +31,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/articles/sen2r_gui.html b/docs/articles/sen2r_gui.html index 2383cc03..728c76b1 100644 --- a/docs/articles/sen2r_gui.html +++ b/docs/articles/sen2r_gui.html @@ -31,7 +31,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/authors.html b/docs/authors.html index b7b141b2..98fd5632 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -71,7 +71,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/index.html b/docs/index.html index f708be67..aa5b715b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -38,7 +38,7 @@ sen2r - 1.4.2 + 1.4.3 @@ -116,18 +116,7 @@
- - +

@@ -254,7 +243,7 @@

Dev status

  • CRAN Status
  • DOI
  • CRAN RStudio mirror downloads
    • -
  • Travis-CI Build Status
    • +
  • R-CMD-check
  • Coverage Status
  • Docker Automated build
  • License: GPL v3
    • diff --git a/docs/news/index.html b/docs/news/index.html index d444990c..57dd1e1b 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -71,7 +71,7 @@ sen2r - 1.4.2 + 1.4.3
    @@ -155,13 +155,48 @@

    Changelog

    Source: NEWS.md
    +
    +

    +Version 1.4.3 Unreleased +

    +
    +

    +Minor changes

    +
      +
    • Use API URLs https://apihub.copernicus.eu/apihub instead of https://scihub.copernicus.eu/apihub as required after changes at SciHub side (https://scihub.copernicus.eu/news/News00868).
      • +
    • Manage multiple SciHub credentials when ordering SAFE archives from LTA (experimental).
      • +
    +
    +
    +

    +Documentation

    +
      +
    • Replace http:// with https:// in documentation _URLs.
      • +
    +
    +
    +

    +Checks

    +
      +
    • Replace Travis with GitHub Actions (and fix tests accordingly).
      • +
    +
    +
    +

    +Bug fixes

    +
      +
    • Avoid topology errors on S2 footprints (to fix errors using sf 1.0).
      • +
    • Manage situations like in #397 (too many nodes for ESA API query).
      • +
    +
    +

    Version 1.4.2 2021-03-04

    -
    +

    -Bug fixes

    +Bug fixes
    • Fix CRAN error (invalid example).
    @@ -171,9 +206,9 @@

    Version 1.4.1 2021-03-02

    -
    +

    -Minor changes

    +Minor changes
    • Prevent Copernicus mismatches between API Hub and dhus (#381)..
    • Rescale resolutions lower than required in s2_translate() (#368).
      • @@ -181,9 +216,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.
      • @@ -210,9 +245,9 @@

    -
    +

    -Minor changes

    +Minor changes
    • Add templates for GitHub issues.
    • Do not return error in tests in case of SciHub server down (#354).
      • @@ -227,9 +262,9 @@

      s2_download() no more uses existing SAFE products instead than downloading new equivalent ones (this in order to manage images split in two SAFE archives).

    -
    +

    -Documentation

    +Documentation
    • Update vignette data (granting using online data) (#360).
    @@ -239,9 +274,9 @@

    Version 1.3.9 2020-10-14

    -
    +

    -Bug fixes

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

    Version 1.3.8 2020-08-26

    -
    +

    -Minor changes

    +Minor changes
    • Add argument service to s2_list() and s2_download() for using "dhus" API service instead of default "apihub" (this could be useful in case of apihub downtimes).
    • Add experimental argument kill_errored to sen2cor() (see documentation).
      • @@ -269,9 +304,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 @@ -288,27 +323,27 @@

  • Some additional products are now supported: CLD, SNW, AOT, WVP (see documentation for description). The GUI and internal functions were modified to support their selection and generation.

    • -
    +

    -Minor changes

    +Minor changes
    • Add indices Red / Green / Blue Chromatic Coordinate (Rcc, Gcc, Bcc) and Excess Green (ExG) (#330).
    • All methods based on runtime GDAL are now discouraged and never called by default (before this version, they were used in case GDAL was found on paths.json).
    • Output GeoTIFF files are now tiled.
    -
    +

    -Documentation

    +Documentation
    -
    +

    -Bug fixes

    +Bug fixes @@ -318,9 +353,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).
    @@ -338,25 +373,25 @@

  • “Graphical” packages needed to run the GUI (leaflet, leafpm, mapedit, shiny, shinyFiles, shinydashboard, shinyjs, shinyWidgets) are now suggested dependencies. In the case they are missing and the user tries to run the GUI, an error is returned with the command for installing them.

    • -
    +

    -Minor changes

    +Minor changes
    • Edit the GUI in order to disable selectors when dependencies required to run them are not available.
    • Automatic tests were reorganised and improved after GDAL changes.
    -
    +

    -Documentation

    +Documentation
    • Document sen2r installation over Ubuntu Focal.
    • Update documentation according to GDAL changes.
    -
    +

    -Bug fixes

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

      gdalUtil(): function used to perform GDAL operations, calling C-based GDAL utilities using sf::gdal_utils(), and Python-based ones through system calls (a standalone GDAL environment is request to do it, as it was in previous versions).

    -
    +

    -Documentation

    +Documentation
    • Improve documentation of vignette “Output file structure”, including the description of output products.
    @@ -390,18 +425,18 @@

    rgdal is now an explicit dependency (this because it is used by raster but it is not a mandatory dependency).

    -
    +

    -Minor changes

    +Minor changes
    • GDAL C-based utilities are called using internal GDAL routines in package sf (see gdalUtil()). This allows reducing the use of external runtime dependencies.
    • GDAL messages are suppressed if the suggested dependency sys is installed (#257).
    • 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.
      • @@ -432,16 +467,16 @@

      RcppTOML (used to manage TOML ignore list TOML file).

    -
    +

    -Documentation

    +Documentation
    • 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)
      • @@ -479,9 +514,9 @@

    • Prepare to move shiny* and leaflet* dependencies to suggested (this will be done in a future release).

    -
    +

    -Minor changes

    +Minor changes
    • Allow choosing if ordering SAFE products from dhus or apihub (experimental).
    • Replace all GET() calls with RETRY(), so to avoid errors in case of temporary unavailability of services.
      • @@ -501,9 +536,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.
      • @@ -518,9 +553,9 @@

    • In the GUI, the maximum allowed cloud cover was set to 100% accordingly to the sen2r() defaults.

    -
    +

    -Minor changes

    +Minor changes
    • Add check on max_mask - mask_type coherence (if max_mask < 100 and mask_type is not specified, a warning is returned).
    • Suppress some useless warnings.
      • @@ -576,9 +611,9 @@

      use_python argument in sen2r() was deprecated (no longer needed).

    -
    +

    -Minor changes

    +Minor changes
    • All components of the order (available, ordered and notordered) are now saved in JSON files. This allows using them to re-do an order, specifying if re-ordering already ordered datasets or only order the ones identified as “notordered” (based on new argument “reorder”).
    • Output messages are formatted so not to exceed output line length.
      • @@ -646,9 +681,9 @@

      safe_shortname(): arguments tiles, force_tiles, set.seed and multiple_names were deprecated, since they are not used with SAFE compact names (old names are no more supported);

    -
    +

    -Minor changes

    +Minor changes
    • Sys.setenv() effects now do not affect the R environment after exiting from sen2r() execution;
      • diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 390061b2..9b281e24 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-04-13T08:44Z +last_built: 2021-05-04T12:31Z diff --git a/docs/reference/abs2rel.html b/docs/reference/abs2rel.html index 524d2ab5..d1e3488a 100644 --- a/docs/reference/abs2rel.html +++ b/docs/reference/abs2rel.html @@ -75,7 +75,7 @@ sen2r - 1.4.2 + 1.4.3
    @@ -212,24 +212,24 @@

    AuthorExamples

    # the reference path
-(ref_path <- system.file(package="sen2r"))
-
    #> [1] "/home/lranghetti/share/git/github/ranghetti/sen2r/inst"
    # a path with a common parent with ref_path
-(in_path_1 <- system.file(package="gdalUtils"))
-
    #> [1] "/home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/gdalUtils"
    # a path included in ref_path
-(in_path_2 <- system.file("R/abs2rel.R", package="sen2r"))
-
    #> [1] "/home/lranghetti/share/git/github/ranghetti/sen2r/R/abs2rel.R"
    # a path external to ref_path (in Linux)
+(ref_path <- system.file(package="sf"))
+
    #> [1] "/home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/sf"
    # a path with a common parent with ref_path
+(in_path_1 <- system.file(package="rgdal"))
+
    #> [1] "/home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/rgdal"
    # a path included in ref_path
+(in_path_2 <- system.file("DESCRIPTION", package="sf"))
+
    #> [1] "/home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/sf/DESCRIPTION"
    # a path external to ref_path (in Linux)
 (in_path_3 <- system.file(package="base"))
 
    #> [1] "/usr/lib/R/library/base"
    # an unexisting path
-(in_path_4 <- gsub("sen2r","r2sen",ref_path))
-
    #> [1] "/home/lranghetti/share/git/github/ranghetti/r2sen/inst"
    
+(in_path_4 <- gsub("sf$","unexistingpackage",ref_path))
+
    #> [1] "/home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/unexistingpackage"
    
 abs2rel(in_path_1, ref_path)
-
    #> [1] "../../../../../../R/x86_64-pc-linux-gnu-library/4.0/gdalUtils"
    
+
    #> [1] "../rgdal"
    
 abs2rel(in_path_2, ref_path)
-
    #> [1] "../R/abs2rel.R"
    
+
    #> [1] "./DESCRIPTION"
    
 suppressWarnings(abs2rel(in_path_3, ref_path))
 
    #> [1] "/usr/lib/R/library/base"
    
 suppressWarnings(abs2rel(in_path_4, ref_path, mustWork=FALSE))
-
    #> [1] "../../r2sen/inst"
    
+
    #> [1] "../unexistingpackage"
    
 suppressWarnings(abs2rel(ref_path, ref_path))
 
    #> [1] "."
    diff --git a/docs/reference/add_rgb_image.html b/docs/reference/add_rgb_image.html index e7155f1f..539fc21b 100644 --- a/docs/reference/add_rgb_image.html +++ b/docs/reference/add_rgb_image.html @@ -72,7 +72,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/add_tile_suffix.html b/docs/reference/add_tile_suffix.html index 13b8aa0a..f7b551f6 100644 --- a/docs/reference/add_tile_suffix.html +++ b/docs/reference/add_tile_suffix.html @@ -76,7 +76,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/build_example_param_file.html b/docs/reference/build_example_param_file.html index ca78a6c7..14a2e913 100644 --- a/docs/reference/build_example_param_file.html +++ b/docs/reference/build_example_param_file.html @@ -74,7 +74,7 @@ sen2r - 1.4.2 + 1.4.3
    @@ -204,7 +204,7 @@

    AuthorExamples

    build_example_param_file()
-
    #> [1] "/tmp/RtmpZkOKZZ/file6c152f11a644_sen2r_params.json"
    +
    #> [1] "/tmp/RtmpieHqOv/filee20b8e8be69_sen2r_params.json"
    diff --git a/docs/reference/check_gdal.html b/docs/reference/check_gdal.html index 93f8c972..f58d84bf 100644 --- a/docs/reference/check_gdal.html +++ b/docs/reference/check_gdal.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    @@ -218,9 +218,9 @@

    AuthorLuigi Ranghetti, phD (2019) luigi@ranghetti.info

    Examples

    - 
    # \donttest{
+    
    if (FALSE) {
 check_gdal()
-
    #> GDAL version in use: 3.0.4
    # }
+}
 
    
   
    
   
 
diff --git a/docs/reference/check_param_list.html b/docs/reference/check_param_list.html
index a3145ec7..11e24c14 100644
--- a/docs/reference/check_param_list.html
+++ b/docs/reference/check_param_list.html
@@ -74,7 +74,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
    diff --git a/docs/reference/check_sen2r_deps.html b/docs/reference/check_sen2r_deps.html index 7cc8301e..bebe65c8 100644 --- a/docs/reference/check_sen2r_deps.html +++ b/docs/reference/check_sen2r_deps.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/compute_s2_paths.html b/docs/reference/compute_s2_paths.html index 6497491e..1923514b 100644 --- a/docs/reference/compute_s2_paths.html +++ b/docs/reference/compute_s2_paths.html @@ -81,7 +81,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/comsub.html b/docs/reference/comsub.html index ba55feb3..d0564c7f 100644 --- a/docs/reference/comsub.html +++ b/docs/reference/comsub.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/create_indices_db.html b/docs/reference/create_indices_db.html index 75f1bce9..531a53d3 100644 --- a/docs/reference/create_indices_db.html +++ b/docs/reference/create_indices_db.html @@ -78,7 +78,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/create_s2_dop.html b/docs/reference/create_s2_dop.html index 961a8d38..73b53127 100644 --- a/docs/reference/create_s2_dop.html +++ b/docs/reference/create_s2_dop.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/dontuse.html b/docs/reference/dontuse.html index 68038e0c..6ef1765f 100644 --- a/docs/reference/dontuse.html +++ b/docs/reference/dontuse.html @@ -72,7 +72,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/expand_path.html b/docs/reference/expand_path.html index b9b17d5b..52f72b7f 100644 --- a/docs/reference/expand_path.html +++ b/docs/reference/expand_path.html @@ -77,7 +77,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/expect_equal_crs.html b/docs/reference/expect_equal_crs.html index 3399c59e..43fae515 100644 --- a/docs/reference/expect_equal_crs.html +++ b/docs/reference/expect_equal_crs.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/fix_envi_format.html b/docs/reference/fix_envi_format.html index cb556ac5..3656d1b1 100644 --- a/docs/reference/fix_envi_format.html +++ b/docs/reference/fix_envi_format.html @@ -81,7 +81,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/gdalUtil.html b/docs/reference/gdalUtil.html index 3737e066..fe89be12 100644 --- a/docs/reference/gdalUtil.html +++ b/docs/reference/gdalUtil.html @@ -76,7 +76,7 @@ sen2r - 1.4.2 + 1.4.3
    @@ -254,7 +254,7 @@

    Examp out0 <- gdalUtil("info", examplename, quiet = TRUE) message(out0)

    #> Driver: GTiff/GeoTIFF -#> Files: /home/lranghetti/share/git/github/ranghetti/sen2r/inst/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif +#> Files: /tmp/RtmpFg5RiI/temp_libpathd6f07109c1a6/sen2r/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif #> Size is 24, 42 #> Coordinate System is: #> PROJCRS["WGS 84 / UTM zone 32N", @@ -352,7 +352,9 @@

    Examp oldpar <- par(mfrow = c(1,2), mar = rep(0,4)) image(stars::read_stars(examplename), rgb = c(11,8,4), useRaster = TRUE) image(stars::read_stars(outname2), rgb = c(11,8,4), useRaster = TRUE) -

    +
    # } + +if (FALSE) { ## gdal_calc outname3 <- tempfile(fileext = ".tif") ndvirefname <- system.file( @@ -368,7 +370,7 @@

    Examp oldpar <- par(mfrow = c(1,2), mar = rep(0,4)) image(stars::read_stars(ndvirefname), useRaster = TRUE) image(stars::read_stars(outname3), useRaster = TRUE) -

    # } +}
    @@ -231,7 +231,7 @@

    Examp rel_vrt_content <- readLines(rel_vrt) ex_vrt_content[ex_vrt_content != abs_vrt_content] # Original line

    #> [1] " <SourceDataset relativeToVRT=\"1\">S2A2A_20190723_022_Barbellino_RGB432B_10.tif</SourceDataset>"
    abs_vrt_content[ex_vrt_content != abs_vrt_content] # Modified line -
    #> [1] " <SourceDataset relativeToVRT=\"0\">/home/lranghetti/share/git/github/ranghetti/sen2r/inst/extdata/out/S2A2A_20190723_022_Barbellino_RGB432B_10.tif</SourceDataset>"
    rel_vrt_content[ex_vrt_content != rel_vrt_content] # No edits +
    #> [1] " <SourceDataset relativeToVRT=\"0\">/tmp/RtmpFg5RiI/temp_libpathd6f07109c1a6/sen2r/extdata/out/S2A2A_20190723_022_Barbellino_RGB432B_10.tif</SourceDataset>"
    rel_vrt_content[ex_vrt_content != rel_vrt_content] # No edits
    #> character(0)
    diff --git a/docs/reference/gdalwarp_grid.html b/docs/reference/gdalwarp_grid.html index 84487165..a553afa3 100644 --- a/docs/reference/gdalwarp_grid.html +++ b/docs/reference/gdalwarp_grid.html @@ -75,7 +75,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/gipp.html b/docs/reference/gipp.html index bbe41d2e..82310a48 100644 --- a/docs/reference/gipp.html +++ b/docs/reference/gipp.html @@ -75,7 +75,7 @@ sen2r - 1.4.2 + 1.4.3
    @@ -229,24 +229,15 @@

    AuthorLuigi Ranghetti, phD (2020) luigi@ranghetti.info

    Examples

    - 
    # \donttest{
+    
    if (FALSE) {
+if (!is.null(load_binpaths()$sen2cor)) {
 # Read default values
 read_gipp(c("dem_directory", "dem_reference"))
-
    #> $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 the use of a topographic correction
 set_gipp(use_dem = TRUE, gipp_path = gipp_temp <- tempfile())
 # Read the parameters in the created temporary files
 read_gipp(c("DEM_Directory", "DEM_Reference"), gipp_path = gipp_temp)
-
    #> $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 not to use a topographic correction
 set_gipp(use_dem = FALSE, gipp_path = gipp_temp <- tempfile())
 # This is equivalent to:
 # set_gipp(
@@ -255,12 +246,8 @@ 
    Examp
 # )
 # Read again the parameters in the created temporary files
 read_gipp(c("DEM_Directory", "DEM_Reference"), gipp_path = gipp_temp)
-
    #> $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 48dc9f6b..8e1237d7 100644
--- a/docs/reference/give_write_permission.html
+++ b/docs/reference/give_write_permission.html
@@ -76,7 +76,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
    diff --git a/docs/reference/ignorelist.html b/docs/reference/ignorelist.html index 08a38a7f..fbcac6f0 100644 --- a/docs/reference/ignorelist.html +++ b/docs/reference/ignorelist.html @@ -74,7 +74,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/index.html b/docs/reference/index.html index 6e7dbd6d..61bc63c8 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -71,7 +71,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/init_python.html b/docs/reference/init_python.html index 26b004b7..8c531908 100644 --- a/docs/reference/init_python.html +++ b/docs/reference/init_python.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/install_aria2.html b/docs/reference/install_aria2.html index 87f16b35..f3927bef 100644 --- a/docs/reference/install_aria2.html +++ b/docs/reference/install_aria2.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/install_sen2cor.html b/docs/reference/install_sen2cor.html index 2c5b50b1..e26611e1 100644 --- a/docs/reference/install_sen2cor.html +++ b/docs/reference/install_sen2cor.html @@ -75,7 +75,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/list_indices.html b/docs/reference/list_indices.html index ddd9cc05..18b05d6c 100644 --- a/docs/reference/list_indices.html +++ b/docs/reference/list_indices.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/load_binpaths.html b/docs/reference/load_binpaths.html index ea5f689e..e88c19b6 100644 --- a/docs/reference/load_binpaths.html +++ b/docs/reference/load_binpaths.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/load_extent.html b/docs/reference/load_extent.html index 5300dcc3..d1f220a3 100644 --- a/docs/reference/load_extent.html +++ b/docs/reference/load_extent.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/reference/mountpoint.html b/docs/reference/mountpoint.html index 8ceced31..15ce93eb 100644 --- a/docs/reference/mountpoint.html +++ b/docs/reference/mountpoint.html @@ -74,7 +74,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/reference/nn.html b/docs/reference/nn.html index 3900900d..efe1cb5d 100644 --- a/docs/reference/nn.html +++ b/docs/reference/nn.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/reference/normalize_path.html b/docs/reference/normalize_path.html index 4588bcb6..57495270 100644 --- a/docs/reference/normalize_path.html +++ b/docs/reference/normalize_path.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/reference/path_check.html b/docs/reference/path_check.html index 4ca79fe6..73a53c2c 100644 --- a/docs/reference/path_check.html +++ b/docs/reference/path_check.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/reference/print_message.html b/docs/reference/print_message.html index cbfb0354..55acaf4d 100644 --- a/docs/reference/print_message.html +++ b/docs/reference/print_message.html @@ -72,7 +72,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/reference/projpar.html b/docs/reference/projpar.html index a093411e..6c09047e 100644 --- a/docs/reference/projpar.html +++ b/docs/reference/projpar.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/reference/raster2rgb.html b/docs/reference/raster2rgb.html index 289117f6..2e035445 100644 --- a/docs/reference/raster2rgb.html +++ b/docs/reference/raster2rgb.html @@ -74,7 +74,7 @@ sen2r - 1.4.2 + 1.4.3 diff --git a/docs/reference/raster_metadata.html b/docs/reference/raster_metadata.html index 37441eb8..7f11a0ea 100644 --- a/docs/reference/raster_metadata.html +++ b/docs/reference/raster_metadata.html @@ -73,7 +73,7 @@ sen2r - 1.4.2 + 1.4.3 @@ -212,9 +212,9 @@

    Examp # \donttest{ # Return metadata as data.table raster_metadata(examplenames) -
    #> path -#> 1: /home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/stars/tif/L7_ETMs.tif -#> 2: /home/lranghetti/share/git/github/ranghetti/sen2r/inst/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif +
    #> path +#> 1: /home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/stars/tif/L7_ETMs.tif +#> 2: /tmp/RtmpFg5RiI/temp_libpathd6f07109c1a6/sen2r/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif #> valid res.x res.y size.x size.y nbands xmin ymin xmax ymax #> 1: TRUE 28.5 28.5 349 352 6 288776.3 9110729 298722.8 9120761 #> 2: TRUE 10.0 10.0 24 42 11 580560.0 5101700 580800.0 5102120 @@ -227,9 +227,9 @@

    Examp # Return some metadata as data.table raster_metadata(examplenames, c("res", "size", "bbox", "outformat")) -

    #> path -#> 1: /home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/stars/tif/L7_ETMs.tif -#> 2: /home/lranghetti/share/git/github/ranghetti/sen2r/inst/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif +
    #> path +#> 1: /home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/stars/tif/L7_ETMs.tif +#> 2: /tmp/RtmpFg5RiI/temp_libpathd6f07109c1a6/sen2r/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif #> valid res.x res.y size.x size.y xmin ymin xmax ymax outformat #> 1: TRUE 28.5 28.5 349 352 288776.3 9110729 298722.8 9120761 GTiff #> 2: TRUE 10.0 10.0 24 42 580560.0 5101700 580800.0 5102120 GTiff
    @@ -336,7 +336,7 @@

    Examp #> #> [[2]] #> [[2]]$path -#> [1] "/home/lranghetti/share/git/github/ranghetti/sen2r/inst/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif" +#> [1] "/tmp/RtmpFg5RiI/temp_libpathd6f07109c1a6/sen2r/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif" #> #> [[2]]$valid #> [1] TRUE @@ -403,10 +403,10 @@

    Examp system.file("extdata/settings/gdal_formats.json", package="sen2r") ) raster_metadata(examplenames, c("bbox", "proj")) -

    #> trying to read file: /home/lranghetti/share/git/github/ranghetti/sen2r/inst/extdata/settings/gdal_formats.json
    #> path -#> 1: /home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/stars/tif/L7_ETMs.tif -#> 2: /home/lranghetti/share/git/github/ranghetti/sen2r/inst/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif -#> 3: /home/lranghetti/share/git/github/ranghetti/sen2r/inst/extdata/settings/gdal_formats.json +
    #> trying to read file: /tmp/RtmpFg5RiI/temp_libpathd6f07109c1a6/sen2r/extdata/settings/gdal_formats.json
    #> path +#> 1: /home/lranghetti/R/x86_64-pc-linux-gnu-library/4.0/stars/tif/L7_ETMs.tif +#> 2: /tmp/RtmpFg5RiI/temp_libpathd6f07109c1a6/sen2r/extdata/out/S2A2A_20190723_022_Barbellino_BOA_10.tif +#> 3: /tmp/RtmpFg5RiI/temp_libpathd6f07109c1a6/sen2r/extdata/settings/gdal_formats.json #> valid xmin ymin xmax ymax #> 1: TRUE 288776.3 9110729 298722.8 9120761 #> 2: TRUE 580560.0 5101700 580800.0 5102120 diff --git a/docs/reference/s2_calcindices.html b/docs/reference/s2_calcindices.html index f4b2cc65..d0f980e8 100644 --- a/docs/reference/s2_calcindices.html +++ b/docs/reference/s2_calcindices.html @@ -74,7 +74,7 @@ sen2r - 1.4.2 + 1.4.3
    @@ -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.0, GDAL 3.0.4, PROJ 7.0.0
    #> [2021-04-13 10:46:14] Computing index EVI on date 2019-07-23...
    ex_out -
    #> [1] "/tmp/RtmpZkOKZZ/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.0, GDAL 3.0.4, PROJ 7.0.0
    #> [2021-05-04 14:31:30] Computing index EVI on date 2019-07-23...
    ex_out +
    #> [1] "/tmp/RtmpieHqOv/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 3acc0d00..0b42de08 100644 --- a/docs/reference/s2_defNA.html +++ b/docs/reference/s2_defNA.html @@ -74,7 +74,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/s2_dop.html b/docs/reference/s2_dop.html index 32d631e8..24ceaa42 100644 --- a/docs/reference/s2_dop.html +++ b/docs/reference/s2_dop.html @@ -81,7 +81,7 @@ sen2r - 1.4.2 + 1.4.3 @@ -232,42 +232,43 @@

    Examp 
    # All the passages in a cycle of 10 days over all the orbits
 s2_dop()
 
    #>            date mission orbit
-#>   1: 2021-04-13      2A   016
-#>   2: 2021-04-13      2A   017
-#>   3: 2021-04-13      2A   018
-#>   4: 2021-04-13      2A   019
-#>   5: 2021-04-13      2A   020
+#>   1: 2021-05-04      2A   030
+#>   2: 2021-05-04      2A   031
+#>   3: 2021-05-04      2A   032
+#>   4: 2021-05-04      2A   033
+#>   5: 2021-05-04      2A   034
 #>  ---                         
-#> 282: 2021-04-22      2B   083
-#> 283: 2021-04-22      2B   084
-#> 284: 2021-04-22      2B   085
-#> 285: 2021-04-22      2B   086
-#> 286: 2021-04-22      2B   087
    
+#> 282: 2021-05-13      2B   097
+#> 283: 2021-05-13      2B   098
+#> 284: 2021-05-13      2B   099
+#> 285: 2021-05-13      2B   100
+#> 286: 2021-05-13      2B   101
    
 # The passages in the current month over two orbits
 s2_dop(c("022", "065"), "this month")
 
    #>           date mission orbit
-#>  1: 2021-04-01      2B   065
-#>  2: 2021-04-03      2A   022
-#>  3: 2021-04-06      2A   065
-#>  4: 2021-04-08      2B   022
-#>  5: 2021-04-11      2B   065
-#>  6: 2021-04-13      2A   022
-#>  7: 2021-04-16      2A   065
-#>  8: 2021-04-18      2B   022
-#>  9: 2021-04-21      2B   065
-#> 10: 2021-04-23      2A   022
-#> 11: 2021-04-26      2A   065
-#> 12: 2021-04-28      2B   022
    
+#>  1: 2021-05-01      2B   065
+#>  2: 2021-05-03      2A   022
+#>  3: 2021-05-06      2A   065
+#>  4: 2021-05-08      2B   022
+#>  5: 2021-05-11      2B   065
+#>  6: 2021-05-13      2A   022
+#>  7: 2021-05-16      2A   065
+#>  8: 2021-05-18      2B   022
+#>  9: 2021-05-21      2B   065
+#> 10: 2021-05-23      2A   022
+#> 11: 2021-05-26      2A   065
+#> 12: 2021-05-28      2B   022
+#> 13: 2021-05-31      2B   065
    
 # The dates in which Sentinel-2A will pass in next six weeks over one orbit
 s2_dop("022", "6 weeks", mission = "2A")$date
-
    #> [1] "2021-04-13" "2021-04-23" "2021-05-03" "2021-05-13" "2021-05-23"
    
+
    #> [1] "2021-05-03" "2021-05-13" "2021-05-23" "2021-06-02" "2021-06-12"
    
 # 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-04-13"
    
+
    #> [1] "2021-05-03"
    
 # All the orbits covered today
 s2_dop(timewindow = Sys.Date(), mission = "2B")$orbit
-
    #>  [1] "088" "089" "090" "091" "092" "093" "094" "095" "096" "097" "098" "099"
-#> [13] "100" "101"
    
+
    #>  [1] "102" "103" "104" "105" "106" "107" "108" "109" "110" "111" "112" "113"
+#> [13] "114" "115"
    
 # 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 d238ec69..7b583dc2 100644
--- a/docs/reference/s2_download.html
+++ b/docs/reference/s2_download.html
@@ -75,7 +75,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
    
 
@@ -249,7 +249,7 @@ 
    AuthorExamples
    
     
    if (FALSE) {
-single_s2 <- paste0("https://scihub.copernicus.eu/apihub/odata/v1/",
+single_s2 <- paste0("https://apihub.copernicus.eu/apihub/odata/v1/",
   "Products(\'c7142722-42bf-4f93-b8c5-59fd1792c430\')/$value")
 names(single_s2) <- "S2A_MSIL1C_20170613T101031_N0205_R022_T32TQQ_20170613T101608.SAFE"
 # (this is equivalent to:
diff --git a/docs/reference/s2_gui.html b/docs/reference/s2_gui.html
index 56130002..d32ae1f9 100644
--- a/docs/reference/s2_gui.html
+++ b/docs/reference/s2_gui.html
@@ -73,7 +73,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
    
 
diff --git a/docs/reference/s2_list.html b/docs/reference/s2_list.html
index 6e340627..0db0c625 100644
--- a/docs/reference/s2_list.html
+++ b/docs/reference/s2_list.html
@@ -73,7 +73,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
@@ -300,18 +300,18 @@ 
    Examp
   time_interval = time_window,
   orbit = "065"
 )
-
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    print(example_s2_list)
+print(example_s2_list)
 
    #> A named vector with 47 SAFE archives.
 #>                                      S2A_MSIL1C_20160502T102032_N0201_R065_T32TNR_20160502T102027.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('fde01d3f-8a0d-46cb-b65d-3e32eff93f1d')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('fde01d3f-8a0d-46cb-b65d-3e32eff93f1d')/$value" 
 #>                                      S2A_MSIL1C_20160512T102032_N0202_R065_T32TNR_20160512T102029.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('4b785773-ba94-49b2-ae81-9b4b08749f70')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('4b785773-ba94-49b2-ae81-9b4b08749f70')/$value" 
 #>                                      S2A_MSIL1C_20160522T102032_N0202_R065_T32TNR_20160522T102029.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('4abf7965-0b26-431b-8708-74de427c0112')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('4abf7965-0b26-431b-8708-74de427c0112')/$value" 
 #>                                      S2A_MSIL1C_20160611T102032_N0202_R065_T32TNR_20160611T102026.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('68afcf6b-4ec6-48da-9b65-6cd41ff47a49')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('68afcf6b-4ec6-48da-9b65-6cd41ff47a49')/$value" 
 #>                                      S2A_MSIL1C_20160621T102022_N0204_R065_T32TNR_20160621T102024.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('9bb6d780-c226-4f59-bad0-1daedfdce9d5')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('9bb6d780-c226-4f59-bad0-1daedfdce9d5')/$value" 
 #> ...with 42 more elements.
 #> The following attributes are included: mission, level, id_tile, id_orbit, sensing_datetime, ingestion_datetime, clouds, footprint, uuid, online.
    # Print the dates of the retrieved products
 safe_getMetadata(example_s2_list, "sensing_datetime")
@@ -416,18 +416,18 @@ 
    Examp
   time_interval = time_window,
   time_period = "seasonal"
 )
-
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    print(example_s2_list)
+print(example_s2_list)
 
    #> A named vector with 28 SAFE archives.
 #>                                      S2A_MSIL1C_20160502T102032_N0201_R065_T32TNR_20160502T102027.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('fde01d3f-8a0d-46cb-b65d-3e32eff93f1d')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('fde01d3f-8a0d-46cb-b65d-3e32eff93f1d')/$value" 
 #>                                      S2A_MSIL1C_20160509T101032_N0202_R022_T32TNR_20160509T101645.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('abf24c65-2ff6-4c9a-9309-425425475d36')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('abf24c65-2ff6-4c9a-9309-425425475d36')/$value" 
 #>                                      S2A_MSIL1C_20160512T102032_N0202_R065_T32TNR_20160512T102029.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('4b785773-ba94-49b2-ae81-9b4b08749f70')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('4b785773-ba94-49b2-ae81-9b4b08749f70')/$value" 
 #>                                      S2A_MSIL1C_20160519T101032_N0202_R022_T32TNR_20160519T101312.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('e1f000b8-e9c3-421b-88c2-08a9046d1a82')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('e1f000b8-e9c3-421b-88c2-08a9046d1a82')/$value" 
 #>                                      S2A_MSIL1C_20160522T102032_N0202_R065_T32TNR_20160522T102029.SAFE 
-#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('4abf7965-0b26-431b-8708-74de427c0112')/$value" 
+#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('4abf7965-0b26-431b-8708-74de427c0112')/$value" 
 #> ...with 23 more elements.
 #> The following attributes are included: mission, level, id_tile, id_orbit, sensing_datetime, ingestion_datetime, clouds, footprint, uuid, online.
    # Print the dates of the retrieved products
 safe_getMetadata(example_s2_list, "sensing_datetime")
diff --git a/docs/reference/s2_mask.html b/docs/reference/s2_mask.html
index 235de2e9..58515a44 100644
--- a/docs/reference/s2_mask.html
+++ b/docs/reference/s2_mask.html
@@ -77,7 +77,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
    
 
@@ -409,9 +409,9 @@ 
    Examp
   mask_type = "land",
   outdir = tempdir()
 )
-
    #> [2021-04-13 10:46:40] Masking file
+
    #> [2021-05-04 14:31:41] Masking file
 #>        S2A2A_20190723_022_Barbellino_RGB432B_10.tif...
    ex_out
-
    #> [1] "/tmp/RtmpZkOKZZ/S2A2A_20190723_022_Barbellino_RGB432B_10.tif"
+
    #> [1] "/tmp/RtmpieHqOv/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 43bc9638..24fcae65 100644
--- a/docs/reference/s2_merge.html
+++ b/docs/reference/s2_merge.html
@@ -75,7 +75,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
    
 
diff --git a/docs/reference/s2_order.html b/docs/reference/s2_order.html
index ed2b6851..5eba5d3f 100644
--- a/docs/reference/s2_order.html
+++ b/docs/reference/s2_order.html
@@ -73,7 +73,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
@@ -255,51 +255,47 @@ 
    Examp
 pos <- sf::st_sfc(sf::st_point(c(-57.8815,-51.6954)), crs = 4326)
 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)
+print(list_safe)
 
    #> 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" 
+#> "https://apihub.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" 
+#> "https://apihub.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" 
+#> "https://apihub.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" 
+#> "https://apihub.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" 
+#> "https://apihub.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-04-13 10:47:05] Check if products are already available for
-#>        download...
    #> [2021-04-13 10:47:09] Ordering 9 Sentinel-2 images stored in the Long
-#>        Term Archive...
    #> [2021-04-13 10:47:21] 9 of 9 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_20210413_104721.json")
    
+
    #> [2021-05-04 14:31:56] Check if products are already available for
+#>        download...
    #> [2021-05-04 14:31:58] 9 Sentinel-2 images are already online.
    
 # Check in a second time if the product was made available
 (order_path <- attr(ordered_prods, "path"))
-
    #> [1] "/home/lranghetti/.sen2r/lta_orders/lta_20210413_104721.json"
    safe_is_online(order_path)
-
    #> 0 out of 9 products are online.
    #> S2A_MSIL2A_20191022T133641_N0213_R038_T21FVC_20191023T155120.SAFE 
-#>                                                             FALSE 
+
    #> [1] "/home/lranghetti/.sen2r/lta_orders/lta_20210504_143158.json"
    safe_is_online(order_path)
+
    #> All 9 products are online.
    #> S2A_MSIL2A_20191022T133641_N0213_R038_T21FVC_20191023T155120.SAFE 
+#>                                                              TRUE 
 #> S2B_MSIL2A_20191027T133639_N0213_R038_T21FVC_20191027T150854.SAFE 
-#>                                                             FALSE 
+#>                                                              TRUE 
 #> S2B_MSIL2A_20191030T134639_N0213_R081_T21FVC_20191030T152504.SAFE 
-#>                                                             FALSE 
+#>                                                              TRUE 
 #> S2A_MSIL2A_20191101T133641_N0213_R038_T21FVC_20191101T150755.SAFE 
-#>                                                             FALSE 
+#>                                                              TRUE 
 #> S2B_MSIL2A_20191106T133639_N0213_R038_T21FVC_20191106T150814.SAFE 
-#>                                                             FALSE 
+#>                                                              TRUE 
 #> S2B_MSIL2A_20191109T134639_N0213_R081_T21FVC_20191109T152703.SAFE 
-#>                                                             FALSE 
+#>                                                              TRUE 
 #> S2A_MSIL2A_20191111T133641_N0213_R038_T21FVC_20191111T150452.SAFE 
-#>                                                             FALSE 
+#>                                                              TRUE 
 #> S2B_MSIL2A_20191116T133639_N0213_R038_T21FVC_20191116T145355.SAFE 
-#>                                                             FALSE 
+#>                                                              TRUE 
 #> S2B_MSIL2A_20191119T134639_N0213_R081_T21FVC_20191119T152133.SAFE 
-#>                                                             FALSE 
    # }
+#>                                                              TRUE 
    # }
 
    
   
   
 
@@ -326,11 +326,11 @@ 
    Examp
   outdir = tempdir(),
   compress = 50
 )
-
    #> [2021-04-13 10:47:26] Generating image
-#>        S2A2A_20190723_022_Barbellino_RGBb84B_10.tif...
    #> [2021-04-13 10:47:37] Generating image
+
    #> [2021-05-04 14:32:00] Generating image
+#>        S2A2A_20190723_022_Barbellino_RGBb84B_10.tif...
    #> [2021-05-04 14:32:11] Generating image
 #>        S2A2A_20190723_022_Barbellino_RGB954B_10.tif...
    #> 2 output RGB files were correctly created.
    ex_out
-
    #> [1] "/tmp/RtmpZkOKZZ/RGBb84B/S2A2A_20190723_022_Barbellino_RGBb84B_10.tif"
-#> [2] "/tmp/RtmpZkOKZZ/RGB954B/S2A2A_20190723_022_Barbellino_RGB954B_10.tif"
    
+
    #> [1] "/tmp/RtmpieHqOv/RGBb84B/S2A2A_20190723_022_Barbellino_RGBb84B_10.tif"
+#> [2] "/tmp/RtmpieHqOv/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 8b873e9b..9c4956ff 100644
--- a/docs/reference/s2_thumbnails.html
+++ b/docs/reference/s2_thumbnails.html
@@ -77,7 +77,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
    
 
diff --git a/docs/reference/s2_tiles-1.png b/docs/reference/s2_tiles-1.png
index 7c833e86..858e4822 100644
Binary files a/docs/reference/s2_tiles-1.png and b/docs/reference/s2_tiles-1.png differ
diff --git a/docs/reference/s2_tiles.html b/docs/reference/s2_tiles.html
index 40a93ea6..e46de4d1 100644
--- a/docs/reference/s2_tiles.html
+++ b/docs/reference/s2_tiles.html
@@ -74,7 +74,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
@@ -190,26 +190,13 @@ 
    Examp
 s2tiles <- s2_tiles()
 
 # Extract a subset of all the tiles
-httr::GET(
-  "https://github.com/ranghetti/sen2r/raw/master/utils/vector/ch_bound.rds", 
-  httr::write_disk(ch_path <- tempfile())
-)
-
    #> Response [https://raw.githubusercontent.com/ranghetti/sen2r/master/utils/vector/ch_bound.rds]
-#>   Date: 2021-04-13 08:49
-#>   Status: 200
-#>   Content-Type: application/octet-stream
-#>   Size: 43.8 kB
-#> <ON DISK>  /tmp/RtmpZkOKZZ/file6c156cc467b0
    ch <- readRDS(ch_path)
-s2tiles_ch <- s2tiles[suppressMessages(sf::st_intersects(ch, s2tiles))[[1]],]
+s2tiles_ch <- s2tiles[grepl("32T[LMN][ST]", s2tiles$tile_id),]
 s2_coords <- sf::st_coordinates(suppressWarnings(sf::st_centroid(s2tiles_ch)))
 
 # Show the tiles
-plot(s2tiles_ch$geometry, border = "blue")
-
    plot(ch, border = "red", add = TRUE)
-
    text(s2_coords[,1], s2_coords[,2], s2tiles_ch$tile_id, col = "blue", cex = .75)
-
    
-# Use function tiles_intersects() to exclude unuseful tiles.
-
    +plot(s2tiles_ch$geometry, border = "black") +
    text(s2_coords[,1], s2_coords[,2], s2tiles_ch$tile_id, cex = .75) +
    diff --git a/docs/reference/safe_getMetadata.html b/docs/reference/safe_getMetadata.html index 39dfb15c..2c201b71 100644 --- a/docs/reference/safe_getMetadata.html +++ b/docs/reference/safe_getMetadata.html @@ -77,7 +77,7 @@ sen2r - 1.4.2 + 1.4.3 @@ -378,7 +378,7 @@

    Examp # Download a sample SAFE archive (this can take a while) s2_exampleurl <- c( "S2A_MSIL1C_20190723T101031_N0208_R022_T32TNS_20190723T121220.SAFE" = - paste0("https://scihub.copernicus.eu/apihub/odata/v1/", + paste0("https://apihub.copernicus.eu/apihub/odata/v1/", "Products('19bbde60-992b-423d-8dea-a5e0ac7715fc')/$value") ) s2_download(s2_exampleurl, outdir=tempdir()) diff --git a/docs/reference/safe_is_online.html b/docs/reference/safe_is_online.html index dfed7cde..b6325e41 100644 --- a/docs/reference/safe_is_online.html +++ b/docs/reference/safe_is_online.html @@ -74,7 +74,7 @@ sen2r - 1.4.2 + 1.4.3 @@ -217,15 +217,15 @@

    Examp 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")) list_safe <- s2_list(spatial_extent = pos, time_interval = time_window) -
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    # (at the time the documentation was written, this list was containing 5 +# (at the time the documentation was written, this list was containing 5 # archives already available online and 2 stored in the Long Term Archive) # Check for availability safe_is_online(list_safe) -
    #> 0 out of 7 products are online.
    #> S2B_MSIL1C_20180224T133629_N0206_R038_T21FVC_20180224T194845.SAFE +
    #> 1 out of 7 products are online.
    #> S2B_MSIL1C_20180224T133629_N0206_R038_T21FVC_20180224T194845.SAFE #> FALSE #> S2B_MSIL1C_20180227T134629_N0206_R081_T21FVC_20180227T200327.SAFE -#> FALSE +#> TRUE #> S2A_MSIL1C_20180301T133641_N0206_R038_T21FVC_20180301T145524.SAFE #> FALSE #> S2B_MSIL1C_20180306T133629_N0206_R038_T21FVC_20180306T183210.SAFE diff --git a/docs/reference/safe_shortname.html b/docs/reference/safe_shortname.html index 6b1854d5..87b1ba86 100644 --- a/docs/reference/safe_shortname.html +++ b/docs/reference/safe_shortname.html @@ -77,7 +77,7 @@ sen2r - 1.4.2 + 1.4.3
    diff --git a/docs/reference/safelist-class.html b/docs/reference/safelist-class.html index 526e845d..3acf2312 100644 --- a/docs/reference/safelist-class.html +++ b/docs/reference/safelist-class.html @@ -45,7 +45,7 @@ It is a named character in which names are SAFE codes (e.g. S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE), and values are URLs used to retrieve them from ESA API Hub (e.g. -https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value). +https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value). Some attributes may be included, basically information retrieved by function s2_list containing product metadata. Moreover, the attribute online (retrieved by function safe_is_online @@ -88,7 +88,7 @@ sen2r - 1.4.2 + 1.4.3 @@ -179,7 +179,7 @@

    Format for SAFE archive lists

    It is a named character in which names are SAFE codes (e.g. S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE), and values are URLs used to retrieve them from ESA API Hub (e.g. -https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value). +https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value). Some attributes may be included, basically information retrieved by function s2_list containing product metadata. Moreover, the attribute online (retrieved by function safe_is_online @@ -216,14 +216,14 @@

    Examp ## Create an object of class safelist list_safe <- s2_list(spatial_extent = pos, time_interval = time_window) -
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    list_safe +list_safe
    #> A named vector with 3 SAFE archives. #> S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" #> S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" #> S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value" #> The following attributes are included: mission, level, id_tile, id_orbit, sensing_datetime, ingestion_datetime, clouds, footprint, uuid, online.
    class(list_safe)
    #> [1] "safelist" "character"
    attr(list_safe, "sensing_datetime") # extract an hidden attribute from a safelist
    #> [1] "2017-05-07 10:20:31 UTC" "2017-05-17 10:20:31 UTC" @@ -231,19 +231,19 @@

    Examp ## Convert to other classes (s2_char <- as.character(list_safe)) # convert to a simple named character

    #> S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" #> S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" #> S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value"
    (s2_df <- as.data.frame(list_safe)) # convert to a data.frame +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value"
    (s2_df <- as.data.frame(list_safe)) # convert to a data.frame
    #> name #> 1 S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE #> 2 S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE #> 3 S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE #> url -#> 1 https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value -#> 2 https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value -#> 3 https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value +#> 1 https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value +#> 2 https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value +#> 3 https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value #> mission level id_tile id_orbit sensing_datetime ingestion_datetime #> 1 2A 2Ap 32TNR 065 2017-05-07 10:20:31 2017-05-09 06:30:41 #> 2 2A 2Ap 32TNR 065 2017-05-17 10:20:31 2017-06-08 12:21:23 @@ -269,9 +269,9 @@

    Examp #> 2: S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE #> 3: S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE #> url -#> 1: https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value -#> 2: https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value -#> 3: https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value +#> 1: https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value +#> 2: https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value +#> 3: https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value #> mission level id_tile id_orbit sensing_datetime ingestion_datetime #> 1: 2A 2Ap 32TNR 065 2017-05-07 10:20:31 2017-05-09 06:30:41 #> 2: 2A 2Ap 32TNR 065 2017-05-17 10:20:31 2017-06-08 12:21:23 @@ -299,9 +299,9 @@

    Examp #> 2 S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE #> 3 S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE #> url -#> 1 https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value -#> 2 https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value -#> 3 https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value +#> 1 https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value +#> 2 https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value +#> 3 https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value #> mission level id_tile id_orbit sensing_datetime ingestion_datetime #> 1 2A 2Ap 32TNR 065 2017-05-07 10:20:31 2017-05-09 06:30:41 #> 2 2A 2Ap 32TNR 065 2017-05-17 10:20:31 2017-06-08 12:21:23 @@ -318,34 +318,34 @@

    Examp as(s2_char, "safelist") # this causes the loss of hidden attributes

    #> A named vector with 3 SAFE archives. #> S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" #> S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" #> S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value"
    as(s2_df, "safelist") # this (and followings) maintain attributes as columns +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value"
    as(s2_df, "safelist") # this (and followings) maintain attributes as columns
    #> A named vector with 3 SAFE archives. #> S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" #> S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" #> S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value" #> The following attributes are included: mission, level, id_tile, id_orbit, sensing_datetime, ingestion_datetime, clouds, footprint, uuid, online.
    as(s2_dt, "safelist")
    #> A named vector with 3 SAFE archives. #> S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" #> S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" #> S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value" #> The following attributes are included: mission, level, id_tile, id_orbit, sensing_datetime, ingestion_datetime, clouds, footprint, uuid, online.
    as(s2_sf, "safelist")
    #> A named vector with 3 SAFE archives. #> S2A_MSIL2A_20170507T102031_N0205_R065_T32TNR_20170507T102319.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('a4a026c0-db7b-4ba8-9b09-53027ab0d7ab')/$value" #> S2A_MSIL2A_20170517T102031_N0205_R065_T32TNR_20170517T102352.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('6b7bb7bb-7598-45ac-9f2c-a3bd9cdc092f')/$value" #> S2A_MSIL2A_20170527T102031_N0205_R065_T32TNR_20170527T102301.SAFE -#> "https://scihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value" +#> "https://apihub.copernicus.eu/apihub/odata/v1/Products('868b5b3c-92ac-412a-8a04-167008a1f08f')/$value" #> The following attributes are included: mission, level, id_tile, id_orbit, sensing_datetime, ingestion_datetime, clouds, uuid, online, footprint.
    # }
    diff --git a/docs/reference/scihub_login.html b/docs/reference/scihub_login.html index 11651997..860a2a54 100644 --- a/docs/reference/scihub_login.html +++ b/docs/reference/scihub_login.html @@ -44,8 +44,10 @@ save new username and password (write_scihub_login()) or check their validity (check_scihub_login()). Login information is stored in a file apihub.txt inside the -".sen2r" subfolder of the home directory. This functions allow to read -or write this file, and to edit them from inside the GUI." /> +".sen2r" subfolder of the home directory. This function allows reading +or writing this file, and editing it from the GUI. +In case file apihub.txt is missing, read_scihub_login() searches inside +the environmental variables SCIHUB_USER and SCIHUB_PASSWORD." /> @@ -77,7 +79,7 @@ sen2r - 1.4.2 + 1.4.3 @@ -167,15 +169,17 @@

    Import / export / check SciHub username and password

    save new username and password (write_scihub_login()) or check their validity (check_scihub_login()). Login information is stored in a file apihub.txt inside the -".sen2r" subfolder of the home directory. This functions allow to read -or write this file, and to edit them from inside the GUI.

    +".sen2r" subfolder of the home directory. This function allows reading +or writing this file, and editing it from the GUI. +In case file apihub.txt is missing, read_scihub_login() searches inside +the environmental variables SCIHUB_USER and SCIHUB_PASSWORD.

    read_scihub_login(apihub_path = NA)
 
-check_scihub_login(username, password)
+check_scihub_login(username, password, service = "apihub")
 
-check_scihub_connection()
+check_scihub_connection(service = "apihub")
 
 write_scihub_login(
   username,
@@ -201,6 +205,10 @@ 
    Arg
       password
       
    SciHub password.
    
     
+    
+      service
+      
    Character: it can be "dhus" or "apihub" (default).
    
+    
     
       check
       
    Logical: if TRUE (default), new credentials are checked
diff --git a/docs/reference/sen2cor.html b/docs/reference/sen2cor.html
index f3e41712..7dac1e93 100644
--- a/docs/reference/sen2cor.html
+++ b/docs/reference/sen2cor.html
@@ -75,7 +75,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
@@ -267,7 +267,8 @@ 
    Arg
 with the function read_gipp(c("DEM_Directory", "DEM_Reference"))).
 In case one or both these parameters were set to "NONE",
 a subdirectory "srtm90" of the default sen2r directory is used as
-DEM directory, and/or the CGIAR SRTM 90m
+DEM directory, and/or the
+CGIAR SRTM 90m
 is set as online source.
 To set another directory or reference, use argument gipp in the form
 gipp = list(DEM_Directory = tempdir(), DEM_Reference ="another_reference", ...)
diff --git a/docs/reference/sen2r.html b/docs/reference/sen2r.html
index 7b2db4db..69f0cafb 100644
--- a/docs/reference/sen2r.html
+++ b/docs/reference/sen2r.html
@@ -76,7 +76,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
@@ -764,22 +764,22 @@ 
    Examp
 json_path <- build_example_param_file()
 
 out_paths_2 <- sen2r(json_path)
-
    #> [2021-04-13 10:48:52] #### Starting sen2r execution. ####
    #> Loading required namespace: stringi
    #> Registered S3 method overwritten by 'geojsonlint':
+
    #> [2021-05-04 14:32:56] #### Starting sen2r execution. ####
    #> Loading required namespace: stringi
    #> Registered S3 method overwritten by 'geojsonlint':
 #>   method         from 
-#>   print.location dplyr
    #> [2021-04-13 10:48:53] Searching for available SAFE products on
-#>        SciHub...
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> [2021-04-13 10:48:58] Computing output names...
    #> [2021-04-13 10:49:00] Starting to download the required level-2A SAFE
+#>   print.location dplyr
    #> [2021-05-04 14:32:56] Searching for available SAFE products on
+#>        SciHub...
    #> [2021-05-04 14:32:59] Computing output names...
    #> [2021-05-04 14:33:01] 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-04-13 10:49:00] Download of level-2A SAFE products terminated.
    #> [2021-04-13 10:49:00] Starting to download the required level-1C SAFE
-#>        products.
    #> No L1C images are needed.
    #> [2021-04-13 10:49:00] Download of level-1C SAFE products terminated.
    #> [2021-04-13 10:49:00] Updating output names...
    #> [2021-04-13 10:49:01] Starting to translate SAFE products in custom
-#>        format.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> [2021-04-13 10:49:02] Starting to merge tiles by orbit.
    #> [2021-04-13 10:49:03] Starting to edit geometry (clip, reproject,
-#>        rescale).
    #> [2021-04-13 10:49:05] Producing required RGB images.
    #> [2021-04-13 10:49:06] Generating image
-#>        S2B2A_20200801_022_sen2r_RGB432B_10.tif...
    #> [2021-04-13 10:49:18] Generating image
-#>        S2B2A_20200801_022_sen2r_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-04-13 10:49:52] Computing required spectral indices.
    #> [2021-04-13 10:49:52] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-04-13 10:50:04] Computing index NDVI on date 2020-08-01...
    #> [2021-04-13 10:50:16] Generating thumbnails.
    #> 6 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════
+#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-05-04 14:33:01] Download of level-2A SAFE products terminated.
    #> [2021-05-04 14:33:01] Starting to download the required level-1C SAFE
+#>        products.
    #> No L1C images are needed.
    #> [2021-05-04 14:33:01] Download of level-1C SAFE products terminated.
    #> [2021-05-04 14:33:01] Updating output names...
    #> [2021-05-04 14:33:02] Starting to translate SAFE products in custom
+#>        format.
    #> Using UTM zone 32N.
    #> 2 output files were correctly created.
    #> [2021-05-04 14:33:02] Starting to merge tiles by orbit.
    #> [2021-05-04 14:33:03] Starting to edit geometry (clip, reproject,
+#>        rescale).
    #> [2021-05-04 14:33:05] Producing required RGB images.
    #> [2021-05-04 14:33:05] Generating image
+#>        S2B2A_20200801_022_sen2r_RGB432B_10.tif...
    #> [2021-05-04 14:33:16] Generating image
+#>        S2B2A_20200801_022_sen2r_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-05-04 14:33:49] Computing required spectral indices.
    #> [2021-05-04 14:33:50] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-05-04 14:34:01] Computing index NDVI on date 2020-08-01...
    #> [2021-05-04 14:34:14] 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-04-13 10:50:28] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command:
-#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210413_104853.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-05-04 14:34:26] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command:
+#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210504_143256.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
@@ -800,26 +800,26 @@ 
    Examp
   path_l2a = safe_dir,
   path_out = out_dir_3
 )
-
    #> [2021-04-13 10:50:29] #### Starting sen2r execution. ####
    #> [2021-04-13 10:50:30] 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-04-13 10:50:38] Computing output names...
    #> [2021-04-13 10:50:39] Starting to download the required level-2A SAFE
+
    #> [2021-05-04 14:34:27] #### Starting sen2r execution. ####
    #> [2021-05-04 14:34:27] Searching for available SAFE products on
+#>        SciHub...
    #> [2021-05-04 14:34:34] Computing output names...
    #> [2021-05-04 14:34:36] 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-04-13 10:50:39] Download of level-2A SAFE products terminated.
    #> [2021-04-13 10:50:39] Starting to download the required level-1C SAFE
+#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-05-04 14:34:36] Download of level-2A SAFE products terminated.
    #> [2021-05-04 14:34:36] 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-04-13 10:50:39] Download of level-1C SAFE products terminated.
    #> [2021-04-13 10:50:39] Updating output names...
    #> [2021-04-13 10:50:40] 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-04-13 10:50:41] Starting to merge tiles by orbit.
    #> [2021-04-13 10:50:43] Starting to edit geometry (clip, reproject,
-#>        rescale).
    #> [2021-04-13 10:50:45] Starting to apply cloud masks.
    #> [2021-04-13 10:50:46] Masking file
-#>        S2B1C_20200801_022_Barbellino_TOA_10.tif...
    #> [2021-04-13 10:51:05] Masking file
-#>        S2B2A_20200801_022_Barbellino_BOA_10.tif...
    #> [2021-04-13 10:51:23] Producing required RGB images.
    #> [2021-04-13 10:51:23] Generating image
-#>        S2B1C_20200801_022_Barbellino_RGB432T_10.tif...
    #> 1 output RGB files were correctly created.
    #> [2021-04-13 10:51:37] Generating image
-#>        S2B2A_20200801_022_Barbellino_RGB432B_10.tif...
    #> [2021-04-13 10:51:49] Generating image
-#>        S2B2A_20200801_022_Barbellino_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-04-13 10:52:24] Computing required spectral indices.
    #> [2021-04-13 10:52:24] Computing index NDVI on date 2020-08-01...
    #> [2021-04-13 10:52:26] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-04-13 10:52:27] Generating thumbnails.
    #> 8 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════
+#> TRUE to re-download them.
    #> No L1C images are needed.
    #> [2021-05-04 14:34:36] Download of level-1C SAFE products terminated.
    #> [2021-05-04 14:34:36] Updating output names...
    #> [2021-05-04 14:34:36] 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-05-04 14:34:38] Starting to merge tiles by orbit.
    #> [2021-05-04 14:34:40] Starting to edit geometry (clip, reproject,
+#>        rescale).
    #> [2021-05-04 14:34:42] Starting to apply cloud masks.
    #> [2021-05-04 14:34:43] Masking file
+#>        S2B1C_20200801_022_Barbellino_TOA_10.tif...
    #> [2021-05-04 14:35:00] Masking file
+#>        S2B2A_20200801_022_Barbellino_BOA_10.tif...
    #> [2021-05-04 14:35:17] Producing required RGB images.
    #> [2021-05-04 14:35:17] Generating image
+#>        S2B1C_20200801_022_Barbellino_RGB432T_10.tif...
    #> 1 output RGB files were correctly created.
    #> [2021-05-04 14:35:28] Generating image
+#>        S2B2A_20200801_022_Barbellino_RGB432B_10.tif...
    #> [2021-05-04 14:35:39] Generating image
+#>        S2B2A_20200801_022_Barbellino_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-05-04 14:36:11] Computing required spectral indices.
    #> [2021-05-04 14:36:11] Computing index NDVI on date 2020-08-01...
    #> [2021-05-04 14:36:12] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-05-04 14:36:13] 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-04-13 10:52:51] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command:
-#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210413_105030.json")
    
+#> ╟──────────────────────────────────────────────────────────────────────
    #> ║ Dates to be processed based on processing parameters: 1
    #> ║ Processing completed for: all expected dates.
    #> ╚══════════════════════════════════════════════════════════════════════
    #> [2021-05-04 14:36:33] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command:
+#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210504_143427.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_")
@@ -829,21 +829,21 @@ 
    Examp
   extent_name = "Scalve",
   path_out = out_dir_4
 )
-
    #> [2021-04-13 10:52:51] #### Starting sen2r execution. ####
    #> [2021-04-13 10:52:52] Searching for available SAFE products on
-#>        SciHub...
    #> although coordinates are longitude/latitude, st_union assumes that they are planar
    #> [2021-04-13 10:52:58] Computing output names...
    #> [2021-04-13 10:52:59] Starting to download the required level-2A SAFE
+
    #> [2021-05-04 14:36:34] #### Starting sen2r execution. ####
    #> [2021-05-04 14:36:34] Searching for available SAFE products on
+#>        SciHub...
    #> [2021-05-04 14:36:38] Computing output names...
    #> [2021-05-04 14:36:40] 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-04-13 10:52:59] Download of level-2A SAFE products terminated.
    #> [2021-04-13 10:52:59] Starting to download the required level-1C SAFE
-#>        products.
    #> No L1C images are needed.
    #> [2021-04-13 10:52:59] Download of level-1C SAFE products terminated.
    #> [2021-04-13 10:52:59] Updating output names...
    #> [2021-04-13 10:53:00] 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-04-13 10:53:02] Starting to merge tiles by orbit.
    #> [2021-04-13 10:53:03] Starting to edit geometry (clip, reproject,
-#>        rescale).
    #> [2021-04-13 10:53:19] Producing required RGB images.
    #> [2021-04-13 10:53:20] Generating image
-#>        S2B2A_20200801_022_Scalve_RGB432B_10.tif...
    #> [2021-04-13 10:53:25] Generating image
-#>        S2B2A_20200801_022_Scalve_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-04-13 10:53:32] Computing required spectral indices.
    #> [2021-04-13 10:53:32] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-04-13 10:53:36] Computing index NDVI on date 2020-08-01...
    #> [2021-04-13 10:53:39] Generating thumbnails.
    #> 6 output files were correctly created.
    #> ╔══════════════════════════════════════════════════════════════════════
+#> TRUE to re-download them.
    #> No L2A images are needed.
    #> [2021-05-04 14:36:40] Download of level-2A SAFE products terminated.
    #> [2021-05-04 14:36:40] Starting to download the required level-1C SAFE
+#>        products.
    #> No L1C images are needed.
    #> [2021-05-04 14:36:40] Download of level-1C SAFE products terminated.
    #> [2021-05-04 14:36:40] Updating output names...
    #> [2021-05-04 14:36: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-05-04 14:36:43] Starting to merge tiles by orbit.
    #> [2021-05-04 14:36:44] Starting to edit geometry (clip, reproject,
+#>        rescale).
    #> [2021-05-04 14:37:01] Producing required RGB images.
    #> [2021-05-04 14:37:01] Generating image
+#>        S2B2A_20200801_022_Scalve_RGB432B_10.tif...
    #> [2021-05-04 14:37:08] Generating image
+#>        S2B2A_20200801_022_Scalve_RGB843B_10.tif...
    #> 2 output RGB files were correctly created.
    #> [2021-05-04 14:37:16] Computing required spectral indices.
    #> [2021-05-04 14:37:17] Computing index MSAVI2 on date 2020-08-01...
    #> [2021-05-04 14:37:22] Computing index NDVI on date 2020-08-01...
    #> [2021-05-04 14:37:26] 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-04-13 10:53:45] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command:
-#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210413_105251.json")
    
+#> ╟──────────────────────────────────────────────────────────────────────
    #> ║ Dates to be processed based on processing parameters: 2
    #> ║ Processing completed for: all expected dates.
    #> ╚══════════════════════════════════════════════════════════════════════
    #> [2021-05-04 14:37:33] #### sen2r session terminated. ####
    #> The processing chain can be re-launched with the command:
+#>   sen2r("/home/lranghetti/.sen2r/proc_par/s2proc_20210504_143634.json")
    
 
 # Show outputs (loading thumbnails)
 
diff --git a/docs/reference/sen2r_getElements.html b/docs/reference/sen2r_getElements.html
index 88cea0cd..67543bc7 100644
--- a/docs/reference/sen2r_getElements.html
+++ b/docs/reference/sen2r_getElements.html
@@ -74,7 +74,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
    
 
diff --git a/docs/reference/sen2r_process_report.html b/docs/reference/sen2r_process_report.html
index 7aa71a51..2f96726b 100644
--- a/docs/reference/sen2r_process_report.html
+++ b/docs/reference/sen2r_process_report.html
@@ -73,7 +73,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
diff --git a/docs/reference/smooth_mask.html b/docs/reference/smooth_mask.html
index 511f3130..09e5645c 100644
--- a/docs/reference/smooth_mask.html
+++ b/docs/reference/smooth_mask.html
@@ -75,7 +75,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
diff --git a/docs/reference/st_as_text_2.html b/docs/reference/st_as_text_2.html
index d80a217f..32eeb61c 100644
--- a/docs/reference/st_as_text_2.html
+++ b/docs/reference/st_as_text_2.html
@@ -78,7 +78,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
diff --git a/docs/reference/st_crs2.html b/docs/reference/st_crs2.html
index 7cd52b4f..4c82b335 100644
--- a/docs/reference/st_crs2.html
+++ b/docs/reference/st_crs2.html
@@ -75,7 +75,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
diff --git a/docs/reference/stack2rgb.html b/docs/reference/stack2rgb.html
index 36c1fcba..ce23c2a0 100644
--- a/docs/reference/stack2rgb.html
+++ b/docs/reference/stack2rgb.html
@@ -74,7 +74,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
diff --git a/docs/reference/str_pad2.html b/docs/reference/str_pad2.html
index 66ad1182..a269703d 100644
--- a/docs/reference/str_pad2.html
+++ b/docs/reference/str_pad2.html
@@ -76,7 +76,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
diff --git a/docs/reference/suppress_warnings.html b/docs/reference/suppress_warnings.html
index 08902ee2..72495d8d 100644
--- a/docs/reference/suppress_warnings.html
+++ b/docs/reference/suppress_warnings.html
@@ -72,7 +72,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
diff --git a/docs/reference/tile_utmzone.html b/docs/reference/tile_utmzone.html
index ef34e0ad..1bb2c298 100644
--- a/docs/reference/tile_utmzone.html
+++ b/docs/reference/tile_utmzone.html
@@ -73,7 +73,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
diff --git a/docs/reference/tiles_intersects.html b/docs/reference/tiles_intersects.html
index 9486d257..1724cbd2 100644
--- a/docs/reference/tiles_intersects.html
+++ b/docs/reference/tiles_intersects.html
@@ -73,7 +73,7 @@
       
       
         sen2r
-        1.4.2
+        1.4.3
       
     
 
@@ -225,6 +225,7 @@ 
    Examp
 # Tile ID of all the overlapping S2 tiles
 tiles_intersects(ex_extent, all = TRUE)
 
    #> [1] "32TNR" "32TNS"
    
+# \donttest{
 # Spatial object with the required tile
 sel_tiles <- tiles_intersects(ex_extent, out_format = "sf")
 plot(sf::st_geometry(sel_tiles)); plot(sf::st_geometry(ex_extent), add=TRUE, col="yellow")
@@ -232,7 +233,8 @@ 
    Examp
 # Spatial object with the overlapping S2 tiles
 sel_tiles <- tiles_intersects(ex_extent, all = TRUE, out_format = "sf")
 plot(sf::st_geometry(sel_tiles)); plot(sf::st_geometry(ex_extent), add=TRUE, col="yellow")
-
    +
    # } +
    diff --git a/index.Rmd b/index.Rmd index f30951fd..06d082db 100644 --- a/index.Rmd +++ b/index.Rmd @@ -1,8 +1,7 @@ --- output: github_document: - toc: yes - toc_depth: 2 + toc: no fig_caption: no --- @@ -20,7 +19,7 @@ knitr::opts_chunk$set( [![CRAN Status](https://www.r-pkg.org/badges/version-ago/sen2r)](https://cran.r-project.org/package=sen2r) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1240384.svg)](https://doi.org/10.5281/zenodo.1240384) [![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/last-month/sen2r?color=green)](https://cran.rstudio.com/web/packages/ggplot2/index.html) -[![R-CMD-check](https://github.com/ranghetti/sen2r/workflows/R-CMD-check/badge.svg)](https://github.com/ranghetti/sen2r/actions) +[![R-CMD-check](https://github.com/ranghetti/sen2r/workflows/R-CMD-check/badge.svg)](https://github.com/ranghetti/sen2r/actions/workflows/R-CMD-check.yaml) [![Coverage Status](http://img.shields.io/codecov/c/github/ranghetti/sen2r/master.svg)](http://codecov.io/github/ranghetti/sen2r?branch=master) [![Docker Automated build](https://img.shields.io/docker/automated/ranghetti/sen2r.svg)](https://hub.docker.com/r/ranghetti/sen2r) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0) diff --git a/index.md b/index.md index d199176e..879c4a8a 100644 --- a/index.md +++ b/index.md @@ -1,11 +1,4 @@ - - [sen2r: Find, Download and Process Sentinel-2 - Data](#sen2r-find-download-and-process-sentinel-2-data) - - [Installation](#installation) - - [Usage](#usage) - - [Credits](#credits) - - [Contributing](#contributing) - @@ -15,7 +8,7 @@ Status](https://www.r-pkg.org/badges/version-ago/sen2r)](https://cran.r-project. [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1240384.svg)](https://doi.org/10.5281/zenodo.1240384) [![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/last-month/sen2r?color=green)](https://cran.rstudio.com/web/packages/ggplot2/index.html) -[![R-CMD-check](https://github.com/ranghetti/sen2r/workflows/R-CMD-check/badge.svg)](https://github.com/ranghetti/sen2r/actions) +[![R-CMD-check](https://github.com/ranghetti/sen2r/workflows/R-CMD-check/badge.svg)](https://github.com/ranghetti/sen2r/actions/workflows/R-CMD-check.yaml) [![Coverage Status](http://img.shields.io/codecov/c/github/ranghetti/sen2r/master.svg)](http://codecov.io/github/ranghetti/sen2r?branch=master) [![Docker Automated diff --git a/man/abs2rel.Rd b/man/abs2rel.Rd index 7e3bb64c..a8c73a57 100644 --- a/man/abs2rel.Rd +++ b/man/abs2rel.Rd @@ -34,15 +34,15 @@ License: GPL 3.0 } \examples{ # the reference path -(ref_path <- system.file(package="sen2r")) +(ref_path <- system.file(package="sf")) # a path with a common parent with ref_path -(in_path_1 <- system.file(package="gdalUtils")) +(in_path_1 <- system.file(package="rgdal")) # a path included in ref_path -(in_path_2 <- system.file("R/abs2rel.R", package="sen2r")) +(in_path_2 <- system.file("DESCRIPTION", package="sf")) # a path external to ref_path (in Linux) (in_path_3 <- system.file(package="base")) # an unexisting path -(in_path_4 <- gsub("sen2r","r2sen",ref_path)) +(in_path_4 <- gsub("sf$","unexistingpackage",ref_path)) abs2rel(in_path_1, ref_path)