X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/33a65a90c9d0e2ab121e1da9c3efedaf9e6a9789..60d8673e3027ea672f50bb12873a440d46195ff3:/lib/osm.rb diff --git a/lib/osm.rb b/lib/osm.rb index e5d3c7fbb..45c506e2e 100644 --- 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) - 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}" + 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 + + return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}" end end