for #1678

rspatial · Dec 13, 2024 · d1d7e0d · d1d7e0d
1 parent cfa8a71
commit d1d7e0d
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 9 deletions.
diff --git a/man/relate.Rd b/man/relate.Rd
@@ -47,7 +47,7 @@ Spatial relationships between geometries
 \arguments{
   \item{x}{SpatVector or SpatExtent}
   \item{y}{missing or as for \code{x}}
-  \item{relation}{character. One of "intersects", "touches", "crosses", "overlaps", "within", "contains", "covers", "coveredby", "disjoint". Or a "DE-9IM" string such as "FF*FF****". See \href{https://en.wikipedia.org/wiki/DE-9IM}{Wikipedia} or \href{https://docs.geotools.org/stable/userguide/library/jts/dim9.html}{GeoTools doc}}
+  \item{relation}{character. One of "intersects", "touches", "crosses", "overlaps", "within", "contains", "covers", "coveredby", "disjoint", or "equals". It can also be a "DE-9IM" string such as "FF*FF****". See \href{https://en.wikipedia.org/wiki/DE-9IM}{Wikipedia} or \href{https://docs.geotools.org/stable/userguide/library/jts/dim9.html}{GeoTools doc}}
   \item{pairs}{logical. If \code{TRUE} a two-column matrix is returned with the indices of the cases where the requested relation is \code{TRUE}. This is especially helpful when dealing with many geometries as the returned value is generally much smaller} 
   \item{na.rm}{logical. If \code{TRUE} and \code{pairs=TRUE}, geometries in \code{x} for which there is no related geometry in \code{y} are omitted}
 } 

diff --git a/src/geos_methods.cpp b/src/geos_methods.cpp
@@ -1226,9 +1226,9 @@ SpatVector SpatVector::buffer2(std::vector<double> d, unsigned quadsegs) {
 	std::vector<GeomPtr> b(size());
 	for (size_t i = 0; i < g.size(); i++) {
 
-		Rcpp::Rcout << "buffer " << i;		
+//		Rcpp::Rcout << "buffer " << i;		
 		GEOSGeometry* pt = GEOSBuffer_r(hGEOSCtxt, g[i].get(), d[i], (int) quadsegs);
-		Rcpp::Rcout << " done" << std::endl;
+//		Rcpp::Rcout << " done" << std::endl;
 
 		if (pt == NULL) {
 			out.setError("GEOS exception");
@@ -1369,9 +1369,14 @@ SpatVector SpatVector::intersect(SpatVector v, bool values) {
 
 
 
+
 std::function<char(GEOSContextHandle_t, const GEOSGeometry *, const GEOSGeometry *)> getRelateFun(const std::string rel) {
 	std::function<char(GEOSContextHandle_t, const GEOSGeometry *, const GEOSGeometry *)> rfun;
-	if (rel == "intersects") {
+	if (rel == "equals") {
+		rfun = GEOSEquals_r;
+//	} else if (rel == "equalidentical") {
+//		rfun = GEOSEqualsIdentical_r;
+	} else if (rel == "intersects") {
 		rfun = GEOSIntersects_r;
 	} else if (rel == "disjoint") {
 		rfun = GEOSDisjoint_r;
@@ -1427,7 +1432,7 @@ int getRel(std::string &relation) {
 	int pattern = 1;
 	std::string rel = relation;
 	std::transform(rel.begin(), rel.end(), rel.begin(), ::tolower);
-	std::vector<std::string> f {"rook", "queen", "intersects", "touches", "crosses", "overlaps", "within", "contains", "covers", "coveredby", "disjoint"};
+	std::vector<std::string> f {"rook", "queen", "intersects", "touches", "crosses", "overlaps", "within", "contains", "covers", "coveredby", "disjoint", "equals"}; // tbd: "equalsexact", "equals"
 	if (std::find(f.begin(), f.end(), rel) == f.end()) {
 		if (relation.size() != 9) {
 			pattern = 2;
@@ -1452,6 +1457,7 @@ int getRel(std::string &relation) {
 }
 
 std::vector<int> SpatVector::relate(SpatVector v, std::string relation, bool prepared, bool index) {
+
 	// this method is redundant with "which_relate")
 	std::vector<int> out;
 	int pattern = getRel(relation);
@@ -1460,7 +1466,10 @@ std::vector<int> SpatVector::relate(SpatVector v, std::string relation, bool pre
 		return out;
 	}
 	if ((relation == "FF*FF****") || (relation == "disjoint")) index = false;
-
+	if (relation.substr(0, 5) == "equal") {
+		prepared = false;
+	}
+
 	GEOSContextHandle_t hGEOSCtxt = geos_init();
 	std::vector<GeomPtr> x = geos_geoms(this, hGEOSCtxt);
 	std::vector<GeomPtr> y = geos_geoms(&v, hGEOSCtxt);
@@ -1578,7 +1587,24 @@ std::vector<std::vector<double>> SpatVector::which_relate(SpatVector v, std::str
 	out[0].reserve(nx * 1.5);
 	out[1].reserve(nx * 1.5);
 
-	if (!index) {
+
+	if (relation.substr(0, 5) == "equal") {
+		std::function<char(GEOSContextHandle_t, const GEOSGeometry *, const GEOSGeometry *)> relFun = getRelateFun(relation);
+		for (size_t i = 0; i < nx; i++) {
+			bool none = !narm;
+			for (size_t j = 0; j < ny; j++) {
+				if ( relFun(hGEOSCtxt, x[i].get(), y[j].get())) {
+					out[0].push_back(i);
+					out[1].push_back(j);
+					none = false;
+				}
+			}
+			if (none) {
+				out[0].push_back(i);
+				out[1].push_back(NAN);
+			}
+		}
+	} else if (!index) {
 		if (pattern == 1) {
 			for (size_t i = 0; i < nx; i++) {
 				bool none = !narm;
@@ -1691,8 +1717,23 @@ std::vector<std::vector<double>> SpatVector::which_relate(std::string relation,
 	out[0].reserve(nx * 1.5);
 	out[1].reserve(nx * 1.5);
 
-
-	if (!index) {
+	if (relation.substr(0, 5) == "equal") {
+		std::function<char(GEOSContextHandle_t, const GEOSGeometry *, const GEOSGeometry *)> relFun = getRelateFun(relation);
+		for (size_t i = 0; i < nx; i++) {
+			bool none = !narm;
+			for (size_t j = 0; j < nx; j++) {
+				if ( relFun(hGEOSCtxt, x[i].get(), x[j].get())) {
+					out[0].push_back(i);
+					out[1].push_back(j);
+					none = false;
+				}
+			}
+			if (none) {
+				out[0].push_back(i);
+				out[1].push_back(NAN);
+			}
+		}
+	} else if (!index) {
 		if (pattern == 1) {
 			for (size_t i=0; i<nx; i++) {
 				bool none = !narm;