m

Author: rhijmans

R/subset.R

@@ -103,10 +103,6 @@ function(x, i, j) {
 setMethod("subset", signature(x="SpatVector"),
 	function(x, subset, select, drop=FALSE, NSE=FALSE) {
 
-		spatcls <- isTRUE(substr(class(subset)[1], 1, 4) == "Spat")
-		if (spatcls) {
-			return(x[subset])
-		}
  		if (NSE) {
 			d <- as.list(x)
 			# from the subset<data.frame> method
@@ -130,7 +126,13 @@ setMethod("subset", signature(x="SpatVector"),
 				}
 			x <- x[r, v, drop=drop]
 		} else {
-			if (missing(select)) {
+			spatcls <- isTRUE(substr(class(subset)[1], 1, 4) == "Spat")
+			if (spatcls) {
+				x <- x[subset]
+				if (!missing(select)) {
+					x <- x[, select, drop=drop]
+				}
+			} else if (missing(select)) {
 				x <- x[which(as.vector(subset)), drop=drop]
 			} else {
 				x <- x[which(as.vector(subset)), select, drop=drop]

man/distance.Rd

@@ -51,7 +51,7 @@ If \code{y} is missing, the distance between each point in \code{x} with all oth
 \S4method{distance}{SpatVector,SpatVector}(x, y, pairwise=FALSE, unit="m", method="haversine", use_nodes=FALSE)
 
 \S4method{distance}{SpatVector,ANY}(x, y, sequential=FALSE, pairs=FALSE, symmetrical=TRUE, unit="m",
-			method="haversine", use_nodes=FALSE)
+			method="haversine", use_nodes=FALSE, names=NULL)
 
 \S4method{distance}{matrix,matrix}(x, y, lonlat, pairwise=FALSE, unit="m", method="geo")
 
@@ -77,6 +77,7 @@ If \code{y} is missing, the distance between each point in \code{x} with all oth
   \item{pairs}{logical. If \code{TRUE} a "from", "to", "distance" matrix is returned} 
   \item{symmetrical}{logical. If \code{TRUE} and \code{pairs=TRUE}, the distance between a pair is only included once. The distance between geometry 1 and 3 is included, but the (same) distance between 3 and 1 is not}
   \item{use_nodes}{logical. If \code{TRUE} and the crs is longitude/latitude, the nodes (vertices) of lines or polygons are used to compute distances, instead of the lines that connect them. This is faster, but can be less precise if the nodes are far apart}
+  \item{names}{character. Either a single variable name in \code{x} or a vector of length \code{nrow(x)} to label the distance matrix} 
 }
 
 \value{

man/ext.Rd

@@ -23,6 +23,7 @@
 \alias{ext,sf-method}
 \alias{ext,bbox-method}
 \alias{ext,PackedSpatExtent-method}
+\alias{ext,SpatGraticule-method}
 
 \title{Create, get or set a SpatExtent}
 

man/plet.Rd

@@ -26,7 +26,7 @@ The arguments of \code{plet} are similar to those of \code{\link[terra]{plot}},
 	tiles=c("Streets", "Esri.WorldImagery", "OpenTopoMap"), 
 	wrap=TRUE, maxcell=500000, stretch=NULL, legend="bottomright", 
 	shared=FALSE, panel=FALSE, collapse=TRUE, type=NULL, breaks=NULL,
-	breakby="eqint", range=NULL, fill_range=NULL, map=NULL, ...) 
+	breakby="eqint", range=NULL, fill_range=FALSE, map=NULL, ...) 
 
 
 \S4method{plet}{SpatRasterCollection}(x, col, alpha=0.8, main=names(x),