From 2fcd2729b2444e633d12e205d37f1d130e542607 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Thu, 11 Sep 2014 09:07:01 -0500
Subject: [PATCH] Added time zone stuff, took out factors.
---
R/getWaterML1Data.r | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/R/getWaterML1Data.r b/R/getWaterML1Data.r
index 45c0c778..554b7cbe 100644
--- a/R/getWaterML1Data.r
+++ b/R/getWaterML1Data.r
@@ -8,7 +8,7 @@
#' @export
#' @import XML
#' @examples
-#' sites <- "02177000"
+#' siteNumber <- "02177000"
#' startDate <- "2012-09-01"
#' endDate <- "2012-10-01"
#' offering <- '00003'
@@ -103,15 +103,16 @@ getWaterML1Data <- function(obs_url){
df <- data.frame(dateTime,
tzAbbriev,
get(valueName),
- get(qualName)
- )
- names(df) <- c("dateTime","tz_cd",valueName,qualName)
+ get(qualName),
+ stringsAsFactors=FALSE)
+
+ names(df) <- c("datetime","tz_cd",valueName,qualName)
} else {
df <- data.frame(dateTime,
tzAbbriev,
- get(valueName)
- )
- names(df) <- c("dateTime","tz_cd",valueName)
+ get(valueName),stringsAsFactors=FALSE)
+
+ names(df) <- c("datetime","tz_cd",valueName)
}
if (1 == i & valuesIndex[1] == j){
@@ -125,8 +126,8 @@ getWaterML1Data <- function(obs_url){
agencyCd <- as.character(xpathSApply(timeSeries[[1]], "ns1:sourceInfo/ns1:siteCode/@agencyCode",namespaces = chunkNS))
siteNo <- as.character(xpathSApply(timeSeries[[1]], "ns1:sourceInfo/ns1:siteCode",namespaces = chunkNS, xmlValue))
- mergedDF$agency <- rep(agencyCd, nrow(mergedDF))
- mergedDF$site <- rep(siteNo, nrow(mergedDF))
+ mergedDF$agency_cd <- rep(agencyCd, nrow(mergedDF))
+ mergedDF$site_no <- rep(siteNo, nrow(mergedDF))
reorder <- c(ncol(mergedDF)-1, ncol(mergedDF), 1:(ncol(mergedDF)-2))
--
GitLab