Fixed geolocation by switching to different API

module/Common/src/Service/IpApiLocationResolver.php

@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Common\Service;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use Shlinkio\Shlink\Common\Exception\WrongIpException;
+
+class IpApiLocationResolver implements IpLocationResolverInterface
+{
+    private const SERVICE_PATTERN = 'http://ip-api.com/json/%s';
+
+    /**
+     * @var Client
+     */
+    private $httpClient;
+
+    public function __construct(Client $httpClient)
+    {
+        $this->httpClient = $httpClient;
+    }
+
+    /**
+     * @param string $ipAddress
+     * @return array
+     * @throws WrongIpException
+     */
+    public function resolveIpLocation(string $ipAddress): array
+    {
+        try {
+            $response = $this->httpClient->get(\sprintf(self::SERVICE_PATTERN, $ipAddress));
+            return $this->mapFields(\json_decode((string) $response->getBody(), true));
+        } catch (GuzzleException $e) {
+            throw WrongIpException::fromIpAddress($ipAddress, $e);
+        }
+    }
+
+    private function mapFields(array $entry): array
+    {
+        return [
+            'country_code' => $entry['countryCode'] ?? '',
+            'country_name' => $entry['country'] ?? '',
+            'region_name' => $entry['regionName'] ?? '',
+            'city' => $entry['city'] ?? '',
+            'latitude' => $entry['lat'] ?? '',
+            'longitude' => $entry['lon'] ?? '',
+            'time_zone' => $entry['timezone'] ?? '',
+        ];
+    }
+}

module/Common/src/Service/IpLocationResolver.php

@@ -1,38 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Service;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-
-class IpLocationResolver implements IpLocationResolverInterface
-{
-    const SERVICE_PATTERN = 'http://freegeoip.net/json/%s';
-
-    /**
-     * @var Client
-     */
-    private $httpClient;
-
-    public function __construct(Client $httpClient)
-    {
-        $this->httpClient = $httpClient;
-    }
-
-    /**
-     * @param string $ipAddress
-     * @return array
-     * @throws WrongIpException
-     */
-    public function resolveIpLocation(string $ipAddress): array
-    {
-        try {
-            $response = $this->httpClient->get(sprintf(self::SERVICE_PATTERN, $ipAddress));
-            return json_decode((string) $response->getBody(), true);
-        } catch (GuzzleException $e) {
-            throw WrongIpException::fromIpAddress($ipAddress, $e);
-        }
-    }
-}