Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 22 additions & 0 deletions src/Services/MaxMindDatabase.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Torann\GeoIP\Services;

use GeoIp2\Model\City;
use Illuminate\Support\Arr;
use PharData;
use Exception;
use GeoIp2\Database\Reader;
Expand Down Expand Up @@ -55,9 +57,29 @@ public function locate($ip)
'lon' => $record->location->longitude,
'timezone' => $record->location->timeZone,
'continent' => $record->continent->code,
'localizations' => $this->getLocalizations($record),
]);
}

/**
* Get localized country name, state name and city name based on config languages
*
* @param City $record
* @return array
*/
private function getLocalizations(City $record): array
{
$localizations = [];

foreach ($this->config('locales', ['en']) as $lang) {
$localizations[$lang]['country'] = Arr::get($record->country->names, $lang);
$localizations[$lang]['state_name'] = Arr::get($record->mostSpecificSubdivision->names, $lang);
$localizations[$lang]['city'] = Arr::get($record->city->names, $lang);
}

return $localizations;
}

/**
* Update function for service.
*
Expand Down
22 changes: 22 additions & 0 deletions src/Services/MaxMindWebService.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace Torann\GeoIP\Services;

use GeoIp2\Model\City;
use GeoIp2\WebService\Client;
use Illuminate\Support\Arr;

class MaxMindWebService extends AbstractService
{
Expand Down Expand Up @@ -46,6 +48,26 @@ public function locate($ip)
'lon' => $record->location->longitude,
'timezone' => $record->location->timeZone,
'continent' => $record->continent->code,
'localizations' => $this->getLocalizations($record),
]);
}

/**
* Get localized country name, state name and city name based on config languages
*
* @param City $record
* @return array
*/
private function getLocalizations(City $record): array
{
$localizations = [];

foreach ($this->config('locales', ['en']) as $lang) {
$localizations[$lang]['country'] = Arr::get($record->country->names, $lang);
$localizations[$lang]['state_name'] = Arr::get($record->mostSpecificSubdivision->names, $lang);
$localizations[$lang]['city'] = Arr::get($record->city->names, $lang);
}

return $localizations;
}
}