Update file names

ropensci · Jan 12, 2025 · daefd4b · daefd4b
1 parent 583b2a6
commit daefd4b
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 39 deletions.
diff --git a/data-raw/file_name_df.csv b/data-raw/file_name_df.csv
@@ -1,14 +1,13 @@
 file_name,url
-dft-road-casualty-statistics-casualty-adjustment-lookup_2004-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-adjustment-lookup_2004-latest-published-year.csv
-dft-road-casualty-statistics-collision-adjustment-lookup_2004-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-adjustment-lookup_2004-latest-published-year.csv
-dft-road-casualty-statistics-vehicle-e-scooter-2020-Latest-Published-Year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-e-scooter-2020-Latest-Published-Year.csv
-dft-road-casualty-statistics-historical-revisions-data.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-historical-revisions-data.csv
+dft-road-casualty-statistics-vehicle-provisional-mid-year-unvalidated-2024.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-provisional-mid-year-unvalidated-2024.csv
+dft-road-casualty-statistics-casualty-provisional-mid-year-unvalidated-2024.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-provisional-mid-year-unvalidated-2024.csv
+dft-road-casualty-statistics-collision-provisional-mid-year-unvalidated-2024.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-provisional-mid-year-unvalidated-2024.csv
+dft-road-casualty-statistics-casualty-2023.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2023.csv
+dft-road-casualty-statistics-vehicle-2023.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2023.csv
+dft-road-casualty-statistics-collision-2023.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2023.csv
 dft-road-casualty-statistics-casualty-2022.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2022.csv
 dft-road-casualty-statistics-vehicle-2022.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2022.csv
 dft-road-casualty-statistics-collision-2022.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2022.csv
-dft-road-casualty-statistics-casualty-1979-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-1979-latest-published-year.csv
-dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv
-dft-road-casualty-statistics-collision-1979-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-1979-latest-published-year.csv
 dft-road-casualty-statistics-casualty-2021.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2021.csv
 dft-road-casualty-statistics-vehicle-2021.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2021.csv
 dft-road-casualty-statistics-collision-2021.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2021.csv
@@ -18,9 +17,14 @@ dft-road-casualty-statistics-collision-2020.csv,https://data.dft.gov.uk/road-acc
 dft-road-casualty-statistics-casualty-2019.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2019.csv
 dft-road-casualty-statistics-vehicle-2019.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2019.csv
 dft-road-casualty-statistics-collision-2019.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2019.csv
-dft-road-casualty-statistics-casualty-2018.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2018.csv
-dft-road-casualty-statistics-vehicle-2018.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2018.csv
-dft-road-casualty-statistics-collision-2018.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2018.csv
+dft-road-casualty-statistics-casualties-adjustment-last-5-years.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualties-adjustment-last-5-years.csv
+dft-road-casualty-statistics-collision-adjustment-last-5-years.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-adjustment-last-5-years.csv
+dft-road-casualty-statistics-casualty-adjustment-lookup_2004-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-adjustment-lookup_2004-latest-published-year.csv
+dft-road-casualty-statistics-collision-adjustment-lookup_2004-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-adjustment-lookup_2004-latest-published-year.csv
+dft-road-casualty-statistics-casualty-1979-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-1979-latest-published-year.csv
+dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv
+dft-road-casualty-statistics-collision-1979-latest-published-year.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-1979-latest-published-year.csv
 dft-road-casualty-statistics-casualty-last-5-years.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-last-5-years.csv
 dft-road-casualty-statistics-vehicle-last-5-years.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-last-5-years.csv
 dft-road-casualty-statistics-collision-last-5-years.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-last-5-years.csv
+dft-road-casualty-statistics-historical-revisions-data.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-historical-revisions-data.csv
diff --git a/data-raw/file_names.txt b/data-raw/file_names.txt
@@ -1,13 +1,12 @@
-dft-road-casualty-statistics-casualty-adjustment-lookup_2004-latest-published-year.csv
-dft-road-casualty-statistics-collision-adjustment-lookup_2004-latest-published-year.csv
-dft-road-casualty-statistics-vehicle-e-scooter-2020-Latest-Published-Year.csv
-dft-road-casualty-statistics-historical-revisions-data.csv
+dft-road-casualty-statistics-vehicle-provisional-mid-year-unvalidated-2024.csv
+dft-road-casualty-statistics-casualty-provisional-mid-year-unvalidated-2024.csv
+dft-road-casualty-statistics-collision-provisional-mid-year-unvalidated-2024.csv
+dft-road-casualty-statistics-casualty-2023.csv
+dft-road-casualty-statistics-vehicle-2023.csv
+dft-road-casualty-statistics-collision-2023.csv
 dft-road-casualty-statistics-casualty-2022.csv
 dft-road-casualty-statistics-vehicle-2022.csv
 dft-road-casualty-statistics-collision-2022.csv
-dft-road-casualty-statistics-casualty-1979-latest-published-year.csv
-dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv
-dft-road-casualty-statistics-collision-1979-latest-published-year.csv
 dft-road-casualty-statistics-casualty-2021.csv
 dft-road-casualty-statistics-vehicle-2021.csv
 dft-road-casualty-statistics-collision-2021.csv
@@ -17,9 +16,14 @@ dft-road-casualty-statistics-collision-2020.csv
 dft-road-casualty-statistics-casualty-2019.csv
 dft-road-casualty-statistics-vehicle-2019.csv
 dft-road-casualty-statistics-collision-2019.csv
-dft-road-casualty-statistics-casualty-2018.csv
-dft-road-casualty-statistics-vehicle-2018.csv
-dft-road-casualty-statistics-collision-2018.csv
+dft-road-casualty-statistics-casualties-adjustment-last-5-years.csv
+dft-road-casualty-statistics-collision-adjustment-last-5-years.csv
+dft-road-casualty-statistics-casualty-adjustment-lookup_2004-latest-published-year.csv
+dft-road-casualty-statistics-collision-adjustment-lookup_2004-latest-published-year.csv
+dft-road-casualty-statistics-casualty-1979-latest-published-year.csv
+dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv
+dft-road-casualty-statistics-collision-1979-latest-published-year.csv
 dft-road-casualty-statistics-casualty-last-5-years.csv
 dft-road-casualty-statistics-vehicle-last-5-years.csv
 dft-road-casualty-statistics-collision-last-5-years.csv
+dft-road-casualty-statistics-historical-revisions-data.csv
diff --git a/data-raw/misc.Rmd b/data-raw/misc.Rmd
@@ -12,10 +12,8 @@ all_links = page %>%
   html_nodes("a") %>%       # find all links
   html_attr("href")
 
-zips = all_links %>% str_subset("\\.zip")
-csvs = all_links %>% str_subset("\\.csv")
+r = all_links %>% str_subset("\\.csv")
 
-r = c(zips, csvs)
 dr = c()
 for(i in 1:length(r)) {
   dr[i] = sub("https://data.dft.gov.uk/road-accidents-safety-data/",
@@ -45,22 +43,34 @@ writeLines(file_names_char, "data-raw/file_names.txt")
 readr::write_csv(file_name_df, "data-raw/file_name_df.csv")
 file.edit("data-raw/file_names.txt")
 file.remove("file_names_old.rda")
+# All file names with 1979 in the name
+file_names_1979 = file_names[grepl("1979", names(file_names))]
+# $`dft-road-casualty-statistics-casualty-1979-latest-published-year.csv`
+# [1] "dft-road-casualty-statistics-casualty-1979-latest-published-year.csv"
+
+# $`dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv`
+# [1] "dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv"
+
+# $`dft-road-casualty-statistics-collision-1979-latest-published-year.csv`
+# [1] "dft-road-casualty-statistics-collision-1979-latest-published-year.csv"
+
+# 2023 data:
+file_names_2023 = file_names[grepl("2023", names(file_names))]
 
-file_names$`accident-and-casualty-adjustment-2004-to-2019.zip` 
-file_names$`accident-and-casualty-adjustment-2004-to-2019.zip` = NULL
-file_names$`accident-and-casualty-adjustment-2004-to-2019.zip` 
 usethis::use_data(file_names, overwrite = TRUE)
 ```
 
 The `accidents_sample_raw` can be (re)generated using:
 
 ```{r}
+devtools::load_all()
 # Obtained with:
-dl_stats19(year = 2022, type = "collison")
-accidents_2022_raw = read_collisions(year = 2022)
+dl_stats19(year = 2023, type = "collision")
+accidents_2023_raw = read_collisions(year = 2023)
+get_stats19(year = 2023, type = "collision", data_dir = tempdir())
 set.seed(350)
-sel = sample(nrow(accidents_2022_raw), 3)
-accidents_sample_raw = accidents_2022_raw[sel, ]
+sel = sample(nrow(accidents_2023_raw), 3)
+accidents_sample_raw = accidents_2023_raw[sel, ]
 # accidents_sample = format_collisions(accidents_sample_raw)
 accidents_sample = accidents_sample_raw
 waldo::compare(accidents_sample_raw, accidents_sample)
@@ -72,11 +82,11 @@ Similarly for casualites, use:
 
 ```{r}
 # Obtained with:
-dl_stats19(year = 2022, type = "cas")
-casualties_2022_raw = read_casualties(year = 2022)
+dl_stats19(year = 2023, type = "cas")
+casualties_2023_raw = read_casualties(year = 2023)
 set.seed(350)
-sel = sample(nrow(casualties_2022_raw), 3)
-casualties_sample_raw = casualties_2022_raw[sel, ]
+sel = sample(nrow(casualties_2023_raw), 3)
+casualties_sample_raw = casualties_2023_raw[sel, ]
 # casualties_sample = format_casualties(casualties_sample_raw)
 casualties_sample = casualties_sample_raw
 usethis::use_data(casualties_sample, overwrite = TRUE)
@@ -85,13 +95,13 @@ usethis::use_data(casualties_sample, overwrite = TRUE)
 and for vehicles, use:
 ```{r}
 # Obtained with:
-dl_stats19(year = 2022, type = "veh")
-vehicles_2022_raw = read_vehicles(year = 2022)
+dl_stats19(year = 2023, type = "veh")
+vehicles_2023_raw = read_vehicles(year = 2023)
 set.seed(350)
-sel = sample(nrow(vehicles_2022_raw), 3)
-vehicles_sample_raw = vehicles_2022_raw[sel, ]
+sel = sample(nrow(vehicles_2023_raw), 3)
+vehicles_sample_raw = vehicles_2023_raw[sel, ]
 # vehicles_sample = format_vehicles(vehicles_sample_raw)
-vehicles_sample = vehicles_2022_raw[sel,]
+vehicles_sample = vehicles_2023_raw[sel,]
 usethis::use_data(vehicles_sample, overwrite = TRUE)
 ```
 

diff --git a/data/file_names.rda b/data/file_names.rda
diff --git a/data/file_names_old.rda b/data/file_names_old.rda