* Fixes [REQUEST] Email-based auto-linking for OIDC Fixes #921 * Add ClusterMap integration for regions and cities with fit-to-bounds functionality * Update COUNTRY_REGION_JSON_VERSION to v3.0 and modify state ID generation to use ISO2 code * fix: handle email verification required case during signup Updated the signup action to return a specific message when the backend responds with a 401 status, indicating that the signup succeeded but email verification is required. This allows the frontend to display the appropriate message using an i18n key. * feat: add Advanced Configuration documentation with optional environment variables * Fixes #511 * fix: update appVersion to v0.11.0-main-121425 and enhance socialProviders handling in settings page * feat: implement social signup controls and update documentation for new environment variables * fix: update LocationCard props and enhance restore data functionality - Changed the user prop to null in LocationCard component on the dashboard page. - Added isRestoring state to manage loading state during data restoration in settings. - Updated the restore button to show a loading spinner when a restore operation is in progress. * fix: update appVersion to v0.12.0-pre-dev-121625 * feat: implement itinerary planning feature with CollectionItineraryPlanner component and related updates * feat: add overnight lodging indicator and functionality to CollectionItineraryPlanner * feat: add compact display option to LocationCard and enhance lodging filtering in CollectionItineraryPlanner * feat(itinerary): add itinerary management features and link modal - Introduced ItineraryViewSet for managing itinerary items with create and reorder functionalities. - Added itinerary linking capabilities in CollectionModal and CollectionItineraryPlanner components. - Implemented new ItineraryLinkModal for linking existing items to specific dates. - Enhanced the frontend with new modals for creating locations, lodging, transportation, notes, and checklists. - Updated the backend to handle itinerary item creation and reordering with appropriate permissions. - Improved data handling for unscheduled items and their association with the itinerary. - Added new dependencies to the frontend for enhanced functionality. * feat(itinerary): implement auto-generate functionality for itinerary items based on dated records * feat(collection): enhance collection sharing logic and improve data handling on invite acceptance * fix: update appVersion to correct pre-dev version * feat(wikipedia): implement image selection from Wikipedia with enhanced results display * Refactor code structure for improved readability and maintainability * feat: add CollectionRecommendationView component for displaying location recommendations - Implemented CollectionRecommendationView.svelte to handle location recommendations based on user input and selected categories. - Added Recommendation and RecommendationResponse types to types.ts for better type safety and structure. - Updated collections/[id]/+page.svelte to include a new view for recommendations, allowing users to switch between different views seamlessly. * fix: update appVersion and improve button accessibility in collection views * feat: add canModify prop to collection components for user permission handling * feat: add itinerary removal functionality to various cards and update UI components - Implemented `removeFromItinerary` function in `LodgingCard`, `NoteCard`, and `TransportationCard` to allow users to remove items from their itinerary. - Replaced the trash icon with a calendar remove icon in `LocationCard`, `LodgingCard`, `NoteCard`, and `TransportationCard` for better visual representation. - Updated the dropdown menus in `LodgingCard`, `NoteCard`, and `TransportationCard` to include the new remove from itinerary option. - Enhanced `CollectionItineraryPlanner` to pass itinerary items to the respective cards. - Removed `PointSelectionModal.svelte` as it is no longer needed. - Refactored `LocationMedia.svelte` to integrate `ImageManagement` component and clean up unused code related to image handling. * feat: enhance itinerary management with deduplication and initial visit date handling * feat: add FullMap component for enhanced map functionality with clustering support - Introduced FullMap.svelte to handle map rendering, clustering, and marker management. - Updated map page to utilize FullMap component, replacing direct MapLibre usage. - Implemented clustering options and marker properties handling in FullMap. - Added utility functions for resolving theme colors and managing marker states. - Enhanced user experience with hover popups and improved loading states for location details. - Updated app version to v0.12.0-pre-dev-122225. * feat: enhance map interaction for touch devices with custom popup handling * feat: add progress tracker for folder views to display visited and planned locations * feat: add map center and zoom state management with URL synchronization * feat: add status and days until start fields to collections with filtering options * Component folder structure changes * feat: add LodgingMedia and LodgingModal components for managing lodging details and media attachments feat: implement LocationSearchMap component for interactive location searching and mapping functionality * fix: update contentType in ImageManagement component to 'lodging' for correct media handling * feat: enhance lodging management with date validation and update messages * feat: implement lodging detail page with server-side loading and image modal functionality - Added a new server-side load function to fetch lodging details by ID. - Created a new Svelte component for the lodging detail page, including image carousel and map integration. - Implemented a modal for displaying images with navigation. - Enhanced URL handling in the locations page to only read parameters. * feat: add Transportation modal component and related routes - Implemented TransportationModal component for creating and editing transportation entries. - Added server-side loading for transportation details in the new route [id]/+page.server.ts. - Created a new Svelte page for displaying transportation details with image and attachment handling. - Integrated modal for editing transportation in the transportation details page. - Updated lodging routes to include a modal for editing lodging entries. - Removed unused delete action from lodging server-side logic. * feat: add start_code and end_code fields to Transportation model and update related components * feat: implement date validation for itinerary items and add day picker modal for scheduling * Reorder town and county checks in geocoding.py Fix detection if only town exists for a location but county is no city name * Use address keys only if city is found * Make sure reverse geocoding uses correct key for cities (#938) * Reorder town and county checks in geocoding.py Fix detection if only town exists for a location but county is no city name * Use address keys only if city is found * Refactor code structure for improved readability and maintainability * Enhance collection management with modal updates and item handling * feat: integrate CollectionMap component in collections page and update map titles in lodging and transportation pages - Replaced inline map implementation with CollectionMap component in collections/[id]/+page.svelte for better modularity. - Updated the map title in lodging/[id]/+page.svelte to reflect lodging context. - Updated the map title in transportations/[id]/+page.svelte to reflect transportation context. - Added functionality to collect and render GeoJSON data from transportation attachments in transportations/[id]/+page.svelte. * chore: update copyright year to 2026 in various files * feat: enhance backup export functionality with itinerary items and export IDs * fix: improve dropdown close behavior by handling multiple event types * fix: remove unnecessary cache decorator from globespin function * feat: add initial visit date support in ChecklistModal and NoteModal, with UI suggestions for prefilled dates * feat: add details view for checklist and note cards with edit functionality * feat: add travel duration and GPX distance calculation to Transportation model and UI * feat: add primary image support to Collection model, serializers, and UI components * Refactor calendar components and enhance event detail handling - Replaced direct calendar implementation with a reusable CalendarComponent in the calendar route. - Introduced EventDetailsModal for displaying event details, improving modularity and readability. - Added functionality to fetch event details asynchronously when an event is clicked. - Implemented ICS calendar download functionality with loading state management. - Enhanced collections page to support calendar view, integrating event handling and timezone management. - Improved lodging and transportation pages to display local time for stays and trips, including timezone badges. - Cleaned up unused code and comments for better maintainability. * feat: enhance hero image handling in collection view by prioritizing primary image * chore: update .env.example to include account email verification configuration * feat: enhance LodgingCard and TransportationCard components with expandable details and improved layout * feat: add price and currency fields to locations, lodging, and transportation components - Introduced price and price_currency fields in LocationModal, LodgingDetails, LodgingModal, TransportationDetails, and TransportationModal components. - Implemented MoneyInput and CurrencyDropdown components for handling monetary values and currency selection. - Updated data structures and types to accommodate new price and currency fields across various models. - Enhanced cost summary calculations in collections and routes to display total costs by currency. - Added user preference for default currency in settings, affecting new item forms. - Updated UI to display price information in relevant components, ensuring consistent formatting and user experience. * feat: add Development Timeline link to overview and create timeline documentation * feat: enhance map functionality with search and zoom features - Updated availableViews in collection page to include map view based on lodging and transportation locations. - Added search functionality to the map page, allowing users to filter pins by name and category. - Implemented auto-zoom feature to adjust the map view based on filtered search results. - Introduced a search bar with a clear button for better user experience. * feat: enhance ISO code extraction and region matching logic in extractIsoCode function * feat: enhance extractIsoCode function with normalization for locality matching * feat: update extractIsoCode function to include additional ISO3166 levels for improved region matching * feat: enhance extractIsoCode function to handle cases without city information and update CollectionMap to bind user data * feat: add cron job for syncing visited regions and cities, enhance Docker and supervisord configurations * feat: add CollectionItineraryDay model and related functionality for itinerary day metadata management * feat: implement cleanup of out-of-range itinerary items and notify users of potential impacts on itinerary when dates change * Refactor collection page for improved localization and code clarity - Removed unused imports and consolidated cost category labels to be reactive. - Updated cost summary function to accept localized labels. - Enhanced localization for various UI elements, including buttons, headings, and statistics. - Improved user feedback messages for better clarity and consistency. - Ensured all relevant text is translatable using the i18n library. * feat: add collaborator serialization and display in collections - Implemented `_build_profile_pic_url` and `_serialize_collaborator` functions for user profile picture URLs and serialization. - Updated `CollectionSerializer` and `UltraSlimCollectionSerializer` to include collaborators in the serialized output. - Enhanced `CollectionViewSet` to prefetch shared_with users for optimized queries. - Modified frontend components to display collaborators in collection details, including profile pictures and initials. - Added new localization strings for collaborators. - Refactored map and location components to improve usability and functionality. - Updated app version to reflect new changes. * feat: add dynamic lodging icons based on type in CollectionMap component * feat: add CollectionStats component for detailed trip statistics - Implemented CollectionStats.svelte to display various statistics related to the collection, including distances, activities, and locations visited. - Enhanced CollectionMap.svelte to filter activities based on date range using new getActivityDate function. - Updated LocationSearchMap.svelte to handle airport mode for start and end locations. - Modified types.ts to include is_global property in CollectionItineraryItem for trip-wide items. - Updated +page.svelte to integrate the new stats view and manage view state accordingly. * feat: enhance itinerary management by removing old items on date change for notes and checklists; normalize date handling in CollectionMap * feat: add functionality to change day and move items to trip-wide itinerary - Implemented changeDay function in ChecklistCard, LocationCard, LodgingCard, NoteCard, and TransportationCard components to allow users to change the scheduled day of items. - Added a button to move items to the global (trip-wide) itinerary in the aforementioned components, with appropriate dispatch events. - Enhanced CollectionItineraryPlanner to handle moving items to the global itinerary and added UI elements for unscheduled items. - Updated ItineraryDayPickModal to support the deletion of source visits when moving locations. - Added new translations for "Change Day" and "Move Trip Wide" in the English locale. * fix: specify full path for python3 in cron job and add shell and path variables * fix: update appVersion to v0.12.0-pre-dev-010726 * feat: enhance CollectionItineraryPlanner and CollectionStats with dynamic links and transport type normalization * Add Dev Container + WSL install docs and link in install guide (#944) (#951) * feat: enhance internationalization support in CollectionMap and CollectionStats components - Added translation support for various labels and messages in CollectionMap.svelte and CollectionStats.svelte using svelte-i18n. - Updated English and Chinese locale files to include new translation keys for improved user experience. - Simplified the rendering of recommendation views in the collections page. * Refactor itinerary management and UI components - Updated ItineraryViewSet to handle visit updates and creations more efficiently, preserving visit IDs when moving between days. - Enhanced ChecklistCard, LodgingCard, TransportationCard, and NoteCard to include a new "Change Day" option in the actions menu. - Improved user experience in CollectionItineraryPlanner by tracking specific itinerary items being moved and ensuring only the relevant entries are deleted. - Added new location sharing options in LodgingCard and TransportationCard for Apple Maps, Google Maps, and OpenStreetMap. - Updated translations in en.json for consistency and clarity. - Minor UI adjustments for better accessibility and usability across various components. * feat: implement action menus and close event handling in card components * feat: refactor Dockerfile and supervisord configuration to remove cron and add periodic sync script * feat: enhance LocationSearchMap and TransportationDetails components with initialization handling and airport mode logic * feat: add airport and location search mode labels to localization file * feat: enhance periodic sync logging and improve airport mode handling in LocationSearchMap * feat: enhance unscheduled items display with improved card interactions and accessibility * Add dev compose for hot reload and update WSL dev container docs (#958) * feat: enhance localization for itinerary linking and transportation components * Localization: update localization files with new keys and values * fix: improve error messages for Overpass API responses * chore: update dependencies in frontend package.json and pnpm-lock.yaml - Updated @sveltejs/adapter-node from ^5.2.12 to ^5.4.0 - Updated @sveltejs/adapter-vercel from ^5.7.0 to ^6.3.0 - Updated tailwindcss from ^3.4.17 to ^3.4.19 - Updated typescript from ^5.8.3 to ^5.9.3 - Updated vite from ^5.4.19 to ^5.4.21 * chore: update dependencies in pnpm-lock.yaml to latest versions * Refactor code structure for improved readability and maintainability * Refactor code structure for improved readability and maintainability * fix: update package dependencies to resolve compatibility issues * Add "worldtravel" translations to multiple locale files - Added "worldtravel" key with translations for Spanish, French, Hungarian, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Slovak, Swedish, Turkish, Ukrainian, and Chinese. - Updated the navigation section in each locale file to include the new "worldtravel" entry. * Add new screenshots and update email verification message in locale file * feat: Implement data restoration functionality with file import - Added a new action `restoreData` in `+page.server.ts` to handle file uploads for restoring collections. - Enhanced the UI in `+page.svelte` to include an import button and a modal for import progress. - Integrated file input handling to trigger form submission upon file selection. - Removed unused GSAP animations from the login, profile, and signup pages for cleaner code. * feat: Add modals for creating locations and lodging from recommendations, enhance image import functionality * fix: Adjust styles to prevent horizontal scroll and enhance floating action button visibility * feat: Enhance error handling and messaging for Google Maps and OpenStreetMap geocoding functions * fix: Enhance error messaging for Google Maps access forbidden response * feat: Add User-Agent header to Google Maps API requests and refine error messaging for access forbidden response * fix: Update User-Agent header in Google Maps API requests for improved compatibility * fix: Disable proxy settings in Google Maps API request to prevent connection issues * fix: Update Trivy security scan configuration and add .trivyignore for known false positives * fix: Refactor update method to handle is_public cascading for related items * feat: Integrate django-invitations for user invitation management and update settings * feat: Add Tailwind CSS and DaisyUI plugin for styling * feat: Add Tailwind CSS and DaisyUI plugin for styling * feat: Add "Invite a User" guide and update navigation links * docs: Update "Invite a User" guide to include email configuration tip * feat: Update email invitation template for improved styling and clarity * fix: Remove trailing backslash from installation note in Unraid documentation * feat: Add export/import messages and user email verification prompts in multiple languages * Squashed commit of the following: commit a993a15b93ebb7521ae2e5cc31596b98b29fcd6c Author: Alex <div@alexe.at> Date: Mon Jan 12 20:44:47 2026 +0100 Translated using Weblate (German) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit fdc455d9424fbb0f6b72179d9eb1340411700773 Author: Ettore Atalan <atalanttore@googlemail.com> Date: Sat Jan 10 23:24:23 2026 +0100 Translated using Weblate (German) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit 5942129c55e89dd999a13d4df9c40e6e3189355c Author: Orhun <orhunavcu@gmail.com> Date: Sun Jan 11 13:05:31 2026 +0100 Translated using Weblate (Turkish) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/ commit 8712e43d8ba4a7e7fe163fb454d6577187f9a375 Author: Henrique Fonseca Veloso <henriquefv@tutamail.com> Date: Fri Jan 9 22:53:11 2026 +0100 Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pt_BR/ commit 18ee56653470413afe8d71ecd2b5028f6e4cf118 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:57 2026 +0100 Translated using Weblate (Dutch) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nl/ commit 57783c544e583c035c8b57b5c10ca320f25f399e Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:14 2026 +0100 Translated using Weblate (Arabic) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ar/ commit fb09edfd85bc85234b1c1ba7dd499f2915093fff Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:26 2026 +0100 Translated using Weblate (Spanish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/ commit 554a207d8e454a1f7ae826e2a40d389b94be5512 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:21 2026 +0100 Translated using Weblate (German) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit b70b9db27fb8607beefeb288185601c8f5eae28d Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:02 2026 +0100 Translated using Weblate (Norwegian Bokmål) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/ commit 3b467caa9007c553e4ae7de97f53b6e462161ea3 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:07 2026 +0100 Translated using Weblate (Polish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pl/ commit 30fbbfba3572c8f78ec7c7e1a231e363aca1ef10 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:17 2026 +0100 Translated using Weblate (Russian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ru/ commit 8cecb492cfcac0a1f93ee8919f7b41d978d331ee Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:42 2026 +0100 Translated using Weblate (Italian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/it/ commit f0d3d41029c89bfa83d5891ee7af70241f27b7be Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:38 2026 +0100 Translated using Weblate (Hungarian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/hu/ commit 102e0f1912d010d38755a1713abb2a7f7564aafb Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:21 2026 +0100 Translated using Weblate (Slovak) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/ commit 428b8f18cf6195a96b55109e0221413d82415a2f Author: Максим Горпиніч <gorpinicmaksim0@gmail.com> Date: Sat Jan 10 08:55:28 2026 +0100 Translated using Weblate (Ukrainian) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/uk/ commit 1a71aaf279ecab26c0c1fede05025732e6dcfa5e Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:27 2026 +0100 Translated using Weblate (Swedish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sv/ commit 36ec3701f3a1a904e7c42ac4ffbe6a050dc6d1ed Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:43 2026 +0100 Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/zh_Hans/ commit 65d8b74b340c877cad2028b7142c783a1b568d49 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:48 2026 +0100 Translated using Weblate (Japanese) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ja/ commit 4d11d1d31022583657e93aee70301a8ffcde1340 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:52 2026 +0100 Translated using Weblate (Korean) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ko/ commit bd1135bcb965ad73cf493771b15081cc97cf513a Author: Orhun <orhunavcu@gmail.com> Date: Fri Jan 9 22:53:33 2026 +0100 Translated using Weblate (Turkish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/ commit 2c3d814119f4cf2dabd20933699f5b991f20f3e6 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:32 2026 +0100 Translated using Weblate (French) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/fr/ * Refactor code structure and remove redundant code blocks for improved readability and maintainability * fix: Correct appVersion to match the latest pre-release version * fix: Add missing vulnerability reference for jaraco.context in .trivyignore --------- Co-authored-by: Lars Lehmann <33843261+larsl-net@users.noreply.github.com> Co-authored-by: Lars Lehmann <lars@lmail.eu> Co-authored-by: Nick Petrushin <n.a.petrushin@gmail.com>
681 lines
29 KiB
Python
681 lines
29 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
|
|
import logging
|
|
from ..geocoding import search_google, search_osm
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
class RecommendationsViewSet(viewsets.ViewSet):
|
|
permission_classes = [IsAuthenticated]
|
|
OVERPASS_URL = "https://overpass-api.de/api/interpreter"
|
|
NOMINATIM_URL = "https://nominatim.openstreetmap.org/search"
|
|
HEADERS = {'User-Agent': 'AdventureLog Server'}
|
|
|
|
# Quality thresholds
|
|
MIN_GOOGLE_RATING = 3.0 # Minimum rating to include
|
|
MIN_GOOGLE_REVIEWS = 5 # Minimum number of reviews
|
|
MAX_RESULTS = 50 # Maximum results to return
|
|
|
|
def calculate_quality_score(self, place_data):
|
|
"""
|
|
Calculate a quality score based on multiple factors.
|
|
Higher score = better quality recommendation.
|
|
"""
|
|
import math
|
|
score = 0.0
|
|
|
|
# Rating contribution (0-50 points)
|
|
rating = place_data.get('rating')
|
|
if rating is not None and rating > 0:
|
|
score += (rating / 5.0) * 50
|
|
|
|
# Review count contribution (0-30 points, logarithmic scale)
|
|
review_count = place_data.get('review_count')
|
|
if review_count is not None and review_count > 0:
|
|
# Logarithmic scale: 10 reviews = ~10 pts, 100 = ~20 pts, 1000 = ~30 pts
|
|
score += min(30, math.log10(review_count) * 10)
|
|
|
|
# Distance penalty (0-20 points, closer is better)
|
|
distance_km = place_data.get('distance_km')
|
|
if distance_km is not None:
|
|
if distance_km < 1:
|
|
score += 20
|
|
elif distance_km < 5:
|
|
score += 15
|
|
elif distance_km < 10:
|
|
score += 10
|
|
elif distance_km < 20:
|
|
score += 5
|
|
|
|
# Verified/business status bonus (0-10 points)
|
|
if place_data.get('is_verified') or place_data.get('business_status') == 'OPERATIONAL':
|
|
score += 10
|
|
|
|
# Has photos bonus (0-5 points)
|
|
photos = place_data.get('photos')
|
|
if photos and len(photos) > 0:
|
|
score += 5
|
|
|
|
# Has opening hours bonus (0-5 points)
|
|
opening_hours = place_data.get('opening_hours')
|
|
if opening_hours and len(opening_hours) > 0:
|
|
score += 5
|
|
|
|
return round(score, 2)
|
|
|
|
def parse_google_places(self, places, origin):
|
|
"""
|
|
Parse Google Places API results into unified format.
|
|
Enhanced with quality filtering and comprehensive data extraction.
|
|
"""
|
|
locations = []
|
|
api_key = getattr(settings, 'GOOGLE_MAPS_API_KEY', None)
|
|
|
|
for place in places:
|
|
location = place.get('location', {})
|
|
types = place.get('types', [])
|
|
|
|
# Extract display name
|
|
display_name = place.get("displayName", {})
|
|
name = display_name.get("text") if isinstance(display_name, dict) else display_name
|
|
|
|
# Extract coordinates
|
|
lat = location.get('latitude')
|
|
lon = location.get('longitude')
|
|
|
|
if not name or not lat or not lon:
|
|
continue
|
|
|
|
# Extract rating information
|
|
rating = place.get('rating')
|
|
review_count = place.get('userRatingCount', 0)
|
|
|
|
# Quality filter: Skip low-rated or unreviewed places
|
|
if rating and rating < self.MIN_GOOGLE_RATING:
|
|
continue
|
|
if review_count < self.MIN_GOOGLE_REVIEWS:
|
|
continue
|
|
|
|
# Calculate distance
|
|
distance_km = geodesic(origin, (lat, lon)).km
|
|
|
|
# Extract address information
|
|
formatted_address = place.get("formattedAddress") or place.get("shortFormattedAddress")
|
|
|
|
# Extract business status
|
|
business_status = place.get('businessStatus')
|
|
is_operational = business_status == 'OPERATIONAL'
|
|
|
|
# Extract opening hours
|
|
opening_hours = place.get('regularOpeningHours', {})
|
|
current_opening_hours = place.get('currentOpeningHours', {})
|
|
is_open_now = current_opening_hours.get('openNow')
|
|
|
|
# Extract photos and construct URLs
|
|
photos = place.get('photos', [])
|
|
photo_urls = []
|
|
if photos and api_key:
|
|
# Get first 5 photos and construct full URLs
|
|
for photo in photos[:5]:
|
|
photo_name = photo.get('name', '')
|
|
if photo_name:
|
|
# Construct Google Places Photo API URL
|
|
# Format: https://places.googleapis.com/v1/{name}/media?key={key}&maxHeightPx=800&maxWidthPx=800
|
|
photo_url = f"https://places.googleapis.com/v1/{photo_name}/media?key={api_key}&maxHeightPx=800&maxWidthPx=800"
|
|
photo_urls.append(photo_url)
|
|
|
|
# Extract contact information
|
|
phone_number = place.get('nationalPhoneNumber') or place.get('internationalPhoneNumber')
|
|
website = place.get('websiteUri')
|
|
google_maps_uri = place.get('googleMapsUri')
|
|
|
|
# Extract price level
|
|
price_level = place.get('priceLevel')
|
|
|
|
# Extract editorial summary/description
|
|
editorial_summary = place.get('editorialSummary', {})
|
|
description = editorial_summary.get('text') if isinstance(editorial_summary, dict) else None
|
|
|
|
# Filter out unwanted types (generic categories)
|
|
filtered_types = [t for t in types if t not in ['point_of_interest', 'establishment']]
|
|
|
|
# Build unified response
|
|
place_data = {
|
|
"id": f"google:{place.get('id')}",
|
|
"external_id": place.get('id'),
|
|
"source": "google",
|
|
"name": name,
|
|
"description": description,
|
|
"latitude": lat,
|
|
"longitude": lon,
|
|
"address": formatted_address,
|
|
"distance_km": round(distance_km, 2),
|
|
"rating": rating,
|
|
"review_count": review_count,
|
|
"price_level": price_level,
|
|
"types": filtered_types,
|
|
"primary_type": filtered_types[0] if filtered_types else None,
|
|
"business_status": business_status,
|
|
"is_open_now": is_open_now,
|
|
"opening_hours": opening_hours.get('weekdayDescriptions', []) if opening_hours else None,
|
|
"phone_number": phone_number,
|
|
"website": website,
|
|
"google_maps_url": google_maps_uri,
|
|
"photos": photo_urls,
|
|
"is_verified": is_operational,
|
|
}
|
|
|
|
# Calculate quality score
|
|
place_data['quality_score'] = self.calculate_quality_score(place_data)
|
|
|
|
locations.append(place_data)
|
|
|
|
return locations
|
|
|
|
def parse_overpass_response(self, data, request, origin):
|
|
"""
|
|
Parse Overpass API (OSM) results into unified format.
|
|
Enhanced with quality filtering and comprehensive data extraction.
|
|
"""
|
|
nodes = data.get('elements', [])
|
|
locations = []
|
|
|
|
for node in nodes:
|
|
if node.get('type') not in ['node', 'way', 'relation']:
|
|
continue
|
|
|
|
tags = node.get('tags', {})
|
|
|
|
# Get coordinates (for ways/relations, use center)
|
|
lat = node.get('lat') or node.get('center', {}).get('lat')
|
|
lon = node.get('lon') or node.get('center', {}).get('lon')
|
|
|
|
# Extract name (with fallbacks)
|
|
name = tags.get('name') or tags.get('official_name') or tags.get('alt_name')
|
|
|
|
if not name or lat is None or lon is None:
|
|
continue
|
|
|
|
# Calculate distance
|
|
distance_km = round(geodesic(origin, (lat, lon)).km, 2) if origin else None
|
|
|
|
# Extract address information
|
|
address_parts = [
|
|
tags.get('addr:housenumber'),
|
|
tags.get('addr:street'),
|
|
tags.get('addr:suburb') or tags.get('addr:neighbourhood'),
|
|
tags.get('addr:city'),
|
|
tags.get('addr:state'),
|
|
tags.get('addr:postcode'),
|
|
tags.get('addr:country')
|
|
]
|
|
formatted_address = ", ".join(filter(None, address_parts)) or None
|
|
|
|
# Extract contact information
|
|
phone = tags.get('phone') or tags.get('contact:phone')
|
|
website = tags.get('website') or tags.get('contact:website') or tags.get('url')
|
|
|
|
# Extract opening hours
|
|
opening_hours = tags.get('opening_hours')
|
|
|
|
# Extract rating/stars (if available)
|
|
stars = tags.get('stars')
|
|
|
|
# Determine category/type hierarchy
|
|
category_keys = ['tourism', 'leisure', 'amenity', 'natural', 'historic', 'attraction', 'shop', 'sport']
|
|
types = [tags.get(key) for key in category_keys if key in tags]
|
|
primary_type = types[0] if types else None
|
|
|
|
# Extract description and additional info
|
|
description = tags.get('description') or tags.get('note')
|
|
wikipedia = tags.get('wikipedia') or tags.get('wikidata')
|
|
|
|
# Extract image if available
|
|
image = tags.get('image') or tags.get('wikimedia_commons')
|
|
|
|
# Quality filters for OSM data
|
|
# Skip if it's just a generic POI without specific category
|
|
if not primary_type:
|
|
continue
|
|
|
|
# Skip construction or disused places
|
|
if tags.get('disused') or tags.get('construction'):
|
|
continue
|
|
|
|
# Build unified response
|
|
place_data = {
|
|
"id": f"osm:{node.get('type')}:{node.get('id')}",
|
|
"external_id": str(node.get('id')),
|
|
"source": "osm",
|
|
"name": name,
|
|
"description": description,
|
|
"latitude": lat,
|
|
"longitude": lon,
|
|
"address": formatted_address,
|
|
"distance_km": distance_km,
|
|
"rating": None, # OSM doesn't have ratings
|
|
"review_count": None,
|
|
"price_level": None,
|
|
"types": types,
|
|
"primary_type": primary_type,
|
|
"business_status": None,
|
|
"is_open_now": None,
|
|
"opening_hours": [opening_hours] if opening_hours else None,
|
|
"phone_number": phone,
|
|
"website": website,
|
|
"google_maps_url": None,
|
|
"photos": [image] if image else [],
|
|
"is_verified": bool(wikipedia), # Has Wikipedia = more verified
|
|
"osm_type": node.get('type'),
|
|
"wikipedia": wikipedia,
|
|
"stars": stars,
|
|
}
|
|
|
|
# Calculate quality score (will be lower without ratings)
|
|
place_data['quality_score'] = self.calculate_quality_score(place_data)
|
|
|
|
locations.append(place_data)
|
|
|
|
return locations
|
|
|
|
|
|
def query_overpass(self, lat, lon, radius, category, request):
|
|
"""
|
|
Query Overpass API (OpenStreetMap) for nearby places.
|
|
Enhanced with better queries and error handling.
|
|
"""
|
|
# Limit radius for OSM to prevent timeouts (max 5km for OSM due to server limits)
|
|
osm_radius = min(radius, 5000)
|
|
|
|
# Build optimized query - use simpler queries and limit results
|
|
# Reduced timeout and simplified queries to prevent 504 errors
|
|
if category == 'tourism':
|
|
query = f"""
|
|
[out:json][timeout:25];
|
|
(
|
|
nwr["tourism"~"attraction|viewpoint|museum|gallery|zoo|aquarium"](around:{osm_radius},{lat},{lon});
|
|
nwr["historic"~"monument|castle|memorial"](around:{osm_radius},{lat},{lon});
|
|
nwr["leisure"~"park|garden|nature_reserve"](around:{osm_radius},{lat},{lon});
|
|
);
|
|
out center tags 50;
|
|
"""
|
|
elif category == 'lodging':
|
|
query = f"""
|
|
[out:json][timeout:25];
|
|
nwr["tourism"~"hotel|motel|guest_house|hostel"](around:{osm_radius},{lat},{lon});
|
|
out center tags 50;
|
|
"""
|
|
elif category == 'food':
|
|
query = f"""
|
|
[out:json][timeout:25];
|
|
nwr["amenity"~"restaurant|cafe|bar|pub"](around:{osm_radius},{lat},{lon});
|
|
out center tags 50;
|
|
"""
|
|
else:
|
|
logger.error(f"Invalid category requested: {category}")
|
|
return {"error": "Invalid category.", "results": []}
|
|
|
|
try:
|
|
response = requests.post(
|
|
self.OVERPASS_URL,
|
|
data=query,
|
|
headers=self.HEADERS,
|
|
timeout=30
|
|
)
|
|
response.raise_for_status()
|
|
data = response.json()
|
|
except requests.exceptions.Timeout:
|
|
logger.warning(f"Overpass API timeout for {category} at ({lat}, {lon}) with radius {osm_radius}m")
|
|
return {"error": f"OpenStreetMap query timed out. The service is overloaded. Radius limited to {int(osm_radius)}m.", "results": []}
|
|
except requests.exceptions.HTTPError as e:
|
|
if e.response.status_code == 504:
|
|
logger.warning(f"Overpass API 504 Gateway Timeout for {category}")
|
|
return {"error": "OpenStreetMap server is overloaded. Try again later or use Google source.", "results": []}
|
|
logger.warning(f"Overpass API HTTP error: {e}")
|
|
return {"error": f"OpenStreetMap error: please try again later.", "results": []}
|
|
except requests.exceptions.RequestException as e:
|
|
logger.warning(f"Overpass API error: {e}")
|
|
return {"error": f"OpenStreetMap temporarily unavailable: please try again later.", "results": []}
|
|
except ValueError as e:
|
|
logger.error(f"Invalid JSON response from Overpass: {e}")
|
|
return {"error": "Invalid response from OpenStreetMap.", "results": []}
|
|
|
|
origin = (float(lat), float(lon))
|
|
locations = self.parse_overpass_response(data, request, origin)
|
|
|
|
logger.info(f"Overpass returned {len(locations)} results")
|
|
return {"error": None, "results": locations}
|
|
|
|
def query_google_nearby(self, lat, lon, radius, category, request):
|
|
"""
|
|
Query Google Places API (New) for nearby places.
|
|
Enhanced with comprehensive field masks and better error handling.
|
|
"""
|
|
api_key = settings.GOOGLE_MAPS_API_KEY
|
|
|
|
url = "https://places.googleapis.com/v1/places:searchNearby"
|
|
|
|
# Comprehensive field mask to get all useful information
|
|
headers = {
|
|
'Content-Type': 'application/json',
|
|
'X-Goog-Api-Key': api_key,
|
|
'X-Goog-FieldMask': (
|
|
'places.id,'
|
|
'places.displayName,'
|
|
'places.formattedAddress,'
|
|
'places.shortFormattedAddress,'
|
|
'places.location,'
|
|
'places.types,'
|
|
'places.rating,'
|
|
'places.userRatingCount,'
|
|
'places.businessStatus,'
|
|
'places.priceLevel,'
|
|
'places.websiteUri,'
|
|
'places.googleMapsUri,'
|
|
'places.nationalPhoneNumber,'
|
|
'places.internationalPhoneNumber,'
|
|
'places.editorialSummary,'
|
|
'places.photos,'
|
|
'places.currentOpeningHours,'
|
|
'places.regularOpeningHours'
|
|
)
|
|
}
|
|
|
|
# Map categories to place types - use multiple types for better coverage
|
|
type_mapping = {
|
|
'lodging': ['lodging', 'hotel', 'hostel', 'resort_hotel', 'extended_stay_hotel'],
|
|
'food': ['restaurant', 'cafe', 'bar', 'bakery', 'meal_takeaway', 'meal_delivery'],
|
|
'tourism': ['tourist_attraction', 'museum', 'art_gallery', 'aquarium', 'zoo', 'amusement_park', 'park', 'natural_feature'],
|
|
}
|
|
|
|
payload = {
|
|
"includedTypes": type_mapping.get(category, ['tourist_attraction']),
|
|
"maxResultCount": 20,
|
|
"rankPreference": "DISTANCE", # Sort by distance first
|
|
"locationRestriction": {
|
|
"circle": {
|
|
"center": {
|
|
"latitude": float(lat),
|
|
"longitude": float(lon)
|
|
},
|
|
"radius": float(radius)
|
|
}
|
|
}
|
|
}
|
|
|
|
try:
|
|
response = requests.post(url, json=payload, headers=headers, timeout=15)
|
|
response.raise_for_status()
|
|
data = response.json()
|
|
|
|
places = data.get('places', [])
|
|
origin = (float(lat), float(lon))
|
|
locations = self.parse_google_places(places, origin)
|
|
|
|
logger.info(f"Google Places returned {len(locations)} quality results for category '{category}'")
|
|
|
|
return Response(self._prepare_final_results(locations))
|
|
|
|
except requests.exceptions.Timeout:
|
|
logger.warning("Google Places API timeout, falling back to OSM")
|
|
return self.query_overpass(lat, lon, radius, category, request)
|
|
except requests.exceptions.RequestException as e:
|
|
logger.warning(f"Google Places API error: {e}, falling back to OSM")
|
|
return self.query_overpass(lat, lon, radius, category, request)
|
|
except Exception as e:
|
|
logger.error(f"Unexpected error with Google Places API: {e}")
|
|
return self.query_overpass(lat, lon, radius, category, request)
|
|
|
|
def _prepare_final_results(self, locations):
|
|
"""
|
|
Prepare final results: sort by quality score and limit results.
|
|
"""
|
|
# Sort by quality score (highest first)
|
|
locations.sort(key=lambda x: x.get('quality_score', 0), reverse=True)
|
|
|
|
# Limit to MAX_RESULTS
|
|
locations = locations[:self.MAX_RESULTS]
|
|
|
|
return locations
|
|
|
|
def _deduplicate_results(self, google_results, osm_results):
|
|
"""
|
|
Deduplicate results from both sources based on name and proximity.
|
|
Prioritize Google results when duplicates are found.
|
|
"""
|
|
from difflib import SequenceMatcher
|
|
|
|
def is_similar(name1, name2, threshold=0.85):
|
|
"""Check if two names are similar using fuzzy matching."""
|
|
return SequenceMatcher(None, name1.lower(), name2.lower()).ratio() > threshold
|
|
|
|
def is_nearby(loc1, loc2, max_distance_m=50):
|
|
"""Check if two locations are within max_distance_m meters."""
|
|
dist = geodesic(
|
|
(loc1['latitude'], loc1['longitude']),
|
|
(loc2['latitude'], loc2['longitude'])
|
|
).meters
|
|
return dist < max_distance_m
|
|
|
|
# Start with all Google results (higher quality)
|
|
deduplicated = list(google_results)
|
|
|
|
# Add OSM results that don't match Google results
|
|
for osm_loc in osm_results:
|
|
is_duplicate = False
|
|
for google_loc in google_results:
|
|
if (is_similar(osm_loc['name'], google_loc['name']) and
|
|
is_nearby(osm_loc, google_loc)):
|
|
is_duplicate = True
|
|
break
|
|
|
|
if not is_duplicate:
|
|
deduplicated.append(osm_loc)
|
|
|
|
return deduplicated
|
|
|
|
@action(detail=False, methods=['get'])
|
|
def query(self, request):
|
|
"""
|
|
Query both Google Places and OSM for recommendations.
|
|
Returns unified, high-quality results sorted by quality score.
|
|
|
|
Query Parameters:
|
|
- lat (required): Latitude
|
|
- lon (required): Longitude
|
|
- radius (optional): Search radius in meters (default: 5000, max: 50000)
|
|
- category (required): Category - 'tourism', 'food', or 'lodging'
|
|
- sources (optional): Comma-separated sources - 'google', 'osm', or 'both' (default: 'both')
|
|
"""
|
|
lat = request.query_params.get('lat')
|
|
lon = request.query_params.get('lon')
|
|
# Allow a free-text `location` parameter which will be geocoded
|
|
location_param = request.query_params.get('location')
|
|
radius = request.query_params.get('radius', '5000')
|
|
category = request.query_params.get('category')
|
|
sources = request.query_params.get('sources', 'both').lower()
|
|
|
|
# If lat/lon not supplied, try geocoding the free-text location param
|
|
if (not lat or not lon) and location_param:
|
|
geocode_results = None
|
|
# Try Google first if API key configured
|
|
if getattr(settings, 'GOOGLE_MAPS_API_KEY', None):
|
|
try:
|
|
geocode_results = search_google(location_param)
|
|
except Exception:
|
|
logger.warning("Google geocoding failed; falling back to OSM")
|
|
geocode_results = None
|
|
|
|
# Fallback to OSM Nominatim
|
|
if not geocode_results:
|
|
try:
|
|
geocode_results = search_osm(location_param)
|
|
except Exception:
|
|
logger.warning("OSM geocoding failed")
|
|
geocode_results = None
|
|
|
|
# Validate geocode results
|
|
if isinstance(geocode_results, dict) and geocode_results.get('error'):
|
|
# Log internal geocoding error but avoid exposing sensitive details
|
|
logger.warning("Geocoding helper returned an internal error")
|
|
return Response({"error": "Geocoding failed. Please try a different location or contact support."}, status=400)
|
|
|
|
if not geocode_results:
|
|
return Response({"error": "Could not geocode provided location."}, status=400)
|
|
|
|
# geocode_results expected to be a list of results; pick the best (first)
|
|
best = None
|
|
if isinstance(geocode_results, list) and len(geocode_results) > 0:
|
|
best = geocode_results[0]
|
|
elif isinstance(geocode_results, dict):
|
|
# Some helpers might return a dict when only one result found
|
|
best = geocode_results
|
|
|
|
if not best:
|
|
return Response({"error": "No geocoding results found."}, status=400)
|
|
|
|
try:
|
|
lat = float(best.get('lat') or best.get('latitude'))
|
|
lon = float(best.get('lon') or best.get('longitude'))
|
|
except Exception:
|
|
return Response({"error": "Geocoding result missing coordinates."}, status=400)
|
|
|
|
# Replace location_param with display name when available for logging/debug
|
|
location_param = best.get('display_name') or best.get('name') or location_param
|
|
|
|
# Validation: require lat and lon at this point
|
|
if not lat or not lon:
|
|
return Response({
|
|
"error": "Latitude and longitude parameters are required (or provide a 'location' parameter to geocode)."
|
|
}, status=400)
|
|
|
|
try:
|
|
lat = float(lat)
|
|
lon = float(lon)
|
|
radius = min(float(radius), 50000) # Max 50km radius
|
|
except ValueError:
|
|
return Response({
|
|
"error": "Invalid latitude, longitude, or radius value."
|
|
}, status=400)
|
|
|
|
valid_categories = ['lodging', 'food', 'tourism']
|
|
if category not in valid_categories:
|
|
return Response({
|
|
"error": f"Invalid category. Valid categories: {', '.join(valid_categories)}"
|
|
}, status=400)
|
|
|
|
valid_sources = ['google', 'osm', 'both']
|
|
if sources not in valid_sources:
|
|
return Response({
|
|
"error": f"Invalid sources. Valid options: {', '.join(valid_sources)}"
|
|
}, status=400)
|
|
|
|
api_key = getattr(settings, 'GOOGLE_MAPS_API_KEY', None)
|
|
|
|
google_results = []
|
|
osm_results = []
|
|
|
|
# Query Google Places if available and requested
|
|
if api_key and sources in ['google', 'both']:
|
|
try:
|
|
url = "https://places.googleapis.com/v1/places:searchNearby"
|
|
headers = {
|
|
'Content-Type': 'application/json',
|
|
'X-Goog-Api-Key': api_key,
|
|
'X-Goog-FieldMask': (
|
|
'places.id,places.displayName,places.formattedAddress,'
|
|
'places.shortFormattedAddress,places.location,places.types,'
|
|
'places.rating,places.userRatingCount,places.businessStatus,'
|
|
'places.priceLevel,places.websiteUri,places.googleMapsUri,'
|
|
'places.nationalPhoneNumber,places.internationalPhoneNumber,'
|
|
'places.editorialSummary,places.photos,'
|
|
'places.currentOpeningHours,places.regularOpeningHours'
|
|
)
|
|
}
|
|
|
|
type_mapping = {
|
|
'lodging': ['lodging', 'hotel', 'hostel', 'resort_hotel'],
|
|
'food': ['restaurant', 'cafe', 'bar', 'bakery'],
|
|
'tourism': ['tourist_attraction', 'museum', 'art_gallery', 'aquarium', 'zoo', 'park'],
|
|
}
|
|
|
|
payload = {
|
|
"includedTypes": type_mapping.get(category, ['tourist_attraction']),
|
|
"maxResultCount": 20,
|
|
"rankPreference": "DISTANCE",
|
|
"locationRestriction": {
|
|
"circle": {
|
|
"center": {"latitude": lat, "longitude": lon},
|
|
"radius": radius
|
|
}
|
|
}
|
|
}
|
|
|
|
response = requests.post(url, json=payload, headers=headers, timeout=15)
|
|
response.raise_for_status()
|
|
data = response.json()
|
|
places = data.get('places', [])
|
|
origin = (lat, lon)
|
|
google_results = self.parse_google_places(places, origin)
|
|
logger.info(f"Google Places: {len(google_results)} quality results")
|
|
|
|
except Exception as e:
|
|
logger.warning(f"Google Places failed: {e}")
|
|
|
|
# Query OSM if requested or as fallback
|
|
osm_error = None
|
|
if sources in ['osm', 'both'] or (sources == 'google' and not google_results):
|
|
osm_response = self.query_overpass(lat, lon, radius, category, request)
|
|
osm_results = osm_response.get('results', [])
|
|
osm_error = osm_response.get('error')
|
|
|
|
if osm_error:
|
|
logger.warning(f"OSM query had issues: {osm_error}")
|
|
|
|
# Combine and deduplicate if using both sources
|
|
if sources == 'both' and google_results and osm_results:
|
|
all_results = self._deduplicate_results(google_results, osm_results)
|
|
else:
|
|
all_results = google_results + osm_results
|
|
|
|
# Prepare final results
|
|
final_results = self._prepare_final_results(all_results)
|
|
|
|
logger.info(f"Returning {len(final_results)} total recommendations")
|
|
|
|
# Build response with metadata
|
|
response_data = {
|
|
"count": len(final_results),
|
|
"results": final_results,
|
|
"sources_used": {
|
|
"google": len(google_results),
|
|
"osm": len(osm_results),
|
|
"total_before_dedup": len(google_results) + len(osm_results)
|
|
}
|
|
}
|
|
|
|
# Add warnings if there were errors but we still have some results
|
|
warnings = []
|
|
if osm_error and len(osm_results) == 0:
|
|
warnings.append(osm_error)
|
|
|
|
if warnings:
|
|
response_data["warnings"] = warnings
|
|
|
|
# If no results at all and user requested only OSM, return error status
|
|
if len(final_results) == 0 and sources == 'osm' and osm_error:
|
|
# Log internal error notice for investigation but do not expose details to clients
|
|
logger.debug("OSM query error (internal)")
|
|
return Response({
|
|
"error": "OpenStreetMap service temporarily unavailable. Please try again later.",
|
|
"count": 0,
|
|
"results": [],
|
|
"sources_used": response_data["sources_used"]
|
|
}, status=503)
|
|
|
|
return Response(response_data) |