X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/233a97bfcbee9c82027c049bb8bafac2693ec359..24b21e4a29d28a3174965d449d36465ecda9ead7:/lib/geo_record.rb diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 3eab72b2d..273419757 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -45,10 +45,16 @@ module GeoRecord # 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 + # 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?