X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a2498928e470b358f69902d9fdc72a1a80aa5bf8..fb4d003ebee8842ace3807bb1a60b9b36d94723e:/lib/geo_record.rb diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 645ddc93a..4aa45531f 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -42,23 +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 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) @@ -71,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