Merge branch 'master' into openstreetbugs

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 78d32e739e39cb7a0c259665ff544e4b4352780e..9ee36e0c7aa6b26db8b085b152d2acf73d52eeec 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -498,23 +498,14 @@ 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)
 
   # 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 * 10000000).round
-    minlon = (minlon * 10000000).round
-    maxlat = (maxlat * 10000000).round
-    maxlon = (maxlon * 10000000).round
+    tilesql = QuadTile.sql_for_area(minlat, minlon, maxlat, maxlon, prefix)

 
 

-    return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
-  end
-
-  # Return an SQL fragment to select a given area of the globe without using the quadtile index
-  def self.sql_for_area_no_quadtile(minlat, minlon, maxlat, maxlon, prefix = nil, without_quadtile = :false)

     minlat = (minlat * 10000000).round
     minlon = (minlon * 10000000).round
     maxlat = (maxlat * 10000000).round
     maxlon = (maxlon * 10000000).round
 
     minlat = (minlat * 10000000).round
     minlon = (minlon * 10000000).round
     maxlat = (maxlat * 10000000).round
     maxlon = (maxlon * 10000000).round
 

-    return "#{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
+    return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"

   end
 
   # Return a spam score for a chunk of text
   end
 
   # Return a spam score for a chunk of text