Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-22 22:39:36 +02:00
Code Issues Releases Activity

fix(geocoding): update search_google function to use new Places API and improve response handling

Browse source
This commit is contained in:
Sean Morley 2025-06-16 17:31:17 -04:00
parent 0636f0ec8c
commit be8ac67161
1 changed files with 37 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

52
backend/server/adventures/geocoding.py
View file

@ -12,21 +12,33 @@ def search_google(query):
if not api_key: if not api_key:
return {"error": "Missing Google Maps API key"} return {"error": "Missing Google Maps API key"}
url = "https://maps.googleapis.com/maps/api/place/textsearch/json" # Updated to use the new Places API (New) endpoint
params = {'query': query, 'key': api_key} url = "https://places.googleapis.com/v1/places:searchText"
response = requests.get(url, params=params, timeout=(2, 5))
headers = {
'Content-Type': 'application/json',
'X-Goog-Api-Key': api_key,
'X-Goog-FieldMask': 'places.displayName.text,places.formattedAddress,places.location,places.types,places.rating,places.userRatingCount'
}
payload = {
"textQuery": query,
"maxResultCount": 20 # Adjust as needed
}
response = requests.post(url, json=payload, headers=headers, timeout=(2, 5))
response.raise_for_status() response.raise_for_status()
data = response.json() data = response.json()
if data.get("status") != "OK":
return { # Check if we have places in the response
"error": f"Google Maps API error: {data.get('status')}", places = data.get("places", [])
"message": data.get("error_message", "") if not places:
} return {"error": "No results found"}
results = [] results = []
for place in data.get("results", []): for place in places:
location = place.get("geometry", {}).get("location", {}) location = place.get("location", {})
types = place.get("types", []) types = place.get("types", [])
primary_type = types[0] if types else None primary_type = types[0] if types else None
category = _extract_google_category(types) category = _extract_google_category(types)
@ -34,15 +46,19 @@ def search_google(query):
importance = None importance = None
rating = place.get("rating") rating = place.get("rating")
ratings_total = place.get("user_ratings_total") ratings_total = place.get("userRatingCount")
if rating is not None and ratings_total: if rating is not None and ratings_total:
importance = round(float(rating) * ratings_total / 100, 2) importance = round(float(rating) * ratings_total / 100, 2)
# Extract display name from the new API structure
display_name_obj = place.get("displayName", {})
name = display_name_obj.get("text") if display_name_obj else None
results.append({ results.append({
"lat": location.get("lat"), "lat": location.get("latitude"),
"lon": location.get("lng"), "lon": location.get("longitude"),
"name": place.get("name"), "name": name,
"display_name": place.get("formatted_address"), "display_name": place.get("formattedAddress"),
"type": primary_type, "type": primary_type,
"category": category, "category": category,
"importance": importance, "importance": importance,
@ -53,7 +69,7 @@ def search_google(query):
if results: if results:
results.sort(key=lambda r: r["importance"] if r["importance"] is not None else 0, reverse=True) results.sort(key=lambda r: r["importance"] if r["importance"] is not None else 0, reverse=True)
return results or {"error": "No results found"} return results
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
return {"error": "Network error while contacting Google Maps", "details": str(e)} return {"error": "Network error while contacting Google Maps", "details": str(e)}
@ -170,6 +186,7 @@ def extractIsoCode(user, data):
if region: if region:
return {"region_id": iso_code, "region": region.name, "country": region.country.name, "country_id": region.country.country_code, "region_visited": region_visited, "display_name": display_name, "city": city.name if city else None, "city_id": city.id if city else None, "city_visited": city_visited, 'location_name': location_name} return {"region_id": iso_code, "region": region.name, "country": region.country.name, "country_id": region.country.country_code, "region_visited": region_visited, "display_name": display_name, "city": city.name if city else None, "city_id": city.id if city else None, "city_visited": city_visited, 'location_name': location_name}
return {"error": "No region found"} return {"error": "No region found"}
def is_host_resolvable(hostname: str) -> bool: def is_host_resolvable(hostname: str) -> bool:
try: try:
socket.gethostbyname(hostname) socket.gethostbyname(hostname)
@ -201,6 +218,9 @@ def reverse_geocode_osm(lat, lon, user):
def reverse_geocode_google(lat, lon, user): def reverse_geocode_google(lat, lon, user):
api_key = settings.GOOGLE_MAPS_API_KEY api_key = settings.GOOGLE_MAPS_API_KEY
# Updated to use the new Geocoding API endpoint (this one is still supported)
# The Geocoding API is separate from Places API and still uses the old format
url = "https://maps.googleapis.com/maps/api/geocode/json" url = "https://maps.googleapis.com/maps/api/geocode/json"
params = {"latlng": f"{lat},{lon}", "key": api_key} params = {"latlng": f"{lat},{lon}", "key": api_key}