Bump max blocklength for additional routes

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 40027991a036ea7611bda63dbba35b357772ebcb..841cce17b8f49dba022de129d7d50b04aba63335 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -480,7 +480,7 @@ module OSM
       minlon = [(@lon - lonradius) * 180 / PI, -180].max
       maxlon = [(@lon + lonradius) * 180 / PI, 180].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
     end
 
     # get the SQL to use to calculate distance


@@ -510,13 +510,13 @@ module OSM
     if ipinfo
       country = ipinfo.country_code2
     else
     if ipinfo
       country = ipinfo.country_code2
     else

-      country = http_client.get("http://api.hostip.info/country.php?ip=#{ip_address}").body
+      country = http_client.get("https://api.hostip.info/country.php?ip=#{ip_address}").body

       country = "GB" if country == "UK"
     end
 
       country = "GB" if country == "UK"
     end
 

-    return country
+    country

   rescue StandardError
   rescue StandardError

-    return nil
+    nil

   end
 
   def self.ip_location(ip_address)
   end
 
   def self.ip_location(ip_address)