m

rhijmans · rhijmans · commit e9f5363ece19 · 2025-09-19T14:51:06.000-07:00
diff --git a/NEWS.md b/NEWS.md
@@ -16,6 +16,11 @@
 
 - better support for creating a SpatVector with an EMPTY wkt geometry [#1903](https://github.com/rspatial/terra/issues/1903) by Anatolii Tsyplenkov
 
+## new
+
+- it is now possible to create a SpatVector from Well Known Binary (WKB) data [#1895](https://github.com/rspatial/terra/pull/1895) by Jan Hartman
+
+
 # version 1.8-60
 
 Released 2025-07-18
diff --git a/R/values.R b/R/values.R
@@ -564,12 +564,7 @@ setMethod("identical", signature(x="SpatRaster", y="SpatRaster"),
 
 setMethod("identical", signature(x="SpatExtent", y="SpatExtent"),
 	function(x, y) {
-		if (any(dim(target) != dim(current))) return(FALSE)
-		if (crs(target) != crs(current)) return(FALSE)
-		if (geomtype(target) != geomtype(current)) return(FALSE)
-		if (!identical(values(target), values(current))) return(FALSE)
-		if (!identical(geom(target), geom(current))) return(FALSE)
-		TRUE
+		identical(as.vector(x), as.vector(y))
 	}
 )
 
diff --git a/man/plot.Rd b/man/plot.Rd
@@ -46,7 +46,7 @@ There is a separate help file for plotting a \code{\link[=plot,SpatGraticule,mis
 
 \S4method{plot}{SpatVector,missing}(x, y, values=NULL, ...)
 
-\S4method{plot}{SpatVectorCollection,missing}(x, y, main, mar=NULL, nc, nr, maxnl=16, ...)
+\S4method{plot}{SpatVectorCollection,missing}(x, y, main, mar=NULL, nc, nr, maxnl=16, col=NULL, ...)
 
 \S4method{plot}{SpatVectorCollection,numeric}(x, y, main, mar=NULL, ext=NULL, ...)
 }
diff --git a/man/voronoi.Rd b/man/voronoi.Rd
@@ -43,9 +43,9 @@ v
 d <- delaunay(x)
 d
 
-plot(v, lwd=2, col=rainbow(15))
-lines(x, col="gray", lwd=2)
-points(x)
+#plot(v, lwd=2, col=rainbow(15))
+#lines(x, col="gray", lwd=2)
+#points(x)
 }
 
 \keyword{spatial}
diff --git a/src/read_ogr.cpp b/src/read_ogr.cpp
@@ -419,13 +419,15 @@ void addOGRgeometry(SpatVector &x, OGRGeometry *poGeometry) {
 		x.setError("cannot read geometry type: " + strgeomtype);
 		return;
 	}
-	if ((x.size() > 1)  && (x.geoms[0].gtype != g.gtype)) {
-		x.setError("a SpatVector can only have a single geometry type");
-		return;
+	if ((x.size() > 1) && (x.geoms[0].gtype != g.gtype)) {
+		if (x.geoms[0].gtype != null) {
+			x.setError("a SpatVector can only have a single geometry type");
+			return;
+		}
 	}
 	x.addGeom(g);
 	OGRGeometryFactory::destroyGeometry(poGeometry);
-}	
+}
 
 
 bool SpatVector::addRawGeoms(std::vector<unsigned char*> wkbs, std::vector<size_t> sizes) {

Original file line number	Diff line number	Diff line change
`@@ -564,12 +564,7 @@ setMethod("identical", signature(x="SpatRaster", y="SpatRaster"),`
`564`	`564`
`565`	`565`	`setMethod("identical", signature(x="SpatExtent", y="SpatExtent"),`
`566`	`566`	`function(x, y) {`
`567`		`- if (any(dim(target) != dim(current))) return(FALSE)`
`568`		`- if (crs(target) != crs(current)) return(FALSE)`
`569`		`- if (geomtype(target) != geomtype(current)) return(FALSE)`
`570`		`- if (!identical(values(target), values(current))) return(FALSE)`
`571`		`- if (!identical(geom(target), geom(current))) return(FALSE)`
`572`		`- TRUE`
	`567`	`+ identical(as.vector(x), as.vector(y))`
`573`	`568`	`}`
`574`	`569`	`)`
`575`	`570`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ There is a separate help file for plotting a \code{\link[=plot,SpatGraticule,mis`
`46`	`46`
`47`	`47`	`\S4method{plot}{SpatVector,missing}(x, y, values=NULL, ...)`
`48`	`48`
`49`		`-\S4method{plot}{SpatVectorCollection,missing}(x, y, main, mar=NULL, nc, nr, maxnl=16, ...)`
	`49`	`+\S4method{plot}{SpatVectorCollection,missing}(x, y, main, mar=NULL, nc, nr, maxnl=16, col=NULL, ...)`
`50`	`50`
`51`	`51`	`\S4method{plot}{SpatVectorCollection,numeric}(x, y, main, mar=NULL, ext=NULL, ...)`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ v`
`43`	`43`	`d <- delaunay(x)`
`44`	`44`	`d`
`45`	`45`
`46`		`-plot(v, lwd=2, col=rainbow(15))`
`47`		`-lines(x, col="gray", lwd=2)`
`48`		`-points(x)`
	`46`	`+#plot(v, lwd=2, col=rainbow(15))`
	`47`	`+#lines(x, col="gray", lwd=2)`
	`48`	`+#points(x)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`\keyword{spatial}`