loose the limit of only processing the NADIR scenes

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.1]
+
+### Fixed
+- Off-NADIR scene can be processed as long as the secondary scene has the same wrs_path, wrs_row, and vire:off_nadir properties. 
+
 ## [0.2.0]
 
 ### Added

landsat/src/main.py

@@ -62,10 +62,6 @@ def _qualifies_for_processing(
         log.log(log_level, f'{item.id} disqualifies for processing because it has too much cloud cover')
         return False
 
-    if item.properties['view:off_nadir'] != 0:
-        log.log(log_level, f'{item.id} disqualifies for processing because it is off-nadir')
-        return False
-
     log.log(log_level, f'{item.id} qualifies for processing')
     return True
 
@@ -99,11 +95,17 @@ def get_landsat_pairs_for_reference_scene(
         query=[
             f'landsat:wrs_path={reference.properties["landsat:wrs_path"]}',
             f'landsat:wrs_row={reference.properties["landsat:wrs_row"]}',
+            f'view:off_nadir={reference.properties["view:off_nadir"]}',
         ],
         datetime=[reference.datetime - max_pair_separation, reference.datetime - timedelta(seconds=1)],
     )
+
     items = [item for page in results.pages() for item in page if _qualifies_for_processing(item, max_cloud_cover)]
 
+    if len(items) == 0:
+        log.info(f'Did not find secondary candidate scenes for the reference scene {reference.id}')
+        return None
+
     features = []
     for item in items:
         feature = item.to_dict()
@@ -192,6 +194,10 @@ def process_scene(
         return sdk.Batch()
 
     pairs = get_landsat_pairs_for_reference_scene(reference, max_pair_separation, max_cloud_cover)
+
+    if pairs is None:
+        return None
+
     log.info(f'Found {len(pairs)} pairs for {scene}')
     with pd.option_context('display.max_rows', None, 'display.max_columns', None, 'display.width', None):
         log.debug(pairs.loc[:, ['reference', 'secondary']])

tests/landsat/test_main.py

@@ -1,6 +1,11 @@
 import unittest.mock
+import pickle
 
-import main
+from landsat.src import main
+
+import geopandas as gpd
+
+import pdb
 
 
 def get_mock_pystac_item() -> unittest.mock.NonCallableMagicMock:
@@ -73,6 +78,79 @@
     item.properties['landsat:cloud_cover_land'] = main.MAX_CLOUD_COVER_PERCENT + 1
     assert not main._qualifies_for_processing(item)
 
-    item = get_mock_pystac_item()
-    item.properties['view:off_nadir'] = 1
-    assert not main._qualifies_for_processing(item)
+
+def test_get_stac_item():
+    scene1 = 'LC08_L1TP_138041_20240128_20240207_02_T1'
+    item1_id = 'LC08_L1TP_138041_20240128_20240207_02_T1'
+    item1_properties = {'datetime': '2024-01-28T04:29:49.361022Z',
+                        'eo:cloud_cover': 11.59,
+                        'view:sun_azimuth': 148.43311105,
+                        'view:sun_elevation': 37.83753177,
+                        'platform': 'LANDSAT_8',
+                        'instruments': ['OLI', 'TIRS'],
+                        'view:off_nadir': 0,
+                        'landsat:cloud_cover_land': 11.59,
+                        'landsat:wrs_type': '2',
+                        'landsat:wrs_path': '138',
+                        'landsat:wrs_row': '041',
+                        'landsat:scene_id': 'LC81380412024028LGN00',
+                        'landsat:collection_category': 'T1',
+                        'landsat:collection_number': '02',
+                        'landsat:correction': 'L1TP',
+                        'accuracy:geometric_x_bias': 0,
+                        'accuracy:geometric_y_bias': 0,
+                        'accuracy:geometric_x_stddev': 3.926,
+                        'accuracy:geometric_y_stddev': 3.525,
+                        'accuracy:geometric_rmse': 5.277,
+                        'proj:epsg': 32645,
+                        'proj:shape': [7681, 7531],
+                        'proj:transform': [30, 0, 674985, 0, -30, 3152415],
+                        'created': '2024-02-07T18:27:27.558Z',
+                        'updated': '2024-02-07T18:27:27.558Z'
+                        }
+
+    assert (main._get_stac_item(scene1).id == item1_id
+            and main._get_stac_item(scene1).properties == item1_properties)
+
+    scene2 = 'LC08_L1GT_208119_20190225_20200829_02_T2'
+
+    item2_id = 'LC08_L1GT_208119_20190225_20200829_02_T2'
+
+    item2_properties = {'datetime': '2019-02-25T12:13:15.140373Z',
+                        'eo:cloud_cover': 46.47,
+                        'view:sun_azimuth': 87.63621418,
+                        'view:sun_elevation': 9.4970641,
+                        'platform': 'LANDSAT_8',
+                        'instruments': ['OLI', 'TIRS'],
+                        'view:off_nadir': 14.092,
+                        'landsat:cloud_cover_land': 46.47,
+                        'landsat:wrs_type': '2',
+                        'landsat:wrs_path': '208',
+                        'landsat:wrs_row': '119',
+                        'landsat:scene_id': 'LC82081192019056LGN00',
+                        'landsat:collection_category': 'T2',
+                        'landsat:collection_number': '02',
+                        'landsat:correction': 'L1GT',
+                        'proj:epsg': 3031,
+                        'proj:shape': [8901, 9151],
+                        'proj:transform': [30, 0, -980415, 0, -30, 188115],
+                        'created': '2022-07-06T18:15:03.664Z',
+                        'updated': '2022-07-06T18:15:03.664Z'
+                        }
+
+    assert (main._get_stac_item(scene2).id == item2_id and
+            main._get_stac_item(scene2).properties == item2_properties)
+
+
+def test_get_landsat_pairs_for_reference_scene():
+    item = main._get_stac_item('LC08_L1TP_138041_20240128_20240207_02_T1')
+    df = main.get_landsat_pairs_for_reference_scene(item)
+    with open("tests/data/LC08_L1TP_138041_20240128_20240207_02_T1_pairs.pkl", 'rb') as file:
+        df_expect = pickle.load(file)
+        assert df.equals(df_expect)
+
+    item = main._get_stac_item('LC08_L1GT_208119_20190225_20200829_02_T2')
+    df = main.get_landsat_pairs_for_reference_scene(item)
+    with open("tests/data/LC08_L1GT_208119_20190225_20200829_02_T2_pairs.pkl", 'rb') as file:
+        df_expect = pickle.load(file)
+        assert df.equals(df_expect)