From ea49d653204d06adbba1bafd51abd0fdde09b69d Mon Sep 17 00:00:00 2001 From: Jeremy Hooke Date: Thu, 21 Dec 2023 12:22:01 +1100 Subject: [PATCH] Update contiguity expected count for new S2 logic We now no longer skip different resolutions on S2. --- eodatasets3/wagl.py | 7 ++++--- tests/integration/test_packagewagl.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eodatasets3/wagl.py b/eodatasets3/wagl.py index 3c54a3c2..8adba23b 100644 --- a/eodatasets3/wagl.py +++ b/eodatasets3/wagl.py @@ -191,7 +191,8 @@ def get_quality_masks(dataset: h5py.Dataset, granule: "Granule") -> BandMasks: ) info = z.getinfo(mask_offset) # Mask under 500 bytes are empty, which kills fiona on load. - # (Non-empty ones in our scan are all far larger than 1000bytes, so this doesn't need precision) + # (From scanning, non-empty ones in our collection are all far larger than 1000bytes, + # so this doesn't need precision) if info.file_size < 500: continue masks[band_id] = ( @@ -208,9 +209,9 @@ def get_quality_masks(dataset: h5py.Dataset, granule: "Granule") -> BandMasks: for band_id in list(mtd_dict.keys()): type, location = mtd_dict[band_id] mask_path = level1_data_path / location - # Sinergise use the original tile metdata document, but change the directory structure + # Sinergise use the original ESA metadata document, but have a new directory structure # So the metadata mask locations are (always?) wrong. - # It's in a 'qi' folder with the original filename. + # (It's in a 'qi' folder with the original filename) if not mask_path.exists(): mask_path = level1_data_path / "qi" / Path(location).name diff --git a/tests/integration/test_packagewagl.py b/tests/integration/test_packagewagl.py index 15c398a2..920cf1b3 100644 --- a/tests/integration/test_packagewagl.py +++ b/tests/integration/test_packagewagl.py @@ -778,10 +778,10 @@ def test_esa_sentinel_wagl_package(tmp_path: Path): # Verify the computed contiguity looks the same. (metadata fields will depend on it) [image] = expected_folder.rglob("*_oa_*nbar-contiguity.tif") - assert_image(image, nodata=255, unique_pixel_counts={0: 5367, 1: 6733}) + assert_image(image, nodata=255, unique_pixel_counts={0: 5546, 1: 6554}) [image] = expected_folder.rglob("*_oa_*nbart-contiguity.tif") - assert_image(image, nodata=255, unique_pixel_counts={0: 5367, 1: 6733}) + assert_image(image, nodata=255, unique_pixel_counts={0: 5546, 1: 6554}) assert_expected_eo3_path( {