Plum the new rowcol precision default all the way up thru rio-merge

Follow up to #2106

CHANGES.txt

@@ -1,6 +1,11 @@
 Changes
 =======
 
+1.2.1 (TBD)
+-----------
+
+- Fix an off-by-one error in the merge tool (#2106, #).
+
 1.2.0 (2021-01-25)
 ------------------
 

rasterio/__init__.py

@@ -27,7 +27,7 @@
 import rasterio.path
 
 __all__ = ['band', 'open', 'pad', 'Env']
-__version__ = "1.2.0"
+__version__ = "1.2.1dev"
 __gdal_version__ = gdal_version()
 
 # Rasterio attaches NullHandler to the 'rasterio' logger and its

rasterio/merge.py

@@ -68,7 +68,7 @@ def merge(
     res=None,
     nodata=None,
     dtype=None,
-    precision=10,
+    precision=None,
     indexes=None,
     output_count=None,
     resampling=Resampling.nearest,

rasterio/rio/merge.py

@@ -21,9 +21,12 @@
 @options.nodata_opt
 @options.bidx_mult_opt
 @options.overwrite_opt
-@click.option('--precision', type=int, default=10,
-              help="Number of decimal places of precision in alignment of "
-                   "pixels")
+@click.option(
+    "--precision",
+    type=int,
+    default=None,
+    help="Number of decimal places of precision in alignment of pixels",
+)
 @options.creation_options
 @click.pass_context
 def merge(ctx, files, output, driver, bounds, res, resampling,

rasterio/transform.py

@@ -208,8 +208,9 @@ def rowcol(transform, xs, ys, op=math.floor, precision=None):
     op : function
         Function to convert fractional pixels to whole numbers (floor, ceiling,
         round)
-    precision : int, optional
-        Decimal places of precision in indexing, as in `round()`.
+    precision : int or float, optional
+        An integer number of decimal points of precision when computing
+        inverse transform, or an absolute float precision.
 
     Returns
     -------
@@ -224,8 +225,13 @@ def rowcol(transform, xs, ys, op=math.floor, precision=None):
     if not isinstance(ys, Iterable):
         ys = [ys]
 
-    eps = sys.float_info.epsilon
-
+    if precision is None:
+        eps = sys.float_info.epsilon * (1.0 - 2.0 * op(0.1))
+    elif isinstance(precision, int):
+        eps = 10.0 ** -precision * (1.0 - 2.0 * op(0.1))
+    else:
+        eps = precision
+
     invtransform = ~transform
 
     rows = []

rasterio/windows.py

@@ -271,9 +271,9 @@ def from_bounds(left, bottom, right, top, transform=None,
         Number of rows of the window.
     width: int, required
         Number of columns of the window.
-    precision: int, optional
-        Number of decimal points of precision when computing inverse
-        transform.
+    precision: int or float, optional
+        An integer number of decimal points of precision when computing
+        inverse transform, or an absolute float precision.
 
     Returns
     -------
@@ -680,6 +680,7 @@ def round_lengths(self, op='floor', pixel_precision=None):
                 operator(round(self.height, pixel_precision) if
                          pixel_precision is not None else self.height))
 
+    # TODO: deprecate round_shape at 1.3.0, with a warning.
     round_shape = round_lengths
 
     def round_offsets(self, op='floor', pixel_precision=None):