remove geometry column when geometry = FALSE (#80)

* remove geometry column when geometry = FALSE

* remove st_drop_geometry

* bug fix version

Author: erikarasnick

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: codec
 Title: Community Data Explorer for Cincinnati
-Version: 0.7.0
+Version: 0.7.1
 Authors@R: c(
     person("Cole", "Brokamp",
            email = "[email protected]",

R/codec_tdr.R

@@ -84,7 +84,10 @@ codec_data <- function(name, geography = cincy::tract_tigris_2010, geometry = FA
     d_sf <- dplyr::left_join(d, cincy::tract_tigris_2010, by = "census_tract_id_2010")
     d_sf <- sf::st_as_sf(d_sf)
     d_int <- cincy::interpolate(from = d_sf, to = geography, weights = "pop")
-    if (!geometry) d_int <- sf::st_drop_geometry(tibble::as_tibble(d_int))
+    if (!geometry) {
+      d_int <- tibble::as_tibble(d_int) |>
+        dplyr::select(-geometry)
+    }
     d <- d_int
   }
 

tests/testthat/test-codec_tdr.R

@@ -12,11 +12,24 @@ test_that("codec_data works", {
 test_that("codec_data works with interpolation", {
   skip_if_no_cincy()
 
+  # geometry = TRUE
   codec_d <- codec_data("hamilton_landcover",
                         geography = cincy::zcta_tigris_2010,
                         geometry = TRUE)
   expect_equal(nrow(codec_d), 57)
+  expect_equal(ncol(codec_d), 7)
   expect_identical(glimpse_attr(codec_d)$value[[2]], "hamilton_landcover")
   expect_s3_class(codec_d, "sf")
 
+  # geometry = FALSE
+  codec_d <- codec_data("hamilton_landcover",
+                        geography = cincy::zcta_tigris_2010,
+                        geometry = FALSE)
+  
+  expect_equal(nrow(codec_d), 57)
+  expect_equal(ncol(codec_d), 6)
+  expect_identical(glimpse_attr(codec_d)$value[[2]], "hamilton_landcover")
+  expect_error(expect_s3_class(codec_d, "sf"))
 })
+
+