X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b7335940e21bfe4fc9ac688130687398e677cfae..5c783cd0eece7c5d4607b89f1cff313d8d867a04:/app/models/relation.rb diff --git a/app/models/relation.rb b/app/models/relation.rb index 6be106159..464d1646c 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -27,14 +27,13 @@ class Relation < ActiveRecord::Base 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) end - rescue LibXML::XML::Error => ex + rescue LibXML::XML::Error, ArgumentError => ex raise OSM::APIBadXMLError.new("relation", xml, ex.message) end end @@ -52,7 +51,7 @@ class Relation < ActiveRecord::Base # 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 @@ -75,7 +74,7 @@ class Relation < ActiveRecord::Base #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'], member['ref'], 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? @@ -126,7 +125,7 @@ class Relation < ActiveRecord::Base #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 @@ -146,7 +145,7 @@ class Relation < ActiveRecord::Base 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 @@ -156,7 +155,7 @@ class Relation < ActiveRecord::Base 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 @@ -166,7 +165,7 @@ class Relation < ActiveRecord::Base 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 @@ -237,7 +236,7 @@ class Relation < ActiveRecord::Base Relation.transaction do check_consistency(self, new_relation, user) # This will check to see if this relation is used by another relation - 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 ]) + 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("The relation #{new_relation.id} is a used in another relation") end self.changeset_id = new_relation.changeset_id @@ -254,6 +253,7 @@ class Relation < ActiveRecord::Base raise OSM::APIPreconditionFailedError.new 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 @@ -281,13 +281,12 @@ class Relation < ActiveRecord::Base elements = { :node => Hash.new, :way => Hash.new, :relation => Hash.new } self.members.each do |m| # find the hash for the element type or die - hash = elements[m[0].to_sym] or return false - + 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]) @@ -317,7 +316,7 @@ class Relation < ActiveRecord::Base 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] + new_id = id_map[type.downcase.to_sym][old_id] raise "invalid placeholder" if new_id.nil? [type, new_id, role] else @@ -334,12 +333,12 @@ class Relation < ActiveRecord::Base # 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 @@ -347,11 +346,7 @@ class Relation < ActiveRecord::Base # 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 @@ -360,20 +355,21 @@ class Relation < ActiveRecord::Base 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| + logger.info "TAG added: #{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. @@ -431,14 +427,16 @@ class Relation < ActiveRecord::Base # 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