Update pages/12_🌲_VertXtractor.py

pages/12_🌲_VertXtractor.py

@@ -19,10 +19,19 @@ def get_swisstopo_collections():
         st.error("Impossible de récupérer les collections Swisstopo")
         return {}
 
-SWISSTOPO_LAYERS = get_swisstopo_collections()
+SWISSTOPO_ALL = get_swisstopo_collections()
+
+SWISSTOPO_SELECTED = {
+    "SWISSIMAGE 10 cm": {"id": "ch.swisstopo.swissimage-dop10", "source": "swisstopo", "type": "image"},
+    "Carte nationale 1:25'000": {"id": "ch.swisstopo.pixelkarte-farbe-pk25.noscale", "source": "swisstopo", "type": "image"},
+    "MNT": {"id": "ch.swisstopo.swissalti3d", "source": "swisstopo", "type": "raster"},
+    "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"},
+}
 
-LAYERS = {
-    **SWISSTOPO_LAYERS,
+ESRI_LAYERS = {
     "World Imagery": {"id": "World_Imagery", "source": "esri", "type": "image"},
     "World Elevation": {"id": "Elevation/World_Elevation", "source": "esri", "type": "raster"},
     "World Topographic": {"id": "World_Topo_Map", "source": "esri", "type": "image"},
@@ -50,7 +59,10 @@ def get_download_url(bbox, layer_info):
         if data['features']:
             feature = data['features'][0]
             asset_keys = feature['assets'].keys()
-            data_key = 'data' if 'data' in asset_keys else next(iter(asset_keys))
+            if layer_info['id'] == 'ch.swisstopo.swissimage-dop10':
+                data_key = 'rgb' if 'rgb' in asset_keys else 'data'
+            else:
+                data_key = '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"
@@ -74,7 +86,16 @@ def main():
 
     with col1:
         st.subheader("1. Sélectionner les couches")
-        selected_layers = st.multiselect("Couches à extraire", list(LAYERS.keys()))
+        source = st.radio("Source des données", ["Swisstopo (Sélection)", "Swisstopo (Toutes)", "ESRI"])
+        
+        if source == "Swisstopo (Sélection)":
+            layers = SWISSTOPO_SELECTED
+        elif source == "Swisstopo (Toutes)":
+            layers = SWISSTOPO_ALL
+        else:
+            layers = ESRI_LAYERS
+
+        selected_layers = st.multiselect("Couches à extraire", list(layers.keys()))
 
         st.subheader("2. Définir la zone d'intérêt")
         method = st.radio("Méthode", ["Dessiner", "GeoJSON"], horizontal=True)
@@ -95,7 +116,7 @@ def main():
                 st.error("Sélectionnez au moins une couche à extraire.")
             else:
                 for layer_name in selected_layers:
-                    layer_info = LAYERS[layer_name]
+                    layer_info = layers[layer_name]
                     bbox = gpd.GeoDataFrame.from_features(st.session_state['geojson_swiss' if layer_info["source"] == "swisstopo" else 'geojson_wgs84']).total_bounds
                     st.write(f"Traitement de la couche : {layer_name}")
                     st.write(f"Bbox : {bbox}")