fix mask

Author: vincentsarago

tests/test_io_rasterio.py

@@ -259,7 +259,7 @@ def test_point_valid():
         pt = src.point(lon, lat, expression="b1*2;b1-100")
         assert len(pt.data) == 2
         assert len(pt.mask) == 1
-        assert pt.mask[0] == 255
+        assert pt._mask[0]
         assert pt.band_names == ["b1*2", "b1-100"]
 
         with pytest.warns(ExpressionMixingWarning):
@@ -284,7 +284,7 @@ def test_point_valid():
 
         pt = src.point(-59.53, 74.03, indexes=(1, 1, 1))
         assert len(pt.data) == 3
-        assert pt.mask[0] == 0
+        assert not pt._mask[0]
         assert pt.band_names == ["b1", "b1", "b1"]
 
 
@@ -554,7 +554,7 @@ def test_imageData_output():
         assert img.count == 1
         assert img.data_as_image().shape == (256, 256, 1)
 
-        assert numpy.array_equal(~img.array.mask[0] * 255, img.mask)
+        assert numpy.array_equal(~img.array.mask[0], img._mask)
 
         assert img.crs == WEB_MERCATOR_TMS.crs
         assert img.bounds == WEB_MERCATOR_TMS.xy_bounds(43, 24, 7)

tests/test_models.py

@@ -235,7 +235,7 @@ def test_point_data():
     assert pt.count == 3
     assert pt.data.shape == (3,)
     assert pt.mask.shape == (1,)
-    assert pt.mask.tolist() == [255]
+    assert pt._mask.tolist() == [True]
     assert pt.band_names == ["b1", "b2", "b3"]
 
     with pytest.raises(ValueError):
@@ -257,7 +257,7 @@ def test_point_data():
     pts = PointData.create_from_list([pt1, pt2])
     assert pts.data.tolist() == [1, 2, 3]
     assert pts.band_names == ["b1", "b2", "b1+b2"]
-    assert pts.mask.tolist() == [255]
+    assert pts._mask.tolist() == [True]
 
     pts = PointData.create_from_list(
         [
@@ -266,7 +266,7 @@ def test_point_data():
         ]
     )
     assert pts.array.mask.tolist() == [False, True]
-    assert pts.mask.tolist() == [0]
+    assert pts._mask.tolist() == [False]
 
     pts = PointData.create_from_list(
         [
@@ -275,7 +275,7 @@ def test_point_data():
         ]
     )
     assert pts.array.mask.tolist() == [False, False]
-    assert pts.mask.tolist() == [255]
+    assert pts._mask.tolist() == [True]
 
     pts = PointData.create_from_list(
         [
@@ -284,7 +284,7 @@ def test_point_data():
         ]
     )
     assert pts.array.mask.tolist() == [True, True]
-    assert pts.mask.tolist() == [0]
+    assert pts._mask.tolist() == [False]
 
     with pytest.raises(InvalidPointDataError):
         PointData.create_from_list([])

tests/test_reader.py

@@ -425,19 +425,19 @@ def test_read_nodata():
     with rasterio.open(COG) as src_dst:
         arr, mask = reader.part(src_dst, bounds, nodata=1)
 
-    masknodata = (arr[0] != 1).astype(numpy.uint8) * 255
+    masknodata = (arr[0] != 1).astype(numpy.uint16) * 65535
     numpy.testing.assert_array_equal(mask, masknodata)
 
     with rasterio.open(COG) as src_dst:
         arr, mask = reader.read(src_dst, nodata=1)
 
-    masknodata = (arr[0] != 1).astype(numpy.uint8) * 255
+    masknodata = (arr[0] != 1).astype(numpy.uint16) * 65535
     numpy.testing.assert_array_equal(mask, masknodata)
 
     with rasterio.open(COG) as src_dst:
         arr, mask = reader.read(src_dst, dst_crs="epsg:3857", nodata=1)
 
-    masknodata = (arr[0] != 1).astype(numpy.uint8) * 255
+    masknodata = (arr[0] != 1).astype(numpy.uint16) * 65535
     numpy.testing.assert_array_equal(mask, masknodata)
 
 
@@ -529,7 +529,7 @@ def test_point():
             nodata=1,
         )
         assert pt.data == numpy.array([2800])
-        assert pt.mask == numpy.array([255])
+        assert pt.mask == numpy.array([[65535]])
         assert pt.band_names == ["b1"]
 
         # resampling_method is useless with interpolate=False
@@ -553,7 +553,7 @@ def test_point():
             interpolate=True,
         )
         assert pt.data == numpy.array([2800])
-        assert pt.mask == numpy.array([255])
+        assert pt.mask == numpy.array([[65535]])
         assert pt.band_names == ["b1"]
         assert pt.pixel_location
         assert isinstance(pt.pixel_location[0], float)
@@ -569,7 +569,7 @@ def test_point():
             interpolate=True,
         )
         assert pt.data == numpy.array([2819])
-        assert pt.mask == numpy.array([255])
+        assert pt.mask == numpy.array([[65535]])
         assert pt.band_names == ["b1"]
 
         # Interpolate=True + resampling=average
@@ -583,7 +583,7 @@ def test_point():
             interpolate=True,
         )
         assert pt.data == numpy.array([2904])
-        assert pt.mask == numpy.array([255])
+        assert pt.mask == numpy.array([[65535]])
         assert pt.band_names == ["b1"]
 
         # Interpolate=True + resampling=Cubic
@@ -597,13 +597,13 @@ def test_point():
             interpolate=True,
         )
         assert pt.data == numpy.array([2812])
-        assert pt.mask == numpy.array([255])
+        assert pt.mask == numpy.array([[65535]])
         assert pt.band_names == ["b1"]
 
     with rasterio.open(COG_SCALE) as src_dst:
         pt = reader.point(src_dst, [310000, 4100000], coord_crs=src_dst.crs, indexes=1)
         assert pt.data == numpy.array([8917])
-        assert pt.mask == numpy.array([255])
+        assert pt.mask == numpy.array([[32767]])
         assert pt.band_names == ["b1"]
 
         pt = reader.point(src_dst, [310000, 4100000], coord_crs=src_dst.crs)
@@ -847,23 +847,23 @@ def test_part_no_VRT():
         img = reader.part(src_dst, bounds, bounds_crs="epsg:4326")
         assert img.height == 1453
         assert img.width == 1613
-        assert img.mask[0, 0] == 255
+        assert img.mask[0, 0] == 65535
         assert img.mask[-1, -1] == 0  # boundless
         assert img.bounds == bounds_dst_crs
 
         # Use bbox in Image CRS
         img_crs = reader.part(src_dst, bounds_dst_crs)
         assert img.height == 1453
         assert img.width == 1613
-        assert img_crs.mask[0, 0] == 255
+        assert img_crs.mask[0, 0] == 65535
         assert img_crs.mask[-1, -1] == 0  # boundless
         assert img.bounds == bounds_dst_crs
 
         # MaxSize
         img = reader.part(src_dst, bounds, bounds_crs="epsg:4326", max_size=1024)
         assert img.height < 1024
         assert img.width == 1024
-        assert img.mask[0, 0] == 255
+        assert img.mask[0, 0] == 65535
         assert img.mask[-1, -1] == 0  # boundless
         assert img.bounds == bounds_dst_crs
 
@@ -877,15 +877,15 @@ def test_part_no_VRT():
         )
         assert img.height == 100
         assert img.width == 100
-        assert img.mask[0, 0] == 255
+        assert img.mask[0, 0] == 65535
         assert img.mask[-1, -1] == 0  # boundless
         assert img.bounds == bounds_dst_crs
 
         # Buffer
         img = reader.part(src_dst, bounds, bounds_crs="epsg:4326", buffer=1)
         assert img.height == 1455
         assert img.width == 1615
-        assert img.mask[0, 0] == 255
+        assert img.mask[0, 0] == 65535
         assert img.mask[-1, -1] == 0  # boundless
         assert not img.bounds == bounds_dst_crs
 
@@ -894,7 +894,7 @@ def test_part_no_VRT():
         img_pad = reader.part(src_dst, bounds, bounds_crs="epsg:4326", padding=1)
         assert img_pad.height == 1453
         assert img_pad.width == 1613
-        assert img_pad.mask[0, 0] == 255
+        assert img_pad.mask[0, 0] == 65535
         assert img_pad.mask[-1, -1] == 0  # boundless
         assert img_pad.bounds == bounds_dst_crs
         # Padding should not have any influence when not doing any rescaling/reprojection
@@ -1082,16 +1082,16 @@ def test_nodata_orverride():
         assert prev.mask[0, 0] == 0
 
         prev = reader.read(src_dst, max_size=100, nodata=2720)
-        assert prev.mask[0, 0] == 255
+        assert prev.mask[0, 0] == 65535
         assert not numpy.all(prev.mask)
 
 
 def test_tile_read_nodata_float():
     """Should work as expected when using NaN as nodata value."""
     with rasterio.open(COG_NODATA_FLOAT_NAN) as src_dst:
         prev = reader.read(src_dst, max_size=100)
-        assert prev.mask[0, 0] == 0
-        assert not numpy.all(prev.mask)
+        assert prev.mask[0, 0] == -3.4028235e38
+        assert not numpy.all(prev._mask)
 
 
 def test_inverted_latitude_point():