Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

depend on dplyr >= 1.1.1 #205

Merged
merged 1 commit into from
Jun 22, 2023
Merged

depend on dplyr >= 1.1.1 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
depend on dplyr >= 1.1.1
  • Loading branch information
@polettif
polettif committed Jun 21, 2023
commit d244ec0b12f9c1de259cd2872a890a3608c63380
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ LazyData: TRUE
Depends: R (>= 3.6.0)
Imports:
gtfsio (>= 1.1.0),
dplyr (>= 1.1.0),
dplyr (>= 1.1.1),
data.table (>= 1.12.8),
rlang,
sf,
Expand Down
9 changes: 2 additions & 7 deletions R/spatial.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,8 @@ get_trip_geometry <- function(gtfs_sf_obj, trip_ids) {

trips = gtfs_sf_obj$trips %>% filter(trip_id %in% trip_ids)

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")
}

trips_shapes = dplyr::inner_join(gtfs_sf_obj$shapes, trips, by = "shape_id")

return(trips_shapes)
}

Expand Down