gwlevel changes

R/readNWISdata.R

@@ -123,11 +123,10 @@
 #'   seriesCatalogOutput = TRUE
 #' )
 #' 
-#' levels <- readNWISdata(state_cd = "WI", 
+#' levels <- readNWISdata(stateCd = "WI", 
 #'                        service = "gwlevels",
-#'                        begin_date = "2024-05-01",
-#'                        end_date = "2024-05-30",
-#'                        list_of_search_criteria = "state_cd") 
+#'                        startDate = "2024-05-01",
+#'                        endDate = "2024-05-30") 
 #'
 #'
 #' meas <- readNWISdata(
@@ -479,11 +478,12 @@ readNWISdots <- function(...) {
     }
   }
 
-  if (service %in% c("peak", "qwdata", "measurements")) {
+  if (service %in% c("peak", "qwdata", "measurements", "gwlevels")) {
     format.default <- "rdb"
 
     names(values)[names(values) == "startDT"] <- "begin_date"
     names(values)[names(values) == "endDT"] <- "end_date"
+    names(values)[names(values) == "sites"] <- "site_no"
 
     if ("bBox" %in% names(values)) {
       values["nw_longitude_va"] <- as.character(matchReturn$bBox[1])
@@ -507,18 +507,22 @@ readNWISdots <- function(...) {
     }
   }
 
-  if (service == "peak" && "state_cd" %in% names(values)) {
+  if (service %in% c("peak", "gwlevels") && "state_cd" %in% names(values)) {
     values["list_of_search_criteria"] <- "state_cd"
   }
 
-  if (service == "peak" && "huc2_cd" %in% names(values)) {
+  if (service%in% c("peak", "gwlevels") && "huc2_cd" %in% names(values)) {
     values["list_of_search_criteria"] <- "huc2_cd"
   }
 
-  if (service == "peak" && "bBox" %in% names(values)) {
+  if (service %in% c("peak", "gwlevels") && "bBox" %in% names(values)) {
     values["list_of_search_criteria"] <- "lat_long_bounding_box"
   }
 
+  if (service == "gwlevels" && "aquiferCd" %in% names(values)) {
+    values["aquiferCd"] <- "nat_aqfr_cd"
+  }
+
   if (service %in% c("site", "gwlevels", "stat", "rating", "peak")) {
     format.default <- "rdb"
   }