Update app.py

app.py

@@ -658,7 +658,7 @@ def prepare_comparison(city1, district1, neigh1,city2, district2, neigh2):
     # Harita HTML'i
     map_html = create_comparison_map(gdf1, gdf2)
 
-    return stats1, stats2, compare_context, map_html
+    return stats1, stats2, compare_context, map_html,gdf1, gdf2
 
 
 
@@ -822,11 +822,15 @@ def create_comparison_map(gdf1, gdf2):
     return m._repr_html_()
 
 
+
 def run_overpass_to_map(query: str,
                         previous_elements: list | None,
                         previous_spatial: str | None,
                         layer_name: str = "Spatial Query",
-                        layer_color: str = "green"):   # 👈 katman için renk parametresi
+                        layer_color: str = "red",
+                        base_gdf1=None,
+                        base_gdf2=None):
+    
     query = normalize_overpass_query(query) if 'normalize_overpass_query' in globals() else query
 
     if not query or not query.strip():
@@ -881,10 +885,51 @@ def run_overpass_to_map(query: str,
             previous_spatial or "Overpass sonucu: nokta verisi bulunamadı.",
             all_elements,
         )
+    
 
     # ---- Haritayı çiz ----
+    # Önce merkez: mümkünse mahallelerden, yoksa Overpass noktalardan
+    if base_gdf1 is not None and len(base_gdf1) > 0:
+        c = base_gdf1.geometry.iloc[0].centroid
+        center_lat, center_lon = c.y, c.x
+    elif base_gdf2 is not None and len(base_gdf2) > 0:
+        c = base_gdf2.geometry.iloc[0].centroid
+        center_lat, center_lon = c.y, c.x
+    # (aksi halde yukarıda all_elements'tan zaten bulduk)
+
     m = folium.Map(location=[center_lat, center_lon], zoom_start=14)
 
+    # 1. mahalleyi tekrar çiz
+    if base_gdf1 is not None and len(base_gdf1) > 0:
+        name1 = str(base_gdf1.get("neighborhood", ["Mahalle 1"]).iloc[0])
+        folium.GeoJson(
+            base_gdf1.geometry.__geo_interface__,
+            name=name1,
+            style_function=lambda feat: {
+                "color": "red",
+                "fill": False,
+                "weight": 3,
+            },
+        ).add_to(m)
+        pois1 = get_pois_within(base_gdf1)
+        add_poi_markers_to_map(pois1, m, layer_prefix=f"{name1} POI")
+
+    # 2. mahalleyi tekrar çiz
+    if base_gdf2 is not None and len(base_gdf2) > 0:
+        name2 = str(base_gdf2.get("neighborhood", ["Mahalle 2"]).iloc[0])
+        folium.GeoJson(
+            base_gdf2.geometry.__geo_interface__,
+            name=name2,
+            style_function=lambda feat: {
+                "color": "blue",
+                "fill": False,
+                "weight": 3,
+            },
+        ).add_to(m)
+        pois2 = get_pois_within(base_gdf2)
+        add_poi_markers_to_map(pois2, m, layer_prefix=f"{name2} POI")
+
+
     # Burada tek bir "spatial" katman oluşturuyoruz
     fg_nodes = folium.FeatureGroup(
         name=f"{layer_name} - Noktalar",  # katman adı
@@ -952,7 +997,10 @@ def run_overpass_to_map(query: str,
 def llm_overpass_to_map(natural_prompt: str,
                         model_name: str,
                         previous_elements: list | None,
-                        previous_spatial: str | None):
+                        previous_spatial: str | None,
+                        base_gdf1=None,
+                        base_gdf2=None):
+    
     if not natural_prompt or not natural_prompt.strip():
         return (
             "Doğal dil sorgu boş.",
@@ -976,8 +1024,9 @@ def llm_overpass_to_map(natural_prompt: str,
         query,
         previous_elements,
         previous_spatial,
+        base_gdf1=base_gdf1,
+        base_gdf2=base_gdf2,
     )
-
     # 4 output: üretilen query, harita, birikmiş spatial metin, birikmiş element listesi
     return query, map_html, combined_spatial, all_elements
 
@@ -1193,8 +1242,8 @@ with gr.Blocks() as demo:
     compare_state = gr.State("")
     spatial_state = gr.State("")   # son Overpass özetleri
     overpass_elements_state = gr.State([])  # 👈 tüm Overpass sonuçlarını biriktireceğimiz liste
-
-
+    gdf1_state = gr.State(None)  # 1. mahalle geometri
+    gdf2_state = gr.State(None)  # 2. mahalle geometri
 
     with gr.Row():
         # SOL SÜTUN: CHAT
@@ -1380,25 +1429,25 @@ with gr.Blocks() as demo:
             # LLM ile üret + çalıştır (birikimli)
             gen_and_run_btn.click(
                 fn=llm_overpass_to_map,
-                inputs=[osm_nl_prompt, model_dropdown, overpass_elements_state, spatial_state],
+                inputs=[osm_nl_prompt, model_dropdown, overpass_elements_state, spatial_state,
+                        gdf1_state, gdf2_state],
                 outputs=[overpass_box, map_html, spatial_state, overpass_elements_state],
             )
-
             
             # Manuel Overpass çalıştırma (birikimli)
 
             run_overpass_btn.click(
                 fn=run_overpass_to_map,
-                inputs=[overpass_box, overpass_elements_state, spatial_state,layer_color_dd],
+                inputs=[overpass_box, overpass_elements_state, spatial_state,
+                        layer_color_dd, gdf1_state, gdf2_state],
                 outputs=[map_html, spatial_state, overpass_elements_state],
             )
-
+            
             compare_btn.click(
                 fn=prepare_comparison,
-                inputs=[city_in1, district1_in, neigh1_in,city_in1, district2_in, neigh2_in],
-                outputs=[stats1_box, stats2_box, compare_state, map_html],
+                inputs=[city_in1, district1_in, neigh1_in, city_in1, district2_in, neigh2_in],
+                outputs=[stats1_box, stats2_box, compare_state, map_html, gdf1_state, gdf2_state],
             )
 
-
 if __name__ == "__main__":
     demo.launch()