feat(geocoding): remove server side fetch

This commit is contained in:
gabdevele
2026-06-15 15:08:33 +02:00 Unverified
parent 486cded844
commit e7219c84ab
5 changed files with 15 additions and 106 deletions
+10 -20
View File
@@ -3,6 +3,7 @@ import type { Category, CreateReportRequest } from '~/types/api'
import type { LeafletMouseEvent, Map as LeafletMap, Marker as LeafletMarker } from 'leaflet'
import { onMounted, onUnmounted, ref, watch } from 'vue'
import { BARI_BOUNDS, BARI_CENTER, isWithinBariBounds } from '~/utils/bari'
import { reverseGeocode, searchAddresses } from '~/utils/geocoding'
interface Props {
isLoading?: boolean
@@ -19,14 +20,6 @@ interface GeocodingSuggestion {
longitude: number
}
interface SearchAddressesResponse {
suggestions: GeocodingSuggestion[]
}
interface ReverseGeocodeResponse {
address: string
}
const props = withDefaults(defineProps<Props>(), {
isLoading: false,
categories: () => []
@@ -123,18 +116,20 @@ const fetchAddressSuggestions = async (query: string) => {
addressSearchError.value = ''
try {
const response = await $fetch<SearchAddressesResponse>('/api/geocoding/search', {
query: { q: query }
})
if (requestId !== addressSearchRequestId) {
return
}
const suggestions = await searchAddresses(query)
if (requestId !== addressSearchRequestId) {
return
}
addressSuggestions.value = response.suggestions
showAddressSuggestions.value = response.suggestions.length > 0
addressSuggestions.value = suggestions
showAddressSuggestions.value = suggestions.length > 0
if (!response.suggestions.length) {
if (!suggestions.length) {
addressSearchError.value = 'Nessun indirizzo trovato nel Comune di Bari.'
}
} catch {
@@ -157,15 +152,11 @@ const resolveAddressFromCoordinates = async (lat: number, lng: number, fallbackA
addressSearchError.value = ''
try {
const response = await $fetch<ReverseGeocodeResponse>('/api/geocoding/reverse', {
query: { lat, lng }
})
if (requestId !== reverseGeocodeRequestId) {
return
}
const resolvedAddress = response.address?.trim() || fallbackAddress.trim()
const resolvedAddress = (await reverseGeocode(lat, lng))?.trim() || fallbackAddress.trim()
if (resolvedAddress) {
setAddressValue(resolvedAddress)
@@ -694,4 +685,3 @@ textarea {
align-items: center;
}
</style>
+103
View File
@@ -0,0 +1,103 @@
import { BARI_BOUNDS, isWithinBariBounds } from '~/utils/bari'
interface NominatimAddress {
road?: string
house_number?: string
pedestrian?: string
footway?: string
path?: string
cycleway?: string
suburb?: string
neighbourhood?: string
city?: string
town?: string
village?: string
municipality?: string
}
interface NominatimResult {
lat: string
lon: string
display_name: string
address?: NominatimAddress
}
export interface GeocodingSuggestion {
label: string
latitude: number
longitude: number
}
const NOMINATIM_BASE_URL = 'https://nominatim.openstreetmap.org'
const bariViewbox = `${BARI_BOUNDS.west},${BARI_BOUNDS.north},${BARI_BOUNDS.east},${BARI_BOUNDS.south}`
const compactAddress = (displayName: string, address?: NominatimAddress) => {
if (!address) {
return displayName
}
const streetName = address.road || address.pedestrian || address.footway || address.path || address.cycleway
const street = [streetName, address.house_number].filter(Boolean).join(' ')
const locality = address.city || address.town || address.village || address.municipality || 'Bari'
const area = address.suburb || address.neighbourhood
const formatted = [street, locality, area]
.filter(Boolean)
.filter((part, index, all) => all.indexOf(part) === index)
.join(', ')
return formatted || displayName
}
const toSuggestion = (result: NominatimResult): GeocodingSuggestion | null => {
const latitude = Number.parseFloat(result.lat)
const longitude = Number.parseFloat(result.lon)
if (!Number.isFinite(latitude) || !Number.isFinite(longitude)) {
return null
}
return {
label: compactAddress(result.display_name, result.address),
latitude,
longitude
}
}
export const searchAddresses = async (query: string, limit = 5) => {
const params = new URLSearchParams({
q: query,
format: 'jsonv2',
addressdetails: '1',
'accept-language': 'it',
countrycodes: 'it',
bounded: '1',
viewbox: bariViewbox,
limit: String(limit)
})
const results = await $fetch<NominatimResult[]>(`${NOMINATIM_BASE_URL}/search?${params.toString()}`)
return results
.map(toSuggestion)
.filter((result): result is GeocodingSuggestion => Boolean(result))
.filter((result) => isWithinBariBounds(result.latitude, result.longitude))
}
export const reverseGeocode = async (latitude: number, longitude: number) => {
const params = new URLSearchParams({
lat: String(latitude),
lon: String(longitude),
zoom: '18',
format: 'jsonv2',
addressdetails: '1',
'accept-language': 'it'
})
const result = await $fetch<NominatimResult | null>(`${NOMINATIM_BASE_URL}/reverse?${params.toString()}`)
if (!result) {
return ''
}
return compactAddress(result.display_name, result.address)
}