X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7331f82bce6ed54959b9550aa110c68e75f58eb0..1a59ac0d68491ca7d9ad8da2d45853a349ad57a6:/app/models/relation.rb diff --git a/app/models/relation.rb b/app/models/relation.rb index 95181ef05..fda5e5677 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -87,7 +87,7 @@ class Relation < ActiveRecord::Base return doc end - def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) + def to_xml_node(visible_members = nil, changeset_cache = {}, user_display_name_cache = {}) el1 = XML::Node.new 'relation' el1['id'] = self.id.to_s el1['visible'] = self.visible.to_s @@ -118,17 +118,17 @@ class Relation < ActiveRecord::Base self.relation_members.each do |member| p=0 - #if visible_members - # # if there is a list of visible members then use that to weed out deleted segments - # if visible_members[member.member_type][member.member_id] - # p=1 - # end - #else + if visible_members + # if there is a list of visible members then use that to weed out deleted segments + if visible_members[member.member_type][member.member_id] + p=1 + end + else # otherwise, manually go to the db to check things if member.member.visible? p=1 end - #end + end if p e = XML::Node.new 'member' e['type'] = member.member_type.downcase @@ -208,7 +208,7 @@ class Relation < ActiveRecord::Base def add_member(type,id,role) @members = Array.new unless @members - @members += [[type,id,role]] + @members += [[type,id.to_i,role]] end def add_tag_keyval(k, v) @@ -218,11 +218,6 @@ class Relation < ActiveRecord::Base # in the hash to be overwritten. raise OSM::APIDuplicateTagsError.new("relation", self.id, k) if @tags.include? k - # check tag size here, as we don't create a RelationTag object until - # just before we save... - raise OSM::APIBadUserInput.new("Relation #{self.id} has a tag with too long a key, '#{k}'.") if k.length > 255 - raise OSM::APIBadUserInput.new("Relation #{self.id} has a tag with too long a value, '#{k}'='#{v}'.") if v.length > 255 - @tags[k] = v end @@ -245,6 +240,7 @@ class Relation < ActiveRecord::Base # provide repeatable reads for the used-by checks. this means it # shouldn't be possible to get race conditions. Relation.transaction do + self.lock! check_consistency(self, new_relation, user) # This will check to see if this relation is used by another relation rel = RelationMember.find(:first, :joins => :relation, @@ -260,16 +256,19 @@ class Relation < ActiveRecord::Base end def update_from(new_relation, user) - check_consistency(self, new_relation, user) - unless new_relation.preconditions_ok?(self.members) - raise OSM::APIPreconditionFailedError.new("Cannot update relation #{self.id}: data or member data is invalid.") + Relation.transaction do + self.lock! + check_consistency(self, new_relation, user) + unless new_relation.preconditions_ok?(self.members) + raise OSM::APIPreconditionFailedError.new("Cannot update relation #{self.id}: data or member data is invalid.") + end + self.changeset_id = new_relation.changeset_id + self.changeset = new_relation.changeset + self.tags = new_relation.tags + self.members = new_relation.members + self.visible = true + save_with_history! end - self.changeset_id = new_relation.changeset_id - self.changeset = new_relation.changeset - self.tags = new_relation.tags - self.members = new_relation.members - self.visible = true - save_with_history! end def create_with_history(user) @@ -307,8 +306,7 @@ class Relation < ActiveRecord::Base # and check that it is OK to use. unless element and element.visible? and element.preconditions_ok? - raise OSM::APIPreconditionFailedError.new("Relation with id #{self.id} cannot be saved due to #{m[0]} with id #{element.id}") - return false + raise OSM::APIPreconditionFailedError.new("Relation with id #{self.id} cannot be saved due to #{m[0]} with id #{m[1]}") end hash[m[1]] = true end @@ -387,21 +385,18 @@ class Relation < ActiveRecord::Base # changed members in an array, as the bounding box updates for # elements are per-element, not blanked on/off like for tags. changed_members = Array.new - members = Hash.new - self.members.each do |m| - # should be: h[[m.id, m.type]] = m.role, but someone prefers arrays - members[[m[1], m[0]]] = m[2] - end - relation_members.each do |old_member| - key = [old_member.member_id.to_s, old_member.member_type] - if members.has_key? key - members.delete key - else + members = self.members.clone + self.relation_members.each do |old_member| + key = [old_member.member_type, old_member.member_id, old_member.member_role] + i = members.index key + if i.nil? changed_members << key + else + members.delete_at i end end # any remaining members must be new additions - changed_members += members.keys + changed_members += members # update the members. first delete all the old members, as the new # members may be in a different order and i don't feel like implementing @@ -435,21 +430,17 @@ class Relation < ActiveRecord::Base changed_members.collect { |id,type| type == "relation" }. inject(false) { |b,s| b or s } - if tags_changed or any_relations - # add all non-relation bounding boxes to the changeset - # FIXME: check for tag changes along with element deletions and - # make sure that the deleted element's bounding box is hit. - self.members.each do |type, id, role| - if type != "Relation" - update_changeset_element(type, id) - end - end - else - # add only changed members to the changeset - changed_members.each do |id, type| - if type != "Relation" - update_changeset_element(type, id) - end + update_members = if tags_changed or any_relations + # add all non-relation bounding boxes to the changeset + # FIXME: check for tag changes along with element deletions and + # make sure that the deleted element's bounding box is hit. + self.members + else + changed_members + end + update_members.each do |type, id, role| + if type != "Relation" + update_changeset_element(type, id) end end