diff --git a/R/importWaterML1.r b/R/importWaterML1.r index 6773791ae07ff87596e07ff83f37a9eed82e804e..0931e4dc1d4ac2437d3e92a8d5f70f0088bff530 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]