Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -20,7 +20,7 @@ LAYERS = {
     "swissBUILDINGS3D 3.0 Beta": {"id": "ch.swisstopo.swissbuildings3d_3_0", "source": "swisstopo", "type": "3d"},
     # ESRI
     "World Imagery": {"id": "World_Imagery", "source": "esri", "type": "image"},
-    "World Elevation": {"id": "World_Elevation", "source": "esri", "type": "raster"},
+    "World Elevation": {"id": "Elevation/World_Elevation", "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"},
@@ -64,35 +64,18 @@ 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://services.arcgisonline.com/arcgis/rest/services/{layer_info['id']}/MapServer/export"
         params = {
             "bbox": f"{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}",
             "bboxSR": 4326,
             "size": "1000,1000",
-            "format": "png",
-            "f": "json",
+            "format": "tiff",
+            "f": "image",
             "imageSR": 4326,
-            "transparent": "true",
-            "dpi": 96,
-            "world_file": "true"
+            "transparent": "true"
         }
-        try:
-            response = requests.get(service_url, params=params)
-            response.raise_for_status()
-            json_response = response.json()
-            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']
-            else:
-                st.error(f"Erreur ESRI: Réponse inattendue - {json_response}")
-                return None
-        except requests.RequestException as e:
-            st.error(f"Erreur ESRI: {str(e)}")
-            return None
+        url = f"{service_url}?{'&'.join([f'{k}={v}' for k, v in params.items()])}"
+        return url
     return None
 
 def main():
@@ -128,7 +111,6 @@ def main():
                     st.write(f"Traitement de la couche : {layer_name}")
                     st.write(f"Bbox : {bbox}")
                     download_url = get_download_url(bbox, layer_info)
-                    st.write(f"URL de téléchargement : {download_url}")
                     if download_url:
                         st.markdown(f"[Télécharger {layer_name}]({download_url})")
                     else: