X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/222d31e435f003ec59e84860d2fa5129449f69de..fb5f39f19ae00dad9ec896e216e8e813de42c151:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index 2773ecc7b..b2bdfb39b 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -1,57 +1,170 @@ class Way < ActiveRecord::Base require 'xml/libxml' - belongs_to :user + include ConsistencyValidations + set_table_name 'current_ways' + validates_presence_of :changeset_id, :timestamp + validates_inclusion_of :visible, :in => [ true, false ] + + belongs_to :changeset + + has_many :old_ways, :foreign_key => 'id', :order => 'version' + + has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id' + has_many :nodes, :through => :way_nodes, :order => 'sequence_id' + + has_many :way_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 + def self.from_xml(xml, create=false) - p = XML::Parser.new - p.string = xml - doc = p.parse + begin + p = XML::Parser.new + p.string = xml + doc = p.parse + + doc.find('//osm/way').each do |pt| + return Way.from_xml_node(pt, create) + end + rescue + return nil + end + end + def self.from_xml_node(pt, create=false) way = Way.new - doc.find('//osm/way').each do |pt| - if !create and pt['id'] != '0' - way.id = pt['id'].to_i + if !create and pt['id'] != '0' + way.id = pt['id'].to_i + end + + way.version = pt['version'] + way.changeset_id = pt['changeset'] + + if create + way.timestamp = Time.now + way.visible = true + else + if pt['timestamp'] + way.timestamp = Time.parse(pt['timestamp']) end + end - if create - way.timestamp = Time.now - way.visible = true + 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() + return doc + end + + def to_xml_node(visible_nodes = nil, user_display_name_cache = nil) + el1 = XML::Node.new 'way' + 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 + + 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) + # use the cache if available + elsif self.changeset.user.data_public? + user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name + else + user_display_name_cache[self.changeset.user_id] = nil + end + + el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil? + + # make sure nodes are output in sequence_id order + ordered_nodes = [] + self.way_nodes.each do |nd| + if visible_nodes + # if there is a list of visible nodes then use that to weed out deleted nodes + if visible_nodes[nd.node_id] + ordered_nodes[nd.sequence_id] = nd.node_id.to_s + end else - if pt['timestamp'] - way.timestamp = Time.parse(pt['timestamp']) + # otherwise, manually go to the db to check things + if nd.node.visible? and nd.node.visible? + ordered_nodes[nd.sequence_id] = nd.node_id.to_s end end + end - pt.find('tag').each do |tag| - way.add_tag_keyval(tag['k'], tag['v']) + ordered_nodes.each do |nd_id| + if nd_id and nd_id != '0' + e = XML::Node.new 'nd' + e['ref'] = nd_id + el1 << e end + end - pt.find('seg').each do |seg| - way.add_seg_num(seg['id']) - end - + self.way_tags.each do |tag| + e = XML::Node.new 'tag' + e['k'] = tag.k + e['v'] = tag.v + el1 << e + end + return el1 + end + def nds + unless @nds + @nds = Array.new + self.way_nodes.each do |nd| + @nds += [nd.node_id] + end end + @nds + end - return way + def tags + unless @tags + @tags = {} + self.way_tags.each do |tag| + @tags[tag.k] = tag.v + end + end + @tags end - def segs - @segs = Array.new unless @segs - @segs + def nds=(s) + @nds = s end - def tags - @tags = Hash.new unless @tags - @tags + def tags=(t) + @tags = t end - def add_seg_num(n) - @segs = Array.new unless @segs - @segs << n.to_i + def add_nd_num(n) + @nds = Array.new unless @nds + @nds << n.to_i end def add_tag_keyval(k, v) @@ -59,23 +172,131 @@ class Way < ActiveRecord::Base @tags[k] = v end - def save_with_history + def save_with_history! t = Time.now - self.timestamp = t - self.save + + Way.transaction do + self.version += 1 + self.timestamp = t + self.save! + + tags = self.tags + WayTag.delete_all(['id = ?', self.id]) + tags.each do |k,v| + tag = WayTag.new + tag.k = k + tag.v = v + tag.id = self.id + tag.save! + end + + nds = self.nds + WayNode.delete_all(['id = ?', self.id]) + sequence = 1 + nds.each do |n| + nd = WayNode.new + nd.id = [self.id, sequence] + nd.node_id = n + nd.save! + sequence += 1 + end + + old_way = OldWay.from_way(self) + old_way.timestamp = t + old_way.save_with_dependencies! + end + end + + def update_from(new_way, user) + check_consistency(self, new_way, user) + if !new_way.preconditions_ok? + raise OSM::APIPreconditionFailedError.new + end + self.changeset_id = changeset_id + self.tags = new_way.tags + self.nds = new_way.nds + self.visible = true + save_with_history! + end + + def create_with_history(user) + check_create_consistency(self, user) + if !self.preconditions_ok? + raise OSM::APIPreconditionsFailedError.new + end + self.version = 0 + self.visible = true + save_with_history! + end + + def preconditions_ok? + return false if self.nds.empty? + self.nds.each do |n| + node = Node.find(:first, :conditions => ["id = ?", n]) + unless node and node.visible + return false + end + end + return true + end + + def delete_with_history(new_way, user) + check_consistency(self, new_way, user) + if self.visible + # FIXME + # this should actually delete the relations, + # not just throw a PreconditionFailed if it's a member of a relation!! + # WHY?? The editor should decide whether the node is in the relation or not! + + # 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.changeset_id = new_way.changeset_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) + # delete the nodes not used by other ways + self.unshared_node_ids.each do |node_id| + n = Node.find(node_id) + n.user_id = user.id + n.visible = false + n.save_with_history! + end - WayTag.delete_all(['id = ?', self.id]) + # FIXME needs more information passed in so that the changeset can be updated + self.user_id = user.id - self.tags.each do |k,v| - tag = WayTag.new - tag.k = k - tag.v = v - tag.id = self.id - tag.save + self.delete_with_history(user) + end + + # Find nodes that belong to this way only + def unshared_node_ids + node_ids = self.nodes.collect { |node| node.id } + + unless node_ids.empty? + way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}") + node_ids = node_ids - way_nodes.collect { |way_node| way_node.node_id } end - old_way = OldWay.from_way(self) - old_way.save + return node_ids end + # Temporary method to match interface to nodes + def tags_as_hash + return self.tags + end end