Skip to content

Commit 2eb6dc9

Browse files
RobinlovelaceRobinlovelace
authored
Merge pull request #254 from ropensci/251-2023-data
Starter on updates for 2023 data
2 parents bbe7fd1 + 08052fd commit 2eb6dc9

28 files changed

+2072
-1194
lines changed

‎DESCRIPTION‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: stats19
22
Title: Work with Open Road Traffic Casualty Data from Great Britain
3-
Version: 3.2.0
3+
Version: 3.3.0
44
Authors@R: c(
55
person("Robin", "Lovelace", email = "[email protected]", role = c("aut", "cre"),
66
comment = c(ORCID = "0000-0001-5679-6536")),
@@ -24,7 +24,7 @@ Description: Tools to help download, process and analyse the UK road collision d
2424
The statistics relate only to events on public roads that were reported
2525
to the police, and subsequently recorded, using the 'STATS19' collision reporting form. See
2626
the Department for Transport website
27-
<https://www.data.gov.uk/dataset/cb7ae6f0-4be6-4935-9277-47e5ce24a11f/road-safety-data> for more
27+
<https://www.data.gov.uk/dataset/cb7ae6f0-4be6-4935-9277-47e5ce24a11f/road-accidents-safety-data> for more
2828
information on these datasets.
2929
The package is described in a paper in the Journal of Open Source Software
3030
(Lovelace et al. 2019) <doi:10.21105/joss.01181>.
@@ -61,12 +61,11 @@ Suggests:
6161
htmltools,
6262
tmap,
6363
jsonlite,
64-
pct,
6564
spatstat.geom,
6665
osmdata,
6766
covr
6867
VignetteBuilder: knitr
69-
RoxygenNote: 7.2.3
68+
RoxygenNote: 7.3.2
7069
Roxygen: list(markdown = TRUE)
7170
Language: en-US
7271
X-schema.org-keywords: stats19, road-safety, transport, car-crashes, ropensci, data

‎NEWS.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# stats19 3.3.0 2025-01
2+
3+
* Support for 2023 data (#251)
4+
* Another round of updates to the schema files thanks to updates from the DfT
5+
16
# stats19 3.2.0 2024-10
27

38
* Updates so package functions fail gracefully when input data is not as expected, e.g. due to URL changes (#252)

‎R/dl.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#' # with type as casualty
3636
#' dl_stats19(year = 2022, type = "casualty")
3737
#' # try another year
38-
#' dl_stats19(year = 2018)
38+
#' dl_stats19(year = 2023)
3939
#' }
4040
#' }
4141
dl_stats19 = function(year = NULL,

‎R/format.R‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,9 @@
77
#' @export
88
#' @examples
99
#' \donttest{
10-
#' if(curl::has_internet()) {
11-
#' dl_stats19(year = 2022, type = "collision")
12-
#' x = read_collisions(year = 2022, format = FALSE)
13-
#' x = readr::read_csv("https://github.com/ropensci/stats19/releases/download/v3.0.0/fatalities.csv")
14-
#' if(nrow(x) > 0) {
15-
#' x[1:3, 1:12]
16-
#' crashes = format_collisions(x)
17-
#' crashes[1:3, 1:12]
18-
#' summary(crashes$datetime)
19-
#' }
20-
#' }
10+
#' if(curl::has_internet()) {
11+
#' dl_stats19(year = 2022, type = "collision")
12+
#' }
2113
#' }
2214
#' @export
2315
format_collisions = function(x) {
@@ -66,19 +58,24 @@ format_stats19 = function(x, type) {
6658
# Rename columns
6759
old_names = names(x)
6860
new_names = format_column_names(old_names)
61+
# waldo::compare(old_names, new_names) They are the same for 2023 date
62+
# TODO: remove format_column_names() and use stats19::stats19_schema$variable
6963
names(x) = new_names
7064

7165
# create lookup table
72-
lkp = stats19::stats19_variables[stats19::stats19_variables$table == type,]
66+
lkp = stats19::stats19_variables[stats19::stats19_variables$table == tolower(type),]
7367

74-
vkeep = new_names %in% stats19::stats19_schema$variable_formatted
68+
vkeep = new_names %in% stats19::stats19_schema$variable
7569
vars_to_change = which(vkeep)
7670

71+
# # for testing
7772
# browser()
73+
# i = 1
74+
# x_old = x
7875
for(i in vars_to_change) {
79-
lkp_name = lkp$column_name[lkp$column_name == new_names[i]]
76+
lkp_name = unique(lkp$variable[lkp$variable %in% new_names[i]])
8077
lookup = stats19::stats19_schema[
81-
stats19::stats19_schema$variable_formatted == lkp_name,
78+
stats19::stats19_schema$variable %in% lkp_name,
8279
c("code", "label")
8380
]
8481
original_class = class(x[[i]])
@@ -88,6 +85,7 @@ format_stats19 = function(x, type) {
8885
x[[i]] = ifelse(is.na(matched_labels), x[[i]], matched_labels)
8986
x[[i]] = methods::as(x[[i]], original_class)
9087
}
88+
# waldo::compare(x_old, x)
9189

9290
date_in_names = "date" %in% names(x)
9391
if(date_in_names) {

‎README.Rmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ knitr::opts_chunk$set(
3131
# stats19 <a href='https://docs.ropensci.org/stats19/'><img src='https://raw.githubusercontent.com/ropensci/stats19/master/man/figures/logo.png' align="right" height=215/></a>
3232

3333
**stats19** provides functions for downloading and formatting road crash data.
34-
Specifically, it enables access to the UK's official road traffic casualty database, [STATS19](https://www.data.gov.uk/dataset/cb7ae6f0-4be6-4935-9277-47e5ce24a11f/road-safety-data). (The name comes from the form used by the police to record car crashes and other incidents resulting in casualties on the roads.)
34+
Specifically, it enables access to the UK's official road traffic casualty database, [STATS19](https://www.data.gov.uk/dataset/cb7ae6f0-4be6-4935-9277-47e5ce24a11f/road-accidents-safety-data). (The name comes from the form used by the police to record car crashes and other incidents resulting in casualties on the roads.)
3535

3636
The raw data is provided as a series of `.csv` files that contain integers and which are stored in dozens of `.zip` files.
3737
Finding, reading-in and formatting the data for research can be a time consuming process subject to human error.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://l
2222
**stats19** provides functions for downloading and formatting road crash
2323
data. Specifically, it enables access to the UK’s official road traffic
2424
casualty database,
25-
[STATS19](https://www.data.gov.uk/dataset/cb7ae6f0-4be6-4935-9277-47e5ce24a11f/road-safety-data).
25+
[STATS19](https://www.data.gov.uk/dataset/cb7ae6f0-4be6-4935-9277-47e5ce24a11f/road-accidents-safety-data).
2626
(The name comes from the form used by the police to record car crashes
2727
and other incidents resulting in casualties on the roads.)
2828

‎cran-comments.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
Apologies for missing the file that failed to pass the auto checks.
2-
3-
Updated to remove README.html, also the package has now been tested without wifi and the tests pass.
4-
5-
Updates so package functions fail gracefully when input data is not as expected, e.g. due to URL changes.
1+
Various updates, including removal of `pct` from Suggests, and fixes to support new datasets from the UK Department for Transport.
62

73
## R CMD check results
84

‎data-raw/all-crashes.R‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
a = stats19::read_collisions(year = 1979)
1+
devtools::load_all()
2+
a_new = get_stats19(year = 1979, type = "collision", data_dir = tempdir())
3+
4+
a = read_collisions(year = 1979)

‎data-raw/file_name_df.csv‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
file_name,url
2-
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
3-
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
4-
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
5-
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
2+
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
3+
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
4+
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
5+
dft-road-casualty-statistics-casualty-2023.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2023.csv
6+
dft-road-casualty-statistics-vehicle-2023.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2023.csv
7+
dft-road-casualty-statistics-collision-2023.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2023.csv
68
dft-road-casualty-statistics-casualty-2022.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2022.csv
79
dft-road-casualty-statistics-vehicle-2022.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2022.csv
810
dft-road-casualty-statistics-collision-2022.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2022.csv
9-
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
10-
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
11-
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
1211
dft-road-casualty-statistics-casualty-2021.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2021.csv
1312
dft-road-casualty-statistics-vehicle-2021.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2021.csv
1413
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
1817
dft-road-casualty-statistics-casualty-2019.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2019.csv
1918
dft-road-casualty-statistics-vehicle-2019.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2019.csv
2019
dft-road-casualty-statistics-collision-2019.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2019.csv
21-
dft-road-casualty-statistics-casualty-2018.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-casualty-2018.csv
22-
dft-road-casualty-statistics-vehicle-2018.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-vehicle-2018.csv
23-
dft-road-casualty-statistics-collision-2018.csv,https://data.dft.gov.uk/road-accidents-safety-data/dft-road-casualty-statistics-collision-2018.csv
20+
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
21+
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
22+
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
23+
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
24+
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
25+
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
26+
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
2427
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
2528
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
2629
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
30+
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

‎data-raw/file_names.txt‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
dft-road-casualty-statistics-casualty-adjustment-lookup_2004-latest-published-year.csv
2-
dft-road-casualty-statistics-collision-adjustment-lookup_2004-latest-published-year.csv
3-
dft-road-casualty-statistics-vehicle-e-scooter-2020-Latest-Published-Year.csv
4-
dft-road-casualty-statistics-historical-revisions-data.csv
1+
dft-road-casualty-statistics-vehicle-provisional-mid-year-unvalidated-2024.csv
2+
dft-road-casualty-statistics-casualty-provisional-mid-year-unvalidated-2024.csv
3+
dft-road-casualty-statistics-collision-provisional-mid-year-unvalidated-2024.csv
4+
dft-road-casualty-statistics-casualty-2023.csv
5+
dft-road-casualty-statistics-vehicle-2023.csv
6+
dft-road-casualty-statistics-collision-2023.csv
57
dft-road-casualty-statistics-casualty-2022.csv
68
dft-road-casualty-statistics-vehicle-2022.csv
79
dft-road-casualty-statistics-collision-2022.csv
8-
dft-road-casualty-statistics-casualty-1979-latest-published-year.csv
9-
dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv
10-
dft-road-casualty-statistics-collision-1979-latest-published-year.csv
1110
dft-road-casualty-statistics-casualty-2021.csv
1211
dft-road-casualty-statistics-vehicle-2021.csv
1312
dft-road-casualty-statistics-collision-2021.csv
@@ -17,9 +16,14 @@ dft-road-casualty-statistics-collision-2020.csv
1716
dft-road-casualty-statistics-casualty-2019.csv
1817
dft-road-casualty-statistics-vehicle-2019.csv
1918
dft-road-casualty-statistics-collision-2019.csv
20-
dft-road-casualty-statistics-casualty-2018.csv
21-
dft-road-casualty-statistics-vehicle-2018.csv
22-
dft-road-casualty-statistics-collision-2018.csv
19+
dft-road-casualty-statistics-casualties-adjustment-last-5-years.csv
20+
dft-road-casualty-statistics-collision-adjustment-last-5-years.csv
21+
dft-road-casualty-statistics-casualty-adjustment-lookup_2004-latest-published-year.csv
22+
dft-road-casualty-statistics-collision-adjustment-lookup_2004-latest-published-year.csv
23+
dft-road-casualty-statistics-casualty-1979-latest-published-year.csv
24+
dft-road-casualty-statistics-vehicle-1979-latest-published-year.csv
25+
dft-road-casualty-statistics-collision-1979-latest-published-year.csv
2326
dft-road-casualty-statistics-casualty-last-5-years.csv
2427
dft-road-casualty-statistics-vehicle-last-5-years.csv
2528
dft-road-casualty-statistics-collision-last-5-years.csv
29+
dft-road-casualty-statistics-historical-revisions-data.csv

0 commit comments

Comments
 (0)