Merge pull request #362 from dblodgett-usgs/main

remove web responses with 0 rows - fixes #361
DOI-USGS · Oct 10, 2023 · 02c4889 · 02c4889
2 parents 20cafb6 + bdf1f5f
commit 02c4889
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: nhdplusTools
 Type: Package
 Title: NHDPlus Tools
-Version: 1.0.0
+Version: 1.0.1
 Authors@R: c(person(given = "David", 
                     family = "Blodgett", 
                     role = c("aut", "cre"), 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+nhdplusTools 1.0.1
+==========
+
+- fixed bug with large nhdplus downloads with empty tiles. #361
+
 nhdplusTools 1.0.0
 ==========
 

diff --git a/R/geoserver_tools.R b/R/geoserver_tools.R
@@ -227,6 +227,12 @@ unify_types <- function(out) {
       }
     }
   }
+
+  rows <- sapply(out, nrow)
+
+  if(any(rows > 0))
+    out <- out[rows > 0]
+
   out
 }
 

diff --git a/tests/testthat/test_02_subset_extras.R b/tests/testthat/test_02_subset_extras.R
@@ -170,3 +170,14 @@ test_that("extras", {
   expect_equal(nhdplusTools:::get_empty("MULTIPOINT"), sf::st_multipoint())
   expect_error(nhdplusTools:::get_empty("BORKED"), "unexpected geometry type")
 })
+
+test_that("unify_types", {
+
+  check <- list(data.frame(), data.frame(one = 1, two = "2"), data.frame(one = "1", two = 2))
+
+  out <- nhdplusTools:::unify_types(check)
+
+  expect_equal(out,
+               list(structure(list(one = 1, two = 2), row.names = c(NA, -1L), class = "data.frame"),
+                    structure(list(one = 1, two = 2), row.names = c(NA, -1L), class = "data.frame")))
+})
diff --git a/tests/testthat/test_get_vaa.R b/tests/testthat/test_get_vaa.R
@@ -2,6 +2,7 @@
 
 test_that("vaa examples", {
   skip_on_cran()
+  testthat::skip_on_os("linux")
 
   vaa_names <- get_vaa_names()
 
@@ -35,6 +36,7 @@ test_that("vaa examples", {
 test_that("catchment chars", {
 
   skip_on_cran()
+  testthat::skip_on_os("linux")
 
   httptest::without_internet({
     suppressMessages(expect_warning(w <- get_characteristics_metadata(cache = FALSE)))
-Original file line number
+Diff line change
@@ Expand Up / @@ -227,6 +227,12 @@ unify_types <- function(out) { @@
           }
         }
       }
+      rows <- sapply(out, nrow)
+      if(any(rows > 0))
+        out <- out[rows > 0]
       out
     }
@@ Expand Down @@