has_many :old_relations, :foreign_key => 'id', :order => 'version'
- has_many :relation_members, :foreign_key => 'id'
+ has_many :relation_members, :foreign_key => 'id', :order => 'sequence_id'
has_many :relation_tags, :foreign_key => 'id'
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
+ validates_presence_of :id, :on => :update
+ validates_presence_of :timestamp,:version, :changeset_id
+ validates_uniqueness_of :id
+ validates_inclusion_of :visible, :in => [ true, false ]
+ validates_numericality_of :id, :on => :update, :integer_only => true
+ validates_numericality_of :changeset_id, :version, :integer_only => true
+ validates_associated :changeset
+
+ TYPES = ["node", "way", "relation"]
+
def self.from_xml(xml, create=false)
begin
- p = XML::Parser.new
- p.string = xml
+ p = XML::Parser.string(xml)
doc = p.parse
doc.find('//osm/relation').each do |pt|
- return Relation.from_xml_node(pt, create)
+ return Relation.from_xml_node(pt, create)
end
- rescue
- return nil
+ rescue LibXML::XML::Error, ArgumentError => ex
+ raise OSM::APIBadXMLError.new("relation", xml, ex.message)
end
end
relation.id = pt['id'].to_i
end
- relation.version = pt['version']
+ raise OSM::APIBadXMLError.new("relation", pt, "You are missing the required changeset in the relation") 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
+ 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']
end
pt.find('tag').each do |tag|
end
pt.find('member').each do |member|
- relation.add_member(member['type'], member['ref'], member['role'])
+ #member_type =
+ logger.debug "each member"
+ raise OSM::APIBadXMLError.new("relation", pt, "The #{member['type']} is not allowed only, #{TYPES.inspect} allowed") unless TYPES.include? member['type']
+ logger.debug "after raise"
+ #member_ref = member['ref']
+ #member_role
+ member['role'] ||= "" # Allow the upload to not include this, in which case we default to an empty string.
+ logger.debug member['role']
+ relation.add_member(member['type'].classify, member['ref'], member['role'])
end
+ raise OSM::APIBadUserInput.new("Some bad xml in relation") if relation.nil?
return relation
end
return doc
end
- def to_xml_node(user_display_name_cache = nil)
+ def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
el1 = XML::Node.new 'relation'
el1['id'] = self.id.to_s
el1['visible'] = self.visible.to_s
el1['version'] = self.version.to_s
el1['changeset'] = self.changeset_id.to_s
- user_display_name_cache = {} if user_display_name_cache.nil?
-
- if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
+ 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[self.changeset.user_id] = self.changeset.user.display_name
+ user_display_name_cache[user_id] = self.changeset.user.display_name
else
- user_display_name_cache[self.changeset.user_id] = nil
+ user_display_name_cache[user_id] = nil
end
- if not user_display_name_cache[self.changeset.user_id].nil?
- el1['user'] = user_display_name_cache[self.changeset.user_id]
- el1['uid'] = self.changeset.user_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
self.relation_members.each do |member|
#end
if p
e = XML::Node.new 'member'
- e['type'] = member.member_type
+ e['type'] = member.member_type.downcase
e['ref'] = member.member_id.to_s
e['role'] = member.member_role
el1 << e
if ids.empty?
return []
else
- self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'node' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+ self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'Node' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
return self.find(:all, options)
end
end
if ids.empty?
return []
else
- self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'way' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+ self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'Way' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
return self.find(:all, options)
end
end
if ids.empty?
return []
else
- self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'relation' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
+ self.with_scope(:find => { :joins => "INNER JOIN current_relation_members ON current_relation_members.id = current_relations.id", :conditions => "current_relation_members.member_type = 'Relation' AND current_relation_members.member_id IN (#{ids.join(',')})" }) do
return self.find(:all, options)
end
end
# duplicate tags are now forbidden, so we can't allow values
# in the hash to be overwritten.
- raise OSM::APIDuplicateTagsError.new if @tags.include? k
+ raise OSM::APIDuplicateTagsError.new("relation", self.id, k) if @tags.include? k
@tags[k] = v
end
+ ##
+ # updates the changeset bounding box to contain the bounding box of
+ # the element with given +type+ and +id+. this only works with nodes
+ # and ways at the moment, as they're the only elements to respond to
+ # the :bbox call.
+ def update_changeset_element(type, id)
+ element = Kernel.const_get(type.capitalize).find(id)
+ changeset.update_bbox! element.bbox
+ end
+
+ def delete_with_history!(new_relation, user)
+ unless self.visible
+ raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id)
+ end
+
+ # need to start the transaction here, so that the database can
+ # provide repeatable reads for the used-by checks. this means it
+ # shouldn't be possible to get race conditions.
+ Relation.transaction do
+ check_consistency(self, new_relation, user)
+ # This will check to see if this relation is used by another relation
+ rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='Relation' and member_id=? ", true, self.id ])
+ raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is a used in relation #{rel.id}.") unless rel.nil?
+
+ self.changeset_id = new_relation.changeset_id
+ self.tags = {}
+ self.members = []
+ self.visible = false
+ save_with_history!
+ end
+ end
+
+ def update_from(new_relation, user)
+ check_consistency(self, new_relation, user)
+ unless new_relation.preconditions_ok?
+ 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
+
+ def create_with_history(user)
+ check_create_consistency(self, user)
+ unless self.preconditions_ok?
+ raise OSM::APIPreconditionFailedError.new("Cannot create relation: data or member data is invalid.")
+ end
+ self.version = 0
+ self.visible = true
+ save_with_history!
+ end
+
+ def preconditions_ok?
+ # These are hastables that store an id in the index of all
+ # the nodes/way/relations that have already been added.
+ # If the member is valid and visible then we add it to the
+ # relevant hash table, with the value true as a cache.
+ # Thus if you have nodes with the ids of 50 and 1 already in the
+ # relation, then the hash table nodes would contain:
+ # => {50=>true, 1=>true}
+ elements = { :node => Hash.new, :way => Hash.new, :relation => Hash.new }
+ self.members.each do |m|
+ # find the hash for the element type or die
+ logger.debug m[0]
+ hash = elements[m[0].downcase.to_sym] or return false
+ # unless its in the cache already
+ unless hash.key? m[1]
+ # use reflection to look up the appropriate class
+ model = Kernel.const_get(m[0].capitalize)
+ # get the element with that ID
+ element = model.find(m[1])
+
+ # and check that it is OK to use.
+ unless element and element.visible? and element.preconditions_ok?
+ return false
+ end
+ hash[m[1]] = true
+ end
+ end
+
+ return true
+ rescue
+ return false
+ end
+
+ # Temporary method to match interface to nodes
+ def tags_as_hash
+ return self.tags
+ end
+
+ ##
+ # if any members are referenced by placeholder IDs (i.e: negative) then
+ # this calling this method will fix them using the map from placeholders
+ # to IDs +id_map+.
+ def fix_placeholders!(id_map)
+ self.members.map! do |type, id, role|
+ old_id = id.to_i
+ if old_id < 0
+ new_id = id_map[type.downcase.to_sym][old_id]
+ raise "invalid placeholder" if new_id.nil?
+ [type, new_id, role]
+ else
+ [type, id, role]
+ end
+ end
+ end
+
+ private
+
def save_with_history!
Relation.transaction do
# have to be a little bit clever here - to detect if any tags
# changed then we have to monitor their before and after state.
tags_changed = false
- t = Time.now
+ t = Time.now.getutc
self.version += 1
self.timestamp = t
self.save!
- tags = self.tags
+ tags = self.tags.clone
self.relation_tags.each do |old_tag|
key = old_tag.k
# if we can match the tags we currently have to the list
# if any are different then set the flag and do the DB
# update.
if tags.has_key? key
- # rails 2.1 dirty handling should take care of making this
- # somewhat efficient... hopefully...
- old_tag.v = tags[key]
- tags_changed |= old_tag.changed?
- old_tag.save!
+ tags_changed |= (old_tag.v != tags[key])
# remove from the map, so that we can expect an empty map
# at the end if there are no new tags
else
# this means a tag was deleted
tags_changed = true
- RelationTag.delete_all ['id = ? and k = ?', self.id, old_tag.k]
end
end
# if there are left-over tags then they are new and will have to
# be added.
tags_changed |= (not tags.empty?)
- tags.each do |k,v|
+ RelationTag.delete_all(:id => self.id)
+ self.tags.each do |k,v|
tag = RelationTag.new
tag.k = k
tag.v = v
tag.id = self.id
tag.save!
end
-
+
# same pattern as before, but this time we're collecting the
# 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 = self.members_as_hash
+ 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
- # i'd love to rely on rails' dirty handling here, but the
- # relation members are always dirty because of the member_class
- # handling.
- if members[key] != old_member.member_role
- old_member.member_role = members[key]
- changed_members << key
- old_member.save!
- end
members.delete key
-
else
changed_members << key
- RelationMember.delete_all ['id = ? and member_id = ? and member_type = ?', self.id, old_member.member_id, old_member.member_type]
end
end
# any remaining members must be new additions
changed_members += members.keys
- members.each do |k,v|
+
+ # 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
+ # a longest common subsequence algorithm to optimise this.
+ members = self.members
+ RelationMember.delete_all(:id => self.id)
+ members.each_with_index do |m,i|
mem = RelationMember.new
- mem.id = self.id
- mem.member_type = k[1];
- mem.member_id = k[0];
- mem.member_role = v;
+ mem.id = [self.id, i]
+ mem.member_type = m[0]
+ mem.member_id = m[1]
+ mem.member_role = m[2]
mem.save!
end
# 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"
+ if type != "Relation"
update_changeset_element(type, id)
end
end
else
# add only changed members to the changeset
changed_members.each do |id, type|
- update_changeset_element(type, id)
+ if type != "Relation"
+ update_changeset_element(type, id)
+ end
end
end
+ # tell the changeset we updated one element only
+ changeset.add_changes! 1
+
# save the (maybe updated) changeset bounding box
changeset.save!
end
end
- ##
- # updates the changeset bounding box to contain the bounding box of
- # the element with given +type+ and +id+. this only works with nodes
- # and ways at the moment, as they're the only elements to respond to
- # the :bbox call.
- def update_changeset_element(type, id)
- element = Kernel.const_get(type.capitalize).find(id)
- changeset.update_bbox! element.bbox
- end
-
- def delete_with_history!(new_relation, user)
- if self.visible
- check_consistency(self, new_relation, user)
- if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='relation' and member_id=? ", true, self.id ])
- raise OSM::APIPreconditionFailedError.new
- else
- self.changeset_id = new_relation.changeset_id
- self.tags = {}
- self.members = []
- self.visible = false
- save_with_history!
- end
- else
- raise OSM::APIAlreadyDeletedError.new
- end
- end
-
- def update_from(new_relation, user)
- check_consistency(self, new_relation, user)
- if !new_relation.preconditions_ok?
- raise OSM::APIPreconditionFailedError.new
- end
- self.changeset_id = new_relation.changeset_id
- self.tags = new_relation.tags
- self.members = new_relation.members
- self.visible = true
- save_with_history!
- end
-
- def create_with_history(user)
- check_create_consistency(self, user)
- if !self.preconditions_ok?
- raise OSM::APIPreconditionFailedError.new
- end
- self.version = 0
- self.visible = true
- save_with_history!
- end
-
- def preconditions_ok?
- # These are hastables that store an id in the index of all
- # the nodes/way/relations that have already been added.
- # Once we know the id of the node/way/relation exists
- # we check to see if it is already existing in the hashtable
- # if it does, then we return false. Otherwise
- # we add it to the relevant hash table, with the value true..
- # Thus if you have nodes with the ids of 50 and 1 already in the
- # relation, then the hash table nodes would contain:
- # => {50=>true, 1=>true}
- nodes = Hash.new
- ways = Hash.new
- relations = Hash.new
- self.members.each do |m|
- if (m[0] == "node")
- n = Node.find(:first, :conditions => ["id = ?", m[1]])
- unless n and n.visible
- return false
- end
- if nodes[m[1]]
- return false
- else
- nodes[m[1]] = true
- end
- elsif (m[0] == "way")
- w = Way.find(:first, :conditions => ["id = ?", m[1]])
- unless w and w.visible and w.preconditions_ok?
- return false
- end
- if ways[m[1]]
- return false
- else
- ways[m[1]] = true
- end
- elsif (m[0] == "relation")
- e = Relation.find(:first, :conditions => ["id = ?", m[1]])
- unless e and e.visible and e.preconditions_ok?
- return false
- end
- if relations[m[1]]
- return false
- else
- relations[m[1]] = true
- end
- else
- return false
- end
- end
- return true
- rescue
- return false
- end
-
- ##
- # members in a hash table [id,type] => role
- def members_as_hash
- h = Hash.new
- members.each do |m|
- # should be: h[[m.id, m.type]] = m.role, but someone prefers arrays
- h[[m[1], m[0]]] = m[2]
- end
- return h
- end
-
- # Temporary method to match interface to nodes
- def tags_as_hash
- return self.tags
- end
-
- ##
- # if any members are referenced by placeholder IDs (i.e: negative) then
- # this calling this method will fix them using the map from placeholders
- # to IDs +id_map+.
- def fix_placeholders!(id_map)
- self.members.map! do |type, id, role|
- old_id = id.to_i
- if old_id < 0
- new_id = id_map[type.to_sym][old_id]
- raise "invalid placeholder" if new_id.nil?
- [type, new_id, role]
- else
- [type, id, role]
- end
- end
- end
-
end
projects / rails.git / blobdiff