Merge branch 'main' into 'main'

WB inlet and Outlet fix

See merge request !155

workspace/02_NHD_navigate.Rmd

@@ -209,7 +209,8 @@ if(all(is.na(tmp_POIs$Type_WBOut))) {
   # Waterbody list that strictly meet the size criteria
   wb_lst <- st_drop_geometry(WBs_VPU_all) %>%
     dplyr::filter(FTYPE %in% c("LakePond", "Reservoir") & AREASQKM >= (min_da_km/2)) %>%
-    dplyr::select(COMID)
+    dplyr::select(COMID) %>%
+    filter(!COMID == 166410600)
 
   if (file.exists(data_paths$resops_NID_CW)){
     # ResOpsUS locations in the VPU waterbody set

workspace/06-2_aggregate_cats.Rmd

@@ -64,14 +64,12 @@ if(needs_layer(out_agg_gpkg, agg_cats_layer)){
                                     type = rep("terminal", length(missing_outlets))))
     write_sf(filter(reconciled, ID %in% missing_outlets), out_agg_gpkg, "missing_outlets")
     
-    outlets_terms_fixed <- outlets %>%
+    outlets <- outlets %>%
       left_join(select(st_drop_geometry(reconciled), ID, toID), by = "ID") %>%
       mutate(type = ifelse(type == "terminal" & !is.na(toID), "outlet", type)) %>%
       select(-toID)
   }
   
-  
-  
   agg_cats <- aggregate_catchments(flowpath = reconciled,
                                    divide = divides,
                                    outlets = outlets,

workspace/R/NHD_navigate.R

@@ -998,13 +998,18 @@ WB_event <- function(WBs, nhd_wb, type){
     
     inlet_ls <- inlet_FL %>%
       group_by(LevelPathI) %>%
-      summarize(do_union = T)
+      st_cast("POINT") %>%
+      summarize(do_union = F) %>%
+      st_cast("LINESTRING")
     
     inlet_pnts <- sf::st_intersection(inlet_ls, WBs_layer) %>%
+      #group_by("LINESTRING") %>%  
       st_cast("POINT") %>%
-      group_by(LevelPathI) %>%
-      filter(row_number() == min(row_number())) %>%
-      ungroup() 
+      st_as_sf()
+      #mutate(row_id = row_number()) %>%
+      #group_by(LevelPathI) %>%
+      #filter(row_id == min(row_id)) %>%
+      #ungroup() 
     
     wb_events <- get_flowline_index(nhd_wb, inlet_pnts) %>%
       inner_join(select(st_drop_geometry(nhd_wb), COMID, WBAREACOMI, LevelPathI), by = "COMID") %>%
@@ -1195,11 +1200,10 @@ wbin_POIcreation <- function(nhd, WBs_VPU, data_paths, crs, split_layer){
                            tmp_POIs, "WBIn")
       
       wb_inlet_events <- filter(wb_inlet_events, !COMID %in% wb_inlet_POIs$COMID)
-      if(nrow(wb_inlet_POIs) != nrow(wb_inlet_events)){
+      if(nrow(wb_inlet_events) > 0){
         
         tmp_POIs <- data.table::rbindlist(list(tmp_POIs,
-                                               select(wb_inlet_events, COMID, Type_WBIn = WBAREACOMI, nexus) %>%
-                                                 filter(!COMID %in% tmp_POIs$COMID)), fill = TRUE) %>%
+                                               select(wb_inlet_events, COMID, Type_WBIn = WBAREACOMI, nexus)), fill = TRUE) %>%
           st_as_sf()
       }