Merge pull request #231 from ldecicco-USGS/master

parse_number bug fix

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: dataRetrieval
 Type: Package
 Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
-Version: 2.5.7
-Date: 2016-05-23
+Version: 2.5.8
+Date: 2016-06-06
 Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
     email = "[email protected]"),
     person("Laura", "DeCicco", role = c("aut","cre"),

R/importRDB1.r

@@ -149,7 +149,7 @@ importRDB1 <- function(obs_url, asDateTime=TRUE, convertType = TRUE, tz=""){
     badCols <- attr(readr.data, "problems")[["col"]]  
 
     if(length(badCols) > 0){
-      readr.data <- fixErrors(readr.data, readr.data.char, "no trailing characters", parse_number)
+      readr.data <- fixErrors(readr.data, readr.data.char, "no trailing characters", as.numeric)
       readr.data <- fixErrors(readr.data, readr.data.char, "date like", parse_date_time, c("%Y-%m-%d %H:%M:%S","%Y-%m-%d","%Y"))
     }
 

tests/testthat/tests_general.R

@@ -42,9 +42,9 @@ test_that("General WQP retrievals working", {
   expect_is(pHData$ActivityStartDateTime, 'POSIXct')
 
   # Known slow query for WQP:
-  pHDataExpanded2 <- readWQPdata(bBox=c(-90.1,42.9,-89.9,43.1),
-                                 characteristicName=nameToUse, querySummary = TRUE)
-  expect_is(pHDataExpanded2, 'list')
+  # pHDataExpanded2 <- readWQPdata(bBox=c(-90.1,42.9,-89.9,43.1),
+  #                                characteristicName=nameToUse, querySummary = TRUE)
+  # expect_is(pHDataExpanded2, 'list')
 
   startDate <- as.Date("2013-01-01")
   nutrientDaneCounty <- readWQPdata(countycode="US:55:025",startDate=startDate,

tests/testthat/tests_imports.R

@@ -92,7 +92,7 @@ test_that("External importWaterML1 test", {
            startGW,endGW, service="gwlevels")
   groundWater <- importWaterML1(groundwaterExampleURL)
 
-  # expect_is(groundWater$dateTime, 'character')
+  expect_is(groundWater$dateTime, 'character')
 
   unitDataURL <- constructNWISURL(siteNumber,property,
           "2013-11-03","2013-11-03",'uv')