Add osm tag filter feature & limit filter

Author: ybert

src/Provider/Photon/Photon.php

@@ -106,7 +106,8 @@ public function reverseQuery(ReverseQuery $query): Collection
             .http_build_query([
                 'lat' => $latitude,
                 'lon' => $longitude,
-                'query_string_filter' => $query->getData('query_string_filter'),
+                'osm_tag' => $query->getData('osm_tag'),
+                'limit' => $query->getLimit(),
                 'lang' => $query->getLocale(),
             ]);
 

src/Provider/Photon/Tests/PhotonTest.php

@@ -13,6 +13,7 @@
 namespace Geocoder\Provider\Photon\Tests;
 
 use Geocoder\IntegrationTest\BaseTestCase;
+use Geocoder\Provider\Photon\Model\PhotonAddress;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Provider\Photon\Photon;
@@ -97,7 +98,8 @@ public function testGeocodeQueryWithNamedResult()
     public function testReverseQuery()
     {
         $provider = Photon::withKomootServer($this->getHttpClient());
-        $results = $provider->reverseQuery(ReverseQuery::fromCoordinates(52, 10));
+        $reverseQuery = ReverseQuery::fromCoordinates(52, 10)->withLimit(1);
+        $results = $provider->reverseQuery($reverseQuery);
 
         $this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
         $this->assertCount(1, $results);
@@ -121,16 +123,19 @@ public function testReverseQuery()
         $this->assertEquals('Sehlem', $result->getDistrict());
     }
 
-    public function testReverseQueryWithOsmDataFilter()
+    public function testReverseQueryWithOsmTagFilter()
     {
         $provider = Photon::withKomootServer($this->getHttpClient());
-        $reverseQuery = ReverseQuery::fromCoordinates(45.73179, 6.03248)
-            ->withData('query_string_filter', 'osm_key:place')
-            ->withLimit(1);
-        /** @var \Geocoder\Provider\Photon\Model\PhotonAddress $result */
-        $result = $provider->reverseQuery($reverseQuery)->first();
-
-        $this->assertEquals('place', $result->getOSMTag()->key);
-        $this->assertEquals('locality', $result->getOSMTag()->value);
+        $reverseQuery = ReverseQuery::fromCoordinates(52.51644, 13.38890)
+            ->withData('osm_tag', 'amenity:pharmacy')
+            ->withLimit(3);
+        $results = $provider->reverseQuery($reverseQuery);
+
+        $this->assertCount(3, $results);
+        foreach ($results as $result) {
+            $this->assertInstanceOf(PhotonAddress::class, $result);
+            $this->assertEquals('amenity', $result->getOSMTag()->key);
+            $this->assertEquals('pharmacy', $result->getOSMTag()->value);
+        }
     }
 }