# 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
+ # and allow the extension 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
raise OSM::APIChangesetMissingError
elsif new.changeset.user_id != user.id
raise OSM::APIUserChangesetMismatchError
- elsif !new.changeset.is_open?
+ elsif !new.changeset.open?
raise OSM::APIChangesetAlreadyClosedError, new.changeset
end
end
# This is similar to above, just some validations don't apply
def check_create_consistency(new, user)
- if new.changeset.nil?
- raise OSM::APIChangesetMissingError
- elsif new.changeset.user_id != user.id
- raise OSM::APIUserChangesetMismatchError
- elsif !new.changeset.is_open?
- raise OSM::APIChangesetAlreadyClosedError, new.changeset
- end
+ check_changeset_consistency(new.changeset, user)
end
##
raise OSM::APIChangesetMissingError
elsif user.id != changeset.user_id
raise OSM::APIUserChangesetMismatchError
- elsif !changeset.is_open?
+ elsif !changeset.open?
raise OSM::APIChangesetAlreadyClosedError, changeset
end
end