Remove as_sf deprecation warnings

Author: pdil

R/fips-data.R

@@ -3,7 +3,7 @@
 #' @param regions The region breakdown for the map, can be one of
 #'   (\code{"states"}, \code{"state"}, \code{"counties"}, \code{"county"}).
 #'   The default is \code{"states"}.
-#' @param as_sf DEPRECATED. This parameter has no effect and will be removed in
+#' @param as_sf Defunct, this parameter no longer has any effect and will be removed in
 #'  the future.
 #'
 #' @return An data frame of FIPS codes of the desired \code{regions}.
@@ -21,10 +21,6 @@ fips_data <- function(
 ) {
   regions <- match.arg(regions)
 
-  if (!missing("as_sf"))
-    warning("`as_sf` is deprecated and no longer has any effect, all data is
-            returned as an `sf` object.")
-
   map_data <- usmapdata::us_map(regions)
   sf::st_geometry(map_data) <- NULL
   map_data

R/us-map.R

@@ -14,7 +14,7 @@
 #'  same name. The regions listed in the \code{include} parameter are applied first and the
 #'  \code{exclude} regions are then removed from the resulting map. Any excluded regions
 #'  not present in the included regions will be ignored.
-#' @param as_sf DEPRECATED. This parameter has no effect and will be removed in
+#' @param as_sf Defunct, this parameter no longer has any effect and will be removed in
 #'  the future.
 #'
 #' @return An `sf` data frame of US map coordinates divided by the desired \code{regions}.
@@ -36,10 +36,6 @@ us_map <- function(
 ) {
   regions <- match.arg(regions)
 
-  if (!missing("as_sf"))
-    warning("`as_sf` is deprecated and no longer has any effect, all data is
-            returned as an `sf` object.")
-
   if (regions == "state") regions <- "states"
   else if (regions == "county") regions <- "counties"
 
@@ -70,7 +66,7 @@ us_map <- function(
 #' @param regions The region breakdown for the map, can be one of
 #'   (\code{"states"}, \code{"counties"}, as specified by the internal file names.
 #'   The default is \code{"states"}.
-#' @param as_sf DEPRECATED. This parameter has no effect and will be removed in
+#' @param as_sf Defunct, this parameter no longer has any effect and will be removed in
 #'  the future.
 #'
 #' @return An `sf` data frame of state or county centroid labels and positions
@@ -83,10 +79,6 @@ centroid_labels <- function(
 ) {
   regions <- match.arg(regions)
 
-  if (!missing("as_sf"))
-    warning("`as_sf` is deprecated and no longer has any effect, all data is
-            returned as an `sf` object.")
-
   sf::read_sf(
     system.file("extdata", paste0("us_", regions, "_centroids.gpkg"),
                 package = "usmapdata")

tests/testthat/test-fips-data.R

@@ -39,7 +39,3 @@ test_that("county FIPS codes load correctly", {
   expect_equal(county_fips[[3144, "county"]], "Weston County")
   expect_equal(county_fips[[3144, "fips"]], "56045")
 })
-
-test_that("as_sf deprecation warning occurs", {
-  expect_warning(fips_data(as_sf = TRUE))
-})

tests/testthat/test-usmap.R

@@ -74,8 +74,3 @@ test_that("centroid labels are loaded", {
   expect_equal(length(centroid_labels("states")[[1]]), 51)
   expect_equal(length(centroid_labels("counties")[[1]]), 3144)
 })
-
-test_that("as_sf deprecation warning occurs", {
-  expect_warning(us_map(as_sf = TRUE))
-  expect_warning(centroid_labels(as_sf = TRUE))
-})