Refactor bounding box code

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 60e33c7db8fd6e31ac5ce66fe6972c318322f419..02c51df7809b599debb11810cb6350ee7048bfc8 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -497,14 +497,12 @@ module OSM
   end
 
   # Return an SQL fragment to select a given area of the globe
   end
 
   # 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
-
-    return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
+  def self.sql_for_area(bbox, prefix = nil)
+    tilesql = QuadTile.sql_for_area(bbox, prefix)
+    bbox = bbox.to_scaled
+
+    return "#{tilesql} AND #{prefix}latitude BETWEEN #{bbox.min_lat} AND #{bbox.max_lat} " +
+                      "AND #{prefix}longitude BETWEEN #{bbox.min_lon} AND #{bbox.max_lon}"

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


@@ -529,8 +527,8 @@ module OSM
   end
 
   def self.legal_text_for_country(country_code)
   end
 
   def self.legal_text_for_country(country_code)

-    file_name = File.join(RAILS_ROOT, "config", "legales", country_code.to_s + ".yml")
-    file_name = File.join(RAILS_ROOT, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
+    file_name = File.join(Rails.root, "config", "legales", country_code.to_s + ".yml")
+    file_name = File.join(Rails.root, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name

     YAML::load_file(file_name)
   end
 end
     YAML::load_file(file_name)
   end
 end