Use a non-equi join in set_dates_service()

r-transit · Feb 27, 2023 · e215f9c · e215f9c
1 parent ff3e5b4
commit e215f9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/R/dates.R b/R/dates.R
@@ -93,11 +93,11 @@ set_dates_services <- function(gtfs_obj) {
       dplyr::filter(bool == 1) %>% dplyr::select(service_id, weekday, start_date, end_date)
 
     # set services to dates according to weekdays and start/end date
-    date_service_df <- 
-      suppress_matches_multiple_warning(
-        dplyr::full_join(dates, service_ids_weekdays, by="weekday")
+    date_service_df <- dates %>%
+      dplyr::inner_join(
+        service_ids_weekdays, 
+        by = dplyr::join_by(weekday, between(date, start_date, end_date))
       ) %>% 
-      dplyr::filter(date >= start_date & date <= end_date) %>% 
       dplyr::select(-weekday, -start_date, -end_date)
 
     # addtions and exceptions

diff --git a/R/globals.R b/R/globals.R
@@ -50,7 +50,8 @@ if (getRversion() >= "3.1.0") {
       "start_time",
       "end_time",
       "feed_start_date",
-      "feed_end_date"
+      "feed_end_date",
+      "between"
     )
   )
 }