X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/24b21e4a29d28a3174965d449d36465ecda9ead7..0dba53c0232385f0fd080266f9a5ce3665426293:/lib/geo_record.rb diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 273419757..0728a6aa1 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -6,10 +6,7 @@ module GeoRecord def self.included(base) base.extend(ClassMethods) - end - - def before_save - self.update_tile + base.before_save :update_tile end # Is this node within -90 >= latitude >= 90 and -180 >= longitude >= 180 @@ -42,25 +39,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.empty? - 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)