mattritchey commited on
Commit
6c8879c
·
verified ·
1 Parent(s): d485c0e

Update main.py

Browse files
Files changed (1) hide show
  1. main.py +13 -11
main.py CHANGED
@@ -46,18 +46,20 @@ def geocode_address(address):
46
 
47
  def get_data(address, start_date, end_date, radius_miles, get_max):
48
 
49
- start_date = pd.Timestamp(str(start_date)).strftime('%Y%m%d%H')
50
- end_date = pd.Timestamp(str(end_date)).strftime('%Y%m%d%H')
51
- date_years = pd.date_range(start=start_date[:-2], end=end_date[:-2], freq='M')
52
- date_range_days = pd.date_range(start_date[:-2], end_date[:-2], freq='H')
53
- years = list(set([d.year for d in date_years]))
54
-
55
- if len(years) == 0:
56
- years = [pd.Timestamp(start_date).year]
57
 
58
  # Geocode Address
59
- lat, lon= geocode_address(address)
60
-
 
 
61
 
62
 
63
  # Convert Lat Lon to row & col on Array
@@ -126,7 +128,7 @@ def get_data(address, start_date, end_date, radius_miles, get_max):
126
  # df_data['Date'] = df_data['Date'].dt.strftime('%Y-%m-%d:%H')
127
 
128
  # return df_data
129
- return lat, lon, crs_dic, row, col
130
 
131
  @app.get('/APCP_Docker_Data')
132
  async def predict(address: str, start_date: str, end_date: str, radius_miles: int, get_max: bool):
 
46
 
47
  def get_data(address, start_date, end_date, radius_miles, get_max):
48
 
49
+ # start_date = pd.Timestamp(str(start_date)).strftime('%Y%m%d%H')
50
+ # end_date = pd.Timestamp(str(end_date)).strftime('%Y%m%d%H')
51
+ # date_years = pd.date_range(start=start_date[:-2], end=end_date[:-2], freq='M')
52
+ # date_range_days = pd.date_range(start_date[:-2], end_date[:-2], freq='H')
53
+ # years = list(set([d.year for d in date_years]))
54
+
55
+ # if len(years) == 0:
56
+ # years = [pd.Timestamp(start_date).year]
57
 
58
  # Geocode Address
59
+ try:
60
+ lat, lon= geocode_address(address)
61
+ except:
62
+ lat, lon= None,None
63
 
64
 
65
  # Convert Lat Lon to row & col on Array
 
128
  # df_data['Date'] = df_data['Date'].dt.strftime('%Y-%m-%d:%H')
129
 
130
  # return df_data
131
+ return lat, lon, row, col
132
 
133
  @app.get('/APCP_Docker_Data')
134
  async def predict(address: str, start_date: str, end_date: str, radius_miles: int, get_max: bool):