Merge branch 'main' into docs

Author: olivroy

NEWS.md

@@ -1,5 +1,7 @@
 # version 1.0-16
 
+* `[.sfc` works when setting argument `op`; #2320
+
 * `st_sample()` for polygons is sensitive to setting `oriented = TRUE` to prevent wrongly correcting ring directions; #2308
 
 * add support for the GDAL `footprint` utility (requiring GDAL >= 3.8.0) to `gdal_utils`; #2305, by @goergen95

R/arith.R

@@ -1,10 +1,10 @@
-#' S3 Ops Group Generic Functions for simple feature geometries
+#' Arithmetic operators for simple feature geometries
 #' @name Ops
 #'
 #' @param e1 object of class \code{sfg} or \code{sfc}
 #' @param e2 numeric, or object of class \code{sfg}; in case \code{e1} is of class \code{sfc} also an object of class \code{sfc} is allowed
 #'
-#' @details in case \code{e2} is numeric, +, -, *, /, %% and %/% add, subtract, multiply, divide, modulo, or integer-divide by \code{e2}. In case \code{e2} is an n x n matrix, * matrix-multiplies and / multiplies by its inverse. If \code{e2} is an \code{sfg} object, |, /, & and %/% result in the geometric union, difference, intersection and symmetric difference respectively, and \code{==} and \code{!=} return geometric (in)equality, using \link{st_equals}.
+#' @details in case \code{e2} is numeric, +, -, *, /, %% and %/% add, subtract, multiply, divide, modulo, or integer-divide by \code{e2}. In case \code{e2} is an n x n matrix, * matrix-multiplies and / multiplies by its inverse. If \code{e2} is an \code{sfg} object, |, /, & and %/% result in the geometric union, difference, intersection and symmetric difference respectively, and \code{==} and \code{!=} return geometric (in)equality, using \link{st_equals}. If `e2` is an `sfg` or `sfc` object, for operations `+` and `-` it has to have `POINT` geometries.
 #'
 #' If \code{e1} is of class \code{sfc}, and \code{e2} is a length 2 numeric, then it is considered a two-dimensional point (and if needed repeated as such) only for operations \code{+} and \code{-}, in other cases the individual numbers are repeated; see commented examples.
 #'

R/graticule.R

@@ -38,7 +38,7 @@
 #'    c( bb[3],bb[4]),c( bb[1],bb[4]),c( bb[1],bb[2])))
 #'
 #' g = st_graticule(usa)
-#' plot(usa, xlim = 1.2 * c(-2450853.4, 2186391.9))
+#' plot(usa, xlim = 1.2 * c(-2450853.4, 2186391.9), reset = FALSE)
 #' plot(g[1], add = TRUE, col = 'grey')
 #' plot(bbox, add = TRUE)
 #' points(g$x_start, g$y_start, col = 'red')

R/sfc.R

@@ -143,8 +143,11 @@ st_sfc = function(..., crs = NA_crs_, precision = 0.0, check_ring_dir = FALSE, d
 "[.sfc" = function(x, i, j, ..., op = st_intersects) {
 	if (!missing(i) && (inherits(i, "sf") || inherits(i, "sfc") || inherits(i, "sfg")))
 		i = lengths(op(x, i, ...)) != 0
-	st_sfc(NextMethod(), crs = st_crs(x), precision = st_precision(x),
-		dim = if(length(x)) class(x[[1]])[1] else "XY")
+	precision = st_precision(x)
+	crs = st_crs(x)
+	dim = if (length(x)) class(x[[1]])[1] else "XY"
+	x = unclass(x)[i] # now a list
+	st_sfc(x, crs = crs, precision = precision, dim = dim)
 }
 
 

R/tidyverse.R

@@ -261,7 +261,7 @@ rename_with.sf = function(.data, .fn, .cols, ...) {
 		ret = dplyr::as_tibble(ret)
 	ret = st_as_sf(ret, sf_column_name = names(ret)[sf_column_loc])
 
-	names(agr) = .fn(names(agr))
+	names(agr) = .fn(names(agr), ...)
 	st_agr(ret) = agr
 	ret
 }