Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -12,7 +12,68 @@ from rasterio.io import MemoryFile
 import numpy as np
 import os
 
-# ... (le reste des imports et la définition de LAYERS restent inchangés)
+# Configuration de la page
+st.set_page_config(layout="wide", page_title="Extracteur de données géospatiales")
+
+# Définition des couches disponibles
+LAYERS = {
+    "Swisstopo - SWISSIMAGE 10 cm": {"id": "ch.swisstopo.swissimage-dop10", "source": "swisstopo", "type": "image"},
+    "Swisstopo - Carte nationale 1:25'000": {"id": "ch.swisstopo.pixelkarte-farbe-pk25.noscale", "source": "swisstopo", "type": "image"},
+    "Swisstopo - MNT": {"id": "ch.swisstopo.swissalti3d", "source": "swisstopo", "type": "raster"},
+    "ESRI - World Imagery": {"id": "WorldImagery", "source": "esri", "type": "image"},
+    "ESRI - World Elevation": {"id": "WorldElevation", "source": "esri", "type": "raster"}
+}
+
+def draw_box_on_map():
+    """Crée une carte interactive pour dessiner une zone d'intérêt."""
+    m = folium.Map(location=[46.8, 8.2], zoom_start=8)
+    Draw(draw_options={'polyline': False, 'polygon': False, 'circle': False, 'marker': False, 'circlemarker': False},
+         edit_options={'edit': False}).add_to(m)
+    return st_folium(m, width=700, height=500)
+
+def create_geojson_from_box(bbox):
+    """Crée un GeoJSON à partir d'une boîte englobante."""
+    gdf = gpd.GeoDataFrame({'geometry': [bbox]}, crs="EPSG:4326")
+    return json.loads(gdf.to_json()), json.loads(gdf.to_crs("EPSG:2056").to_json())
+
+@st.cache_data
+def extract_swisstopo_data(bbox, layer_id, layer_type):
+    """Extrait les données de Swisstopo."""
+    api_url = f"https://data.geo.admin.ch/api/stac/v0.9/collections/{layer_id}/items"
+    params = {"bbox": ",".join(map(str, bbox)), "limit": 1}
+    try:
+        response = requests.get(api_url, params=params)
+        response.raise_for_status()
+        data = response.json()
+        if data['features']:
+            feature = data['features'][0]
+            asset_keys = feature['assets'].keys()
+            data_key = 'rgb' if 'rgb' in asset_keys else 'data' if 'data' in asset_keys else next(iter(asset_keys))
+            data_url = feature['assets'][data_key]['href']
+            return requests.get(data_url).content
+    except requests.RequestException as e:
+        st.error(f"Erreur Swisstopo: {str(e)}")
+    return None
+
+@st.cache_data
+def extract_esri_data(bbox, layer_id, layer_type):
+    """Extrait les données d'ESRI."""
+    service_url = "https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/export" if layer_type == "image" else "https://elevation.arcgis.com/arcgis/rest/services/WorldElevation/Terrain/ImageServer/exportImage"
+    params = {
+        "bbox": f"{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}",
+        "bboxSR": 4326,
+        "size": "1000,1000",
+        "format": "tiff",
+        "f": "image",
+        "imageSR": 4326
+    }
+    try:
+        response = requests.get(service_url, params=params)
+        response.raise_for_status()
+        return response.content
+    except requests.RequestException as e:
+        st.error(f"Erreur ESRI: {str(e)}")
+    return None
 
 def process_and_save_data(data, layer_name, layer_type):
     """Traite et sauvegarde les données extraites."""
@@ -44,28 +105,6 @@ def process_and_save_data(data, layer_name, layer_type):
     except Exception as e:
         st.error(f"Erreur de traitement pour {layer_name}: {str(e)}")
 
-@st.cache_data
-def extract_esri_data(bbox, layer_id, layer_type):
-    """Extrait les données d'ESRI."""
-    service_url = "https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/export" if layer_type == "image" else "https://elevation.arcgis.com/arcgis/rest/services/WorldElevation/Terrain/ImageServer/exportImage"
-    params = {
-        "bbox": f"{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}",
-        "bboxSR": 4326,
-        "size": "1000,1000",
-        "format": "tiff",
-        "f": "image",
-        "imageSR": 4326  # Ajout de cette ligne pour spécifier le système de coordonnées de l'image
-    }
-    try:
-        response = requests.get(service_url, params=params)
-        response.raise_for_status()
-        return response.content
-    except requests.RequestException as e:
-        st.error(f"Erreur ESRI: {str(e)}")
-    return None
-
-# ... (le reste du code reste inchangé jusqu'à la fonction main())
-
 def main():
     st.title("Extracteur de données Swisstopo et ESRI")