pcm-libraries/pcm-geocode-bundle
2
0
Fork 0
Code Issues 2 Releases Activity

Move geocoder into service folder

Browse Source
This commit is contained in:
Brabli
2022-07-20 21:49:26 +01:00
parent 827d528c64
commit 59bdb63c09
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Geocoder.php → src/Service/Geocoder.php
View File

@@ -2,11 +2,11 @@
declare(strict_types=1); declare(strict_types=1);
namespace Pcm\GeocodeBundle; namespace Pcm\GeocodeBundle\Service;
use Exception; use Exception;
use Pcm\GeocodeBundle\Data\LatLon;
use Pcm\GeocodeBundle\Entity\GeocodeData; use Pcm\GeocodeBundle\Entity\GeocodeData;
use Symfony\Component\HttpClient\HttpClient;
use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\HttpClientInterface;
use Symfony\Contracts\HttpClient\ResponseInterface; use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -14,13 +14,17 @@ class Geocoder
{ {
private const API_URL = "https://nominatim.openstreetmap.org/search"; private const API_URL = "https://nominatim.openstreetmap.org/search";
public function __construct(private HttpClientInterface $client) {}
/** /**
* Returns a LatLon object
*
* @param string $postcode * @param string $postcode
* @return GeocodeData * @return GeocodeData
*/ */
public function geocodePostcode(string $postcode): GeocodeData public function geocodePostcode(string $postcode): LatLon
{ {
$client = $this->getHttpClient(); $client = $this->setClientHeaders();
$response = $this->makeApiRequest($client, $postcode); $response = $this->makeApiRequest($client, $postcode);
$data = $response->toArray(); $data = $response->toArray();
$this->throwIfNoResponseData($data); $this->throwIfNoResponseData($data);
@@ -28,9 +32,9 @@ class Geocoder
return $this->createGeocodeDataObject($data); return $this->createGeocodeDataObject($data);
} }
private function getHttpClient(): HttpClientInterface private function setClientHeaders(): HttpClientInterface
{ {
return HttpClient::create([ return $this->client->withOptions([
'headers' => ["User-Agent" => "Geocode"] 'headers' => ["User-Agent" => "Geocode"]
]); ]);
} }
@@ -55,12 +59,8 @@ class Geocoder
throw new Exception("No data was received from API response! Were the arguments valid?"); throw new Exception("No data was received from API response! Were the arguments valid?");
} }
private function createGeocodeDataObject(array $data): GeocodeData private function createGeocodeDataObject(array $data): LatLon
{ {
$geocodeData = new GeocodeData(); return new LatLon((float) $data[0]['lat'], (float) $data[0]['lon']);
$geocodeData->setLatitude((float) $data[0]['lat']);
$geocodeData->setLongitude((float) $data[0]['lon']);
return $geocodeData;
} }
} }