telemetry with lap selection only

Partial SCasanova#78
pbulsink · Jun 26, 2023 · dbdd428 · dbdd428
1 parent 12429f4
commit dbdd428
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 36 deletions.
diff --git a/R/load_driver_telemetry.R b/R/load_driver_telemetry.R
@@ -7,30 +7,28 @@
 #' @param round number from 1 to 23 (depending on season selected). Also accepts race name.
 #' @param session the code for the session to load Options are `'FP1'`, `'FP2'`, `'FP3'`,
 #' `'Q'`, `'S'`, `'SS'`, and `'R'`. Default is `'R'`, which refers to Race.
-#' @param drivers three letter driver code (see `load_drivers()` for a list)
+#' @param driver three letter driver code (see `load_drivers()` for a list)
 #' @param laps which lap's telemetry to return. One of an integer lap number (<= total laps in the race), `fastest`,
 #' or `all`.
 #' @param log_level Detail of logging from fastf1 to be displayed. Choice of:
 #' `'DEBUG'`, `'INFO'`, `'WARNING'`, `'ERROR'` and `'CRITICAL'`. See \href{https://theoehrly.github.io/Fast-F1/fastf1.html#configure-logging-verbosity}{fastf1 documentation}.
 #' @param race `r lifecycle::badge("deprecated")` `race` is no longer supported, use `round`.
 #' @param fastest_only `r lifecycle::badge("deprecated")` `fastest_only` is no longer supported, indicated preferred
 #' laps in `laps`.
-#' @param driver `r lifecycle::badge("deprecated")` `driver` is no longer supported, indicated preferred
-#' driver in `drivers`.
 #' @importFrom magrittr "%>%"
 #' @return A tibble with telemetry data for selected driver/session.
 #' @import reticulate
 #' @export
 #' @examples
 #' \dontrun{
 #' telem <- load_driver_telemetry(season = 2023,
-#'                                round = 'bahrain',
+#'                                round = 'Bahrain',
 #'                                session = 'Q',
-#'                                drivers = 'HAM',
+#'                                driver = 'HAM',
 #'                                laps = 'fastest')
 #' }
 #'
-load_driver_telemetry <- function(season = get_current_season(), round = 1, session = 'R', drivers, laps = 'fastest', log_level = "WARNING", race = lifecycle::deprecated(), fastest_only = lifecycle::deprecated(), driver = lifecycle::deprecated()){
+load_driver_telemetry <- function(season = get_current_season(), round = 1, session = 'R', driver, laps = 'fastest', log_level = "WARNING", race = lifecycle::deprecated(), fastest_only = lifecycle::deprecated()){
 
   #Lifecycles
   if (lifecycle::is_present(race)) {
@@ -43,10 +41,6 @@ load_driver_telemetry <- function(season = get_current_season(), round = 1, sess
       lap = 'fastest'
     }
   }
-  if (lifecycle::is_present(driver)) {
-    lifecycle::deprecate_warn("1.1.0", "load_driver_telemetry(driver)", "load_driver_telemetry(drivers)")
-    drivers <- driver
-  }
 
   # Param checks
   if(!(laps %in% c('fastest', 'all'))){
@@ -68,20 +62,14 @@ load_driver_telemetry <- function(season = get_current_season(), round = 1, sess
     add_v3_option <- ''
   }
 
-  if(length(drivers) > 1){
-    driver <- glue::glue("pick_drivers(['{drivers}'])", drivers = paste(drivers, collapse  = "', '"))
-  } else {
-    driver <- glue::glue("pick_driver('{drivers}')", drivers = drivers)
-  }
-
   if(laps == 'fastest'){
-    reticulate::py_run_string(glue::glue("tel = session.laps.{driver}.pick_fastest().get_telemetry().add_distance(){opt}",
+    reticulate::py_run_string(glue::glue("tel = session.laps.pick_driver('{driver}').pick_fastest().get_telemetry().add_distance(){opt}",
                                          driver = driver, opt = add_v3_option))
   } else if (laps != 'all'){
-    reticulate::py_run_string(glue::glue("tel = session.laps.{driver}.pick_lap({laps}).get_telemetry().add_distance(){opt}",
+    reticulate::py_run_string(glue::glue("tel = session.laps.pick_driver('{driver}').pick_lap({laps}).get_telemetry().add_distance(){opt}",
                                          driver = driver, laps = laps, opt = add_v3_option))
   } else {
-    reticulate::py_run_string(glue::glue("tel = session.laps.{driver}.get_telemetry().add_distance(){opt}",
+    reticulate::py_run_string(glue::glue("tel = session.laps.pick_driver('{driver}').get_telemetry().add_distance(){opt}",
                                          driver = driver, opt = add_v3_option))
 
   }
@@ -92,7 +80,7 @@ load_driver_telemetry <- function(season = get_current_season(), round = 1, sess
   tel <- reticulate::py_to_r(reticulate::py_get_item(py_env, 'tel'))
 
   tel %>%
-    #dplyr::mutate(driverCode = driver) %>%
+    dplyr::mutate(driverCode = driver) %>%
     tibble::tibble() %>%
     janitor::clean_names()
 }

diff --git a/R/plot_fastest.R b/R/plot_fastest.R
@@ -35,7 +35,7 @@ plot_fastest <- function(season = get_current_season(), round = 1, session = 'R'
     round <- race
   }
 
-  driver_data <- load_driver_telemetry(season, round, session, driver, T)
+  driver_data <- load_driver_telemetry(season, round, session, driver, 'fastest')
 
   selected_driver_id <- load_drivers(season) %>%
     dplyr::filter(.data$code == driver) %>%

diff --git a/man/get_driver_telemetry.Rd b/man/get_driver_telemetry.Rd
diff --git a/man/load_driver_telemetry.Rd b/man/load_driver_telemetry.Rd
diff --git a/tests/testthat/test-load_driver_telemetry.R b/tests/testthat/test-load_driver_telemetry.R
@@ -19,10 +19,9 @@ test_that("driver telemetry", {
   withr::local_options(f1dataR.cache = file.path(getwd(), "tst_telem"))
 
   # Tests
-  telem <- load_driver_telemetry(season = 2022, round = "Brazil", session = "S", drivers = "HAM", laps = 'all')
-  telem_fast <- load_driver_telemetry(season = 2022, round = "Brazil", session = "S", drivers = "HAM", laps = 'fastest')
-  telem_multidrive <- load_driver_telemetry(season = 2022, round = 'Brazil', session = "S", drivers = c("HAM", "VER"), laps = 'fastest')
-  telem_lap <- load_driver_telemetry(season = 2022, round = "Brazil", session = "S", drivers = "HAM", laps = 1)
+  telem <- load_driver_telemetry(season = 2022, round = "Brazil", session = "S", driver = "HAM", laps = 'all')
+  telem_fast <- load_driver_telemetry(season = 2022, round = "Brazil", session = "S", driver = "HAM", laps = 'fastest')
+  telem_lap <- load_driver_telemetry(season = 2022, round = "Brazil", session = "S", driver = "HAM", laps = 1)
 
   expect_true(nrow(telem) > nrow(telem_fast))
   expect_true(ncol(telem) == ncol(telem_fast))
@@ -34,6 +33,8 @@ test_that("driver telemetry", {
     expect_equal(telem_fast$session_time[[1]], 3518.595)
     expect_equal(telem_fast$time[[2]], 0.044)
   }
+  expect_equal(telem_lap$time[[1]], 0)
+  expect_equal(telem_lap$speed[[1]], 0)
 
 
 })