Fix error w/ misplaced arg + call in validate_crs()

R/utils-crs.R

@@ -45,16 +45,18 @@ validate_crs <- function(
     return(list(spatialReference = c()))
   }
   if (
-    !((inherits(crs, "character") ||
+    !(inherits(crs, "character") ||
       inherits(crs, "crs") ||
-      inherits(crs, "numeric")))
+      rlang::is_integerish(crs))
   ) {
-    cli::cli_abort(c(
-      "Invalid CRS supplied: {.arg {arg}}",
-      "i" = "must be compatible with {.fn sf::st_crs}",
+    cli::cli_abort(
+      c(
+        "Invalid CRS supplied: {.arg {arg}}",
+        "i" = "must be compatible with {.fn sf::st_crs}"
+      ),
       arg = arg,
       call = call
-    ))
+    )
   }
 
   crs <- sf::st_crs(crs)

tests/testthat/_snaps/utils-crs.md

@@ -0,0 +1,21 @@
+# validate_crs() errors on invalid input
+
+    Code
+      validate_crs(4326.5)
+    Condition
+      Error:
+      ! Invalid CRS supplied: `4326.5`
+      i must be compatible with `sf::st_crs()`
+    Code
+      validate_crs(TRUE)
+    Condition
+      Error:
+      ! Invalid CRS supplied: `TRUE`
+      i must be compatible with `sf::st_crs()`
+    Code
+      validate_crs(list(4326))
+    Condition
+      Error:
+      ! Invalid CRS supplied: `list(4326)`
+      i must be compatible with `sf::st_crs()`
+

tests/testthat/test-utils-crs.R

@@ -0,0 +1,16 @@
+test_that("validate_crs() accepts crs, character, integer, and whole doubles", {
+  expected <- list(spatialReference = list(wkid = 4326L))
+
+  expect_identical(validate_crs(sf::st_crs(4326)), expected)
+  expect_identical(validate_crs("EPSG:4326"), expected)
+  expect_identical(validate_crs(4326L), expected)
+  expect_identical(validate_crs(4326), expected)
+})
+
+test_that("validate_crs() errors on invalid input", {
+  expect_snapshot(error = TRUE, {
+    validate_crs(4326.5)
+    validate_crs(TRUE)
+    validate_crs(list(4326))
+  })
+})