Tidy up some of the map bugs code

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index 286ce69e14a411bb6f1f9214bc678758b3496f79..4aa45531f37a6719c43aa7277896d358c96eda7c 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -42,15 +42,6 @@ module GeoRecord
     return self.longitude.to_f / SCALE
   end
 
-  # Potlatch projections
-  def lon_potlatch(baselong,masterscale)
-    (self.lon-baselong)*masterscale
-  end
-
-  def lat_potlatch(basey,masterscale)
-    -(lat2y(self.lat)-basey)*masterscale
-  end
-  
 private
   
   def lat2y(a)
@@ -63,6 +54,12 @@ private
         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