Update app.py

app.py

@@ -64,6 +64,8 @@ def get_vehicle_locations_and_occupancy(vehicle_numbers):
     return results
 
 def get_vehicle_destinations(route, stopcall):
+    print(f"DEBUG: Fetching vehicle destinations for route: {route}, stopcall: {stopcall}")
+    
     url = f'https://www.transsee.ca/predict?s=ttc.{route}.{stopcall}'
     headers = {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36',
@@ -78,7 +80,9 @@ def get_vehicle_destinations(route, stopcall):
     try:
         response = requests.get(url, headers=headers, timeout=10)
         response.raise_for_status()
+        print("DEBUG: Successfully fetched data from Transsee.")
     except Exception as e:
+        print(f"ERROR: Failed to fetch vehicle data: {e}")
         return jsonify({"error": f"Failed to fetch vehicle data: {e}"}), 500
     
     soup = BeautifulSoup(response.text, 'html.parser')
@@ -89,13 +93,20 @@ def get_vehicle_destinations(route, stopcall):
     dest_par = soup.find('p', id=pattern)
     
     if dest_par:
+        print(f"DEBUG: Found destination paragraph with id: {dest_par['id']}")
         contents = dest_par.contents
-        if " going " in contents:
-            idx = contents.index(" going ")
-            destination_text = dest_par.contents[idx + 2].strip()
+        print(f"DEBUG: Contents: {contents}")
+        if len(contents) > 1 and "going" in contents[1]:
+            stuff = contents[1].strip().split(" ")
+            if len(stuff) > 1: branch = stuff[1]
+            destination_text = dest_par.contents[3].strip()
             # Remove directional prefixes
             destination_text = re.sub(r'^(North|South|East|West)\s+', '', destination_text, flags=re.IGNORECASE)
-            vehicle_info['destination'] = destination_text
+            if branch:
+                vehicle_info['destination'] = branch + " " + destination_text
+            else:
+                vehicle_info['destination'] = destination_text
+            print(f"DEBUG: Extracted destination text: {destination_text}")
         else:
             vehicle_info['destination'] = []
             new_pattern = re.compile(rf'^{route}_{stopcall}\d*_\d*$')
@@ -105,20 +116,25 @@ def get_vehicle_destinations(route, stopcall):
                 vehicle_link = p_tag.find('a', href="#MapMain")
                 if vehicle_link and vehicle_link.text.strip().isdigit():
                     vehicle_data['vehicle_number'] = vehicle_link.text.strip()
+                    print(f"DEBUG: Found vehicle number: {vehicle_data['vehicle_number']}")
                 else:
                     # Case 2: Vehicle number is in plain text like "Vehicle 3417 Load"
                     text = p_tag.get_text()
                     match = re.search(r'Vehicle\s+(\d+)', text)
                     if match:
                         vehicle_data['vehicle_number'] = match.group(1)
+                        print(f"DEBUG: Extracted vehicle number: {vehicle_data['vehicle_number']}")
                 span_element = p_tag.find('span', class_='tsfont')
                 if span_element:
                     destination_text = span_element.next_sibling.strip()
                     branch = span_element.previous_sibling.strip()
                     # Remove directional prefixes
-                    destination_text = re.sub(r'^(North|South|East|West) to\s+', '', destination_text, flags=re.IGNORECASE)
+                    destination_text = re.sub(r'^(North|South|East|West)\s+', '', destination_text, flags=re.IGNORECASE)
                     vehicle_data['destination'] = branch + " " + destination_text
+                    print(f"DEBUG: Extracted destination: {vehicle_data['destination']}")
                 vehicle_info['destination'].append(vehicle_data)
+    else:
+        print("WARNING: No destination paragraph found.")
 
     return vehicle_info
 
@@ -295,7 +311,7 @@ def destinations():
     if not route:
         return jsonify({'error': 'route is required'}), 400
     info = get_vehicle_destinations(stopCall, route)
-    return jsonify(info)
+    return jsonify({'vehicles': info})
     
 @app.route('/test_destinations')
 def test_destinations():