for #1648

rspatial · Dec 19, 2024 · f6f5554 · f6f5554
1 parent 0af5eab
commit f6f5554
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/man/terraOptions.Rd b/man/terraOptions.Rd
@@ -35,6 +35,8 @@ The following options are available.
 \bold{progress} - non-negative integer. A progress bar is shown if the number of chunks in which the data is processed is larger than this number. No progress bar is shown if the value is zero
 
 \bold{verbose} - logical. If \code{TRUE} debugging info is printed for some functions
+
+\bold{tolerance} - numeric. difference in raster extent (expressed as the fraction of the raster resolution) that can be ignored when comparing alighnment of rasters.
 }
 
 \note{

diff --git a/src/spatBase.cpp b/src/spatBase.cpp
@@ -456,7 +456,7 @@ std::vector<double> SpatRaster::origin() {
 
 bool SpatRaster::compare_geom(SpatRaster &x, bool lyrs, bool crs, double tol, bool warncrs, bool ext, bool rowcol, bool res) {
 
-	tol = tol < 0 ? 0 : tol;
+	tol = tol < 0 ? 0 : (tol > 0.5 ? 0.5 : tol);
 
 	if (ext) {
 		SpatExtent extent = getExtent();
@@ -481,7 +481,7 @@ bool SpatRaster::compare_geom(SpatRaster &x, bool lyrs, bool crs, double tol, bo
 
 	if (lyrs) {
 		if (!(nlyr() == x.nlyr())) {
-			setError("number of layers does not match");
+			setError("number of layers does not match" + std::to_string(nlyr()) + " != " + std::to_string(x.nlyr()));
 			return false;
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,8 @@ The following options are available. @@
     \bold{progress} - non-negative integer. A progress bar is shown if the number of chunks in which the data is processed is larger than this number. No progress bar is shown if the value is zero
     \bold{verbose} - logical. If \code{TRUE} debugging info is printed for some functions
+    \bold{tolerance} - numeric. difference in raster extent (expressed as the fraction of the raster resolution) that can be ignored when comparing alighnment of rasters.
     }
     \note{
@@ Expand Down @@