Merge pull request #584 from dblodgett-usgs/master

quote handling -- fixes #583

R/findNLDI.R

@@ -23,7 +23,8 @@ find_good_names = function(input, type) {
   if (type == "nav") {
     grep("comid", names(input), value = TRUE)
   } else if (type == "feature") {
-    c("sourceName", "identifier", "comid")
+    c("sourceName", "identifier", "comid",
+      names(input)[names(input) %in% c("name", "reachcode", "measure")])
   } else {
     NULL
   }

R/importRDB1.r

@@ -135,6 +135,7 @@ importRDB1 <- function(obs_url, asDateTime=TRUE, convertType = TRUE, tz="UTC"){
   if(data.rows > 0){
     args_list <- list(file = f,
                  delim = "\t",
+                 quote = "",
                  skip = meta.rows + 2,
                  col_names = FALSE)
     if(utils::packageVersion("readr") > 1.4){

tests/testthat/tests_imports.R

@@ -44,6 +44,24 @@ test_that("External importRDB1 tests", {
                           statCd = "laksjd")
   # And....now there's data there:
   expect_null(importRDB1(url))
+  
+  site <- "11486500"
+  
+  url <- dataRetrieval:::drURL("site", arg.list = list(siteOutput = "Expanded", 
+                                                       format = "rdb", 
+                                                       site = site))
+  site_data <- importRDB1(url)
+  
+  expect_equal(site_data$station_nm, "\"G\" CANAL NEAR OLENE,OREG.")
+  
+  site <- "040854588204"
+  
+  url <- dataRetrieval:::drURL("site", arg.list = list(siteOutput = "Expanded", 
+                                                       format = "rdb", 
+                                                       site = site))
+  site_data <- importRDB1(url)
+  
+  expect_equal(site_data$station_nm, "\"FISHER CR AT 32 & HIGHLAND RD AT HOWARDS GROVE, W")
 })
 
 context("importRDB")

tests/testthat/tests_nldi.R

@@ -15,7 +15,8 @@ test_that("NLDI starting sources...", {
   # POINT GEOMETERY
   expect_equal(sum(names(findNLDI(nwis = '11120000')) ==
                      c('sourceName', 'identifier', "comid",
-                       "X", "Y", "geometry")),  6)
+                       "name", "reachcode", "measure",
+                       "X", "Y", "geometry")),  9)
   # COMID
   expect_equal(findNLDI(comid = 101)$sourceName, "NHDPlus comid")
   # NWIS