X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a6f61bd18aebe24d7488447b18d49158b15a71fa..1bbe59b6a77030c362f9991083aa7c06799b272d:/app/models/segment.rb

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 19d7b2b63..14949879d 100644
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -2,13 +2,15 @@ class Segment < ActiveRecord::Base
   require 'xml/libxml'
   set_table_name 'current_segments'
 
-  validates_numericality_of :segment_a
-  validates_numericality_of :segment_b
-  # FIXME validate a nd b exist and are visible
+  validates_numericality_of :node_a
+  validates_numericality_of :node_b
 
   has_many :old_segments, :foreign_key => :id
   belongs_to :user
 
+  # using belongs_to :foreign_key = 'node_*', since if use has_one :foreign_key = 'id', segment preconditions? fails checking for segment id in node table
+  belongs_to :from_node, :class_name => 'Node', :foreign_key => 'node_a'
+  belongs_to :to_node, :class_name => 'Node', :foreign_key => 'node_b'
 
   def self.from_xml(xml, create=false)
     p = XML::Parser.new
@@ -19,14 +21,14 @@ class Segment < ActiveRecord::Base
 
     doc.find('//osm/segment').each do |pt|
 
-      segment.segment_a = pt['from'].to_i
-      segment.segment_b = pt['to'].to_i
+      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
 
-      segment.visible = pt['visible'] == '1'
+      segment.visible = true
 
       if create
         segment.timestamp = Time.now
@@ -54,8 +56,9 @@ class Segment < ActiveRecord::Base
   def save_with_history
     begin
       Segment.transaction do
-        old_segment = OldSegment.from_segment(self)
+        self.timestamp = Time.now
         self.save
+        old_segment = OldSegment.from_segment(self)
         old_segment.save
       end
       return true
@@ -65,25 +68,34 @@ class Segment < ActiveRecord::Base
   end
 
   def to_xml
-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Segment.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
-    el1 = XML::Segment.new 'segment'
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end
+
+  def to_xml_node(user_display_name_cache  = nil)
+    el1 = XML::Node.new 'segment'
     el1['id'] = self.id.to_s
-    el1['lat'] = self.latitude.to_s
-    el1['lon'] = self.longitude.to_s
-    split_tags(el1, self.tags)
+    el1['from'] = self.node_a.to_s
+    el1['to'] = self.node_b.to_s
+
+    user_display_name_cache = {} if user_display_name_cache.nil?
+    if user_display_name_cache and user_display_name_cache[self.user_id]
+      # use the cache if available
+    else
+      user_display_name_cache[self.user_id] = self.user.display_name
+    end
+    
+    #el1['user'] = self.user.display_name if self.user.data_public?
+    el1['user'] = user_display_name_cache[self.user_id]
+
+    Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    root << el1
-    return doc
+    return el1
   end
 
-  private
-  def split_tags(el, tags)
+  def self.split_tags(el, tags)
     tags.split(';').each do |tag|
       parts = tag.split('=')
       key = ''
@@ -91,7 +103,7 @@ class Segment < ActiveRecord::Base
       key = parts[0].strip unless parts[0].nil?
       val = parts[1].strip unless parts[1].nil?
       if key != '' && val != ''
-        el2 = Segment.new('tag')
+        el2 = XML::Node.new('tag')
         el2['k'] = key.to_s
         el2['v'] = val.to_s
         el << el2
@@ -99,5 +111,8 @@ class Segment < ActiveRecord::Base
     end
   end
 
+  def preconditions_ok?
+    from_node and from_node.visible and to_node and to_node.visible
+  end
 
 end