simplify grabbing of a xml base doc

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 35d6889d26964576a5bc53ae2130e9224e320e26..5c3c65e34ba190fd44769e9de1be211034515610 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
-  # FIXME validate a nd b exist and are visible
 
   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
@@ -26,7 +28,7 @@ class Segment < ActiveRecord::Base
         segment.id = pt['id'].to_i
       end
 
-      segment.visible = pt['visible'] and pt['visible'] == 'true'
+      segment.visible = true
 
       if create
         segment.timestamp = Time.now
@@ -65,13 +67,8 @@ class Segment < ActiveRecord::Base
   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
 
@@ -80,6 +77,7 @@ class Segment < ActiveRecord::Base
     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?
     Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
@@ -94,7 +92,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
@@ -102,5 +100,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