Add compatibility for multiple osm tag filters

Author: ybert

src/Provider/Photon/Photon.php

@@ -68,10 +68,13 @@ public function geocodeQuery(GeocodeQuery $query): Collection
             .'/api?'
             .http_build_query([
                 'q' => $address,
-                'osm_tag' => $query->getData('osm_tag'),
                 'limit' => $query->getLimit(),
                 'lang' => $query->getLocale(),
             ]);
+        $osmTagFilters = $this->buildOsmTagFilterQuery($query->getData('osm_tag'));
+        if (!empty($osmTagFilters)) {
+            $url .= $osmTagFilters;
+        }
 
         $json = $this->executeQuery($url);
 
@@ -99,10 +102,13 @@ public function reverseQuery(ReverseQuery $query): Collection
             .http_build_query([
                 'lat' => $latitude,
                 'lon' => $longitude,
-                'osm_tag' => $query->getData('osm_tag'),
                 'limit' => $query->getLimit(),
                 'lang' => $query->getLocale(),
             ]);
+        $osmTagFilters = $this->buildOsmTagFilterQuery($query->getData('osm_tag'));
+        if (!empty($osmTagFilters)) {
+            $url .= $osmTagFilters;
+        }
 
         $json = $this->executeQuery($url);
 
@@ -161,6 +167,25 @@ public function getName(): string
         return 'photon';
     }
 
+    /**
+     * @param string|array|null $filters
+     */
+    private function buildOsmTagFilterQuery($filters): string
+    {
+        $query = '';
+        if (null === $filters) {
+            return $query;
+        }
+        if (is_string($filters)) {
+            return '&osm_tag='.urlencode($filters);
+        }
+        foreach ($filters as $filter) {
+            $query .= '&osm_tag='.urlencode($filter);
+        }
+
+        return $query;
+    }
+
     private function executeQuery(string $url): \stdClass
     {
         $content = $this->getUrlContents($url);

…900b8b48594b267db76d84cfe7fd8b0ba4b927d6 …3c362ba852ee2323f9f25ca02c28cc5238959dbcsrc/Provider/Photon/Tests/.cached_responses/photon.komoot.io_900b8b48594b267db76d84cfe7fd8b0ba4b927d6 renamed to src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_3c362ba852ee2323f9f25ca02c28cc5238959dbc src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_900b8b48594b267db76d84cfe7fd8b0ba4b927d6 renamed to src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_3c362ba852ee2323f9f25ca02c28cc5238959dbc

@@ -0,0 +1 @@
+s:2263:"{"features":[{"geometry":{"coordinates":[2.3328439,48.8587571],"type":"Point"},"type":"Feature","properties":{"osm_id":4839163372,"country":"France","city":"Paris","countrycode":"FR","postcode":"75006","locality":"Saint-Germain-des-Prés","type":"house","osm_type":"N","osm_key":"tourism","street":"Promenade Marceline Loridan-Ivens","district":"Paris","osm_value":"artwork","name":"La Ville de Paris","state":"Île-de-France"}},{"geometry":{"coordinates":[2.418394477960865,48.8318844],"type":"Point"},"type":"Feature","properties":{"osm_id":26008116,"extent":[2.4141177,48.834668,2.4204695,48.8289812],"country":"France","city":"Paris","countrycode":"FR","postcode":"75012","locality":"Quartier du Bel-Air","type":"house","osm_type":"W","osm_key":"tourism","street":"Promenade Maurice-Boitel","district":"Paris","osm_value":"zoo","name":"Parc zoologique de Paris","state":"Île-de-France"}},{"geometry":{"coordinates":[2.345051233260165,48.85565735],"type":"Point"},"type":"Feature","properties":{"osm_id":536982,"extent":[2.3429677,48.856811,2.3462472,48.8544964],"country":"France","city":"Paris","countrycode":"FR","postcode":"75001","locality":"Quartier Saint-Germain-l'Auxerrois","type":"house","osm_type":"R","osm_key":"tourism","street":"Cour du Premier Président","district":"Paris","osm_value":"attraction","name":"Palais de Justice de Paris","state":"Île-de-France"}},{"geometry":{"coordinates":[2.2933072,48.870745],"type":"Point"},"type":"Feature","properties":{"osm_id":2990418382,"country":"France","city":"Paris","countrycode":"FR","postcode":"75116","locality":"Quartier de Chaillot","type":"house","osm_type":"N","osm_key":"tourism","street":"Avenue Kléber","district":"Paris","osm_value":"hotel","name":"The Peninsula Paris","state":"Île-de-France"}},{"geometry":{"coordinates":[2.288981354650506,48.82872115000001],"type":"Point"},"type":"Feature","properties":{"osm_id":129135460,"extent":[2.2847236,48.8321689,2.2921187,48.8253682],"country":"France","city":"Paris","countrycode":"FR","postcode":"75015","locality":"Paris Expo Porte de Versailles","type":"house","osm_type":"W","osm_key":"tourism","district":"Paris","osm_value":"attraction","name":"Parc des Expositions de Paris","state":"Île-de-France"}}],"type":"FeatureCollection"}";

…f3b7c730ba71e84b11ac92049cd31806186e0ef1 …8cd3447834c3ae8316dda602714b4ca4959eae65src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_f3b7c730ba71e84b11ac92049cd31806186e0ef1 renamed to src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_8cd3447834c3ae8316dda602714b4ca4959eae65 src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_f3b7c730ba71e84b11ac92049cd31806186e0ef1 renamed to src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_8cd3447834c3ae8316dda602714b4ca4959eae65

@@ -111,6 +111,22 @@ public function testGeocodeQueryWithOsmTagFilter()
         }
     }
 
+    public function testGeocodeQueryWithMultipleOsmTagFilter()
+    {
+        $provider = Photon::withKomootServer($this->getHttpClient());
+        $query = GeocodeQuery::create('Paris')
+            ->withData('osm_tag', ['tourism', ':!museum'])
+            ->withLimit(5);
+        $results = $provider->geocodeQuery($query);
+
+        $this->assertCount(5, $results);
+        foreach ($results as $result) {
+            $this->assertInstanceOf(PhotonAddress::class, $result);
+            $this->assertEquals('tourism', $result->getOSMTag()->key);
+            $this->assertNotEquals('museum', $result->getOSMTag()->value);
+        }
+    }
+
     public function testReverseQuery()
     {
         $provider = Photon::withKomootServer($this->getHttpClient());