construct remote urls accounting for multimatching, closes #58

R/load.R

@@ -186,7 +186,6 @@ nhd_plus_load <- memoise::memoise(function(vpu, component = "NHDSnapshot", dsn,
   }
 
   nhd_plus_load_vpu <- function(vpu, component, dsn, pretty, ...){
-
       vpu_path <- list.files(file.path(nhd_path(), "NHDPlus"),
                              include.dirs = TRUE, full.names = TRUE)
 

R/utils.R

@@ -64,9 +64,16 @@ get_plus_remotepath <- function(vpu, component = "NHDSnapshot"){
   }
 
   res <- rvest::html_attrs(rvest::html_nodes(xml2::read_html(baseurl), "a"))
-  res <- unlist(res[grep(component, res)])
-  res <- res[!(seq_len(length(res)) %in% c(grep("FGDB", res), grep(".pdf", res)))][1]
-  res
+
+  if(vpu == "National"){
+    res <- unlist(res[grep(component, res)])
+  }else{
+    res <- unlist(res[grep(paste0(vpu, "_", component), res)])
+  }
+
+  res <- res[!(seq_len(length(res)) %in%
+                 c(grep("FGDB", res), grep(".pdf", res)))]
+  res[1]
 }
 
 is_spatial <- function(filename){

tests/testthat/test-get.R

@@ -15,12 +15,15 @@ test_that("remote urls are constructed correctly", {
   skip_on_cran()
   skip_on_travis()
 
-  expect_true(RCurl::url.exists(
-    get_plus_remotepath(4, component = "NHDSnapshot")))
-
-  expect_true(RCurl::url.exists(
-    get_plus_remotepath("National", component = "V1_To_V2_Crosswalk")
-  ))
+  expect_true(
+    RCurl::url.exists(
+      nhdR:::get_plus_remotepath(4, component = "NHDSnapshot"))
+    )
+
+  expect_true(
+    RCurl::url.exists(
+      nhdR:::get_plus_remotepath("National", component = "V1_To_V2_Crosswalk"))
+    )
 
 
 })