Merge pull request #41 from pepijn-devries/work-in-progress

Fix in WMTS

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: CopernicusMarine
 Type: Package
 Title: Search Download and Handle Data from Copernicus Marine Service Information
-Version: 0.2.3
-Date: 2024-01-25
+Version: 0.2.3.001
+Date: 2024-03-26
 Authors@R: c(person("Pepijn", "de Vries", role = c("aut", "cre", "dtc"),
     email = "pepijn.devries@outlook.com",
     comment = c(ORCID = "0000-0002-7961-6646")))

NEWS.md

@@ -1,3 +1,8 @@
+CopernicusMarine v0.2.3.001 (Release date: 2024-02-26)
+-------------
+
+ * Fix in `addCmsWMTSTiles`
+
 CopernicusMarine v0.2.3 (Release date: 2024-01-25)
 -------------
 

R/cms_wmts.r

@@ -46,10 +46,10 @@ cms_wmts_details <- function(product, layer, variable) {
       "WMTS:https://wmts.marine.copernicus.eu/teroWmts/%s?request=GetCapabilities" |>
         sprintf(product),
       quiet = TRUE)
-  desc <- copwmtsinfo |> stringr::str_match_all("SUBDATASET_(\\d)_DESC=(.*?)\n")
+  desc <- copwmtsinfo |> stringr::str_match_all("SUBDATASET_(\\d+)_DESC=(.*?)\n")
   if (length(desc) == 0) return(dplyr::tibble(desc = character(0), url = character(0)))
   desc <- desc[[1]][,3]
-  url  <- copwmtsinfo |> stringr::str_match_all("SUBDATASET_(\\d)_NAME=(.*?)\n")
+  url  <- copwmtsinfo |> stringr::str_match_all("SUBDATASET_(\\d+)_NAME=(.*?)\n")
   url  <- url[[1]][,3]
   result <- dplyr::bind_cols(desc = desc, url = url)
 
@@ -73,7 +73,14 @@ addCmsWMTSTiles <- function(
 
   detail <- cms_wmts_details(product, layer, variable)
   detail <- detail$url |> strsplit(",") |> unlist()
-  detail <- detail[startsWith(detail, "layer=")]
+  detail <- detail[startsWith(detail, "layer=")] |> unique()
+  if (length(detail) == 0) rlang::abort(
+    c(x = "Could not find a WMTS URL",
+      i = "Check your parameter settings"))
+  if (length(detail) > 1) rlang::abort(
+    c(x = "Found ambiguous WMTS URLs",
+      i = "Check your parameter settings"))
+
   leaflet::addTiles(
     map = map,
     urlTemplate =