Skip to content

fix(geocoding): support configured google maps locale in geocoding re… #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spanchenko wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(geocoding): support configured google maps locale in geocoding re… #279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions server/src/Support/Geocoding.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,25 @@ class Geocoding
*/
public const SEARCH_RADIUS = 2000;

/**
* Geocode a search query to get places.
*
* @param string $searchQuery the query to search for
* @param float|null $latitude optional latitude for location-based search
* @param float|null $longitude optional longitude for location-based search
*
* @return Collection a collection of places
*
* @throws \Exception
*/
/**
* Retrieve the configured Google Maps locale.
*/
public static function getLocale(): string
{
return config('services.google_maps.locale', env('GOOGLE_MAPS_LOCALE', 'en'));
}

/**
* Geocode a search query to get places.
*
Expand All @@ -37,8 +56,9 @@ class Geocoding
public static function geocode(string $searchQuery, $latitude = null, $longitude = null): Collection
{
$httpClient = new Client();
$provider = new GoogleMaps($httpClient, null, config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY')));
$geocoder = new StatefulGeocoder($provider, 'en');
$locale = static::getLocale();
$provider = new GoogleMaps($httpClient, $locale, config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY')));
$geocoder = new StatefulGeocoder($provider, $locale);

try {
if ($latitude && $longitude) {
Expand Down Expand Up @@ -82,8 +102,9 @@ function ($googleAddress) {
public static function reverseFromQuery(string $searchQuery, $latitude, $longitude): Collection
{
$httpClient = new Client();
$provider = new GoogleMaps($httpClient, null, config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY')));
$geocoder = new StatefulGeocoder($provider, 'en');
$locale = static::getLocale();
$provider = new GoogleMaps($httpClient, $locale, config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY')));
$geocoder = new StatefulGeocoder($provider, $locale);

if (empty($searchQuery)) {
return collect();
Expand Down Expand Up @@ -128,8 +149,9 @@ function ($googleAddress) {
public static function reverseFromCoordinates($latitude, $longitude, ?string $searchQuery = null): Collection
{
$httpClient = new Client();
$provider = new GoogleMaps($httpClient, null, config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY')));
$geocoder = new StatefulGeocoder($provider, 'en');
$locale = static::getLocale();
$provider = new GoogleMaps($httpClient, $locale, config('services.google_maps.api_key', env('GOOGLE_MAPS_API_KEY')));
$geocoder = new StatefulGeocoder($provider, $locale);

if (empty($latitude) && empty($longitude)) {
return collect();
Expand Down