feat: [Photon] support multiple layers

src/Provider/Photon/Photon.php

@@ -68,12 +68,12 @@ public function geocodeQuery(GeocodeQuery $query): Collection
  .'/api?'
  .http_build_query([
  'q' => $address,
- 'layer' => $query->getData('layer'),
  'limit' => $query->getLimit(),
  'lang' => $query->getLocale(),
  'lat' => $query->getData('lat'),
  'lon' => $query->getData('lon'),
  ]);
+ $url .= $this->buildLayerFilterQuery($query->getData('layer'));
  $osmTagFilters = $this->buildOsmTagFilterQuery($query->getData('osm_tag'));
  if (!empty($osmTagFilters)) {
  $url .= $osmTagFilters;
@@ -109,11 +109,11 @@ public function reverseQuery(ReverseQuery $query): Collection
  .http_build_query([
  'lat' => $latitude,
  'lon' => $longitude,
- 'layer' => $query->getData('layer'),
  'radius' => $query->getData('radius'),
  'limit' => $query->getLimit(),
  'lang' => $query->getLocale(),
  ]);
+ $url .= $this->buildLayerFilterQuery($query->getData('layer'));
  $osmTagFilters = $this->buildOsmTagFilterQuery($query->getData('osm_tag'));
  if (!empty($osmTagFilters)) {
  $url .= $osmTagFilters;
@@ -177,6 +177,22 @@ public function getName(): string
  return 'photon';
  }
 
+ private function buildLayerFilterQuery(mixed $layers): string
+ {
+ if (!is_iterable($layers)) {
+ $layers = [$layers];
+ }
+
+ if (!is_array($layers)) {
+ $layers = iterator_to_array($layers);
+ }
+
+ return implode('', array_map(
+ static fn ($layer) => sprintf('&layer=%s', $layer),
+ array_filter($layers, static fn ($layer) => is_scalar($layer)),
+ ));
+ }
+
  /**
  * @param string|array<int, string>|null $filters
  */

src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_4d9e19f668373f9804a90f41f1a499a74ded2594

@@ -0,0 +1 @@
+s:359:"{"features":[{"geometry":{"coordinates":[21.2392122,49.0000074],"type":"Point"},"type":"Feature","properties":{"osm_type":"R","osm_id":388255,"extent":[20.870461,49.185185,21.485864,48.810739],"country":"Slovensko","osm_key":"place","countrycode":"SK","osm_value":"city","name":"Prešov","state":"Prešovský kraj","type":"city"}}],"type":"FeatureCollection"}";

src/Provider/Photon/Tests/.cached_responses/photon.komoot.io_ed91365025e794205300bed4ad45119eeeed5f3f

@@ -0,0 +1 @@
+s:703:"{"features":[{"geometry":{"coordinates":[21.2392122,49.0000074],"type":"Point"},"type":"Feature","properties":{"osm_type":"R","osm_id":388255,"extent":[20.870461,49.185185,21.485864,48.810739],"country":"Slovensko","osm_key":"place","countrycode":"SK","osm_value":"city","name":"Prešov","state":"Prešovský kraj","type":"city"}},{"geometry":{"coordinates":[21.2392122,49.0000074],"type":"Point"},"type":"Feature","properties":{"osm_type":"R","osm_id":2320257,"extent":[21.1569866,49.0468381,21.3354271,48.9449997],"country":"Slovensko","osm_key":"place","city":"Prešov","countrycode":"SK","osm_value":"city","name":"Prešov","state":"Prešovský kraj","type":"district"}}],"type":"FeatureCollection"}";

src/Provider/Photon/Tests/PhotonTest.php

@@ -213,6 +213,32 @@ public function testReverseQueryWithLayerCityAndRadiusFilter(): void
  $this->assertEquals('Berlin', $result->getLocality());
  }
 
+ public function testReverseQueryWithMultipleLayers(): void
+ {
+ $provider = Photon::withKomootServer($this->getHttpClient());
+ $reverseQuery = ReverseQuery::fromCoordinates(49.001831, 21.239311)
+ ->withData('layer', 'city')
+ ->withLimit(2);
+
+ $results = $provider->reverseQuery($reverseQuery);
+ $this->assertInstanceOf(AddressCollection::class, $results);
+ $this->assertCount(1, $results);
+ $result0 = $results->get(0);
+ $this->assertInstanceOf(PhotonAddress::class, $result0);
+ $this->assertEquals('city', $result0->getType());
+
+ $reverseQuery = $reverseQuery->withData('layer', ['city', 'district']);
+ $results = $provider->reverseQuery($reverseQuery);
+ $this->assertInstanceOf(AddressCollection::class, $results);
+ $this->assertCount(2, $results);
+ $result0 = $results->get(0);
+ $this->assertInstanceOf(PhotonAddress::class, $result0);
+ $this->assertEquals('city', $result0->getType());
+ $result1 = $results->get(1);
+ $this->assertInstanceOf(PhotonAddress::class, $result1);
+ $this->assertEquals('district', $result1->getType());
+ }
+
  public function testGeocodeQueryWithBbox(): void
  {
  // Germany