Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -1,6 +1,6 @@
 import streamlit as st
 import folium
-from streamlit_folium import folium_static
+from streamlit_folium import st_folium
 from folium.plugins import Draw
 import geopandas as gpd
 import tempfile
@@ -351,40 +351,37 @@ draw = Draw(
 )
 draw.add_to(m)
 
-# Display the map
-folium_static(m)
+# Use st_folium to render the map and get the drawn bbox
+output = st_folium(m, width=700, height=500)
 
 # Initialize session state for bbox
 if 'bbox' not in st.session_state:
-    st.session_state.bbox = None
-
-# Get bbox from drawn rectangle
-draw_data = st.session_state.get("json_data")
-if draw_data and "features" in draw_data:
-    feature = draw_data["features"][0]
-    if feature["geometry"]["type"] == "Polygon":
-        coords = feature["geometry"]["coordinates"][0]
-        st.session_state.bbox = [
-            min(coord[0] for coord in coords),
-            min(coord[1] for coord in coords),
-            max(coord[0] for coord in coords),
-            max(coord[1] for coord in coords)
-        ]
+    st.session_state.bbox = [6.0, 46.0, 10.0, 47.0]  # Default values for Switzerland
+
+# Update bbox if a new one is drawn
+if output['last_active_drawing']:
+    coordinates = output['last_active_drawing']['geometry']['coordinates'][0]
+    st.session_state.bbox = [
+        min(coord[0] for coord in coordinates),
+        min(coord[1] for coord in coordinates),
+        max(coord[0] for coord in coordinates),
+        max(coord[1] for coord in coordinates)
+    ]
 
 # Display and allow editing of bounding box coordinates
 st.subheader("Enter Bounding Box Coordinates")
 col1, col2, col3, col4 = st.columns(4)
 with col1:
-    xmin = st.number_input("Min Longitude", value=st.session_state.bbox[0] if st.session_state.bbox else 6.0, format="%.4f")
+    xmin = st.number_input("Min Longitude", value=st.session_state.bbox[0], format="%.4f", key="xmin")
 with col2:
-    ymin = st.number_input("Min Latitude", value=st.session_state.bbox[1] if st.session_state.bbox else 46.0, format="%.4f")
+    ymin = st.number_input("Min Latitude", value=st.session_state.bbox[1], format="%.4f", key="ymin")
 with col3:
-    xmax = st.number_input("Max Longitude", value=st.session_state.bbox[2] if st.session_state.bbox else 10.0, format="%.4f")
+    xmax = st.number_input("Max Longitude", value=st.session_state.bbox[2], format="%.4f", key="xmax")
 with col4:
-    ymax = st.number_input("Max Latitude", value=st.session_state.bbox[3] if st.session_state.bbox else 47.0, format="%.4f")
+    ymax = st.number_input("Max Latitude", value=st.session_state.bbox[3], format="%.4f", key="ymax")
 
-if st.button("Set Bounding Box"):
-    st.session_state.bbox = [xmin, ymin, xmax, ymax]
+# Update session state if coordinates are manually changed
+st.session_state.bbox = [xmin, ymin, xmax, ymax]
 
 if st.session_state.bbox:
     st.write(f"Selected bounding box (WGS84): {st.session_state.bbox}")