fix(get_hydrometrie_sites): potential issue if using the "fields" parameter

Refs #7

fix(get_hydrometrie_sites): potential issue if using the "fields" parameter
Refs #7
c5f6b053 · Dorchies David · ae5eae01 · c5f6b053
Commit c5f6b053 authored 3 years ago by Dorchies David
Hide whitespace changes
Inline Side-by-side

Showing

with 16 additions and 14 deletions
+16 -14
--- a/R/get_hydrometrie_sites.R
+++ b/R/get_hydrometrie_sites.R
@@ -37,22 +37,24 @@ get_hydrometrie_sites  <- function(params,
      )
    bFirst <- TRUE
    for (field in fields) {
-      fieldValue <- unique(unlist(x[[field]]))
+      if (!is.null(x[[field]])) {
-      if (unique_site && length(fieldValue) > 1) {
+        fieldValue <- unique(unlist(x[[field]]))
-        if(bFirst) {
+        if (unique_site && length(fieldValue) > 1) {
-          warning(
+          if(bFirst) {
-            "The site '",
+            warning(
-            x$code_site,
+              "The site '",
-            "' has ",
+              x$code_site,
-            length(fieldValue),
+              "' has ",
-            " different locations, only the first one is returned",
+              length(fieldValue),
-            call. = FALSE
+              " different locations, only the first one is returned",
-          )
+              call. = FALSE
-          bFirst <- FALSE
+            )
+            bFirst <- FALSE
+          }
+          fieldValue <- x[[field]][[1]]
        }
-        fieldValue <- x[[field]][[1]]
+        x[[field]] <- fieldValue
      }
-      x[[field]] <- fieldValue
    }
    x$geometry <- NULL
    x