From 9b4ace8c6c7e4bd1ed3532cc942ee80f97e4c171 Mon Sep 17 00:00:00 2001 From: Dexter H Locke <16103942+DHLocke@users.noreply.github.com> Date: Wed, 27 Mar 2024 11:47:30 -0400 Subject: [PATCH] fixes bug with cli and closes #49 --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ R/spacetime-constructor.R | 4 ++-- .../test-spacetime-constructor_cli_update_patch.R | 12 ++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 tests/testthat/test-spacetime-constructor_cli_update_patch.R diff --git a/DESCRIPTION b/DESCRIPTION index 55f9dac..1733640 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: sfdep Title: Spatial Dependence for Simple Features -Version: 0.2.4 +Version: 0.2.4.9000 Authors@R: c( person("Josiah", "Parry", , "josiah.parry@gmail.com", role = c("aut"), comment = c(ORCID = "0000-0001-9910-865X")), diff --git a/NEWS.md b/NEWS.md index 72336c1..ab4a963 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# sfdep (development version) + +- fixes bug with cli and closes #49 + # sfdep 0.2.4 - Dexter Locke is now the maintainer of sfdep diff --git a/R/spacetime-constructor.R b/R/spacetime-constructor.R index eeeacc4..bdeb31b 100644 --- a/R/spacetime-constructor.R +++ b/R/spacetime-constructor.R @@ -176,8 +176,8 @@ validate_spacetime <- function(.data, .geometry, .loc_col, .time_col) { if (!identical(.data_loc_class, .geo_loc_class)) { cli::cli_abort( c("Differing class types for {.var .loc_col}.", - i = "{.var .data}: {.cls {.data_loc_class}}", - "i" = "{.var .geometry}: {.cls {.geo_loc_class}}.") + i = "{.var .data}: {.cls {(.data_loc_class)}}", + "i" = "{.var .geometry}: {.cls {(.geo_loc_class)}}.") ) } diff --git a/tests/testthat/test-spacetime-constructor_cli_update_patch.R b/tests/testthat/test-spacetime-constructor_cli_update_patch.R new file mode 100644 index 0000000..e8efd65 --- /dev/null +++ b/tests/testthat/test-spacetime-constructor_cli_update_patch.R @@ -0,0 +1,12 @@ +test_that("local_g_perm", { + df_fp <- system.file("extdata", "bos-ecometric.csv", package = "sfdep") + geo_fp <- system.file("extdata", "bos-ecometric.geojson", package = "sfdep") + + # read in data + df <- read.csv( + df_fp, colClasses = c("numeric", "character", "integer", "double", "Date") + ) + + geo <- sf::st_read(geo_fp) + expect_error(spacetime(df, geo, ".region_id", "year")) +})