Merge pull request #247 from Koc/yandex-cities

Add support for cities in Yandex Provider

Author: willdurand

src/Geocoder/Provider/YandexProvider.php

@@ -111,7 +111,8 @@ protected function executeQuery($query)
             $item           = $item['GeoObject'];
             $country        = $item['metaDataProperty']['GeocoderMetaData']['AddressDetails']['Country'];
             $addressDetails = isset($country['AdministrativeArea']) ? $country['AdministrativeArea'] : $country;
-            $locality       = isset($addressDetails['Locality']['Thoroughfare']) ? $addressDetails['Locality']['Thoroughfare'] : null;
+            $locality       = isset($addressDetails['Locality']) ? $addressDetails['Locality'] : null;
+            $thoroughfare   = isset($locality['Thoroughfare']) ? $locality['Thoroughfare'] : null;
             $coordinates    = explode(' ', $item['Point']['pos']);
             $bounds         = null;
             $lowerCorner    = explode(' ', $item['boundedBy']['Envelope']['lowerCorner']);
@@ -127,8 +128,9 @@ protected function executeQuery($query)
                 'latitude'      => isset($coordinates[1]) ? $coordinates[1] : null,
                 'longitude'     => isset($coordinates[0]) ? $coordinates[0] : null,
                 'bounds'        => $bounds,
-                'streetNumber'  => isset($locality['Premise']['PremiseNumber']) ? $locality['Premise']['PremiseNumber'] : null,
-                'streetName'    => isset($locality['ThoroughfareName']) ? $locality['ThoroughfareName'] : null,
+                'streetNumber'  => isset($thoroughfare['Premise']['PremiseNumber']) ? $thoroughfare['Premise']['PremiseNumber'] : null,
+                'streetName'    => isset($thoroughfare['ThoroughfareName']) ? $thoroughfare['ThoroughfareName'] : null,
+                'city'          => isset($locality['LocalityName']) ? $locality['LocalityName'] : null,
                 'cityDistrict'  => isset($addressDetails['AdministrativeAreaName']) ? $addressDetails['AdministrativeAreaName'] : null,
                 'country'       => isset($country['CountryName']) ? $country['CountryName'] : null,
                 'countryCode'   => isset($country['CountryNameCode']) ? $country['CountryNameCode'] : null,

tests/Geocoder/Tests/Provider/YandexProviderTest.php

@@ -149,12 +149,12 @@ public function testGetGeocodedDataWithRealAddressWithUALocale()
         $this->assertNull($results[0]['streetNumber']);
         $this->assertEquals('Столичная область', $results[0]['cityDistrict']);
         $this->assertNull($results[0]['streetName']);
+        $this->assertEquals('Копенгаген', $results[0]['city']);
         $this->assertEquals('Данія', $results[0]['country']);
         $this->assertEquals('DK', $results[0]['countryCode']);
 
         // not provided
         $this->assertNull($results[0]['zipcode']);
-        $this->assertNull($results[0]['city']);
         $this->assertNull($results[0]['region']);
         $this->assertNull($results[0]['regionCode']);
         $this->assertNull($results[0]['timezone']);
@@ -193,12 +193,12 @@ public function testGetGeocodedDataWithRealAddressWithUSLocale()
         $this->assertEquals(-77.012453, $results[0]['bounds']['east'], '', 0.01);
         $this->assertEquals('District of Columbia', $results[0]['cityDistrict']);
         $this->assertEquals('Pennsylvania Ave NW', $results[0]['streetName']);
+        $this->assertEquals('Washington', $results[0]['city']);
         $this->assertEquals('United States', $results[0]['country']);
         $this->assertEquals('US', $results[0]['countryCode']);
 
         // not provided
         $this->assertNull($results[0]['zipcode']);
-        $this->assertNull($results[0]['city']);
         $this->assertNull($results[0]['region']);
         $this->assertNull($results[0]['regionCode']);
         $this->assertNull($results[0]['timezone']);
@@ -239,12 +239,12 @@ public function testGetGeocodedDataWithRealAddressWithBYLocale()
         $this->assertEquals(19, $result['streetNumber']);
         $this->assertNull($result['cityDistrict']);
         $this->assertEquals('улица Ленина', $result['streetName']);
+        $this->assertEquals('Минск', $result['city']);
         $this->assertEquals('Беларусь', $result['country']);
         $this->assertEquals('BY', $result['countryCode']);
 
         // not provided
         $this->assertNull($result['zipcode']);
-        $this->assertNull($result['city']);
         $this->assertNull($result['region']);
         $this->assertNull($result['regionCode']);
         $this->assertNull($result['timezone']);
@@ -380,12 +380,12 @@ public function testGetReversedDataWithRealCoordinatesWithUALocaleAndHouseTopony
         $this->assertEquals(36, $results[0]['streetNumber']);
         $this->assertEquals('Исконная Финляндия', $results[0]['cityDistrict']);
         //$this->assertEquals('Bangårdsgatan', $results[0]['streetName']);
+        $this->assertEquals('Турку', $results[0]['city']);
         $this->assertEquals('Фінляндія', $results[0]['country']);
         $this->assertEquals('FI', $results[0]['countryCode']);
 
         // not provided
         $this->assertNull($results[0]['zipcode']);
-        $this->assertNull($results[0]['city']);
         $this->assertNull($results[0]['region']);
         $this->assertNull($results[0]['regionCode']);
         $this->assertNull($results[0]['timezone']);