Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -9,7 +9,6 @@ import json
 
 st.set_page_config(layout="wide", page_title="Extracteur de données géospatiales")
 
-# Liste étendue des couches disponibles
 LAYERS = {
     # Swisstopo
     "SWISSIMAGE 10 cm": {"id": "ch.swisstopo.swissimage-dop10", "source": "swisstopo", "type": "image"},
@@ -19,8 +18,8 @@ LAYERS = {
     "Limites administratives": {"id": "ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill", "source": "swisstopo", "type": "vector"},
     "Réseau hydrographique": {"id": "ch.bafu.vec25-gewaessernetz", "source": "swisstopo", "type": "vector"},
     # ESRI
-    "World Imagery": {"id": "WorldImagery", "source": "esri", "type": "image"},
-    "World Elevation": {"id": "WorldElevation", "source": "esri", "type": "raster"},
+    "World Imagery": {"id": "World_Imagery", "source": "esri", "type": "image"},
+    "World Elevation": {"id": "WorldElevation/Terrain", "source": "esri", "type": "raster"},
     "World Topographic": {"id": "World_Topo_Map", "source": "esri", "type": "image"},
     "World Street Map": {"id": "World_Street_Map", "source": "esri", "type": "image"},
     "World Terrain": {"id": "World_Terrain_Base", "source": "esri", "type": "image"},
@@ -49,7 +48,7 @@ def get_download_url(bbox, layer_info):
             data_key = 'rgb' if 'rgb' in asset_keys else 'data' if 'data' in asset_keys else next(iter(asset_keys))
             return feature['assets'][data_key]['href']
     else:  # ESRI
-        service_url = f"https://server.arcgisonline.com/arcgis/rest/services/{layer_info['id']}/MapServer/export"
+        service_url = f"https://server.arcgisonline.com/arcgis/rest/services/{layer_info['id']}/ImageServer/exportImage"
         params = {
             "bbox": f"{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}",
             "bboxSR": 4326,
@@ -62,7 +61,10 @@ def get_download_url(bbox, layer_info):
             response = requests.get(service_url, params=params)
             response.raise_for_status()
             json_response = response.json()
-            if 'href' in json_response:
+            if 'error' in json_response:
+                st.error(f"Erreur ESRI: {json_response['error']['message']}")
+                return None
+            elif 'href' in json_response:
                 return json_response['href']
             elif 'url' in json_response:
                 return json_response['url']