X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5a8c4faf3ebf4e80bd41b2f281bc3c23309739d5..c53db246f606e0233a524e8f3c6390ea74e96890:/app/models/relation.rb?ds=sidebyside diff --git a/app/models/relation.rb b/app/models/relation.rb index 908651b64..008f365c4 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -2,18 +2,20 @@ class Relation < ActiveRecord::Base require 'xml/libxml' include ConsistencyValidations - + include NotRedactable + include ObjectMetadata + self.table_name = "current_relations" belongs_to :changeset - has_many :old_relations, :order => 'version' + has_many :old_relations, -> { order(:version) } - has_many :relation_members, :order => 'sequence_id' + has_many :relation_members, -> { order(:sequence_id) } has_many :relation_tags has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update validates_presence_of :timestamp,:version, :changeset_id @@ -23,11 +25,11 @@ class Relation < ActiveRecord::Base validates_numericality_of :changeset_id, :version, :integer_only => true validates_associated :changeset - scope :visible, where(:visible => true) - scope :invisible, where(:visible => false) - scope :nodes, lambda { |*ids| joins(:relation_members).where(:current_relation_members => { :member_type => "Node", :member_id => ids }) } - scope :ways, lambda { |*ids| joins(:relation_members).where(:current_relation_members => { :member_type => "Way", :member_id => ids }) } - scope :relations, lambda { |*ids| joins(:relation_members).where(:current_relation_members => { :member_type => "Relation", :member_id => ids }) } + scope :visible, -> { where(:visible => true) } + scope :invisible, -> { where(:visible => false) } + scope :nodes, ->(*ids) { joins(:relation_members).where(:current_relation_members => { :member_type => "Node", :member_id => ids.flatten }) } + scope :ways, ->(*ids) { joins(:relation_members).where(:current_relation_members => { :member_type => "Way", :member_id => ids.flatten }) } + scope :relations, ->(*ids) { joins(:relation_members).where(:current_relation_members => { :member_type => "Relation", :member_id => ids.flatten }) } TYPES = ["node", "way", "relation"] @@ -66,12 +68,22 @@ class Relation < ActiveRecord::Base # and manually set to false before the actual delete. relation.visible = true + # Start with no tags + relation.tags = Hash.new + + # Add in any tags from the XML 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 + # need to initialise the relation members array explicitly, as if this + # isn't done for a new relation then @members attribute will be nil, + # and the members will be loaded from the database instead of being + # empty, as intended. + relation.members = Array.new + pt.find('member').each do |member| #member_type = logger.debug "each member" @@ -95,33 +107,10 @@ class Relation < ActiveRecord::Base end 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 - el1['timestamp'] = self.timestamp.xmlschema - el1['version'] = self.version.to_s - el1['changeset'] = self.changeset_id.to_s - - if changeset_cache.key?(self.changeset_id) - # use the cache if available - else - changeset_cache[self.changeset_id] = self.changeset.user_id - end - - user_id = changeset_cache[self.changeset_id] - - if user_display_name_cache.key?(user_id) - # use the cache if available - elsif self.changeset.user.data_public? - user_display_name_cache[user_id] = self.changeset.user.display_name - else - user_display_name_cache[user_id] = nil - end + el = XML::Node.new 'relation' + el['id'] = self.id.to_s - if not user_display_name_cache[user_id].nil? - el1['user'] = user_display_name_cache[user_id] - el1['uid'] = user_id.to_s - end + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) self.relation_members.each do |member| p=0 @@ -137,42 +126,28 @@ class Relation < ActiveRecord::Base end end if p - e = XML::Node.new 'member' - e['type'] = member.member_type.downcase - e['ref'] = member.member_id.to_s - e['role'] = member.member_role - el1 << e + member_el = XML::Node.new 'member' + member_el['type'] = member.member_type.downcase + member_el['ref'] = member.member_id.to_s + member_el['role'] = member.member_role + el << member_el end end - self.relation_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end - return el1 + add_tags_to_xml_node(el, self.relation_tags) + + return el end # FIXME is this really needed? def members - unless @members - @members = Array.new - self.relation_members.each do |member| - @members += [[member.member_type,member.member_id,member.member_role]] - end + @members ||= self.relation_members.map do |member| + [member.member_type, member.member_id, member.member_role] end - @members end def tags - unless @tags - @tags = Hash.new - self.relation_tags.each do |tag| - @tags[tag.k] = tag.v - end - end - @tags + @tags ||= Hash[self.relation_tags.collect { |t| [t.k, t.v] }] end def members=(m) @@ -183,9 +158,9 @@ class Relation < ActiveRecord::Base @tags = t end - def add_member(type,id,role) - @members = Array.new unless @members - @members += [[type,id.to_i,role]] + def add_member(type, id, role) + @members ||= [] + @members << [type, id.to_i, role] end def add_tag_keyval(k, v)