| 202 | 202 | } |
|
| 203 | 203 | ||
| 204 | 204 | if( Rf_isNull( unlist ) ) { |
|
| 205 | - | // Rcpp::Rcout << "not unlisting: " << std::endl; |
|
| 206 | 205 | return sf_to_df( sf, fill ); |
|
| 207 | 206 | } |
|
| 208 | 207 | ||
| 208 | + | // issue 75 - ignore undefined 'unlist' columns |
|
| 209 | + | Rcpp::StringVector sf_names = sf.names(); |
|
| 210 | + | Rcpp::IntegerVector unlist_idx = sfheaders::utils::where_is( unlist, sf_names ); |
|
| 211 | + | unlist = unlist[ unlist_idx >= 0 ]; |
|
| 212 | + | ||
| 209 | 213 | R_xlen_t n_unlist = unlist.size(); |
|
| 210 | 214 | R_xlen_t i; |
|
| 211 | 215 | Rcpp::List to_unlist( n_unlist ); |
| 218 | 222 | ||
| 219 | 223 | to_unlist.names() = unlist; |
|
| 220 | 224 | ||
| 221 | - | // std::string geom_column = sf.attr("sf_column"); |
|
| 222 | - | // Rcpp::List sfc = sf[ geom_column ]; |
|
| 223 | - | // Rcpp::NumericMatrix sfc_coordinates = sfc_n_coordinates( sfc ); |
|
| 224 | 225 | Rcpp::DataFrame res = sf_to_df( sf, sfc, geom_column, sfc_coordinates, fill ); |
|
| 225 | 226 | ||
| 226 | 227 | R_xlen_t n_row = res.nrow(); |
| 108 | 108 | #' simpler syntax. |
|
| 109 | 109 | #' |
|
| 110 | 110 | #' @inheritParams sf_point |
|
| 111 | + | #' @inheritParams sf_multipoint |
|
| 111 | 112 | #' @inheritSection sf_pt Helpers |
|
| 112 | 113 | #' @inheritSection sfc_point notes |
|
| 113 | 114 | #' @inheritSection sf_point Keeping Properties |
| 144 | 145 | #' Constructs sf of LINESTRING objects, a helper for [sf_linestring()] with a |
|
| 145 | 146 | #' simpler syntax. |
|
| 146 | 147 | #' |
|
| 147 | - | #' @inheritParams sf_point |
|
| 148 | + | #' @inheritParams sf_linestring |
|
| 148 | 149 | #' @inheritSection sf_pt Helpers |
|
| 149 | 150 | #' @inheritSection sfc_point notes |
|
| 150 | 151 | #' @inheritSection sf_point Keeping Properties |
| 176 | 177 | #' Constructs sf of MULTILINESTRING objects, a helper for [sf_multilinestring()] |
|
| 177 | 178 | #' with a simpler syntax. |
|
| 178 | 179 | #' |
|
| 179 | - | #' @inheritParams sf_point |
|
| 180 | + | #' @inheritParams sf_line |
|
| 180 | 181 | #' @inheritSection sf_pt Helpers |
|
| 181 | 182 | #' @inheritSection sfc_point notes |
|
| 182 | 183 | #' @inheritSection sf_point Keeping Properties |
| 223 | 224 | #'Constructs sf of POLYGON objects, a helper for [sf_polygon()] with a simpler |
|
| 224 | 225 | #'syntax. |
|
| 225 | 226 | #' |
|
| 226 | - | #'@inheritParams sf_multipolygon |
|
| 227 | - | #'@inheritParams sf_point |
|
| 227 | + | #'@inheritParams sf_polygon |
|
| 228 | 228 | #'@inheritSection sf_pt Helpers |
|
| 229 | 229 | #'@inheritSection sfc_point notes |
|
| 230 | 230 | #'@inheritSection sf_point Keeping Properties |
| 260 | 260 | #' Constructs sf of MULTIPOLYGON objects, a helper for [sf_multipolygon()] with |
|
| 261 | 261 | #' a simpler syntax. |
|
| 262 | 262 | #' |
|
| 263 | - | #' @inheritParams sf_multipolygon |
|
| 264 | - | #' @inheritParams sf_point |
|
| 263 | + | #' @inheritParams sf_polygon |
|
| 265 | 264 | #' @inheritSection sf_pt Helpers |
|
| 266 | 265 | #' @inheritSection sfc_point notes |
|
| 267 | 266 | #' @inheritSection sf_point Keeping Properties |
| Files | Coverage |
|---|---|
| R | 95.69% |
| inst/include/sfheaders | 99.23% |
| src | 96.74% |
| Project Totals (74 files) | 99.00% |
