Update S2 tests for resolution grid names

opendatacube · Apr 13, 2021 · 2d70488 · 2d70488
1 parent aa87146
commit 2d70488
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/tests/integration/prepare/test_prepare_esa_sentinel_l1.py b/tests/integration/prepare/test_prepare_esa_sentinel_l1.py
@@ -35,7 +35,7 @@ def expected_dataset_document():
             "type": "Polygon",
         },
         "grids": {
-            "coastal_aerosol_swir_1_cirrus_water_vapour": {
+            "300": {
                 "shape": [366, 366],
                 "transform": [
                     300.0,
@@ -63,7 +63,7 @@ def expected_dataset_document():
                     1.0,
                 ],
             },
-            "blue_green_nir_1_red": {
+            "50": {
                 "shape": [2196, 2196],
                 "transform": [
                     50.0,
@@ -82,27 +82,27 @@ def expected_dataset_document():
         "lineage": {},
         "measurements": {
             "blue": {
-                "grid": "blue_green_nir_1_red",
+                "grid": "50",
                 "path": "S2B_MSIL1C_20201011T000249_N0209_R030_T55HFA_20201011T011446.SAFE/GRANULE/"
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B02.jp2",
             },
             "coastal_aerosol": {
-                "grid": "coastal_aerosol_swir_1_cirrus_water_vapour",
+                "grid": "300",
                 "path": "S2B_MSIL1C_20201011T000249_N0209_R030_T55HFA_20201011T011446.SAFE/GRANULE/"
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B01.jp2",
             },
             "green": {
-                "grid": "blue_green_nir_1_red",
+                "grid": "50",
                 "path": "S2B_MSIL1C_20201011T000249_N0209_R030_T55HFA_20201011T011446.SAFE/GRANULE/"
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B03.jp2",
             },
             "nir_1": {
-                "grid": "blue_green_nir_1_red",
+                "grid": "50",
                 "path": "S2B_MSIL1C_20201011T000249_N0209_R030_T55HFA_20201011T011446.SAFE/GRANULE/"
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B08.jp2",
             },
             "red": {
-                "grid": "blue_green_nir_1_red",
+                "grid": "50",
                 "path": "S2B_MSIL1C_20201011T000249_N0209_R030_T55HFA_20201011T011446.SAFE/GRANULE/"
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B04.jp2",
             },
@@ -119,7 +119,7 @@ def expected_dataset_document():
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B07.jp2"
             },
             "swir_1_cirrus": {
-                "grid": "coastal_aerosol_swir_1_cirrus_water_vapour",
+                "grid": "300",
                 "path": "S2B_MSIL1C_20201011T000249_N0209_R030_T55HFA_20201011T011446.SAFE/GRANULE/"
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B10.jp2",
             },
@@ -132,7 +132,7 @@ def expected_dataset_document():
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B12.jp2"
             },
             "water_vapour": {
-                "grid": "coastal_aerosol_swir_1_cirrus_water_vapour",
+                "grid": "300",
                 "path": "S2B_MSIL1C_20201011T000249_N0209_R030_T55HFA_20201011T011446.SAFE/GRANULE/"
                 "L1C_T55HFA_A018789_20201011T000244/IMG_DATA/T55HFA_20201011T000249_B09.jp2",
             },

diff --git a/tests/integration/prepare/test_prepare_sinergise_sentinel_l1.py b/tests/integration/prepare/test_prepare_sinergise_sentinel_l1.py
@@ -47,7 +47,7 @@ def expected_dataset_document():
                     1.0,
                 ],
             },
-            "blue_green_nir_1_red": {
+            "998": {
                 "shape": [110, 110],
                 "transform": [
                     998.1818181818181,
@@ -61,7 +61,7 @@ def expected_dataset_document():
                     1.0,
                 ],
             },
-            "coastal_aerosol_swir_1_cirrus_water_vapour": {
+            "5778": {
                 "shape": [19, 19],
                 "transform": [
                     5778.9473684210525,
@@ -79,26 +79,26 @@ def expected_dataset_document():
         "label": "sinergise_s2am_level1_1-0-20201011_55HFA_2020-10-11",
         "lineage": {},
         "measurements": {
-            "blue": {"grid": "blue_green_nir_1_red", "path": "B02.jp2"},
+            "blue": {"grid": "998", "path": "B02.jp2"},
             "coastal_aerosol": {
-                "grid": "coastal_aerosol_swir_1_cirrus_water_vapour",
+                "grid": "5778",
                 "path": "B01.jp2",
             },
-            "green": {"grid": "blue_green_nir_1_red", "path": "B03.jp2"},
-            "nir_1": {"grid": "blue_green_nir_1_red", "path": "B08.jp2"},
+            "green": {"grid": "998", "path": "B03.jp2"},
+            "nir_1": {"grid": "998", "path": "B08.jp2"},
             "nir_2": {"path": "B8A.jp2"},
-            "red": {"grid": "blue_green_nir_1_red", "path": "B04.jp2"},
+            "red": {"grid": "998", "path": "B04.jp2"},
             "red_edge_1": {"path": "B05.jp2"},
             "red_edge_2": {"path": "B06.jp2"},
             "red_edge_3": {"path": "B07.jp2"},
             "swir_1_cirrus": {
-                "grid": "coastal_aerosol_swir_1_cirrus_water_vapour",
+                "grid": "5778",
                 "path": "B10.jp2",
             },
             "swir_2": {"path": "B11.jp2"},
             "swir_3": {"path": "B12.jp2"},
             "water_vapour": {
-                "grid": "coastal_aerosol_swir_1_cirrus_water_vapour",
+                "grid": "5778",
                 "path": "B09.jp2",
             },
         },