cboettig commited on
Commit
ac1b392
·
1 Parent(s): 0105c7c
Files changed (1) hide show
  1. app.py +23 -18
app.py CHANGED
@@ -26,6 +26,7 @@ import streamlit as st
26
  # SETTING PAGE CONFIG TO WIDE MODE AND ADDING A TITLE AND FAVICON
27
  st.set_page_config(layout="wide", page_title="NYC Ridesharing Demo", page_icon=":taxi:")
28
 
 
29
  # LOAD DATA ONCE
30
  @st.cache_resource
31
  def load_data():
@@ -89,6 +90,7 @@ def filterdata(df, hour_selected):
89
  def mpoint(lat, lon):
90
  return (np.average(lat), np.average(lon))
91
 
 
92
  # FILTER DATA BY HOUR
93
  @st.cache_data
94
  def histdata(df, hr):
@@ -104,8 +106,6 @@ def histdata(df, hr):
104
  # STREAMLIT APP LAYOUT
105
  data = load_data()
106
 
107
- hour_selected = 1
108
-
109
  # LAYING OUT THE TOP SECTION OF THE APP
110
  row1_1, row1_2 = st.columns((2, 3))
111
 
@@ -159,16 +159,20 @@ with row2_1:
159
  )
160
  map(filterdata(data, hour_selected), midpoint[0], midpoint[1], 11)
161
 
162
- map(filterdata(data, hour_selected), midpoint[0], midpoint[1], 11)
163
-
164
- map(filterdata(data, hour_selected), la_guardia[0], la_guardia[1], zoom_level)
165
 
166
- map(filterdata(data, hour_selected), jfk[0], jfk[1], zoom_level)
 
 
167
 
168
- map(filterdata(data, hour_selected), newark[0], newark[1], zoom_level)
 
 
169
 
170
  # CALCULATING DATA FOR THE HISTOGRAM
171
- chart_data = histdata(data, 1)
172
 
173
  # LAYING OUT THE HISTOGRAM SECTION
174
  st.write(
@@ -176,14 +180,15 @@ st.write(
176
  )
177
 
178
  st.altair_chart(
179
- (alt.Chart(chart_data)
180
- .mark_area(
181
- interpolate="step-after",
182
- )
183
- .encode(
184
- x=alt.X("minute:Q", scale=alt.Scale(nice=False)),
185
- y=alt.Y("pickups:Q"),
186
- tooltip=["minute", "pickups"],
187
- )
188
- .configure_mark(opacity=0.2, color="red")
 
189
  )
 
26
  # SETTING PAGE CONFIG TO WIDE MODE AND ADDING A TITLE AND FAVICON
27
  st.set_page_config(layout="wide", page_title="NYC Ridesharing Demo", page_icon=":taxi:")
28
 
29
+
30
  # LOAD DATA ONCE
31
  @st.cache_resource
32
  def load_data():
 
90
  def mpoint(lat, lon):
91
  return (np.average(lat), np.average(lon))
92
 
93
+
94
  # FILTER DATA BY HOUR
95
  @st.cache_data
96
  def histdata(df, hr):
 
106
  # STREAMLIT APP LAYOUT
107
  data = load_data()
108
 
 
 
109
  # LAYING OUT THE TOP SECTION OF THE APP
110
  row1_1, row1_2 = st.columns((2, 3))
111
 
 
159
  )
160
  map(filterdata(data, hour_selected), midpoint[0], midpoint[1], 11)
161
 
162
+ with row2_2:
163
+ st.write("**La Guardia Airport**")
164
+ map(filterdata(data, hour_selected), la_guardia[0], la_guardia[1], zoom_level)
165
 
166
+ with row2_3:
167
+ st.write("**JFK Airport**")
168
+ map(filterdata(data, hour_selected), jfk[0], jfk[1], zoom_level)
169
 
170
+ with row2_4:
171
+ st.write("**Newark Airport**")
172
+ map(filterdata(data, hour_selected), newark[0], newark[1], zoom_level)
173
 
174
  # CALCULATING DATA FOR THE HISTOGRAM
175
+ chart_data = histdata(data, hour_selected)
176
 
177
  # LAYING OUT THE HISTOGRAM SECTION
178
  st.write(
 
180
  )
181
 
182
  st.altair_chart(
183
+ alt.Chart(chart_data)
184
+ .mark_area(
185
+ interpolate="step-after",
186
+ )
187
+ .encode(
188
+ x=alt.X("minute:Q", scale=alt.Scale(nice=False)),
189
+ y=alt.Y("pickups:Q"),
190
+ tooltip=["minute", "pickups"],
191
+ )
192
+ .configure_mark(opacity=0.2, color="red"),
193
+ use_container_width=True,
194
  )