Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -17,9 +17,10 @@ LAYERS = {
     "Carte géologique": {"id": "ch.swisstopo.geologie-geologische_karte", "source": "swisstopo", "type": "image"},
     "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"},
+    "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": "WorldElevation/Terrain", "source": "esri", "type": "raster"},
+    "World Elevation": {"id": "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"},
@@ -38,24 +39,42 @@ def create_geojson_from_box(bbox):
 @st.cache_data
 def get_download_url(bbox, layer_info):
     if layer_info["source"] == "swisstopo":
-        api_url = f"https://data.geo.admin.ch/api/stac/v0.9/collections/{layer_info['id']}/items"
-        params = {"bbox": ",".join(map(str, bbox)), "limit": 1}
-        response = requests.get(api_url, params=params)
-        data = response.json()
-        if data['features']:
-            feature = data['features'][0]
-            asset_keys = feature['assets'].keys()
-            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']
+        if layer_info["type"] == "3d":
+            api_url = "https://data.geo.admin.ch/api/stac/v0.9/collections/ch.swisstopo.swissbuildings3d_3_0/items"
+            params = {
+                "bbox": ",".join(map(str, bbox)),
+                "limit": 1,
+                "datetime": "2023-01-01/2024-12-31"
+            }
+            response = requests.get(api_url, params=params)
+            data = response.json()
+            if data['features']:
+                feature = data['features'][0]
+                asset_keys = feature['assets'].keys()
+                data_key = 'gltf' if 'gltf' in asset_keys else next(iter(asset_keys))
+                return feature['assets'][data_key]['href']
+        else:
+            api_url = f"https://data.geo.admin.ch/api/stac/v0.9/collections/{layer_info['id']}/items"
+            params = {"bbox": ",".join(map(str, bbox)), "limit": 1}
+            response = requests.get(api_url, params=params)
+            data = response.json()
+            if data['features']:
+                feature = data['features'][0]
+                asset_keys = feature['assets'].keys()
+                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']}/ImageServer/exportImage"
+        service_url = f"https://server.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": "tiff",
+            "format": "png",
             "f": "json",
-            "imageSR": 4326
+            "imageSR": 4326,
+            "transparent": "true",
+            "dpi": 96,
+            "world_file": "true"
         }
         try:
             response = requests.get(service_url, params=params)