From ee1dece8a943f03ec3084d7e70473300926b3a34 Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Fri, 26 Jun 2015 10:57:21 -0500
Subject: [PATCH] Explicitly call reshape2...doesn't solve reshape conflict
though.
---
R/importWaterML1.r | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/R/importWaterML1.r b/R/importWaterML1.r
index 6773791a..0931e4dc 100644
--- a/R/importWaterML1.r
+++ b/R/importWaterML1.r
@@ -40,7 +40,8 @@
#' @export
#' @import XML
#' @import RCurl
-#' @import reshape2
+#' @importFrom reshape2 melt
+#' @importFrom reshape2 dcast
#' @examples
#' siteNumber <- "02177000"
#' startDate <- "2012-09-01"
@@ -403,8 +404,11 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
qualColumns <- unique(qualColumns)
sortingColumns <- names(mergedDF)[!(names(mergedDF) %in% c(dataColumns,qualColumns))]
-
- meltedmergedDF <- reshape2::melt(mergedDF,id.vars=sortingColumns)
+
+ meltedmergedDF <- reshape2::melt(mergedDF, measure.vars = c(dataColumns,qualColumns),
+ variable.name = "variable", value.name = "value", na.rm = FALSE)
+ rownames(meltedmergedDF) <- NULL
+ # meltedmergedDF <- reshape2::melt(mergedDF,id.vars=sortingColumns)
meltedmergedDF <- meltedmergedDF[!is.na(meltedmergedDF$value),]
meltedmergedDF <- meltedmergedDF[!duplicated(meltedmergedDF),]
@@ -416,7 +420,7 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
indexDups <- as.numeric(row.names(qualDups))
if(length(indexDups) > 0){
- mergedDF2 <- reshape2::dcast(meltedmergedDF[-indexDups,], castFormula, drop=FALSE, value.var = "value",)
+ mergedDF2 <- reshape2::dcast(meltedmergedDF[-indexDups,], castFormula, drop=FALSE, value.var = "value")
# Need to get value....
dupInfo <- meltedmergedDF[indexDups, sortingColumns]
--
GitLab