Update app.py

app.py

@@ -6,6 +6,7 @@ from geopy.geocoders import Nominatim
 import osmnx as ox
 import folium
 import branca
+import pandas as pd
 
 # --- Initial settings ---
 geolocator = Nominatim(user_agent="gradio_osm_app")
@@ -17,15 +18,117 @@ os.makedirs(DOWNLOAD_DIR, exist_ok=True)
 def slugify(name):
     return re.sub(r"[^0-9A-Za-z]+", "_", name).strip("_")
 
+# --------- Utilidades para salvar GPKG sem erros ----------
+def _is_complex_obj(v):
+    # Tipos que o OGR não aceita direto como campo (list, dict, set, tuple, bytes)
+    return isinstance(v, (list, dict, tuple, set, bytes))
+
+def clean_for_gpkg(gdf):
+    """Sanitiza colunas e dtypes para gravação segura em GPKG."""
+    gdf = gdf.copy()
+
+    # CRS
+    if getattr(gdf, "crs", None) is None:
+        try:
+            gdf.set_crs(4326, inplace=True)
+        except Exception:
+            pass
+
+    # Nomes de colunas seguros e não muito longos
+    gdf.columns = (
+        pd.Index(gdf.columns)
+        .map(str)
+        .str.replace(r"[^0-9a-zA-Z_]", "_", regex=True)
+        .str.replace(r"_{2,}", "_", regex=True)
+        .str.strip("_")
+        .str.slice(0, 60)
+    )
+
+    # Converter dtypes problemáticos
+    for col in gdf.columns:
+        if col == gdf.geometry.name:
+            continue
+        dt = gdf[col].dtype
+
+        # Pandas tipo string nativo ajuda a evitar NaN/None
+        if dt == "object":
+            # Se houver qualquer valor complexo, vira string integral
+            if gdf[col].apply(_is_complex_obj).any():
+                gdf[col] = gdf[col].astype(str)
+            else:
+                # Objetos simples (str/num/None) -> string estável
+                gdf[col] = gdf[col].astype("string")
+
+        # Inteiros nulos (Int64) -> float64 (OGR lida melhor) ou string
+        if pd.api.types.is_integer_dtype(dt) and str(dt).startswith("Int"):
+            gdf[col] = gdf[col].astype("float64")
+
+        # Booleans com nulos -> string "true/false" para evitar falhas
+        if pd.api.types.is_bool_dtype(dt):
+            if gdf[col].isna().any():
+                gdf[col] = gdf[col].astype("string").fillna("")
+            else:
+                # bool puro costuma funcionar, mantém
+                pass
+
+        # Datetime -> manter como datetime64[ns]; OGR aceita (como DateTime)
+        # Se quiser, pode converter para string ISO:
+        # if pd.api.types.is_datetime64_any_dtype(dt):
+        #     gdf[col] = gdf[col].dt.strftime("%Y-%m-%d %H:%M:%S").astype("string")
+
+        # Preencher NaN em strings
+        if gdf[col].dtype == "string":
+            gdf[col] = gdf[col].fillna("")
+
+    return gdf
+
+def try_to_file(gdf, path, driver="GPKG"):
+    """Tenta salvar; em caso de erro por campo, remove apenas o campo problemático e tenta novamente."""
+    try:
+        gdf.to_file(path, driver=driver)
+        return
+    except Exception as e:
+        msg = str(e)
+        # Detecta qual campo quebrou (mensagem típica do pyogrio/OGR)
+        # Ex.: "Error adding field 'fixme' to layer"
+        m = re.search(r"field '([^']+)'", msg)
+        if m:
+            bad = m.group(1)
+            if bad in gdf.columns:
+                gdf2 = gdf.drop(columns=[bad])
+                gdf2.to_file(path, driver=driver)
+                return
+        # Se não identificar, relança
+        raise
+
 def ensure_saved(gdf, slug, layer):
-    if gdf.empty:
+    if gdf is None or gdf.empty:
         return
     filename = f"{slug}_{layer}.gpkg"
     path = os.path.join(DOWNLOAD_DIR, filename)
     if os.path.exists(path):
         os.remove(path)
-    gdf.to_file(path, driver="GPKG")
 
+    gdf_clean = clean_for_gpkg(gdf)
+
+    # Fallback final: se ainda der erro, tenta remover colunas 'problemáticas' comuns em OSM
+    try:
+        try_to_file(gdf_clean, path, driver="GPKG")
+    except Exception:
+        # Remove colunas muito propensas a erro
+        drop_candidates = [c for c in gdf_clean.columns if c.lower() in {"fixme", "note", "source_ref"}]
+        if drop_candidates:
+            gdf_clean2 = gdf_clean.drop(columns=drop_candidates, errors="ignore")
+            try_to_file(gdf_clean2, path, driver="GPKG")
+        else:
+            # Sem pistas: tenta converter tudo não-geom para string como último recurso
+            gdf_last = gdf_clean.copy()
+            for c in gdf_last.columns:
+                if c != gdf_last.geometry.name:
+                    gdf_last[c] = gdf_last[c].astype(str)
+            try_to_file(gdf_last, path, driver="GPKG")
+
+# --------- UI / Lógica principal ----------
 def make_legend(selected_layers):
     color_map = {
         "Highways": "yellow",
@@ -68,7 +171,7 @@ style_funcs = {
 
 def map_with_layers(place_name, cb_highways, cb_buildings, cb_school,
                     cb_fire, cb_hospital, cb_police, cb_rest, cb_hotels, cb_monuments):
-    if not place_name.strip():
+    if not place_name or not place_name.strip():
         yield None, "❌ Please enter a valid place name."
         return
     slug = slugify(place_name)
@@ -92,10 +195,14 @@ def map_with_layers(place_name, cb_highways, cb_buildings, cb_school,
             ensure_saved(gdf, slug, 'highways')
 
     tag_map = {
-        'Buildings': {'building': True}, 'School': {'amenity': 'school'},
-        'Fire Station': {'amenity': 'fire_station'}, 'Hospital': {'amenity': 'hospital'},
-        'Police Station': {'amenity': 'police'}, 'Restaurants': {'amenity': 'restaurant'},
-        'Hotels': {'tourism': 'hotel'}, 'Monuments': {'historic': 'monument'}
+        'Buildings': {'building': True},
+        'School': {'amenity': 'school'},
+        'Fire Station': {'amenity': 'fire_station'},
+        'Hospital': {'amenity': 'hospital'},
+        'Police Station': {'amenity': 'police'},
+        'Restaurants': {'amenity': 'restaurant'},
+        'Hotels': {'tourism': 'hotel'},
+        'Monuments': {'historic': 'monument'}
     }
     flags = [cb_buildings, cb_school, cb_fire, cb_hospital,
              cb_police, cb_rest, cb_hotels, cb_monuments]
@@ -103,6 +210,7 @@ def map_with_layers(place_name, cb_highways, cb_buildings, cb_school,
         if flag:
             yield None, f"🔄 Downloading {name}..."
             gdf2 = ox.features_from_polygon(poly, tags)
+            # Apenas polígonos para essas camadas
             gdf2 = gdf2[gdf2.geometry.type.isin(['Polygon', 'MultiPolygon'])]
             if not gdf2.empty:
                 layers[name] = gdf2
@@ -115,7 +223,7 @@ def map_with_layers(place_name, cb_highways, cb_buildings, cb_school,
             continue
         has_name = 'name' in gdf.columns and gdf['name'].notna().any()
         cols = ['geometry', 'name'] if has_name else ['geometry']
-        gj = folium.GeoJson(gdf[cols], name=name, style_function=style_funcs[name])
+        gj = folium.GeoJson(gdf[cols], name=name, style_function=style_funcs.get(name, lambda f: {}))
         if has_name:
             gj.add_child(folium.GeoJsonPopup(fields=['name'], labels=False))
         gj.add_to(m)
@@ -230,3 +338,4 @@ with gr.Blocks(title="Geoeasy View") as demo:
 
 if __name__ == '__main__':
     demo.launch()
+