Update pages/5_📍_VertXtractor.py

pages/5_📍_VertXtractor.py

@@ -325,69 +325,80 @@ ortho = st.sidebar.checkbox("Orthophotos", value=True)
 mnt_resol = st.sidebar.selectbox("MNT Resolution", [0.5, 2.0], index=0)
 ortho_resol = st.sidebar.selectbox("Orthophoto Resolution", [0.1, 2.0], index=0)
 
-# Initialize session state for bbox
-if 'bbox' not in st.session_state:
-    st.session_state.bbox = None
-
-# Create a map for bbox selection
-m = folium.Map(location=[46.8182, 8.2275], zoom_start=8)
-
-draw = folium.plugins.Draw()
-draw.add_to(m)
-
-folium_static(m)
-
-# Get bbox from drawn rectangle
-if st.button("Get Bounding Box"):
-    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)
-            ]
-
-if st.session_state.bbox:
-    st.write(f"Selected bounding box (WGS84): {st.session_state.bbox}")
-    
-    # Convert bbox to LV95
-    bbox_results = detect_and_convert_bbox(st.session_state.bbox)
-    
-    if bbox_results:
-        bbox_wgs84, bbox_lv95 = bbox_results
-        st.write(f"Converted bounding box (LV95): {bbox_lv95}")
+# Main content area
+col1, col2 = st.columns([2, 1])
+
+with col1:
+    st.subheader("Select Area of Interest")
+    m = folium.Map(location=[46.8182, 8.2275], zoom_start=8)
+    draw = Draw(
+        draw_options={
+            'polyline': False,
+            'polygon': False,
+            'circle': False,
+            'marker': False,
+            'circlemarker': False,
+        },
+        edit_options={'edit': False}
+    )
+    draw.add_to(m)
+    folium_static(m)
+
+with col2:
+    st.subheader("Bounding Box")
+    if 'bbox' not in st.session_state:
+        st.session_state.bbox = None
+
+    if st.button("Get Bounding Box"):
+        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"] == "rectangle":
+                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)
+                ]
+
+    if st.session_state.bbox:
+        st.write(f"Selected bounding box (WGS84): {st.session_state.bbox}")
         
-        if st.button("Get Download Links"):
-            with st.spinner("Fetching download links..."):
-                urls = get_urls(bbox_wgs84, mnt, mns, bati3D_v2, bati3D_v3, ortho, mnt_resol, ortho_resol)
-                
-                if urls:
-                    st.success(f"Found {len(urls)} files to download:")
-                    for url in urls:
-                        st.write(url)
-                    
-                    # Option to download files
-                    if st.button("Download Files"):
-                        with st.spinner("Downloading files..."):
-                            download_path = download_files(urls, "downloads")
-                            st.success(f"Files downloaded to: {download_path}")
-                else:
-                    st.warning("No files found for the selected area and options.")
+        # Convert bbox to LV95
+        bbox_results = detect_and_convert_bbox(st.session_state.bbox)
         
-        # Option to download forest data
-        if st.button("Download Forest Data"):
-            with st.spinner("Downloading forest data..."):
-                with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.geojson') as tmp:
-                    geojson_forest(bbox_lv95, tmp.name)
-                    gdf = gpd.read_file(tmp.name)
-                    st.write(gdf)
-                os.unlink(tmp.name)
-                st.success("Forest data downloaded and displayed.")
-    else:
-        st.error("Selected area is outside Switzerland. Please select an area within Switzerland.")
-
-st.sidebar.info("This application allows you to download various types of geospatial data for Switzerland. Select the data types you want, draw a bounding box on the map, and click 'Get Download Links' to see available files.")
+        if bbox_results:
+            bbox_wgs84, bbox_lv95 = bbox_results
+            st.write(f"Converted bounding box (LV95): {bbox_lv95}")
+            
+            if st.button("Get Download Links"):
+                with st.spinner("Fetching download links..."):
+                    urls = get_urls(bbox_wgs84, mnt, mns, bati3D_v2, bati3D_v3, ortho, mnt_resol, ortho_resol)
+                    
+                    if urls:
+                        st.success(f"Found {len(urls)} files to download:")
+                        for url in urls:
+                            st.write(url)
+                        
+                        # Option to download files
+                        if st.button("Download Files"):
+                            with st.spinner("Downloading files..."):
+                                download_path = download_files(urls, "downloads")
+                                st.success(f"Files downloaded to: {download_path}")
+                    else:
+                        st.warning("No files found for the selected area and options.")
+            
+            # Option to download forest data
+            if st.button("Download Forest Data"):
+                with st.spinner("Downloading forest data..."):
+                    with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.geojson') as tmp:
+                        geojson_forest(bbox_lv95, tmp.name)
+                        gdf = gpd.read_file(tmp.name)
+                        st.write(gdf)
+                    os.unlink(tmp.name)
+                    st.success("Forest data downloaded and displayed.")
+        else:
+            st.error("Selected area is outside Switzerland. Please select an area within Switzerland.")
+
+st.sidebar.info("This application allows you to download various types of geospatial data for Switzerland. Select the data types you want, draw a bounding box on the map, and click 'Get Download Links' to see available files.")