Update app.py

add vehicle destinations

app.py

@@ -19,21 +19,7 @@ reader = easyocr.Reader(
     user_network_directory='/tmp/.EasyOCR'   # ✅ Also tell it where user models are
 )
 
-def get_trip_info(trip_id):
-    try:
-        with open('trips.txt', 'r') as f:
-            for line in f:
-                if trip_id in line:
-                    # Split the line by commas and get the route information
-                    parts = line.strip().split(',')
-                    if len(parts) >= 2:
-                        return parts[3].strip() # third part
-    except Exception as e:
-        print(f"Error reading trips.txt: {e}")
-    return None
-
 def get_vehicle_locations_and_occupancy(vehicle_numbers):
-    print("DEBUG: Called get_vehicle_locations_and_occupancy with vehicle_numbers:", vehicle_numbers)
     url = "https://bustime.ttc.ca/gtfsrt/vehicles?debug"
     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',
@@ -45,59 +31,82 @@ def get_vehicle_locations_and_occupancy(vehicle_numbers):
         'Upgrade-Insecure-Requests': '1'
     }
     try:
-        print("DEBUG: Sending GET request to", url)
         response = requests.get(url, headers=headers, timeout=10)
-        print("DEBUG: Response status code:", response.status_code)
         response.raise_for_status()
     except Exception as e:
-        print("ERROR: Exception during requests.get:", e)
         return jsonify({"error": f"Failed to fetch vehicle data: {e}"}), 500
 
     text = response.text
-    print("DEBUG: Length of response text:", len(text))
-    if len(text) < 1000:
-        print("DEBUG: Response text (first 500 chars):", text[:500])
-
     entities = text.split('entity {')[1:]  # skip the header
-    print("DEBUG: Number of entities found:", len(entities))
 
     # Ensure vehicle_numbers are strings for comparison
     vehicle_numbers = set(str(num) for num in vehicle_numbers)
-    print("DEBUG: vehicle_numbers as strings:", vehicle_numbers)
 
     results = []
-    for idx, entity in enumerate(entities):
+    for entity in entities:
         vehicle_id_matches = re.findall(r'vehicle\s*\{\s*id: "(\d+)"', entity)
         if not vehicle_id_matches:
-            print(f"DEBUG: No vehicle id found in entity {idx}")
             continue
         vehicle_id = vehicle_id_matches[-1]
         if vehicle_id not in vehicle_numbers:
-            print(f"DEBUG: vehicle_id {vehicle_id} not in requested vehicle_numbers")
             continue
 
         lat_match = re.search(r'latitude: (-?[\d\.]+)', entity)
         lon_match = re.search(r'longitude: (-?[\d\.]+)', entity)
         occ_match = re.search(r'occupancy_status: ([A-Z_]+)', entity)
-        trip_id_match = re.search(r'trip_id: "(\d+)"', entity)
-
-        print(f"DEBUG: vehicle_id={vehicle_id}, lat={lat_match.group(1) if lat_match else None}, lon={lon_match.group(1) if lon_match else None}, occ={occ_match.group(1) if occ_match else None}")
-
-        trip_id = trip_id_match.group(1) if trip_id_match else None
-        route_info = get_trip_info(trip_id) if trip_id else None
 
         results.append({
             'vehicle_id': vehicle_id,
             'latitude': float(lat_match.group(1)) if lat_match else None,
             'longitude': float(lon_match.group(1)) if lon_match else None,
-            'occupancy_status': occ_match.group(1) if occ_match else None,
-            #'trip_id': trip_id, # not needed
-            'route_info': route_info
+            'occupancy_status': occ_match.group(1) if occ_match else None
         })
-
-    print("DEBUG: Final results to return:", results)
     return results
 
+def get_vehicle_destinations(vehicle_numbers):
+    # Join vehicle numbers with %2C (URL encoded comma)
+    vehicle_query = '%2C'.join(vehicle_numbers)
+    url = f"https://www.transsee.ca/fleetfind?a=ttc&findtrack=1&q={vehicle_query}&Go=Go"
+    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',
+        'Referer': 'https://www.transsee.ca/',
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+        'Accept-Language': 'en-US,en;q=0.9',
+        'DNT': '1',  # Do Not Track
+        'Connection': 'keep-alive',
+        'Upgrade-Insecure-Requests': '1'
+    }
+    try:
+        response = requests.get(url, headers=headers, timeout=10)
+        response.raise_for_status()
+    except Exception as e:
+        return jsonify({"error": f"Failed to fetch vehicle data: {e}"}), 500
+    
+    soup = BeautifulSoup(response.text, 'html.parser')
+    vehicle_info = {}
+    for vid in vehicle_numbers:
+        p_tag = soup.find('p', id=f'{vid}')
+        if p_tag:
+            # Remove the span with class 'tsfont'
+            for span in p_tag.find_all('span', class_='tsfont'):
+                span.decompose() # no arrows please
+            text = p_tag.get_text(" ", strip=True)
+            # Extract the destination string starting with 'going' up to
+            # ' at ', ' aprchg', ' past', or end of string
+            match = re.search(r'(going.*?)(?= at | aprchg| past|$)', text)
+            if match:
+                destination = match.group(1).strip()
+                # Remove direction words (case-insensitive, as whole words)
+                destination = re.sub(r'\b(going|North|South|East|West)\b', '', destination, flags=re.IGNORECASE)
+                # Remove any extra spaces left behind
+                destination = re.sub(r'\s+', ' ', destination).strip()
+            else:
+                destination = None
+            vehicle_info[vid] = destination
+
+    # Now vehicle_info is a dict mapping vehicle IDs to their info
+    return jsonify(vehicle_info)
+
 @app.route('/', methods=['GET'])
 def health_check():
     return 'Backend is running!', 200
@@ -235,14 +244,24 @@ def vehicle_status():
     vehicle_numbers = data.get('vehicle_numbers')
     if not vehicle_numbers or not isinstance(vehicle_numbers, list):
         return jsonify({'error': 'vehicle_numbers must be a list'}), 400
-
     info = get_vehicle_locations_and_occupancy(vehicle_numbers)
     return jsonify({'vehicles': info})
 
-#@app.route('/test_vehicle', methods=['GET'])
-#def test_vehicle():
-#    info = get_vehicle_locations_and_occupancy(['3433', '1676'])
-#    return info
+@app.route('/destinations', methods=['POST'])
+def destinations():
+    if not request.is_json:
+        return jsonify({'error': 'Request must be JSON'}), 400
+    data = request.get_json()
+    vehicle_numbers = data.get('vehicle_numbers')
+    if not vehicle_numbers or not isinstance(vehicle_numbers, list):
+        return jsonify({'error': 'vehicle_numbers must be a list'}), 400
+    info = get_vehicle_destinations(vehicle_numbers)
+    return jsonify({'vehicles': info})
+    
+#@app.route('/test_destinations')
+#def test_destinations():
+#    return get_vehicle_destinations(['1220', '3640', '9051'])
+
 
 if __name__ == '__main__':
-    app.run(debug=True, port=5000)
+    app.run(debug=True, port=5000)