Added near traffic spot logic

AirbnbMapVisualiser.py

@@ -3,8 +3,10 @@ import pandas as pd
 import folium
 from html import escape
 from sentence_transformers import SentenceTransformer, util
-from TrafficSpot import TrafficSpotManager
+from geopy.distance import geodesic
+import logging
 
+from TrafficSpot import TrafficSpotManager
 
 class AirbnbMapVisualiser:
     def __init__(self):
@@ -22,7 +24,10 @@ class AirbnbMapVisualiser:
             increment=1,
             getmode=oracledb.SPOOL_ATTRVAL_WAIT
         )
+
+        # Initialize TrafficSpotManager
         self.traffic_manager = TrafficSpotManager(self.connection_params)
+        logging.info(f"Traffic spots initialized, {len(self.traffic_manager.traffic_spots)} spots loaded")
 
         # Initialize sentence transformer model
         try:
@@ -45,6 +50,32 @@ class AirbnbMapVisualiser:
             self.cached_listings = {}
             self.cached_embeddings = {}
 
+    def find_nearest_traffic_spot(self, airbnb_lat, airbnb_lng, max_distance_km=1.0):
+        """Find the nearest traffic spot within max_distance_km kilometers of an Airbnb listing"""
+        nearest_spot = None
+        min_distance = float('inf')
+
+        # Check each traffic spot
+        for spot in self.traffic_manager.traffic_spots:
+            if not spot.is_valid():
+                continue
+
+            # Calculate distance in kilometers
+            distance = geodesic(
+                (airbnb_lat, airbnb_lng),
+                (spot.latitude, spot.longitude)
+            ).kilometers
+
+            # Update nearest if this spot is closer and within max distance
+            if distance < min_distance and distance <= max_distance_km:
+                min_distance = distance
+                nearest_spot = spot
+
+        if nearest_spot:
+            return nearest_spot, min_distance
+        else:
+            return None, None
+
     def get_all_neighborhoods(self):
         connection = self.pool.acquire()
         try:
@@ -267,7 +298,6 @@ class AirbnbMapVisualiser:
             return [0.0] * len(df)
 
     def sort_by_relevance(self, df, search_query):
-        """Sort listings by relevance using sentence transformer comparison"""
         if not search_query:
             return df
 
@@ -370,13 +400,54 @@ class AirbnbMapVisualiser:
             tiles='OpenStreetMap'
         )
 
+        # First add all traffic spots if enabled
+        if show_traffic:
+            self.traffic_manager.add_spots_to_map(m)
+
+        # Create a feature group for connection lines
+        lines_group = folium.FeatureGroup(name="Connection Lines")
+        m.add_child(lines_group)
+
+        # Add Airbnb markers
         for idx, row in df.iterrows():
             marker_id = f"marker_{row['id']}"
             reviews = self.get_listing_reviews(row['id'])
             review_button_key = f"review_btn_{row['id']}"
 
+            # Find nearest traffic spot within 1 km
+            nearest_spot, distance = self.find_nearest_traffic_spot(row['latitude'], row['longitude'])
+
+            # Add traffic spot information to popup if found
+            traffic_spot_info = ""
+            if nearest_spot:
+                # Format distance for display (convert to meters if less than 1km)
+                distance_str = f"{distance:.2f} km" if distance >= 0.1 else f"{distance * 1000:.0f} meters"
+
+                traffic_spot_info = f"""
+                    <div class='traffic-spot-info' style='margin: 10px 0; padding: 8px; background-color: #f0f8ff; border-radius: 4px; border-left: 4px solid #4285f4;'>
+                        <p style='margin: 5px 0;'>
+                            <strong>Nearest Traffic Spot:</strong> {escape(str(nearest_spot.key))}
+                            <br/>
+                            <strong>Distance:</strong> {distance_str}
+                        </p>
+                    </div>
+                """
+
+                # Add a line connecting Airbnb to nearest traffic spot
+                folium.PolyLine(
+                    locations=[
+                        [row['latitude'], row['longitude']],
+                        [nearest_spot.latitude, nearest_spot.longitude]
+                    ],
+                    color='blue',
+                    weight=2,
+                    opacity=0.7,
+                    dash_array='5',
+                    tooltip=f"Distance: {distance_str}"
+                ).add_to(lines_group)
+
             relevance_info = ""
-            if search_query and 'relevance_percentage' in row:
+            if search_query and 'relevance_percentage' in row and 'relevance_features' in row:
                 relevance_info = f"""
                     <div class='relevance-info' style='margin: 10px 0; padding: 8px; background-color: #f8f9fa; border-radius: 4px;'>
                         <p style='margin: 5px 0;'>
@@ -396,12 +467,8 @@ class AirbnbMapVisualiser:
                     <p style='margin: 5px 0;'><strong>Room Type:</strong> {escape(str(row['room_type']))}</p>
                     <p style='margin: 5px 0;'><strong>Price:</strong> ${row['price']:.0f}</p>
                     <p style='margin: 5px 0;'><strong>Reviews:</strong> {row['number_of_reviews']:.0f}</p>
+                    {traffic_spot_info}
                     {relevance_info}
-                    <button onclick="streamlit_click('{review_button_key}')" 
-                        style="background-color: #4CAF50; color: white; padding: 8px 15px; border: none; 
-                        border-radius: 4px; cursor: pointer; margin-top: 10px; width: 100%;">
-                        View Reviews ({len(reviews)})
-                    </button>
                 </div>
             """
 
@@ -416,7 +483,30 @@ class AirbnbMapVisualiser:
             if selected_id is not None and row['id'] == selected_id:
                 marker._name = marker_id
 
-        if show_traffic:
-            self.traffic_manager.add_spots_to_map(m)
+        # Add JavaScript function to help navigate to traffic spots
+        folium.Element("""
+            <script>
+            function showTrafficSpot(lat, lng) {
+                // Get the map object
+                var map = document.querySelector('.folium-map')._leaflet_map;
+
+                // Pan to the traffic spot and zoom in
+                map.setView([lat, lng], 18);
+
+                // Find and open the popup for the traffic spot marker
+                map.eachLayer(function(layer) {
+                    if (layer instanceof L.Marker) {
+                        var latLng = layer.getLatLng();
+                        if (Math.abs(latLng.lat - lat) < 0.0001 && Math.abs(latLng.lng - lng) < 0.0001) {
+                            layer.openPopup();
+                        }
+                    }
+                });
+            }
+            </script>
+        """).add_to(m)
+
+        # Add layer control to toggle traffic spots and connection lines
+        folium.LayerControl().add_to(m)
 
         return m, df

TrafficSpot.py

@@ -1,10 +1,9 @@
-import logging
-from datetime import datetime
-from html import escape
 import folium
 import oracledb
-from datasets import load_dataset
+import logging
 import base64
+from html import escape
+from datasets import load_dataset
 
 
 class TrafficSpot:
@@ -121,4 +120,11 @@ class TrafficSpotManager:
 
     def add_spots_to_map(self, folium_map):
         for spot in self.traffic_spots:
-            spot.add_to_map(folium_map)
+            spot.add_to_map(folium_map)
+
+    def get_spot_by_key(self, key):
+        """Get a traffic spot by its key"""
+        for spot in self.traffic_spots:
+            if spot.key == key:
+                return spot
+        return None

app.py

@@ -129,7 +129,7 @@ def main():
         neighborhood = st.selectbox(
             "Select Neighborhood",
             options=visualizer.neighborhoods,
-            index=visualizer.neighborhoods.index("Southern") if "Southern" in visualizer.neighborhoods else 0
+            index=visualizer.neighborhoods.index("Kowloon City") if "Kowloon City" in visualizer.neighborhoods else 0
         )
         show_traffic = st.checkbox("Show Traffic Cameras", value=True)
 
@@ -142,7 +142,7 @@ def main():
             st.session_state.show_review_dialog = False
             st.rerun()
 
-    # Create map and get data
+    # Create map and get data - pass current page information
     m, df = visualizer.create_map_and_data(
         neighborhood,
         show_traffic,

requirements.txt

@@ -15,4 +15,5 @@ pillow~=10.4.0
 timm~=1.0.14
 streamlit_folium~=0.24.0
 watchdog
-sentence_transformers
+sentence_transformers
+geopy