Allow column names in area conditions to be qualified, and do so for

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index e5d3c7fbb6b653172cf804bbe744be8021b39e52..300d9fa7a43224ac306d78098a41ccb2fafc7b78 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -412,13 +412,13 @@ module OSM
   end
 
   # Return an SQL fragment to select a given area of the globe
-  def self.sql_for_area(minlat, minlon, maxlat, maxlon)
-    tilesql = QuadTile.sql_for_area(minlat, minlon, maxlat, maxlon)
+  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
 
-    return "#{tilesql} AND latitude BETWEEN #{minlat} AND #{maxlat} AND longitude BETWEEN #{minlon} AND #{maxlon}"
+    return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
   end
 end