fix for diff route shortnames with same dest headsigns (#6)

anand-p-r · Dec 2, 2020 · 07c6188 · 07c6188
1 parent c77a52f
commit 07c6188
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/__init__.py b/__init__.py
@@ -152,29 +152,26 @@ def parse_data(data, line_from_user = ""):
 
                             route_dict[DICT_KEY_ARRIVAL] = str(datetime.timedelta(seconds=arrival))
                             route_dict[DICT_KEY_DEST] = route.get("headsign", "")
-
+                            
                             route_dict[DICT_KEY_ROUTE] = ""
                             if route_dict[DICT_KEY_DEST] != "":
                                 for bus in bus_lines:
-                                    patterns = bus.get("patterns", None)
                                     line = bus.get("shortName", None)
 
                                     if line is None:
                                         continue
 
-                                    if patterns is None:
-                                        continue
-
-                                    for pattern in patterns:
-                                        headsign = pattern.get("headsign", None)
-
-                                        if headsign is not None:
-                                            dest_string = route_dict[DICT_KEY_DEST]
-                                            if headsign is not None and dest_string is not None:
-                                                if headsign.lower() in dest_string.lower():
+                                    # Check if the line and trip route names match for this
+                                    # schedule
+                                    trip = route.get("trip", "")
+                                    if trip != "":
+                                        trip_route = trip.get("route", "")
+                                        if trip_route != "":
+                                            trip_route_shortname = trip_route.get("shortName", "")
+                                            if trip_route_shortname != "":
+                                                if trip_route_shortname.lower() == line.lower():
                                                     route_dict[DICT_KEY_ROUTE] = line
 
-
                             routes.append(route_dict)
 
                         parsed_data[DICT_KEY_ROUTES] = routes

diff --git a/const.py b/const.py
@@ -91,6 +91,11 @@
 	  			realtimeState
 	  			serviceDay
 				headsign
+				trip {
+					route {
+						shortName
+					}
+				}
 			}
 		}
 	}