Skip to content

Commit

Permalink
Merge branch 'main' into prepare-spatial-filter-revisions
Browse files Browse the repository at this point in the history
  • Loading branch information
elipousson authored Apr 25, 2024
2 parents 5fbee80 + bd83f9f commit 6665363
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Add `pull_field_aliases()` utility function
- `arc_select()` now uses `arcgisutils::rbind_results()` for faster row-binding if `{collapse}`, `{data.table}`, `{vctrs}` are installed (#175)
- Improve handling of `filter_geom` by `arc_select()` by using `sf::st_concave_hull()` to process input geometry (in cases when applying `sf::st_union()` does not generate a single POLYGON) and warn if the input geometry is empty or longer than length 1. (@elipousson, #166)
- Preserve order of `fields` column names for `arc_select()` (fixes minor bug with `arc_read` handling of `col_names`) (#185)

# arcgislayers 0.2.0

Expand Down
4 changes: 2 additions & 2 deletions R/arc-select.R
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ collect_layer <- function(
# selected
if (rlang::is_named(res) && has_out_fields) {
out_fields <- c(out_fields, attr(res, "sf_column"))
res_nm <- names(res)
res <- res[, tolower(res_nm) %in% tolower(out_fields), drop = FALSE]
match_nm <- match(tolower(out_fields), tolower(names(res)))
res <- res[, match_nm[!is.na(match_nm)], drop = FALSE]
}

if (rlang::is_empty(res)) {
Expand Down

0 comments on commit 6665363

Please sign in to comment.