Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dcooley/sfheaders
Browse files Browse the repository at this point in the history
  • Loading branch information
dcooley committed Nov 26, 2020
2 parents 287a852 + 3115827 commit 41c2c6a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions R/df.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sfg_to_df <- function( sfg ) return( rcpp_sfg_to_df( sfg ) )

#' sfc to df
#'
#' Converts an sfc object a to data.frame
#' Converts an sfc object to a data.frame
#'
#' @param sfc sfc object
#'
Expand Down Expand Up @@ -47,12 +47,12 @@ sfc_to_df <- function( sfc ) return( rcpp_sfc_to_df( sfc ) )

#' sf to df
#'
#' Converts an sf object ot a data.frame
#' Converts an sf object to a data.frame
#'
#' @param sf sf object
#' @param fill logical indicating if the resulting data.frame should be filled
#' with the data columns from the sf object. If \code{TRUE}, each row of data will
#' be replicated for every coordiante in every geometry.
#' be replicated for every coordinate in every geometry.
#' @param unlist string vector of columns to unlist. Each list element is equivalent
#' to a row of the input object, and is expected to be the same
#' length as the number of coordinates in the geometry.
Expand All @@ -77,7 +77,7 @@ sfc_to_df <- function( sfc ) return( rcpp_sfc_to_df( sfc ) )
#'
#' df <- sf_to_df( sf, fill = TRUE )
#'
#' ## Unlisting lsit columns
#' ## Unlisting list columns
#'
#' df <- data.frame(
#' l_id = c(1,1,1,2,2,2,3,3,3,3)
Expand Down
2 changes: 1 addition & 1 deletion R/sfc.R
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ sfc_multipoint <- function( obj, x = NULL, y = NULL, z = NULL, m = NULL, multipo

#' sfc LINESTRING
#'
#' constructs sfc of MULTIPOINT objects
#' constructs sfc of LINESTRING objects
#'
#' @inheritParams sfc_multipoint
#' @inheritSection sfc_point notes
Expand Down
6 changes: 3 additions & 3 deletions man/sf_to_df.Rd

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

2 changes: 1 addition & 1 deletion man/sfc_linestring.Rd

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

2 changes: 1 addition & 1 deletion man/sfc_to_df.Rd

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

0 comments on commit 41c2c6a

Please sign in to comment.