elli-teu commited on
Commit
cc58789
·
1 Parent(s): 8769306

Start på försök att ändra loggan

Browse files
Files changed (1) hide show
  1. app.py +15 -7
app.py CHANGED
@@ -196,7 +196,7 @@ def plot_graph_title(plot_df, stop, time):
196
  st.altair_chart(chart, use_container_width=True)
197
 
198
 
199
- def visualize(filtered_data):
200
  import folium
201
  from streamlit_folium import st_folium
202
 
@@ -217,11 +217,18 @@ def visualize(filtered_data):
217
 
218
  # Add bus stop markers based on filtered data
219
  for idx, row in filtered_data.iterrows():
220
- folium.Marker(
221
- [row['stop_lat'], row['stop_lon']],
222
- popup=f"Bus stop: {row['stop_name']} Bus occupancy: {categories[row['vehicle_occupancystatus']] }",
223
- icon = folium.Icon(icon="bus-simple", prefix="fa")
224
- ).add_to(m)
 
 
 
 
 
 
 
225
 
226
  # Display the map
227
  st_folium(m, width=700, height=500)
@@ -361,6 +368,7 @@ def main():
361
 
362
  chioce = selected_trips[selected_trips["stop_name"]==stop_choice]
363
  chioce.head()
 
364
  chioce = chioce[["trip_id", "stop_name", "datetime"]]
365
  #Ev lägga stop_chioce i session_state
366
 
@@ -374,7 +382,7 @@ def main():
374
  st.write(f"Length {len(trip_ids)}")
375
  for id in trip_ids:
376
  plot_graph(st.session_state.data[st.session_state.data["trip_id"]==id])
377
- visualize(st.session_state.data[st.session_state.data["trip_id"]==id])
378
 
379
 
380
 
 
196
  st.altair_chart(chart, use_container_width=True)
197
 
198
 
199
+ def visualize(filtered_data, stop_name):
200
  import folium
201
  from streamlit_folium import st_folium
202
 
 
217
 
218
  # Add bus stop markers based on filtered data
219
  for idx, row in filtered_data.iterrows():
220
+ if row["stop_name"] == stop_name:
221
+ folium.Marker(
222
+ [row['stop_lat'], row['stop_lon']],
223
+ popup=f"Bus stop: {row['stop_name']} Bus occupancy: {categories[row['vehicle_occupancystatus']] }",
224
+ icon = folium.Icon(colour="yellow", icon="bus-simple", prefix="fa")
225
+ ).add_to(m)
226
+ else:
227
+ folium.Marker(
228
+ [row['stop_lat'], row['stop_lon']],
229
+ popup=f"Bus stop: {row['stop_name']} Bus occupancy: {categories[row['vehicle_occupancystatus']] }",
230
+ icon = folium.Icon(icon="bus-simple", prefix="fa")
231
+ ).add_to(m)
232
 
233
  # Display the map
234
  st_folium(m, width=700, height=500)
 
368
 
369
  chioce = selected_trips[selected_trips["stop_name"]==stop_choice]
370
  chioce.head()
371
+ #TODO ta bort stop_name:)
372
  chioce = chioce[["trip_id", "stop_name", "datetime"]]
373
  #Ev lägga stop_chioce i session_state
374
 
 
382
  st.write(f"Length {len(trip_ids)}")
383
  for id in trip_ids:
384
  plot_graph(st.session_state.data[st.session_state.data["trip_id"]==id])
385
+ visualize(st.session_state.data[st.session_state.data["trip_id"]==id], stop_choice)
386
 
387
 
388