Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -18,7 +18,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": "Elevation/World_Elevation", "source": "esri", "type": "raster"},
+    "ESRI - World Elevation": {"id": "WorldElevation/Terrain", "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"},
@@ -47,17 +47,47 @@ 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://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": "html",
-            "imageSR": 4326,
-            "transparent": "true"
-        }
-        return f"{service_url}?{'&'.join([f'{k}={v}' for k, v in params.items()])}"
+        if layer_info["type"] == "image":
+            return get_esri_image_url(bbox, layer_info["id"])
+        elif layer_info["type"] == "raster":
+            return get_esri_terrain_url(bbox, layer_info["id"])
+    return None
+
+def get_esri_image_url(bbox, service_name):
+    url = f"https://services.arcgisonline.com/arcgis/rest/services/{service_name}/MapServer/export"
+    params = {
+        'bbox': f'{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}',
+        'bboxSR': 4326,
+        'size': '1000,1000',
+        'imageSR': 3857,
+        'format': 'png',
+        'f': 'json'
+    }
+    response = requests.get(url, 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"
+    params = {
+        'bbox': f'{bbox[0]},{bbox[1]},{bbox[2]},{bbox[3]}',
+        'bboxSR': 4326,
+        'size': '1000,1000',
+        'imageSR': 3857,
+        'format': 'tiff',
+        'pixelType': 'F32',
+        'noDataInterpretation': 'esriNoDataMatchAny',
+        'interpolation': '+RSP_BilinearInterpolation',
+        'f': 'json'
+    }
+    response = requests.get(url, params=params)
+    if response.status_code == 200:
+        result = response.json()
+        if 'href' in result:
+            return result['href']
     return None
 
 def main():