Update app.py

app.py

@@ -1,7 +1,8 @@
-# app.py
+# app.py - VERSÃO FINAL CORRIGIDA
 import os
 import re
 import zipfile
+import tempfile
 import gradio as gr
 from geopy.geocoders import Nominatim
 import osmnx as ox
@@ -14,9 +15,18 @@ import geopandas as gpd
 geolocator = Nominatim(user_agent="gradio_osm_app")
 ox.settings.log_console = False
 
-DOWNLOAD_DIR = "/tmp/download"
+# CORRIGIDO: Usar diretório de trabalho atual ou temp do sistema
+# Opção 1: Usar diretório "downloads" no diretório de trabalho atual
+DOWNLOAD_DIR = os.path.join(os.getcwd(), "downloads")
 os.makedirs(DOWNLOAD_DIR, exist_ok=True)
 
+# Se o diretório de trabalho não for acessível, usar temp do sistema
+if not os.access(DOWNLOAD_DIR, os.W_OK):
+    DOWNLOAD_DIR = tempfile.gettempdir()
+    print(f"⚠️ Usando diretório temporário do sistema: {DOWNLOAD_DIR}")
+else:
+    print(f"✅ Usando diretório de downloads: {DOWNLOAD_DIR}")
+
 def slugify(name: str) -> str:
     return re.sub(r"[^0-9A-Za-z]+", "_", name).strip("_")
 
@@ -138,6 +148,7 @@ def ensure_saved(gdf: gpd.GeoDataFrame, slug: str, layer: str):
 
     try:
         try_to_file(gdf_clean, path, driver="GPKG")
+        print(f"✅ Arquivo salvo com sucesso: {path}")
     except Exception:
         # Drop common problematic OSM fields as a second attempt
         drop_candidates = [c for c in gdf_clean.columns if c.lower() in {"fixme", "note", "source_ref"}]
@@ -151,6 +162,7 @@ def ensure_saved(gdf: gpd.GeoDataFrame, slug: str, layer: str):
                 if c != gdf_last.geometry.name:
                     gdf_last[c] = gdf_last[c].astype(str)
             try_to_file(gdf_last, path, driver="GPKG")
+        print(f"✅ Arquivo salvo com sucesso (com tratamento): {path}")
 
 # --------- UI / main logic ----------
 def make_legend(selected_layers):
@@ -210,13 +222,19 @@ def map_with_layers(place_name, cb_highways, cb_buildings, cb_school,
         return
 
     layers = {}
+    
+    # Salvar highways com o nome correto
     if cb_highways:
         yield None, "🔄 Downloading Highways..."
-        G = ox.graph_from_polygon(poly, network_type="all", simplify=True)
-        gdf = ox.graph_to_gdfs(G, nodes=False, edges=True)
-        if not gdf.empty:
-            layers['Highways'] = gdf
-            ensure_saved(gdf, slug, 'highways')
+        try:
+            G = ox.graph_from_polygon(poly, network_type="all", simplify=True)
+            gdf = ox.graph_to_gdfs(G, nodes=False, edges=True)
+            if not gdf.empty:
+                layers['Highways'] = gdf
+                ensure_saved(gdf, slug, 'highways')
+                yield None, f"✅ Highways downloaded: {len(gdf)} features"
+        except Exception as e:
+            yield None, f"⚠️ Highways error: {e}"
 
     tag_map = {
         'Buildings': {'building': True},
@@ -233,12 +251,17 @@ def map_with_layers(place_name, cb_highways, cb_buildings, cb_school,
     for (name, tags), flag in zip(tag_map.items(), flags):
         if flag:
             yield None, f"🔄 Downloading {name}..."
-            gdf2 = ox.features_from_polygon(poly, tags)
-            # Only polygons for these layers
-            gdf2 = gdf2[gdf2.geometry.type.isin(['Polygon', 'MultiPolygon'])]
-            if not gdf2.empty:
-                layers[name] = gdf2
-                ensure_saved(gdf2, slug, name.replace(' ', '').lower())
+            try:
+                gdf2 = ox.features_from_polygon(poly, tags)
+                # Only polygons for these layers
+                gdf2 = gdf2[gdf2.geometry.type.isin(['Polygon', 'MultiPolygon'])]
+                if not gdf2.empty:
+                    layers[name] = gdf2
+                    layer_name = name.replace(' ', '').lower()
+                    ensure_saved(gdf2, slug, layer_name)
+                    yield None, f"✅ {name} downloaded: {len(gdf2)} features"
+            except Exception as e:
+                yield None, f"⚠️ {name} error: {e}"
 
     yield None, "🔄 Rendering map..."
     m = folium.Map([lat, lon], zoom_start=13, tiles='CartoDB Dark_Matter')
@@ -271,16 +294,29 @@ def download_data(place_name, cb_highways, cb_buildings, cb_school,
             return zip_path
 
         files = []
-        for layer, flag in zip(
-            ['highways', 'buildings', 'school', 'fire_station', 'hospital',
-             'police_station', 'restaurants', 'hotels', 'monuments'],
-            [cb_highways, cb_buildings, cb_school, cb_fire, cb_hospital,
-             cb_police, cb_rest, cb_hotels, cb_monuments]
-        ):
+        
+        # Mapeamento consistente de nomes de camadas
+        layer_mapping = {
+            'highways': cb_highways,
+            'buildings': cb_buildings,
+            'school': cb_school,
+            'fire_station': cb_fire,
+            'hospital': cb_hospital,
+            'police_station': cb_police,
+            'restaurants': cb_rest,
+            'hotels': cb_hotels,
+            'monuments': cb_monuments
+        }
+        
+        for layer, flag in layer_mapping.items():
             if flag:
                 path = os.path.join(DOWNLOAD_DIR, f"{slug}_{layer}.gpkg")
                 if os.path.exists(path):
+                    print(f"✅ Arquivo encontrado: {path}")
                     files.append(path)
+                else:
+                    print(f"⚠️ Arquivo não encontrado: {path}")
+        
         html_path = os.path.join(DOWNLOAD_DIR, f"{slug}_map.html")
         if os.path.exists(html_path):
             files.append(html_path)
@@ -297,7 +333,6 @@ def download_data(place_name, cb_highways, cb_buildings, cb_school,
 
         print("ZIP gerado com sucesso:", zip_path)
         return zip_path
-
     except Exception as e:
         print("Erro ao gerar o ZIP:", str(e))
         raise gr.Error(f"❌ Download failed: {e}")
@@ -318,7 +353,7 @@ with gr.Blocks(title="Geoeasy View") as demo:
               <h1 id="app-title">OSM View</h1>
             </div>
             """)
-            inp = gr.Textbox(label='Place', placeholder='e.g.: Porto, Portugal')
+            inp = gr.Textbox(label='Place', placeholder='e.g.: Ellwangen, Germany')
             with gr.Row():
                 cb_highways  = gr.Checkbox(label='Highways', value=True)
                 cb_buildings = gr.Checkbox(label='Buildings', value=True)
@@ -343,7 +378,6 @@ with gr.Blocks(title="Geoeasy View") as demo:
         with gr.TabItem('Taginfo'):
             gr.Markdown('''
 **Most used keys (Taginfo)**
-
 | Position | Key        | Approximate usage¹         |
 |----------|------------|----------------------------|
 | 1        | `highway`  | ~58 million geometries     |
@@ -356,9 +390,9 @@ with gr.Blocks(title="Geoeasy View") as demo:
 | 8        | `amenity`  | ~16 million geometries     |
 | 9        | `place`    | ~12 million geometries     |
 | 10       | `power`    | ~14 million geometries     |
-
 ¹ Approximate values from daily Taginfo reports.
 ''')
 
 if __name__ == '__main__':
-    demo.launch()
+    # CORRIGIDO: Adicionar allowed_paths para permitir downloads do diretório de downloads
+    demo.launch(allowed_paths=[DOWNLOAD_DIR])