X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ab154a0ae8b6a1e105212f0f37a688bf6d94c8a..eeeb13e4e4d67600e02f949cdeec11277a1156db:/app/models/way.rb?ds=sidebyside diff --git a/app/models/way.rb b/app/models/way.rb index d5d2dc98e..e0a445074 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -3,42 +3,45 @@ class Way < ActiveRecord::Base belongs_to :user - has_many :way_segments, :foreign_key => 'id' + has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id' has_many :way_tags, :foreign_key => 'id' - has_many :old_ways, :foreign_key => :id + has_many :old_ways, :foreign_key => 'id', :order => 'version' set_table_name 'current_ways' 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 - way = Way.new + way = Way.new - doc.find('//osm/way').each do |pt| - if !create and pt['id'] != '0' - way.id = pt['id'].to_i - end + doc.find('//osm/way').each do |pt| + if !create and pt['id'] != '0' + way.id = pt['id'].to_i + end - if create - way.timestamp = Time.now - way.visible = true - else - if pt['timestamp'] - way.timestamp = Time.parse(pt['timestamp']) + if create + way.timestamp = Time.now + way.visible = true + else + if pt['timestamp'] + way.timestamp = Time.parse(pt['timestamp']) + end end - end - pt.find('tag').each do |tag| - way.add_tag_keyval(tag['k'], tag['v']) - end + pt.find('tag').each do |tag| + way.add_tag_keyval(tag['k'], tag['v']) + end - pt.find('seg').each do |seg| - way.add_seg_num(seg['id']) + pt.find('nd').each do |nd| + way.add_nd_num(nd['ref']) + end end - + rescue + way = nil end return way @@ -50,7 +53,7 @@ class Way < ActiveRecord::Base return doc end - def to_xml_node(visible_segments = nil, user_display_name_cache = nil) + 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 @@ -58,7 +61,7 @@ class Way < ActiveRecord::Base user_display_name_cache = {} if user_display_name_cache.nil? - if user_display_name_cache and user_display_name_cache[self.user_id] + if user_display_name_cache and user_display_name_cache.key?(self.user_id) # use the cache if available elsif self.user.data_public? user_display_name_cache[self.user_id] = self.user.display_name @@ -68,26 +71,26 @@ class Way < ActiveRecord::Base el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil? - # make sure segments are output in sequence_id order - ordered_segments = [] - self.way_segments.each do |seg| - if visible_segments - # if there is a list of visible segments then use that to weed out deleted segments - if visible_segments[seg.segment_id] - ordered_segments[seg.sequence_id] = seg.segment_id.to_s + # 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 # otherwise, manually go to the db to check things - if seg.segment.visible? and seg.segment.from_node.visible? and seg.segment.to_node.visible? - ordered_segments[seg.sequence_id] = seg.segment_id.to_s + if nd.node.visible? and nd.node.visible? + ordered_nodes[nd.sequence_id] = nd.node_id.to_s end end end - ordered_segments.each do |seg_id| - if seg_id and seg_id != '0' - e = XML::Node.new 'seg' - e['id'] = seg_id + 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 @@ -101,14 +104,14 @@ class Way < ActiveRecord::Base return el1 end - def segs - unless @segs - @segs = Array.new - self.way_segments.each do |seg| - @segs += [seg.segment_id] + def nds + unless @nds + @nds = Array.new + self.way_nodes.each do |nd| + @nds += [nd.node_id] end end - @segs + @nds end def tags @@ -121,17 +124,17 @@ class Way < ActiveRecord::Base @tags end - def segs=(s) - @segs = s + def nds=(s) + @nds = s end 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) @@ -139,42 +142,54 @@ class Way < ActiveRecord::Base @tags[k] = v end - def save_with_history + def save_with_history! t = Time.now - self.timestamp = t - self.save - - WayTag.delete_all(['id = ?', self.id]) - - self.tags.each do |k,v| - tag = WayTag.new - tag.k = k - tag.v = v - tag.id = self.id - tag.save + + Way.transaction do + self.timestamp = t + self.save! end - WaySegment.delete_all(['id = ?', self.id]) - - i = 0 - self.segs.each do |n| - seg = WaySegment.new - seg.id = self.id - seg.segment_id = n - seg.sequence_id = i - seg.save - i += 1 + WayTag.transaction do + 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 + end + + WayNode.transaction do + nds = self.nds + + WayNode.delete_all(['id = ?', self.id]) + + i = 1 + nds.each do |n| + nd = WayNode.new + nd.id = self.id + nd.node_id = n + nd.sequence_id = i + nd.save! + i += 1 + end end old_way = OldWay.from_way(self) old_way.timestamp = t - old_way.save_with_dependencies + old_way.save_with_dependencies! end def preconditions_ok? - self.segs.each do |n| - segment = Segment.find(n) - unless segment and segment.visible and segment.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