do no harm on AK prep

workspace/00_AK_prep.Rmd

@@ -50,20 +50,20 @@ if(needs_layer(ak_gpkg, ak_flowline)) {
   
   ak_rivers[["order"]] <- st_drop_geometry(ak_rivers) %>%
     select(ID = COMID, toID = NextDownID) %>%
-    add_streamoder() %>%
+    hydroloom::add_streamorder() %>%
     dplyr::pull(stream_order)
   
   lp <- st_drop_geometry(ak_rivers) %>%
     select(ID = COMID, toID = NextDownID, weight = arbolate_sum) %>%
     mutate(nameID = "constant") %>%
-    add_levelpaths(weight_attribute = "weight", 
+    hydroloom::add_levelpaths(weight_attribute = "weight", 
                    name_attribute = "nameID",
                    override_factor = NULL) %>%
-    select(dplyr::all_of(c("ID" = "id", "outletID" = "levelpath_outlet_id",
+    select(dplyr::all_of(c("ID" = "ID", "outletID" = "levelpath_outlet_id",
                           "topo_sort" = "topo_sort", "levelpath" = "levelpath"))) |>
     as.data.frame()
   
-  lp <- rename(lp, COMID = .data$ID, outletCOMID = .data$outletID)
+  lp <- rename(lp, COMID = ID, outletCOMID = outletID)
   
   ak_rivers <- left_join(ak_rivers, lp, by = "COMID")
   
@@ -77,11 +77,11 @@ if(needs_layer(ak_gpkg, ak_flowline)) {
   ak_outlets <- ak_rivers$COMID[ak_rivers$toCOMID == 0]
   
   terminal_paths <- dplyr::left_join(data.frame(ID = ak_rivers$COMID),
-                                     hydroloom::get_sorted(
+                                     hydroloom::sort_network(
                                        select(st_drop_geometry(ak_rivers), COMID, toCOMID), 
                                        split = TRUE,
                                        outlets = ak_outlets) |>
-                                       dplyr::select(dplyr::all_of(c("ID", "terminalID"))))
+                                       dplyr::select(dplyr::all_of(c("ID" = "COMID", "terminalID" = "terminal_id"))))
                                      
   terminal_paths <- left_join(terminal_paths, 
                               select(st_drop_geometry(ak_rivers), 
@@ -100,13 +100,13 @@ if(needs_layer(ak_gpkg, ak_flowline)) {
   pathlength <- hydroloom::add_pathlength(select(st_drop_geometry(ak_rivers), 
                                                  ID = COMID, 
                                                  toID = toCOMID, 
-                                                 length = LENGTHKM)) |>
-    dplyr::select(ID, pathlength)
+                                                 length_km = LENGTHKM)) |>
+    dplyr::select(ID, pathlength = pathlength_km)
   
   ak_rivers <- left_join(ak_rivers, 
-                         select(pathlength, 
-                                COMID = ID, 
-                                Pathlength = pathlength),
+                         select(pathlength, dplyr::all_of(c(
+                                COMID = "ID", 
+                                Pathlength = "pathlength"))),
                          by = "COMID")
   
   # Same as mainstems:::prep_net