X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2803612d9db2f89c4eaa57bbf4606b56967caa62..029b9f3d9f93cbb5bfbd2e0a54866aa55a3f7cd7:/app/models/way.rb?ds=sidebyside

diff --git a/app/models/way.rb b/app/models/way.rb
index 0c53e5e87..7dffcfef1 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -6,6 +6,8 @@ class Way < ActiveRecord::Base
   has_many :way_segments, :foreign_key => 'id'
   has_many :way_tags, :foreign_key => 'id'
 
+  has_many :old_ways, :foreign_key => :id
+
   set_table_name 'current_ways'
 
   def self.from_xml(xml, create=false)
@@ -16,7 +18,7 @@ class Way < ActiveRecord::Base
     way = Way.new
 
     doc.find('//osm/way').each do |pt|
-      unless create and pt['id'] == '0'
+      if !create and pt['id'] != '0'
         way.id = pt['id'].to_i
       end
 
@@ -43,15 +45,8 @@ class Way < ActiveRecord::Base
   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
-
-    root << to_xml_node()
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
     return doc
   end
 
@@ -60,12 +55,17 @@ class Way < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    
-    self.way_segments.each do |seg| # FIXME need to make sure they come back in the right order
-      e = XML::Node.new 'seg'
-      e['id'] = seg.segment_id.to_s
-      el1 << e
-    end
+    el1['user'] = self.user.display_name if self.user.data_public?
+    # make sure segments are output in sequence_id order
+    ordered_segments = []
+    self.way_segments.each do |seg| 
+      ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+    end
+    ordered_segments.each do |seg_id|
+      e = XML::Node.new 'seg'
+      e['id'] = seg_id
+      el1 << e
+    end
  
     self.way_tags.each do |tag|
       e = XML::Node.new 'tag'
@@ -137,4 +137,14 @@ class Way < ActiveRecord::Base
     old_way.save_with_dependencies
   end
 
+  def preconditions_ok?
+    self.segs.each do |n|
+      segment = Segment.find(n)
+      unless segment and segment.visible and segment.preconditions_ok?
+        return false
+      end
+    end
+    return true
+  end
+
 end