From 392611a317146bc8a8e96b79dec191b5d9b461a1 Mon Sep 17 00:00:00 2001 From: Laura DeCicco Date: Tue, 14 Jun 2016 15:17:32 -0500 Subject: [PATCH 1/4] Took out parse_number --- NAMESPACE | 1 - 1 file changed, 1 deletion(-) diff --git a/NAMESPACE b/NAMESPACE index 0598f38..3d38213 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -65,7 +65,6 @@ importFrom(lubridate,parse_date_time) importFrom(readr,col_character) importFrom(readr,col_number) importFrom(readr,cols) -importFrom(readr,parse_number) importFrom(readr,problems) importFrom(readr,read_delim) importFrom(readr,read_lines) -- GitLab From e599c87e62404d5e19e4f738cf78cd0b5711221b Mon Sep 17 00:00:00 2001 From: Laura DeCicco Date: Tue, 14 Jun 2016 15:18:15 -0500 Subject: [PATCH 2/4] changed fast_strptime again --- R/importRDB1.r | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/R/importRDB1.r b/R/importRDB1.r index 9ee984d..f222ad3 100644 --- a/R/importRDB1.r +++ b/R/importRDB1.r @@ -47,8 +47,8 @@ #' @importFrom readr read_lines #' @importFrom readr read_delim #' @importFrom readr problems -#' @importFrom readr parse_number #' @importFrom lubridate fast_strptime +#' @importFrom lubridate parse_date_time #' @examples #' siteNumber <- "02177000" #' startDate <- "2012-09-01" @@ -166,12 +166,8 @@ importRDB1 <- function(obs_url, asDateTime=TRUE, convertType = TRUE, tz=""){ if(all(c(paste0(i,"_dt"),paste0(i,"_tm")) %in% header.names)){ varname <- paste0(i,"_dateTime") - - if("lt" %in% names(formals(fast_strptime))){ - varval <- fast_strptime(paste(readr.data[,paste0(i,"_dt")],readr.data[,paste0(i,"_tm")]), "%Y-%m-%d %H:%M", tz = "UTC", lt=FALSE) - } else { - varval <- fast_strptime(paste(readr.data[,paste0(i,"_dt")],readr.data[,paste0(i,"_tm")]), "%Y-%m-%d %H:%M", tz = "UTC") - } + + varval <- as.POSIXct(fast_strptime(paste(readr.data[,paste0(i,"_dt")],readr.data[,paste0(i,"_tm")]), "%Y-%m-%d %H:%M", tz = "UTC")) if(!all(is.na(varval))){ readr.data[,varname] <- varval @@ -203,7 +199,7 @@ importRDB1 <- function(obs_url, asDateTime=TRUE, convertType = TRUE, tz=""){ if(all(c("DATE","TIME","TZCD") %in% header.names)){ varname <- "DATETIME" - varval <- fast_strptime(paste(readr.data[,"DATE"],readr.data[,"TIME"]), "%Y-%m-%d %H%M%S", tz = "UTC", lt=FALSE) + varval <- as.POSIXct(fast_strptime(paste(readr.data[,"DATE"],readr.data[,"TIME"]), "%Y-%m-%d %H%M%S", tz = "UTC")) readr.data[,varname] <- varval readr.data <- convertTZ(readr.data,"TZCD",varname,tz, flip.cols=TRUE) } -- GitLab From 15aad571b345448904b743396ee18847cbedb329 Mon Sep 17 00:00:00 2001 From: Laura DeCicco Date: Mon, 20 Jun 2016 15:22:30 -0500 Subject: [PATCH 3/4] Added type to eventually get NGWMN --- R/getWebServiceData.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/getWebServiceData.R b/R/getWebServiceData.R index dbfd7e6..6473fa3 100644 --- a/R/getWebServiceData.R +++ b/R/getWebServiceData.R @@ -37,7 +37,8 @@ getWebServiceData <- function(obs_url, ...){ if(headerInfo$`content-type` == "text/tab-separated-values;charset=UTF-8"){ returnedDoc <- content(returnedList, type="text",encoding = "UTF-8") - } else if (headerInfo$`content-type` == "text/xml;charset=UTF-8"){ + } else if (headerInfo$`content-type` %in% c("text/xml;charset=UTF-8", + "text/xml")){ returnedDoc <- xmlcontent(returnedList) } else if (headerInfo$`content-type` == "text/html"){ txt <- readBin(returnedList$content, character()) -- GitLab From fdd23dbbb06fb965bca3146dae0d5d285d4ffce6 Mon Sep 17 00:00:00 2001 From: Laura DeCicco Date: Tue, 21 Jun 2016 16:43:20 -0500 Subject: [PATCH 4/4] Version --- DESCRIPTION | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 403dd70..219a1b4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: dataRetrieval Type: Package Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data -Version: 2.5.9 +Version: 2.5.10 Date: 2016-06-14 Authors@R: c( person("Robert", "Hirsch", role = c("aut"), email = "rhirsch@usgs.gov"), @@ -12,7 +12,9 @@ Authors@R: c( person("Robert", "Hirsch", role = c("aut"), person("Jordan", "Read", role = c("ctb"), email = "jread@usgs.gov"), person("Lindsay","Carr", role=c("ctb"), - email = "lcarr@usgs.gov")) + email = "lcarr@usgs.gov"), + person("David","Watkins", role=c("ctb"), + email = "wwatkins@usgs.gov")) Description: Collection of functions to help retrieve U.S. Geological Survey (USGS) and U.S. Environmental Protection Agency (EPA) water quality and hydrology data from web services. USGS web services are discovered from the -- GitLab