From f5c3670769add8151375383ac058a1e6ced4d190 Mon Sep 17 00:00:00 2001
From: David Blodgett <dblodgett@usgs.gov>
Date: Tue, 15 Aug 2023 20:58:05 -0500
Subject: [PATCH] minor fixes
---
workspace/02_NHD_navigate.Rmd | 2 +-
workspace/06-1_hyRefactor_cats.Rmd | 1 +
workspace/06-2_aggregate_cats.Rmd | 13 +++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/workspace/02_NHD_navigate.Rmd b/workspace/02_NHD_navigate.Rmd
index f5eb821..9bf3eaa 100644
--- a/workspace/02_NHD_navigate.Rmd
+++ b/workspace/02_NHD_navigate.Rmd
@@ -207,7 +207,7 @@ if(!"Type_WBOut" %in% names(tmp_POIs)) {
wb_out_col <- wb_poi_collapse(wb_layers$POIs, filter(nhd, WB == 1), events)
tmp_POIs <- wb_out_col$POIs
- if(!is.na(wb_out_col$events_ret)){
+ if(!all(is.na(wb_out_col$events_ret))) {
write_sf(wb_out_col$events_ret, temp_gpkg, split_layer)
}
diff --git a/workspace/06-1_hyRefactor_cats.Rmd b/workspace/06-1_hyRefactor_cats.Rmd
index 3071f1e..0a4a4c6 100644
--- a/workspace/06-1_hyRefactor_cats.Rmd
+++ b/workspace/06-1_hyRefactor_cats.Rmd
@@ -65,6 +65,7 @@ if(needs_layer(out_refac_gpkg, divide_layer)) {
write_sf(sf::st_transform(split_cats, crs), out_refac_gpkg, split_divide_layer)
+ rm(split_cats)
}
unlink(cache_split)
diff --git a/workspace/06-2_aggregate_cats.Rmd b/workspace/06-2_aggregate_cats.Rmd
index c28f674..b67a588 100644
--- a/workspace/06-2_aggregate_cats.Rmd
+++ b/workspace/06-2_aggregate_cats.Rmd
@@ -86,6 +86,19 @@ if(needs_layer(out_agg_gpkg, agg_cats_layer)){
}
+ # Identify reconciled flowpaths that are terminal and below DA threshold
+ reconciled_DA <- filter(reconciled, TotDASqKM <= aggregate_da_thresh_sqkm, is.na(toID))
+
+ # Ones not in existing pois
+ extra_outlets <- filter(reconciled_DA, !ID %in% outlets$ID) %>%
+ pull(ID)
+
+ extra_nets <- nhdplusTools::get_sorted(select(sf::st_drop_geometry(reconciled),
+ ID, toID), outlets = extra_outlets)
+
+ # remove extra network from contention
+ reconciled <- filter(reconciled, !ID %in% extra_nets$ID)
+
outlets <- outlets %>%
left_join(select(st_drop_geometry(reconciled), ID, toID), by = "ID") %>%
mutate(type = ifelse(is.na(toID), "terminal", "outlet")) %>%
--
GitLab