Update app.py

app.py

@@ -10,17 +10,24 @@ import folium
 from branca.colormap import LinearColormap
 
 # Function to add heatmap layer to folium map
-def add_heatmap_layer(map_obj, filtered_data, column_name, colormap_name, radius=15):
-    heat_data = filtered_data[['latitude', 'longitude', column_name]].dropna()
-
-    cmap = LinearColormap(colors=['#9e0142', '#d53e4f', '#f46d43', '#fdae61', '#fee08b', '#ffffbf', '#e6f598', '#abdda4', '#66c2a5', '#3288bd', '#5e4fa2'], vmin=heat_data[column_name].min(), vmax=heat_data[column_name].max())
-
-    # Handle NaN values
-    heat_data = heat_data[~np.isnan(heat_data[column_name])]
-
-    heat_points = heat_data.apply(lambda row: [row['latitude'], row['longitude'], cmap(row[column_name])], axis=1).tolist()
-
-    folium.plugins.HeatMap(heat_points, radius=radius, gradient={0.0: 'blue', 1.0: 'red'}).add_to(map_obj)
+def add_heatmap_layer(map_obj, data, column_name, colormap_name, radius=15):
+    heat_data = data[['latitude', 'longitude', column_name]].dropna()
+    heat_layer = folium.FeatureGroup(name=f'Heatmap - {column_name}')
+
+    cmap = LinearColormap(colors=['blue', 'white', 'red'], vmin=heat_data[column_name].min(), vmax=heat_data[column_name].max())
+
+    for index, row in heat_data.iterrows():
+        folium.CircleMarker(
+            location=[row['latitude'], row['longitude']],
+            radius=radius,
+            fill=True,
+            fill_color=cmap(row[column_name]),
+            fill_opacity=0.7,
+            color='black',
+            weight=0.5,
+        ).add_to(heat_layer)
+
+    heat_layer.add_to(map_obj)
     
 # Function to calculate distance in meters between two coordinates
 def calculate_distance(lat1, lon1, lat2, lon2):
@@ -252,9 +259,9 @@ with st.container():
     folium_layermap = folium.Map(location=[custom_lat, custom_lon], zoom_start=zoom_level, control_scale=True)
 
     # Add heatmap layers for 'Valor_Urb', 'Valor_Eqp', and 'RENDA'
-    add_heatmap_layer(folium_layermap, filtered_data, 'Valor_Urb', 'RdBu_r', radius=15)
-    add_heatmap_layer(folium_layermap, filtered_data, 'Valor_Eqp', 'RdBu_r', radius=15)
-    add_heatmap_layer(folium_layermap, filtered_data, 'RENDA', 'RdBu_r', radius=15)
+    add_heatmap_layer(folium_layermap, filtered_data, 'Valor_Urb', 'RdBu_r')
+    add_heatmap_layer(folium_layermap, filtered_data, 'Valor_Eqp', 'RdBu_r')
+    add_heatmap_layer(folium_layermap, filtered_data, 'RENDA', 'RdBu_r')
 
     # Add layer control
     folium.LayerControl().add_to(folium_layermap)