Skip to content

Commit

Permalink
closing JosiahParry#55
Browse files Browse the repository at this point in the history
Merge branch 'rsbivand-main' into main
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information
DHLocke committed Sep 5, 2024
2 parents 3d5617d + f86f079 commit b37478b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Package: sfdep
Title: Spatial Dependence for Simple Features
Version: 0.2.4.9000
Authors@R: c(
person("Josiah", "Parry", , "[email protected]", role = c("aut"),
person("Josiah", "Parry", email = "[email protected]", role = c("aut"),
comment = c(ORCID = "0000-0001-9910-865X")),
person("Dexter", "Locke", 'H', "[email protected]", role = c("aut", "cre"),
person("Dexter", "Locke", email = "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-2704-9720"))
)
Description: An interface to 'spdep' to integrate with 'sf' objects and the 'tidyverse'.
Expand Down Expand Up @@ -35,7 +35,7 @@ Suggests:
Config/testthat/edition: 3
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Imports:
sf,
cli,
Expand Down
2 changes: 1 addition & 1 deletion R/spacetime-methods.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spt_update <- function(x, ...) {

#' Cast between `spacetime` and `sf` classes
#'
#' @param x for [sfdep::st_as_sf()] a spacetime object. For [sfdep::as_spacetime()]
#' @param x for [sf::st_as_sf()] a spacetime object. For [sfdep::as_spacetime()]
#' an sf object.
#' @param ... arguments passed to merge.
#' @export
Expand Down
3 changes: 3 additions & 0 deletions R/utils-set-operations.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#' @export
nb_union <- function(x, y) {
res <- mapply(union, x, y, SIMPLIFY = FALSE)
res <- lapply(res, sort)
res <- fill_missing_nb(res)
class_modify(res, "nb")
}
Expand All @@ -32,6 +33,7 @@ nb_union <- function(x, y) {
#' @export
nb_intersect <- function(x, y) {
res <- mapply(intersect, x, y, SIMPLIFY = FALSE)
res <- lapply(res, sort)
res <- fill_missing_nb(res)
class_modify(res, "nb")
}
Expand All @@ -40,6 +42,7 @@ nb_intersect <- function(x, y) {
#' @export
nb_setdiff <- function(x, y) {
res <- mapply(setdiff, x, y, SIMPLIFY = FALSE)
res <- lapply(res, sort)
res <- fill_missing_nb(res)
class_modify(res, "nb")
}
Expand Down
2 changes: 1 addition & 1 deletion man/as_spacetime.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b37478b

Please sign in to comment.