Convert more 'setup do' to 'def setup' for consistency

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index 025bbe4a87b38b13a960751bdc2e63304e75e762..09ced972930cc8289ff9b7d76e80a119cca33810 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -1,18 +1,20 @@
 module GeoRecord
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
+  # 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 before_save
-    self.update_tile
+  def self.included(base)
+    base.scope :bbox, ->(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
   # * returns true/false
   def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
+    return false if lat < -90 || lat > 90
+    return false if lon < -180 || lon > 180
+    true
   end
 
   def update_tile
@@ -20,44 +22,20 @@ module GeoRecord
   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
+    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
-  end
-
-  def lat_potlatch(basey,masterscale)
-    -(lat2y(self.lat)-basey)*masterscale
-  end
-  
-private
-  
-  def lat2y(a)
-    180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2))
-  end
-
-  module ClassMethods
-    def 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
+    longitude.to_f / SCALE
   end
 end
-