Fix update-wiki-pages to resolve redirects correctly

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index 645ddc93a7f509549a98b9f61eceb83b5e87845a..fbfb0c2ce07bed5e7ba39a4b0efebe899fd0c975 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -5,11 +5,8 @@ module GeoRecord
   SCALE = 10000000
   
   def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  def before_save
-    self.update_tile
+    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
@@ -42,35 +39,9 @@ module GeoRecord
     return self.longitude.to_f / SCALE
   end
 
-  # Generic checks that are run for the updates and deletes of
-  # node, ways and relations. This code is here to avoid duplication, 
-  # and allow the extention of the checks without having to modify the
-  # code in 6 places for all the updates and deletes. Some of these tests are 
-  # needed for creates, but are currently not run :-( 
-  # This will throw an exception if there is an inconsistency
-  def check_consistency(old, new, user)
-    if new.version != old.version
-      raise OSM::APIVersionMismatchError.new(new.version, old.version)
-    elsif new.changeset.nil?
-      raise OSM::APIChangesetMissingError.new
-    elsif new.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError.new
-    end
-  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
-  end
 end
-