Navigate

.Rbuildignore

@@ -14,3 +14,4 @@ data-raw
 ^\.ccache$
 ^\.github$
 ^tic\.R$
+Dockerfile

.github/workflows/R-CMD-check.yml

@@ -1,16 +1,16 @@
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 name: R-CMD-check
 
 jobs:
   R-CMD-check:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

DESCRIPTION

@@ -9,27 +9,24 @@ URL: https://github.com/dblodgett-usgs/hyrefactor
 BugReports: https://github.com/dblodgett-usgs/hyrefactor/issues
 Depends:
     R (>= 3.5.0)
-Imports: 
-  dplyr, 
-  sf, 
-  lwgeom, 
-  units, 
-  magrittr, 
-  data.table, 
-  raster, 
-  nhdplusTools, 
-  igraph, 
-  tidyr, 
-  pbapply, 
-  xml2, 
-  rvest, 
-  httr, 
-  stringr, 
-  methods,
-  rlang,
-  rgeos,
-  rmapshaper
-Suggests: testthat, knitr, rmarkdown, mapview, rgdal, snow
+Imports:
+    dplyr,
+    sf,
+    lwgeom,
+    units,
+    data.table,
+    terra,
+    nhdplusTools,
+    tidyr,
+    pbapply,
+    rvest,
+    httr,
+    methods,
+    rlang,
+    rgeos,
+    rmapshaper,
+    utils
+Suggests: testthat, knitr, rmarkdown
 Remotes: dblodgett-usgs/nhdplusTools
 License: CC0
 Encoding: UTF-8

NAMESPACE

@@ -9,6 +9,7 @@ export(collapse_flowlines)
 export(download_elev)
 export(download_fdr_fac)
 export(flowpaths_to_linestrings)
+export(get_minimal_network)
 export(map_outlet_ids)
 export(reconcile_catchment_divides)
 export(reconcile_collapsed_flowlines)
@@ -18,6 +19,7 @@ export(split_flowlines)
 export(union_linestrings_geos)
 export(union_polygons_geos)
 importFrom(data.table,rbindlist)
+importFrom(dplyr,`%>%`)
 importFrom(dplyr,arrange)
 importFrom(dplyr,bind_rows)
 importFrom(dplyr,case_when)
@@ -31,6 +33,7 @@ importFrom(dplyr,mutate)
 importFrom(dplyr,n)
 importFrom(dplyr,rename)
 importFrom(dplyr,right_join)
+importFrom(dplyr,row_number)
 importFrom(dplyr,select)
 importFrom(dplyr,slice_max)
 importFrom(dplyr,slice_min)
@@ -40,28 +43,15 @@ importFrom(dplyr,ungroup)
 importFrom(httr,RETRY)
 importFrom(httr,progress)
 importFrom(httr,write_disk)
-importFrom(igraph,V)
-importFrom(igraph,bfs)
-importFrom(igraph,graph_from_data_frame)
-importFrom(igraph,head_of)
-importFrom(igraph,incident_edges)
-importFrom(igraph,shortest_paths)
-importFrom(igraph,topo_sort)
-importFrom(magrittr,"%>%")
-importFrom(methods,is)
 importFrom(methods,slot)
+importFrom(nhdplusTools,add_plus_network_attributes)
 importFrom(nhdplusTools,get_node)
 importFrom(nhdplusTools,get_vaa)
 importFrom(nhdplusTools,prepare_nhdplus)
 importFrom(nhdplusTools,rename_geometry)
-importFrom(raster,as.matrix)
-importFrom(raster,cellFromXY)
-importFrom(raster,crop)
-importFrom(raster,crs)
-importFrom(raster,mask)
-importFrom(raster,raster)
-importFrom(raster,rasterToPolygons)
-importFrom(raster,rowColFromCell)
+importFrom(parallel,makeCluster)
+importFrom(parallel,stopCluster)
+importFrom(pbapply,pblapply)
 importFrom(rgeos,gLineMerge)
 importFrom(rgeos,gUnaryUnion)
 importFrom(rlang,":=")
@@ -70,7 +60,8 @@ importFrom(rmapshaper,ms_explode)
 importFrom(rmapshaper,ms_simplify)
 importFrom(rvest,html_attr)
 importFrom(rvest,html_nodes)
-importFrom(sf,"st_crs<-")
+importFrom(rvest,read_html)
+importFrom(sf,`st_crs<-`)
 importFrom(sf,as_Spatial)
 importFrom(sf,st_area)
 importFrom(sf,st_as_sf)
@@ -91,10 +82,12 @@ importFrom(sf,st_geometry_type)
 importFrom(sf,st_intersection)
 importFrom(sf,st_intersects)
 importFrom(sf,st_is_empty)
+importFrom(sf,st_is_longlat)
 importFrom(sf,st_length)
 importFrom(sf,st_line_merge)
 importFrom(sf,st_linestring)
 importFrom(sf,st_make_valid)
+importFrom(sf,st_multipolygon)
 importFrom(sf,st_nearest_feature)
 importFrom(sf,st_point)
 importFrom(sf,st_precision)
@@ -107,8 +100,23 @@ importFrom(sf,st_touches)
 importFrom(sf,st_transform)
 importFrom(sf,st_union)
 importFrom(sf,st_within)
-importFrom(tidyr,unnest)
-importFrom(tidyr,unnest_longer)
+importFrom(terra,as.matrix)
+importFrom(terra,as.polygons)
+importFrom(terra,cellFromRowCol)
+importFrom(terra,cellFromXY)
+importFrom(terra,crop)
+importFrom(terra,crs)
+importFrom(terra,mask)
+importFrom(terra,rast)
+importFrom(terra,res)
+importFrom(terra,rowColFromCell)
+importFrom(terra,setValues)
+importFrom(terra,vect)
+importFrom(terra,xFromCol)
+importFrom(terra,xyFromCell)
+importFrom(terra,yFromRow)
+importFrom(tidyr,separate_rows)
 importFrom(units,drop_units)
 importFrom(units,set_units)
-importFrom(xml2,read_html)
+importFrom(utils,capture.output)
+importFrom(utils,str)

R/aggregate_catchments.R

@@ -24,7 +24,9 @@
 #' outlets <- data.frame(ID = c(31, 3, 5, 1, 45, 92),
 #'  type = c("outlet", "outlet", "outlet", "terminal", "outlet", "outlet"),
 #'  stringsAsFactors = FALSE)
-#' aggregated <- aggregate_catchments(walker_fline_rec, walker_catchment_rec, outlets)
+#' aggregated <- aggregate_catchments(flowpath = walker_fline_rec, 
+#'                                    divide = walker_catchment_rec, 
+#'                                    outlets = outlets)
 #' plot(aggregated$cat_sets$geom, lwd = 3, border = "red")
 #' plot(walker_catchment_rec$geom, lwd = 1.5, border = "green", col = NA, add = TRUE)
 #' plot(walker_catchment$geom, lwd = 1, add = TRUE)