mirror of
https://github.com/seanmorley15/AdventureLog.git
synced 2025-07-23 06:49:37 +02:00
* Refactor user_id to user in adventures and related models, views, and components - Updated all instances of user_id to user in the adventures app, including models, serializers, views, and frontend components. - Adjusted queries and filters to reflect the new user field naming convention. - Ensured consistency across the codebase for user identification in adventures, collections, notes, and transportation entities. - Modified frontend components to align with the updated data structure, ensuring proper access control and rendering based on user ownership. * Refactor adventure-related views and components to use "Location" terminology - Updated GlobalSearchView to replace AdventureSerializer with LocationSerializer. - Modified IcsCalendarGeneratorViewSet to use LocationSerializer instead of AdventureSerializer. - Created new LocationImageViewSet for managing location images, including primary image toggling and image deletion. - Introduced LocationViewSet for managing locations with enhanced filtering, sorting, and sharing capabilities. - Updated ReverseGeocodeViewSet to utilize LocationSerializer. - Added ActivityTypesView to retrieve distinct activity types from locations. - Refactored user views to replace AdventureSerializer with LocationSerializer. - Updated frontend components to reflect changes from "adventure" to "location", including AdventureCard, AdventureLink, AdventureModal, and others. - Adjusted API endpoints in frontend routes to align with new location-based structure. - Ensured all references to adventures are replaced with locations across the codebase. * refactor: rename adventures to locations across the application - Updated localization files to replace adventure-related terms with location-related terms. - Refactored TypeScript types and variables from Adventure to Location in various routes and components. - Adjusted UI elements and labels to reflect the change from adventures to locations. - Ensured all references to adventures in the codebase are consistent with the new location terminology. * Refactor code structure for improved readability and maintainability * feat: Implement location details page with server-side loading and deletion functionality - Added +page.server.ts to handle server-side loading of additional location info. - Created +page.svelte for displaying location details, including images, visits, and maps. - Integrated GPX file handling and rendering on the map. - Updated map route to link to locations instead of adventures. - Refactored profile and search routes to use LocationCard instead of AdventureCard. * docs: Update terminology from "Adventure" to "Location" and enhance project overview * docs: Clarify collection examples in usage documentation * feat: Enable credentials for GPX file fetch and add CORS_ALLOW_CREDENTIALS setting * Refactor adventure references to locations across the backend and frontend - Updated CategoryViewSet to reflect location context instead of adventures. - Modified ChecklistViewSet to include locations in retrieval logic. - Changed GlobalSearchView to search for locations instead of adventures. - Adjusted IcsCalendarGeneratorViewSet to handle locations instead of adventures. - Refactored LocationImageViewSet to remove unused import. - Updated LocationViewSet to clarify public access for locations. - Changed LodgingViewSet to reference locations instead of adventures. - Modified NoteViewSet to prevent listing all locations. - Updated RecommendationsViewSet to handle locations in parsing and response. - Adjusted ReverseGeocodeViewSet to search through user locations. - Updated StatsViewSet to count locations instead of adventures. - Changed TagsView to reflect activity types for locations. - Updated TransportationViewSet to reference locations instead of adventures. - Added new translations for search results related to locations in multiple languages. - Updated dashboard and profile pages to reflect location counts instead of adventure counts. - Adjusted search routes to handle locations instead of adventures. * Update banner image * style: Update stats component background and border for improved visibility * refactor: Rename AdventureCard and AdventureModal to LocationCard and LocationModal for consistency
256 lines
No EOL
9.8 KiB
Python
256 lines
No EOL
9.8 KiB
Python
from rest_framework import viewsets
|
|
from rest_framework.decorators import action
|
|
from rest_framework.permissions import IsAuthenticated
|
|
from rest_framework.response import Response
|
|
from django.conf import settings
|
|
import requests
|
|
from geopy.distance import geodesic
|
|
|
|
class RecommendationsViewSet(viewsets.ViewSet):
|
|
permission_classes = [IsAuthenticated]
|
|
BASE_URL = "https://overpass-api.de/api/interpreter"
|
|
HEADERS = {'User-Agent': 'AdventureLog Server'}
|
|
|
|
def parse_google_places(self, places, origin):
|
|
locations = []
|
|
|
|
for place in places:
|
|
location = place.get('location', {})
|
|
types = place.get('types', [])
|
|
|
|
# Updated for new API response structure
|
|
formatted_address = place.get("formattedAddress") or place.get("shortFormattedAddress")
|
|
display_name = place.get("displayName", {})
|
|
name = display_name.get("text") if isinstance(display_name, dict) else display_name
|
|
|
|
lat = location.get('latitude')
|
|
lon = location.get('longitude')
|
|
|
|
if not name or not lat or not lon:
|
|
continue
|
|
|
|
distance_km = geodesic(origin, (lat, lon)).km
|
|
|
|
adventure = {
|
|
"id": place.get('id'),
|
|
"type": 'place',
|
|
"name": name,
|
|
"description": place.get('businessStatus', None),
|
|
"latitude": lat,
|
|
"longitude": lon,
|
|
"address": formatted_address,
|
|
"tag": types[0] if types else None,
|
|
"distance_km": round(distance_km, 2),
|
|
}
|
|
|
|
locations.append(adventure)
|
|
|
|
# Sort by distance ascending
|
|
locations.sort(key=lambda x: x["distance_km"])
|
|
|
|
return locations
|
|
|
|
def parse_overpass_response(self, data, request):
|
|
nodes = data.get('elements', [])
|
|
locations = []
|
|
all = request.query_params.get('all', False)
|
|
|
|
origin = None
|
|
try:
|
|
origin = (
|
|
float(request.query_params.get('lat')),
|
|
float(request.query_params.get('lon'))
|
|
)
|
|
except(ValueError, TypeError):
|
|
origin = None
|
|
|
|
for node in nodes:
|
|
if node.get('type') not in ['node', 'way', 'relation']:
|
|
continue
|
|
|
|
tags = node.get('tags', {})
|
|
lat = node.get('lat')
|
|
lon = node.get('lon')
|
|
name = tags.get('name', tags.get('official_name', ''))
|
|
|
|
if not name or lat is None or lon is None:
|
|
if not all:
|
|
continue
|
|
|
|
# Flatten address
|
|
address_parts = [tags.get(f'addr:{k}') for k in ['housenumber', 'street', 'suburb', 'city', 'state', 'postcode', 'country']]
|
|
formatted_address = ", ".join(filter(None, address_parts)) or name
|
|
|
|
# Calculate distance if possible
|
|
distance_km = None
|
|
if origin:
|
|
distance_km = round(geodesic(origin, (lat, lon)).km, 2)
|
|
|
|
# Unified format
|
|
adventure = {
|
|
"id": f"osm:{node.get('id')}",
|
|
"type": "place",
|
|
"name": name,
|
|
"description": tags.get('description'),
|
|
"latitude": lat,
|
|
"longitude": lon,
|
|
"address": formatted_address,
|
|
"tag": next((tags.get(key) for key in ['leisure', 'tourism', 'natural', 'historic', 'amenity'] if key in tags), None),
|
|
"distance_km": distance_km,
|
|
"powered_by": "osm"
|
|
}
|
|
|
|
locations.append(adventure)
|
|
|
|
# Sort by distance if available
|
|
if origin:
|
|
locations.sort(key=lambda x: x.get("distance_km") or float("inf"))
|
|
|
|
return locations
|
|
|
|
|
|
def query_overpass(self, lat, lon, radius, category, request):
|
|
if category == 'tourism':
|
|
query = f"""
|
|
[out:json];
|
|
(
|
|
node(around:{radius},{lat},{lon})["tourism"];
|
|
node(around:{radius},{lat},{lon})["leisure"];
|
|
node(around:{radius},{lat},{lon})["historic"];
|
|
node(around:{radius},{lat},{lon})["sport"];
|
|
node(around:{radius},{lat},{lon})["natural"];
|
|
node(around:{radius},{lat},{lon})["attraction"];
|
|
node(around:{radius},{lat},{lon})["museum"];
|
|
node(around:{radius},{lat},{lon})["zoo"];
|
|
node(around:{radius},{lat},{lon})["aquarium"];
|
|
);
|
|
out;
|
|
"""
|
|
elif category == 'lodging':
|
|
query = f"""
|
|
[out:json];
|
|
(
|
|
node(around:{radius},{lat},{lon})["tourism"="hotel"];
|
|
node(around:{radius},{lat},{lon})["tourism"="motel"];
|
|
node(around:{radius},{lat},{lon})["tourism"="guest_house"];
|
|
node(around:{radius},{lat},{lon})["tourism"="hostel"];
|
|
node(around:{radius},{lat},{lon})["tourism"="camp_site"];
|
|
node(around:{radius},{lat},{lon})["tourism"="caravan_site"];
|
|
node(around:{radius},{lat},{lon})["tourism"="chalet"];
|
|
node(around:{radius},{lat},{lon})["tourism"="alpine_hut"];
|
|
node(around:{radius},{lat},{lon})["tourism"="apartment"];
|
|
);
|
|
out;
|
|
"""
|
|
elif category == 'food':
|
|
query = f"""
|
|
[out:json];
|
|
(
|
|
node(around:{radius},{lat},{lon})["amenity"="restaurant"];
|
|
node(around:{radius},{lat},{lon})["amenity"="cafe"];
|
|
node(around:{radius},{lat},{lon})["amenity"="fast_food"];
|
|
node(around:{radius},{lat},{lon})["amenity"="pub"];
|
|
node(around:{radius},{lat},{lon})["amenity"="bar"];
|
|
node(around:{radius},{lat},{lon})["amenity"="food_court"];
|
|
node(around:{radius},{lat},{lon})["amenity"="ice_cream"];
|
|
node(around:{radius},{lat},{lon})["amenity"="bakery"];
|
|
node(around:{radius},{lat},{lon})["amenity"="confectionery"];
|
|
);
|
|
out;
|
|
"""
|
|
else:
|
|
return Response({"error": "Invalid category."}, status=400)
|
|
|
|
overpass_url = f"{self.BASE_URL}?data={query}"
|
|
try:
|
|
response = requests.get(overpass_url, headers=self.HEADERS)
|
|
response.raise_for_status()
|
|
data = response.json()
|
|
except Exception as e:
|
|
print("Overpass API error:", e)
|
|
return Response({"error": "Failed to retrieve data from Overpass API."}, status=500)
|
|
|
|
locations = self.parse_overpass_response(data, request)
|
|
return Response(locations)
|
|
|
|
def query_google_nearby(self, lat, lon, radius, category, request):
|
|
"""Query Google Places API (New) for nearby places"""
|
|
api_key = settings.GOOGLE_MAPS_API_KEY
|
|
|
|
# Updated to use new Places API endpoint
|
|
url = "https://places.googleapis.com/v1/places:searchNearby"
|
|
|
|
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,places.businessStatus,places.id'
|
|
}
|
|
|
|
# Map categories to place types for the new API
|
|
type_mapping = {
|
|
'lodging': 'lodging',
|
|
'food': 'restaurant',
|
|
'tourism': 'tourist_attraction',
|
|
}
|
|
|
|
payload = {
|
|
"includedTypes": [type_mapping[category]],
|
|
"maxResultCount": 20,
|
|
"locationRestriction": {
|
|
"circle": {
|
|
"center": {
|
|
"latitude": float(lat),
|
|
"longitude": float(lon)
|
|
},
|
|
"radius": float(radius)
|
|
}
|
|
}
|
|
}
|
|
|
|
try:
|
|
response = requests.post(url, json=payload, headers=headers, timeout=10)
|
|
response.raise_for_status()
|
|
data = response.json()
|
|
|
|
places = data.get('places', [])
|
|
origin = (float(lat), float(lon))
|
|
locations = self.parse_google_places(places, origin)
|
|
|
|
return Response(locations)
|
|
|
|
except requests.exceptions.RequestException as e:
|
|
print(f"Google Places API error: {e}")
|
|
# Fallback to Overpass API
|
|
return self.query_overpass(lat, lon, radius, category, request)
|
|
except Exception as e:
|
|
print(f"Unexpected error with Google Places API: {e}")
|
|
# Fallback to Overpass API
|
|
return self.query_overpass(lat, lon, radius, category, request)
|
|
|
|
@action(detail=False, methods=['get'])
|
|
def query(self, request):
|
|
lat = request.query_params.get('lat')
|
|
lon = request.query_params.get('lon')
|
|
radius = request.query_params.get('radius', '1000')
|
|
category = request.query_params.get('category', 'all')
|
|
|
|
if not lat or not lon:
|
|
return Response({"error": "Latitude and longitude parameters are required."}, status=400)
|
|
|
|
valid_categories = {
|
|
'lodging': 'lodging',
|
|
'food': 'restaurant',
|
|
'tourism': 'tourist_attraction',
|
|
}
|
|
|
|
if category not in valid_categories:
|
|
return Response({"error": f"Invalid category. Valid categories: {', '.join(valid_categories)}"}, status=400)
|
|
|
|
api_key = getattr(settings, 'GOOGLE_MAPS_API_KEY', None)
|
|
|
|
# Fallback to Overpass if no API key configured
|
|
if not api_key:
|
|
return self.query_overpass(lat, lon, radius, category, request)
|
|
|
|
# Use the new Google Places API
|
|
return self.query_google_nearby(lat, lon, radius, category, request) |