check usage of return #12

R/accumulate_downstream.R

@@ -13,7 +13,7 @@ required_atts_accumulate <- c(id, toid)
 #'
 #' plot(x['totDASqKM'], lwd = x$totDASqKM / 50)
 accumulate_downstream <- function(x, var) {
-  if(!var %in% names(x)) stop(paste(var, "must be in x"))
+  if(!var %in% names(x)) stop(var, " must be in x")
 
   UseMethod("accumulate_downstream")
 }
@@ -58,5 +58,5 @@ accumulate_downstream.hy <- function(x, var) {
 
   x <- distinct(left_join(cat_order, x, by = "id"))
 
-  return(x[[var]])
+  x[[var]]
 }

R/add_divergence.R

@@ -42,7 +42,7 @@ required_atts_add_divergence <- c("id", "fromnode", "tonode")
 #' name to use is chosen 1) if there is only one upstream flowline with a name
 #' 2) if one of the upstream flowlines with a name matches the downstream line,
 #' 3) if one of the upstream flowlines is of a "major" type and others are not,
-#' and 4) the smallest id value otherwise.
+#' and, 4) if no criteria exist to select one, the smallest id value otherwise.
 #'
 #' @name add_divergence
 #' @export

R/add_levelpaths.R

@@ -174,10 +174,9 @@ add_levelpaths.hy <- function(x, name_attribute, weight_attribute,
   x <- select(x, all_of(c(id, toid, levelpath_outlet_id, topo_sort, levelpath)),
               !all_of(c("done", "lp_name_attribute", "lp_weight_attribute", "ind", "toind")))
 
-  x <- left_join(x, select(extra, -any_of(c("levelpath_outlet_id", "topo_sort", "levelpath"))),
-                 by = id)
+  left_join(x, select(extra, -any_of(c("levelpath_outlet_id", "topo_sort", "levelpath"))),
+            by = id)
 
-  return(x)
 }
 
 par_get_path <- function(outlet, x_in, from_ind, status, wat) {
@@ -248,8 +247,7 @@ get_path <- function(x, tailid, from_ind, status, wat) {
 
   }
 
-
-  return(tracker[!is.na(tracker)])
+  tracker[!is.na(tracker)]
 }
 
 reweight <- function(x, ..., override_factor, nat, wat) {

R/add_pathlength.R

@@ -52,5 +52,5 @@ add_pathlength.hy <- function(x) {
     }
   }
 
-  return(left_join(orig_order, x, by = id))
+  left_join(orig_order, x, by = id)
 }

R/add_pfafstetter.R

@@ -203,5 +203,5 @@ cleanup_pfaf <- function(pfaf) {
       floor(pfaf[, (i + 1)][is.na(pfaf[, i, drop = TRUE]), ] / 10)
   }
 
-  return(pfaf)
+  pfaf
 }

R/align_names.R

@@ -80,7 +80,7 @@ align_names <- function(x) {
 
   names(x)[switch_back] <- orig_names[switch_back]
 
-  return(x)
+  x
 
 }
 
@@ -129,6 +129,6 @@ hydroloom_names <- function(x = NULL, clear = FALSE) {
 
   assign("hydroloom_name_map", hl, envir = hydroloom_env)
 
-  return(hl)
+  hl
 
 }

R/get_hydro_location.R

@@ -66,7 +66,7 @@ get_hydro_location_single <- function(x) {
 
   new <- interp_meas(new_m, coords$X[nds], coords$Y[nds], coords$X[nus], coords$Y[nus])
 
-  return(st_sfc(st_point(c(new[[1]], new[[2]])), crs = st_crs(x[[2]])))
+  st_sfc(st_point(c(new[[1]], new[[2]])), crs = st_crs(x[[2]]))
 }
 
 interp_meas <- function(m, x1, y1, x2, y2) {

R/index_points_to_lines.R

@@ -32,7 +32,7 @@ matcher <- function(coords, points, search_radius, max_matches = 1) {
     ungroup() |>
     as.data.frame()
 
-  return(matched)
+  matched
 }
 
 check_search_radius <- function(search_radius, points) {
@@ -338,7 +338,7 @@ index_points_to_lines.hy <- function(x, points,
                        by = c("node" = "index")) |>
     select(all_of(select_vec2))
 
-  return(matched)
+  matched
 }
 
 #' @title Index Points to Waterbodies

R/make_fromids.R

@@ -56,7 +56,7 @@ make_fromids <- function(index_ids, return_list = FALSE) {
   if(return_list) return(list(froms = froms_m, lengths = froms_l,
                               froms_list = froms))
 
-  return(list(froms = froms_m, lengths = froms_l))
+  list(froms = froms_m, lengths = froms_l)
 
 }
 

R/make_index_ids.R

@@ -137,6 +137,6 @@ format_index_ids <- function(g, return_list = FALSE) {
   if(return_list) return(list(to = to_m, lengths = to_l,
                               to_list = g))
 
-  return(list(to = to_m, lengths = to_l))
+  list(to = to_m, lengths = to_l)
 
 }

R/navigation_network.R

@@ -131,9 +131,9 @@ get_UT <- function(x, id, distance) {
 
     x <- filter(x, .data$id %in% all)
 
-    return(filter(x, .data$pathlength_km <= stop_pathlength_km)$id)
+    filter(x, .data$pathlength_km <= stop_pathlength_km)$id
   } else {
-    return(all)
+    all
   }
 }
 
@@ -160,9 +160,9 @@ private_get_UT <- function(x, id) {
   trib_id <- filter(x, levelpath %in% trib_lpid)$id
 
   if (length(trib_id) > 0) {
-    return(c(full_main$id, private_get_UT(x, trib_id)))
+    c(full_main$id, private_get_UT(x, trib_id))
   } else {
-    return(full_main$id)
+    full_main$id
   }
 }
 
@@ -187,7 +187,7 @@ get_UM <- function(x, id, distance = NULL) {
 
   }
 
-  return(main_us$id)
+  main_us$id
 }
 
 get_DM <- function(x, id, distance = NULL) {
@@ -210,7 +210,7 @@ get_DM <- function(x, id, distance = NULL) {
       filter(id %in% main_ds$id, (pathlength_km + length_km) >= stop_pathlength_km)
   }
 
-  return(main_ds$id)
+  main_ds$id
 }
 
 
@@ -246,7 +246,7 @@ private_get_DM <- function(x, id) {
     }
   }
 
-  return(select(ds_main, id, topo_sort))
+  select(ds_main, id, topo_sort)
 }
 
 get_DD <- function(x, id, distance = NULL) {
@@ -267,9 +267,9 @@ get_DD <- function(x, id, distance = NULL) {
   if (!is.null(distance)) {
     x <- filter(x, id %in% unique(all))
 
-    return(filter(x, (pathlength_km + length_km) >= stop_pathlength_km)$id)
+    filter(x, (pathlength_km + length_km) >= stop_pathlength_km)$id
   } else {
-    return(unique(all))
+    unique(all)
   }
 }
 
@@ -311,7 +311,7 @@ private_get_DD <- function(x, id, stop_pathlength_km = 0) {
 
     c(ds_main$id, private_get_DD(x, ds_id, stop_pathlength_km))
   } else {
-    return(ds_main$id)
+    ds_main$id
   }
 }
 

R/sort_network.R

@@ -199,5 +199,5 @@ sort_network.hy <- function(x, split = FALSE, outlets = NULL) {
 
   x <- put_hyg(x, hy_g)
 
-  return(x)
+  x
 }