Simplify inner_join() in get_trip_geometry()

R/spatial.R

@@ -146,9 +146,14 @@ get_trip_geometry <- function(gtfs_sf_obj, trip_ids) {
   }
 
   trips = gtfs_sf_obj$trips %>% filter(trip_id %in% trip_ids)
-  trips_shapes = suppress_matches_multiple_warning(
-    dplyr::inner_join(gtfs_sf_obj$shapes, trips, by = "shape_id")
-  )
+
+  if (utils::packageVersion("dplyr") >= "1.1.0.9000") {
+    trips_shapes = dplyr::inner_join(gtfs_sf_obj$shapes, trips, by = "shape_id")
+  } else {
+    # TODO: Remove after dplyr 1.1.1 is released
+    trips_shapes = dplyr::inner_join(gtfs_sf_obj$shapes, trips, by = "shape_id", multiple = "all")
+  }
+
   return(trips_shapes)
 }
 

R/utils.R

@@ -48,16 +48,3 @@ na_to_empty_strings = function(gtfs_obj) {
     df
   })
 }
-
-# TODO: Remove after dplyr 1.1.0 is released and use `multiple = "all"` instead
-suppress_matches_multiple_warning <- function(expr) {
-  handler_matches_multiple <- function(cnd) {
-    if (inherits(cnd, "dplyr_warning_join_matches_multiple")) {
-      restart <- findRestart("muffleWarning")
-      if (!is.null(restart)) {
-        invokeRestart(restart)
-      }
-    }
-  }
-  withCallingHandlers(expr, warning = handler_matches_multiple)
-}