diff --git a/test/hybig/HyBIG_Regression.ipynb b/test/hybig/HyBIG_Regression.ipynb index 62432cb8..b74f7834 100644 --- a/test/hybig/HyBIG_Regression.ipynb +++ b/test/hybig/HyBIG_Regression.ipynb @@ -219,7 +219,7 @@ " print_success('all test files generated')\n", "\n", " expected_output_metadata = {\n", - " 'driver': 'PNG', **common_aster_metadata, 'count': 1\n", + " **common_aster_metadata, 'driver': 'PNG', 'count': 1, 'nodata': 255\n", " }\n", "\n", " assert_dataset_produced_correct_results(\n", @@ -278,8 +278,6 @@ " expected_output_metadata = {\n", " 'driver': 'JPEG', **common_aster_metadata, 'count': 3\n", " } \n", - " with rasterio.open(test_files[0]) as test_file:\n", - " print(test_file.meta)\n", "\n", " assert_dataset_produced_correct_results(\n", " test_files[0], expected_output_metadata, reference_files[0], 'JPEG'\n", @@ -442,7 +440,7 @@ " print_success('all test files generated')\n", "\n", " expected_output_metadata = {\n", - " 'driver': 'PNG', 'count': 1, **common_measures_metadata\n", + " **common_measures_metadata, 'driver': 'PNG', 'count': 1 \n", " }\n", "\n", " assert_dataset_produced_correct_results(\n", diff --git a/test/hybig/reference_data/ASTGTMV003_N00E022_dem.jpg b/test/hybig/reference_data/ASTGTMV003_N00E022_dem.jpg index 265e4c89..15bb384d 100644 Binary files a/test/hybig/reference_data/ASTGTMV003_N00E022_dem.jpg and b/test/hybig/reference_data/ASTGTMV003_N00E022_dem.jpg differ diff --git a/test/hybig/reference_data/ASTGTMV003_N00E022_dem.png b/test/hybig/reference_data/ASTGTMV003_N00E022_dem.png index 1e168f77..d5fc14a1 100644 Binary files a/test/hybig/reference_data/ASTGTMV003_N00E022_dem.png and b/test/hybig/reference_data/ASTGTMV003_N00E022_dem.png differ diff --git a/test/hybig/reference_data/VCF5KYR_1991001_001_2018224205008.png b/test/hybig/reference_data/VCF5KYR_1991001_001_2018224205008.png index 11c733bc..8eb83053 100644 Binary files a/test/hybig/reference_data/VCF5KYR_1991001_001_2018224205008.png and b/test/hybig/reference_data/VCF5KYR_1991001_001_2018224205008.png differ diff --git a/test/hybig/reference_data/dimensions/VCF5KYR_1991001_001_2018224205008.png b/test/hybig/reference_data/dimensions/VCF5KYR_1991001_001_2018224205008.png index 32ad0920..406a8aeb 100644 Binary files a/test/hybig/reference_data/dimensions/VCF5KYR_1991001_001_2018224205008.png and b/test/hybig/reference_data/dimensions/VCF5KYR_1991001_001_2018224205008.png differ diff --git a/test/hybig/reference_data/scale_size/VCF5KYR_1991001_001_2018224205008.png b/test/hybig/reference_data/scale_size/VCF5KYR_1991001_001_2018224205008.png index 53d5ac9d..b3e809c1 100644 Binary files a/test/hybig/reference_data/scale_size/VCF5KYR_1991001_001_2018224205008.png and b/test/hybig/reference_data/scale_size/VCF5KYR_1991001_001_2018224205008.png differ diff --git a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c00.png b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c00.png index 2a573c11..dcde9afc 100644 Binary files a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c00.png and b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c00.png differ diff --git a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c01.png b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c01.png index a1ef7157..18b17546 100644 Binary files a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c01.png and b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c01.png differ diff --git a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c02.png b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c02.png index be5dc365..a2ba3feb 100644 Binary files a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c02.png and b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c02.png differ diff --git a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c03.png b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c03.png index 60fc3690..42e50fba 100644 Binary files a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c03.png and b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c03.png differ diff --git a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c04.png b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c04.png index 5bb14113..4b050c61 100644 Binary files a/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c04.png and b/test/hybig/reference_data/tiled/VCF5KYR_1991001_001_2018224205008.r00c04.png differ diff --git a/test/hybig/utility.py b/test/hybig/utility.py index 0100b233..0c5adbf8 100644 --- a/test/hybig/utility.py +++ b/test/hybig/utility.py @@ -20,7 +20,7 @@ def assert_dataset_produced_correct_results( with rasterio.open(generated_file) as test_dataset: assert ( test_dataset.meta == expected_metadata - ), f'output {file_type} has incorrect metadata' + ), f'output {file_type} has incorrect metadata: {test_dataset.meta}' print_success('Generated image has correct metadata.') with rasterio.open(reference_file) as reference_dataset: diff --git a/test/hybig/version.txt b/test/hybig/version.txt index 81340c7e..bbdeab62 100644 --- a/test/hybig/version.txt +++ b/test/hybig/version.txt @@ -1 +1 @@ -0.0.4 +0.0.5