X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/87918595da1e1fad2ddd7aa62f9fc537dff657ff..908324323e8801ff76a7cde812e61dbbb03a33ce:/app/models/relation.rb diff --git a/app/models/relation.rb b/app/models/relation.rb index 545336793..f55711a69 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -1,3 +1,22 @@ +# == Schema Information +# +# Table name: current_relations +# +# id :integer not null, primary key +# changeset_id :integer not null +# timestamp :datetime not null +# visible :boolean not null +# version :integer not null +# +# Indexes +# +# current_relations_timestamp_idx (timestamp) +# +# Foreign Keys +# +# current_relations_changeset_id_fkey (changeset_id => changesets.id) +# + class Relation < ActiveRecord::Base require "xml/libxml" @@ -51,12 +70,15 @@ class Relation < ActiveRecord::Base relation = Relation.new raise OSM::APIBadXMLError.new("relation", pt, "Version is required when updating") unless create || !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"] 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 @@ -75,6 +97,7 @@ class Relation < ActiveRecord::Base 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 @@ -87,6 +110,7 @@ class Relation < ActiveRecord::Base pt.find("member").each do |member| # member_type = raise OSM::APIBadXMLError.new("relation", pt, "The #{member['type']} is not allowed only, #{TYPES.inspect} allowed") unless TYPES.include? member["type"] + # member_ref = member['ref'] # member_role member["role"] ||= "" # Allow the upload to not include this, in which case we default to an empty string. @@ -103,25 +127,13 @@ class Relation < ActiveRecord::Base doc end - def to_xml_node(visible_members = nil, changeset_cache = {}, user_display_name_cache = {}) + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) el = XML::Node.new "relation" el["id"] = id.to_s add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) 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 - p = 1 if visible_members[member.member_type][member.member_id] - else - # otherwise, manually go to the db to check things - p = 1 if member.member.visible? - end - - next unless p - member_el = XML::Node.new "member" member_el["type"] = member.member_type.downcase member_el["ref"] = member.member_id.to_s @@ -175,9 +187,7 @@ class Relation < ActiveRecord::Base end def delete_with_history!(new_relation, user) - unless visible - raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id) - end + raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id) unless visible # need to start the transaction here, so that the database can # provide repeatable reads for the used-by checks. this means it @@ -201,9 +211,8 @@ class Relation < ActiveRecord::Base Relation.transaction do lock! check_consistency(self, new_relation, user) - unless new_relation.preconditions_ok?(members) - raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid." unless new_relation.preconditions_ok?(members) + self.changeset_id = new_relation.changeset_id self.changeset = new_relation.changeset self.tags = new_relation.tags @@ -215,9 +224,8 @@ class Relation < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) - unless preconditions_ok? - raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." unless preconditions_ok? + self.version = 0 self.visible = true save_with_history! @@ -252,9 +260,8 @@ class Relation < ActiveRecord::Base element = model.lock("for share").find_by(:id => m[1]) # and check that it is OK to use. - unless element && element.visible? && element.preconditions_ok? - raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" - end + raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" unless element&.visible? && element&.preconditions_ok? + hash[m[1]] = true end @@ -268,9 +275,10 @@ class Relation < ActiveRecord::Base def fix_placeholders!(id_map, placeholder_id = nil) members.map! do |type, id, role| old_id = id.to_i - if old_id < 0 + if old_id.negative? new_id = id_map[type.downcase.to_sym][old_id] raise OSM::APIBadUserInput, "Placeholder #{type} not found for reference #{old_id} in relation #{self.id.nil? ? placeholder_id : self.id}." if new_id.nil? + [type, new_id, role] else [type, id, role] @@ -373,10 +381,12 @@ class Relation < ActiveRecord::Base # reasonable on the assumption that adding or removing members doesn't # materially change the rest of the relation. any_relations = - changed_members.collect { |_id, type| type == "relation" } + changed_members.collect { |type, _id, _role| type == "Relation" } .inject(false) { |acc, elem| acc || elem } - update_members = if tags_changed || any_relations + # if the relation is being deleted tags_changed will be true and members empty + # so we need to use changed_members to create a correct bounding box + update_members = if visible && (tags_changed || 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.