fixed merge error in waterML1

wdwatkins · wdwatkins · commit b02c75435fbb · 2016-09-06T11:49:47.000-05:00
diff --git a/R/importWaterML1.r b/R/importWaterML1.r
@@ -244,7 +244,12 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
           obsDF <- full_join(obsDF, valParentDF, by = c("dateTime","tz_cd"))
         }
       }else{
-        obsDF <- data.frame()
+        #need column names for joining later
+        obsDF <- data.frame(dateTime=character(0), tz_cd=character(0), stringsAsFactors = FALSE)
+        if(asDateTime){
+          obsDF$dateTime <- as.POSIXct(obsDF$dateTime)
+        }
+        
       }
     }
    

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,12 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){`
`244`	`244`	`obsDF <- full_join(obsDF, valParentDF, by = c("dateTime","tz_cd"))`
`245`	`245`	`}`
`246`	`246`	`}else{`
`247`		`- obsDF <- data.frame()`
	`247`	`+ #need column names for joining later`
	`248`	`+ obsDF <- data.frame(dateTime=character(0), tz_cd=character(0), stringsAsFactors = FALSE)`
	`249`	`+ if(asDateTime){`
	`250`	`+ obsDF$dateTime <- as.POSIXct(obsDF$dateTime)`
	`251`	`+ }`
	`252`	`+`
`248`	`253`	`}`
`249`	`254`	`}`
`250`	`255`