Update app.py

app.py

@@ -1325,48 +1325,49 @@ def locator_page():
         pass
     
     # ----------------------------
-    # Render map and capture ROI (geemap only)
-    # ----------------------------
-    st.markdown("👉 Draw a polygon/rectangle/circle using the draw tool, then press **Compute Summaries**")
-
-    # Render the map inside Streamlit
+    # --- Render the map ---
     m.to_streamlit(height=600, responsive=True)
-
-    # --- Render map and capture drawings ---
-    # st_map() is the correct way to sync drawn features into Streamlit
-    drawn_features = m.st_map(width=1200, height=600)
-
+    
+    # --- ROI capture ---
     roi = None
-    if drawn_features:
+    
+    # Case 1: New drawing in this run
+    if m.user_roi:
         try:
-            # Get last drawn shape
-            last_feature = drawn_features[-1]
-            geom = last_feature.get("geometry")
-            if geom:
-                roi = ee.Geometry(geom)
-                st.session_state["roi_geojson"] = json.dumps(last_feature)
-                st.success("✅ ROI captured successfully")
+            roi = m.user_roi
+            st.session_state["roi_geojson"] = roi.toGeoJSONString()
+            st.success("✅ ROI captured from user drawing")
         except Exception as e:
-            st.error(f"Failed to parse drawn feature: {e}")
-
-    # Restore ROI from session_state if nothing drawn this run
-    if roi is None and "roi_geojson" in st.session_state:
+            st.warning(f"Could not parse m.user_roi: {e}")
+    
+    elif m.draw_features:
         try:
-            saved = json.loads(st.session_state["roi_geojson"])
-            geom = saved.get("geometry") if isinstance(saved, dict) else saved
+            last_feature = m.draw_features[-1]
+            geom = last_feature.get("geometry") or last_feature
             roi = ee.Geometry(geom)
-            st.info("♻️ Restored ROI from session state")
+            st.session_state["roi_geojson"] = json.dumps(last_feature)
+            st.success("✅ ROI captured from draw_features")
+        except Exception as e:
+            st.warning(f"Could not parse m.draw_features: {e}")
+    
+    # Case 2: Restore ROI from session_state if nothing new drawn
+    elif "roi_geojson" in st.session_state:
+        try:
+            stored = json.loads(st.session_state["roi_geojson"])
+            geom = stored.get("geometry") if isinstance(stored, dict) else stored
+            roi = ee.Geometry(geom)
+            st.info("♻️ ROI restored from session state")
         except Exception as e:
             st.warning(f"Could not restore ROI: {e}")
-            roi = None
-
-    # --- Compute Summaries ---
+    
+    # --- Button to trigger computation ---
     if st.button("Compute Summaries"):
-        roi = get_roi_from_map()
         if roi is None:
-            st.error("⚠️ No drawn ROI found. Please draw and try again.")
-            return
-        st.success("✅ ROI found — computing...")
+            st.error("⚠️ No ROI found. Please draw a polygon/rectangle/circle and try again.")
+        else:
+            st.success("🚀 ROI found — computing summaries...")
+          
+
 
         chosen_soil_band = None
         if soil_img: