update app.py

app.py

@@ -173,6 +173,14 @@ def calculate_custom_formula(image, geometry, formula):
     )
     return result.get('Custom Index')
 
+# Helper function to ensure valid geometry for EE processing
+def convert_to_ee_geometry(geometry):
+    if geometry.is_valid:
+        geojson = geometry.__geo_interface__  # Convert geometry to GeoJSON format
+        return ee.Geometry(geojson)
+    else:
+        raise ValueError("Invalid geometry: The polygon geometry is not valid.")
+
 # Process each point or polygon
 if file_upload:
     locations_df = None  # Initialize locations_df to None
@@ -277,39 +285,36 @@ if file_upload:
                         'Calculated Value': calculated_value
                     })
 
-    # Check if polygons_df is populated for polygons
-    if polygons_df is not None:
-        # Display a preview of the polygons data
-        st.write("Preview of the uploaded polygons data:")
-        st.dataframe(polygons_df.head())
-
-        # Create a LeafMap object to display the polygons
-        m = leafmap.Map(center=[polygons_df.geometry.centroid.y.mean(), polygons_df.geometry.centroid.x.mean()], zoom=10)
-
-        # Add polygons to the map
-        for _, row in polygons_df.iterrows():
-            polygon = row['geometry']
-            if polygon.is_valid:  # Check if the geometry is valid
-                # Create a GeoDataFrame with the single row
-                gdf = gpd.GeoDataFrame([row], geometry=[polygon], crs=polygons_df.crs)
-                
-                # Add the valid GeoDataFrame to the map
-                m.add_gdf(gdf=gdf, layer_name=row.get('name', 'Unnamed Polygon'))
+   # Process polygons
+if polygons_df is not None:
+    # Display a preview of the polygons data
+    st.write("Preview of the uploaded polygons data:")
+    st.dataframe(polygons_df.head())
 
-        # Display map
-        st.write("Map of Uploaded Polygons:")
-        m.to_streamlit()
+    # Create a LeafMap object to display the polygons
+    m = leafmap.Map(center=[polygons_df.geometry.centroid.y.mean(), polygons_df.geometry.centroid.x.mean()], zoom=10)
 
-        # Store the map in session_state
-        st.session_state.map_data = m
+    # Add polygons to the map
+    for _, row in polygons_df.iterrows():
+        polygon = row['geometry']
+        if polygon.is_valid:  # Check if the geometry is valid
+            m.add_gdf(gdf=row, layer_name=row.get('name', 'Unnamed Polygon'))
 
-        # Process each polygon for index calculation
-        for idx, row in polygons_df.iterrows():
-            polygon = row['geometry']
-            location_name = row.get('name', f"Polygon_{idx}")
+    # Display map
+    st.write("Map of Uploaded Polygons:")
+    m.to_streamlit()
 
-            # Define the region of interest (ROI)
-            roi = ee.Geometry(polygon)
+    # Store the map in session_state
+    st.session_state.map_data = m
+
+    # Process each polygon for index calculation
+    for idx, row in polygons_df.iterrows():
+        polygon = row['geometry']
+        location_name = row.get('name', f"Polygon_{idx}")
+
+        try:
+            # Convert polygon to Earth Engine geometry
+            roi = convert_to_ee_geometry(polygon)
 
             # Load Sentinel-2 image collection
             collection = ee.ImageCollection(sub_options[sub_selection]) \
@@ -347,7 +352,9 @@ if file_upload:
                         'Location Name': location_name,
                         'Calculated Value': calculated_value
                     })
-
+        except ValueError as e:
+            st.error(f"Error processing {location_name}: {str(e)}")
+            
 # After processing, show the results
 if st.session_state.results:
     # Convert the results to a DataFrame for better visualization
@@ -368,4 +375,4 @@ if st.session_state.results:
             data=result_df.to_csv(index=False).encode('utf-8'),
             file_name=filename,
             mime='text/csv'
-        )
+        )