Merge branch 'master' into openstreetbugs

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index 3eab72b2d91c574b1be59db17b318906e2c101c7..d44227dd85d77d07ec30db995041595d6dea3c92 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -42,19 +42,6 @@ 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. 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.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError.new
-    end
-  end
 private
   
   def lat2y(a)
@@ -66,6 +53,11 @@ private
       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