From af95f60e3dd9c08fcf86e67695119455069a5be3 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Fri, 15 Apr 2011 12:00:27 -0400
Subject: [PATCH] Avoid re-defining Result methods.
---
lib/geocoder/results/freegeoip.rb | 3 +--
lib/geocoder/results/geocoder_ca.rb | 2 +-
lib/geocoder/results/yahoo.rb | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/geocoder/results/freegeoip.rb b/lib/geocoder/results/freegeoip.rb
index c1e6e0ab..bb8f1cd2 100644
--- a/lib/geocoder/results/freegeoip.rb
+++ b/lib/geocoder/results/freegeoip.rb
@@ -24,8 +24,7 @@ module Geocoder::Result
end
def self.response_attributes
- %w[city region_code region_name metrocode
- zipcode country_name country_code ip]
+ %w[region_code region_name metrocode zipcode country_name ip]
end
response_attributes.each do |a|
diff --git a/lib/geocoder/results/geocoder_ca.rb b/lib/geocoder/results/geocoder_ca.rb
index f5f9e14b..db52765e 100644
--- a/lib/geocoder/results/geocoder_ca.rb
+++ b/lib/geocoder/results/geocoder_ca.rb
@@ -45,7 +45,7 @@ module Geocoder::Result
def self.response_attributes
%w[latt longt inlatt inlongt betweenRoad1 betweenRoad2 distance
- stnumber staddress city prov postal
+ stnumber staddress prov postal
NearRoad NearRoadDistance intersection major_intersection]
end
diff --git a/lib/geocoder/results/yahoo.rb b/lib/geocoder/results/yahoo.rb
index 1c6ae430..d8e3e0d7 100644
--- a/lib/geocoder/results/yahoo.rb
+++ b/lib/geocoder/results/yahoo.rb
@@ -26,7 +26,7 @@ module Geocoder::Result
def self.response_attributes
%w[quality offsetlat offsetlon radius boundingbox name
line1 line2 line3 line4 cross house street xstreet unittype unit postal
- neighborhood city county state country countrycode statecode countycode
+ neighborhood county state countrycode statecode countycode
level0 level1 level2 level3 level4 level0code level1code level2code
timezone areacode uzip hash woeid woetype]
end
--
GitLab