m

Author: rhijmans

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: terra
 Type: Package
 Title: Spatial Data Analysis
-Version: 1.8-83
-Date: 2025-11-18
+Version: 1.8-85
+Date: 2025-11-23
 Depends: R (>= 3.5.0), methods
 Suggests: parallel, tinytest, ncdf4, sf (>= 0.9-8), deldir, XML, leaflet (>= 2.2.1), htmlwidgets
 LinkingTo: Rcpp

NEWS.md

@@ -1,4 +1,4 @@
-# version 1.8-83
+# version 1.8-85
 
 ## bug fixes
 
@@ -16,7 +16,7 @@
 - `boundaries` has new argument "ignoreNA=FALSE" to only detect boundaries between different classes, not between classes and missing values [#1963](https://github.com/rspatial/terra/issues/1963) by Oleg Zheleznyy
 - `stretch` gains argument "bylayer=TRUE" [#1970](https://github.com/rspatial/terra/issues/1970) by Michael Sumner
 - `makeValid` gains argument `buffer=FALSE` [#1955](https://github.com/rspatial/terra/issues/1955) by Márcia Barbosa
-- argument "col" in `plot<SpatVector>` can now be a named vector or two-column matrix/data.frame to match character/factor values to colors [#1976](https://github.com/rspatial/terra/issues/1976) by Richard Cooper 
+- `plot<SpatVector>` argument "col" can now be a named vector or two-column matrix/data.frame to match character/factor values to colors [#1976](https://github.com/rspatial/terra/issues/1976) by Richard Cooper 
 
 ## new
 

R/plot_add.R

@@ -45,18 +45,18 @@
 
 
 
-add_legend <- function(x, y, ...) {
+add_legend <- function(x, y, xpd=TRUE, ...) {
 	if (inherits(x, "character")) {
 		e <- unlist(get.clip())
 		if (!is.null(e)) {
-			rct <- graphics::legend(x=x, y=y, plot=FALSE, ...)$rect
+			rct <- graphics::legend(x=x, y=y, plot=FALSE, xpd=xpd, ...)$rect
 			xy <- get_legxy(rct, e[1:4], x, NULL)
-			graphics::legend(x=xy[1], y=xy[2], ...)
+			graphics::legend(x=xy[1], y=xy[2], xpd=xpd, ...)
 		} else {
-			graphics::legend(x=x, y=y, ...)
+			graphics::legend(x=x, y=y, xpd=xpd, ...)
 		}
 	} else {
-		graphics::legend(x=x, y=y, ...)
+		graphics::legend(x=x, y=y, xpd=xpd, ...)
 	}
 }
 

R/plot_raster.R

@@ -156,9 +156,9 @@
 	stopifnot(length(out$leg$legend) == length(out$levels))
 	nlevs <- length(levs)
 
-	if (is.vector(out$cols) && !is.null(names(out$cols))) {
-		out$cols <- data.frame(value=as.numeric(names(out$cols)), col=out$cols)
-	} 
+#	if (is.vector(out$cols) && !is.null(names(out$cols))) {
+#		out$cols <- data.frame(value=as.numeric(names(out$cols)), col=out$cols)
+#	} 
 
 	if (NCOL(out$cols) == 2) {
 		#i <- match(Z, as.numeric(levs))

man/legend.Rd

@@ -9,13 +9,14 @@ Wrapper around \code{\link[graphics]{legend}} that allows adding a custom legend
 }
 
 \usage{
-add_legend(x, y, ...)
+add_legend(x, y, xpd=xpd, ...)
 }
 
 
 \arguments{
   \item{x}{The keyword to be used to position the legend (or the x coordinate)}
   \item{y}{The y coordinate to be used to position the legend (is x is also a coordinate)}
+  \item{xpd}{logical. If \code{TRUE}, the legend can be added outside the map area}
   \item{...}{arguments passed to \code{\link[graphics]{legend}}}
 }
 

man/plot.Rd

@@ -54,8 +54,7 @@ There is a separate help file for plotting a \code{\link[=plot,SpatGraticule,mis
 \arguments{
   \item{x}{SpatRaster or SpatVector}
   \item{y}{missing or positive integer or name indicating the layer(s) to be plotted}
-  \item{col}{character vector to specify the colors to use. The default is \code{map.pal("viridis", 100)}. The default can be changed with the \code{terra.pal} option. For example: \code{options(terra.pal=terrain.colors(10))}. If \code{x} is a \code{SpatRaster} it can also be a \code{data.frame} with two columns (value, color) or a named vector (value=color) for a "classes" type legend or with three columns (from, to, color) for an "interval" type legend. 
-  If \code{x} is a \code{SpatVector} it can also be a \code{data.frame} with two columns (value, color) or a named vector (value=color) for a "classes" type legend. If \code{x} us a SpatVectorCollection, a list can be provided with colors for each SpatVector}
+  \item{col}{character vector to specify the colors to use. The default is \code{map.pal("viridis", 100)}. The default can be changed with the \code{terra.pal} option. For example: \code{options(terra.pal=terrain.colors(10))}. If \code{x} is a \code{SpatRaster} it can also be a \code{data.frame} with two columns (value, color) for a "classes" type legend or with three columns (from, to, color) for an "interval" type legend. If \code{x} is a \code{SpatVector} it can also be a \code{data.frame} with two columns (value, color) or a named vector (value=color) for a "classes" type legend. If \code{x} us a SpatVectorCollection, a list can be provided with colors for each SpatVector}
   \item{type}{character. Type of map/legend. One of "continuous", "classes", or "interval". If not specified, the type is chosen based on the data}
   \item{mar}{numeric vector of length 4 to set the margins of the plot (to make space for the legend). The default is (3.1, 3.1, 2.1, 7.1) for a single plot with a legend and (3.1, 3.1, 2.1, 2.1) otherwise. The default for a RGB raster is 0. Use \code{mar=NA} to not set the margins}
   \item{legend}{logical or character. If not \code{FALSE} a legend is drawn. The character value can be used to indicate where the legend is to be drawn. For example "topright" or "bottomleft". Use \code{plg} for more refined placement. Not supported for continuous legends (the default for raster data)}