X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/349413a520d05cf9c55fe6870de6ea2f933a3248..f82f362cea0c044a96da1dfd801d5e4b0196ac32:/lib/osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 300d9fa7a..0f059ce98 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -374,7 +374,7 @@ module OSM
     Timeout::timeout(4) do
       Net::HTTP.start('api.hostip.info') do |http|
         country = http.get("/country.php?ip=#{ip_address}").body
-        country = "GB" if country = "UK"
+        country = "GB" if country == "UK"
         Net::HTTP.start('ws.geonames.org') do |http|
           xml = REXML::Document.new(http.get("/countryInfo?country=#{country}").body)
           xml.elements.each("geonames/country") do |ele|
@@ -414,10 +414,10 @@ module OSM
   # Return an SQL fragment to select a given area of the globe
   def self.sql_for_area(minlat, minlon, maxlat, maxlon, prefix = nil)
     tilesql = QuadTile.sql_for_area(minlat, minlon, maxlat, maxlon, prefix)
-    minlat = (minlat * 1000000).round
-    minlon = (minlon * 1000000).round
-    maxlat = (maxlat * 1000000).round
-    maxlon = (maxlon * 1000000).round
+    minlat = (minlat * 10000000).round
+    minlon = (minlon * 10000000).round
+    maxlat = (maxlat * 10000000).round
+    maxlon = (maxlon * 10000000).round
 
     return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
   end