X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..c47a40c1db59f0d0f836fbcd1b876390befe796e:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index b11c225dd..203d3b703 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -142,7 +142,7 @@ class Way < ApplicationRecord def update_from(new_way, user) Way.transaction do lock! - check_consistency(self, new_way, user) + check_update_element_consistency(self, new_way, user) raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." unless new_way.preconditions_ok?(nds) self.changeset_id = new_way.changeset_id @@ -155,7 +155,7 @@ class Way < ApplicationRecord end def create_with_history(user) - check_create_consistency(self, user) + check_create_element_consistency(self, user) raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." unless preconditions_ok? self.version = 0 @@ -193,7 +193,7 @@ class Way < ApplicationRecord # shouldn't be possible to get race conditions. Way.transaction do lock! - check_consistency(self, new_way, user) + check_update_element_consistency(self, new_way, user) rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Way", :member_id => id }).order(:id) raise OSM::APIPreconditionFailedError, "Way #{id} is still used by relations #{rels.collect(&:id).join(',')}." unless rels.empty?