lib/geocoder/results/yandex.rb in geocoder-1.0.5 vs lib/geocoder/results/yandex.rb in geocoder-1.1.0

@@ -10,11 +10,15 @@
     def address(format = :full)
       @data['GeoObject']['metaDataProperty']['GeocoderMetaData']['text']
     end
 
     def city
-      address_details['Locality']['LocalityName']
+      if state.empty?
+        address_details['Locality']['LocalityName']
+      else
+        address_details['AdministrativeArea']['Locality']['LocalityName']
+      end
     end
 
     def country
       address_details['CountryName']
     end
@@ -22,10 +26,14 @@
     def country_code
       address_details['CountryNameCode']
     end
 
     def state
-      ""
+      if address_details['AdministrativeArea']
+        address_details['AdministrativeArea']['AdministrativeAreaName']
+      else
+        ""
+      end
     end
 
     def state_code
       ""
     end