Merge pull request #296 from ldecicco-USGS/master

noDataValue used better
DOI-USGS · Dec 15, 2016 · e686b61 · e686b61
2 parents 18d5f13 + 1458f14
commit e686b61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: dataRetrieval
 Type: Package
 Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
-Version: 2.6.5
-Date: 2016-12-14
+Version: 2.6.6
+Date: 2016-12-15
 Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
     email = "[email protected]"),
     person("Laura", "DeCicco", role = c("aut","cre"),

diff --git a/R/importWaterML1.r b/R/importWaterML1.r
@@ -279,7 +279,7 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
     #replace no data vals with NA, change attribute df
     noDataVal <- as.numeric(varText$noDataValue)
     if(nObs > 0){
-      obsDF[obsDF$values == noDataVal] <- NA
+      obsDF[[obsColName]][obsDF[[obsColName]] == noDataVal] <- NA
     }
     varText$noDataValue <- NA
 

diff --git a/tests/testthat/tests_userFriendly_fxns.R b/tests/testthat/tests_userFriendly_fxns.R
@@ -40,6 +40,9 @@ test_that("Unit value data returns correct types", {
                                  "X_YSI.6136.DOWN_63680_00000","X_.YSI.6136.UP._63680_00000_cd",
                                  "X_YSI.6136.DOWN_63680_00000_cd","tz_cd")))
 
+  noData <- readNWISuv("01196500","00010", "2016-06-15", "2016-06-15")
+  expect_equal(noData$X_00010_00000[1], as.numeric(NA))
+
 })
 
 context("Peak, rating, meas, site")