UI klart?

app.py

@@ -220,6 +220,7 @@ def visualize(filtered_data, stop_name):
         if row["stop_name"] == stop_name:
             folium.Marker(
                 [row['stop_lat'], row['stop_lon']],
+            
                 popup=f"Bus stop: {row['stop_name']} Bus occupancy: {categories[row['vehicle_occupancystatus']] }",
                 icon = folium.Icon(color="darkpurple", icon="bus-simple", prefix="fa")
             ).add_to(m)
@@ -233,6 +234,17 @@ def visualize(filtered_data, stop_name):
     # Display the map
     st_folium(m, width=700, height=500)
 
+def drop_the_duplicates(df):
+    
+    df = df.drop_duplicates("datetime")
+    df["previous"] = df["datetime"].shift(1)
+    df = df[((df["datetime"] - df["previous"]) > timedelta(minutes=3)) | (df["previous"].isna())]
+
+    return df
+
+
+
+
 # Streamlit UI
 def main():
     st.title("Wheely Fun Times - Bus Occupancy Explorer")
@@ -288,16 +300,14 @@ def main():
         long_names = list(pd.unique(route["route_long_name"]))
         if len(long_names)==1:
             bus = long_names[0]
-            st.write("### Selected Bus")
-            st.write(f"{search}: {bus}")
+            st.write(f"### Selected Bus: {search} {bus}")
         else:
             bus = st.sidebar.selectbox(
             "Pick bus route:",
             options=long_names,
             help="Select one bus to view details."
             )
-            st.write("### Selected Bus")
-            st.write(f"{search}: {bus}")
+            st.write(f"### Selected Bus: {search} {bus}")
         
         # Streamlit checkbox to toggle bus direction
         if "direction" not in st.session_state:
@@ -339,16 +349,6 @@ def main():
         start_time = st.sidebar.time_input("Select a start time", value=None)
         end_time = st.sidebar.time_input("Select an end time", value=None)
 
-        
-        
-        #TODO remove
-        #trip_ids = list(trips["trip_id"])
-        #plot_df = st.session_state.data[st.session_state.data["trip_id"]==trip_ids[0]]
-
-        #TODO hållsplats
-        #Kolla på route_id för att plocka alla hållplatser
-
-
 
         print(f"start time {type(start_time)}")
         print(f"end time {type(end_time)}")
@@ -357,32 +357,28 @@ def main():
         if start_time != None and end_time != None:
             #TODO hur filtrera på tid?
             st.write(f"Displaying buses between {start_time.strftime('%H:%M')} and {end_time.strftime('%H:%M')} the {day_choice}")
-            """selected_trips = bus_trips[(bus_trips["datetime"] >= datetime.combine(date_options[day_choice], start_time)) 
-                                       & (bus_trips["datetime"] <= datetime.combine(date_options[day_choice], end_time))
-                                       & (bus_trips["direction_id"] == st.session_state.direction )]"""
+        
             selected_trips = bus_trips[(bus_trips["datetime"] >= datetime.combine(date_options[day_choice], start_time)) 
                                        & (bus_trips["datetime"] <= datetime.combine(date_options[day_choice], end_time))
                                        & (bus_trips["direction_id"] == st.session_state.direction )
                                        & (bus_trips["stop_name"] == stop_choice)]
             trip_ids = list(pd.unique(selected_trips["trip_id"]))
-
+            #st.write(f"{len(trip_ids)} buses available")
             chioce = selected_trips[selected_trips["stop_name"]==stop_choice]
-            chioce.head()
+            #chioce.head()
             #TODO ta bort stop_name:)
             chioce = chioce[["trip_id", "stop_name", "datetime"]]
             #Ev lägga stop_chioce i session_state
 
             chioce = chioce.sort_values(by=["datetime"])
-            chioce = chioce.drop_duplicates("datetime")
+            chioce = drop_the_duplicates(chioce)
+            
+            st.write(f"{chioce['trip_id'].nunique()} buses available")
 
             for idx, row in chioce.iterrows():
-                st.write(f"The bus arrives at {row['stop_name']} at {row['datetime'].strftime('%H:%M')}")
+                #st.write(f"The bus arrives at {row['stop_name']} at {row['datetime'].strftime('%H:%M')}")
                 plot_graph_title(st.session_state.data[st.session_state.data["trip_id"]==row["trip_id"]], row["stop_name"], row['datetime'].strftime('%H:%M'))
-
-            st.write(f"Length {len(trip_ids)}")
-            for id in trip_ids:
-                plot_graph(st.session_state.data[st.session_state.data["trip_id"]==id])
-                visualize(st.session_state.data[st.session_state.data["trip_id"]==id], stop_choice)
+                visualize(st.session_state.data[st.session_state.data["trip_id"]==row["trip_id"]], stop_choice)
             
 
 
@@ -392,9 +388,9 @@ def main():
     
 
     # Display data and graphs
-    if st.session_state.data is not None:
+    #if st.session_state.data is not None:
         #plot_graphs(st.session_state.data)
-        st.write("Hi")
+        
 
 main()