- replaced hardcoded www.openstreetmap.org with environment variable

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 35d6889d26964576a5bc53ae2130e9224e320e26..a88bc9a5b62f47e6277366a37e89adfdf3379956 100644 (file)
--- 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
 
   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
 

+  has_one :from_node, :class_name => 'Node', :foreign_key => 'node_a'
+  has_one :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 +27,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


@@ -94,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 != ''
       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


@@ -102,5 +103,8 @@ class Segment < ActiveRecord::Base
     end
   end
 
     end
   end
 

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

 
 end
 
 end