Merge ca65741 into 03d6bb4

ropensci · Jun 16, 2020 · 2b59125 · 2b59125
2 parents 03d6bb4 + ca65741
commit 2b59125
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/R/call_waterinfo.R b/R/call_waterinfo.R
@@ -70,14 +70,16 @@ call_waterinfo <- function(query, base_url = "vmm", token = NULL) {
         regexpr(pattern, custom_error,
                 perl = TRUE
         ))
-    }
-    if (grep(pattern = "Credit limit exceeded", error_message) == 1) {
-      error_message <- paste(error_message,
-          "- When you require more extended data requests, please request",
-          "a download token from the waterinfo.be site administrators via",
-          "the e-mail address hydrometrie@waterinfo.be with a statement of",
-          "which data and how frequently you would like to download data.",
-          "Run `?wateRinfo::token` for more information on token usage.")
+      if (isTRUE(grep(pattern = "Credit limit exceeded", error_message))) {
+        error_message <- paste(error_message,
+            "- When you require more extended data requests, please request ",
+            "a download token from the waterinfo.be site administrators via ",
+            "the e-mail address hydrometrie@waterinfo.be with a statement of ",
+            "which data and how frequently you would like to download data. ",
+            "Run `?wateRinfo::token` for more information on token usage.")
+      }
+    } else {
+      error_message <- "API returned response type not known to wateRinfo package (no json or XML)."
     }
     stop("API did not return json - ", trimws(error_message), call. = FALSE)
   }