diff --git a/web/lib/max_mind_manager.rb b/web/lib/max_mind_manager.rb index fceef6353..db630195c 100644 --- a/web/lib/max_mind_manager.rb +++ b/web/lib/max_mind_manager.rb @@ -5,24 +5,11 @@ class MaxMindManager < BaseManager end def self.countries - Country.get_all.map do |c| - country = Carmen::Country.coded(c.countrycode) - { - countrycode: c.countrycode, - countryname: country.name - } - end + Country.get_all.map { |c| {countrycode: c.countrycode, countryname: c.countryname} } end def self.regions(country) - Region.get_all(country).map do |r| - country = Carmen::Country.coded(r.countrycode) - region = country.subregions.coded(r.region) - { - region: r.region, - name: region.name - } - end + Region.get_all(country).map { |r| { region: r.region, name: r.regionname } } end def self.cities(country, region)