Skip to content

Commit

Permalink
Merge pull request #1 from pepijn-devries/work-in-progress
Browse files Browse the repository at this point in the history
Fixes after CRAN checks
  • Loading branch information
pepijn-devries authored Jan 18, 2023
2 parents a549c3b + b99ddb8 commit cea0f75
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 28 deletions.
12 changes: 6 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Package: CopernicusMarine
Type: Package
Title: Search Download and Handle Data from Copernicus Marine Service Information
Version: 0.0.2
Date: 2023-01-16
Version: 0.0.3
Date: 2023-01-17
Authors@R: c(person("Pepijn", "de Vries", role = c("aut", "cre", "dtc"),
email = "[email protected]",
comment = c(ORCID = "0000-0002-7961-6646")))
Author:
Pepijn de Vries [aut, cre, dtc] (0000-0002-7961-6646)
Maintainer: Pepijn de Vries <[email protected]>
Description: Subset and download marine data from EU Copernicus
Marine Service Information. Import data on the oceans
physical and biogeochemical state from Copernicus into R
without the need of external software.
Description: Subset and download data from EU Copernicus Marine
Service Information: <https://data.marine.copernicus.eu>.
Import data on the oceans physical and biogeochemical state
from Copernicus into R without the need of external software.
Depends:
R (>= 3.5.0)
Imports:
Expand Down
2 changes: 1 addition & 1 deletion R/copernicus_cite_product.r
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#' @name copernicus_cite_product
#' @family product-functions
#' @examples
#' \dontrun{
#' \donttest{
#' copernicus_cite_product("SST_MED_PHY_SUBSKIN_L4_NRT_010_036")
#' }
#' @author Pepijn de Vries
Expand Down
4 changes: 2 additions & 2 deletions R/copernicus_product_details.r
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#' @name copernicus_product_details
#' @family product-functions
#' @examples
#' \dontrun{
#' \donttest{
#' copernicus_product_details("GLOBAL_ANALYSISFORECAST_PHY_001_024")
#'
#' copernicus_product_details(
Expand Down Expand Up @@ -46,7 +46,7 @@ copernicus_product_details <- function(product, layer, variable) {
#' @rdname copernicus_product_services
#' @name copernicus_product_services
#' @examples
#' \dontrun{
#' \donttest{
#' copernicus_product_services("GLOBAL_ANALYSISFORECAST_PHY_001_024")
#' }
#' @author Pepijn de Vries
Expand Down
2 changes: 1 addition & 1 deletion R/copernicus_product_metadata.r
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#' @name copernicus_product_metadata
#' @family product-functions
#' @examples
#' \dontrun{
#' \donttest{
#' copernicus_product_metadata("GLOBAL_ANALYSISFORECAST_PHY_001_024")
#' }
#' @author Pepijn de Vries
Expand Down
2 changes: 1 addition & 1 deletion R/copernicus_products_list.r
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#' @name copernicus_products_list
#' @family product-functions
#' @examples
#' \dontrun{
#' \donttest{
#' copernicus_products_list()
#'
#' ## Query a specific product:
Expand Down
2 changes: 1 addition & 1 deletion R/ftp.r
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ copernicus_ftp_list <- function(
#' @name copernicus_ftp_get
#' @export
copernicus_ftp_get <- function(
url, destination, show_progress = T, overwrite = F,
url, destination, show_progress = TRUE, overwrite = FALSE,
username = getOption("CopernicusMarine_uid", ""),
password = getOption("CopernicusMarine_pwd", "")) {
if (!dir.exists(destination)) stop("'destination' either doesn't exist or is not a directory!")
Expand Down
5 changes: 4 additions & 1 deletion R/imports.r
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
#' Objects imported and exported from other packages. See original documentation for more details.
#'
#' \describe{
#' \item{dplyr}{[`\%>\%()`][dplyr::reexports]}
#' \item{dplyr pipe operator}{[`%>%`][dplyr::reexports]}
#' }
#' @importFrom dplyr %>%
#' @return Returns the result of the function call on the right-hand side of the pipe operator.
#' The left-hand side is used as first argument to the call to the right-hand side. For
#' more details see [dplyr::reexports].
#' @export %>%
#' @name %>%
#' @rdname reexports
Expand Down
8 changes: 4 additions & 4 deletions R/wms.r
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#' @name copernicus_wms_details
#' @family wms-functions
#' @examples
#' \dontrun{
#' \donttest{
#' copernicus_wms_details(
#' product = "GLOBAL_ANALYSISFORECAST_PHY_001_024",
#' layer = "cmems_mod_glo_phy-thetao_anfc_0.083deg_P1D-m",
Expand All @@ -20,7 +20,7 @@
copernicus_wms_details <- function(product, layer, variable) {
product_details <- copernicus_product_details(product, layer, variable)

copwmsinfo <- sf::gdal_utils("info", paste0("WMS:", product_details$wmsUrl), quiet = T)
copwmsinfo <- sf::gdal_utils("info", paste0("WMS:", product_details$wmsUrl), quiet = TRUE)

desc <- copwmsinfo %>% stringr::str_match_all("SUBDATASET_(\\d)_DESC=(.*?)\n")
desc <- desc[[1]][,3]
Expand All @@ -43,7 +43,7 @@ copernicus_wms_details <- function(product, layer, variable) {
#' @name addCopernicusWMSTiles
#' @family wms-functions
#' @examples
#' \dontrun{
#' \donttest{
#' leaflet::leaflet() %>%
#' leaflet::setView(lng = 3, lat = 54, zoom = 4) %>%
#' leaflet::addProviderTiles("Esri.WorldImagery") %>%
Expand Down Expand Up @@ -85,7 +85,7 @@ addCopernicusWMSTiles <- function(map, product, layer, variable,
#' @name copernicus_wms2geotiff
#' @family wms-functions
#' @examples
#' \dontrun{
#' \donttest{
#' destination <- tempfile("wms", fileext = ".tiff")
#' copernicus_wms2geotiff(
#' product = "GLOBAL_ANALYSISFORECAST_PHY_001_024",
Expand Down
2 changes: 1 addition & 1 deletion man/addCopernicusWMSTiles.Rd

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

2 changes: 1 addition & 1 deletion man/copernicus_cite_product.Rd

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

4 changes: 2 additions & 2 deletions man/copernicus_ftp.Rd

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

2 changes: 1 addition & 1 deletion man/copernicus_product_details.Rd

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

2 changes: 1 addition & 1 deletion man/copernicus_product_metadata.Rd

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

2 changes: 1 addition & 1 deletion man/copernicus_product_services.Rd

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

2 changes: 1 addition & 1 deletion man/copernicus_products_list.Rd

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

2 changes: 1 addition & 1 deletion man/copernicus_wms2geotiff.Rd

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

2 changes: 1 addition & 1 deletion man/copernicus_wms_details.Rd

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

7 changes: 6 additions & 1 deletion man/reexports.Rd

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

0 comments on commit cea0f75

Please sign in to comment.