Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -10,6 +10,12 @@ from osgeo import gdal
 import io
 import zipfile
 import base64
+import concurrent.futures
+import requests
+from functools import partial
+import folium
+from streamlit_folium import folium_static
+from folium.plugins import Draw
 
 # Constants
 CATEGORIES = {
@@ -32,7 +38,7 @@ DIC_LAYERS = {
 
 # Helper functions
 def wgs84_to_lv95(lat, lon):
-    url = f'http://geodesy.geo.admin.ch/reframe/wgs84tolv95?easting={lat}&northing={lon}&format=json'
+    url = f'http://geodesy.geo.admin.ch/reframe/wgs84tolv95?easting={lon}&northing={lat}&format=json'
     with urllib.request.urlopen(url) as response:
         data = json.load(response)
     return data['easting'], data['northing']
@@ -41,7 +47,7 @@ def lv95_to_wgs84(x, y):
     url = f'http://geodesy.geo.admin.ch/reframe/lv95towgs84?easting={x}&northing={y}&format=json'
     with urllib.request.urlopen(url) as response:
         data = json.load(response)
-    return data['easting'], data['northing']
+    return data['northing'], data['easting']
 
 def detect_and_convert_bbox(bbox):
     xmin, ymin, xmax, ymax = bbox
@@ -67,8 +73,8 @@ def detect_and_convert_bbox(bbox):
         wgs84_bounds['xmin'] <= xmax <= wgs84_bounds['xmax'] and
         wgs84_bounds['ymin'] <= ymax <= wgs84_bounds['ymax']):
         
-        lv95_min = wgs84_to_lv95(xmin, ymin)
-        lv95_max = wgs84_to_lv95(xmax, ymax)
+        lv95_min = wgs84_to_lv95(ymin, xmin)
+        lv95_max = wgs84_to_lv95(ymax, xmax)
         
         bbox_lv95 = (lv95_min[0], lv95_min[1], lv95_max[0], lv95_max[1])
         return (bbox, bbox_lv95)
@@ -81,7 +87,7 @@ def detect_and_convert_bbox(bbox):
         wgs84_min = lv95_to_wgs84(xmin, ymin)
         wgs84_max = lv95_to_wgs84(xmax, ymax)
         
-        bbox_wgs84 = (wgs84_min, wgs84_max[0], wgs84_max[1], wgs84_min[1])
+        bbox_wgs84 = (wgs84_min[1], wgs84_min[0], wgs84_max[1], wgs84_max[0])
         return (bbox_wgs84, bbox)
     
     return None
@@ -165,55 +171,80 @@ def suppr_doublons_list_mnt(lst):
 @st.cache_data
 def get_urls(bbox_wgs84, data_types, resolutions):
     urls = []
-    for data_type, enabled in data_types.items():
-        if enabled:
-            url = URL_STAC_SWISSTOPO_BASE + DIC_LAYERS[data_type]
-            if data_type in ['mnt', 'ortho']:
-                resolution = resolutions[data_type]
-                tri = f'_{resolution}_'
-                lst = [v for v in get_list_from_STAC_swisstopo(url, *bbox_wgs84) if tri in v]
-                if data_type == 'mnt':
-                    lst = suppr_doublons_list_mnt(lst)
-                else:
-                    lst = suppr_doublons_list_ortho(lst)
-            elif data_type == 'mns':
-                lst = [v for v in get_list_from_STAC_swisstopo(url, *bbox_wgs84) if 'raster' in v]
-                lst = suppr_doublons_list_mnt(lst)
-            elif data_type == 'bati3D_v2':
-                lst = get_list_from_STAC_swisstopo(url, *bbox_wgs84)
-                lst = suppr_doublons_bati3D_v2(lst)
-            elif data_type == 'bati3D_v3':
-                lst = get_list_from_STAC_swisstopo(url, *bbox_wgs84, gdb=True)
-                lst = suppr_doublons_bati3D_v3(lst)
-            urls.extend(lst)
+    with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+        future_to_data_type = {
+            executor.submit(
+                get_urls_for_data_type, 
+                data_type, 
+                bbox_wgs84, 
+                resolutions.get(data_type)
+            ): data_type for data_type, enabled in data_types.items() if enabled
+        }
+        for future in concurrent.futures.as_completed(future_to_data_type):
+            data_type = future_to_data_type[future]
+            try:
+                urls.extend(future.result())
+            except Exception as exc:
+                st.error(f"Error fetching URLs for {data_type}: {exc}")
     return urls
 
-def geojson_forest(bbox, fn_geojson):
-    xmin, ymin, xmax, ymax = bbox
-    url_base = 'https://hepiadata.hesge.ch/arcgis/rest/services/suisse/TLM_C4D_couverture_sol/FeatureServer/1/query?'
+def get_urls_for_data_type(data_type, bbox_wgs84, resolution=None):
+    url = URL_STAC_SWISSTOPO_BASE + DIC_LAYERS[data_type]
+    if data_type in ['mnt', 'ortho']:
+        tri = f'_{resolution}_'
+        lst = [v for v in get_list_from_STAC_swisstopo(url, *bbox_wgs84) if tri in v]
+        if data_type == 'mnt':
+            return suppr_doublons_list_mnt(lst)
+        else:
+            return suppr_doublons_list_ortho(lst)
+    elif data_type == 'mns':
+        lst = [v for v in get_list_from_STAC_swisstopo(url, *bbox_wgs84) if 'raster' in v]
+        return suppr_doublons_list_mnt(lst)
+    elif data_type == 'bati3D_v2':
+        lst = get_list_from_STAC_swisstopo(url, *bbox_wgs84)
+        return suppr_doublons_bati3D_v2(lst)
+    elif data_type == 'bati3D_v3':
+        lst = get_list_from_STAC_swisstopo(url, *bbox_wgs84, gdb=True)
+        return suppr_doublons_bati3D_v3(lst)
+    return []
 
-    sql = ' OR '.join([f"OBJEKTART='{cat}'" for cat in CATEGORIES.keys()])
+def fetch_url(url):
+    response = requests.get(url)
+    return response.content
 
-    params = {
-        "geometry": f"{xmin},{ymin},{xmax},{ymax}",
-        "geometryType": "esriGeometryEnvelope",
-        "returnGeometry": "true",
-        "outFields": "OBJEKTART",
-        "orderByFields": "OBJEKTART",
-        "where": sql,
-        "returnZ": "true",
-        "outSR": '2056',
-        "spatialRel": "esriSpatialRelIntersects",
-        "f": "geojson"
-    }
-    query_string = urllib.parse.urlencode(params)
-    url = url_base + query_string
-    
-    with urllib.request.urlopen(url) as response:
-        data = json.load(response)
+def merge_ortho_images(urls, output_format='GTiff'):
+    with tempfile.TemporaryDirectory() as temp_dir:
+        with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+            future_to_url = {executor.submit(fetch_url, url): url for url in urls}
+            for i, future in enumerate(concurrent.futures.as_completed(future_to_url)):
+                url = future_to_url[future]
+                try:
+                    data = future.result()
+                    local_filename = os.path.join(temp_dir, f"ortho_{i}.tif")
+                    with open(local_filename, 'wb') as f:
+                        f.write(data)
+                except Exception as exc:
+                    st.error(f"Error downloading {url}: {exc}")
         
-    with open(fn_geojson, 'w') as f:
-        json.dump(data, f)
+        local_files = [os.path.join(temp_dir, f) for f in os.listdir(temp_dir) if f.endswith('.tif')]
+        
+        vrt_options = gdal.BuildVRTOptions(resampleAlg='nearest', addAlpha=False)
+        vrt_path = os.path.join(temp_dir, "merged.vrt")
+        vrt = gdal.BuildVRT(vrt_path, local_files, options=vrt_options)
+        vrt = None  # Close the dataset
+        
+        output_path = os.path.join(temp_dir, f"merged.{output_format.lower()}")
+        if output_format == 'GTiff':
+            translate_options = gdal.TranslateOptions(format="GTiff", creationOptions=["COMPRESS=LZW", "TILED=YES"])
+        elif output_format == 'JPEG':
+            translate_options = gdal.TranslateOptions(format="JPEG", creationOptions=["QUALITY=85"])
+        elif output_format == 'PNG':
+            translate_options = gdal.TranslateOptions(format="PNG", creationOptions=["COMPRESS=DEFLATE"])
+        
+        gdal.Translate(output_path, vrt_path, options=translate_options)
+        
+        with open(output_path, 'rb') as f:
+            return f.read()
 
 def create_geojson_with_links(urls, bbox):
     features = []
@@ -237,32 +268,7 @@ def create_geojson_with_links(urls, bbox):
     }
     return json.dumps(geojson)
 
-def merge_ortho_images(urls, output_format='GTiff'):
-    with tempfile.TemporaryDirectory() as temp_dir:
-        local_files = []
-        for i, url in enumerate(urls):
-            local_filename = os.path.join(temp_dir, f"ortho_{i}.tif")
-            urllib.request.urlretrieve(url, local_filename)
-            local_files.append(local_filename)
-        
-        vrt_options = gdal.BuildVRTOptions(resampleAlg='nearest', addAlpha=False)
-        vrt_path = os.path.join(temp_dir, "merged.vrt")
-        vrt = gdal.BuildVRT(vrt_path, local_files, options=vrt_options)
-        vrt = None  # Close the dataset
-        
-        output_path = os.path.join(temp_dir, f"merged.{output_format.lower()}")
-        if output_format == 'GTiff':
-            translate_options = gdal.TranslateOptions(format="GTiff", creationOptions=["COMPRESS=LZW", "TILED=YES"])
-        elif output_format == 'JPEG':
-            translate_options = gdal.TranslateOptions(format="JPEG", creationOptions=["QUALITY=85"])
-        elif output_format == 'PNG':
-            translate_options = gdal.TranslateOptions(format="PNG", creationOptions=["COMPRESS=DEFLATE"])
-        
-        gdal.Translate(output_path, vrt_path, options=translate_options)
-        
-        with open(output_path, 'rb') as f:
-            return f.read()
-
+@st.cache_data
 def prepare_download_package(urls, bbox, ortho_format):
     geojson_data = create_geojson_with_links(urls, bbox)
     ortho_urls = [url for url in urls if 'swissimage-dop10' in url]
@@ -276,6 +282,33 @@ def prepare_download_package(urls, bbox, ortho_format):
     
     return zip_buffer.getvalue()
 
+def geojson_forest(bbox, fn_geojson):
+    xmin, ymin, xmax, ymax = bbox
+    url_base = 'https://hepiadata.hesge.ch/arcgis/rest/services/suisse/TLM_C4D_couverture_sol/FeatureServer/1/query?'
+
+    sql = ' OR '.join([f"OBJEKTART='{cat}'" for cat in CATEGORIES.keys()])
+
+    params = {
+        "geometry": f"{xmin},{ymin},{xmax},{ymax}",
+        "geometryType": "esriGeometryEnvelope",
+        "returnGeometry": "true",
+        "outFields": "OBJEKTART",
+        "orderByFields": "OBJEKTART",
+        "where": sql,
+        "returnZ": "true",
+        "outSR": '2056',
+        "spatialRel": "esriSpatialRelIntersects",
+        "f": "geojson"
+    }
+    query_string = urllib.parse.urlencode(params)
+    url = url_base + query_string
+    
+    with urllib.request.urlopen(url) as response:
+        data = json.load(response)
+        
+    with open(fn_geojson, 'w') as f:
+        json.dump(data, f)
+
 # Streamlit app
 st.set_page_config(page_title="Swiss Geospatial Data Downloader", layout="wide")
 
@@ -299,22 +332,45 @@ resolutions = {
 ortho_format = st.sidebar.selectbox("Ortho Output Format", ['GTiff', 'JPEG', 'PNG'], index=0)
 
 # Main content area
-st.subheader("Enter Bounding Box Coordinates")
-col1, col2, col3, col4 = st.columns(4)
-with col1:
-    xmin = st.number_input("Min Longitude", value=6.0500, step=0.0001, format="%.4f")
-with col2:
-    ymin = st.number_input("Min Latitude", value=46.1800, step=0.0001, format="%.4f")
-with col3:
-    xmax = st.number_input("Max Longitude", value=6.2200, step=0.0001, format="%.4f")
-with col4:
-    ymax = st.number_input("Max Latitude", value=46.2500, step=0.0001, format="%.4f")
+st.subheader("Select Bounding Box")
+
+# Create a map centered on Switzerland
+m = folium.Map(location=[46.8182, 8.2275], zoom_start=8)
+
+# Add rectangle draw control
+draw = folium.plugins.Draw(
+    export=False,
+    position='topleft',
+    draw_options={
+        'rectangle': True,
+        'polygon': False,
+        'polyline': False,
+        'circle': False,
+        'marker': False,
+        'circlemarker': False
+    }
+)
+draw.add_to(m)
+
+# Display the map
+folium_static(m)
 
+# Get bbox from drawn rectangle
 if 'bbox' not in st.session_state:
     st.session_state.bbox = None
 
-if st.button("Set Bounding Box"):
-    st.session_state.bbox = [xmin, ymin, xmax, ymax]
+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}")
@@ -356,4 +412,4 @@ if st.session_state.bbox:
     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, enter the bounding box coordinates, and click 'Get Download Package' to prepare all data for download.")
+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 Package' to prepare all data for download.")