change to check to coordinates exist #23

R/sf.R

@@ -10,11 +10,12 @@
 #' @seealso [make_temporal_tsibble]
 #' @examples
 #' climate_mel |> make_spatial_sf()
-make_spatial_sf <-  function(x, sfc = NULL, crs, silent = FALSE) {
-	stopifnot(is_cubble_spatial(x),
+make_spatial_sf <-  function(x, sfc = NULL, crs,
+                             silent = FALSE) {
+  stopifnot(is_cubble_spatial(x),
 			  is.null(sfc) || inherits(sfc, "sfc"),
 			  missing(crs) || inherits(crs, "crs"),
-			  all(c("long", "lat") %in% names(x)) || all(c("x", "y") %in% names(x)))
+			  !is.null(coords(x)))
 	if (! requireNamespace("sf", quietly = TRUE))
 		stop("package sf required, please install it first")
 	if (is.null(sfc)) {

tests/testthat/test-sf.R

@@ -1,3 +1,4 @@
 test_that("cubble works with sf", {
   expect_snapshot(climate_mel |> make_spatial_sf())
+  expect_snapshot(climate_mel |> rename(x = long, y = lat) |> make_spatial_sf())
 })