Pass "config" instead of "abimo_config"

and return a data frame if called with vetors
instead of scalars

Author: hsonne

R/getPotentialEvaporation2.R

@@ -6,20 +6,20 @@
 #'   of type (from the type/yield/irrigation tuple) "waterbody"
 #' @param district (vector of) integer indicating the district number of the
 #'   plot area (from the original input column "BEZIRK")
-#' @param abimo_config list structure as returned by
-#'   \code{kwb.abimo:::read_config}
+#' @param config list structure as returned by
+#'   \code{\link{abimo_config_to_config}}
 #' @export
 #' @examples
 #' \dontrun{
-#' abimo_config <- kwb.abimo:::read_config()
+#' config <- abimo_config_to_config(kwb.abimo:::read_config())
 #' getPotentialEvaporation(
 #'   is_waterbody = TRUE,
 #'   district = 1,
-#'   abimo_config = abimo_config
+#'   config = config
 #' )
 #' }
 #'
-getPotentialEvaporation2 <- function(isWaterbody, district, abimo_config)
+getPotentialEvaporation2 <- function(isWaterbody, district, config)
 {
   #`%>%` <- magrittr::`%>%`
   #kwb.utils::assignPackageObjects("kwb.rabimo")
@@ -35,9 +35,7 @@ getPotentialEvaporation2 <- function(isWaterbody, district, abimo_config)
   )
 
   # Create lookup table from abimo configuration object
-  lookup <- abimo_config %>%
-    abimo_config_to_config() %>%
-    select_elements("potentialEvaporation")
+  lookup <- select_elements(config, "potentialEvaporation")
 
   result <- c(perYearInteger = "etp", inSummerInteger = "etps") %>%
     lapply(function(column) {
@@ -46,5 +44,10 @@ getPotentialEvaporation2 <- function(isWaterbody, district, abimo_config)
 
   result[["perYearFloat"]] <- as.double(result[["perYearInteger"]])
 
-  result
+
+  if (all(lengths(result) == 1L)) {
+    return(result)
+  }
+
+  as.data.frame(result)
 }