Merge pull request #561 from ropensci/560-line_segment-fails-when-n_s…

…egments-has-multiple-values 560 line segment fails when n segments has multiple values
ropensci · May 1, 2024 · 1221459 · 1221459
2 parents ad134be + dba1894
commit 1221459
Show file tree

Hide file tree

Showing 54 changed files with 71 additions and 67 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -88,5 +88,5 @@ VignetteBuilder:
 Encoding: UTF-8
 LazyData: yes
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 SystemRequirements: GNU make
diff --git a/R/linefuns.R b/R/linefuns.R
@@ -172,8 +172,10 @@ line_midpoint <- function(l, tolerance = NULL) {
 #' @export
 #' @examples
 #' library(sf)
-#' l <- routes_fast_sf[2:4, ]
+#' l <- routes_fast_sf[2:4, "ID"]
 #' l_seg_multi <- line_segment(l, segment_length = 1000, use_rsgeo = FALSE)
+#' l_seg_n <- line_segment(l, n_segments = 2)
+#' l_seg_n <- line_segment(l, n_segments = c(1:3))
 #' # Number of subsegments
 #' table(l_seg_multi$ID)
 #' plot(l_seg_multi["ID"])
@@ -200,7 +202,7 @@ line_segment <- function(
     use_rsgeo = NULL,
     debug_mode = FALSE) {
   # Defensive programming:
-  if (is.na(segment_length) && is.na(n_segments)) {
+  if (any(is.na(segment_length)) && any(is.na(n_segments))) {
     rlang::abort(
       "segment_length or n_segments must be set.",
       call = rlang::caller_env()
@@ -217,7 +219,7 @@ line_segment.sf <- function(
     debug_mode = FALSE
   ) {
   # Get n_segments if not provided:
-  if (is.na(n_segments)) {
+  if (all(is.na(n_segments))) {
     segment_lengths <- as.numeric(sf::st_length(l))
     n_segments <- n_segments(segment_lengths, segment_length)
   } else {

diff --git a/man/angle_diff.Rd b/man/angle_diff.Rd
diff --git a/man/bbox_scale.Rd b/man/bbox_scale.Rd
diff --git a/man/bind_sf.Rd b/man/bind_sf.Rd
diff --git a/man/cents_sf.Rd b/man/cents_sf.Rd
diff --git a/man/destinations_sf.Rd b/man/destinations_sf.Rd
diff --git a/man/flow_dests.Rd b/man/flow_dests.Rd
diff --git a/man/flowlines_sf.Rd b/man/flowlines_sf.Rd
diff --git a/man/geo_buffer.Rd b/man/geo_buffer.Rd
diff --git a/man/geo_length.Rd b/man/geo_length.Rd
diff --git a/man/geo_projected.Rd b/man/geo_projected.Rd
diff --git a/man/geo_select_aeq.Rd b/man/geo_select_aeq.Rd
diff --git a/man/geo_toptail.Rd b/man/geo_toptail.Rd
diff --git a/man/is_linepoint.Rd b/man/is_linepoint.Rd
diff --git a/man/line2df.Rd b/man/line2df.Rd
diff --git a/man/line2points.Rd b/man/line2points.Rd
diff --git a/man/line_bearing.Rd b/man/line_bearing.Rd
diff --git a/man/line_breakup.Rd b/man/line_breakup.Rd
diff --git a/man/line_midpoint.Rd b/man/line_midpoint.Rd
diff --git a/man/line_segment.Rd b/man/line_segment.Rd
diff --git a/man/line_via.Rd b/man/line_via.Rd
diff --git a/man/mats2line.Rd b/man/mats2line.Rd
diff --git a/man/n_segments.Rd b/man/n_segments.Rd
diff --git a/man/n_vertices.Rd b/man/n_vertices.Rd
diff --git a/man/od2line.Rd b/man/od2line.Rd
diff --git a/man/od2odf.Rd b/man/od2odf.Rd
diff --git a/man/od_aggregate_from.Rd b/man/od_aggregate_from.Rd
diff --git a/man/od_aggregate_to.Rd b/man/od_aggregate_to.Rd
diff --git a/man/od_coords.Rd b/man/od_coords.Rd
diff --git a/man/od_coords2line.Rd b/man/od_coords2line.Rd
diff --git a/man/od_data_lines.Rd b/man/od_data_lines.Rd
diff --git a/man/od_data_routes.Rd b/man/od_data_routes.Rd
diff --git a/man/od_data_sample.Rd b/man/od_data_sample.Rd
diff --git a/man/od_id.Rd b/man/od_id.Rd
diff --git a/man/od_id_order.Rd b/man/od_id_order.Rd