Merge pull request #168 from dblodgett-usgs/master

avoid CRAN failures when geoserver down
DOI-USGS · Nov 13, 2020 · 20f0019 · 20f0019
2 parents c8f8b6d + d0fa7e4
commit 20f0019
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,7 @@ nhdplusTools 0.3.16
 ==========
 * `subset_nhdplus()` now validates geometry and ensures all outputs are in NAD83
 * `subset_nhdplus()` queries the NHDPlus database rather than loading then filtering
+* `get_levelpaths()` rewritten for performance. Package now uses `data.table`.
 
 nhdplusTools 0.3.15
 ==========

diff --git a/R/get_paths.R b/R/get_paths.R
@@ -105,6 +105,7 @@ get_path <- function(x, tailID, status) {
     x <- data.table::data.table(x)
   }
 
+  toID <- NULL
   while(keep_going) {
     # May be more than 1
     if(dt) {

diff --git a/R/index_nhdplus.R b/R/index_nhdplus.R
@@ -68,6 +68,7 @@ matcher <- function(coords, points, search_radius, max_matches = 1) {
 #' @importFrom magrittr "%>%"
 #' @export
 #' @examples
+#' \donttest{
 #' sample_flines <- sf::read_sf(system.file("extdata",
 #'                                          "petapsco_flowlines.gpkg",
 #'                                          package = "nhdplusTools"))
@@ -94,6 +95,7 @@ matcher <- function(coords, points, search_radius, max_matches = 1) {
 #'                    search_radius = 0.2,
 #'                    max_matches = 10)
 #'
+#' }
 
 get_flowline_index <- function(flines, points,
                                search_radius = 0.1,

diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -6,7 +6,7 @@ articles:
   nhdplusTools: nhdplusTools.html
   plot_nhdplus: plot_nhdplus.html
   point_indexing: point_indexing.html
-last_built: 2020-11-05T01:06Z
+last_built: 2020-11-13T16:32Z
 urls:
   reference: https://usgs-r.github.io/nhdplusTools//reference
   article: https://usgs-r.github.io/nhdplusTools//articles

diff --git a/docs/reference/get_flowline_index.html b/docs/reference/get_flowline_index.html
diff --git a/man/get_flowline_index.Rd b/man/get_flowline_index.Rd
diff --git a/tests/testthat/test_plot_nhdplus.R b/tests/testthat/test_plot_nhdplus.R
@@ -294,6 +294,7 @@ test_that("bbox", {
 })
 
 test_that("comids", {
+  testthat::skip_on_cran()
   fline <- sf::read_sf(sample_data, "NHDFlowline_Network")
   comids <- nhdplusTools::get_UT(fline, 13293970)
   d <- nhdplusTools:::get_plot_data(comids)