Skip to content

Experiment with removing all sf methods #2143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavisVaughan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Experiment with removing all sf methods #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions R/bind.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,5 +253,7 @@ vec_cbind_frame_ptype.default <- function(x, ...) {

#' @export
vec_cbind_frame_ptype.sf <- function(x, ...) {
# Still need this experimental method even after
# https://github.com/r-spatial/sf/pull/2584
data.frame()
}
159 changes: 0 additions & 159 deletions R/type-sf.R
View file
Open in desktop

This file was deleted.

43 changes: 17 additions & 26 deletions R/zzz.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,32 +168,23 @@
})

on_package_load("sf", {
import_from("sf", sf_deps, env = sf_env)

if (!env_has(ns_env("sf"), "vec_restore.sf")) {
s3_register("vctrs::vec_proxy", "sf", vec_proxy_sf)
s3_register("vctrs::vec_restore", "sf", vec_restore_sf)
}
if (!env_has(ns_env("sf"), "vec_ptype2.sf.sf")) {
s3_register("vctrs::vec_ptype2", "sf.sf", vec_ptype2_sf_sf)
s3_register(
"vctrs::vec_ptype2",
"sf.data.frame",
vec_ptype2_sf_data.frame
)
s3_register(
"vctrs::vec_ptype2",
"data.frame.sf",
vec_ptype2_data.frame_sf
)
s3_register("vctrs::vec_ptype2", "sf.tbl_df", vec_ptype2_sf_tbl_df)
s3_register("vctrs::vec_ptype2", "tbl_df.sf", vec_ptype2_tbl_df_sf)
s3_register("vctrs::vec_cast", "sf.sf", vec_cast_sf_sf)
s3_register("vctrs::vec_cast", "sf.data.frame", vec_cast_sf_data.frame)
s3_register("vctrs::vec_cast", "data.frame.sf", vec_cast_data.frame_sf)
}
if (!env_has(ns_env("sf"), "vec_proxy_order.sfc")) {
s3_register("vctrs::vec_proxy_order", "sfc", vec_proxy_order_sfc)
if (!is_installed("sf (>= 1.0-25)")) {
sf_update <- function(...) {
abort(
"Please update to sf >=1.0-25 for sf + vctrs/tidyverse compatibility."
)
}
s3_register("vctrs::vec_proxy", "sf", sf_update)
s3_register("vctrs::vec_restore", "sf", sf_update)
s3_register("vctrs::vec_ptype2", "sf.sf", sf_update)
s3_register("vctrs::vec_ptype2", "sf.data.frame", sf_update)
s3_register("vctrs::vec_ptype2", "data.frame.sf", sf_update)
s3_register("vctrs::vec_ptype2", "sf.tbl_df", sf_update)
s3_register("vctrs::vec_ptype2", "tbl_df.sf", sf_update)
s3_register("vctrs::vec_cast", "sf.sf", sf_update)
s3_register("vctrs::vec_cast", "sf.data.frame", sf_update)
s3_register("vctrs::vec_cast", "data.frame.sf", sf_update)
s3_register("vctrs::vec_proxy_order", "sfc", sf_update)
}
})

Expand Down
8 changes: 0 additions & 8 deletions tests/testthat/_snaps/type-sf.md
View file
Open in desktop

This file was deleted.

Loading