X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/613e88c4a8728c2f1ab8a2fb9338762b947eac6a..e7c2d2a211e0f5604acc53f4a941067d94d675a9:/app/models/segment.rb

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 70ce6a4ec..785701c3d 100644
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -4,11 +4,12 @@ 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
 
+  has_one :from_node, :class_name => 'Node', :foreign_key => 'id'
+  has_one :to_node, :class_name => 'Node', :foreign_key => 'id'
 
   def self.from_xml(xml, create=false)
     p = XML::Parser.new
@@ -26,7 +27,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
@@ -68,9 +69,14 @@ class Segment < ActiveRecord::Base
     doc = XML::Document.new
     doc.encoding = 'UTF-8' 
     root = XML::Node.new 'osm'
-    root['version'] = '0.4'
+    root['version'] = API_VERSION
     root['generator'] = 'OpenStreetMap server'
     doc.root = root
+    root << to_xml_node()
+    return doc
+  end
+
+  def to_xml_node
     el1 = XML::Node.new 'segment'
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
@@ -78,8 +84,7 @@ class Segment < ActiveRecord::Base
     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)
@@ -90,7 +95,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
@@ -98,5 +103,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