Merge branch 'main' into pointx

Author: edzer

.github/workflows/rcmdcheck.yml

@@ -5,6 +5,8 @@ on:
     branches: [main, master]
   pull_request:
     branches: [main, master]
+  schedule:
+    - cron: "0 4 * * *"
 
 name: R-CMD-check
 

NEWS.md

@@ -1,5 +1,7 @@
 # version 1.0-13
 
+* add `rename_with.sf()` method; #1472
+
 * use GEOS' overlayNG routines for (GEOS) Intersection, Difference, Union and SymDifference; #2143
 
 * added `duplicated.sf()`; #2138, #2140, thanks to @bart1

R/geom-predicates.R

@@ -259,15 +259,15 @@ st_is_within_distance = function(x, y = x, dist, sparse = TRUE, ...) {
 	ret = if (isTRUE(st_is_longlat(x))) {
 			units(dist) = as_units("m") # might convert
 			r = if (sf_use_s2()) {
-				if (inherits(dist, "units"))
-					dist = drop_units(dist)
-				s2::s2_dwithin_matrix(x, y, dist, ...)
-			} else {
-				if (!requireNamespace("lwgeom", quietly = TRUE) || 
-						utils::packageVersion("lwgeom") <= "0.1-2")
-					stop("lwgeom > 0.1-2 required: install first?")
-				lwgeom::st_geod_distance(x, y, tolerance = dist, sparse = TRUE)
-			}
+					if (inherits(dist, "units"))
+						dist = drop_units(dist)
+					s2::s2_dwithin_matrix(x, y, dist, ...)
+				} else {
+					if (!requireNamespace("lwgeom", quietly = TRUE) || 
+							utils::packageVersion("lwgeom") <= "0.1-2")
+						stop("lwgeom > 0.1-2 required: install first?")
+					lwgeom::st_geod_distance(x, y, tolerance = dist, sparse = TRUE)
+				}
 			sgbp(r, predicate = "is_within_distance", region.id = seq_along(x), 
 				ncol = length(st_geometry(y)))
 		} else {

R/plot.R

@@ -788,10 +788,13 @@ bb2merc = function(x, cls = "ggmap") { # return bbox in the appropriate "web mer
 #' @param axes ignore
 #' @param logz ignore
 #' @param ... ignore
+#' @param lab ignore
 .image_scale = function(z, col, breaks = NULL, key.pos, add.axis = TRUE,
-		at = NULL, ..., axes = FALSE, key.length, logz = FALSE) {
+		at = NULL, ..., axes = FALSE, key.length, logz = FALSE, lab = "") {
 	if (!is.null(breaks) && length(breaks) != (length(col) + 1))
 		stop("must have one more break than colour")
+	stopifnot(is.character(lab) || is.expression(lab))
+	lab_set = (is.character(lab) && lab != "") || is.expression(lab)
 	zlim = range(z, na.rm = TRUE)
 	if (is.null(breaks))
 		breaks = seq(zlim[1], zlim[2], length.out = length(col) + 1)
@@ -819,14 +822,16 @@ bb2merc = function(x, cls = "ggmap") { # return bbox in the appropriate "web mer
 		xlim = c(0, 1)
 		mar = c(ifelse(axes, 2.1, 1), 0, 1.2, 0)
 	}
-	mar[key.pos] = 2.1
+	mar[key.pos] = 2.1 + 1.5 * lab_set
 	par(mar = mar)
 
+	plot(1, 1, t = "n", ylim = ylim, xlim = xlim, axes = FALSE,
+		xlab = "", ylab = "", xaxs = "i", yaxs = "i")
+	if (lab != "")
+		mtext(lab, side = key.pos, line = 2.5, cex = .8)
 	poly = vector(mode="list", length(col))
 	for (i in seq(poly))
 		poly[[i]] = c(breaks[i], breaks[i+1], breaks[i+1], breaks[i])
-	plot(1, 1, t = "n", ylim = ylim, xlim = xlim, axes = FALSE,
-		xlab = "", ylab = "", xaxs = "i", yaxs = "i")
 	offset = 0.2
 	offs = switch(key.pos,
 		c(0,0,-offset,-offset),

R/tidyverse.R

@@ -235,6 +235,18 @@ rename.sf <- function(.data, ...) {
 	st_set_agr(st_as_sf(ret, sf_column_name = sf_column), agr)
 }
 
+rename_with.sf = function(.data, .fn, .cols, ...) {
+	if (!requireNamespace("rlang", quietly = TRUE))
+		stop("rlang required: install that first") # nocov
+	.fn = rlang::as_function(.fn)
+	agr = st_agr(.data)
+	ret = NextMethod()
+	names(agr) = .fn(names(agr))
+	st_agr(ret) = agr
+	ret
+}
+
+
 #' @name tidyverse
 #' @examples
 #' if (require(dplyr, quietly = TRUE)) {
@@ -634,6 +646,7 @@ register_all_s3_methods = function() {
 	register_s3_method("dplyr", "left_join", "sf")
 	register_s3_method("dplyr", "mutate", "sf")
 	register_s3_method("dplyr", "rename", "sf")
+	register_s3_method("dplyr", "rename_with", "sf")
 	register_s3_method("dplyr", "right_join", "sf")
 	register_s3_method("dplyr", "rowwise", "sf")
 	register_s3_method("dplyr", "sample_frac", "sf")

README.md

@@ -1,6 +1,5 @@
 <!-- badges: start -->
 [![rcmdcheck](https://github.com/r-spatial/sf/actions/workflows/rcmdcheck.yml/badge.svg?branch=main)](https://github.com/r-spatial/sf/actions/workflows/rcmdcheck.yml)
-[![tic](https://github.com/r-spatial/sf/workflows/tic/badge.svg?branch=main)](https://github.com/r-spatial/sf/actions)
 [![tic-db](https://github.com/r-spatial/sf/workflows/tic-db/badge.svg?branch=main)](https://github.com/r-spatial/sf/actions)
 [![Coverage Status](https://img.shields.io/codecov/c/github/r-spatial/sf/main.svg)](https://app.codecov.io/gh/r-spatial/sf)
 [![License](http://img.shields.io/badge/license-GPL%20%28%3E=%202%29-brightgreen.svg?style=flat)](http://www.gnu.org/licenses/gpl-2.0.html)

man/stars.Rd

@@ -367,16 +367,23 @@ List CPL_write_mdim(CharacterVector name, CharacterVector driver, IntegerVector
 	std::vector<std::shared_ptr<GDALDimension>> all_dims;
 	for (int i = dimensions.size() - 1; i >= 0; i--) { // backwards, for whatever reason
 		std::string type;
+		std::string direction = "";
 		if (dimnames[i] == xy[0]) // "x"
 			type = "HORIZONTAL_X";
 		else if (dimnames[i] == xy[1]) // "y"
 			type = "HORIZONTAL_Y";
-		else if (dimnames[i] == "time")
+		else if (dimnames[i] == "depth") {
+			type = "VERTICAL";
+			direction = "DOWN";
+		} else if (dimnames[i] == "height") {
+			type = "VERTICAL";
+			direction = "UP";
+		} else if (dimnames[i] == "time")
 			type = "TEMPORAL";
 		else
 			type = "";
 		const char *name = dimnames[i];
-		std::shared_ptr<GDALDimension> d = g->CreateDimension(name, type, "", dimensions[i], nullptr);
+		std::shared_ptr<GDALDimension> d = g->CreateDimension(name, type, direction, dimensions[i], nullptr);
 		if (d == nullptr)
 			stop("creation of dimension failed");
 		all_dims.push_back(d);

src/mdim.cpp

@@ -0,0 +1,8 @@
+# installs dependencies, runs R CMD check, runs covr::codecov()
+do_package_checks()
+
+if (ci_on_ghactions() && ci_has_env("BUILD_PKGDOWN")) {
+  # creates pkgdown site and pushes to gh-pages branch
+  # only for the runner with the "BUILD_PKGDOWN" env var set
+  do_pkgdown()
+}