Change server_settings to smtp_settings to avoid deprecation warning.

[rails.git] / app / models / segment.rb

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 70ce6a4ecf22c09cc9a38f3accb3fd69d6a67ed8..14949879dc6d3cb98cab74621bb2909034f42ba4 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -4,11 +4,13 @@ class Segment < ActiveRecord::Base
 
   validates_numericality_of :node_a
   validates_numericality_of :node_b
 
   validates_numericality_of :node_a
   validates_numericality_of :node_b

-  # FIXME validate a nd b exist and are visible

 
   has_many :old_segments, :foreign_key => :id
   belongs_to :user
 
 
   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
 
   def self.from_xml(xml, create=false)
     p = XML::Parser.new


@@ -26,7 +28,7 @@ class Segment < ActiveRecord::Base
         segment.id = pt['id'].to_i
       end
 
         segment.id = pt['id'].to_i
       end
 

-      segment.visible = pt['visible'] and pt['visible'] == 'true'
+      segment.visible = true

 
       if create
         segment.timestamp = Time.now
 
       if create
         segment.timestamp = Time.now


@@ -54,6 +56,7 @@ class Segment < ActiveRecord::Base
   def save_with_history
     begin
       Segment.transaction do
   def save_with_history
     begin
       Segment.transaction do

+        self.timestamp = Time.now

         self.save
         old_segment = OldSegment.from_segment(self)
         old_segment.save
         self.save
         old_segment = OldSegment.from_segment(self)
         old_segment.save


@@ -65,21 +68,31 @@ class Segment < ActiveRecord::Base
   end
 
   def to_xml
   end
 
   def to_xml

-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
+    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['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s
     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

+
+    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
     Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    root << el1
-    return doc
+    return el1

   end
 
   def self.split_tags(el, tags)
   end
 
   def self.split_tags(el, tags)


@@ -90,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 != ''
       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
         el2['k'] = key.to_s
         el2['v'] = val.to_s
         el << el2


@@ -98,5 +111,8 @@ class Segment < ActiveRecord::Base
     end
   end
 
     end
   end
 

+  def preconditions_ok?
+    from_node and from_node.visible and to_node and to_node.visible
+  end

 
 end
 
 end