diff --git a/NEWS b/NEWS index b33e5666d9a3c45fbcca66225cc18bdb9dfcc325..2fa474d0a01696b246f4dce7a2ef56350b0012ad 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +dataRetrieval 2.4.0 +========== +* Package readr now used for tab delimited parsing +* readr functions used to determine column types. Mostly, this produces the same results. +* In the case where there is text in a numeric column (specified by the RDB header), these now remain characters (previously was converted to numeric) +* + dataRetrieval 2.3.0 =========== * Converted all Water Quality Portal queries to sorted=no to greatly improve retrieval times diff --git a/R/renameColumns.R b/R/renameColumns.R index 505b640e98382362a510ef57c4f8dbf54a1114ce..0af8bcbc0b8e1715408ec44ac0745dbcdf9c9c8d 100644 --- a/R/renameColumns.R +++ b/R/renameColumns.R @@ -45,6 +45,10 @@ #' url2 <- constructNWISURL(siteWithTwo, "00060",startDate,endDate,'dv') #' twoResults <- importWaterML1(url2,TRUE) #' twoResults <- renameNWISColumns(twoResults) +#' url2RDB <- constructNWISURL(siteWithTwo,"00060", +#' startDate,endDate,"dv",format="tsv") +#' rdbResults <- importRDB1(url2RDB) +#' rdbResults <- renameNWISColumns(rdbResults) #' } renameNWISColumns <- function(rawData, p00010="Wtemp", p00045="Precip", p00060="Flow", p00065="GH", p00095="SpecCond", p00300="DO", @@ -78,7 +82,7 @@ renameNWISColumns <- function(rawData, p00010="Wtemp", p00045="Precip", Conv$s00023<- "HiLoTide" Conv$s00024<- "LoLoTide" - dataColumns <- grep("X_", Cnames) + dataColumns <- c(grep("X_", Cnames),grep("X\\d{2}", Cnames)) for (i in dataColumns){ chunks <- strsplit(Cnames[i], "_")[[1]] diff --git a/man/renameNWISColumns.Rd b/man/renameNWISColumns.Rd index 84c6b277f91bc941b5b00037ecd8bb93cfc0dbf6..e877e0420bd4d551eedb67c9380ef1defd3d24a9 100644 --- a/man/renameNWISColumns.Rd +++ b/man/renameNWISColumns.Rd @@ -68,6 +68,10 @@ endDate <- "2012-10-01" url2 <- constructNWISURL(siteWithTwo, "00060",startDate,endDate,'dv') twoResults <- importWaterML1(url2,TRUE) twoResults <- renameNWISColumns(twoResults) +url2RDB <- constructNWISURL(siteWithTwo,"00060", + startDate,endDate,"dv",format="tsv") +rdbResults <- importRDB1(url2RDB) +rdbResults <- renameNWISColumns(rdbResults) } } \seealso{