X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/37df03a0432c0fcbc1c1b91af741a5cc135bea34..7be823bb11ad2aa93ffd4d85cc7f11469a867fa2:/app/models/relation.rb diff --git a/app/models/relation.rb b/app/models/relation.rb index 28fa326ba..21ee058d8 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -3,14 +3,14 @@ class Relation < ActiveRecord::Base include ConsistencyValidations - set_table_name 'current_relations' + self.table_name = "current_relations" belongs_to :changeset - has_many :old_relations, :foreign_key => 'id', :order => 'version' + has_many :old_relations, :order => 'version' - has_many :relation_members, :foreign_key => 'id', :order => 'sequence_id' - has_many :relation_tags, :foreign_key => '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 @@ -23,6 +23,12 @@ 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 }) } + TYPES = ["node", "way", "relation"] def self.from_xml(xml, create=false) @@ -33,6 +39,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 @@ -59,7 +66,13 @@ 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 @@ -145,36 +158,6 @@ class Relation < ActiveRecord::Base return el1 end - def self.find_for_nodes(ids, options = {}) - if ids.empty? - return [] - else - self.with_scope(:find => { :joins => "INNER JOIN current_relation_members AS crm ON crm.id = current_relations.id", :conditions => "crm.member_type = 'Node' AND crm.member_id IN (#{ids.join(',')})" }) do - return self.find(:all, options) - end - end - end - - def self.find_for_ways(ids, options = {}) - if ids.empty? - return [] - else - self.with_scope(:find => { :joins => "INNER JOIN current_relation_members AS crm ON crm.id = current_relations.id", :conditions => "crm.member_type = 'Way' AND crm.member_id IN (#{ids.join(',')})" }) do - return self.find(:all, options) - end - end - end - - def self.find_for_relations(ids, options = {}) - if ids.empty? - return [] - else - self.with_scope(:find => { :joins => "INNER JOIN current_relation_members AS crm ON crm.id = current_relations.id", :conditions => "crm.member_type = 'Relation' AND crm.member_id IN (#{ids.join(',')})" }) do - return self.find(:all, options) - end - end - end - # FIXME is this really needed? def members unless @members @@ -241,8 +224,7 @@ class Relation < ActiveRecord::Base 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, - :conditions => [ "visible = ? AND member_type='Relation' and member_id=? ", true, self.id ]) + rel = RelationMember.joins(:relation).where("visible = ? AND member_type = 'Relation' and member_id = ? ", true, self.id).first raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is used in relation #{rel.relation.id}.") unless rel.nil? self.changeset_id = new_relation.changeset_id @@ -300,7 +282,7 @@ class Relation < ActiveRecord::Base # use reflection to look up the appropriate class model = Kernel.const_get(m[0].capitalize) # get the element with that ID - element = model.find(:first, :conditions =>["id = ?", m[1]]) + element = model.where(:id => m[1]).first # and check that it is OK to use. unless element and element.visible? and element.preconditions_ok? @@ -370,12 +352,12 @@ class Relation < ActiveRecord::Base # if there are left-over tags then they are new and will have to # be added. tags_changed |= (not tags.empty?) - RelationTag.delete_all(:id => self.id) + RelationTag.delete_all(:relation_id => self.id) self.tags.each do |k,v| tag = RelationTag.new + tag.relation_id = self.id tag.k = k tag.v = v - tag.id = self.id tag.save! end @@ -400,10 +382,11 @@ class Relation < ActiveRecord::Base # members may be in a different order and i don't feel like implementing # a longest common subsequence algorithm to optimise this. members = self.members - RelationMember.delete_all(:id => self.id) + RelationMember.delete_all(:relation_id => self.id) members.each_with_index do |m,i| mem = RelationMember.new - mem.id = [self.id, i] + mem.relation_id = self.id + mem.sequence_id = i mem.member_type = m[0] mem.member_id = m[1] mem.member_role = m[2]