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")
 
-# Dictionnaires d'ESRI_extractor
 ESRI_SERVICES = {
     'World_Imagery' : 'https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer',
     'World_Topo_Map' : 'https://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer',
@@ -88,35 +87,26 @@ def get_esri_image_url(bbox, service_url):
         'bbox': f'{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}',
         'bboxSR': 4326,
         'size': '1000,1000',
-        'imageSR': 3857,
-        'format': ESRI_FORMATS['png'],
-        'f': 'json'
+        'imageSR': 4326,
+        'format': 'png',
+        'f': 'html',
+        'transparent': 'true'
     }
-    response = requests.get(f"{service_url}/export", params=params)
-    if response.status_code == 200:
-        result = response.json()
-        if 'href' in result:
-            return result['href']
-    return None
+    return f"{service_url}/export?{'&'.join([f'{k}={v}' for k, v in params.items()])}"
 
 def get_esri_terrain_url(bbox, service_url):
     params = {
         'bbox': f'{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}',
         'bboxSR': 4326,
         'size': '1000,1000',
-        'imageSR': 3857,
-        'format': ESRI_FORMATS['tiff'],
+        'imageSR': 4326,
+        'format': 'tiff',
         'pixelType': 'F32',
         'noDataInterpretation': 'esriNoDataMatchAny',
         'interpolation': '+RSP_BilinearInterpolation',
-        'f': 'json'
+        'f': 'image'
     }
-    response = requests.get(f"{service_url}/exportImage", params=params)
-    if response.status_code == 200:
-        result = response.json()
-        if 'href' in result:
-            return result['href']
-    return None
+    return f"{service_url}/exportImage?{'&'.join([f'{k}={v}' for k, v in params.items()])}"
 
 def main():
     st.title("Extracteur de données Swisstopo et ESRI")