bug fix for no traffic discount

constant/hkust_bnb_constant.py

@@ -61,6 +61,12 @@ DISCOUNT_INFO_TEMPLATE = """
 </div>
 """
 
+NO_DISCOUNT_INFO_TEMPLATE = """
+<div style='background-color: #e8f5e9; padding: 8px; margin: 10px 0; border-radius: 4px; border-left: 4px solid #4caf50;'>
+    <p style='margin: 2px 0; font-size: 0.85em;'>Avg. {avg_vehicle_count:.1f} vehicles across {observation_count} observations</p>
+</div>
+"""
+
 TRAFFIC_SPOT_INFO_TEMPLATE = """
 <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;'>
@@ -182,7 +188,7 @@ RELEVANCE_INFO_LISTING = """<p class="listing-info">  Relevance: {relevance_perc
 
 TRAFFIC_DISCOUNT_DISPLAY = """
 <div style='background-color: #e8f5e9; padding: 5px; margin: 5px 0; border-radius: 4px; border-left: 3px solid #4caf50;'>
-    <p style='margin: 2px 0; color: #2e7d32;'><strong>{discount_info}</strong></p>
+    <p style='margin: 2px 0; color: blue;'><strong>{discount_info}</strong></p>
     <p style='margin: 2px 0; font-size: 0.9em;'>Avg. {avg_vehicle_count:.1f} vehicles across {observation_count} observations</p>
 </div>
 """

visualiser/hkust_bnb_visualiser.py

@@ -30,7 +30,8 @@ from constant.hkust_bnb_constant import (
     TRAFFIC_SPOT_INFO_TEMPLATE,
     RELEVANCE_INFO_TEMPLATE,
     POPUP_CONTENT_TEMPLATE,
-    MAP_SCRIPT
+    MAP_SCRIPT,
+    NO_DISCOUNT_INFO_TEMPLATE
 )
 
 class HKUSTBNBVisualiser:
@@ -388,10 +389,16 @@ class HKUSTBNBVisualiser:
             discount_info = ""
             discounted_price = row['price']
 
+            # Inside the create_map_and_data method
             if row['id'] in all_nearest_traffic_spots:
                 nearest_spot, distance = all_nearest_traffic_spots[row['id']]
                 discount_rate = nearest_spot.get_discount_rate()
 
+                # Calculate average vehicle count safely
+                avg_vehicle_count = nearest_spot.avg_vehicle_count
+                if avg_vehicle_count is None:
+                    avg_vehicle_count = "N/A"  # Or calculate it directly here if needed
+
                 if discount_rate > 0:
                     discounted_price = row['price'] * (1 - discount_rate)
                     discount_percentage = int(discount_rate * 100)
@@ -400,7 +407,12 @@ class HKUSTBNBVisualiser:
                         discount_percentage=discount_percentage,
                         original_price=row['price'],
                         discounted_price=discounted_price,
-                        avg_vehicle_count=nearest_spot.avg_vehicle_count,
+                        avg_vehicle_count=avg_vehicle_count,
+                        observation_count=len(nearest_spot.dataset_rows)
+                    )
+                else:
+                    discount_info = NO_DISCOUNT_INFO_TEMPLATE.format(
+                        avg_vehicle_count=avg_vehicle_count,
                         observation_count=len(nearest_spot.dataset_rows)
                     )
 

visualiser/td_traffic_spot_visualiser.py

@@ -92,7 +92,7 @@ class TDTrafficSpot:
     def get_discount_rate(self):
         if self.avg_vehicle_count < 2:
             return 0.20
-        elif self.avg_vehicle_count < 5:
+        elif self.avg_vehicle_count <= 5:
             return 0.10
         else:
             return 0.0
@@ -117,10 +117,7 @@ class TDTrafficSpot:
 
     def create_popup_content(self):
         discount_info = self.get_discount_info()
-        discount_display = ""
-
-        if "discount" in discount_info.lower() and "no" not in discount_info.lower():
-            discount_display = TRAFFIC_DISCOUNT_DISPLAY.format(
+        discount_display = TRAFFIC_DISCOUNT_DISPLAY.format(
                 discount_info=discount_info,
                 avg_vehicle_count=self.avg_vehicle_count,
                 observation_count=len(self.dataset_rows)