Skip to content

Commit

Permalink
Changes for CRAN checks
Browse files Browse the repository at this point in the history
  • Loading branch information
ranghetti committed Nov 9, 2023
1 parent 12f570e commit ede8017
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 3 deletions.
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Major changes
- Remove the possibility to search/download SAFE archives from ESA SciHub due
to its dismission.
to its discontinuation.
- Set `"gcloud"` as the default SAFE server.
- Begin voiding some functions related to ESA SciHub: `s2_order()`,
`safe_is_online()`, `*_scihub_login()`,
Expand Down
2 changes: 1 addition & 1 deletion R/s2_gui.R
Original file line number Diff line number Diff line change
Expand Up @@ -3014,7 +3014,7 @@ s2_gui <- function(param_list = NULL,
"This mode is not optimal (a modern STAC API approach should be used),",
"and searching products could be a very slow process.",
"Nevertheless, the old official data source, ESA Hub</strong>, is no",
"longer available since November 2023 due to it dismission;",
"longer available since November 2023 due to it discontinuation;",
"since sen2r is not actively maintained, the replacement with the new",
"<a href='https://dataspace.copernicus.eu/analyse/apis'",
"target='_blank'>Copernicus Data Space</a>",
Expand Down
7 changes: 7 additions & 0 deletions R/s2_order.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#' @title Order S2 products (deprecated).
#' @description This function is deprecated and will be removed.
#' @param s2_prodlist deprecated
#' @param export_prodlist deprecated
#' @param delay deprecated
#' @param apihub deprecated
#' @param service deprecated
#' @param reorder deprecated
#' @return deprecated
#' @export

s2_order <- function(
Expand Down
4 changes: 4 additions & 0 deletions R/safe_is_online.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#' @title Check if SAFE is available for download (deprecated)
#' @description This function is deprecated and will be removed.
#' @param s2_prodlist deprecated
#' @param apihub deprecated
#' @param verbose deprecated
#' @return deprecated
#' @export

safe_is_online <- function(s2_prodlist = NULL, apihub = NA, verbose = TRUE) {
Expand Down
7 changes: 7 additions & 0 deletions R/scihub_login.R
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#' @title Import / export / check SciHub username and password (deprecated)
#' @description These functions are deprecated and will be removed.
#' @return deprecated

#' @name read_scihub_login
#' @rdname scihub_login
#' @param apihub_path deprecated
#' @param username deprecated
#' @param password deprecated
#' @param service deprecated
#' @export
read_scihub_login <- function(apihub_path = NA) {
matrix(c("",""), ncol = 2)
Expand Down Expand Up @@ -32,6 +37,8 @@ check_scihub_connection <- function(service = "apihub") {

#' @name write_scihub_login
#' @rdname scihub_login
#' @param check deprecated
#' @param append deprecated
#' @export

write_scihub_login <- function(username, password,
Expand Down
2 changes: 1 addition & 1 deletion inst/extdata/settings/indices.json
Original file line number Diff line number Diff line change
Expand Up @@ -2101,6 +2101,6 @@
"s2_formula_mathml": "<math xmlns=\"http://www.w3.org/1998/Math/MathML\">\n <mrow>\n <mfrac>\n <mrow>\n <mrow>\n <mrow>\n <mi mathcolor=\"#443399\">NIR<\/mi>\n <mo>-<\/mo>\n <mrow>\n <mo>(<\/mo>\n <mrow>\n <mrow>\n <mi mathcolor=\"#443399\">SWIR1<\/mi>\n <mo>-<\/mo>\n <mi mathcolor=\"#443399\">SWIR2<\/mi>\n <\/mrow>\n <\/mrow>\n <mo>)<\/mo>\n <\/mrow>\n <\/mrow>\n <\/mrow>\n <\/mrow>\n <mrow>\n <mrow>\n <mrow>\n <mi mathcolor=\"#443399\">NIR<\/mi>\n <mo>+<\/mo>\n <mrow>\n <mo>(<\/mo>\n <mrow>\n <mrow>\n <mi mathcolor=\"#443399\">SWIR1<\/mi>\n <mo>-<\/mo>\n <mi mathcolor=\"#443399\">SWIR2<\/mi>\n <\/mrow>\n <\/mrow>\n <mo>)<\/mo>\n <\/mrow>\n <\/mrow>\n <\/mrow>\n <\/mrow>\n <\/mfrac>\n <\/mrow>\n<\/math>"
}
],
"pkg_version": ["1.5.4.9000"],
"pkg_version": ["1.6.0"],
"creation_date": ["2023-05-30 16:07:39.257282"]
}
16 changes: 16 additions & 0 deletions man/s2_order.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions man/safe_is_online.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions man/scihub_login.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ede8017

Please sign in to comment.