X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f55a3f0a80974922678d7677902d169b3481693..1be46302e47eb517525d2afb52ffc5d3a9cbf917:/app/models/segment.rb?ds=sidebyside diff --git a/app/models/segment.rb b/app/models/segment.rb index f4909c7d2..bdb807d93 100644 --- a/app/models/segment.rb +++ b/app/models/segment.rb @@ -2,8 +2,9 @@ class Segment < ActiveRecord::Base require 'xml/libxml' set_table_name 'current_segments' - validates_numericality_of :node_a - validates_numericality_of :node_b + validates_presence_of :user_id, :timestamp + validates_inclusion_of :visible, :in => [ true, false ] + validates_numericality_of :node_a, :node_b has_many :old_segments, :foreign_key => :id belongs_to :user @@ -13,76 +14,90 @@ class Segment < ActiveRecord::Base belongs_to :to_node, :class_name => 'Node', :foreign_key => 'node_b' def self.from_xml(xml, create=false) - p = XML::Parser.new - p.string = xml - doc = p.parse - - segment = Segment.new + begin + p = XML::Parser.new + p.string = xml + doc = p.parse - doc.find('//osm/segment').each do |pt| + segment = Segment.new - segment.node_a = pt['from'].to_i - segment.node_b = pt['to'].to_i + doc.find('//osm/segment').each do |pt| + segment.node_a = pt['from'].to_i + segment.node_b = pt['to'].to_i - if pt['id'] != '0' - segment.id = pt['id'].to_i - end + unless create + if pt['id'] != '0' + segment.id = pt['id'].to_i + end + end - segment.visible = true + segment.visible = true - if create - segment.timestamp = Time.now - else - if pt['timestamp'] - segment.timestamp = Time.parse(pt['timestamp']) + if create + segment.timestamp = Time.now + else + if pt['timestamp'] + segment.timestamp = Time.parse(pt['timestamp']) + end end - end - - tags = [] - pt.find('tag').each do |tag| - tags << [tag['k'],tag['v']] - end + tags = [] - tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') - tags = '' if tags.nil? + pt.find('tag').each do |tag| + tags << [tag['k'],tag['v']] + end - segment.tags = tags + tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') + tags = '' if tags.nil? + segment.tags = tags + end + rescue + segment = nil end + return segment end def save_with_history begin Segment.transaction do - self.save + self.timestamp = Time.now + self.save! old_segment = OldSegment.from_segment(self) - old_segment.save + old_segment.save! end + return true - rescue Exception => ex + rescue return nil end end def to_xml - doc = XML::Document.new - doc.encoding = 'UTF-8' - root = XML::Node.new 'osm' - root['version'] = API_VERSION - root['generator'] = 'OpenStreetMap server' - doc.root = root - root << to_xml_node() + doc = OSM::API.new.get_xml_doc + doc.root << to_xml_node() return doc end - def to_xml_node + def to_xml_node(user_display_name_cache = nil) el1 = XML::Node.new 'segment' el1['id'] = self.id.to_s el1['from'] = self.node_a.to_s el1['to'] = self.node_b.to_s - el1['user'] = self.user.display_name if self.user.data_public? + + 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? + user_display_name_cache[self.user_id] = self.user.display_name + else + user_display_name_cache[self.user_id] = nil + end + + el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil? + Segment.split_tags(el1, self.tags) el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema