Merge branch 'master' into openstreetbugs

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index f1a923c42c1e48b3b0de75d2e67b744bdecea23a..d44227dd85d77d07ec30db995041595d6dea3c92 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -1,4 +1,9 @@
 module GeoRecord
 module GeoRecord

+  # This scaling factor is used to convert between the float lat/lon that is 
+  # returned by the API, and the integer lat/lon equivalent that is stored in
+  # the database.
+  SCALE = 10000000
+  

   def self.included(base)
     base.extend(ClassMethods)
   end
   def self.included(base)
     base.extend(ClassMethods)
   end


@@ -20,21 +25,21 @@ module GeoRecord
   end
 
   def lat=(l)
   end
 
   def lat=(l)

-    self.latitude = (l * 10000000).round
+    self.latitude = (l * SCALE).round

   end
 
   def lon=(l)
   end
 
   def lon=(l)

-    self.longitude = (l * 10000000).round
+    self.longitude = (l * SCALE).round

   end
 
   # Return WGS84 latitude
   def lat
   end
 
   # Return WGS84 latitude
   def lat

-    return self.latitude.to_f / 10000000
+    return self.latitude.to_f / SCALE

   end
 
   # Return WGS84 longitude
   def lon
   end
 
   # Return WGS84 longitude
   def lon

-    return self.longitude.to_f / 10000000
+    return self.longitude.to_f / SCALE

   end
 
 private
   end
 
 private


@@ -48,6 +53,11 @@ private
       self.with_scope(:find => {:conditions => OSM.sql_for_area(minlat, minlon, maxlat, maxlon)}) do
         return self.find(:all, options)
       end
       self.with_scope(:find => {:conditions => OSM.sql_for_area(minlat, minlon, maxlat, maxlon)}) do
         return self.find(:all, options)
       end

+    end
+       def find_by_area_no_quadtile(minlat, minlon, maxlat, maxlon, options)
+      self.with_scope(:find => {:conditions => OSM.sql_for_area_no_quadtile(minlat, minlon, maxlat, maxlon)}) do
+        return self.find(:all, options)
+      end

     end
   end
 end
     end
   end
 end