Merge pull request #133 from pbulsink/schedule-sprint

load_schedule shows Sprint Race date
SCasanova · Jul 20, 2023 · c9dfbdd · c9dfbdd
2 parents 696559a + 7814d76
commit c9dfbdd
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: f1dataR
 Title: F1 Data in R
-Version: 1.2.0
+Version: 1.2.1
 Authors@R: 
     c(person(given = "Santiago", 
              family = "Casanova", 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# f1dataR 1.2.1
+
+* Added additional output column to `load_schedule()` to show Sprint Race date.
+
 # f1dataR 1.2.0
 
 * Added a helper function for setting up `fastf1` connection.

diff --git a/R/load_schedule.R b/R/load_schedule.R
@@ -31,9 +31,10 @@
         "lat":"country",
         "date"
       ) %>%
+      dplyr::mutate("time" = NA_character_, "sprint_date" = NA_character_) %>%
       tibble::as_tibble() %>%
       janitor::clean_names()
-  } else {
+  } else if (season < 2021) {
     data$MRData$RaceTable$Races %>%
       tidyr::unnest(cols = c("Circuit"), names_repair = "universal") %>%
       janitor::clean_names() %>%
@@ -50,6 +51,30 @@
         "date",
         "time"
       ) %>%
+      dplyr::mutate("sprint_date" = NA_character_) %>%
+      tibble::as_tibble() %>%
+      janitor::clean_names()
+  } else {
+    data$MRData$RaceTable$Races %>%
+      tidyr::unnest(cols = c("Circuit"), names_repair = "universal") %>%
+      janitor::clean_names() %>%
+      suppressWarnings() %>%
+      suppressMessages() %>%
+      tidyr::unnest(cols = c("location", "sprint"), names_sep = "_") %>%
+      dplyr::select(
+        "season",
+        "round",
+        "race_name",
+        "circuit_id",
+        "circuit_name",
+        "lat" = "location_lat",
+        "long" = "location_long",
+        "locality" = "location_locality",
+        "country" = "location_country",
+        "date",
+        "time",
+        "sprint_date"
+      ) %>%
       tibble::as_tibble() %>%
       janitor::clean_names()
   }

diff --git a/tests/testthat/test-load_schedule.R b/tests/testthat/test-load_schedule.R
@@ -14,4 +14,9 @@ test_that("Schedule Load works", {
   expect_equal(schedule_1999$circuit_id[1], "albert_park")
 
   expect_error(load_schedule(3050), "`season` must be between 1950 and *")
+
+  schedule_2018 <- load_schedule(2018)
+  expect_true(all(is.na(schedule_1999$sprint_date)))
+  expect_true(all(is.na(schedule_2018$sprint_date)))
+  expect_equal(sum(!is.na(schedule_2021$sprint_date)), 3)
 })