respect convertType

Author: ldecicco-USGS

R/walk_pages.R

@@ -4,6 +4,8 @@
 #' @param properties A vector of requested columns
 #' @param service character, can be any existing collection such
 #' as "daily", "monitoring-locations", "time-series-metadata"
+#' @param skipGeometry A logical for whether to return geometry
+#' @param convertType A logical for whether to convert value to numeric
 #' 
 #' @return data.frame
 #' @noRd
@@ -18,7 +20,9 @@
 #'                                       service = "daily")
 #' 
 deal_with_empty <- function(return_list, properties, service, 
-                            skipGeometry = TRUE){
+                            skipGeometry = TRUE,
+                            convertType = TRUE){
+  
   if(nrow(return_list) == 0){
 
     if(all(is.na(properties))){
@@ -38,9 +42,17 @@ deal_with_empty <- function(return_list, properties, service,
       }
     }
 
-    if(service == "daily"){
+    if(convertType && service == "daily"){
       return_list$time <- as.Date(as.character())
     }
+    
+    if(convertType && "value" %in% names(return_list)){
+      return_list$value <- as.numeric()
+    }
+    
+    if(convertType && "contributing_drainage_area" %in% names(return_list)){
+      return_list$contributing_drainage_area <- as.numeric()
+    }
 
     return_list <- data.frame(return_list)
     return_list$geometry <- NULL
@@ -301,7 +313,7 @@ get_ogc_data <- function(args,
   }
 
   return_list <- deal_with_empty(return_list, properties, service,
-                                 skipGeometry)
+                                 skipGeometry, convertType)
 
   if(convertType) return_list <- cleanup_cols(return_list, service = service)
 

tests/testthat/tests_userFriendly_fxns.R

@@ -154,6 +154,12 @@ test_that("read_waterdata_daily", {
                                    parameter_code =  "00060",
                                    time =  c("2014-01-01", "2014-01-07"))
   expect_true(nrow(notActiveUSGS) == 0)
+  expect_type(notActiveUSGS$value, "double")
+  notActiveUSGS2 <- read_waterdata_daily(monitoring_location_id = paste0("USGS-", site),
+                                        parameter_code =  "00060",
+                                        convertType = FALSE,
+                                        time =  c("2014-01-01", "2014-01-07"))
+  expect_type(notActiveUSGS2$value, "character")
 
 })