X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e03ea17a227b09df70899b035680b51b3da2c61b..7151fa05e4d4f73956d7f9a7ad2db1f5b956a0c0:/app/models/way.rb?ds=inline diff --git a/app/models/way.rb b/app/models/way.rb index e0a445074..ea027fb47 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -1,8 +1,9 @@ class Way < ActiveRecord::Base require 'xml/libxml' - + belongs_to :user + has_many :nodes, :through => :way_nodes, :order => 'sequence_id' has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id' has_many :way_tags, :foreign_key => 'id' @@ -16,37 +17,54 @@ class Way < ActiveRecord::Base p.string = xml doc = p.parse - way = Way.new - doc.find('//osm/way').each do |pt| - if !create and pt['id'] != '0' - way.id = pt['id'].to_i - end + return Way.from_xml_node(pt, create) + end + rescue + return nil + end + end - if create - way.timestamp = Time.now - way.visible = true - else - if pt['timestamp'] - way.timestamp = Time.parse(pt['timestamp']) - end - end + def self.from_xml_node(pt, create=false) + way = Way.new - pt.find('tag').each do |tag| - way.add_tag_keyval(tag['k'], tag['v']) - end + if !create and pt['id'] != '0' + way.id = pt['id'].to_i + end + + way.version = pt['version'] - pt.find('nd').each do |nd| - way.add_nd_num(nd['ref']) - end + if create + way.timestamp = Time.now + way.visible = true + else + if pt['timestamp'] + way.timestamp = Time.parse(pt['timestamp']) end - rescue - way = nil + end + + pt.find('tag').each do |tag| + way.add_tag_keyval(tag['k'], tag['v']) + end + + pt.find('nd').each do |nd| + way.add_nd_num(nd['ref']) end return way end + # Find a way given it's ID, and in a single SQL call also grab its nodes + # + + # You can't pull in all the tags too unless we put a sequence_id on the way_tags table and have a multipart key + def self.find_eager(id) + way = Way.find(id, :include => {:way_nodes => :node}) + #If waytag had a multipart key that was real, you could do this: + #way = Way.find(id, :include => [:way_tags, {:way_nodes => :node}]) + end + + # Find a way given it's ID, and in a single SQL call also grab its nodes and tags def to_xml doc = OSM::API.new.get_xml_doc doc.root << to_xml_node() @@ -58,9 +76,10 @@ class Way < ActiveRecord::Base el1['id'] = self.id.to_s el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema + el1['version'] = self.version.to_s user_display_name_cache = {} if user_display_name_cache.nil? - + if user_display_name_cache and user_display_name_cache.key?(self.user_id) # use the cache if available elsif self.user.data_public? @@ -94,7 +113,7 @@ class Way < ActiveRecord::Base el1 << e end end - + self.way_tags.each do |tag| e = XML::Node.new 'tag' e['k'] = tag.k @@ -106,20 +125,20 @@ class Way < ActiveRecord::Base def nds unless @nds - @nds = Array.new - self.way_nodes.each do |nd| - @nds += [nd.node_id] - end + @nds = Array.new + self.way_nodes.each do |nd| + @nds += [nd.node_id] + end end @nds end def tags unless @tags - @tags = Hash.new - self.way_tags.each do |tag| - @tags[tag.k] = tag.v - end + @tags = {} + self.way_tags.each do |tag| + @tags[tag.k] = tag.v + end end @tags end @@ -146,15 +165,12 @@ class Way < ActiveRecord::Base t = Time.now Way.transaction do + self.version += 1 self.timestamp = t self.save! - end - WayTag.transaction do tags = self.tags - WayTag.delete_all(['id = ?', self.id]) - tags.each do |k,v| tag = WayTag.new tag.k = k @@ -162,27 +178,36 @@ class Way < ActiveRecord::Base tag.id = self.id tag.save! end - end - WayNode.transaction do nds = self.nds - WayNode.delete_all(['id = ?', self.id]) - - i = 1 + sequence = 1 nds.each do |n| nd = WayNode.new - nd.id = self.id + nd.id = [self.id, sequence] nd.node_id = n - nd.sequence_id = i nd.save! - i += 1 + sequence += 1 end + + old_way = OldWay.from_way(self) + old_way.timestamp = t + old_way.save_with_dependencies! end + end - old_way = OldWay.from_way(self) - old_way.timestamp = t - old_way.save_with_dependencies! + def update_from(new_way, user) + if !new_way.preconditions_ok? + raise OSM::APIPreconditionFailedError.new + elsif new_way.version != version + raise OSM::APIVersionMismatchError.new(new_way.version, version) + else + self.user_id = user.id + self.tags = new_way.tags + self.nds = new_way.nds + self.visible = true + save_with_history! + end end def preconditions_ok? @@ -196,4 +221,53 @@ class Way < ActiveRecord::Base return true end + def delete_with_history(user) + if self.visible + # FIXME + # this should actually delete the relations, + # not just throw a PreconditionFailed if it's a member of a relation!! + + # FIXME: this should probably renamed to delete_with_history + if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", + :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id]) + raise OSM::APIPreconditionFailedError + # end FIXME + else + self.user_id = user.id + self.tags = [] + self.nds = [] + self.visible = false + self.save_with_history! + end + else + raise OSM::APIAlreadyDeletedError + end + end + + # delete a way and it's nodes that aren't part of other ways, with history + + # FIXME: merge the potlatch code to delete the relations + def delete_with_relations_and_nodes_and_history(user) + + node_ids = self.nodes.collect {|node| node.id } + node_ids_not_to_delete = [] + way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}") + + node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id} + + node_ids_to_delete = node_ids - node_ids_not_to_delete + + # delete the nodes not used by other ways + node_ids_to_delete.each do |node_id| + n = Node.find(node_id) + n.user_id = user.id + n.visible = false + n.save_with_history! + end + + self.user_id = user.id + + self.delete_with_history(user) + + end end