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

@@ -12,12 +12,14 @@
     end
 
     def city
       if state.empty?
         address_details['Locality']['LocalityName']
-      else
+      elsif sub_state.empty?
         address_details['AdministrativeArea']['Locality']['LocalityName']
+      else 
+        address_details['AdministrativeArea']['SubAdministrativeArea']['Locality']['LocalityName']
       end
     end
 
     def country
       address_details['CountryName']
@@ -28,9 +30,17 @@
     end
 
     def state
       if address_details['AdministrativeArea']
         address_details['AdministrativeArea']['AdministrativeAreaName']
+      else
+        ""
+      end
+    end
+
+    def sub_state
+      if !state.empty? and address_details['AdministrativeArea']['SubAdministrativeArea']
+        address_details['AdministrativeArea']['SubAdministrativeArea']['SubAdministrativeAreaName']
       else
         ""
       end
     end