address hydroloom issue in sort_network

Author: mikejohnson51

R/hfsubsetR-package.R

@@ -11,7 +11,7 @@
 #' @importFrom nhdplusTools discover_nhdplus_id get_sorted
 #' @importFrom jsonlite toJSON
 #' @importFrom glue glue
-#' @importFrom dplyr tbl select mutate rename if_any filter everything distinct collect any_of `%>%`
+#' @importFrom dplyr tbl select mutate rename if_any filter everything distinct collect any_of `%>%` pull
 #' @importFrom arrow open_dataset
 #' @importFrom httr GET progress write_disk
 NULL

R/query_subset.R

@@ -24,18 +24,24 @@ query_subset <- function(query) {
     dplyr::select(dplyr::any_of(c("id", "toid", "divide_id", "poi_id"))) |>
     dplyr::distinct() |>
     dplyr::collect()
-  
-  topology <- suppressWarnings(nhdplusTools::get_sorted(network, outlets = origin$toid))
+
+ topology <- suppressWarnings(
+    nhdplusTools::sort_network(dplyr::select(network, 'id', 'toid'), 
+                            outlets = origin$toid)
+  )
 
   topology$toid[nrow(topology)] <- NA
+  
+  topology <- as.matrix(topology)
+  topology <- topology[!is.na(topology)]
 
   all_identifiers <-
-    as.matrix(topology) |>
+    filter(network, id %in% topology) |> 
+    as.matrix() |>
     as.vector() |>
     unique()
 
-  all_identifiers <-
-    all_identifiers[!is.na(all_identifiers)]
+  all_identifiers <- all_identifiers[!is.na(all_identifiers)]
 
   if('lakes' %in% query$layers){
     lake_id <- net |> 
@@ -57,6 +63,7 @@ query_subset <- function(query) {
   query_extract(query)
 }
 
+
 #' Perform data extraction from a query
 #' @param query A `hfsubset_query` object
 #' @returns A list of hydrofabric layers, or the path to the sink of the query