KeshavRa commited on
Commit
2004733
·
verified ·
1 Parent(s): d98e4ef

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +6 -5
app.py CHANGED
@@ -239,18 +239,19 @@ else:
239
 
240
  # calculate distances between zipcodes
241
  if data['Zip Code'] != "Unsure":
242
- geocoding_api_key = os.environ['OpenWeather_API_KEY']
243
 
244
- shelters_coordinates = shelters.apply(lambda row: get_coordinates(row['Zip Code'], geocoding_api_key), axis=1).tolist()
245
- user_coordinates = get_coordinates(data['Zip Code'], geocoding_api_key)
246
 
247
  distances = []
248
  for coordinates in shelters_coordinates:
249
  distances.append(haversine(coordinates[0], coordinates[1], user_coordinates[0], user_coordinates[1]))
250
 
251
- max = max(distances) if (max(distances) != 0) else 1
252
- shelters['zipcode_score'] = [d / max for d in distances]
253
  scores.append('zipcode_score')
 
254
 
255
  # get urgency scores
256
  urgency_scores = shelters.apply(lambda row: get_urgency_score(data['Urgency'], row['Urgency']), axis=1).tolist()
 
239
 
240
  # calculate distances between zipcodes
241
  if data['Zip Code'] != "Unsure":
242
+ geocoding_api_key = os.environ['GoogleAPI']
243
 
244
+ shelters_coordinates = shelters.apply(lambda row: geocode_address(f"{row['Address']}, {row['City']}, CA {row['Zip Code']}", geocoding_api_key), axis=1).tolist()
245
+ user_coordinates = get_coordinates(f"{data['City']}, CA {data['Zip Code']}", geocoding_api_key)
246
 
247
  distances = []
248
  for coordinates in shelters_coordinates:
249
  distances.append(haversine(coordinates[0], coordinates[1], user_coordinates[0], user_coordinates[1]))
250
 
251
+ max_d = max(distances) if (max(distances) != 0) else 1
252
+ shelters['zipcode_score'] = [d / max_d for d in distances]
253
  scores.append('zipcode_score')
254
+ print('zipcode_score')
255
 
256
  # get urgency scores
257
  urgency_scores = shelters.apply(lambda row: get_urgency_score(data['Urgency'], row['Urgency']), axis=1).tolist()