Update app.py

app.py

@@ -1332,45 +1332,33 @@ def locator_page():
     # Render the map inside Streamlit
     m.to_streamlit(height=600, responsive=True)
 
-    # ----------------------------
-    # ROI capture helper
-    # ----------------------------
-    def get_roi_from_map():
-        """Return ee.Geometry if ROI exists, otherwise None"""
-        roi = None
+    # --- 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)
 
-        # Case 1: User just drew something on the map
-        if m.draw_features:
-            try:
-                last_feature = m.draw_features[-1]
-                if isinstance(last_feature, dict):
-                    geom = last_feature.get("geometry") or last_feature
-                    roi = ee.Geometry(geom)
-                    # Save permanently in session state
-                    st.session_state["roi_geojson"] = json.dumps(last_feature)
-            except Exception as e:
-                st.warning(f"⚠️ Could not parse drawn ROI: {e}")
-                roi = None
-
-        # Case 2: Nothing drawn this run, but we saved ROI earlier
-        elif "roi_geojson" in st.session_state:
-            try:
-                saved = json.loads(st.session_state["roi_geojson"])
-                geom = saved.get("geometry") if isinstance(saved, dict) else saved
+    roi = None
+    if drawn_features:
+        try:
+            # Get last drawn shape
+            last_feature = drawn_features[-1]
+            geom = last_feature.get("geometry")
+            if geom:
                 roi = ee.Geometry(geom)
-            except Exception as e:
-                st.warning(f"⚠️ Failed to restore ROI: {e}")
-                roi = None
-
-        return roi
+                st.session_state["roi_geojson"] = json.dumps(last_feature)
+                st.success("✅ ROI captured successfully")
+        except Exception as e:
+            st.error(f"Failed to parse drawn feature: {e}")
 
-    # Update ROI immediately (persistent between runs)
-    roi = get_roi_from_map()
-    if roi:
-        st.success("✅ ROI is available and ready for computations")
-    else:
-        st.info("✍️ Please draw a polygon/rectangle/circle before pressing **Compute Summaries**")
- 
+    # Restore ROI from session_state if nothing drawn this run
+    if roi is None and "roi_geojson" in st.session_state:
+        try:
+            saved = json.loads(st.session_state["roi_geojson"])
+            geom = saved.get("geometry") if isinstance(saved, dict) else saved
+            roi = ee.Geometry(geom)
+            st.info("♻️ Restored ROI from session state")
+        except Exception as e:
+            st.warning(f"Could not restore ROI: {e}")
+            roi = None
 
     # --- Compute Summaries ---
     if st.button("Compute Summaries"):