simpler

rspatial · Oct 10, 2023 · ca7e702 · ca7e702
1 parent 4384573
commit ca7e702
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/R/generics.R b/R/generics.R
@@ -7,19 +7,20 @@ setMethod("tags", signature(x="SpatRaster"),
 	function(x, name=NULL) {
 		v <- x@cpp$getTags()
 		m <- matrix(v, ncol=2, byrow=TRUE, dimnames = list(NULL, c("name", "value")))
+		out <- m[,2]
+		names(out) <- m[,1]
 		if (!is.null(name)) {
-			i <- match(name, m[,1])
-			m[i,2]
-		} else {
-			m
-		}
+			out <- out[name]
+		} 
+		out
 	}
 )
 
+
 setMethod("tags<-", signature(x="SpatRaster"),
 	function(x, value) {
 		if (is.null(value)) {
-			value <- tags(x)
+			value <- matrix(x@cpp$getTags(), ncol=2, byrow=TRUE)
 			value[,2] <- ""
 		} else if (NCOL(value) == 1) {
 			value <- strsplit(value, "=")

diff --git a/man/tags.Rd b/man/tags.Rd
@@ -27,7 +27,7 @@ You can set arbitrary metadata to a SpatRaster using "name=value" tags.
 }
 
 \value{
-SpatRaster (\code{tags<-}), matrix (\code{tags}) or character (\code{tags} and \code{name} is not NULL)
+SpatRaster (\code{tags<-}), or named character (\code{tags})
 }
 
 \examples{
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     \value{
-    SpatRaster (\code{tags<-}), matrix (\code{tags}) or character (\code{tags} and \code{name} is not NULL)
+    SpatRaster (\code{tags<-}), or named character (\code{tags})
     }
     \examples{
@@ Expand Down @@