X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..44e778aedd91a84582cbbef4ffc6e9912d001d66:/lib/osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 3a0beccdf..370f0f300 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -63,7 +63,8 @@ module OSM
   # Raised when to delete an already-deleted object.
   class APIAlreadyDeletedError < APIError
     def initialize(object = "object", object_id = "")
-      @object, @object_id = object, object_id
+      @object = object
+      @object_id = object_id
     end
 
     attr_reader :object, :object_id
@@ -171,7 +172,8 @@ module OSM
   # the changeset ID that the diff was uploaded to.
   class APIChangesetMismatchError < APIError
     def initialize(provided, allowed)
-      @provided, @allowed = provided, allowed
+      @provided = provided
+      @allowed = allowed
     end
 
     def status
@@ -203,7 +205,9 @@ module OSM
   # they should.
   class APIBadXMLError < APIError
     def initialize(model, xml, message = "")
-      @model, @xml, @message = model, xml, message
+      @model = model
+      @xml = xml
+      @message = message
     end
 
     def status
@@ -218,7 +222,10 @@ module OSM
   # Raised when the provided version is not equal to the latest in the db.
   class APIVersionMismatchError < APIError
     def initialize(id, type, provided, latest)
-      @id, @type, @provided, @latest = id, type, provided, latest
+      @id = id
+      @type = type
+      @provided = provided
+      @latest = latest
     end
 
     attr_reader :provided, :latest, :id, :type
@@ -236,7 +243,9 @@ module OSM
   # this is now forbidden by the API.
   class APIDuplicateTagsError < APIError
     def initialize(type, id, tag_key)
-      @type, @id, @tag_key = type, id, tag_key
+      @type = type
+      @id = id
+      @tag_key = tag_key
     end
 
     attr_reader :type, :id, :tag_key
@@ -254,7 +263,9 @@ module OSM
   # This prevents ways from being to long and difficult to work with
   class APITooManyWayNodesError < APIError
     def initialize(id, provided, max)
-      @id, @provided, @max = id, provided, max
+      @id = id
+      @provided = provided
+      @max = max
     end
 
     attr_reader :id, :provided, :max
@@ -487,29 +498,23 @@ module OSM
       root["generator"] = GENERATOR
       root["copyright"] = COPYRIGHT_OWNER
       root["attribution"] = ATTRIBUTION_URL
-      root["license"] =  LICENSE_URL
+      root["license"] = LICENSE_URL
       doc.root = root
       doc
     end
   end
 
   def self.ip_to_country(ip_address)
-    Timer.timeout(4) do
-      ipinfo = Quova::IpInfo.new(ip_address)
-
-      if ipinfo.status == Quova::SUCCESS
-        country = ipinfo.country_code
-      else
-        Net::HTTP.start("api.hostip.info") do |http|
-          country = http.get("/country.php?ip=#{ip_address}").body
-          country = "GB" if country == "UK"
-        end
-      end
+    ipinfo = geoip_database.country(ip_address) if defined?(GEOIP_DATABASE)
 
-      return country.upcase
+    if ipinfo
+      country = ipinfo.country_code2
+    else
+      country = http_client.get("http://api.hostip.info/country.php?ip=#{ip_address}").body
+      country = "GB" if country == "UK"
     end
 
-    return nil
+    return country
   rescue StandardError
     return nil
   end
@@ -517,7 +522,7 @@ module OSM
   def self.ip_location(ip_address)
     code = OSM.ip_to_country(ip_address)
 
-    if code && country = Country.find_by_code(code)
+    if code && country = Country.find(code)
       return { :minlon => country.min_lon, :minlat => country.min_lat, :maxlon => country.max_lon, :maxlat => country.max_lat }
     end
 
@@ -552,9 +557,20 @@ module OSM
       "AND #{prefix}longitude BETWEEN #{bbox.min_lon} AND #{bbox.max_lon}"
   end
 
+  # Return the terms and conditions text for a given country
   def self.legal_text_for_country(country_code)
     file_name = File.join(Rails.root, "config", "legales", country_code.to_s + ".yml")
     file_name = File.join(Rails.root, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
     YAML.load_file(file_name)
   end
+
+  # Return the HTTP client to use
+  def self.http_client
+    @http_client ||= Faraday.new
+  end
+
+  # Return the GeoIP database handle
+  def self.geoip_database
+    @geoip_database ||= GeoIP.new(GEOIP_DATABASE) if defined?(GEOIP_DATABASE)
+  end
 end