Release v.0.3.1

Fixes #9
mpjashby · Jun 18, 2022 · 798d1f4 · 798d1f4
1 parent 921b48e
commit 798d1f4
Show file tree

Hide file tree

Showing 26 changed files with 63 additions and 40 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -10,3 +10,5 @@
 ^_pkgdown\.yml$
 ^docs$
 ^pkgdown$
+^CRAN-SUBMISSION$
+^\.github$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: crimedata
 Title: Access Crime Data from the Open Crime Database
-Version: 0.3.0
+Version: 0.3.1
 Authors@R: person("Matthew", "Ashby", email = "matthew.ashby@ucl.ac.uk", 
-    role = c("aut", "cre"), 
+    role = c("aut", "cre", "cph"), 
     comment = c(ORCID = "<https://orcid.org/0000-0003-4201-9239>"))
 Description: Gives convenient access to publicly available police-recorded open
     crime data from large cities in the United States that are included in the

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# crimedata 0.3.1
+
+* Fixed an error with downloading some data for 2020 that was caused by a 
+  change in the OSF API used to query the data.
+
+
 # crimedata 0.3.0
 
 * Errors, warnings and messages are now generated using `rlang` to make them

diff --git a/R/data.R b/R/data.R
@@ -4,7 +4,7 @@
 #' obtained from the \href{https://osf.io/zyaqn/}{Crime Open Database}.
 #'
 #' More details of the data format are available on the
-#' \href{https://osf.io/zyaqn/wiki/}{Crime Open Database website}.
+#' \href{https://osf.io/zyaqn/wiki/home/}{Crime Open Database website}.
 #' Variables marked * are only available for some of the
 #' data, due to limitations in the data published by some cities.
 #'
@@ -43,7 +43,7 @@
 #' \href{https://osf.io/zyaqn/}{Crime Open Database}.
 #'
 #' More details of the data format are available on the
-#' \href{https://osf.io/zyaqn/wiki/}{Crime Open Database website}.
+#' \href{https://osf.io/zyaqn/wiki/home/}{Crime Open Database website}.
 #' Variables marked * are only available for some of the
 #' data, due to limitations in the data published by some cities.
 #'

diff --git a/R/get_crime_data.R b/R/get_crime_data.R
@@ -266,7 +266,7 @@ get_crime_data <- function(
     crime_data,
     dplyr::vars(dplyr::one_of(c(
       "city_name", "offense_code", "offense_type", "offense_group",
-      "offense_against", "location_type", "location_category"
+      "offense_against"
     ))),
     as.factor
   )
@@ -275,14 +275,22 @@ get_crime_data <- function(
     dplyr::vars("date_single"),
     as.POSIXct, format = "%Y-%m-%d %H:%M"
   )
+  if (
+    "location_type" %in% names(crime_data) |
+    "location_category" %in% names(crime_data)
+  ) {
+    crime_data <- dplyr::mutate_at(
+      crime_data,
+      dplyr::vars(dplyr::one_of(c("location_type", "location_category"))),
+      as.factor
+    )
+  }
   if ("date_start" %in% names(crime_data) | "date_end" %in% names(crime_data)) {
-
     crime_data <- dplyr::mutate_at(
       crime_data,
       dplyr::vars(dplyr::one_of(c("date_start", "date_end"))),
       as.POSIXct, format = "%Y-%m-%d %H:%M"
     )
-
   }
 
   # return data

diff --git a/cran-comments.md b/cran-comments.md
@@ -6,7 +6,8 @@ New submission
 
 Package was archived on CRAN
 
-* This package was archived due to an out-of-date maintainer email address, 
-  which I have now fixed.
+* This package was archived due to an out-of-date maintainer email address and
+  a problem with one of the tests of `get_crime_data()`. Both these issues have
+  been fixed.
 * win-builder gives an 'Invalid DOI' message for the DOI 
   https://doi.org/10.1163/24523666-00401007 but this DOI is valid.
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/introduction.html b/docs/articles/introduction.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,7 +3,7 @@ pkgdown: 2.0.4
 pkgdown_sha: ~
 articles:
   introduction: introduction.html
-last_built: 2022-06-14T11:39Z
+last_built: 2022-06-18T21:43Z
 urls:
   reference: http://pkgs.lesscrime.info/crimedata/reference
   article: http://pkgs.lesscrime.info/crimedata/articles

diff --git a/docs/reference/block_geoid_to.html b/docs/reference/block_geoid_to.html
diff --git a/docs/reference/crimedata.html b/docs/reference/crimedata.html
diff --git a/docs/reference/get_crime_data.html b/docs/reference/get_crime_data.html
diff --git a/docs/reference/homicides15.html b/docs/reference/homicides15.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/list_crime_data.html b/docs/reference/list_crime_data.html
diff --git a/docs/reference/nycvehiclethefts.html b/docs/reference/nycvehiclethefts.html
diff --git a/docs/search.json b/docs/search.json
diff --git a/inst/WORDLIST b/inst/WORDLIST
@@ -4,6 +4,7 @@ GEOID
 GEOIDs
 Lifecycle
 NIBRS
+OSF
 WGS
 blockgroup
 dplyr

diff --git a/man/homicides15.Rd b/man/homicides15.Rd
diff --git a/man/nycvehiclethefts.Rd b/man/nycvehiclethefts.Rd
diff --git a/tests/testthat/test_get_crime_data.R b/tests/testthat/test_get_crime_data.R
@@ -1,8 +1,8 @@
 context("Test function to get crime data")
 
 test_that("return value of get_crime_data is a tibble or SF object", {
-  expect_is(get_crime_data(years = 2019), "tbl_df")
-  expect_is(get_crime_data(years = 2019, output = "sf"), "sf")
+  expect_is(get_crime_data(), "tbl_df")
+  expect_is(get_crime_data(output = "sf"), "sf")
 })
 
 test_that("incorrect arguments produce errors", {
@@ -52,17 +52,17 @@ test_that("quiet execution does not return any messages", {
 test_that("data cache works as expected", {
 
   # get data, which should then be cached
-  get_crime_data(years = 2019, cities = "Detroit")
+  get_crime_data(cities = "Detroit")
 
   # request data again and check if it is retrieved from the cache
   expect_message(
-    get_crime_data(years = 2019, cities = "Detroit"),
+    get_crime_data(cities = "Detroit"),
     "Loading cached data"
   )
 
   # request data again, forcing download from server
   expect_message(
-    get_crime_data(years = 2019, cities = "Detroit", cache = FALSE),
+    get_crime_data(cities = "Detroit", cache = FALSE),
     "Deleting cached data"
   )
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ GEOID @@
     GEOIDs
     Lifecycle
     NIBRS
+    OSF
     WGS
     blockgroup
     dplyr
@@ Expand Down @@