update app.py

app.py

@@ -79,6 +79,16 @@ elif index_choice.lower() == 'custom formula':
     custom_formula = st.text_input("Enter Custom Formula (e.g., 'B5 - B4 / B5 + B4')")
     st.write(f"Custom Formula: {custom_formula}")  # Display the custom formula after the user inputs it
 
+# Function to convert GeoDataFrame geometry to Earth Engine format
+def convert_to_ee_geometry(geometry):
+    """
+    Convert a GeoDataFrame geometry (Polygon, MultiPolygon, etc.) to an Earth Engine geometry.
+    """
+    if geometry.is_valid:
+        return ee.Geometry(geometry.__geo_interface__)
+    else:
+        raise ValueError(f"Invalid geometry: {geometry}")
+
 # Function to read points from CSV
 def read_csv(file_path):
     df = pd.read_csv(file_path)
@@ -173,14 +183,6 @@ 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
@@ -285,35 +287,38 @@ if file_upload:
                         'Calculated Value': calculated_value
                     })
 
-   # 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())
+    # 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
+                # Convert geometry to Earth Engine format
+                roi = convert_to_ee_geometry(polygon)
+                
+                # Add the valid GeoDataFrame to the map
+                m.add_geojson(roi, layer_name=row.get('name', 'Unnamed Polygon'))
 
-    # 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
-            m.add_gdf(gdf=row, layer_name=row.get('name', 'Unnamed Polygon'))
-
-    # Display map
-    st.write("Map of Uploaded Polygons:")
-    m.to_streamlit()
+        # Display map
+        st.write("Map of Uploaded Polygons:")
+        m.to_streamlit()
 
-    # Store the map in session_state
-    st.session_state.map_data = m
+        # 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}")
+        # 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
+            # Define the region of interest (ROI)
             roi = convert_to_ee_geometry(polygon)
 
             # Load Sentinel-2 image collection
@@ -352,9 +357,7 @@ if polygons_df is not None:
                         '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
@@ -375,4 +378,4 @@ if st.session_state.results:
             data=result_df.to_csv(index=False).encode('utf-8'),
             file_name=filename,
             mime='text/csv'
-        )
+        )