Merge remote-tracking branch 'upstream/pull/1809'

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 7556e631b57d28750f90ad774441b7491f68372b..71e12534ffe57c348d4802d81aeb40f9a4b31cbf 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -475,12 +475,12 @@ module OSM
         lonradius = PI
       end
 
-      minlat = (@lat - latradius) * 180 / PI
-      maxlat = (@lat + latradius) * 180 / PI
-      minlon = (@lon - lonradius) * 180 / PI
-      maxlon = (@lon + lonradius) * 180 / PI
+      minlat = [(@lat - latradius) * 180 / PI, -90].max
+      maxlat = [(@lat + latradius) * 180 / PI, 90].min
+      minlon = [(@lon - lonradius) * 180 / PI, -180].max
+      maxlon = [(@lon + lonradius) * 180 / PI, 180].min
 
-      { :minlat => minlat, :maxlat => maxlat, :minlon => minlon, :maxlon => maxlon }
+      BoundingBox.new(minlon, minlat, maxlon, maxlat)
     end
 
     # get the SQL to use to calculate distance
@@ -498,35 +498,31 @@ 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 defined?(QUOVA_USERNAME)
-
-      if ipinfo && ipinfo.status == Quova::SUCCESS
-        country = ipinfo.country_code
-      else
-        country = http_client.get("http://api.hostip.info/country.php?ip=#{ip_address}").body
-        country = "GB" if country == "UK"
-      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
+    country
   rescue StandardError
-    return nil
+    nil
   end
 
   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
 
@@ -536,7 +532,7 @@ module OSM
   # Parse a float, raising a specified exception on failure
   def self.parse_float(str, klass, *args)
     Float(str)
-  rescue
+  rescue StandardError
     raise klass.new(*args)
   end
 
@@ -557,14 +553,14 @@ module OSM
     tilesql = QuadTile.sql_for_area(bbox, prefix)
     bbox = bbox.to_scaled
 
-    "#{tilesql} AND #{prefix}latitude BETWEEN #{bbox.min_lat} AND #{bbox.max_lat} " +
+    "#{tilesql} AND #{prefix}latitude BETWEEN #{bbox.min_lat} AND #{bbox.max_lat} " \
       "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
+    file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml")
+    file_name = Rails.root.join("config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
     YAML.load_file(file_name)
   end
 
@@ -573,8 +569,8 @@ module OSM
     @http_client ||= Faraday.new
   end
 
-  # Set the HTTP client to use
-  def self.http_client=(client)
-    @http_client = client
+  # Return the GeoIP database handle
+  def self.geoip_database
+    @geoip_database ||= GeoIP.new(GEOIP_DATABASE) if defined?(GEOIP_DATABASE)
   end
 end