mattritchey commited on
Commit
b2fb90e
·
1 Parent(s): 3075b14

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +8 -9
app.py CHANGED
@@ -99,13 +99,14 @@ def extract_vertices(gdf):
99
  except:
100
  df = pd.DataFrame({'Lat': [np.nan],
101
  'Lon': [np.nan], })
 
102
  all_data.append(df)
103
- return pd.concat(all_data)
104
 
105
 
106
  #Side Bar
107
  address = st.sidebar.text_input(
108
- "Address", "123 Main St, Sacramento, CA 95670")
109
  date = st.sidebar.date_input("Date", pd.Timestamp(2021, 7, 14), key='date')
110
  number_days_range = st.sidebar.selectbox(
111
  'Within Day Range:', (5, 10, 30, 90, 180))
@@ -132,7 +133,7 @@ start_date_str, end_date_str = start_date.strftime(
132
  '%Y-%m-%d'), end_date.strftime('%Y-%m-%d')
133
  gdf_cut = gdf.query(f"'{start_date_str}'<=DiscoveryDate<='{end_date_str}'")
134
  gdf_cut['DiscoveryDate'] = gdf_cut['DiscoveryDate'].dt.strftime('%Y-%m-%d')
135
- gdf_cut['Incident']=gdf_cut['Incident'].str.strip()
136
 
137
  #Distance to Fire
138
  gdf_cut["Lat_address"] = lat
@@ -157,18 +158,15 @@ indicents = list(gdf_cut['Incident'].values)
157
  incident_edge = st.sidebar.selectbox(
158
  'Find Distance to Closest Edge:', indicents)
159
 
160
- st.header(indicents)
161
- gdf_cut.query(f"Incident=='{incident_edge}'")
162
- gdf_cut[gdf_cut['Incident']==incident_edge]
163
-
164
- vertices = extract_vertices(gdf_cut.query(f"Incident=='{incident_edge}'"))
165
  vertices["Lat_address"] = lat
166
  vertices["Lon_address"] = lon
167
  vertices['Distance'] = [
168
  distance(i) for i in vertices.values]
169
  closest_edge = vertices[vertices['Distance']
170
  == vertices['Distance'].min()].head()
171
-
 
172
  try:
173
 
174
  lon_point, lat_point = closest_edge[['Lon', 'Lat']].values[0]
@@ -190,3 +188,4 @@ with col2:
190
  gdf_cut[['Incident', 'DiscoveryDate', 'Size_acres','Miles to Fire Centroid']]
191
 
192
 
 
 
99
  except:
100
  df = pd.DataFrame({'Lat': [np.nan],
101
  'Lon': [np.nan], })
102
+ df['index_gdf'] = i
103
  all_data.append(df)
104
+ return pd.concat(all_data).query('Lat==Lat').reset_index(drop=1).drop(columns='index_gdf')
105
 
106
 
107
  #Side Bar
108
  address = st.sidebar.text_input(
109
+ "Address", "Sacramento, CA")
110
  date = st.sidebar.date_input("Date", pd.Timestamp(2021, 7, 14), key='date')
111
  number_days_range = st.sidebar.selectbox(
112
  'Within Day Range:', (5, 10, 30, 90, 180))
 
133
  '%Y-%m-%d'), end_date.strftime('%Y-%m-%d')
134
  gdf_cut = gdf.query(f"'{start_date_str}'<=DiscoveryDate<='{end_date_str}'")
135
  gdf_cut['DiscoveryDate'] = gdf_cut['DiscoveryDate'].dt.strftime('%Y-%m-%d')
136
+
137
 
138
  #Distance to Fire
139
  gdf_cut["Lat_address"] = lat
 
158
  incident_edge = st.sidebar.selectbox(
159
  'Find Distance to Closest Edge:', indicents)
160
 
161
+ vertices = extract_vertices(gdf_cut[gdf_cut['Incident']==incident_edge])
 
 
 
 
162
  vertices["Lat_address"] = lat
163
  vertices["Lon_address"] = lon
164
  vertices['Distance'] = [
165
  distance(i) for i in vertices.values]
166
  closest_edge = vertices[vertices['Distance']
167
  == vertices['Distance'].min()].head()
168
+ closest_edge
169
+ vertices
170
  try:
171
 
172
  lon_point, lat_point = closest_edge[['Lon', 'Lat']].values[0]
 
188
  gdf_cut[['Incident', 'DiscoveryDate', 'Size_acres','Miles to Fire Centroid']]
189
 
190
 
191
+