Merge branch 'main' into 'main'

minor fixes

See merge request !174

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)
   }
   

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)

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")) %>%