X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fa13a11a94a96e47582483503753ced3db438f6f..6383a9358bd82e3848cf2b3815b54b3ff44ad54b:/app/models/relation.rb?ds=inline diff --git a/app/models/relation.rb b/app/models/relation.rb index 8078cf860..e3ba69b56 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -33,6 +33,7 @@ class Relation < ActiveRecord::Base doc.find('//osm/relation').each do |pt| return Relation.from_xml_node(pt, create) end + raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/relation element.") rescue LibXML::XML::Error, ArgumentError => ex raise OSM::APIBadXMLError.new("relation", xml, ex.message) end @@ -41,27 +42,27 @@ class Relation < ActiveRecord::Base def self.from_xml_node(pt, create=false) relation = Relation.new - if !create and pt['id'] != '0' - relation.id = pt['id'].to_i - end - - raise OSM::APIBadXMLError.new("relation", pt, "You are missing the required changeset in the relation") if pt['changeset'].nil? + raise OSM::APIBadXMLError.new("relation", pt, "Version is required when updating") unless create or not pt['version'].nil? + relation.version = pt['version'] + raise OSM::APIBadXMLError.new("relation", pt, "Changeset id is missing") if pt['changeset'].nil? relation.changeset_id = pt['changeset'] - - # The follow block does not need to be executed because they are dealt with - # in create_with_history, update_from and delete_with_history - if create - relation.timestamp = Time.now.getutc - relation.visible = true - relation.version = 0 - else - if pt['timestamp'] - relation.timestamp = Time.parse(pt['timestamp']) - end - relation.version = pt['version'] + + unless create + raise OSM::APIBadXMLError.new("relation", pt, "ID is required when updating") if pt['id'].nil? + relation.id = pt['id'].to_i + # .to_i will return 0 if there is no number that can be parsed. + # We want to make sure that there is no id with zero anyway + raise OSM::APIBadUserInput.new("ID of relation cannot be zero when updating.") if relation.id == 0 end + + # We don't care about the timestamp nor the visibility as these are either + # set explicitly or implicit in the action. The visibility is set to true, + # and manually set to false before the actual delete. + relation.visible = true pt.find('tag').each do |tag| + raise OSM::APIBadXMLError.new("relation", pt, "tag is missing key") if tag['k'].nil? + raise OSM::APIBadXMLError.new("relation", pt, "tag is missing value") if tag['v'].nil? relation.add_tag_keyval(tag['k'], tag['v']) end @@ -208,7 +209,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 +219,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 +241,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 +257,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) @@ -386,21 +386,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 @@ -434,21 +431,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