X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/42b329ed82c7899b970e1f0fd8d6d29fd625f7d5..3d79f9fd88ab2784b292c8eafc46070472b2a4c9:/lib/country.rb diff --git a/lib/country.rb b/lib/country.rb index ea52efd77..ca547a972 100644 --- a/lib/country.rb +++ b/lib/country.rb @@ -9,19 +9,17 @@ class Country @max_lon = max_lon end - def self.find_by_code(code) + def self.find(code) countries[code] end -private - def self.countries - @@countries ||= load_countries + @countries ||= load_countries end def self.load_countries - countries = Hash.new - xml = REXML::Document.new(File.read("config/countries.xml")) + countries = {} + xml = REXML::Document.new(Rails.root.join("config/countries.xml").read) xml.elements.each("geonames/country") do |ele| code = ele.get_text("countryCode").to_s