various fixes

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

diff --git a/app/models/way.rb b/app/models/way.rb
index a8724456374be2f339933c6201bcb2bdd8277fe2..65bb3158debd3c545c47b869ed6de3c50a900ba6 100644 (file)
--- 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)
@@ -43,23 +45,50 @@ 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 = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end
 
-    doc.root = root
-    
+  def to_xml_node(visible_segments = nil, user_display_name_cache = nil)
     el1 = XML::Node.new 'way'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
+
+    user_display_name_cache = {} if user_display_name_cache.nil?
     
-    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
+    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]
+
+    # make sure segments are output in sequence_id order
+    ordered_segments = []
+    self.way_segments.each do |seg|
+      if visible_segments
+        # if there is a list of visible segments then use that to weed out deleted segments
+        if visible_segments[seg.segment_id]
+          ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+        end
+      else
+        # otherwise, manually go to the db to check things
+        if seg.segment.visible? and seg.segment.from_node.visible? and seg.segment.to_node.visible?
+          ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+        end
+      end
+    end
+
+    ordered_segments.each do |seg_id|
+      if seg_id
+        e = XML::Node.new 'seg'
+        e['id'] = seg_id
+        el1 << e
+      end
     end
  
     self.way_tags.each do |tag|
@@ -68,21 +97,37 @@ class Way < ActiveRecord::Base
       e['v'] = tag.v
       el1 << e
     end
-  
-    root << el1
-    return doc
-  end
+    return el1
+  end 
 
   def segs
-    @segs = Array.new unless @segs
+    unless @segs
+        @segs = Array.new
+        self.way_segments.each do |seg|
+            @segs += [seg.segment_id]
+        end
+    end
     @segs
   end
 
   def tags
-    @tags = Hash.new unless @tags
+    unless @tags
+        @tags = Hash.new
+        self.way_tags.each do |tag|
+            @tags[tag.k] = tag.v
+        end
+    end
     @tags
   end
 
+  def segs=(s)
+    @segs = s
+  end
+
+  def tags=(t)
+    @tags = t
+  end
+
   def add_seg_num(n)
     @segs = Array.new unless @segs
     @segs << n.to_i
@@ -125,4 +170,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