update app.py

app.py

@@ -252,11 +252,7 @@ def calculate_cloud_percentage(image, cloud_band='QA60'):
     return ee.Number(cloudy_pixels).divide(ee.Number(total_pixels)).multiply(100)
 
 # Preprocessing function
-def preprocess_collection(collection, tile_cloud_threshold, pixel_cloud_threshold):
-    def filter_tile(image):
-        cloud_percentage = calculate_cloud_percentage(image, cloud_band='QA60')
-        return image.set('cloud_percentage', cloud_percentage).updateMask(cloud_percentage.lt(tile_cloud_threshold))
-    
+def preprocess_collection(collection, pixel_cloud_threshold):
     def mask_cloudy_pixels(image):
         qa60 = image.select('QA60')
         opaque_clouds = qa60.bitwiseAnd(1 << 10)
@@ -265,9 +261,9 @@ def preprocess_collection(collection, tile_cloud_threshold, pixel_cloud_threshol
         clear_pixels = cloud_mask.Not()
         return image.updateMask(clear_pixels)
     
-    filtered_collection = collection.map(filter_tile)
-    masked_collection = filtered_collection.map(mask_cloudy_pixels)
-    return masked_collection
+    if pixel_cloud_threshold > 0:
+        return collection.map(mask_cloudy_pixels)
+    return collection
 
 # Process single geometry
 def process_single_geometry(row, start_date_str, end_date_str, dataset_id, selected_bands, reducer_choice, shape_type, aggregation_period, custom_formula, original_lat_col, original_lon_col, kernel_size=None, include_boundary=None, user_scale=None):
@@ -614,19 +610,11 @@ end_date_str = end_date.strftime('%Y-%m-%d')
 
 if imagery_base == "Sentinel" and "Sentinel-2" in sub_options[sub_selection]:
     st.markdown("<h5>Cloud Filtering</h5>", unsafe_allow_html=True)
-    tile_cloud_threshold = st.slider(
-        "Select Maximum Tile-Based Cloud Coverage Threshold (%)",
-        min_value=0,
-        max_value=100,
-        value=10,  # Reduced from 20
-        step=5,
-        help="Tiles with cloud coverage exceeding this threshold will be excluded."
-    )
     pixel_cloud_threshold = st.slider(
         "Select Maximum Pixel-Based Cloud Coverage Threshold (%)",
         min_value=0,
         max_value=100,
-        value=5,  # Reduced from 10
+        value=5,
         step=5,
         help="Individual pixels with cloud coverage exceeding this threshold will be masked."
     )
@@ -810,7 +798,6 @@ if st.button(f"Calculate {custom_formula}"):
                     custom_formula=custom_formula,
                     kernel_size=kernel_size,
                     include_boundary=include_boundary,
-                    tile_cloud_threshold=tile_cloud_threshold if "tile_cloud_threshold" in locals() else 0,
                     pixel_cloud_threshold=pixel_cloud_threshold if "pixel_cloud_threshold" in locals() else 0,
                     user_scale=user_scale
                 )