From 1e197a5b6a0db4e574a6888f5e942d89481a9aa5 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Wed, 12 Nov 2014 15:25:06 -0600
Subject: [PATCH] More checks for genralizability.
---
R/importWaterML1.r | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/R/importWaterML1.r b/R/importWaterML1.r
index c78923d9..4e138253 100644
--- a/R/importWaterML1.r
+++ b/R/importWaterML1.r
@@ -360,8 +360,12 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
castFormula <- as.formula(paste(paste(sortingColumns, collapse="+"),"variable",sep="~"))
mergedDF2 <- dcast(meltedmergedDF, castFormula, drop=FALSE)
dataColumns2 <- !(names(mergedDF2) %in% sortingColumns)
- mergedDF <- mergedDF2[rowSums(is.na(mergedDF2[,dataColumns2])) != sum(dataColumns2),]
-
+ if(sum(dataColumns2) == 1){
+ mergedDF <- mergedDF2[!is.na(mergedDF2[,dataColumns2]),]
+ } else {
+ mergedDF <- mergedDF2[rowSums(is.na(mergedDF2[,dataColumns2])) != sum(dataColumns2),]
+ }
+
if(length(dataColumns) > 1){
mergedDF[,dataColumns] <- lapply(mergedDF[,dataColumns], function(x) as.numeric(x))
} else {
--
GitLab