addresses #1666

r-spatial · May 3, 2021 · 4911f5a · 4911f5a
1 parent 721a7a4
commit 4911f5a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/R/valid.R b/R/valid.R
@@ -21,14 +21,14 @@ st_is_valid.sfc = function(x, ..., NA_on_exception = TRUE, reason = FALSE) {
 			ret
 		} else
 			CPL_geos_is_valid_reason(x)
-	} else if (! NA_on_exception) {
+	} else #if (! NA_on_exception) {
 		CPL_geos_is_valid(x, as.logical(NA_on_exception))
-	} else {
-		ret = vector("logical", length(x))
-		for (i in seq_along(x))
-			ret[i] = CPL_geos_is_valid(x[i], as.logical(NA_on_exception))
-		ret
-	}
+#	} else {
+#		ret = vector("logical", length(x))
+#		for (i in seq_along(x))
+#			ret[i] = CPL_geos_is_valid(x[i], as.logical(NA_on_exception))
+#		ret
+#	}
 }
 
 #' @export

diff --git a/src/geos.cpp b/src/geos.cpp
@@ -528,8 +528,10 @@ Rcpp::LogicalVector CPL_geos_is_valid(Rcpp::List sfc, bool NA_on_exception = tru
 
 	int notice = 0;
 	if (NA_on_exception) {
+/*
 		if (sfc.size() > 1)
 			Rcpp::stop("NA_on_exception will only work reliably with length 1 sfc objects"); // #nocov
+*/
 #ifdef HAVE350
 		GEOSContext_setNoticeMessageHandler_r(hGEOSCtxt,
 			(GEOSMessageHandler_r) __emptyNoticeHandler, (void *) &notice);