Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -9,6 +9,25 @@ 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',
+    'World_Shaded_Relief' : 'https://services.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer',
+    'World_Terrain_Base' : 'https://services.arcgisonline.com/arcgis/rest/services/World_Terrain_Base/MapServer',
+    'World_Street_Map' : 'https://services.arcgisonline.com/arcgis/rest/services/World_Street_Map/MapServer',
+    'World_Elevation' : 'https://elevation.arcgis.com/arcgis/rest/services/WorldElevation/Terrain/ImageServer',
+}
+
+ESRI_FORMATS = {
+    'png' : 'png',
+    'png8' : 'png8',
+    'png24' : 'png24',
+    'png32' : 'png32',
+    'jpg' : 'jpg',
+    'tiff' : 'tiff',
+}
+
 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"},
@@ -18,7 +37,7 @@ LAYERS = {
     "Swisstopo - Réseau hydrographique": {"id": "ch.bafu.vec25-gewaessernetz", "source": "swisstopo", "type": "vector"},
     "Swisstopo - swissBUILDINGS3D 3.0 Beta": {"id": "ch.swisstopo.swissbuildings3d_3_0", "source": "swisstopo", "type": "3d"},
     "ESRI - World Imagery": {"id": "World_Imagery", "source": "esri", "type": "image"},
-    "ESRI - World Elevation": {"id": "WorldElevation/Terrain", "source": "esri", "type": "raster"},
+    "ESRI - World Elevation": {"id": "World_Elevation", "source": "esri", "type": "raster"},
     "ESRI - World Topographic": {"id": "World_Topo_Map", "source": "esri", "type": "image"},
     "ESRI - World Street Map": {"id": "World_Street_Map", "source": "esri", "type": "image"},
     "ESRI - World Terrain": {"id": "World_Terrain_Base", "source": "esri", "type": "image"},
@@ -54,43 +73,45 @@ def get_swisstopo_url(bbox, layer_info):
     return None
 
 def get_esri_url(bbox, layer_info):
+    service_url = ESRI_SERVICES.get(layer_info["id"])
+    if not service_url:
+        return None
+
     if layer_info["type"] == "image":
-        return get_esri_image_url(bbox, layer_info["id"])
+        return get_esri_image_url(bbox, service_url)
     elif layer_info["type"] == "raster":
-        return get_esri_terrain_url(bbox, layer_info["id"])
+        return get_esri_terrain_url(bbox, service_url)
     return None
 
-def get_esri_image_url(bbox, service_name):
-    url = f"https://services.arcgisonline.com/arcgis/rest/services/{service_name}/MapServer/export"
+def get_esri_image_url(bbox, service_url):
     params = {
         'bbox': f'{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}',
         'bboxSR': 4326,
         'size': '1000,1000',
         'imageSR': 3857,
-        'format': 'png',
+        'format': ESRI_FORMATS['png'],
         'f': 'json'
     }
-    response = requests.get(url, params=params)
+    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
 
-def get_esri_terrain_url(bbox, service_name):
-    url = f"https://elevation.arcgis.com/arcgis/rest/services/{service_name}/ImageServer/exportImage"
+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': 'tiff',
+        'format': ESRI_FORMATS['tiff'],
         'pixelType': 'F32',
         'noDataInterpretation': 'esriNoDataMatchAny',
         'interpolation': '+RSP_BilinearInterpolation',
         'f': 'json'
     }
-    response = requests.get(url, params=params)
+    response = requests.get(f"{service_url}/exportImage", params=params)
     if response.status_code == 200:
         result = response.json()
         if 'href' in result: