From 2ab17e6d88f9a06b1b70eb8c769983d8bfbf9f2a Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Fri, 22 Apr 2011 13:17:32 -0400
Subject: [PATCH] Clean up state/province code.
---
lib/geocoder/results/geocoder_ca.rb | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/lib/geocoder/results/geocoder_ca.rb b/lib/geocoder/results/geocoder_ca.rb
index 650f8e5c..e0f4bdd8 100644
--- a/lib/geocoder/results/geocoder_ca.rb
+++ b/lib/geocoder/results/geocoder_ca.rb
@@ -34,19 +34,14 @@ module Geocoder::Result
end
def country_code
- prov = @data['prov']
- return nil if prov.nil? || prov == ""
- canadian_province_abbreviations.include?(@data['prov']) ? "CA" : "US"
- end
-
- def canadian_province_abbreviations
- %w[ON QC NS NB MB BC PE SK AB NL]
+ return nil if state.nil? || state == ""
+ canadian_province_abbreviations.include?(state) ? "CA" : "US"
end
def self.response_attributes
- %w[latt longt inlatt inlongt betweenRoad1 betweenRoad2 distance
- stnumber staddress prov postal
- NearRoad NearRoadDistance intersection major_intersection]
+ %w[latt longt inlatt inlongt distance stnumber staddress prov
+ NearRoad NearRoadDistance betweenRoad1 betweenRoad2
+ intersection major_intersection]
end
response_attributes.each do |a|
@@ -54,5 +49,12 @@ module Geocoder::Result
@data[a]
end
end
+
+
+ private # ----------------------------------------------------------------
+
+ def canadian_province_abbreviations
+ %w[ON QC NS NB MB BC PE SK AB NL]
+ end
end
end
--
GitLab