update app.py

app.py

@@ -79,15 +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
+# Function to check if the polygon geometry is valid and convert it to the correct format
 def convert_to_ee_geometry(geometry):
-    """
-    Convert a GeoDataFrame geometry (Polygon, MultiPolygon, etc.) to an Earth Engine geometry.
-    """
+    # Ensure the polygon geometry is in the right format
     if geometry.is_valid:
-        return ee.Geometry(geometry.__geo_interface__)
+        # Convert the geometry to GeoJSON format
+        geojson = geometry.__geo_interface__
+        # Convert to Earth Engine geometry
+        return ee.Geometry(geojson)
     else:
-        raise ValueError(f"Invalid geometry: {geometry}")
+        raise ValueError("Invalid geometry: The polygon geometry is not valid.")
 
 # Function to read points from CSV
 def read_csv(file_path):
@@ -287,34 +288,31 @@ 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)
+    # 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())
 
-    # 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)
+        # 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)
 
-            # Convert the Earth Engine geometry to GeoJSON format (dictionary)
-            geojson_dict = roi.getInfo()
-
-            # Add the valid GeoDataFrame to the map using GeoJSON format
-            m.add_geojson(geojson_dict, layer_name=row.get('name', 'Unnamed Polygon'))
+        # 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'))
 
-    # 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():
@@ -322,7 +320,11 @@ if polygons_df is not None:
             location_name = row.get('name', f"Polygon_{idx}")
 
             # Define the region of interest (ROI)
-            roi = convert_to_ee_geometry(polygon)
+            try:
+                roi = convert_to_ee_geometry(polygon)
+            except ValueError as e:
+                st.error(str(e))
+                continue  # Skip this polygon if geometry is invalid
 
             # Load Sentinel-2 image collection
             collection = ee.ImageCollection(sub_options[sub_selection]) \