Fix/granules sel (#508)

* ensure select_granules returns correct order (rank)

* comment out noaa selected files print

Author: iferencik

rapida/ntl/fetch.py

@@ -62,7 +62,6 @@ async def fetch(bbox:tuple[numbers.Number]=None, nominal_date:datetime=None,
                 download_and_track(granule, dst_dir, progress)
             )
             tasks.append(task)
-
         downloaded_files = {}
 
         for coro in asyncio.as_completed(tasks, timeout=100 * 3 * len(tasks)):
@@ -81,7 +80,7 @@ async def fetch(bbox:tuple[numbers.Number]=None, nominal_date:datetime=None,
                 await asyncio.gather(*tasks, return_exceptions=True)
                 raise
 
-        return downloaded_files
+        return {g.timestamp:downloaded_files[g.timestamp] for g in selected_granules if g.timestamp in downloaded_files}
 
     expected_tiles = get_intersecting_tiles(bbox=bbox)
     routes = nasaconst.ROUTES
@@ -151,7 +150,7 @@ async def fetch(bbox:tuple[numbers.Number]=None, nominal_date:datetime=None,
             # Break out of the 'routes' loop to stop searching for this processing_level
             break
 
-
+    print(downloaded_files)
     return downloaded_files
 
 

rapida/ntl/noaa/cmask.py

@@ -103,8 +103,8 @@ def select_required_granules(sorted_granules: list, bbox: tuple, progress:Progre
         logger.warning("Exhausted all combinations. BBOX cannot be fully covered by available data.")
         logger.warning(f"Selecting max of {combos}.")
 
-        w = max(combos)
-        return combos[w]
+        max_cov = max(combos)
+        return combos[max_cov]
     finally:
         if progress and progress_task:
             progress.remove_task(progress_task)

rapida/ntl/outage.py

@@ -33,8 +33,7 @@ async def detect_outage(
         logger.info(f'No imagery was found for {nominal_date:"%Y%m%d"} over {bbox} {deliverable.split("_")[0]}')
         logger.info(f'Consider adjusting source, date or the bounding box')
         return
-    for timestamp, product_files in daily_results.items():
-        print(timestamp, product_files)
+
 
     arrays = {}
     # --- 1. FETCH & PROCESS MONTHLY BASELINE ---
@@ -73,6 +72,7 @@ async def detect_outage(
 
         for timestamp, product_files in daily_results.items():
 
+
             daily_data, cloud_mask = read_and_align_sdr_and_cmask(
                 sdr_path=product_files[noaa_const.SDR], geo_path=product_files[noaa_const.GEO],
                 cmask_path=product_files[noaa_const.CM], target_area=target_area