From 652439100c128d4669e54cf58121e80f61c652fc Mon Sep 17 00:00:00 2001 From: mdcone Date: Mon, 29 Apr 2013 17:27:52 -0700 Subject: [PATCH 1/7] Update yandex.rb --- lib/geocoder/results/yandex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/geocoder/results/yandex.rb b/lib/geocoder/results/yandex.rb index b1b0952a6..a82bd8953 100644 --- a/lib/geocoder/results/yandex.rb +++ b/lib/geocoder/results/yandex.rb @@ -71,7 +71,7 @@ def address_details def sub_state_city if sub_state && sub_state["Locality"] - sub_state['Locality']['LocalityName'] + sub_state['Locality']['DependentLocality']['DependentLocalityName'] else "" end From 374a614e142e1cc0828c60f0998b31a78c3a5e1f Mon Sep 17 00:00:00 2001 From: mdcone Date: Mon, 29 Apr 2013 17:43:15 -0700 Subject: [PATCH 2/7] Update yandex.rb Start fresh --- lib/geocoder/results/yandex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/geocoder/results/yandex.rb b/lib/geocoder/results/yandex.rb index a82bd8953..72f0a3c91 100644 --- a/lib/geocoder/results/yandex.rb +++ b/lib/geocoder/results/yandex.rb @@ -71,7 +71,7 @@ def address_details def sub_state_city if sub_state && sub_state["Locality"] - sub_state['Locality']['DependentLocality']['DependentLocalityName'] + sub_state['Locality']['LocalityName'] else "" end From 537473fdf0c0f2c314b95919a8a7ae0332bb629c Mon Sep 17 00:00:00 2001 From: mdcone Date: Mon, 29 Apr 2013 18:33:13 -0700 Subject: [PATCH 3/7] Update calculations.rb --- lib/geocoder/calculations.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/geocoder/calculations.rb b/lib/geocoder/calculations.rb index 5b47ed024..c9b824deb 100644 --- a/lib/geocoder/calculations.rb +++ b/lib/geocoder/calculations.rb @@ -46,6 +46,7 @@ def coordinates_present?(*args) # def latitude_degree_distance(units = nil) units ||= Geocoder.config.units + units ||= :mi 2 * Math::PI * earth_radius(units) / 360 end @@ -55,6 +56,7 @@ def latitude_degree_distance(units = nil) # def longitude_degree_distance(latitude, units = nil) units ||= Geocoder.config.units + units ||= :mi latitude_degree_distance(units) * Math.cos(to_radians(latitude)) end From 6559c7b91dfc71f1be053a722b5c1684805e0b25 Mon Sep 17 00:00:00 2001 From: mdcone Date: Mon, 29 Apr 2013 18:41:03 -0700 Subject: [PATCH 4/7] Update calculations.rb --- lib/geocoder/calculations.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/geocoder/calculations.rb b/lib/geocoder/calculations.rb index c9b824deb..c7309cdd3 100644 --- a/lib/geocoder/calculations.rb +++ b/lib/geocoder/calculations.rb @@ -46,8 +46,8 @@ def coordinates_present?(*args) # def latitude_degree_distance(units = nil) units ||= Geocoder.config.units - units ||= :mi - 2 * Math::PI * earth_radius(units) / 360 + #this is a hack... + 2 * Math::PI * earth_radius(:mi) / 360 end ## @@ -56,8 +56,8 @@ def latitude_degree_distance(units = nil) # def longitude_degree_distance(latitude, units = nil) units ||= Geocoder.config.units - units ||= :mi - latitude_degree_distance(units) * Math.cos(to_radians(latitude)) + #this is a hack... + latitude_degree_distance(:mi) * Math.cos(to_radians(latitude)) end ## From 889cf8e1c15a1477b30c7397219015f6e512907d Mon Sep 17 00:00:00 2001 From: mdcone Date: Mon, 29 Apr 2013 19:13:12 -0700 Subject: [PATCH 5/7] Update yandex.rb --- lib/geocoder/results/yandex.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/geocoder/results/yandex.rb b/lib/geocoder/results/yandex.rb index 72f0a3c91..8608d33d7 100644 --- a/lib/geocoder/results/yandex.rb +++ b/lib/geocoder/results/yandex.rb @@ -70,8 +70,10 @@ def address_details end def sub_state_city - if sub_state && sub_state["Locality"] - sub_state['Locality']['LocalityName'] + if sub_state && sub_state["Locality"] && sub_state["DependentLocality"] + sub_state['Locality']['DependentLocality']['DependentLocalityName'] + elsif sub_state && sub_state["Locality"] + sub_state['Locality']['LocalityName'] else "" end From cc6d070e33e1982fddfc71158f917fbd15578c28 Mon Sep 17 00:00:00 2001 From: mdcone Date: Mon, 29 Apr 2013 19:56:29 -0700 Subject: [PATCH 6/7] Update yandex.rb --- lib/geocoder/results/yandex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/geocoder/results/yandex.rb b/lib/geocoder/results/yandex.rb index 8608d33d7..d1dc00a97 100644 --- a/lib/geocoder/results/yandex.rb +++ b/lib/geocoder/results/yandex.rb @@ -15,7 +15,7 @@ def city if state.empty? address_details['Locality']['LocalityName'] elsif sub_state.empty? - address_details['AdministrativeArea']['Locality']['LocalityName'] + address_details['AdministrativeArea']['Locality']['DependentLocality']['DependentLocalityName'] elsif not sub_state_city.empty? sub_state_city else From 9951705f656be5c7e69086990afe602c96dd3a31 Mon Sep 17 00:00:00 2001 From: mdcone Date: Mon, 29 Apr 2013 19:57:33 -0700 Subject: [PATCH 7/7] Update yandex.rb --- lib/geocoder/results/yandex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/geocoder/results/yandex.rb b/lib/geocoder/results/yandex.rb index d1dc00a97..f3aff1301 100644 --- a/lib/geocoder/results/yandex.rb +++ b/lib/geocoder/results/yandex.rb @@ -13,7 +13,7 @@ def address(format = :full) def city if state.empty? - address_details['Locality']['LocalityName'] + address_details['Locality']['DependentLocality']['DependentLocalityName'] elsif sub_state.empty? address_details['AdministrativeArea']['Locality']['DependentLocality']['DependentLocalityName'] elsif not sub_state_city.empty?