X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b72fedb162d3fcecc304d7dfe5f67acb30844099..2805118a6047fa9e5814d44003d993507222fb90:/lib/geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index d5604d4d3..0d010eb86 100644
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -1,6 +1,12 @@
 module GeoRecord
-  def before_save
-    self.update_tile
+  # 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.scope :bbox, lambda { |bbox| base.where(OSM.sql_for_area(bbox)) }
+    base.before_save :update_tile
   end
 
   # Is this node within -90 >= latitude >= 90 and -180 >= longitude >= 180
@@ -11,48 +17,32 @@ module GeoRecord
     return true
   end
 
-  def self.find_by_area(minlat, minlon, maxlat, maxlon, options)
-    self.with_scope(:find => {:conditions => OSM.sql_for_area(minlat, minlon, maxlat, maxlon)}) do
-      return self.find(:all, options)
-    end
-  end
-
   def update_tile
     self.tile = QuadTile.tile_for_point(lat, lon)
   end
 
   def lat=(l)
-    self.latitude = (l * 10000000).round
+    self.latitude = (l * SCALE).round
   end
 
   def lon=(l)
-    self.longitude = (l * 10000000).round
+    self.longitude = (l * SCALE).round
   end
 
   # Return WGS84 latitude
   def lat
-    return self.latitude.to_f / 10000000
+    return self.latitude.to_f / SCALE
   end
 
   # Return WGS84 longitude
   def lon
-    return self.longitude.to_f / 10000000
-  end
-
-  # Potlatch projections
-  def lon_potlatch(baselong,masterscale)
-    (self.lon-baselong)*masterscale
+    return self.longitude.to_f / SCALE
   end
 
-  def lat_potlatch(basey,masterscale)
-    -(lat2y(self.lat)-basey)*masterscale
-  end
-  
-  private
+private
   
   def lat2y(a)
     180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2))
   end
-
 end